From patchwork Wed Oct 23 16:27:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13847502 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 CB288CFA44E for ; Wed, 23 Oct 2024 16:29:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 438126B0088; Wed, 23 Oct 2024 12:29:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C02E6B0089; Wed, 23 Oct 2024 12:29:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 212196B00A5; Wed, 23 Oct 2024 12:29:02 -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 0254D6B0088 for ; Wed, 23 Oct 2024 12:29:01 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id BFAE9A0CB2 for ; Wed, 23 Oct 2024 16:28:29 +0000 (UTC) X-FDA: 82705400862.15.7BBA847 Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf19.hostedemail.com (Postfix) with ESMTP id 676CC1A0016 for ; Wed, 23 Oct 2024 16:28:38 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IiFeeafB; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 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=1729700772; 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=BZgydcd83RnoD+nKZMyd/RhTFE33DpavMZJgDUUSvXs=; b=JGSW3lYVQtN3L/0Ny3PmJ1ggj6LK4Dx7qVXCYLwGuXP8MgZWy5Qyvax/eKUnTh2FT0PTKa RXd9tMtRFFPUir+KGVAAeHshgyELC9hjaryCUZ7JNoc2HH2EwWSMfSyfDuatLBq65o5bej rLzvDB/Bub2L9hg0QM8NY3cmJckIRes= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729700772; a=rsa-sha256; cv=none; b=7w7h4onmLbcr+utqKmA4RmZksEYuheHdGTocQeAd/Mj1GbJkkB1KeV4jqStQtewtVaS+86 WVrlopCWMdf1YE9YO8ehDiLRRPD6b5EbN1sYEWRDyo/sJuquK9onYLYIN/f4qrv4oV62Tj E2rOlgsZvopD6vU8aFvkyg4euBn6rvQ= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=IiFeeafB; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id C2671A43420; Wed, 23 Oct 2024 16:28:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC030C4CEEA; Wed, 23 Oct 2024 16:28:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729700938; bh=WkgLYLP14z9R0rX0arj7V8bSL3F01OjsGvulzgdJGig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IiFeeafB3NRoVAeVBviHseyoM42juLPWXAdhm7ufrL2maTLAnIohm/6mhkJlMvJfx eDLHET0+TzAnfxNuUnNvXwm+e3KPlOmfSQ/Y8Q3XLK5ZYEPZJDhUg2e3VX2j5lC7El zXxMilXQJ+Ff83lvU3th5yV3MRzHvxuZE+QqpDeT7qaAEqUbpjexyDTgaGqJH5IpKu PCfqrtFRlDZkd7zkFSBGBynjtpcJgNbGklm6P7OW+iDSX6GIb538OjsWHvGPu3X71Z u4oqjsGtC1QQA8ihFJa1sw37OIgFvMEPBD65b21tNDc50GwHsKf1RJWB8M5RLMLh0J H0RQDTjm4JP8w== From: Mike Rapoport To: Andrew Morton , Luis Chamberlain Cc: Andreas Larsson , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Christoph Hellwig , Christophe Leroy , Dave Hansen , Dinh Nguyen , Geert Uytterhoeven , Guo Ren , Helge Deller , Huacai Chen , Ingo Molnar , Johannes Berg , John Paul Adrian Glaubitz , Kent Overstreet , "Liam R. Howlett" , Mark Rutland , Masami Hiramatsu , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Oleg Nesterov , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Song Liu , Stafford Horne , Steven Rostedt , Suren Baghdasaryan , Thomas Bogendoerfer , Thomas Gleixner , Uladzislau Rezki , Vineet Gupta , Will Deacon , bpf@vger.kernel.org, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-trace-kernel@vger.kernel.org, linux-um@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, loongarch@lists.linux.dev, sparclinux@vger.kernel.org, x86@kernel.org Subject: [PATCH v7 5/8] arch: introduce set_direct_map_valid_noflush() Date: Wed, 23 Oct 2024 19:27:08 +0300 Message-ID: <20241023162711.2579610-6-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023162711.2579610-1-rppt@kernel.org> References: <20241023162711.2579610-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 676CC1A0016 X-Stat-Signature: 516jf89bd5o4bjm9u14hhow18d51sdg4 X-Rspam-User: X-HE-Tag: 1729700918-204767 X-HE-Meta: U2FsdGVkX1/Ro+eI7KGf1/nIyRD2jc3khZAHom62r+kjdmPLim/iDP0eL1C2sNNhsHn/HcY/bIy3l3T2UQ6q2B2kMSpFHIbJ51iBDnnChl1jT/2x4vL3DeuKzRryWQ7psgUGf88xf4spxUpUT/rTO0kUso6+voAeiYE54siqG7Nd94vzHHwR2sBZDw6xd2LlXrh/d0GlxfOUoRy68jvKIAg0XOvU4Cmo09IUhKmvXQYkArIWKRh8rmAOBvW90FbXMPWKH3CndmH4lUDbbzvcc/QGZPK4g+wgZ02O/n7192QGkeq1nSik88FuH5fe8YKhR7IgIKES44+5d8g51EJ0ZptwcLrI1PpjdUp0HcyUYONnlzO7O7hCNvZ0tjKlQ/7OLrr7H6Re36zpKnFIUb3vCC+A0LIAJ4aVHM3OR1vaspor3xGwsvrx+wGsrLGmiu4BUVugSvDdEMDyJZ+OqMfrDRFvg0Lk4Tb9OyJtgXCvG6cRYANMGfaCxrfI6h6QerDvoFIYVzEsM0qfWCmUKSldFWvPu/BlYVccJ6SH4HAWnxwTJiIIJxSl+jfIwV6HvCtdVPYj4rN5GxiKEo8xX0P/7FrCidwje0ojd9mJ6amCZG4OeCgdy6NjC0vfA9XMTzQl1P15nKgnknYIfAfMXRI+bHebRKZN5FbnnzZTjssJux5200Yna6DH+A4Wrf9UFyFVEFQhtC/DkrPxUBitMq75h5zTvRkqeBourorLogQ+nYxjT/FrluveXtru8MSJ8TXPrcxgPkuvQj4pjaDDGFOnAQr/YP90QnufK7VwNmN8GgBqjKSEBvjmDcdCPQlymJApoFEo/rrQms3B4ZYecYBNBmi8Ba5GPor0cuWZcYgk5yUif7uV2YhSaWoV+AChCrO9/pWmJx7wnQOOmwGxEGhatGzGI8VE5dqaVNh471zEBKwHzvmXIqZfbapDlNI7hNkwO8/dzXwYrk78GRtGXH9 Im/m3Zdq 8HQ9qBqltWmHGq7g+INqbkjfFfzxdyHyKvmJimYDPt8pJKHQKpL4s1bAYzb+aGZemWm0fldImI/kZxSY41fcZSnLFGVRKIzjyrXCrBLIu69HEeh87RJacD3s/L9stEDTj/vRk3j3N8mORO9zQXWeyWAYpgaNLinenQayTRaJDLl2E/Y56Ob2kpL/PsNH1zfvYhntLVsJgqZ1dCldCmrCsA6/4nrQt4cGhidtnl0N4zPU0ql9hsgovCE4XNyA8VodHC7J6V+J5Bik8SMRZDnhH53COxavFVTZVS+hhcdiA/S1mN0Vi8K0PvfPmAxdXyc99fbv+MfaSkodR99JRV7mnEAI8ijK8UnURCDKdeyZbGmHR7Wg= 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)" Add an API that will allow updates of the direct/linear map for a set of physically contiguous pages. It will be used in the following patches. Signed-off-by: Mike Rapoport (Microsoft) Reviewed-by: Christoph Hellwig Reviewed-by: Luis Chamberlain Tested-by: kdevops --- arch/arm64/include/asm/set_memory.h | 1 + arch/arm64/mm/pageattr.c | 10 ++++++++++ arch/loongarch/include/asm/set_memory.h | 1 + arch/loongarch/mm/pageattr.c | 19 +++++++++++++++++++ arch/riscv/include/asm/set_memory.h | 1 + arch/riscv/mm/pageattr.c | 15 +++++++++++++++ arch/s390/include/asm/set_memory.h | 1 + arch/s390/mm/pageattr.c | 11 +++++++++++ arch/x86/include/asm/set_memory.h | 1 + arch/x86/mm/pat/set_memory.c | 8 ++++++++ include/linux/set_memory.h | 6 ++++++ 11 files changed, 74 insertions(+) diff --git a/arch/arm64/include/asm/set_memory.h b/arch/arm64/include/asm/set_memory.h index 917761feeffd..98088c043606 100644 --- a/arch/arm64/include/asm/set_memory.h +++ b/arch/arm64/include/asm/set_memory.h @@ -13,6 +13,7 @@ int set_memory_valid(unsigned long addr, int numpages, int enable); int set_direct_map_invalid_noflush(struct page *page); int set_direct_map_default_noflush(struct page *page); +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid); bool kernel_page_present(struct page *page); #endif /* _ASM_ARM64_SET_MEMORY_H */ diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c index 0e270a1c51e6..01225900293a 100644 --- a/arch/arm64/mm/pageattr.c +++ b/arch/arm64/mm/pageattr.c @@ -192,6 +192,16 @@ int set_direct_map_default_noflush(struct page *page) PAGE_SIZE, change_page_range, &data); } +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) +{ + unsigned long addr = (unsigned long)page_address(page); + + if (!can_set_direct_map()) + return 0; + + return set_memory_valid(addr, nr, valid); +} + #ifdef CONFIG_DEBUG_PAGEALLOC void __kernel_map_pages(struct page *page, int numpages, int enable) { diff --git a/arch/loongarch/include/asm/set_memory.h b/arch/loongarch/include/asm/set_memory.h index d70505b6676c..55dfaefd02c8 100644 --- a/arch/loongarch/include/asm/set_memory.h +++ b/arch/loongarch/include/asm/set_memory.h @@ -17,5 +17,6 @@ int set_memory_rw(unsigned long addr, int numpages); bool kernel_page_present(struct page *page); int set_direct_map_default_noflush(struct page *page); int set_direct_map_invalid_noflush(struct page *page); +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid); #endif /* _ASM_LOONGARCH_SET_MEMORY_H */ diff --git a/arch/loongarch/mm/pageattr.c b/arch/loongarch/mm/pageattr.c index ffd8d76021d4..bf8678248444 100644 --- a/arch/loongarch/mm/pageattr.c +++ b/arch/loongarch/mm/pageattr.c @@ -216,3 +216,22 @@ int set_direct_map_invalid_noflush(struct page *page) return __set_memory(addr, 1, __pgprot(0), __pgprot(_PAGE_PRESENT | _PAGE_VALID)); } + +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) +{ + unsigned long addr = (unsigned long)page_address(page); + pgprot_t set, clear; + + if (addr < vm_map_base) + return 0; + + if (valid) { + set = PAGE_KERNEL; + clear = __pgprot(0); + } else { + set = __pgprot(0); + clear = __pgprot(_PAGE_PRESENT | _PAGE_VALID); + } + + return __set_memory(addr, 1, set, clear); +} diff --git a/arch/riscv/include/asm/set_memory.h b/arch/riscv/include/asm/set_memory.h index ab92fc84e1fc..ea263d3683ef 100644 --- a/arch/riscv/include/asm/set_memory.h +++ b/arch/riscv/include/asm/set_memory.h @@ -42,6 +42,7 @@ static inline int set_kernel_memory(char *startp, char *endp, int set_direct_map_invalid_noflush(struct page *page); int set_direct_map_default_noflush(struct page *page); +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid); bool kernel_page_present(struct page *page); #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/mm/pageattr.c b/arch/riscv/mm/pageattr.c index 271d01a5ba4d..d815448758a1 100644 --- a/arch/riscv/mm/pageattr.c +++ b/arch/riscv/mm/pageattr.c @@ -386,6 +386,21 @@ int set_direct_map_default_noflush(struct page *page) PAGE_KERNEL, __pgprot(_PAGE_EXEC)); } +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) +{ + pgprot_t set, clear; + + if (valid) { + set = PAGE_KERNEL; + clear = __pgprot(_PAGE_EXEC); + } else { + set = __pgprot(0); + clear = __pgprot(_PAGE_PRESENT); + } + + return __set_memory((unsigned long)page_address(page), nr, set, clear); +} + #ifdef CONFIG_DEBUG_PAGEALLOC static int debug_pagealloc_set_page(pte_t *pte, unsigned long addr, void *data) { diff --git a/arch/s390/include/asm/set_memory.h b/arch/s390/include/asm/set_memory.h index 06fbabe2f66c..240bcfbdcdce 100644 --- a/arch/s390/include/asm/set_memory.h +++ b/arch/s390/include/asm/set_memory.h @@ -62,5 +62,6 @@ __SET_MEMORY_FUNC(set_memory_4k, SET_MEMORY_4K) int set_direct_map_invalid_noflush(struct page *page); int set_direct_map_default_noflush(struct page *page); +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid); #endif diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 5f805ad42d4c..4c7ee74aa130 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c @@ -406,6 +406,17 @@ int set_direct_map_default_noflush(struct page *page) return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_DEF); } +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) +{ + unsigned long flags; + + if (valid) + flags = SET_MEMORY_DEF; + else + flags = SET_MEMORY_INV; + + return __set_memory((unsigned long)page_to_virt(page), nr, flags); +} #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE) static void ipte_range(pte_t *pte, unsigned long address, int nr) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 4b2abce2e3e7..cc62ef70ccc0 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -89,6 +89,7 @@ int set_pages_rw(struct page *page, int numpages); int set_direct_map_invalid_noflush(struct page *page); int set_direct_map_default_noflush(struct page *page); +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid); bool kernel_page_present(struct page *page); extern int kernel_set_to_readonly; diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 44f7b2ea6a07..069e421c2247 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2444,6 +2444,14 @@ int set_direct_map_default_noflush(struct page *page) return __set_pages_p(page, 1); } +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid) +{ + if (valid) + return __set_pages_p(page, nr); + + return __set_pages_np(page, nr); +} + #ifdef CONFIG_DEBUG_PAGEALLOC void __kernel_map_pages(struct page *page, int numpages, int enable) { diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h index e7aec20fb44f..3030d9245f5a 100644 --- a/include/linux/set_memory.h +++ b/include/linux/set_memory.h @@ -34,6 +34,12 @@ static inline int set_direct_map_default_noflush(struct page *page) return 0; } +static inline int set_direct_map_valid_noflush(struct page *page, + unsigned nr, bool valid) +{ + return 0; +} + static inline bool kernel_page_present(struct page *page) { return true;