arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
PATCH 1/1 arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit a1c76574f345 ("arm64: mm: use *_sect to check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.
---
This applies on v5.13-rc1.
arch/arm64/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/arm64/include/asm/pgtable.h +2 -3
@@ -509,13 +509,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,#define pmd_none (pmd) (!pmd_val(pmd)) -#define pmd_bad (pmd) (!(pmd_val(pmd) & PMD_TABLE_BIT)) -#define pmd_table (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT)#define pmd_leaf (pmd) pmd_sect(pmd) +#define pmd_bad (pmd) (!pmd_table(pmd))#define pmd_leaf_size (pmd) (pmd_cont(pmd) ? CONT_PMD_SIZE : PMD_SIZE)#define pte_leaf_size (pte) (pte_cont(pte) ? CONT_PTE_SIZE : PAGE_SIZE)
@@ -602,7 +601,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))#define pud_none (pud) (!pud_val(pud)) -#define pud_bad (pud) (!(pud_val(pud) & PUD_TABLE_BIT)) +#define pud_bad (pud) (!pud_table(pud))#define pud_present (pud) pte_present(pud_pte(pud))#define pud_leaf (pud) pud_sect(pud)#define pud_valid (pud) pte_valid(pud_pte(pud))
Signature · 7 lines
2.20.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 7 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.
Quoted 6 lines
Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>
I have no strong feelings either way, so:
... that said, I think that the "bad" naming is unclear and misleading, and it'd be really nice if we could clean that up treewide with something clearer than "bad".
It does seem that would roughly fit p??_leaf() if we had p??_clear_leaf() and p??_none_or_clear_leaf() helpers.
Thanks,
Mark.
Quoted 37 lines
---
This applies on v5.13-rc1.arch/arm64/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)arch/arm64/include/asm/pgtable.h +2
-3@@ -509,13 +509,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,#define pmd_none (pmd) (!pmd_val(pmd)) -#define pmd_bad (pmd) (!(pmd_val(pmd) & PMD_TABLE_BIT)) -#define pmd_table (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT)#define pmd_leaf (pmd) pmd_sect(pmd) +#define pmd_bad (pmd) (!pmd_table(pmd))#define pmd_leaf_size (pmd) (pmd_cont(pmd) ? CONT_PMD_SIZE : PMD_SIZE)#define pte_leaf_size (pte) (pte_cont(pte) ? CONT_PTE_SIZE : PAGE_SIZE)@@ -602,7 +601,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))#define pud_none (pud) (!pud_val(pud)) -#define pud_bad (pud) (!(pud_val(pud) & PUD_TABLE_BIT)) +#define pud_bad (pud) (!pud_table(pud))#define pud_present (pud) pte_present(pud_pte(pud))#define pud_leaf (pud) pud_sect(pud)#define pud_valid (pud) pte_valid(pud_pte(pud))Signature · 1 line
2.20.1
Quoted 15 lines · Mark Rutland
Quoted 7 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.Quoted 6 lines
Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>
Quoted 7 lines
I have no strong feelings either way, so:
Acked-by Mark Rutland <[email protected]>... that said, I think that the "bad" naming is unclear and misleading, and it'd be really nice if we could clean that up treewide with something clearer than "bad".
Agreed, the name is misleading.
Quoted 2 lines
It does seem that would roughly fit p??_leaf() if we had
But what if the platform does not support huge page aka leaf mapping at the given level ? Also a non table i.e bad entry might not always mean a leaf/section/huge page mapping, it could simply imply that the entry is not just pointing to next level and might be just in an bad intermediate or invalid state.
Quoted 1 line
p??_clear_leaf() and p??_none_or_clear_leaf() helpers.
Could you please elaborate how these new helpers might help define pxx_bad() ?
Quoted 41 lines
Thanks,
Mark.Quoted 37 lines
---
This applies on v5.13-rc1.arch/arm64/include/asm/pgtable.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)arch/arm64/include/asm/pgtable.h +2
-3@@ -509,13 +509,12 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,#define pmd_none (pmd) (!pmd_val(pmd)) -#define pmd_bad (pmd) (!(pmd_val(pmd) & PMD_TABLE_BIT)) -#define pmd_table (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_TABLE)#define pmd_sect (pmd) ((pmd_val(pmd) & PMD_TYPE_MASK) == \ PMD_TYPE_SECT)#define pmd_leaf (pmd) pmd_sect(pmd) +#define pmd_bad (pmd) (!pmd_table(pmd))#define pmd_leaf_size (pmd) (pmd_cont(pmd) ? CONT_PMD_SIZE : PMD_SIZE)#define pte_leaf_size (pte) (pte_cont(pte) ? CONT_PTE_SIZE : PAGE_SIZE)@@ -602,7 +601,7 @@ static inline unsigned long pmd_page_vaddr(pmd_t pmd) pr_err("%s:%d: bad pmd %016llx.\n", __FILE__, __LINE__, pmd_val(e))#define pud_none (pud) (!pud_val(pud)) -#define pud_bad (pud) (!(pud_val(pud) & PUD_TABLE_BIT)) +#define pud_bad (pud) (!pud_table(pud))#define pud_present (pud) pte_present(pud_pte(pud))#define pud_leaf (pud) pud_sect(pud)#define pud_valid (pud) pte_valid(pud_pte(pud))Signature · 1 line
2.20.1
Mark Rutland
reviewerQuoted 27 lines · Anshuman Khandual
Quoted 15 lines · Mark Rutland
Quoted 7 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.Quoted 6 lines
Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>Quoted 7 lines
I have no strong feelings either way, so:
Acked-by Mark Rutland <[email protected]>... that said, I think that the "bad" naming is unclear and misleading, and it'd be really nice if we could clean that up treewide with something clearer than "bad".
Agreed, the name is misleading.
Quoted 7 lines
Quoted 1 line
It does seem that would roughly fit p??_leaf() if we had
But what if the platform does not support huge page aka leaf mapping at the given level ? Also a non table i.e bad entry might not always mean a leaf/section/huge page mapping, it could simply imply that the entry is not just pointing to next level and might be just in an bad intermediate or invalid state.
Ah, so that's also covering swap entries, too? It's not entirely clear to me what "bad intermediate or invalid state" means, because I assume it's not arbitrary junk or this wouldn't be sound genrally.
I had assumed it was only covering *valid* non-table entries.
Quoted 4 lines
Quoted 1 line
p??_clear_leaf() and p??_none_or_clear_leaf() helpers.
Could you please elaborate how these new helpers might help define
pxx_bad()?
This was based on my (evidently wrong) prior understanding above.
Thanks,
Mark.
Quoted 36 lines · Mark Rutland
Quoted 27 lines · Anshuman Khandual
Quoted 15 lines · Mark Rutland
Quoted 7 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.Quoted 6 lines
Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>Quoted 7 lines
I have no strong feelings either way, so:
Acked-by Mark Rutland <[email protected]>... that said, I think that the "bad" naming is unclear and misleading, and it'd be really nice if we could clean that up treewide with something clearer than "bad".
Agreed, the name is misleading.
Quoted 7 lines
Quoted 1 line
It does seem that would roughly fit p??_leaf() if we had
But what if the platform does not support huge page aka leaf mapping at the given level ? Also a non table i.e bad entry might not always mean a leaf/section/huge page mapping, it could simply imply that the entry is not just pointing to next level and might be just in an bad intermediate or invalid state.
Quoted 3 lines
Ah, so that's also covering swap entries, too? It's not entirely clear to me what "bad intermediate or invalid state" means, because I assume it's not arbitrary junk or this wouldn't be sound genrally.
Intermediate states like swap, migration or probably even splitting THP. Though I am not really sure whether pxx_bad() only gets used for valid table or leaf entries i.e things which are mapped. Hence checking just for non table entry is better and even safer, than looking out for what other states the entry could be in.
Quoted 13 lines
I had assumed it was only covering *valid* non-table entries.
Quoted 4 lines
Quoted 1 line
p??_clear_leaf() and p??_none_or_clear_leaf() helpers.
Could you please elaborate how these new helpers might help define
pxx_bad()?This was based on my (evidently wrong) prior understanding above.
Thanks,
Mark.
Quoted 40 lines · Anshuman Khandual
Quoted 35 lines · Mark Rutland
Quoted 26 lines · Anshuman Khandual
Quoted 15 lines · Mark Rutland
Quoted 7 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.Quoted 6 lines
Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>Cc Mark Rutland <[email protected]>Signed-off-by Anshuman Khandual <[email protected]>Quoted 7 lines
I have no strong feelings either way, so:
Acked-by Mark Rutland <[email protected]>... that said, I think that the "bad" naming is unclear and misleading, and it'd be really nice if we could clean that up treewide with something clearer than "bad".
Agreed, the name is misleading.
Quoted 7 lines
Quoted 1 line
It does seem that would roughly fit p??_leaf() if we had
But what if the platform does not support huge page aka leaf mapping at the given level ? Also a non table i.e bad entry might not always mean a leaf/section/huge page mapping, it could simply imply that the entry is not just pointing to next level and might be just in an bad intermediate or invalid state.
Quoted 3 lines
Ah, so that's also covering swap entries, too? It's not entirely clear to me what "bad intermediate or invalid state" means, because I assume it's not arbitrary junk or this wouldn't be sound genrally.
Quoted 5 lines
Intermediate states like swap, migration or probably even splitting THP. Though I am not really sure whether
pxx_bad()only gets used for valid table or leaf entries i.e things which are mapped. Hence checking just for non table entry is better and even safer, than looking out for what other states the entry could be in.
I had a quick look through some of the uses and it seems the expectation is that after a !pmd_bad(), the pmd is a table. The checks for migration, huge page etc. are prior to the pmd_bad() check.
For this patch:
Quoted 6 lines · Anshuman Khandual
Semantics wise, [pud|pmd]_bad() have always implied that a given [PUD|PMD] entry does not have a pointer to the next level page table. This had been made clear in the commit
a1c76574f345("arm64: mm: use*_sectto check for section maps"). Hence explicitly check for a table entry rather than just testing a single bit. This basically redefines [pud|pmd]_bad() in terms of [pud|pmd]_table() making the semantics clear.
Applied to arm64 (for-next/mm), thanks!
[1/1] arm64/mm: Remove [PUD|PMD]_TABLE_BIT from [pud|pmd]_bad()
https://git.kernel.org/arm64/c/e377ab82311a
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev