Commit 5f155f27 authored by Vlastimil Babka's avatar Vlastimil Babka Committed by Linus Torvalds

mm, cpuset: always use seqlock when changing task's nodemask

When updating task's mems_allowed and rebinding its mempolicy due to
cpuset's mems being changed, we currently only take the seqlock for
writing when either the task has a mempolicy, or the new mems has no
intersection with the old mems.

This should be enough to prevent a parallel allocation seeing no
available nodes, but the optimization is IMHO unnecessary (cpuset
updates should not be frequent), and we still potentially risk issues if
the intersection of new and old nodes has limited amount of
free/reclaimable memory.

Let's just use the seqlock for all tasks.

Link: http://lkml.kernel.org/r/20170517081140.30654-6-vbabka@suse.czSigned-off-by: default avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Anshuman Khandual <khandual@linux.vnet.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 213980c0
...@@ -1038,38 +1038,25 @@ static void cpuset_post_attach(void) ...@@ -1038,38 +1038,25 @@ static void cpuset_post_attach(void)
* @tsk: the task to change * @tsk: the task to change
* @newmems: new nodes that the task will be set * @newmems: new nodes that the task will be set
* *
* In order to avoid seeing no nodes if the old and new nodes are disjoint, * We use the mems_allowed_seq seqlock to safely update both tsk->mems_allowed
* we structure updates as setting all new allowed nodes, then clearing newly * and rebind an eventual tasks' mempolicy. If the task is allocating in
* disallowed ones. * parallel, it might temporarily see an empty intersection, which results in
* a seqlock check and retry before OOM or allocation failure.
*/ */
static void cpuset_change_task_nodemask(struct task_struct *tsk, static void cpuset_change_task_nodemask(struct task_struct *tsk,
nodemask_t *newmems) nodemask_t *newmems)
{ {
bool need_loop;
task_lock(tsk); task_lock(tsk);
/*
* Determine if a loop is necessary if another thread is doing
* read_mems_allowed_begin(). If at least one node remains unchanged and
* tsk does not have a mempolicy, then an empty nodemask will not be
* possible when mems_allowed is larger than a word.
*/
need_loop = task_has_mempolicy(tsk) ||
!nodes_intersects(*newmems, tsk->mems_allowed);
if (need_loop) { local_irq_disable();
local_irq_disable(); write_seqcount_begin(&tsk->mems_allowed_seq);
write_seqcount_begin(&tsk->mems_allowed_seq);
}
nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems); nodes_or(tsk->mems_allowed, tsk->mems_allowed, *newmems);
mpol_rebind_task(tsk, newmems); mpol_rebind_task(tsk, newmems);
tsk->mems_allowed = *newmems; tsk->mems_allowed = *newmems;
if (need_loop) { write_seqcount_end(&tsk->mems_allowed_seq);
write_seqcount_end(&tsk->mems_allowed_seq); local_irq_enable();
local_irq_enable();
}
task_unlock(tsk); task_unlock(tsk);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment