From patchwork Tue Oct 2 13:23:26 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: 10623679 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 CF88F13BB for ; Tue, 2 Oct 2018 13:31:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D447828A4F for ; Tue, 2 Oct 2018 13:31:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D245A28992; Tue, 2 Oct 2018 13:31:40 +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 6192A28A64 for ; Tue, 2 Oct 2018 13:31:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C5C46B0273; Tue, 2 Oct 2018 09:31:39 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4A5C36B0275; Tue, 2 Oct 2018 09:31:39 -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 38DB46B0276; Tue, 2 Oct 2018 09:31:39 -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 EE0CF6B0273 for ; Tue, 2 Oct 2018 09:31:38 -0400 (EDT) Received: by mail-pl1-f199.google.com with SMTP id f17-v6so2062611plr.1 for ; Tue, 02 Oct 2018 06:31:38 -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=DEaXPIHICaGcxyEJsth1/KJ+OeyuysnGqFI/6MTFAaY=; b=XrHT0U5bGtrXvZHFV0c+4ekWEwmo2ad7Db6LxOvSTx42USHR2/dVRkYCtFw3zLXMvj e9y50XowgulxPHctJcJgXPYg4QLiHmeHcsBnCqvpyMme7EmMaWLH1oiirS8qugf7NZjG mXTFsvCHVGFhbaHqLuHCBKBz+IlwXNHjsuG6QzXTdCdjaVmtNujlkeLroCJqiIEfLLKv yVlC2ChLfBPT2U0eXWVJLI9lpun+mO29x1ohSXifo2WXB+P5GTGUY7wfPZZ/p8jkXsST a3pnA/R5+DN//ofar2VFsMxpvZ/CORoFtobCDLe5ivbWDf3JbrNbwsB+HxLlrT0Yx6qZ 0i8Q== 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: ABuFfohzb89xShV9bqtg0cXU5EhsRPNWZy/cYlpnUKZEX81u25Ts5d3y 5ckGrlmXDQfSSoa97+BCACJXv++lMyD+NfEiG89wji1JtqXBGaMC+n0MArLgzdByCWHNmq5ht/g 7j5S+j87XjoOTx/olcJEsLfJoVUGqr+0zoAv8neu7RBxs3ITml9WZy2zaM+VZ0hJywA== X-Received: by 2002:a62:69c9:: with SMTP id e192-v6mr16316228pfc.35.1538487098659; Tue, 02 Oct 2018 06:31:38 -0700 (PDT) X-Google-Smtp-Source: ACcGV61DNz35uqVas/IyVQn5dvzAzF/vfVHpkUJF7/VuP2YTQVIrxRYtlncryOo6XUwkhE2hfJLb X-Received: by 2002:a62:69c9:: with SMTP id e192-v6mr16316164pfc.35.1538487097827; Tue, 02 Oct 2018 06:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538487097; cv=none; d=google.com; s=arc-20160816; b=b5C6ySuGzehowVE9Psn1yJmU3iVM6aq06u79FKd1vLikwGe8Oln7jXzftwZGhqLb+M 0af+AY+RJ2NS0O4pJxUq3ggpLO4ixZj4VtlgmNEfZH/ZS5uoCYM8q4AjAIfGGhamReNY FrWoBDrEm/LnXd8t950eOjJpT92517seaVpXl0UygvvuFbGiLNZjQ9YbaP9TzJR51dw3 BRhBJ6xmn7H8/cu0hxkcl3ixIDHyN9H83yeCtubzgeH/xBF6cgjwi5vxJrw1b80xWphL CyRh9HEnhOXdBUgBCb0lMHQN6ri3ADaCCnwRrG7X5fB39698cyenNsufBhzmqXHZpswd nRNA== 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=DEaXPIHICaGcxyEJsth1/KJ+OeyuysnGqFI/6MTFAaY=; b=geMdtMmc1aZ12qJ4+AQmLSCQsngMGsXsQy34CqW+kiTxDjHPtYoEIQEhk8GF53BEkf 7DJHZlPY1HwPbGHgIvJtSvpMCFckVwn3PsIBwP3nOiyDdAHH+3/J4sG04vbUeG9+N6G1 yz+uFv11SAOoYv0IF/oxSpmGop7kW2LH4mzrk3u0c2RAd8WVKoyVVn67g0v30pEfX9kN NYJ5x1BkpumjGJ1ms/XuoS8iCmwSc+GFReIRXmoRGPrV0x7RnyrPkkchS4iEGugO/fbh vErD9quwoszdFb8LXWSLN2Oknlpsi0wMm5lP2oz2lkeIe2O6L+1Q//64TSfIXaJk8Q9I 1ppQ== 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 c8-v6si14807466pgh.418.2018.10.02.06.31.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 06:31:37 -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 684CCC47; Tue, 2 Oct 2018 13:31:37 +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.14 005/137] x86/numa_emulation: Fix emulated-to-physical node mapping Date: Tue, 2 Oct 2018 06:23:26 -0700 Message-Id: <20181002132458.779929451@linuxfoundation.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002132458.446916963@linuxfoundation.org> References: <20181002132458.446916963@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.14-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) {