arch-introduce-set_direct_map_valid_noflush.patch removed from -mm tree
The quilt patch titled
Subject: arch: introduce set_direct_map_valid_noflush()
has been removed from the -mm tree. Its filename was
arch-introduce-set_direct_map_valid_noflush.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: arch: introduce set_direct_map_valid_noflush()
Date: Wed, 23 Oct 2024 19:27:08 +0300
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) <[email protected]>
Reviewed-by Christoph Hellwig <[email protected]>
Reviewed-by Luis Chamberlain <[email protected]>
Tested-by kdevops <[email protected]>
Cc Andreas Larsson <[email protected]>
Cc Andy Lutomirski <[email protected]>
Cc Ard Biesheuvel <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Borislav Petkov (AMD) <[email protected]>
Cc Brian Cain <[email protected]>
Cc Catalin Marinas <[email protected]>
Cc Christophe Leroy <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Guo Ren <[email protected]>
Cc Helge Deller <[email protected]>
Cc Huacai Chen <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Johannes Berg <[email protected]>
Cc John Paul Adrian Glaubitz <[email protected]>
Cc Kent Overstreet <[email protected]>
Cc Liam R. Howlett <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Masami Hiramatsu (Google) <[email protected]>
Cc Matt Turner <[email protected]>
Cc Max Filippov <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Michal Simek <[email protected]>
Cc Oleg Nesterov <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Richard Weinberger <[email protected]>
Cc Russell King <[email protected]>
Cc Song Liu <[email protected]>
Cc Stafford Horne <[email protected]>
Cc Steven Rostedt (Google) <[email protected]>
Cc Suren Baghdasaryan <[email protected]>
Cc Thomas Bogendoerfer <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Uladzislau Rezki (Sony) <[email protected]>
Cc Vineet Gupta <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
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(+)
arch/arm64/include/asm/set_memory.h renamed from arch/arm64/include/asm/set_memory.h~arch-introduce-set_direct_map_valid_noflush +1 -0
@@ -13,6 +13,7 @@ int set_memory_valid(unsigned long addr,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 */
arch/arm64/mm/pageattr.c renamed from arch/arm64/mm/pageattr.c~arch-introduce-set_direct_map_valid_noflush +10 -0
@@ -192,6 +192,16 @@ int set_direct_map_default_noflush(struc 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) {
arch/loongarch/include/asm/set_memory.h renamed from arch/loongarch/include/asm/set_memory.h~arch-introduce-set_direct_map_valid_noflush +1 -0
@@ -17,5 +17,6 @@ int set_memory_rw(unsigned long addr, inbool 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 */
arch/loongarch/mm/pageattr.c renamed from arch/loongarch/mm/pageattr.c~arch-introduce-set_direct_map_valid_noflush +19 -0
@@ -216,3 +216,22 @@ int set_direct_map_invalid_noflush(strucreturn __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); +}
arch/riscv/include/asm/set_memory.h renamed from arch/riscv/include/asm/set_memory.h~arch-introduce-set_direct_map_valid_noflush +1 -0
@@ -42,6 +42,7 @@ static inline int set_kernel_memory(charint 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__ */
arch/riscv/mm/pageattr.c renamed from arch/riscv/mm/pageattr.c~arch-introduce-set_direct_map_valid_noflush +15 -0
@@ -386,6 +386,21 @@ int set_direct_map_default_noflush(struc 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) {
arch/s390/include/asm/set_memory.h renamed from arch/s390/include/asm/set_memory.h~arch-introduce-set_direct_map_valid_noflush +1 -0
@@ -62,5 +62,6 @@ __SET_MEMORY_FUNC(set_memory_4k, SET_MEMint 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
arch/s390/mm/pageattr.c renamed from arch/s390/mm/pageattr.c~arch-introduce-set_direct_map_valid_noflush +11 -0
@@ -406,6 +406,17 @@ int set_direct_map_default_noflush(strucreturn __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)
arch/x86/include/asm/set_memory.h renamed from arch/x86/include/asm/set_memory.h~arch-introduce-set_direct_map_valid_noflush +1 -0
@@ -89,6 +89,7 @@ int set_pages_rw(struct page *page, intint 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;
arch/x86/mm/pat/set_memory.c renamed from arch/x86/mm/pat/set_memory.c~arch-introduce-set_direct_map_valid_noflush +8 -0
@@ -2444,6 +2444,14 @@ int set_direct_map_default_noflush(strucreturn __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) {
include/linux/set_memory.h renamed from include/linux/set_memory.h~arch-introduce-set_direct_map_valid_noflush +6 -0
@@ -34,6 +34,12 @@ static inline int set_direct_map_defaultreturn 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;
_
Patches currently in -mm which might be from [email protected] are