From patchwork Mon Sep 17 03:05:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 10602031 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 ADF2E14DA for ; Mon, 17 Sep 2018 03:07:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F330292B2 for ; Mon, 17 Sep 2018 03:07:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93086296AD; Mon, 17 Sep 2018 03:07:54 +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,RCVD_IN_DNSWL_NONE 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 EF72F292B2 for ; Mon, 17 Sep 2018 03:07:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 06FBA8E0001; Sun, 16 Sep 2018 23:07:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 020458E0006; Sun, 16 Sep 2018 23:07:52 -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 E2AB68E0001; Sun, 16 Sep 2018 23:07:52 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-it0-f70.google.com (mail-it0-f70.google.com [209.85.214.70]) by kanga.kvack.org (Postfix) with ESMTP id B5BE18E0006 for ; Sun, 16 Sep 2018 23:07:52 -0400 (EDT) Received: by mail-it0-f70.google.com with SMTP id z72-v6so11685792itc.8 for ; Sun, 16 Sep 2018 20:07:52 -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=x6EFB+hxxf/uX9T9lsQKkr7PTWDd6uMzxiXGp3m/DjA=; b=uPtKpTGcqH43n+CfsvmZJnbxNq4BM3/3K7ICiR/NG8R+8DQpeUb3icxWxsxHkfShK8 tXnC+WbUIAlTIUjaIkkgovRiApATOF1hoe4GjYrpAmcku/2BEB4nbf3M/TjBccAu3yA4 MbCNBTKh8ByV+Pg+7YjRqmAxw8eZJa4tOTyZN4i7PSCwEvwGOSDKuChadngVqIjUrYDy Nwy/Pxq65AIp0Zs42ptTpZplly2DG15IE0OMKv1FuOF2V75yEXQP2q9vZ3kHeWg6IUKW Jt6/wQEcwdWTWVKyVpKTNUFQ9Cez5eM/VOn9z5FtiOjp211A9jT++/cd0CLEqvEX1NxA Cwig== X-Gm-Message-State: APzg51APKlNn6+m477N0LKGiDyA8EkfzZ4V+7fXpuPAwMIFxKgN8SLYt uwJ2HTfPkfrLPsTWwhMQz/6Z2rIE5b5hMktg6pMSs0k1JALbRe+giyCs4lgFEEhqLrxkdPZvsrc SY9Ca/mrdeJJPRUaGdDh1OGuiGe5bW+H6qzmiDKZyskISuW603awEeK3lGHHNfq8Kiw== X-Received: by 2002:a24:c48a:: with SMTP id v132-v6mr11681723itf.72.1537153672160; Sun, 16 Sep 2018 20:07:52 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZgerIpoXbskYwfNFA5nTjrCrQOF2YDzH+qwkCEwTMSdjP8dtHS4u6pCDDgB0ClPVMY1sgB X-Received: by 2002:a24:c48a:: with SMTP id v132-v6mr11681701itf.72.1537153671433; Sun, 16 Sep 2018 20:07:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537153671; cv=none; d=google.com; s=arc-20160816; b=BhhqysTQrAuKb2BUyOJu7eikzHQtDhi7XMIDD0ToQIH4CVAbDnlTfQhGeiE/jE7YII AnLNNVSkwII/h6chP8lx4hhTXIuAl1IRAT0KOldV6NVrI6dY9eIYXms9AplNcmY3VeXj HOm95RrgNWptyBQUrrjjhoP+Yz0acq3tOsTbxRbWA8p3+ueioTQkuJVJXmectcels0zs Pu+8Ss/BtbQV+3Dw/Skzeq+pKq2JiwqGfxCFGUL2gL3MDA5x6XKE1QUqJBC7k9WbE+m4 m+NhPUYDn/2eWUiP7UaYw2lD1SQcapC1Ce51vJ3yQ1TGfldetADGV9l8DWt5VqXSGTCF QADQ== 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=x6EFB+hxxf/uX9T9lsQKkr7PTWDd6uMzxiXGp3m/DjA=; b=sleoI8qe8nqG60kktI2hVcg/i4d/FRM9cbFGnT+FMOYpqi1iU3ji61ZSLLUfm9VgVg 9cUWuIq3saDqrkiY5JbwTvfabmPOQXndvGIITmt8EAYlYkukfCEMFpBiZMMT2dPattU6 vrLG+igR9L7o1eEKLC+gYbgJJJaR/qWlJu00jR++SAjqh5A49UyOx712APWXg87FbRAf ZrrUJoaIUG6CF5DHkCwCR/CI0ThNBzqa8o8nsyTZVzyb7ozjPwD1laay6JWbxm5BN6lE E8LuLmu1rVPH1kh/PF6IJs+2TyaRN2/CfnAElP3Oo1RY338W6oDtW99y04MlFdcicjRF PF8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=WpffpDku; spf=pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.38.113 as permitted sender) smtp.mailfrom=Alexander.Levin@microsoft.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0113.outbound.protection.outlook.com. [104.47.38.113]) by mx.google.com with ESMTPS id a4-v6si7968517ioc.119.2018.09.16.20.07.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 16 Sep 2018 20:07:51 -0700 (PDT) Received-SPF: pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.38.113 as permitted sender) client-ip=104.47.38.113; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=WpffpDku; spf=pass (google.com: domain of alexander.levin@microsoft.com designates 104.47.38.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=x6EFB+hxxf/uX9T9lsQKkr7PTWDd6uMzxiXGp3m/DjA=; b=WpffpDkudTuMfuU1BebmBGYO7DUMSs8K21x7/L06NV7v8o6GZNVJYDuJRZ2kVN6934oJvvKNHjsZ9qoIxYx6OrktXElLJLwpb1yCKIqFZwO+qQr0jOQVuVpR+RuAGQH/Pd1yL84IzToPj6ZJLG9THx5q6OnKx5jxnhS0OdQNtKw= Received: from CY4PR21MB0776.namprd21.prod.outlook.com (10.173.192.22) by CY4PR21MB0839.namprd21.prod.outlook.com (10.173.192.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.11; Mon, 17 Sep 2018 03:07:48 +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:07:48 +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 3.18 03/29] x86/numa_emulation: Fix emulated-to-physical node mapping Thread-Topic: [PATCH AUTOSEL 3.18 03/29] x86/numa_emulation: Fix emulated-to-physical node mapping Thread-Index: AQHUTjNPJiTeV9qlk0mPyGKnH3V5wA== Date: Mon, 17 Sep 2018 03:05:38 +0000 Message-ID: <20180917030533.592-3-alexander.levin@microsoft.com> References: <20180917030533.592-1-alexander.levin@microsoft.com> In-Reply-To: <20180917030533.592-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;CY4PR21MB0839;6:nkKSD56B+aFXyyoUtzyR8hqR9/KydZS5MSd/MkATdFJ1ZhFOH6YkDAV984zRcJtkys3+45OiJGUDzxX8dj7Nf67Fz9OV7E9dVWkaF0BZ/+gqqjqbkIeWcDNaCjp8qMeu247L4a+r6PbKsMTrPb3c0i4nSzA/iB5f55hXWyzqHw+Xw7m13HFgl451iLvrWCUUZcoICGnbnLdJYLj/SBi9QN8L+Zbm/GkySFQzG2iV6cFJqxvgU1jB8JN5KT7DnVocA+AcIe9IxigAv2bHvA1ExCZor2d9UUApwkfzEIYN7J3Dy5SfkJ4lGhJprcrW0FFwaXnNXEn9ermVGfUOvukOlpk27EjZ7UNSVgaH2pN6WRbAptaOVN0HDYY9p6f7+VRciVUGbgWpesd1LW06zygFe5vFSj3EnP4jQ3cTeAFywYISgCC0r+weRGOrgCfz6r8cdSHO2cYPigBnPu1N+E8f9Q==;5:YDm1mF0jMdaRloWRc42cp6kleX1TS0hDouBqlYpaWaIxth/XedKEM7NhpNUZD0qCpUDZyuvMhg8QmhJIBFVT6tbgJN29wfDQBinV8Va0VRS9ynjgk2t5OqhN91SnOMv/AngNH2cdqp9LTCQc3KroF1aOVHydjs68Pof7Z8fbOoU=;7:xyYzVzUqiU3HLRZZxQwVTqYzixLTsCSSG9qBl1QrmsABQ8dCYcRe9BFfqq5pPl2fV9T9FeJ1P7MoKBZjwCs0uM9duSeoWbvSjqy36sqjLA0okJlFpOWjAlsS2/KIedcbzk/Vl1YnTcGi62bI8R8dC8TuSu0Fai123F6YqSCnF3YBnzSb5ft0d3EPdLcbtSouHd++mvXwe/swOZl/J9FFaLzlhDPnroXzjBlUnjOk5f5HtQheJqTWQf8XSEzqtxs7 x-ms-office365-filtering-correlation-id: 8804d47e-ca79-4555-86bb-08d61c4abfa0 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:CY4PR21MB0839; x-ms-traffictypediagnostic: CY4PR21MB0839: 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)(10201501046)(3002001)(3231355)(944501410)(52105095)(2018427008)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(201708071742011)(7699050)(76991041);SRVR:CY4PR21MB0839;BCL:0;PCL:0;RULEID:;SRVR:CY4PR21MB0839; x-forefront-prvs: 0798146F16 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(366004)(346002)(39860400002)(136003)(376002)(396003)(189003)(199004)(8936002)(6116002)(86612001)(3846002)(53936002)(81166006)(25786009)(217873002)(39060400002)(5660300001)(68736007)(5250100002)(6666003)(107886003)(256004)(14444005)(305945005)(7736002)(7416002)(2900100001)(1076002)(86362001)(2501003)(966005)(6506007)(4326008)(22452003)(10090500001)(6436002)(11346002)(446003)(76176011)(102836004)(6486002)(186003)(105586002)(6346003)(26005)(106356001)(54906003)(110136005)(6306002)(316002)(478600001)(6512007)(2616005)(476003)(486006)(10290500003)(2906002)(81156014)(36756003)(66066001)(72206003)(8676002)(97736004)(99286004)(14454004);DIR:OUT;SFP:1102;SCL:1;SRVR:CY4PR21MB0839;H:CY4PR21MB0776.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A: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: SaFd5wzJF5XkqXvXfl95zoCmLhDsVlU/pWnHC84yxGlWlCHazGBApdihu3yhW+f2gMW9MixI1Z+2n66IvxCYyq6zgMMANcdaYF0+KHZLGLnbdbXV0IwvBUyQ0CDNRjAdI+wvTYD1Mn8IHTTgRJXfE4xMF/Lt68NXzPIP/9qlyjD4NGoMXT5kVcLwvR2aP/7NsWH/DrKMmJqilCrkL2nfxamQiOA8aE0cL52/HXKWH3ZNmyPXk59Dj4f9UvC8UYXAOblfRu6SNpXaZtOYWKUIc7T9ZC837nHUwTvLSyp3gYkg+086PhRePPf0YysomKcxCFTrK8v67ZNVe3NrhvXQScxZpZFt56Wff3fukYUrpw8= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8804d47e-ca79-4555-86bb-08d61c4abfa0 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Sep 2018 03:05:38.4828 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR21MB0839 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 a8f90ce3dedf..dc6d99017f3f 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -60,7 +60,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) {