Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 13:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm/treewide: align up pXd_leaf() retval across archs

Browse Source 
Even if pXd_leaf() API is defined globally, it's not clear on the retval,
and there are three types used (bool, int, unsigned log).

Always return a boolean for pXd_leaf() APIs.

Link: https://lkml.kernel.org/r/20240305043750.93762-11-peterx@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Muchun Song <muchun.song@linux.dev>
Cc: "Naveen N. Rao" <naveen.n.rao@linux.ibm.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>
Cc: Yang Shi <shy828301@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Peter Xu 2024-03-05 12:37:50 +08:00 committed by Andrew Morton
parent e72c7c2b88
commit c05995b7ec
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/riscv/include/asm/pgtable-64.h
View File

@ -190,7 +190,7 @@ static inline int pud_bad(pud_t pud)
} }
#define pud_leaf pud_leaf #define pud_leaf pud_leaf
static inline int pud_leaf(pud_t pud) static inline bool pud_leaf(pud_t pud)
{ {
return pud_present(pud) && (pud_val(pud) & _PAGE_LEAF); return pud_present(pud) && (pud_val(pud) & _PAGE_LEAF);
} }

2
arch/riscv/include/asm/pgtable.h
View File

@ -241,7 +241,7 @@ static inline int pmd_bad(pmd_t pmd)
} }
#define pmd_leaf pmd_leaf #define pmd_leaf pmd_leaf
static inline int pmd_leaf(pmd_t pmd) static inline bool pmd_leaf(pmd_t pmd)
{ {
return pmd_present(pmd) && (pmd_val(pmd) & _PAGE_LEAF); return pmd_present(pmd) && (pmd_val(pmd) & _PAGE_LEAF);
} }

4
arch/s390/include/asm/pgtable.h
View File

@ -706,7 +706,7 @@ static inline int pud_none(pud_t pud)
} }
#define pud_leaf pud_leaf #define pud_leaf pud_leaf
static inline int pud_leaf(pud_t pud) static inline bool pud_leaf(pud_t pud)
{ {
if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3) if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3)
return 0; return 0;
@ -714,7 +714,7 @@ static inline int pud_leaf(pud_t pud)
} }
#define pmd_leaf pmd_leaf #define pmd_leaf pmd_leaf
static inline int pmd_leaf(pmd_t pmd) static inline bool pmd_leaf(pmd_t pmd)
{ {
return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0; return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0;
} }

4
arch/sparc/include/asm/pgtable_64.h
View File

@ -681,7 +681,7 @@ static inline unsigned long pte_special(pte_t pte)
} }
#define pmd_leaf pmd_leaf #define pmd_leaf pmd_leaf
static inline unsigned long pmd_leaf(pmd_t pmd) static inline bool pmd_leaf(pmd_t pmd)
{ {
pte_t pte = __pte(pmd_val(pmd)); pte_t pte = __pte(pmd_val(pmd));
@ -868,7 +868,7 @@ static inline pmd_t *pud_pgtable(pud_t pud)
#define p4d_page(p4d) NULL #define p4d_page(p4d) NULL
#define pud_leaf pud_leaf #define pud_leaf pud_leaf
static inline unsigned long pud_leaf(pud_t pud) static inline bool pud_leaf(pud_t pud)
{ {
pte_t pte = __pte(pud_val(pud)); pte_t pte = __pte(pud_val(pud));

8
arch/x86/include/asm/pgtable.h
View File

@ -252,7 +252,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd)
} }
#define p4d_leaf p4d_leaf #define p4d_leaf p4d_leaf
static inline int p4d_leaf(p4d_t p4d) static inline bool p4d_leaf(p4d_t p4d)
{ {
/* No 512 GiB pages yet */ /* No 512 GiB pages yet */
return 0; return 0;
@ -261,7 +261,7 @@ static inline int p4d_leaf(p4d_t p4d)
#define pte_page(pte) pfn_to_page(pte_pfn(pte)) #define pte_page(pte) pfn_to_page(pte_pfn(pte))
#define pmd_leaf pmd_leaf #define pmd_leaf pmd_leaf
static inline int pmd_leaf(pmd_t pte) static inline bool pmd_leaf(pmd_t pte)
{ {
return pmd_flags(pte) & _PAGE_PSE; return pmd_flags(pte) & _PAGE_PSE;
} }
@ -1086,7 +1086,7 @@ static inline pmd_t *pud_pgtable(pud_t pud)
#define pud_page(pud) pfn_to_page(pud_pfn(pud)) #define pud_page(pud) pfn_to_page(pud_pfn(pud))
#define pud_leaf pud_leaf #define pud_leaf pud_leaf
static inline int pud_leaf(pud_t pud) static inline bool pud_leaf(pud_t pud)
{ {
return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) ==
(_PAGE_PSE | _PAGE_PRESENT); (_PAGE_PSE | _PAGE_PRESENT);
@ -1413,7 +1413,7 @@ static inline bool pgdp_maps_userspace(void *__ptr)
} }
#define pgd_leaf pgd_leaf #define pgd_leaf pgd_leaf
static inline int pgd_leaf(pgd_t pgd) { return 0; } static inline bool pgd_leaf(pgd_t pgd) { return false; }
#ifdef CONFIG_PAGE_TABLE_ISOLATION #ifdef CONFIG_PAGE_TABLE_ISOLATION
/* /*

8
include/linux/pgtable.h
View File

@ -1777,16 +1777,16 @@ typedef unsigned int pgtbl_mod_mask;
* Only meaningful when called on a valid entry. * Only meaningful when called on a valid entry.
*/ */
#ifndef pgd_leaf #ifndef pgd_leaf
#define pgd_leaf(x) 0 #define pgd_leaf(x) false
#endif #endif
#ifndef p4d_leaf #ifndef p4d_leaf
#define p4d_leaf(x) 0 #define p4d_leaf(x) false
#endif #endif
#ifndef pud_leaf #ifndef pud_leaf
#define pud_leaf(x) 0 #define pud_leaf(x) false
#endif #endif
#ifndef pmd_leaf #ifndef pmd_leaf
#define pmd_leaf(x) 0 #define pmd_leaf(x) false
#endif #endif
#ifndef pgd_leaf_size #ifndef pgd_leaf_size