The patch titled
powerpc vdso updates
has been added to the -mm tree. Its filename is
powerpc-vdso-updates.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: powerpc vdso updates
From: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Clean up some locking & error handling in the ppc vdso and moves the vdso
base pointer from the thread struct to the mm context where it more
logically belongs. It brings the powerpc implementation closer to Ingo's
new x86 one and also adds an arch_vma_name() function allowing to print
[vsdo] in /proc/<pid>/maps if Ingo's x86 vdso patch is also applied.
Signed-off-by: Benjamin Herrenschidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Reviewed-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/powerpc/kernel/signal_32.c | 8 ++--
arch/powerpc/kernel/signal_64.c | 4 +-
arch/powerpc/kernel/vdso.c | 57 ++++++++++++++++++------------
include/asm-powerpc/elf.h | 2 -
include/asm-powerpc/mmu.h | 1
include/asm-powerpc/page.h | 3 +
include/asm-powerpc/processor.h | 1
7 files changed, 47 insertions(+), 29 deletions(-)
diff -puN arch/powerpc/kernel/signal_32.c~powerpc-vdso-updates arch/powerpc/kernel/signal_32.c
--- 25/arch/powerpc/kernel/signal_32.c~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/arch/powerpc/kernel/signal_32.c Fri Jun 2 13:53:18 2006
@@ -757,10 +757,10 @@ static int handle_rt_signal(unsigned lon
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
- if (vdso32_rt_sigtramp && current->thread.vdso_base) {
+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
if (save_user_regs(regs, frame, 0))
goto badframe;
- regs->link = current->thread.vdso_base + vdso32_rt_sigtramp;
+ regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
} else {
if (save_user_regs(regs, frame, __NR_rt_sigreturn))
goto badframe;
@@ -1029,10 +1029,10 @@ static int handle_signal(unsigned long s
|| __put_user(sig, &sc->signal))
goto badframe;
- if (vdso32_sigtramp && current->thread.vdso_base) {
+ if (vdso32_sigtramp && current->mm->context.vdso_base) {
if (save_user_regs(regs, &frame->mctx, 0))
goto badframe;
- regs->link = current->thread.vdso_base + vdso32_sigtramp;
+ regs->link = current->mm->context.vdso_base + vdso32_sigtramp;
} else {
if (save_user_regs(regs, &frame->mctx, __NR_sigreturn))
goto badframe;
diff -puN arch/powerpc/kernel/signal_64.c~powerpc-vdso-updates arch/powerpc/kernel/signal_64.c
--- 25/arch/powerpc/kernel/signal_64.c~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/arch/powerpc/kernel/signal_64.c Fri Jun 2 13:53:18 2006
@@ -394,8 +394,8 @@ static int setup_rt_frame(int signr, str
current->thread.fpscr.val = 0;
/* Set up to return from userspace. */
- if (vdso64_rt_sigtramp && current->thread.vdso_base) {
- regs->link = current->thread.vdso_base + vdso64_rt_sigtramp;
+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
+ regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
if (err)
diff -puN arch/powerpc/kernel/vdso.c~powerpc-vdso-updates arch/powerpc/kernel/vdso.c
--- 25/arch/powerpc/kernel/vdso.c~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/arch/powerpc/kernel/vdso.c Fri Jun 2 13:53:18 2006
@@ -223,6 +223,7 @@ int arch_setup_additional_pages(struct l
struct vm_area_struct *vma;
unsigned long vdso_pages;
unsigned long vdso_base;
+ int rc;
#ifdef CONFIG_PPC64
if (test_thread_flag(TIF_32BIT)) {
@@ -237,20 +238,13 @@ int arch_setup_additional_pages(struct l
vdso_base = VDSO32_MBASE;
#endif
- current->thread.vdso_base = 0;
+ current->mm->context.vdso_base = 0;
/* vDSO has a problem and was disabled, just don't "enable" it for the
* process
*/
if (vdso_pages == 0)
return 0;
-
- vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
- if (vma == NULL)
- return -ENOMEM;
-
- memset(vma, 0, sizeof(*vma));
-
/* Add a page to the vdso size for the data page */
vdso_pages ++;
@@ -259,17 +253,23 @@ int arch_setup_additional_pages(struct l
* at vdso_base which is the "natural" base for it, but we might fail
* and end up putting it elsewhere.
*/
+ down_write(&mm->mmap_sem);
vdso_base = get_unmapped_area(NULL, vdso_base,
vdso_pages << PAGE_SHIFT, 0, 0);
- if (vdso_base & ~PAGE_MASK) {
- kmem_cache_free(vm_area_cachep, vma);
- return (int)vdso_base;
+ if (IS_ERR_VALUE(vdso_base)) {
+ rc = vdso_base;
+ goto fail_mmapsem;
}
- current->thread.vdso_base = vdso_base;
+ /* Allocate a VMA structure and fill it up */
+ vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);
+ if (vma == NULL) {
+ rc = -ENOMEM;
+ goto fail_mmapsem;
+ }
vma->vm_mm = mm;
- vma->vm_start = current->thread.vdso_base;
+ vma->vm_start = vdso_base;
vma->vm_end = vma->vm_start + (vdso_pages << PAGE_SHIFT);
/*
@@ -282,23 +282,38 @@ int arch_setup_additional_pages(struct l
* It's fine to use that for setting breakpoints in the vDSO code
* pages though
*/
- vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
+ vma->vm_flags = VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC;
vma->vm_flags |= mm->def_flags;
vma->vm_page_prot = protection_map[vma->vm_flags & 0x7];
vma->vm_ops = &vdso_vmops;
- down_write(&mm->mmap_sem);
- if (insert_vm_struct(mm, vma)) {
- up_write(&mm->mmap_sem);
- kmem_cache_free(vm_area_cachep, vma);
- return -ENOMEM;
- }
+ /* Insert new VMA */
+ rc = insert_vm_struct(mm, vma);
+ if (rc)
+ goto fail_vma;
+
+ /* Put vDSO base into mm struct and account for memory usage */
+ current->mm->context.vdso_base = vdso_base;
mm->total_vm += (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
up_write(&mm->mmap_sem);
-
return 0;
+
+ fail_vma:
+ kmem_cache_free(vm_area_cachep, vma);
+ fail_mmapsem:
+ up_write(&mm->mmap_sem);
+ return rc;
}
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso_base)
+ return "[vdso]";
+ return NULL;
+}
+
+
+
static void * __init find_section32(Elf32_Ehdr *ehdr, const char *secname,
unsigned long *size)
{
diff -puN include/asm-powerpc/elf.h~powerpc-vdso-updates include/asm-powerpc/elf.h
--- 25/include/asm-powerpc/elf.h~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/include/asm-powerpc/elf.h Fri Jun 2 13:53:18 2006
@@ -293,7 +293,7 @@ do { \
NEW_AUX_ENT(AT_DCACHEBSIZE, dcache_bsize); \
NEW_AUX_ENT(AT_ICACHEBSIZE, icache_bsize); \
NEW_AUX_ENT(AT_UCACHEBSIZE, ucache_bsize); \
- VDSO_AUX_ENT(AT_SYSINFO_EHDR, current->thread.vdso_base) \
+ VDSO_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso_base) \
} while (0)
/* PowerPC64 relocations defined by the ABIs */
diff -puN include/asm-powerpc/mmu.h~powerpc-vdso-updates include/asm-powerpc/mmu.h
--- 25/include/asm-powerpc/mmu.h~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/include/asm-powerpc/mmu.h Fri Jun 2 13:53:18 2006
@@ -360,6 +360,7 @@ typedef struct {
#ifdef CONFIG_HUGETLB_PAGE
u16 low_htlb_areas, high_htlb_areas;
#endif
+ unsigned long vdso_base;
} mm_context_t;
diff -puN include/asm-powerpc/page.h~powerpc-vdso-updates include/asm-powerpc/page.h
--- 25/include/asm-powerpc/page.h~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/include/asm-powerpc/page.h Fri Jun 2 13:53:18 2006
@@ -191,6 +191,9 @@ extern void copy_user_page(void *to, voi
struct page *p);
extern int page_is_ram(unsigned long pfn);
+struct vm_area_struct;
+extern const char *arch_vma_name(struct vm_area_struct *vma);
+
#include <asm-generic/memory_model.h>
#endif /* __ASSEMBLY__ */
diff -puN include/asm-powerpc/processor.h~powerpc-vdso-updates include/asm-powerpc/processor.h
--- 25/include/asm-powerpc/processor.h~powerpc-vdso-updates Fri Jun 2 13:53:18 2006
+++ 25-akpm/include/asm-powerpc/processor.h Fri Jun 2 13:53:18 2006
@@ -153,7 +153,6 @@ struct thread_struct {
unsigned long start_tb; /* Start purr when proc switched in */
unsigned long accum_tb; /* Total accumilated purr for process */
#endif
- unsigned long vdso_base; /* base of the vDSO library */
unsigned long dabr; /* Data address breakpoint register */
#ifdef CONFIG_ALTIVEC
/* Complete AltiVec register set */
_
Patches currently in -mm which might be from benh@xxxxxxxxxxxxxxxxxxx are
origin.patch
pmf_register_irq_client-gives-sleep-with-locks-held-warning.patch
macintosh-mangle-caps-lock-events-on-adb-keyboards.patch
via-pmu-add-input-device.patch
input-powermac-cleanup-of-mac_hid-and-support-for-ctrlclick-and-commandclick.patch
git-netdev-all.patch
powerpc-kbuild-warning-fix.patch
powerpc-vdso-updates.patch
add-poisonh-and-patch-primary-users.patch
x86-powerpc-make-hardirq_ctx-and-softirq_ctx-__read_mostly.patch
rewritten-backlight-infrastructure-for-portable-apple-computers.patch
rewritten-backlight-infrastructure-for-portable-apple-computers-fix.patch
apple-motion-sensor-driver.patch
radeonfb-powerdrain-issue-on-ibm-thinkpads-and-suspend-to-d2.patch
genirq-msi-fixes-2.patch
genirq-add-chip-eoi-fastack-fasteoi.patch
lock-validator-add-per_cpu_offset-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
