From patchwork Wed Oct 16 12:24:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 13838293 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 11178D1AD52 for ; Wed, 16 Oct 2024 12:26:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6E446B0096; Wed, 16 Oct 2024 08:26:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A44FF6B0098; Wed, 16 Oct 2024 08:26:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90D246B0099; Wed, 16 Oct 2024 08:26:18 -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 72D696B0096 for ; Wed, 16 Oct 2024 08:26:18 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id AB58DC01B4 for ; Wed, 16 Oct 2024 12:26:07 +0000 (UTC) X-FDA: 82679387784.23.4E9217C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf19.hostedemail.com (Postfix) with ESMTP id EC8BF1A0019 for ; Wed, 16 Oct 2024 12:26:05 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hzTuwFXN; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.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=1729081459; a=rsa-sha256; cv=none; b=HX0TZ+OD5Qt/njczQuITDk1kmn1kbIiX+bCFYiQTHeuqiDPznSTeDJJx1XjKUyd0ezjLj+ Tqzelb1803/6JSj5CHjS+8xYJGHlXguT70vZsaj7/y1lmJN0rOOr4S9UCXVSnysaumU8Na P/VVLbg1KVJ6TqgzXOM41ncQMbzekOs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=hzTuwFXN; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf19.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=1729081459; 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=FMWp7kHNBspLBEOsvVGbAordX/5cIjIPaR16zuy49C4=; b=kGfJOetwcOSIptkvGyU2JUA0pgXHlD/WohFi3LRWNt6OCtE2omkbZGHnPwnqWEeWap8o4Z y5PcG69bVDMUq6VslavR19VYjOdSiuXAsx37YZx2XSS5Ox3DfcZszvwGMb8w5geOBEJGk9 k7QSddQtDFELJpP0MneIb8NawD58MQo= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 5CC775C076C; Wed, 16 Oct 2024 12:26:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7CE8AC4CECF; Wed, 16 Oct 2024 12:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729081575; bh=xT+C+UkXHo4ksxI6EkkdxgycTwZCmYts1G3brTXvzKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hzTuwFXN3MOizhmxK2LJr8bxptrhqsSvItoln0stLiekCB9E3AQm5mrOjUFv12WnQ gWmDRH8kwTw4ZxNRsb1SD3d2zdcdE4GO2BxoWOXy8K3oJvkLAZhUnk8cvRsioh0jj9 kAKDXlMhONinxnTyhfT2Eg+ggtsFtldjPiZ487zMHqQO4/15dIG+nKSrN55O06+fvW 5VSA8m/1E9YILnTcawvfokyFt5FrKRbPhjxYmJi7bCB54X1N/vMn+aXHBXohGa5rpJ yV59lX35ZR36emuX3yvzhlrlIwfqXup4/ddTNAup5/3UswY6tUOIJ8SHqYfMfBwT31 KIGDxgFuHvDNw== 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, Christoph Hellwig Subject: [PATCH v6 5/8] arch: introduce set_direct_map_valid_noflush() Date: Wed, 16 Oct 2024 15:24:21 +0300 Message-ID: <20241016122424.1655560-6-rppt@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016122424.1655560-1-rppt@kernel.org> References: <20241016122424.1655560-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: EC8BF1A0019 X-Stat-Signature: aasnuqpjd1hhy67d4goz6hds913srmsd X-Rspam-User: X-HE-Tag: 1729081565-668273 X-HE-Meta: U2FsdGVkX1/A0F35tdJ7U0tHPlcC9ha3CTY+mR06RMREOI8fh57IyWg3l3/dymT9gf3PnjZd/+PV4J/gVXbu8BaN97G40JHD6K5GCew9nhYfLoxkrY6dTPJLdtVZ37hFiRYZ5ZVgmt+j11+Fbj38hywpUOB+6zIqFZJJCP4daFr5nVs4KB0RqM6goXkViSeYQjkQpSPMop9C3ny2PRgb2YGwMx68xsMlummF7SdlqjPpQZphKVjbrL+nxPAfzuK/5R61WchY/7f6ICQHC2kqoe5tyrDX1AboD+TVs1LThQr7BVR0laNu60N0Owq6j6mae79Zp8QwJ7aNpyEpRabzXIgrD8Sn+LdAy6ym6izZEHAgNhGPfTwZiO2BuSy+8UPsOnzPUX6XBnjumcVAbCH9dCNB3e46RFsB4KO6GwwVH+hPS9KeT5ySVL1RfF2Un1Q+isDJosLEiWL1d55/EKEe2hbwlEo2tmmRZNTZldZ2tvXoHm9B3izT0hvnYt7e+bJviv5euRkP46/wVF//Gq4EwO9eNEwJm7heD1OK1ew+BA8tWH7ERLvZg4JyVLqmq695nYzI1uj+YW6AM4uYK15LDcyqbj6dpKY4fteXXKy6tDmteB0mlI3C1qbfrf4fEHYTlNmRDhfFHKsq1QvhfW4MNDG9Nf9HQ04n4YgAd7FxIjcCqaNqILoVirwYbFB/8SGYbiLeGmNoeqVtOnvi89hj/GPN/40SWnSjUznuDXbG8gMOBSilapi+43/rgTU9cOFDIuLMdZmd1cEdYG1mdVd54jeRreSIbnx6p1RYoM1H7/GmjxBme3fH7acxtSns69ISzYA+JiNM9ShOVpsd4c1QIVK09LNibBHF/xllW33KPbW3k7B/XPIyuon9tDIdgLPWyRNIOiiuMzxPg913O69DTIVVKLLeQWF4xyUi+QTN2lntGMjWPsHTq4+tMgaoh8+itTFDgv6ojZooFjvYUMU EXowCZ9G ikn9kWbzEmPpgMw/1x4HQB/39w9CACN38d106ulCIkcfsfj2L2Ouphft2TDFoAQPlkQT76B5UdwgmdSvHUgMuJZvcP+1Vpt8omCGA9z0CRdHJPejfQn5KXkl3RVkDYFNKRbghwVYBTDTQbqttLyAFh8F2EuptuNfmXQOuemRNy3kTHAF4dcrG8E8/8UsdH911A4XgaVHXasBNW8W/dcGRfOpkWaWtlxujANRIqUWV9k9YSpH+CZW4LQwV38nzVWWGBrifxxyOYb47rjjp5UcGIwuXt05ERdv4/+Sl 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 --- 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;