From patchwork Wed Oct 9 18:08:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13829023 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 568B7CEE339 for ; Wed, 9 Oct 2024 18:10:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCBEA6B00D8; Wed, 9 Oct 2024 14:10:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7C056B00D9; Wed, 9 Oct 2024 14:10:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF5B86B00DA; Wed, 9 Oct 2024 14:10:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A06676B00D8 for ; Wed, 9 Oct 2024 14:10:20 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 66A571C6F37 for ; Wed, 9 Oct 2024 18:10:17 +0000 (UTC) X-FDA: 82654853400.23.823DB7B Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 3A5B040013 for ; Wed, 9 Oct 2024 18:10:18 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UepqTtkh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.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=1728497391; a=rsa-sha256; cv=none; b=lCKCAZFE2V7yNqHSd59WFRQtKe4eUDbm9FGPN6cxCHs3CDtIh/kFjdcauU51t/lyEUcteh VMRR6szj4kw/qepc7vbLqT03Dm+wkCeTmg1js/WrajHae6WwatuO/6QhkuWsD7SOI4vFCw 0dDHUmG35MJyX8ggSshk5SuTub9wd2U= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=UepqTtkh; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf11.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=1728497391; 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=NrsoLfyHb09FMN+CX0EDY6mGfqT/Pd4W0lSnb0C7VJw=; b=uN+2edsH1YnSm74u8ypl9G2+eFetJoLVR2xzD4VYAuzrcs9RWXEIX3GksyHBwNRHSM88u8 dpkmzFLRy8dSw9FIrIzZS3dWxIXIJdxal5/OzjgiIAlqm4cPZ32I9x+AwIB5I/7i96ba7z +dkpv4Duk+8T/VaMZACFQ8DW86p2ZKk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0A8CE5C5B7B; Wed, 9 Oct 2024 18:10:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E09CC4CED1; Wed, 9 Oct 2024 18:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728497416; bh=CJNZAFYUZGFiG9zQtgqhZLu00qF2UvbEHTlMVQ5+bqg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UepqTtkhXATBOqzTMuyxuSc8potEL4CjAsu+IWHn4bpf4ST2NaAsTblUwEw0TgYJA UJ3+Op4vvR1HDSMGyiZJjyyO8qiNkp0KOJBiYj8rAxUKrwUiauQlLSC5VtEnulub5Q QoWYG/UZHPixS8iNMG+m6suxbTLTLv2CsErcmYv8O901AoLeHNhFFTzcQ73+mdlBBD fwlazyEdvRkAfS1HpDYdzUxUEBrZ9roeiULD3Sa2y9g5WjQVeDF7srJ5agMZTAsnma 8z34ayY5uHLx1v+iGT+VijDSfyhlMvvlSmx+7PjhIl6kH0Q8Ipxo6f0ynLZImMXcvP Jne3IiLXv0Hfw== From: Mike Rapoport To: Andrew Morton 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" , Luis Chamberlain , 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 , 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 v5 5/8] arch: introduce set_direct_map_valid_noflush() Date: Wed, 9 Oct 2024 21:08:13 +0300 Message-ID: <20241009180816.83591-6-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241009180816.83591-1-rppt@kernel.org> References: <20241009180816.83591-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: fcx1zb5e9u4ayeaqdqwicgzpp9r84714 X-Rspamd-Queue-Id: 3A5B040013 X-Rspamd-Server: rspam02 X-HE-Tag: 1728497418-43264 X-HE-Meta: U2FsdGVkX1/0a7AUJVxWX+F0eSIVG4MaYGAfnB5+dp3Cq0xiwMzCb3ywWbRqFEHEoLSK3BqK+1tjOjtwagBk1Edx/oIPEqILyWwgHK9zS3dLpqZUi01KDg+J+1xMUb884pZZWYeTQ6UmXqXeOxeUUSBP8L5XPZC4Ct0rguwNlWpS8iEtlWumKPh4mZgS0KYKMRrCWEYx+aAhvKY18PJi2+JtvwCHIbMCMYq3eLREM0z+dvDk2tyHG5jOVsynSblD353JgPaUmlxRWyLPpmS2nmza/J4IKbOq1d81PAI8Kr9vsJtF1ICxcCd9IRLlaCFCDIIJcrEU5UIx5SnxClRGKabXj+jVVmH0i7liymPF63SNCJoqNqQVK3eCV8AIIYRYdZjdyd94b3z5JaVJmp6mkW/7rgzID5rJRFgwM9W5Erw7VIH0ivqnyA/UMpH05+Ori0E7P8lR/F7FEVMkCDEAB5wr01YvHlK57zBlAtpEptQk0penbIL01pZRX8FqFf9zzurcwijUzFVVP5ocCpbPdxQJOfA5OKy1iIexleQmENZBZ68z89jB/mAMSA0VPjFWIOF9AKP9SKZAeUWmF/yLhOV9MQU7NvU45HH6awuquwZgOnToGaLUIsJSVHULQttH38uJPZ7ONYU3oF4oa6DMAk6GLGHra9OAuTYX68CswLH1BmQqEznI8rMm8Mct22HCyRPhQVc0BJM72ux8ZwPBTgvbTsljQLL+LAl9v9+lubzwbb8/1+UGnfXy78sHe1RosVglTiQ2wrazPtOWU2PSwOV/AWfGVvRRxPR3N6BhXmKwNq5iJr33et9kEmQzv+k4ecLXt8TZ5+pcIrZpUKboi7aa3UR05CjkCdxbixuEdH7Csr3Z34FxSuBg86XgouCS8CAeel4bnj8Vxnpe2NIEx+urVjzYK/O+LNIGBZylYvJyY9YOWZzqIHgKKrzbhbjcIaoJ/5x51XUXI7TIgaa 945A9dnr 1Uq0zA5Z5nJgH30OMzk1Z28nUzA8W2v/W4YbYT5L8e5899oQmVGbuWkNLZMNYwBnrsnvN6hGfzu3U4aZj+wPMqX98slIlTEVf0kR6qqxyzdWvGii/nMYm1Rp9L0zeLclQXedXIU/sIlcSM4y+LDiGg3DAQ+ZydI1ejEA1A9S9XGSYZclTz8NhRhsfYd46ui1wtiPg1zQQ066gGat/91RFw8EwZfwcQL3Ysa6/qw1Ebq6bnOPvws/5x3VLg+JoUt/QgVxpiZjGLqMNNrgkYgEJmyqq5AVHfA325qnW 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 --- 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;