arch/powerpc/hugetlb: Use pte_access_permitted for hugetlb access check
PATCH 1/3 arch/powerpc/hugetlb: Use pte_access_permitted for hugetlb access check
No functional change in this patch. This update gup_hugepte to use the helper. This will help later when we add memory keys.
--- arch/powerpc/mm/hugetlbpage.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/powerpc/mm/hugetlbpage.c +1 -3
@@ -855,9 +855,7 @@ int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, pte =READ_ONCE (*ptep); -if (!pte_present (pte) || !pte_read (pte)) -return 0 ; -if (write && !pte_write (pte)) +if (!pte_access_permitted (pte, write))return 0 ;/* hugepages are never "special" */
Signature · 1 line
2.14.3
PATCH 2/3 powerpc/mm/book3s/64: Add proper pte access check helper
pte_access_premitted get called in get_user_pages_fast path. If we have marked the pte PROT_NONE, we should not allow a read access on the address. With the current implementation we are not checking the READ and only check for WRITE. This is needed on archs like ppc64 that implement PROT_NONE using RWX access instead of _PAGE_PRESENT. Also add pte_user check just to make sure we are not accessing kernel mapping.
--- arch/powerpc/include/asm/book3s/64/pgtable.h | 41 ++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
arch/powerpc/include/asm/book3s/64/pgtable.h +41 -0
@@ -520,6 +520,30 @@ static inline int pte_present(pte_t pte) {return !!(pte_raw (pte) &cpu_to_be64 (_PAGE_PRESENT)); } + +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ +unsigned long pteval =pte_val (pte); +/* Also check for pte_user */ +unsigned long clear_pte_bits = _PAGE_PRIVILEGED; +/* +* _PAGE_READ is needed for any access and will be +* cleared for PROT_NONE +*/ +unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_READ; + +if (write) + need_pte_bits |= _PAGE_WRITE; + +if ((pteval & need_pte_bits) != need_pte_bits) +return false; + +if ((pteval & clear_pte_bits) == clear_pte_bits) +return false; +return true; +} +/* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to.
@@ -824,6 +848,11 @@ static inline int pud_bad(pud_t pud)return hash__pud_bad (pud); } +#define pud_access_permitted pud_access_permitted +static inline bool pud_access_permitted (pud_t pud,bool write) +{ +return pte_access_permitted (pud_pte (pud), write); +}#define pgd_write (pgd) pte_write(pgd_pte(pgd))static inline void pgd_set (pgd_t *pgdp,unsigned long val)
@@ -863,6 +892,12 @@ static inline int pgd_bad(pgd_t pgd)return hash__pgd_bad (pgd); } +#define pgd_access_permitted pgd_access_permitted +static inline bool pgd_access_permitted (pgd_t pgd,bool write) +{ +return pte_access_permitted (pgd_pte (pgd), write); +} +extern struct page *pgd_page (pgd_t pgd);/* Pointers in the page table tree are physical addresses */
@@ -984,6 +1019,12 @@ static inline int pmd_protnone(pmd_t pmd)#define __pmd_write (pmd) __pte_write(pmd_pte(pmd))#define pmd_savedwrite (pmd) pte_savedwrite(pmd_pte(pmd)) +#define pmd_access_permitted pmd_access_permitted +static inline bool pmd_access_permitted (pmd_t pmd,bool write) +{ +return pte_access_permitted (pmd_pte (pmd), write); +} +#ifdef CONFIG_TRANSPARENT_HUGEPAGE extern pmd_t pfn_pmd (unsigned long pfn,pgprot_t pgprot);extern pmd_t mk_pmd (struct page *page,pgprot_t pgprot);
Signature · 1 line
2.14.3
PATCH 3/3 powerpc/mm/ Add proper pte access check helper
In reply to Aneesh Kumar K.Vpte_access_premitted get called in get_user_pages_fast path. If we have marked the pte PROT_NONE, we should not allow a read access on the address. With the current implementation we are not checking the READ and only check for WRITE. This is needed on archs like ppc64 that implement PROT_NONE using _PAGE_USER access instead of _PAGE_PRESENT. Also add pte_user check just to make sure we are not accessing kernel mapping.
Even though there is code duplication, keeping the low level pte accessors different for different platforms helps in code readability.
--- arch/powerpc/include/asm/book3s/32/pgtable.h | 23 +++++++++++++++++++++++ arch/powerpc/include/asm/nohash/pgtable.h | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+)
arch/powerpc/include/asm/book3s/32/pgtable.h +23 -0
@@ -311,6 +311,29 @@ static inline int pte_present(pte_t pte)return pte_val (pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level +* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ +unsigned long pteval =pte_val (pte); +/* +* A read-only access is controlled by _PAGE_USER bit. +* We have _PAGE_READ set for WRITE and EXECUTE +*/ +unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; + +if (write) + need_pte_bits |= _PAGE_WRITE; + +if ((pteval & need_pte_bits) != need_pte_bits) +return false; + +return true; +} +/* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. *
arch/powerpc/include/asm/nohash/pgtable.h +23 -0
@@ -45,6 +45,29 @@ static inline int pte_present(pte_t pte)return pte_val (pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level +* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ +unsigned long pteval =pte_val (pte); +/* +* A read-only access is controlled by _PAGE_USER bit. +* We have _PAGE_READ set for WRITE and EXECUTE +*/ +unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; + +if (write) + need_pte_bits |= _PAGE_WRITE; + +if ((pteval & need_pte_bits) != need_pte_bits) +return false; + +return true; +} +/* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. *
Signature · 1 line
2.14.3
Re: [PATCH 3/3] powerpc/mm/ Add proper pte access check helper
Le 04/12/2017 à 03:19, Aneesh Kumar K.V a écrit :
Quoted 60 lines
pte_access_premittedget called inget_user_pages_fastpath. If we have marked the ptePROT_NONE, we should not allow a read access on the address. With the current implementation we are not checking the READ and only check for WRITE. This is needed on archs like ppc64 that implementPROT_NONEusing_PAGE_USERaccess instead of_PAGE_PRESENT. Also addpte_usercheck just to make sure we are not accessing kernel mapping.Even though there is code duplication, keeping the low level pte accessors different for different platforms helps in code readability.
Signed-off-by Aneesh Kumar K.V <[email protected]>--- arch/powerpc/include/asm/book3s/32/pgtable.h | 23 +++++++++++++++++++++++ arch/powerpc/include/asm/nohash/pgtable.h | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+)arch/powerpc/include/asm/book3s/32/pgtable.h +23
-0@@ -311,6 +311,29 @@ static inline int pte_present(pte_t pte)return pte_val (pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level +* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ +unsigned long pteval =pte_val (pte); +/* +* A read-only access is controlled by _PAGE_USER bit. +* We have _PAGE_READ set for WRITE and EXECUTE +*/ +unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; + +if (write) + need_pte_bits |= _PAGE_WRITE; + +if ((pteval & need_pte_bits) != need_pte_bits) +return false; + +return true; +} +/* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. * arch/powerpc/include/asm/nohash/pgtable.h +2
-0@@ -45,6 +45,29 @@ static inline int pte_present(pte_t pte)return pte_val (pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level
arch/powerpc/include/asm/nohash/pgtable.h static inline int pte_present(pte_t pte) · line 59
Quoted 10 lines
arch/powerpc/include/asm/nohash/pgtable.h +10
-0+* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ +unsigned long pteval =pte_val (pte); +/* +* A read-only access is controlled by _PAGE_USER bit. +* We have _PAGE_READ set for WRITE and EXECUTE +*/
Not fully right. asm/pte-common.h defines:
#define PAGE_NONE __pgprot(_PAGE_BASE | _PAGE_NA)
#define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)
#define PAGE_SHARED_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW | \ _PAGE_EXEC) #define PAGE_COPY __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO) #define PAGE_COPY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO | \ _PAGE_EXEC) #define PAGE_READONLY __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO) #define PAGE_READONLY_X __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO | \ _PAGE_EXEC)
On the 8xx, _PAGE_USER = 0
arch/powerpc/include/asm/nohash/pgtable.h static inline int pte_present(pte_t pte) · line 66
Quoted 7 lines
arch/powerpc/include/asm/nohash/pgtable.h +7
-0+unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; + +if (write) + need_pte_bits |= _PAGE_WRITE; + +if ((pteval & need_pte_bits) != need_pte_bits) +return false;
This test is not fully correct:
- To check access(read) permission, you also have to check that _PAGE_NA is not set.
- To check write permission, you also have to check that neither _PAGE_NA nor _PAGE_RO are set.
On the 8xx, you have:_PAGE_RW = _PAGE_WRITE = 0_PAGE_NA = 0x0200_PAGE_RO = 0x0600
Christophe
Quoted 8 lines
arch/powerpc/include/asm/nohash/pgtable.h +4
-0+ +return true; +} +/* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. *
Re: [PATCH 3/3] powerpc/mm/ Add proper pte access check helper
Le 17/08/2018 à 17:12, Christophe LEROY a écrit :
Quoted 87 lines
Le 04/12/2017 à 03:19, Aneesh Kumar K.V a écrit :
Quoted 60 lines
pte_access_premittedget called inget_user_pages_fastpath. If we have marked the ptePROT_NONE, we should not allow a read access on the address. With the current implementation we are not checking the READ and only check for WRITE. This is needed on archs like ppc64 that implementPROT_NONEusing_PAGE_USERaccess instead of_PAGE_PRESENT. Also addpte_usercheck just to make sure we are not accessing kernel mapping.Even though there is code duplication, keeping the low level pte accessors different for different platforms helps in code readability.
Signed-off-by Aneesh Kumar K.V <[email protected]>---
arch/powerpc/include/asm/book3s/32/pgtable.h| 23
+++++++++++++++++++++++
arch/powerpc/include/asm/nohash/pgtable.h | 23
+++++++++++++++++++++++2 files changed, 46 insertions(+)arch/powerpc/include/asm/book3s/32/pgtable.h +23
-0@@ -311,6 +311,29 @@ static inline int pte_present(pte_t pte) return pte_val(pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level +* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ + unsigned long pteval = pte_val(pte); + /* + * A read-only access is controlled by _PAGE_USER bit. + * We have _PAGE_READ set for WRITE and EXECUTE + */ + unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER; + + if (write) + need_pte_bits |= _PAGE_WRITE; + + if ((pteval & need_pte_bits) != need_pte_bits) + return false; + + return true; +} + /* Conversion functions: convert a page and protection to a page entry,* and a page entry and page directory to the page they refer to. * arch/powerpc/include/asm/nohash/pgtable.h +2
-0@@ -45,6 +45,29 @@ static inline int pte_present(pte_t pte) return pte_val(pte) & _PAGE_PRESENT; } +/* +* We only find page table entry in the last level arch/powerpc/include/asm/nohash/pgtable.h static inline int pte_present(pte_t pte) · line 58
Quoted 10 lines
arch/powerpc/include/asm/nohash/pgtable.h +10
-0+* Hence no need for other accessors +*/ +#define pte_access_permitted pte_access_permitted +static inline bool pte_access_permitted (pte_t pte,bool write) +{ + unsigned long pteval = pte_val(pte); + /* +* A read-only access is controlled by _PAGE_USER bit. +* We have _PAGE_READ set for WRITE and EXECUTE +*/ Not fully right.
asm/pte-common.hdefines:#define PAGE_NONE
__pgprot(_PAGE_BASE | _PAGE_NA)
#define PAGE_SHARED__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW)#define PAGE_SHARED_X __pgprot(_PAGE_BASE |_PAGE_USER|_PAGE_RW| \
_PAGE_EXEC)
#define PAGE_COPY__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO)#define PAGE_COPY_X __pgprot(_PAGE_BASE |_PAGE_USER|_PAGE_RO| \
_PAGE_EXEC)
#define PAGE_READONLY__pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RO)#define PAGE_READONLY_X __pgprot(_PAGE_BASE |_PAGE_USER|_PAGE_RO| \
_PAGE_EXEC)
Quoted 3 lines
On the 8xx,
_PAGE_USER= 0Quoted 1 line
arch/powerpc/include/asm/nohash/pgtable.h +1
-0+ unsigned long need_pte_bits = _PAGE_PRESENT | _PAGE_USER;
_PAGE_PRIVILEGED should be checked as well.
Indeed, it seems like our patches crossed each other. My patch for adding _PAGE_PRIVILEGED is date January 16th while your's was merged on the 17th.
I'm wondering if there are other places that are missing _PAGE_RO handling and _PAGE_PRIVILEGED handling. Do you remember if you added any recently ?
Christophe
Quoted 28 lines
arch/powerpc/include/asm/nohash/pgtable.h static inline int pte_present(pte_t pte) · line 65
Quoted 6 lines
arch/powerpc/include/asm/nohash/pgtable.h +6
-0+ + if (write) + need_pte_bits |= _PAGE_WRITE; + + if ((pteval & need_pte_bits) != need_pte_bits) + return false;This test is not fully correct:
- To check access(read) permission, you also have to check that_PAGE_NAis not set.
- To check write permission, you also have to check that neither_PAGE_NAnor_PAGE_ROare set.On the 8xx, you have:
_PAGE_RW=_PAGE_WRITE= 0_PAGE_NA=0x0200_PAGE_RO=0x0600Christophe
Quoted 8 lines
arch/powerpc/include/asm/nohash/pgtable.h +4
-0+ + return true; +} + /* Conversion functions: convert a page and protection to a page entry,* and a page entry and page directory to the page they refer to. *
Quoted 4 lines · Aneesh Kumar K.V
No functional change in this patch. This update
gup_hugepteto use the helper. This will help later when we add memory keys.Signed-off-by Aneesh Kumar K.V <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/5fa5b16be5b319184378870467352e
cheers
Le 04/12/2017 à 03:19, Aneesh Kumar K.V a écrit :
Quoted 13 lines
No functional change in this patch. This update
gup_hugepteto use the helper. This will help later when we add memory keys.Signed-off-by Aneesh Kumar K.V <[email protected]>--- arch/powerpc/mm/hugetlbpage.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)arch/powerpc/mm/hugetlbpage.c +0
-0
arch/powerpc/mm/hugetlbpage.c int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, · line 858
Quoted 7 lines
arch/powerpc/mm/hugetlbpage.c +1
-3@@ -855,9 +855,7 @@ int gup_hugepte(pte_t *ptep, unsigned long sz, unsigned long addr, pte =READ_ONCE (*ptep); -if (!pte_present (pte) || !pte_read (pte)) -return 0 ; -if (write && !pte_write (pte)) +if (!pte_access_permitted (pte, write))
Seems like pte_access_permitted() doesn't check _PAGE_RO whereas pte_write() does.
Christophe
Quoted 4 lines
arch/powerpc/mm/hugetlbpage.c +0
-0return 0 ;/* hugepages are never "special" */