Commit 9a1d0c73 authored by Mike Rapoport (Microsoft)'s avatar Mike Rapoport (Microsoft) Committed by Andrew Morton
Browse files

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: default avatarMike Rapoport (Microsoft) <rppt@kernel.org>
Acked-by: default avatarDavid Hildenbrand (Arm) <david@kernel.org>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Reviewed-by: default avatarLiam 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 652d12bc

arch/x86/kvm/mmu/spte.h

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ extern u64 __read_mostly shadow_nonpresent_or_rsvd_lower_gfn_mask; 


static inline hpa_t kvm_mmu_get_dummy_root(void)

{

	return my_zero_pfn(0) << PAGE_SHIFT;

	return zero_pfn(0) << PAGE_SHIFT;

}



static inline bool kvm_mmu_is_dummy_root(hpa_t shadow_page)

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static vm_fault_t dax_load_hole(struct xa_state *xas, struct vm_fault *vmf, 
{

	struct inode *inode = iter->inode;

	unsigned long vaddr = vmf->address;

	unsigned long pfn = my_zero_pfn(vaddr);

	unsigned long pfn = zero_pfn(vaddr);

	vm_fault_t ret;



	*entry = dax_insert_entry(xas, vmf, iter, *entry, pfn, DAX_ZERO_PAGE);

fs/proc/vmcore.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int remap_oldmem_pfn_checked(struct vm_area_struct *vma, 
{

	unsigned long map_size;

	unsigned long pos_start, pos_end, pos;

	unsigned long zeropage_pfn = my_zero_pfn(0);

	unsigned long zeropage_pfn = zero_pfn(0);

	size_t len = 0;



	pos_start = pfn;

include/linux/pgtable.h

+20 −8
Original line number Diff line number Diff line
@@ -1917,27 +1917,39 @@ static inline void pfnmap_setup_cachemode_pfn(unsigned long pfn, pgprot_t *prot) 
	pfnmap_setup_cachemode(pfn, PAGE_SIZE, prot);

}



/*

 * ZERO_PAGE() is global shared page(s) that is always zero. It is used for

 * zero-mapped memory areas, CoW etc.

 *

 * On architectures that __HAVE_COLOR_ZERO_PAGE there are several such pages

 * for different ranges in the virtual address space.

 *

 * zero_page_pfn identifies the first (or the only) pfn for these pages.

 */

#ifdef __HAVE_COLOR_ZERO_PAGE

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	unsigned long offset_from_zero_pfn = pfn - zero_pfn;

	extern unsigned long zero_page_pfn;

	unsigned long offset_from_zero_pfn = pfn - zero_page_pfn;



	return offset_from_zero_pfn <= (zero_page_mask >> PAGE_SHIFT);

}



#define my_zero_pfn(addr)	page_to_pfn(ZERO_PAGE(addr))

#define zero_pfn(addr)	page_to_pfn(ZERO_PAGE(addr))



#else

static inline int is_zero_pfn(unsigned long pfn)

{

	extern unsigned long zero_pfn;

	return pfn == zero_pfn;

	extern unsigned long zero_page_pfn;



	return pfn == zero_page_pfn;

}



static inline unsigned long my_zero_pfn(unsigned long addr)

static inline unsigned long zero_pfn(unsigned long addr)

{

	extern unsigned long zero_pfn;

	return zero_pfn;

	extern unsigned long zero_page_pfn;



	return zero_page_pfn;

}

#endif /* __HAVE_COLOR_ZERO_PAGE */

mm/huge_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -2972,7 +2972,7 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma, 
	for (i = 0, addr = haddr; i < HPAGE_PMD_NR; i++, addr += PAGE_SIZE) {

		pte_t entry;



		entry = pfn_pte(my_zero_pfn(addr), vma->vm_page_prot);

		entry = pfn_pte(zero_pfn(addr), vma->vm_page_prot);

		entry = pte_mkspecial(entry);

		if (pmd_uffd_wp(old_pmd))

			entry = pte_mkuffd_wp(entry);