Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933858AbbGUWCc (ORCPT ); Tue, 21 Jul 2015 18:02:32 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:35173 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbbGUWCa (ORCPT ); Tue, 21 Jul 2015 18:02:30 -0400 X-Helo: d03dlp03.boulder.ibm.com X-MailFrom: nacc@linux.vnet.ibm.com X-RcptTo: netdev@vger.kernel.org Date: Tue, 21 Jul 2015 15:02:22 -0700 From: Nishanth Aravamudan To: Chris J Arges Cc: pshelar@nicira.com, linuxppc-dev@lists.ozlabs.org, benh@kernel.crashing.org, linux-numa@vger.kernel.org, davem@davemloft.net, netdev@vger.kernel.org, dev@openvswitch.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] openvswitch: allocate nr_node_ids flow_stats instead of num_possible_nodes Message-ID: <20150721220222.GB29402@linux.vnet.ibm.com> References: <20150721162418.GM38815@linux.vnet.ibm.com> <1437500193-10255-1-git-send-email-chris.j.arges@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437500193-10255-1-git-send-email-chris.j.arges@canonical.com> X-Operating-System: Linux 3.13.0-40-generic (x86_64) User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15072122-0033-0000-0000-0000053D078D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1636 Lines: 42 On 21.07.2015 [12:36:33 -0500], Chris J Arges wrote: > Some architectures like POWER can have a NUMA node_possible_map that > contains sparse entries. This causes memory corruption with openvswitch > since it allocates flow_cache with a multiple of num_possible_nodes() and > assumes the node variable returned by for_each_node will index into > flow->stats[node]. > > Use nr_node_ids to allocate a maximal sparse array instead of > num_possible_nodes(). > > The crash was noticed after 3af229f2 was applied as it changed the > node_possible_map to match node_online_map on boot. > Fixes: 3af229f2071f5b5cb31664be6109561fbe19c861 > > Signed-off-by: Chris J Arges Acked-by: Nishanth Aravamudan > --- > net/openvswitch/flow_table.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c > index 4613df8..6552394 100644 > --- a/net/openvswitch/flow_table.c > +++ b/net/openvswitch/flow_table.c > @@ -752,7 +752,7 @@ int ovs_flow_init(void) > BUILD_BUG_ON(sizeof(struct sw_flow_key) % sizeof(long)); > > flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow) > - + (num_possible_nodes() > + + (nr_node_ids > * sizeof(struct flow_stats *)), > 0, 0, NULL); > if (flow_cache == NULL) > -- > 1.9.1 > -- 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/