From patchwork Mon Oct 8 18:30:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10631277 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 9D19214BD for ; Mon, 8 Oct 2018 18:33:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DDB12022C for ; Mon, 8 Oct 2018 18:33:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 60E9522AFC; Mon, 8 Oct 2018 18:33:29 +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 DD3822022C for ; Mon, 8 Oct 2018 18:33:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6555C6B0003; Mon, 8 Oct 2018 14:33:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5DF446B0006; Mon, 8 Oct 2018 14:33:27 -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 480586B0007; Mon, 8 Oct 2018 14:33:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by kanga.kvack.org (Postfix) with ESMTP id 06F5C6B0003 for ; Mon, 8 Oct 2018 14:33:27 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id s24-v6so17944174plp.12 for ; Mon, 08 Oct 2018 11:33:26 -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=UlOVD9MJwBOqO5lRmJR1Scj/J4jbbBL91b902jb2jdE=; b=W1pIW0IJOtzxPGMOhz6abIfkepP7B2+Knm2Z/ox5L+gOfmzhlC3HIGN6RRa7C3buFy 5L3s4c+tfJ7NW/+k+KBB5CMi4nHfh8VAaO2TVBtOnSYNq5/XmNxAYc7OWPLY8mj9XKTT hS8XfUwJfthERLK0zBjrn+fXkUx0bt+DgH0UWNpKEiAgoW3wuNR36cyTe/eV/Np4jZgL sVNkajDX8EjYAR1F2Zpv+xfjyaI0g9NUHZ219T/l366wvrjaQKl9XGtafYeL61df/eN9 41W6g65bwGuzOUXGnxVAjVjoY2GtWjOSR6ccZBUNExvJyQ78lyy2UMOZ4XflHuvw+Hbx tvnw== X-Gm-Message-State: ABuFfoh5sYE4VvJNi97QlLKxfhn1gnG8QFO447OrAqrGhnfWeRZXgKHq n/nZAJaRo5SRg8WJqZC5coGUmkJZMNYUY1yIghj57YQ8tER7AvNRU6fqBjgEeIJa11kVUI5x759 /sWJznrDB86r6vIjEeOxaWZDvA0K9aqL5c2cc/7hUAO/E+JD6umRKUAreVj6xXlo= X-Received: by 2002:a62:f20f:: with SMTP id m15-v6mr25991924pfh.244.1539023606697; Mon, 08 Oct 2018 11:33:26 -0700 (PDT) X-Google-Smtp-Source: ACcGV62sRBW51QD0IRpXeTHLvwMxxgUKtRsHya4nI1sFbrfZDie1k+gY2ET5Q3tHWJXQJCU5z4ey X-Received: by 2002:a62:f20f:: with SMTP id m15-v6mr25991866pfh.244.1539023605749; Mon, 08 Oct 2018 11:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539023605; cv=none; d=google.com; s=arc-20160816; b=H1R5ZKLjrCz7hA8k/JgU6H01Sz/bCb2Ubn6aKouU8IYBP5u+FpxuzdPVgDPmT70Wd1 LhQFgl0CXOkEVHQCNu1I9uqR3S1m7QBP9F3gCT70CyCcZS91DrlaelYyqpNg3sqXtLUd iar+ss+UTJACZGChfb4+1cxJvzwgQn3de1o7S/5UGtTxF++PdlaLqo6MpAG2fnePRxgM IH9cILuIIn2xqLejz+ewbLfA29RIeMnp/3cjynFohQLXV4eR8waCJIUBIfD9QgF4Jq/C Z7P8day//sfL4+/qGJ3e7mjHTeBjGiWPBcjfGUfWz85r9TEYp62wepbyO50KFJS3iD1a 7mUw== 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=UlOVD9MJwBOqO5lRmJR1Scj/J4jbbBL91b902jb2jdE=; b=D3X6rDkBeqi19xGUm59Hxxd8v17nE72U4AUy7dQCqD0ydbYruteBFcQ7i1P4QimwEg tzAPVfUAA4fPosp+Yv0nQ3z8VzaoJn0XbK4zTcfdFBcaNaTFQwBzI3SJHF1z6E4leok+ Z2WyM1NwtkS+GBTa26mYZRUMVrU/L3xwj5v+x/DZLaIbqPqNhMqeULULfARPfNgj5RLf qixTZ3onLIHBDM/2d3j2C9uj20H3TGMLQRc5XXZRhAPyNKQBcB6PUMi6UeFb7PXInerA GXwqFaXGC+FM6r1bMcu1IsJi3AFZpoD/h7e17y0wWF/VZqHfhrXMYmMZw3Bdh+71Ho5f yLXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="PmzUe8F/"; spf=pass (google.com: domain of srs0=urq0=mu=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=uRq0=MU=linuxfoundation.org=gregkh@kernel.org" Received: from mail.kernel.org (mail.kernel.org. [198.145.29.99]) by mx.google.com with ESMTPS id g187-v6si17015877pgc.151.2018.10.08.11.33.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Oct 2018 11:33:25 -0700 (PDT) Received-SPF: pass (google.com: domain of srs0=urq0=mu=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="PmzUe8F/"; spf=pass (google.com: domain of srs0=urq0=mu=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom="SRS0=uRq0=MU=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 A30E62087D; Mon, 8 Oct 2018 18:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1539023605; bh=4eNyM86cNy1epojnfZKgkHk7pyZQT2spd6sxBAprJ8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmzUe8F/qhkC6nCGCDiwB+8HuQZNBk79313n7rhnIVZZRq6sEmQVk6Gjk53buiTGo e/wGs0w5vq2k0F7ef4fMvXooOheNSL6C0PGlNDmf3O3KQtXQHFSeFAEfS+FqKBzoTO GbkeKZ7fiUxF0KO7guocdOmLRSZXmwadKF8zZXLQ= 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.4 004/113] x86/numa_emulation: Fix emulated-to-physical node mapping Date: Mon, 8 Oct 2018 20:30:05 +0200 Message-Id: <20181008175531.076044994@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181008175530.864641368@linuxfoundation.org> References: <20181008175530.864641368@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.4-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) {