Commit 2a681cfa authored by Joerg Roedel's avatar Joerg Roedel Committed by Linus Torvalds
Browse files

mm: move p?d_alloc_track to separate header file 



The functions are only used in two source files, so there is no need for
them to be in the global <linux/mm.h> header.  Move them to the new
<linux/pgalloc-track.h> header and include it only where needed.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarPekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Cc: Satheesh Rajendran <sathnaga@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Matthew Wilcox <willy@infradead.org>
Link: http://lkml.kernel.org/r/20200609120533.25867-1-joro@8bytes.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab05eabf

include/linux/mm.h

+0 −45
Original line number Diff line number Diff line
@@ -2103,51 +2103,11 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, p4d_t *p4d, 
		NULL : pud_offset(p4d, address);

}



static inline p4d_t *p4d_alloc_track(struct mm_struct *mm, pgd_t *pgd,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)



{

	if (unlikely(pgd_none(*pgd))) {

		if (__p4d_alloc(mm, pgd, address))

			return NULL;

		*mod_mask |= PGTBL_PGD_MODIFIED;

	}



	return p4d_offset(pgd, address);

}



static inline pud_t *pud_alloc_track(struct mm_struct *mm, p4d_t *p4d,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)

{

	if (unlikely(p4d_none(*p4d))) {

		if (__pud_alloc(mm, p4d, address))

			return NULL;

		*mod_mask |= PGTBL_P4D_MODIFIED;

	}



	return pud_offset(p4d, address);

}



static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)

{

	return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?

		NULL: pmd_offset(pud, address);

}



static inline pmd_t *pmd_alloc_track(struct mm_struct *mm, pud_t *pud,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)

{

	if (unlikely(pud_none(*pud))) {

		if (__pmd_alloc(mm, pud, address))

			return NULL;

		*mod_mask |= PGTBL_PUD_MODIFIED;

	}



	return pmd_offset(pud, address);

}

#endif /* CONFIG_MMU */



#if USE_SPLIT_PTE_PTLOCKS
@@ -2263,11 +2223,6 @@ static inline void pgtable_pte_page_dtor(struct page *page) 
	((unlikely(pmd_none(*(pmd))) && __pte_alloc_kernel(pmd))? \

		NULL: pte_offset_kernel(pmd, address))



#define pte_alloc_kernel_track(pmd, address, mask)			\

	((unlikely(pmd_none(*(pmd))) &&					\

	  (__pte_alloc_kernel(pmd) || ({*(mask)|=PGTBL_PMD_MODIFIED;0;})))?\

		NULL: pte_offset_kernel(pmd, address))



#if USE_SPLIT_PMD_PTLOCKS



static struct page *pmd_to_page(pmd_t *pmd)

mm/ioremap.c

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/export.h>

#include <asm/cacheflush.h>



#include "pgalloc-track.h"



#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP

static int __read_mostly ioremap_p4d_capable;

static int __read_mostly ioremap_pud_capable;

mm/pgalloc-track.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _LINUX_PGALLLC_TRACK_H

#define _LINUX_PGALLLC_TRACK_H



#if defined(CONFIG_MMU)

static inline p4d_t *p4d_alloc_track(struct mm_struct *mm, pgd_t *pgd,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)

{

	if (unlikely(pgd_none(*pgd))) {

		if (__p4d_alloc(mm, pgd, address))

			return NULL;

		*mod_mask |= PGTBL_PGD_MODIFIED;

	}



	return p4d_offset(pgd, address);

}



static inline pud_t *pud_alloc_track(struct mm_struct *mm, p4d_t *p4d,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)

{

	if (unlikely(p4d_none(*p4d))) {

		if (__pud_alloc(mm, p4d, address))

			return NULL;

		*mod_mask |= PGTBL_P4D_MODIFIED;

	}



	return pud_offset(p4d, address);

}



static inline pmd_t *pmd_alloc_track(struct mm_struct *mm, pud_t *pud,

				     unsigned long address,

				     pgtbl_mod_mask *mod_mask)

{

	if (unlikely(pud_none(*pud))) {

		if (__pmd_alloc(mm, pud, address))

			return NULL;

		*mod_mask |= PGTBL_PUD_MODIFIED;

	}



	return pmd_offset(pud, address);

}

#endif /* CONFIG_MMU */



#define pte_alloc_kernel_track(pmd, address, mask)			\

	((unlikely(pmd_none(*(pmd))) &&					\

	  (__pte_alloc_kernel(pmd) || ({*(mask)|=PGTBL_PMD_MODIFIED;0;})))?\

		NULL: pte_offset_kernel(pmd, address))



#endif /* _LINUX_PGALLLC_TRACK_H */

mm/vmalloc.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/shmparam.h>



#include "internal.h"

#include "pgalloc-track.h"



bool is_vmalloc_addr(const void *x)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE