From patchwork Thu Oct 11 15:33:23 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: 10636943 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 8EF0F17E1 for ; Thu, 11 Oct 2018 15:37:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C1B12BAEF for ; Thu, 11 Oct 2018 15:37:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 700292BAE6; Thu, 11 Oct 2018 15:37:27 +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,DKIM_SIGNED, DKIM_VALID,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 F2B0C2BADD for ; Thu, 11 Oct 2018 15:37:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6DC16B0005; Thu, 11 Oct 2018 11:37:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CF48C6B0006; Thu, 11 Oct 2018 11:37:25 -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 B95376B02B0; Thu, 11 Oct 2018 11:37:25 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 76DA26B0006 for ; Thu, 11 Oct 2018 11:37:25 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id f59-v6so6600028plb.5 for ; Thu, 11 Oct 2018 08:37:25 -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:date :message-id:in-reply-to:references:user-agent:mime-version :content-transfer-encoding; bh=Pg5NXMIH7muKfl9nYyu8wHmIoW9Hp2E3VEG8tTlIPRQ=; b=Dkjpr7rf/fQYVqQ21GiNJb+hGCeHWkbnOWtedVVDpbBn+5ngmvtXl6x9YdG0wabPcA FfWwZB8PNcweA8Cx43rQ2wMioPWO0aDROm0qMkJ5aYl1e4kxO80Bw/zdtuVZdVUfguyX Zvo8cj8Q/n3+o5BLmL3pjEXCVz66Y/I5LxTcQbxBKZol5SwMCVMFvmNknFJVzU3xMooh Ti0UfI6lWamGeRI4cQMLTv3XwEzauwHOzp66VkzX03cqngnioPyqJOsUMvPk+dtWWyuX XB/vdekad4C+wMaUlJhx7Yk5EdBzjEV6KhhYXL1uxP6U36yw0mEKyhRDmkxrGtdjIOo0 OU4Q== X-Gm-Message-State: ABuFfoiDxTZfsqep29ox/4/JbknQuUMf+KLIS2lUbxSUDXAoAWqhy/d8 oTwNMSxbRjbQsukIXI4tR0m4aopdh0RNe3zEXTIff0uZburV0GmtqT8RPzUI6pJcyMWZbfBNmPu HnS8J9tne3Th2iMyfJVT2ZGnnd/YSUIrUdsM2N/4nfFSgV8A9x40RXp5FusxO5Pw= X-Received: by 2002:a63:80c6:: with SMTP id j189-v6mr1947036pgd.40.1539272245155; Thu, 11 Oct 2018 08:37:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV62psJRSuTjZ77uDBoE/zFsM7Mk4N0UDtupt02uUsvD35LVkIIrHEIEszEiAvlpF5epDzMCL X-Received: by 2002:a63:80c6:: with SMTP id j189-v6mr1946989pgd.40.1539272244010; Thu, 11 Oct 2018 08:37:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539272243; cv=none; d=google.com; s=arc-20160816; b=rts/9CkvEKtHP1c1U3xWOWkbeOdOoTA6PRqt1RFAPozEoMSdBPr5722uchv798A/ku 7Bsmyjry+KwpwdqC8eKXmM34sCX8K9gPG+jzfnmS/CpGz/czKJo2kGib3f6eui5SfvTh UKceJUf4HWLV55o048BVwMXWaBTus/DCdfw92APfAvItciRiCP3s9gM7w93BT3oFsDiP Xmu5c3kPFdTbv0dDhPVfXO19MKAlXLlHp5rft8c8raCWrM5hmB6hVPMFgyh9xPSBfVeU hSvvIG3ZJtxfOzddY4NeZZ9NclJz7pV2+hqMqB3eWBly4Pv4nDdhewsqIc3ryZmCXo4D RDrA== 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:dkim-signature; bh=Pg5NXMIH7muKfl9nYyu8wHmIoW9Hp2E3VEG8tTlIPRQ=; b=WZA+pweyA6yGE0cK2t2sp6M/VeJATRh7xpZL7TYdYfzWz38hXH6qcayl0SZzaid7U0 DsXlV8VaUtWqRRkyLttvIBkVIPZA/U2vLpw1K8TuqBgYYtyh9AkrucCftOJqNdOEOBxo p71o9DLq/9GdF13eKmZKddjbInXV/plSOhnhY2dP8MSa/rgSJFMA8P9BSO8Y6DuNbDUz r5OIJAHFM8AV3w0yA5vvktXstd7FgGdxBQtf31fUYD46VFk77cwm3q1SauQU6OFy4OOn Qd5cbZwaoz48TgKXFgaWPnmUEBkTkLgtOk+38+ie+bTuHDb72b/xM2yuCDhhuzflGJ2H x6LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wFwFCiC4; spf=pass (google.com: domain of srs0=4o5/=mx=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=4O5/=MX=linuxfoundation.org=gregkh@kernel.org" Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id p12-v6si28549123pfj.244.2018.10.11.08.37.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Oct 2018 08:37:23 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=4o5/=mx=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wFwFCiC4; spf=pass (google.com: domain of srs0=4o5/=mx=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=4O5/=MX=linuxfoundation.org=gregkh@kernel.org" Received: from localhost (ip-213-127-77-176.ip.prioritytelecom.net [213.127.77.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F1B7020652; Thu, 11 Oct 2018 15:37:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539272243; bh=dMBNt8Jg1tBiikeCgCd9igqAsKxMwJ3CbEVjxQvoKM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wFwFCiC4JZLo/rrwuTrCnJiEA7smkju9Rrn0YEzHiSjfn7++Nb+6Rej/3vgkpYqKb x49vM6WdekSNt5Exbd0REGh6J6JiUQo9YKoDFu8QhtTDj4McX3CLsZK3ODNpEY9TPe fJ8nS5X4KiB9UonOAdkuQKacrc3SvtU5MciAyCvQ= 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 3.18 022/120] x86/numa_emulation: Fix emulated-to-physical node mapping Date: Thu, 11 Oct 2018 17:33:23 +0200 Message-Id: <20181011152550.566280457@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181011152549.500488630@linuxfoundation.org> References: <20181011152549.500488630@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 3.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 @@ -60,7 +60,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) {