Skip to content

Commit c7c386f

Browse files
arndbwilldeacon
authored andcommitted
arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions
gcc warns about undefined behavior the vmalloc code when building with CONFIG_ARM64_PA_BITS_52, when the 'idx++' in the argument to __phys_to_pte_val() is evaluated twice: mm/vmalloc.c: In function 'vmap_pfn_apply': mm/vmalloc.c:2800:58: error: operation on 'data->idx' may be undefined [-Werror=sequence-point] 2800 | *pte = pte_mkspecial(pfn_pte(data->pfns[data->idx++], data->prot)); | ~~~~~~~~~^~ arch/arm64/include/asm/pgtable-types.h:25:37: note: in definition of macro '__pte' 25 | #define __pte(x) ((pte_t) { (x) } ) | ^ arch/arm64/include/asm/pgtable.h:80:15: note: in expansion of macro '__phys_to_pte_val' 80 | __pte(__phys_to_pte_val((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) | ^~~~~~~~~~~~~~~~~ mm/vmalloc.c:2800:30: note: in expansion of macro 'pfn_pte' 2800 | *pte = pte_mkspecial(pfn_pte(data->pfns[data->idx++], data->prot)); | ^~~~~~~ I have no idea why this never showed up earlier, but the safest workaround appears to be changing those macros into inline functions so the arguments get evaluated only once. Cc: Matthew Wilcox <[email protected]> Fixes: 75387b9 ("arm64: handle 52-bit physical addresses in page table entries") Signed-off-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent c6975d7 commit c7c386f

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

arch/arm64/include/asm/pgtable.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,15 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
6767
* page table entry, taking care of 52-bit addresses.
6868
*/
6969
#ifdef CONFIG_ARM64_PA_BITS_52
70-
#define __pte_to_phys(pte) \
71-
((pte_val(pte) & PTE_ADDR_LOW) | ((pte_val(pte) & PTE_ADDR_HIGH) << 36))
72-
#define __phys_to_pte_val(phys) (((phys) | ((phys) >> 36)) & PTE_ADDR_MASK)
70+
static inline phys_addr_t __pte_to_phys(pte_t pte)
71+
{
72+
return (pte_val(pte) & PTE_ADDR_LOW) |
73+
((pte_val(pte) & PTE_ADDR_HIGH) << 36);
74+
}
75+
static inline pteval_t __phys_to_pte_val(phys_addr_t phys)
76+
{
77+
return (phys | (phys >> 36)) & PTE_ADDR_MASK;
78+
}
7379
#else
7480
#define __pte_to_phys(pte) (pte_val(pte) & PTE_ADDR_MASK)
7581
#define __phys_to_pte_val(phys) (phys)

0 commit comments

Comments
 (0)