Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751Ab0DVONS (ORCPT ); Thu, 22 Apr 2010 10:13:18 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:62708 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754673Ab0DVONQ (ORCPT ); Thu, 22 Apr 2010 10:13:16 -0400 Message-ID: <4BD05929.8040900@cn.fujitsu.com> Date: Thu, 22 Apr 2010 22:11:53 +0800 From: Miao Xie Reply-To: miaox@cn.fujitsu.com User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9.1.9) Gecko/20100317 Thunderbird/3.0.4 MIME-Version: 1.0 To: David Rientjes , Lee Schermerhorn , Nick Piggin , Paul Menage CC: Andrew Morton , Linux-Kernel , Linux-MM Subject: [PATCH 1/2] mm: fix bugs of mpol_rebind_nodemask() Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1416 Lines: 46 - local variable might be an empty nodemask, so must be checked before setting pol->v.nodes to it. - nodes_remap() may cause the weight of pol->v.nodes being monotonic decreasing. and never become large even we pass a nodemask with large weight after ->v.nodes become little. this patch fixes these two problem. Signed-off-by: Miao Xie --- mm/mempolicy.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 08f40a2..03ba9fc 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -291,12 +291,15 @@ static void mpol_rebind_nodemask(struct mempolicy *pol, else if (pol->flags & MPOL_F_RELATIVE_NODES) mpol_relative_nodemask(&tmp, &pol->w.user_nodemask, nodes); else { - nodes_remap(tmp, pol->v.nodes, pol->w.cpuset_mems_allowed, - *nodes); + tmp = *nodes; pol->w.cpuset_mems_allowed = *nodes; } - pol->v.nodes = tmp; + if (nodes_empty(tmp)) + pol->v.nodes = *nodes; + else + pol->v.nodes = tmp; + if (!node_isset(current->il_next, tmp)) { current->il_next = next_node(current->il_next, tmp); if (current->il_next >= MAX_NUMNODES) -- 1.6.5.2 -- 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/