Commit f5397c3e authored by Nanyong Sun's avatar Nanyong Sun Committed by Palmer Dabbelt

riscv: mm: add _PAGE_LEAF macro

In riscv, a page table entry is leaf when any bit of read, write,
or execute bit is set. So add a macro:_PAGE_LEAF instead of
(_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC), which is frequently used
to determine if it is a leaf page. This make code easier to read,
without any functional change.
Signed-off-by: default avatarNanyong Sun <sunnanyong@huawei.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 6efb943b
...@@ -46,8 +46,7 @@ static inline int pud_bad(pud_t pud) ...@@ -46,8 +46,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 int pud_leaf(pud_t pud)
{ {
return pud_present(pud) && return pud_present(pud) && (pud_val(pud) & _PAGE_LEAF);
(pud_val(pud) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC));
} }
static inline void set_pud(pud_t *pudp, pud_t pud) static inline void set_pud(pud_t *pudp, pud_t pud)
......
...@@ -39,5 +39,10 @@ ...@@ -39,5 +39,10 @@
#define _PAGE_CHG_MASK (~(unsigned long)(_PAGE_PRESENT | _PAGE_READ | \ #define _PAGE_CHG_MASK (~(unsigned long)(_PAGE_PRESENT | _PAGE_READ | \
_PAGE_WRITE | _PAGE_EXEC | \ _PAGE_WRITE | _PAGE_EXEC | \
_PAGE_USER | _PAGE_GLOBAL)) _PAGE_USER | _PAGE_GLOBAL))
/*
* when all of R/W/X are zero, the PTE is a pointer to the next level
* of the page table; otherwise, it is a leaf PTE.
*/
#define _PAGE_LEAF (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC)
#endif /* _ASM_RISCV_PGTABLE_BITS_H */ #endif /* _ASM_RISCV_PGTABLE_BITS_H */
...@@ -190,8 +190,7 @@ static inline int pmd_bad(pmd_t pmd) ...@@ -190,8 +190,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 int pmd_leaf(pmd_t pmd)
{ {
return pmd_present(pmd) && return pmd_present(pmd) && (pmd_val(pmd) & _PAGE_LEAF);
(pmd_val(pmd) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC));
} }
static inline void set_pmd(pmd_t *pmdp, pmd_t pmd) static inline void set_pmd(pmd_t *pmdp, pmd_t pmd)
...@@ -267,8 +266,7 @@ static inline int pte_exec(pte_t pte) ...@@ -267,8 +266,7 @@ static inline int pte_exec(pte_t pte)
static inline int pte_huge(pte_t pte) static inline int pte_huge(pte_t pte)
{ {
return pte_present(pte) return pte_present(pte) && (pte_val(pte) & _PAGE_LEAF);
&& (pte_val(pte) & (_PAGE_READ | _PAGE_WRITE | _PAGE_EXEC));
} }
static inline int pte_dirty(pte_t pte) static inline int pte_dirty(pte_t pte)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment