Skip to content

Commit 3766a1a

Browse files
kirylozbenh
authored andcommitted
mm/thp: define HPAGE_PMD_* constants as BUILD_BUG() if !THP
Currently, HPAGE_PMD_* constans rely on PMD_SHIFT regardless of CONFIG_TRANSPARENT_HUGEPAGE. PMD_SHIFT is not defined everywhere (e.g. arm nommu case). It means we can't use anything like this in generic code: if (PageTransHuge(page)) zero_huge_user(page, 0, HPAGE_PMD_SIZE); else clear_highpage(page); For !THP case, PageTransHuge() is 0 and compiler can eliminate zero_huge_user() call. But it still need to be valid C expression, means HPAGE_PMD_SIZE has to expand to something compiler can understand. Previously, HPAGE_PMD_* were defined to BUILD_BUG() for !THP. Let's come back to it. Signed-off-by: Kirill A. Shutemov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
1 parent 5459ae1 commit 3766a1a

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

include/linux/huge_mm.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ extern pmd_t *page_check_address_pmd(struct page *page,
5858

5959
#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
6060
#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
61+
62+
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
6163
#define HPAGE_PMD_SHIFT PMD_SHIFT
6264
#define HPAGE_PMD_SIZE ((1UL) << HPAGE_PMD_SHIFT)
6365
#define HPAGE_PMD_MASK (~(HPAGE_PMD_SIZE - 1))
6466

65-
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
6667
extern bool is_vma_temporary_stack(struct vm_area_struct *vma);
6768

6869
#define transparent_hugepage_enabled(__vma) \
@@ -180,6 +181,9 @@ extern int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vm
180181
unsigned long addr, pmd_t pmd, pmd_t *pmdp);
181182

182183
#else /* CONFIG_TRANSPARENT_HUGEPAGE */
184+
#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
185+
#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })
186+
#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })
183187

184188
#define hpage_nr_pages(x) 1
185189

0 commit comments

Comments
 (0)