From patchwork Tue Jul 23 06:41:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13739443 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 F3AF1C3DA49 for ; Tue, 23 Jul 2024 06:45:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 855A96B00AE; Tue, 23 Jul 2024 02:45:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DE846B00AF; Tue, 23 Jul 2024 02:45:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 631666B00B0; Tue, 23 Jul 2024 02:45:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3ED6F6B00AE for ; Tue, 23 Jul 2024 02:45:15 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id F0E2AA5AA5 for ; Tue, 23 Jul 2024 06:45:14 +0000 (UTC) X-FDA: 82370080548.21.E800F2D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 5237E1C001F for ; Tue, 23 Jul 2024 06:45:13 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sy8Le62C; spf=pass (imf18.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721717090; a=rsa-sha256; cv=none; b=UifULmNHgoORf6ysRJ6kVj/LUFhiYAotX5OcPJRumht7QNk/K6dFO9IgLHGeWb3SO+l2wl nBzDsZQ7rDyXxAG58h1NOSWR2GkHT1lNmgXbdTCkFRGPypFOtOQdFdm6sakww1Ee3DvewE uyEFns0sqQEI3Eo4NCFVfPwwEfcvQZQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sy8Le62C; spf=pass (imf18.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721717090; 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=2EmLMS5bC2gO+A4kRuSt5h5bNKzXmA/Er2Ig9EwWhxU=; b=tizgb2zu1+k7A2d5kyXl8EnfdqL/C4bcQrKJCtJ1Y2kM55rxJ++fS+8INTVb0cY4AshjU/ vD3UhskBicdFbYcyT7z5ceuTJ7xeUfpCLhi4n8aB3dB0rs/tHSSgDDN8ArQpTfM7TGUep/ i8vrg6mejif4OplL6aSVdwMlPHyxo0I= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 91FD260D2C; Tue, 23 Jul 2024 06:45:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BD2FC4AF09; Tue, 23 Jul 2024 06:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721717112; bh=NBS9sSELyDjXskLupWw1+sILSG3bb7AMsfQy1q7g6+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sy8Le62C0nSfYONzB5OqQtNVljQMOYCPxcj7s7rvy33s/FViYPWZhd2aXVmEOcluJ u5vJVlIgA5Z4zITDTVOT7CGOd5Rsl3raVSCCorRFuqlBEfq6cETpxEcJwIEoZrNJGw NMy+YX46uk98KS2sWFmufuZU03pF+oo+7txOWNcvH8ragojRdlr1a+5eEVnj1Mhi6B fl3/Err2rFg8lRV6hnME3wQhyBWGHzcxR9qZMxsOLF5GpdHxF/6i460+2L+cwghg+Q ZihtUIdEY4Bbh6svDmFpTm9x6NPbCucKFfd1WWOViYNGNL79W3VYlty98npK9T9rtA HoIXU79EZnyfg== 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" , Davidlohr Bueso , Greg Kroah-Hartman , Heiko Carstens , Huacai Chen , Ingo Molnar , Jiaxun Yang , John Paul Adrian Glaubitz , Jonathan Cameron , Jonathan Corbet , Michael Ellerman , Mike Rapoport , Palmer Dabbelt , "Rafael J. Wysocki" , Rob Herring , Samuel Holland , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Will Deacon , Zi Yan , devicetree@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-cxl@vger.kernel.org, linux-doc@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, nvdimm@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org, Jonathan Cameron Subject: [PATCH v2 15/25] x86/numa_emu: use a helper function to get MAX_DMA32_PFN Date: Tue, 23 Jul 2024 09:41:46 +0300 Message-ID: <20240723064156.4009477-16-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240723064156.4009477-1-rppt@kernel.org> References: <20240723064156.4009477-1-rppt@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 69odf5rb5kri6qb65sndonpwe4ihoopn X-Rspamd-Queue-Id: 5237E1C001F X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1721717113-8290 X-HE-Meta: U2FsdGVkX19stZHrEZESgCsEl9I68CmevPW/aSukCfGlKPo4HcEMihVzzlka9VtaLga6288QfRqalvH5CO/GW+dq/AN35liquq/s8x6ZkQxDVi0vfW4WrgDf3gGE+IsQ+8ztmboDEtdpYfc0oyevaSQm/blvfX7MPLSSmh+CIQjT2y3m04TQFQ24U+xyrE0i1Gy1ftebUMN1ZpyJ4fYnFOfAI59phD+k/2yTJCH4prFTjBebI3HVUnBWWkGsTNXu2owRwbfOfJLIcwKKxzz9SZStMdHpM64YYHmLjYopITylqrsEnPS7N7MV8zUTNDcm9E+tlCgD98cVpuhMAimCff7gidpJMTJ9L0BJIUxIyYl8VOkTIeQlY103oEfWvV6wOqJjhAb//XjYPJdLyRPVgsNDid7RgqE2kbfZg6vA/P1G3GQSl9eBU4eyR540LF2Jrtbz1ifoPEOMVMk/OFYQWCDW8U/eoBpLOmhuk4uspcK/PIP+Ucmznx9yVJ8zKGj56rDI0geTPHTDN0NtdBtERtJtloQPr6dGMnf8meb+sy7QOyjX83htCenj2K5buOW/5gqM1dFnc2gQVu+FkZBk8KOl2sGSpG7rHwOPKBwTZdgu5wQ1tNlr5G8BfmWvP8k/0BEnP34Pk5QRum9smyDFbZ+hAuPAGepLX9Io6iHFKdtXYK6aU8Ztsb6drk141RS31RyuWUadKBuYlfWVRmMp10o5LvP52Na8hxfWPeoe2toZEcJKb4+Jrv3UM7B8pxor9WN1i+QaRIxZSTvH67ygbDIpwiDL7rv5oOUd2dQ3AtGPLjEKx94ZtETCrbKkqsj45wZs77JkXuM7nsS3xSgPK37Tf0fe2kBu6Fyu81vewP/t9KwVvRAtQbjxE7Idf1+LPT4cSuGgNxMaKeWtzWGzvdtJeT5NWMU50FiZbqctpKYFg6v1mSqgy7fVAmfUQJyiMRZh4Iu11AQ03pVt0oJ uElBoyHd V8cG8vc4tL4YSjQHb4W0bNv4uNQca0Dr4f8gM0Mw9Il4HSgk1HdeYUNS7RoS3sGIxMmQAlTd5LOFAiuBvfoeT1GVEaYZvNG+99o5OhKwR2c19H+IB8L4Vef6UksBiA0QPjnh0cdRopQuX6PqCEzTlzQ47EFd8oMIqh3LlPLedGZ1xVeGemxWsTWF0d7EqQnf6p8aofC/cSXSEKumhXj6gSLviJjBnrS7jJiFaADB1FKnfUj+EnYnlrK7z/eOS8pq/eT15rINegKTbiJvfweg9XpH1XFojAhOm+itMFF+gvkNE457iYBTXFoHNEZCJVKroIfjwAPKGxs0h+qKYRTFLe4eKMmoCFibu9T+r 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 so 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 9180d524cfe4..8b7c6580d268 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@ -868,6 +868,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;