lkml.org 
[lkml]   [2005]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] cpuset semaphore depth check deadlock fix
Paul Jackson writes:
> The cpusets-formalize-intermediate-gfp_kernel-containment patch
> has a deadlock problem.

[...]

>
> /*
> + * The global cpuset semaphore cpuset_sem can be needed by the
> + * memory allocator to update a tasks mems_allowed (see the calls
> + * to cpuset_update_current_mems_allowed()) or to walk up the
> + * cpuset hierarchy to find a mem_exclusive cpuset see the calls
> + * to cpuset_excl_nodes_overlap()).
> + *
> + * But if the memory allocation is being done by cpuset.c code, it
> + * usually already holds cpuset_sem. Double tripping on a kernel
> + * semaphore deadlocks the current task, and any other task that
> + * subsequently tries to obtain the lock.
> + *
> + * Run all up's and down's on cpuset_sem through the following
> + * wrappers, which will detect this nested locking, and avoid
> + * deadlocking.
> + */
> +
> +static inline void cs_down(struct semaphore *psem)
> +{
> + if (current->cpuset_sem_nest_depth == 0)
> + down(psem);
> + current->cpuset_sem_nest_depth++;
> +}
> +
> +static inline void cs_up(struct semaphore *psem)
> +{
> + current->cpuset_sem_nest_depth--;
> + if (current->cpuset_sem_nest_depth == 0)
> + up(psem);
> +}

I am somewhat concerned that new fields are added to the struct
task_struct all the time: it's already over 1.3KB.

In that particular case, it seems that cs_{up,down}() (or however they
end up being named), are used only on &cpuset_sem, and adding new field
to the thread struct can be avoided by doing:

static DECLARE_MUTEX(cpuset_sem);
static struct task_struct *cpuset_sem_owner = NULL;
static int cpuset_sem_depth = 0;

static void cpusets_lock(void)
{
if (cpuset_sem_owner != current) {
down(&cpuset_sem);
cpuset_sem_owner = current;
}
cpuset_sem_depth ++;
}

static void cpusets_unlock(void)
{
if (-- cpuset_sem_depth == 0) {
cpuset_sem_owner = NULL;
up(&cpuset_sem);
}
}

Nikita.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-09-10 09:32    [W:0.073 / U:0.880 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site