997cdcb068
Patch series "hugetlbfs: convert macros to static inline, fix sparse
warning".
The definition for huge_pte_offset() in <linux/hugetlb.h> causes a
sparse warning in the !CONFIG_HUGETLB_PAGE. Fix this as well as
converting all macros in this block of definitions to static inlines for
better type checking.
When making the above changes, build errors were found in powerpc due to
duplicate definitions. A separate powerpc specific patch is included as
a requisite to remove the definitions and get them from
<linux/hugetlb.h>.
This patch (of 2):
This removes the power specific stubs created by commit aad71e3928
("powerpc/mm: Fix build break with RADIX=y & HUGETLBFS=n") used when
!CONFIG_HUGETLB_PAGE. Instead, it addresses the build break by getting
the definitions from <linux/hugetlb.h>. This allows the macros in
<linux/hugetlb.h> to be replaced with static inlines.
Link: http://lkml.kernel.org/r/20191112194558.139389-2-mike.kravetz@oracle.com
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au>
Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
77 lines
1.7 KiB
C
77 lines
1.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H
|
|
#define _ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H
|
|
/*
|
|
* hash 4k can't share hugetlb and also doesn't support THP
|
|
*/
|
|
#ifndef __ASSEMBLY__
|
|
#ifdef CONFIG_HUGETLB_PAGE
|
|
static inline int pmd_huge(pmd_t pmd)
|
|
{
|
|
/*
|
|
* leaf pte for huge page
|
|
*/
|
|
if (radix_enabled())
|
|
return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE));
|
|
return 0;
|
|
}
|
|
|
|
static inline int pud_huge(pud_t pud)
|
|
{
|
|
/*
|
|
* leaf pte for huge page
|
|
*/
|
|
if (radix_enabled())
|
|
return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE));
|
|
return 0;
|
|
}
|
|
|
|
static inline int pgd_huge(pgd_t pgd)
|
|
{
|
|
/*
|
|
* leaf pte for huge page
|
|
*/
|
|
if (radix_enabled())
|
|
return !!(pgd_raw(pgd) & cpu_to_be64(_PAGE_PTE));
|
|
return 0;
|
|
}
|
|
#define pgd_huge pgd_huge
|
|
/*
|
|
* With radix , we have hugepage ptes in the pud and pmd entries. We don't
|
|
* need to setup hugepage directory for them. Our pte and page directory format
|
|
* enable us to have this enabled.
|
|
*/
|
|
static inline int hugepd_ok(hugepd_t hpd)
|
|
{
|
|
if (radix_enabled())
|
|
return 0;
|
|
return hash__hugepd_ok(hpd);
|
|
}
|
|
#define is_hugepd(hpd) (hugepd_ok(hpd))
|
|
|
|
/*
|
|
* 16M and 16G huge page directory tables are allocated from slab cache
|
|
*
|
|
*/
|
|
#define H_16M_CACHE_INDEX (PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE - 24)
|
|
#define H_16G_CACHE_INDEX \
|
|
(PAGE_SHIFT + H_PTE_INDEX_SIZE + H_PMD_INDEX_SIZE + H_PUD_INDEX_SIZE - 34)
|
|
|
|
static inline int get_hugepd_cache_index(int index)
|
|
{
|
|
switch (index) {
|
|
case H_16M_CACHE_INDEX:
|
|
return HTLB_16M_INDEX;
|
|
case H_16G_CACHE_INDEX:
|
|
return HTLB_16G_INDEX;
|
|
default:
|
|
BUG();
|
|
}
|
|
/* should not reach */
|
|
}
|
|
|
|
#endif /* CONFIG_HUGETLB_PAGE */
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /*_ASM_POWERPC_BOOK3S_64_PGTABLE_4K_H */
|