| Message ID | BLU0-SMTP8691FD3EB8749D3303BA57972D0@phx.gbl (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 2013-01-14 at 19:45 -0500, John David Anglin wrote: > Attached is new version of patch which no longer saves and restores > %sr1. Lightly tested with a GCC build > and a build of Debian gtk+3.0 package. I can merge it with your previous changelog, but for ease of git users, the accepted format is <patch description for git> --- <Any other details you don't want in git> git ignores everything after the three dashes on a single line. So your preamble should be (I also added an explanation of why we think the problem is occurring): This patch goes a long way toward fixing the minifail bug, and it significantly improves the stability of SMP machines such as the rp3440. When write protecting a page for COW, we need to purge the existing translation. Otherwise, the COW break doesn't occur as expected because the TLB may still have a stale entry which allows writes. Signed-off-by: John David Anglin <dave.anglin@bell.net> --- v2: Attached is new version of patch which no longer saves and restores %sr1. Lightly tested with a GCC build and a build of Debian gtk+3.0 package. James -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
James Bottomley wrote: > On Mon, 2013-01-14 at 19:45 -0500, John David Anglin wrote: > > Attached is new version of patch which no longer saves and restores > > %sr1. Lightly tested with a GCC build > > and a build of Debian gtk+3.0 package. > > I can merge it with your previous changelog, but for ease of git users, > the accepted format is > v2: Attached is new version of patch which no longer saves and > restores %sr1. Lightly tested with a GCC build and a build of > Debian gtk+3.0 package. Do we want that to go back into stable kernels? Eike
Hi Rolf, On 01/16/2013 10:44 PM, Rolf Eike Beer wrote: > James Bottomley wrote: >> On Mon, 2013-01-14 at 19:45 -0500, John David Anglin wrote: >>> Attached is new version of patch which no longer saves and restores >>> %sr1. Lightly tested with a GCC build >>> and a build of Debian gtk+3.0 package. >> >> I can merge it with your previous changelog, but for ease of git users, >> the accepted format is > >> v2: Attached is new version of patch which no longer saves and >> restores %sr1. Lightly tested with a GCC build and a build of >> Debian gtk+3.0 package. > > Do we want that to go back into stable kernels? Short answer: Yes. Long answer: First we need those patches upstream - which is what did not happened yet. Then I wanted to take a look what we can send to stable. Helge -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h index ee99f23..2c6dedb 100644 --- a/arch/parisc/include/asm/pgtable.h +++ b/arch/parisc/include/asm/pgtable.h @@ -12,11 +12,10 @@ #include <linux/bitops.h> #include <linux/spinlock.h> +#include <linux/mm_types.h> #include <asm/processor.h> #include <asm/cache.h> -struct vm_area_struct; - /* * kern_addr_valid(ADDR) tests if ADDR is pointing to valid kernel * memory. For the return value to be meaningful, ADDR must be >= @@ -40,7 +39,14 @@ struct vm_area_struct; do{ \ *(pteptr) = (pteval); \ } while(0) -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) + +extern void purge_tlb_entries(struct mm_struct *, unsigned long); + +#define set_pte_at(mm,addr,ptep, pteval) \ + do{ \ + set_pte(ptep,pteval); \ + purge_tlb_entries(mm,addr); \ + } while(0) #endif /* !__ASSEMBLY__ */ @@ -466,6 +472,7 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, old = pte_val(*ptep); new = pte_val(pte_wrprotect(__pte (old))); } while (cmpxchg((unsigned long *) ptep, old, new) != old); + purge_tlb_entries(mm, addr); #else pte_t old_pte = *ptep; set_pte_at(mm, addr, ptep, pte_wrprotect(old_pte)); diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 48e16dc..1524fd8 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -419,6 +419,24 @@ void kunmap_parisc(void *addr) EXPORT_SYMBOL(kunmap_parisc); #endif +void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) +{ + unsigned long flags; + + /* Note: purge_tlb_entries can be called at startup with + no context. */ + + /* Disable preemption while we play with %sr1. */ + preempt_disable(); + mtsp(mm->context,1); + purge_tlb_start(flags); + pdtlb(addr); + pitlb(addr); + purge_tlb_end(flags); + preempt_enable(); +} +EXPORT_SYMBOL(purge_tlb_entries); + void __flush_tlb_range(unsigned long sid, unsigned long start, unsigned long end) {
Attached is new version of patch which no longer saves and restores %sr1. Lightly tested with a GCC build and a build of Debian gtk+3.0 package. Signed-off-by: John David Anglin <dave.anglin@bell.net> Dave -- John David Anglin dave.anglin@bell.net