Patchwork sparc: huge_ptep_set_* functions need to call set_huge_pte_at()

login
register
mail settings
Submitter Dave Kleikamp
Date Dec. 14, 2012, 9:02 p.m.
Message ID <50CB93C8.8010802@oracle.com>
Download mbox | patch
Permalink /patch/206559/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Dave Kleikamp - Dec. 14, 2012, 9:02 p.m.
Modifying the huge pte's requires that all the underlying pte's be
modified.

Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: sparclinux@vger.kernel.org
---
 arch/sparc/include/asm/hugetlb.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
David Miller - Dec. 16, 2012, 4:52 p.m.
From: Dave Kleikamp <dave.kleikamp@oracle.com>
Date: Fri, 14 Dec 2012 15:02:00 -0600

>  static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
>  					     unsigned long addr, pte_t *ptep,
>  					     pte_t pte, int dirty)
>  {
> -	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
> +	int changed = !pte_same(*ptep, pte);
> +	if (changed)
> +		set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
> +	return changed;
>  }
>  
>  static inline pte_t huge_ptep_get(pte_t *ptep)

This lacks the TLB flush after setting the pte, which is really
needed.

--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index 8c5eed6..ef3fce5 100644
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -61,14 +61,18 @@  static inline pte_t huge_pte_wrprotect(pte_t pte)
 static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
 					   unsigned long addr, pte_t *ptep)
 {
-	ptep_set_wrprotect(mm, addr, ptep);
+	pte_t old_pte = *ptep;
+	set_huge_pte_at(mm, addr, ptep, pte_wrprotect(old_pte));
 }
 
 static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
 					     unsigned long addr, pte_t *ptep,
 					     pte_t pte, int dirty)
 {
-	return ptep_set_access_flags(vma, addr, ptep, pte, dirty);
+	int changed = !pte_same(*ptep, pte);
+	if (changed)
+		set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
+	return changed;
 }
 
 static inline pte_t huge_ptep_get(pte_t *ptep)