Skip to content

[PW_SID:1099714] [RESEND] riscv: mm: exclude invalid THP PMDs from page table check #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
linux-riscv-bot wants to merge 1 commit into from
Closed

[PW_SID:1099714] [RESEND] riscv: mm: exclude invalid THP PMDs from page table check #2001

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion arch/riscv/include/asm/pgtable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,14 @@ static inline bool pte_user_accessible_page(struct mm_struct *mm, unsigned long

static inline bool pmd_user_accessible_page(struct mm_struct *mm, unsigned long addr, pmd_t pmd)
{
return pmd_leaf(pmd) && pmd_user(pmd);
/*
* page_table_check() must ignore THP split invalidation entries created by
* pmd_mkinvalid(). These retain _PAGE_LEAF so pmd_present()/pmd_leaf() stay
* true during the split, but they no longer describe a user-accessible
* mapping once both _PAGE_PRESENT and _PAGE_PROT_NONE are cleared.
*/
return (pmd_val(pmd) & (_PAGE_PRESENT | _PAGE_PROT_NONE)) &&
(pmd_val(pmd) & _PAGE_LEAF) && pmd_user(pmd);
}

static inline bool pud_user_accessible_page(struct mm_struct *mm, unsigned long addr, pud_t pud)
Expand Down