From patchwork Thu Nov 12 13:10:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 7601971 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2F993BF90C for ; Thu, 12 Nov 2015 13:11:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 401ED201C8 for ; Thu, 12 Nov 2015 13:11:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 53BA82079F for ; Thu, 12 Nov 2015 13:11:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751958AbbKLNLM (ORCPT ); Thu, 12 Nov 2015 08:11:12 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:38236 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751664AbbKLNK5 (ORCPT ); Thu, 12 Nov 2015 08:10:57 -0500 Received: by wmec201 with SMTP id c201so90656869wme.1 for ; Thu, 12 Nov 2015 05:10:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=plexistor_com.20150623.gappssmtp.com; s=20150623; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=3nCZ5+07gBmjSzCg92Otw/dNbD/dwfqV+kXFTDikQfo=; b=d92rRcVHArBkxVvVjnusn20XtU9AEB96DUYQofKpTeR+p7MWQCepBC+c4GQweyGJaT t50N78kUg3DIJ+Te5x+c1Q/8uvRiZC9QdNGBcfC+cawhCExLSjqf2X2OuL2saOHhlv8/ YTAeUSz3KyjXWBWdbV5LPmEL8LsSYTT0G/O9V+Tq9RQMCwgrSRXDxYNTKQjjCAuv/ZWW 2/RfM7XRwIRF1OXnUfxY6w1QD+NAwwFjsG3SOsHWjun1DwG+U+mRP8P/QxG/XEQV4686 nr8Tx/eyL7M/XKdszkbuQEIxE98B8YBYeZ1j9YTDxnbdQo+WHsEJ+nuiZrtoYViK3l7Z MKsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=3nCZ5+07gBmjSzCg92Otw/dNbD/dwfqV+kXFTDikQfo=; b=XwwZwC0xUyuoKaqtWvIkUxQCnCwQalndVtpclCvmzzuPWhYt0if6A7hHc5jiupU2Oc Nz9F3vlxAZPcUn73KruT9sgGys3jBtDZ/ztO+B5SBymcpPvwUhiY2QPROWNASBLA+2lC 73OcymrO+1SPZ6D1uoDznAmUnbfQh+hYEVydvhp/E5eS2TQ0YtzAxbkqWAUc+Tu+glZI KN3n7TRD7E7EY3xbsUkGFMThOnd9/ZpCYwigkPyKidQ3ARj8KvaC8iJfebF6zHkBUqD/ r7cm4NHRJlVzUuEfprhH8yUCQTFEUVjlQXhcAENQ14Ykgdd2SQIZKflP1pHoW3+uw2Hc +2dw== X-Gm-Message-State: ALoCoQmuOizuhs8OJ2mI6RWUxDFVIiJfBPeW+kifdjhxIlIQRS8BC8+o2fD0fayTIKAuleGPUfOc X-Received: by 10.28.47.212 with SMTP id v203mr1750925wmv.37.1447333856409; Thu, 12 Nov 2015 05:10:56 -0800 (PST) Received: from [10.0.0.5] ([207.232.55.62]) by smtp.googlemail.com with ESMTPSA id t126sm30666900wmd.18.2015.11.12.05.10.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Nov 2015 05:10:55 -0800 (PST) Message-ID: <56448FDE.4020404@plexistor.com> Date: Thu, 12 Nov 2015 15:10:54 +0200 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Dan Williams CC: linux-fsdevel , "linux-nvdimm@lists.01.org" , Stable Tree Subject: [PATCH] nvdimm: proper NID in e820_pmem_probe References: <5643B043.3010103@plexistor.com> <5643BB8D.4080202@plexistor.com> In-Reply-To: <5643BB8D.4080202@plexistor.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dan Williams [Boaz] What I see is that in the call to arch_add_memory() nid==0 regardless of the real NID the memory is actually on. [Dan] In the case of NFIT numa node should already be set, and in the case of the memmap=ss!nn or e820-type-12 we can set the numa node like this: [Needed for v4.3] CC: Stable Tree Tested-by: Boaz Harrosh Signed-off-by: Boaz Harrosh --- drivers/nvdimm/e820.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvdimm/e820.c b/drivers/nvdimm/e820.c index 8282db2..e40df8f 100644 --- a/drivers/nvdimm/e820.c +++ b/drivers/nvdimm/e820.c @@ -48,7 +48,7 @@ static int e820_pmem_probe(struct platform_device *pdev) memset(&ndr_desc, 0, sizeof(ndr_desc)); ndr_desc.res = p; ndr_desc.attr_groups = e820_pmem_region_attribute_groups; - ndr_desc.numa_node = NUMA_NO_NODE; + ndr_desc.numa_node = memory_add_physaddr_to_nid(p->start); set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); if (!nvdimm_pmem_region_create(nvdimm_bus, &ndr_desc)) goto err;