From patchwork Tue Jul 16 11:13:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13734337 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA0DCC3DA49 for ; Tue, 16 Jul 2024 11:15:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 27E0B6B00A3; Tue, 16 Jul 2024 07:15:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 22CC26B00A4; Tue, 16 Jul 2024 07:15:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0CDAE6B00A5; Tue, 16 Jul 2024 07:15:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DDBA46B00A3 for ; Tue, 16 Jul 2024 07:15:50 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9BA9CA0FF2 for ; Tue, 16 Jul 2024 11:15:50 +0000 (UTC) X-FDA: 82345360860.11.F7A1207 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf09.hostedemail.com (Postfix) with ESMTP id D272C14000A for ; Tue, 16 Jul 2024 11:15:48 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=aUg6c6D0; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721128517; a=rsa-sha256; cv=none; b=ncwegf+lFAsBjxfQ1VuyiRRW6k24RjhY5xjCOuw5h6catD2iEcf0eOzmEbEY2jQlGPOh3t SEtcGRNB+3BLylTM4Q30XemnG34NU1bdxSYj4aySZK9pHHAFJq9+9VN23968E3RskYKXAQ kkySlxp4PgQ3UxD8Wd4YHcaDIwH4ASg= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=aUg6c6D0; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf09.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721128517; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=WM3+3K2HURRB4LS7nhsTxW1sAjVNg46Hs+3r1H+lfbc=; b=By6kiyoAqZwjVIV9igAXrD/o8V72GjITgBc5TE9W+mCAVvwbVRfiepRelOeHE0tuaZ+7UZ kjPVwhOeyd7Q1AsWMa9n2UDZVdyvJpOcE4GzQn8+n7f6uMChtPOO1GXW+7cermqoaSUMmO pJBByzXqE0NNl3m+1tQHfXPNjth9/D4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id F10CD6108C; Tue, 16 Jul 2024 11:15:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17FC9C4AF0F; Tue, 16 Jul 2024 11:15:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721128547; bh=ym0kawqEGV0FNmvOsYm3DWOKfdlDmSXOdSkjneozt3M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aUg6c6D0pXxFYfxdCla0UlGGSb+fzaMJ98PhtEuPZ4xlpOrwMZNzxrunxPvcfDdc7 NXufJhNRBO67I6yVAwRrB24yf+HtAH8pnnvS0xcP/IRbHEWL7yqiHMbLPL3az/7dke kLw1+nQiaSDwkyvjoNw2D0R3dN+SnBi06HG1s3TOoOvNCDUXV5ucaNQK1Kbys49hx6 /juYk12sHgDnrQrIMEwtmEumKOES0H1okVRE5+R168aRmF+qYQ4ppw/Kfra4PrNfW3 YhaZIeYTe6w4tK9Ox3H4968ZbRGp43kkC7vp81Gd13qPzugi8VN9tKHerIr0CKBuPG CUc4ZCR6v33eg== From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Andreas Larsson , Andrew Morton , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christophe Leroy , Dan Williams , Dave Hansen , David Hildenbrand , "David S. Miller" , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Michael Ellerman , Mike Rapoport , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-acpi@vger.kernel.org, linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev, devicetree@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH 10/17] x86/numa_emu: use a helper function to get MAX_DMA32_PFN Date: Tue, 16 Jul 2024 14:13:39 +0300 Message-ID: <20240716111346.3676969-11-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716111346.3676969-1-rppt@kernel.org> References: <20240716111346.3676969-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: D272C14000A X-Stat-Signature: d1gtyixdzt856i6id9pg75hfpw3myn43 X-Rspam-User: X-HE-Tag: 1721128548-877932 X-HE-Meta: U2FsdGVkX1/ge6abe4bS/zBMDNu+onqSF65pv4L7IIHbnuHhNHXARaIJGOgT7r9XXSg/5QYFM380M4Fr5up4zYmIzo4y1Y/RgNHNizZ88gtxl0IFjkf2FLVbkZ6jl1Sp7wFqzvjkvRATmTY+aK/GDTQ91Yumtm6n4frmNcGKL97zg8/mE7hUos2UJC0uTzjVVPpmaxmgB1znkd7ZdR5dMUpRRRkg8v0dEdJ5ez0YfBES3f/CsCYfSh09ZVWJuC2V1tC2bRFn7BerWd89rQgNhW5i3jNewuB+tUE6AIjuR8JgoIWO9ra7qb90GWaLp4glFFEvK7bjGeSL1KmfBq2j67ODn7qAbhDF4HI0fa37b888IGnrE3hbdVLZOG98sMHQwqVHPAVpN+tVt69kaHqKj54gdaWVnt6/00CPvMIU3H2KbNP1vYfSAVMzUy1DT8MsoPaF9qfY5MmZS/tZFl/74WnTpKRbKKvYwHgiQrIfNuNXpJ5EqrWlnRiYPmSsXyPEPJQfdcOy1db/uJC45HIi/CKQFknAraagxPK9PVE23tpRmy/6/He3YkdjnCqAfATjCykJNibT/Es4YxTyPCyyEbH3wG7Gtb5H0Z8AsQQUqh5bAHFPBNutLDI5uJAXzyKHj+Xlv5w3uvvJuIp6uQ16u22Y85TwyfXXDzzpVX6/tbtFR88PxZFbck7BW6jFCphW0mnLjkdP+yke5Elm6n8BKc/MPvCd+U9ff3ekJuWyaVF4Kimb03jkJ4Un+zlfAWN2bDGYzctx/QtLqc2Jg9hfoX33HkQc/dz7USnbYll6SG7gegRcHx+B9JhxY9a6dMcxe3uuJm+XyELCiXar4tscj8DIt3+4vEx6VzQqRsPD1X9dPWXbNASaCgAfcOO4YOVA7Lc476LNCHecUvTkffD+vh3MY2Nb7A9SxrZrbxNovTRUk8iOCqcDSkNF1XlZlyuVWD7iSTrQzE16syu5uq0 bp8M4Fkv PEjr7hHlL5/SurZJ+U9muckbMZeuTn0pfKLUMaDqBj9hNQW7k/qenpF6lwbpKazpVqnfpc0IGw41nqvk8JfXtivHvUjpjix37MsepWqmYQx3ERtxGgIquUK0E257jh/Nqyu5QJ9tS6rrAli5Q9vuxTt+Elw+uBmw77eq3ArDzzWfaegHrvK1PvFC301h9Yuas6HtZpZa7ERLXej8OKxQ+tGvUG9AdyDyh0o9t2Aa1jXMS8+3894KjtE+HmUyGuO+5MtAIMxkRpK0JF0xslAY2SjmHVy+3sKNhTqF9 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: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" This is required to make numa emulation code architecture independent s that it can be moved to generic code in following commits. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Jonathan Cameron --- arch/x86/include/asm/numa.h | 1 + arch/x86/mm/numa.c | 5 +++++ arch/x86/mm/numa_emulation.c | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/numa.h b/arch/x86/include/asm/numa.h index 7017d540894a..b22c85c1ef18 100644 --- a/arch/x86/include/asm/numa.h +++ b/arch/x86/include/asm/numa.h @@ -74,6 +74,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable); int numa_emu_cmdline(char *str); void __init numa_emu_update_cpu_to_node(int *emu_nid_to_phys, unsigned int nr_emu_nids); +u64 __init numa_emu_dma_end(void); #else /* CONFIG_NUMA_EMU */ static inline int numa_emu_cmdline(char *str) { diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 1320d776caed..0a59e3ceecda 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -872,6 +872,11 @@ void __init numa_emu_update_cpu_to_node(int *emu_nid_to_phys, __apicid_to_node[i] = j < nr_emu_nids ? j : 0; } } + +u64 __init numa_emu_dma_end(void) +{ + return PFN_PHYS(MAX_DMA32_PFN); +} #endif /* CONFIG_NUMA_EMU */ #ifdef CONFIG_NUMA_KEEP_MEMINFO diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c index f2746e52ab93..fb4814497446 100644 --- a/arch/x86/mm/numa_emulation.c +++ b/arch/x86/mm/numa_emulation.c @@ -128,7 +128,7 @@ static int __init split_nodes_interleave(struct numa_meminfo *ei, */ while (!nodes_empty(physnode_mask)) { for_each_node_mask(i, physnode_mask) { - u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN); + u64 dma32_end = numa_emu_dma_end(); u64 start, limit, end; int phys_blk; @@ -275,7 +275,7 @@ static int __init split_nodes_size_interleave_uniform(struct numa_meminfo *ei, */ while (!nodes_empty(physnode_mask)) { for_each_node_mask(i, physnode_mask) { - u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN); + u64 dma32_end = numa_emu_dma_end(); u64 start, limit, end; int phys_blk;