From patchwork Mon Sep 17 03:02:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 10602025 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2377614DA for ; Mon, 17 Sep 2018 03:03:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DC462967F for ; Mon, 17 Sep 2018 03:03:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F3B52296BB; Mon, 17 Sep 2018 03:03:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 254A92967F for ; Mon, 17 Sep 2018 03:03:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E89E8E0003; Sun, 16 Sep 2018 23:03:33 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 070448E0001; Sun, 16 Sep 2018 23:03:33 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E05B38E0003; Sun, 16 Sep 2018 23:03:32 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by kanga.kvack.org (Postfix) with ESMTP id B28468E0001 for ; Sun, 16 Sep 2018 23:03:32 -0400 (EDT) Received: by mail-oi0-f71.google.com with SMTP id c18-v6so16947311oiy.3 for ; Sun, 16 Sep 2018 20:03:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:thread-topic :thread-index:date:message-id:references:in-reply-to:accept-language :content-language:spamdiagnosticoutput:spamdiagnosticmetadata :content-transfer-encoding:mime-version; bh=jAISTbhvsYKJqkEDupBCZV3PVE9ObqTF2FL7hOKgOIM=; b=GQYnl2d4zNRyKbO43/VXnYidjZRAqmyLKU7SP7UvBOvjX+9263ukqzp+AoRPygQSJh mjbU+qoacalH2nAxjYkGhpD0U7XnuaXg9smGPnk6IvkuLl6Z4swuY1TycGawUs/rebUx tgcVVjV4YOSnHNPaY4YYRv0GWMvydz/c2SgdW0erk47MfxuGeD+bf8x2r7KeCQfbITZI IpZBiixFDorNmsCBuzOSxnjJOtLWNeg09zgGiegyNKQ9BbHqw835EdJjP/KppcrrnKtD odxYmuZH7lhNqo6U9ZPcJbwW/FsWSPw3IBmMTJx8zfVAN47jbP14mF4H37vDK1bpCAjt 0BTA== X-Gm-Message-State: APzg51D+gkPPza0Yhypc1yE+/aWtHREG02/weeMsSZVAcuhRFqoBnpz0 gLzHjnXRx36k5uNTkuxs4D7Hetrx/45r9TtjTo0FdigjW+NlOnCDi/i2eKeayxpOX52ESANm+VI VijNug+hFUWPFLsyWZhBgF9uJ8xBd4VnpWVmHHzXoYngCB2O+ROfxjU7L0Bv7rISk1w== X-Received: by 2002:a9d:19a8:: with SMTP id k37-v6mr11578852otk.123.1537153412502; Sun, 16 Sep 2018 20:03:32 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYUPDwrCWY8XM63dIbdiri4TDpiRbTbwy0mIiorsMjMXDHBP6B9Wyym9iibbIbtR6efKcUp X-Received: by 2002:a9d:19a8:: with SMTP id k37-v6mr11578829otk.123.1537153411734; Sun, 16 Sep 2018 20:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537153411; cv=none; d=google.com; s=arc-20160816; b=Y1WSaqkkDf9PnqUAaPc+3BY0j+O1Apz2XF3AhpDkAN+9fsMMgFo50htumPJVrEsDof tOmYYFKcy2AknTpY+1IwieKTncSWZjKxmc7X0jlfdcjJgIvuhYyjLxxFbx4t/kI1lKoS 45cGPZW3arLXC0Lq4olC+VJUUGMB0ZXVl/msPiAEkidkHdqY6tgGfgYWVDctp6O6dbfJ NRB1qKCDIuRUsvh4YqMjLVB0JNvazS68BeMoy0SxKYLg6zbACMu0qghyn7XJLcQ7FoOB Ud07x2+EsT1dil7g5T20dDp8r1+KaFmLxP/5j8g1EwgMaEJt+ezGkv1Wp+LSjHwz6m7e BGFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:spamdiagnosticmetadata :spamdiagnosticoutput:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:cc:to :from:dkim-signature; bh=jAISTbhvsYKJqkEDupBCZV3PVE9ObqTF2FL7hOKgOIM=; b=HiebPOokxKMw+jMwxxLaZtt7bxSplO3LTC6DYeBzZtd678YLbnhuOxl4frp1EmOYFF Lq1gXO0oC2QgkdPwefQZPKUx+3bBy5ZPgfGSMi/1tVuTxYgo0nmGUkYMfucW1z9T7tpz 0VSRlVZRvgZtvqWQ5ueC2Dc5ymqKoF/Y+Y2wzd6rtZEEK28ZpRu6ZhiCd/c3VsykMOGp U8xIR5bvaaTXK2otZ0BJ3gAdlz4F+QnPFcrtjXzOU0DvJeE7jLbMSCdsmZJ8UWSMEi2t Dfjo/COGAt32KF+KDYrEMF7OHHXshosyVBPsSQK9c3Kay1b1UXzNTGnhnfY362bTkxo7 wQWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=hVcqJQhL; spf=pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.42.113 as permitted sender) smtp.mailfrom=Alexander.Levin@microsoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0113.outbound.protection.outlook.com. [104.47.42.113]) by mx.google.com with ESMTPS id 109-v6si4356708otg.148.2018.09.16.20.03.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Sep 2018 20:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.42.113 as permitted sender) client-ip=104.47.42.113; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=hVcqJQhL; spf=pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.42.113 as permitted sender) smtp.mailfrom=Alexander.Levin@microsoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jAISTbhvsYKJqkEDupBCZV3PVE9ObqTF2FL7hOKgOIM=; b=hVcqJQhL/9XL+0PnT6GHHdDP+4Sr39q8pgFKGeW6qgZdH+RfW1HD6HG9+FqUq67a701G9nZrmIJNsG9WKOBFDWP1HWpEI5GLKA67O+HktVsvDqxQnv3mSlRwQm8mxgfNdha+RGJTdKmPGYPe5hsIEXReKjduvoJa5vzuMUtM3sg= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0855.namprd21.prod.outlook.com (10.173.192.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.4; Mon, 17 Sep 2018 03:03:29 +0000 Received: from CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36]) by CY4PR21MB0776.namprd21.prod.outlook.com ([fe80::54e2:88e0:b622:b36%5]) with mapi id 15.20.1185.003; Mon, 17 Sep 2018 03:03:29 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Dan Williams , David Rientjes , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Wei Yang , "linux-mm@kvack.org" , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.14 05/87] x86/numa_emulation: Fix emulated-to-physical node mapping Thread-Topic: [PATCH AUTOSEL 4.14 05/87] x86/numa_emulation: Fix emulated-to-physical node mapping Thread-Index: AQHUTjLdfoG+lX/S40yOaVutEc5tdA== Date: Mon, 17 Sep 2018 03:02:27 +0000 Message-ID: <20180917030220.245686-5-alexander.levin@microsoft.com> References: <20180917030220.245686-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030220.245686-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;CY4PR21MB0855;6:OsDzVNgWHRaOeJ1JC+5k3qRR3jymxhj/D4mrrS21rev/dLsyf8gQ1A4sprBfllP+f+5sAIeFUD0axHdx0Q4KLevblCpXC1Gya/NGIiIpl1mQ/mrytx2r21KJ/nbPeZh1DNatnEj5UmHTozlfYp7SNJUJdHQR4l+bVX6YCofvG8PPjusLXLXXpkdu162t8WeciXAeEojgpgoopCMWN9m8kBLnK4/5KCCxiTjfFqady5VgCBy65qx8mkGmjXNx2VHKQNc4VKnivmUvmAJOPcLftqdEUWIfsin9/a7BZTIKmf0Rzsbpm1o/qoAuydm7DQ5+JNefWwOk5Cq1EAwJzH2tYcdTCLC+BEh38MjM5+7ucTakmmi0CHwy3cuGg1roGbqG1TG5LJaqVXU10I6mvemUL0/yKVTKC5NU7vUI4tbazWsJzNN1ec18fjMvCkCgdjgUcfVzKjTD2ok0MVmo9Y99yQ==;5:E7Xd4DKu/p118MTU9wqqpCsE1IiML+hCm9rafwH6U6SAzYZPyzkaDz1Gik8Hk8S7UKoqGu8XSrLYEsr5I3zy/II+2SmpESp1jP8ITcYM83aAbiEB2SNp9At0ANee/ghacC6z6a9eayZL/mNno5ds3zwFgwtR0B5Vh5vWRSeeZt4=;7:AJjywI73O7M/V6wxNOTVSHI1EIelATYCTD4QN6X1YEXe8K+9UabzvLDi+XYaLpmxZzuXfIA/cD/2FUo872Lfu+MJzmLi/sempjNwgsVxz1nv6eiW1ZejjwsxgkuuvfLMe9S8O806VVGnpa9j7VlckJJ+8mCxcj9S0RvjM0mPI1BHx1iU91CbM7XghUOTHAEfIujwO4YtPH5DpxmNVS8YIVOEs92iV0uZOUAgTXmFc8hj7nUZWb/kHMJOOWz/LCfB x-ms-office365-filtering-correlation-id: 13472970-3c60-4857-c97c-08d61c4a2527 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:CY4PR21MB0855; x-ms-traffictypediagnostic: CY4PR21MB0855: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(42068640409301)(228905959029699)(211936372134217)(153496737603132)(85827821059158)(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231355)(944501410)(52105095)(2018427008)(10201501046)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0855;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0855; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(396003)(136003)(366004)(199004)(189003)(6436002)(99286004)(7736002)(110136005)(54906003)(97736004)(5660300001)(7416002)(66066001)(446003)(72206003)(76176011)(86362001)(86612001)(81166006)(81156014)(2906002)(478600001)(305945005)(68736007)(105586002)(2616005)(106356001)(476003)(11346002)(22452003)(6486002)(10090500001)(10290500003)(8676002)(39060400002)(36756003)(6346003)(6116002)(6506007)(3846002)(102836004)(107886003)(6512007)(1076002)(25786009)(217873002)(4326008)(14454004)(26005)(256004)(14444005)(486006)(186003)(316002)(2900100001)(8936002)(53936002)(966005)(5250100002)(2501003)(6306002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0855;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: cghMX1LU0nBTyd1UfeSRe1ta+NQCw6EvZdnJ/P4FMhAQJnXBKf0qSD6Ir46TPUz+6h98R7L360zLCuCijgcX1vipYudwh8XtVsRNxtPuXKpDCz8gXvTwxaIYfc0ZwYjeP/x6eely5KRucTqZ7bZA49dUTa0JsKEC3/wco5+1aWPiB0tOjLjqA/bM2ZSb6RIBn/YXUFZrU3FmGg0nCGZFmNOwQsToABe2DDvUlpJhNRu67reWLSmZuW9mNxqKuAusyrOja5PbBWAV2glG8uthu9HdhCWbi5gEDcgUGDFQ7aMdDHJQdHaXpe1nD2t2QnTbL2LpUDFZE2Qxej2tdzjvLBBcDV5xW+tIaXej6iXgxHQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13472970-3c60-4857-c97c-08d61c4a2527 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:02:27.8533 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0855 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Dan Williams [ Upstream commit 3b6c62f363a19ce82bf378187ab97c9dc01e3927 ] Without this change the distance table calculation for emulated nodes may use the wrong numa node and report an incorrect distance. Signed-off-by: Dan Williams Cc: David Rientjes Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Wei Yang Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/153089328103.27680.14778434392225818887.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- arch/x86/mm/numa_emulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index 34a2a3bfde9c..22cbad56acab 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -61,7 +61,7 @@ static int __init emu_setup_memblk(struct numa_meminfo *ei, eb->nid = nid; if (emu_nid_to_phys[nid] == NUMA_NO_NODE) - emu_nid_to_phys[nid] = nid; + emu_nid_to_phys[nid] = pb->nid; pb->start += size; if (pb->start >= pb->end) {