From: Michael Neuling <mikey@neuling.org>
To: paulus@samba.org
Cc: linuxppc-dev@ozlabs.org
Subject: [PATCH] fixes for the SLB shadow buffer
Date: Wed, 01 Aug 2007 14:56:12 +1000 [thread overview]
Message-ID: <17055.1185944172@neuling.org> (raw)
We sometimes change the vmalloc segment in slb_flush_and_rebolt but we
never updated with slb shadow buffer. This fixes it. Thanks to paulus
for finding this.
Also added some write barriers to ensure the shadow buffer is always
valid.
Signed-off-by: Michael Neuling <mikey@neuling.org>
---
Paulus: unless someone has a problem with my implementation, this should
go up for 2.6.23.
arch/powerpc/kernel/entry_64.S | 2 ++
arch/powerpc/mm/hash_utils_64.c | 7 +++++++
arch/powerpc/mm/slb.c | 10 +++++-----
include/asm-powerpc/mmu-hash64.h | 4 ++++
4 files changed, 18 insertions(+), 5 deletions(-)
Index: linux-2.6-ozlabs/arch/powerpc/kernel/entry_64.S
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/kernel/entry_64.S
+++ linux-2.6-ozlabs/arch/powerpc/kernel/entry_64.S
@@ -389,7 +389,9 @@ BEGIN_FTR_SECTION
ld r9,PACA_SLBSHADOWPTR(r13)
li r12,0
std r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
+ eieio
std r7,SLBSHADOW_STACKVSID(r9) /* Save VSID */
+ eieio
std r0,SLBSHADOW_STACKESID(r9) /* Save ESID */
slbie r6
Index: linux-2.6-ozlabs/arch/powerpc/mm/hash_utils_64.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/mm/hash_utils_64.c
+++ linux-2.6-ozlabs/arch/powerpc/mm/hash_utils_64.c
@@ -629,6 +629,9 @@ int hash_page(unsigned long ea, unsigned
cpumask_t tmp;
int rc, user_region = 0, local = 0;
int psize;
+#ifdef CONFIG_PPC_64K_PAGES
+ unsigned long vflags;
+#endif
DBG_LOW("hash_page(ea=%016lx, access=%lx, trap=%lx\n",
ea, access, trap);
@@ -759,6 +762,10 @@ int hash_page(unsigned long ea, unsigned
mmu_psize_defs[mmu_vmalloc_psize].sllp) {
get_paca()->vmalloc_sllp =
mmu_psize_defs[mmu_vmalloc_psize].sllp;
+ vflags = SLB_VSID_KERNEL |
+ mmu_psize_defs[mmu_vmalloc_psize].sllp;
+ slb_shadow_update(mk_esid_data(VMALLOC_START, 1),
+ mk_vsid_data(VMALLOC_START, vflags), 1);
slb_flush_and_rebolt();
}
#endif /* CONFIG_PPC_64K_PAGES */
Index: linux-2.6-ozlabs/arch/powerpc/mm/slb.c
===================================================================
--- linux-2.6-ozlabs.orig/arch/powerpc/mm/slb.c
+++ linux-2.6-ozlabs/arch/powerpc/mm/slb.c
@@ -43,17 +43,17 @@ static void slb_allocate(unsigned long e
slb_allocate_realmode(ea);
}
-static inline unsigned long mk_esid_data(unsigned long ea, unsigned long slot)
+unsigned long mk_esid_data(unsigned long ea, unsigned long slot)
{
return (ea & ESID_MASK) | SLB_ESID_V | slot;
}
-static inline unsigned long mk_vsid_data(unsigned long ea, unsigned long flags)
+unsigned long mk_vsid_data(unsigned long ea, unsigned long flags)
{
return (get_kernel_vsid(ea) << SLB_VSID_SHIFT) | flags;
}
-static inline void slb_shadow_update(unsigned long esid, unsigned long vsid,
+void slb_shadow_update(unsigned long esid, unsigned long vsid,
unsigned long entry)
{
/*
@@ -61,9 +61,9 @@ static inline void slb_shadow_update(uns
* updating it.
*/
get_slb_shadow()->save_area[entry].esid = 0;
- barrier();
+ smp_wmb();
get_slb_shadow()->save_area[entry].vsid = vsid;
- barrier();
+ smp_wmb();
get_slb_shadow()->save_area[entry].esid = esid;
}
Index: linux-2.6-ozlabs/include/asm-powerpc/mmu-hash64.h
===================================================================
--- linux-2.6-ozlabs.orig/include/asm-powerpc/mmu-hash64.h
+++ linux-2.6-ozlabs/include/asm-powerpc/mmu-hash64.h
@@ -262,6 +262,10 @@ extern void slb_initialize(void);
extern void slb_flush_and_rebolt(void);
extern void stab_initialize(unsigned long stab);
+extern unsigned long mk_esid_data(unsigned long ea, unsigned long slot);
+extern unsigned long mk_vsid_data(unsigned long ea, unsigned long flags);
+extern void slb_shadow_update(unsigned long esid, unsigned long vsid,
+ unsigned long entry);
#endif /* __ASSEMBLY__ */
/*
next reply other threads:[~2007-08-01 4:56 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-01 4:56 Michael Neuling [this message]
2007-08-01 5:28 ` [PATCH] fixes for the SLB shadow buffer Paul Mackerras
2007-08-01 6:02 ` Michael Neuling
2007-08-01 21:48 ` Will Schmidt
2007-08-02 5:56 ` Michael Neuling
2007-08-02 7:31 ` Benjamin Herrenschmidt
2007-08-02 8:56 ` Michael Neuling
2007-08-02 8:58 ` Benjamin Herrenschmidt
2007-08-02 9:03 ` Michael Neuling
2007-08-02 9:14 ` Benjamin Herrenschmidt
2007-08-02 9:28 ` Michael Neuling
2007-08-03 1:55 ` Michael Neuling
2007-08-03 2:50 ` Benjamin Herrenschmidt
2007-08-01 22:33 ` Benjamin Herrenschmidt
2007-08-01 23:32 ` Michael Neuling
2007-08-02 0:05 ` Benjamin Herrenschmidt
2007-08-02 1:04 ` Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17055.1185944172@neuling.org \
--to=mikey@neuling.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).