tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

mm: rename my_zero_pfn() to zero_pfn()

my_zero_pfn() is a silly name.

Rename zero_pfn variable to zero_page_pfn and my_zero_pfn() function to
zero_pfn().

While on it, move extern declarations of zero_page_pfn outside the
functions that use it and add a comment about what ZERO_PAGE is.

Link: https://lkml.kernel.org/r/20260211103141.3215197-3-rppt@kernel.org
Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Andreas Larsson <andreas@gaisler.com>
Cc: "Borislav Petkov (AMD)" <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Magnus Lindholm <linmag7@gmail.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vineet Gupta <vgupta@kernel.org>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Mike Rapoport (Microsoft) and committed by
Andrew Morton 9a1d0c73 652d12bc

+33 -21
+1 -1
arch/x86/kvm/mmu/spte.h
··· 248 248 249 249 static inline hpa_t kvm_mmu_get_dummy_root(void) 250 250 { 251 - return my_zero_pfn(0) << PAGE_SHIFT; 251 + return zero_pfn(0) << PAGE_SHIFT; 252 252 } 253 253 254 254 static inline bool kvm_mmu_is_dummy_root(hpa_t shadow_page)
+1 -1
fs/dax.c
··· 1360 1360 { 1361 1361 struct inode *inode = iter->inode; 1362 1362 unsigned long vaddr = vmf->address; 1363 - unsigned long pfn = my_zero_pfn(vaddr); 1363 + unsigned long pfn = zero_pfn(vaddr); 1364 1364 vm_fault_t ret; 1365 1365 1366 1366 *entry = dax_insert_entry(xas, vmf, iter, *entry, pfn, DAX_ZERO_PAGE);
+1 -1
fs/proc/vmcore.c
··· 525 525 { 526 526 unsigned long map_size; 527 527 unsigned long pos_start, pos_end, pos; 528 - unsigned long zeropage_pfn = my_zero_pfn(0); 528 + unsigned long zeropage_pfn = zero_pfn(0); 529 529 size_t len = 0; 530 530 531 531 pos_start = pfn;
+20 -8
include/linux/pgtable.h
··· 1917 1917 pfnmap_setup_cachemode(pfn, PAGE_SIZE, prot); 1918 1918 } 1919 1919 1920 + /* 1921 + * ZERO_PAGE() is global shared page(s) that is always zero. It is used for 1922 + * zero-mapped memory areas, CoW etc. 1923 + * 1924 + * On architectures that __HAVE_COLOR_ZERO_PAGE there are several such pages 1925 + * for different ranges in the virtual address space. 1926 + * 1927 + * zero_page_pfn identifies the first (or the only) pfn for these pages. 1928 + */ 1920 1929 #ifdef __HAVE_COLOR_ZERO_PAGE 1921 1930 static inline int is_zero_pfn(unsigned long pfn) 1922 1931 { 1923 - extern unsigned long zero_pfn; 1924 - unsigned long offset_from_zero_pfn = pfn - zero_pfn; 1932 + extern unsigned long zero_page_pfn; 1933 + unsigned long offset_from_zero_pfn = pfn - zero_page_pfn; 1934 + 1925 1935 return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT); 1926 1936 } 1927 1937 1928 - #define my_zero_pfn(addr) page_to_pfn(ZERO_PAGE(addr)) 1938 + #define zero_pfn(addr) page_to_pfn(ZERO_PAGE(addr)) 1929 1939 1930 1940 #else 1931 1941 static inline int is_zero_pfn(unsigned long pfn) 1932 1942 { 1933 - extern unsigned long zero_pfn; 1934 - return pfn == zero_pfn; 1943 + extern unsigned long zero_page_pfn; 1944 + 1945 + return pfn == zero_page_pfn; 1935 1946 } 1936 1947 1937 - static inline unsigned long my_zero_pfn(unsigned long addr) 1948 + static inline unsigned long zero_pfn(unsigned long addr) 1938 1949 { 1939 - extern unsigned long zero_pfn; 1940 - return zero_pfn; 1950 + extern unsigned long zero_page_pfn; 1951 + 1952 + return zero_page_pfn; 1941 1953 } 1942 1954 #endif /* __HAVE_COLOR_ZERO_PAGE */ 1943 1955
+1 -1
mm/huge_memory.c
··· 2972 2972 for (i = 0, addr = haddr; i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE) { 2973 2973 pte_t entry; 2974 2974 2975 - entry = pfn_pte(my_zero_pfn(addr), vma->vm_page_prot); 2975 + entry = pfn_pte(zero_pfn(addr), vma->vm_page_prot); 2976 2976 entry = pte_mkspecial(entry); 2977 2977 if (pmd_uffd_wp(old_pmd)) 2978 2978 entry = pte_mkuffd_wp(entry);
+1 -1
mm/memory.c
··· 5224 5224 /* Use the zero-page for reads */ 5225 5225 if (!(vmf->flags & FAULT_FLAG_WRITE) && 5226 5226 !mm_forbids_zeropage(vma->vm_mm)) { 5227 - entry = pte_mkspecial(pfn_pte(my_zero_pfn(vmf->address), 5227 + entry = pte_mkspecial(pfn_pte(zero_pfn(vmf->address), 5228 5228 vma->vm_page_prot)); 5229 5229 vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, 5230 5230 vmf->address, &vmf->ptl);
+1 -1
mm/migrate.c
··· 321 321 if (!pages_identical(page, ZERO_PAGE(0))) 322 322 return false; 323 323 324 - newpte = pte_mkspecial(pfn_pte(my_zero_pfn(pvmw->address), 324 + newpte = pte_mkspecial(pfn_pte(zero_pfn(pvmw->address), 325 325 pvmw->vma->vm_page_prot)); 326 326 327 327 if (pte_swp_soft_dirty(old_pte))
+5 -5
mm/mm_init.c
··· 53 53 void *high_memory; 54 54 EXPORT_SYMBOL(high_memory); 55 55 56 - unsigned long zero_pfn __ro_after_init; 57 - EXPORT_SYMBOL(zero_pfn); 56 + unsigned long zero_page_pfn __ro_after_init; 57 + EXPORT_SYMBOL(zero_page_pfn); 58 58 59 59 #ifdef CONFIG_DEBUG_MEMORY_INIT 60 60 int __meminitdata mminit_loglevel; ··· 2675 2675 ); 2676 2676 } 2677 2677 2678 - static int __init init_zero_pfn(void) 2678 + static int __init init_zero_page_pfn(void) 2679 2679 { 2680 - zero_pfn = page_to_pfn(ZERO_PAGE(0)); 2680 + zero_page_pfn = page_to_pfn(ZERO_PAGE(0)); 2681 2681 return 0; 2682 2682 } 2683 - early_initcall(init_zero_pfn); 2683 + early_initcall(init_zero_page_pfn); 2684 2684 2685 2685 void __init __weak arch_mm_preinit(void) 2686 2686 {
+2 -2
mm/userfaultfd.c
··· 357 357 if (mm_forbids_zeropage(dst_vma->vm_mm)) 358 358 return mfill_atomic_pte_zeroed_folio(dst_pmd, dst_vma, dst_addr); 359 359 360 - _dst_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr), 360 + _dst_pte = pte_mkspecial(pfn_pte(zero_pfn(dst_addr), 361 361 dst_vma->vm_page_prot)); 362 362 ret = -EAGAIN; 363 363 dst_pte = pte_offset_map_lock(dst_vma->vm_mm, dst_pmd, dst_addr, &ptl); ··· 1229 1229 return -EAGAIN; 1230 1230 } 1231 1231 1232 - zero_pte = pte_mkspecial(pfn_pte(my_zero_pfn(dst_addr), 1232 + zero_pte = pte_mkspecial(pfn_pte(zero_pfn(dst_addr), 1233 1233 dst_vma->vm_page_prot)); 1234 1234 ptep_clear_flush(src_vma, src_addr, src_pte); 1235 1235 set_pte_at(mm, dst_addr, dst_pte, zero_pte);