From patchwork Tue Oct 2 13:21:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 10623673 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 2544315E8 for ; Tue, 2 Oct 2018 13:26:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 243222863C for ; Tue, 2 Oct 2018 13:26:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 178892871E; Tue, 2 Oct 2018 13:26:12 +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=-2.9 required=2.0 tests=BAYES_00,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 01F2928696 for ; Tue, 2 Oct 2018 13:26:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D7C336B0272; Tue, 2 Oct 2018 09:26:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D29EF6B0273; Tue, 2 Oct 2018 09:26:09 -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 C41266B0274; Tue, 2 Oct 2018 09:26:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 872E16B0272 for ; Tue, 2 Oct 2018 09:26:09 -0400 (EDT) Received: by mail-pl1-f198.google.com with SMTP id d40-v6so2230583pla.14 for ; Tue, 02 Oct 2018 06:26:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=fpXHLmMxtDGoLT8cRornc4FOXhWYAbPZmVe1mwaR4Hc=; b=crvqdf7gjjEc7DALvjuCwwHs8NM34QXV0EODqcSzsOVgZ5jikwoDY6ZCY3nu+UEswh WqvCdskAQJa3K5OUeOHiCDoEXAwmDXlG3a2gwmsRPEdamjr3jiVAXlI8ZBxqXVwtqZ9g 3dKLH5DW6NbJV/mZJ4BwqZWeFEqak3V1f5+SlA1K3fcmM69huALE0BwzHGA6iw/FekEf mdfOARIy95Lz4lshE8h5/EAFisey8IadIf/QFdjx0in+QgJa2FgkWhiKMLfNB8TF5+2o VoyzsNG2eCCD6Dh2/AXCSIkNeMM6l75N+0/cCZPp+SwbeVBKV+Kmck/BaO3Eqw/xG95V ndhQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org X-Gm-Message-State: ABuFfog4GtIlmRwGfdAAdsOAz88juwGkKueHkniPSNDbuaLwFfyk8FYE xqZ9R15258D51PYwdRXNtE6ZP6gv4CZU24IvV05dbn47+XypnYRZzGFTX7RWfBgirY9KF5y6lHL 1d0pehovig7u5OM8NGhvW6j61d1w39M7kErehO17kBeV6f7XcVql+hsuSQCz66BxkOg== X-Received: by 2002:a62:c8c3:: with SMTP id i64-v6mr16589503pfk.183.1538486769215; Tue, 02 Oct 2018 06:26:09 -0700 (PDT) X-Google-Smtp-Source: ACcGV61LBSAIL1DK+OhpFfQ1/FSaabhXaa8gBV33CMEhJlVG9ZMF2srfTsQuUm2UKUwIdHmimiam X-Received: by 2002:a62:c8c3:: with SMTP id i64-v6mr16589454pfk.183.1538486768420; Tue, 02 Oct 2018 06:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538486768; cv=none; d=google.com; s=arc-20160816; b=Ul0KU+vZbt9z7rdEXOr6axEJYmQTbOl/nmiRSaBLQWmVMP7kwuOsd7u5u5zhH2R+FJ k1P9JjAvTYGMAR4Unag/XOz3NVTo1lAq0vPusg0av785kZaXPnEAPCZpfSnAeBu3vp/T 1szGcB2TptNNMXHsDDtbWAwqG0k8aJXfOauO7l9dr91pJZO/NT9MKqsK6bDiVumEMbx+ k4zRQzFbk/A7cDgwo4OjsEdPEpfsOPZ5sizGn91IuT4m1S3/apjrjz+iZ68lk/GOzaue VqDYpmd3uNDf1kP3JV667fHo+qOcUEYtIxReN6i1f52EAM0IhzN3PIas9b0BHixMkvwM Sfow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from; bh=fpXHLmMxtDGoLT8cRornc4FOXhWYAbPZmVe1mwaR4Hc=; b=nu7loRKXuPzyAozWx16XAQWwzWqquSTC2i7hPJ6JUjSQjoTW/xfepn6g0251CM0Gdp CCLIheON+/0rEfGkAmVRVs65CU39J+bFZWOMh5V57+hSydN+m697yiHY9LvquEolhkZ1 lAaYWahTWykgXGy9H2dxz3N5WJ6qyOWZeFGooTBQ94PoqOB80BfbU67oiESxo8NlEMhP mE5kzcT32WcxPBopmy5QvrvoyQMJcrqv0Jr61zHn32MXtyLUhP81baeElWSAdZAY0dkY 6yFuqZNVRIztSKw/2aSsCYjg+UfzYDSK2hCitQZw3qQO3YwB1ME7P7KNHsr/xlDsZh3E rU0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org. [140.211.169.12]) by mx.google.com with ESMTPS id 186-v6si3342230pfg.163.2018.10.02.06.26.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 06:26:08 -0700 (PDT) Received-SPF: pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) client-ip=140.211.169.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of gregkh@linuxfoundation.org designates 140.211.169.12 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Received: from localhost (24-104-73-23-ip-static.hfc.comcastbusiness.net [24.104.73.23]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 0837AB2F; Tue, 2 Oct 2018 13:26:08 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Williams , David Rientjes , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , Wei Yang , linux-mm@kvack.org, Ingo Molnar , Sasha Levin Subject: [PATCH 4.18 011/228] x86/numa_emulation: Fix emulated-to-physical node mapping Date: Tue, 2 Oct 2018 06:21:48 -0700 Message-Id: <20181002132459.789313286@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132459.032960735@linuxfoundation.org> References: <20181002132459.032960735@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 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 4.18-stable review patch. If anyone has any objections, please let me know. ------------------ 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 Signed-off-by: Greg Kroah-Hartman --- arch/x86/mm/numa_emulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -61,7 +61,7 @@ static int __init emu_setup_memblk(struc 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) {