vdso for parisc-linux

index c11a5bc..5effa4b 100644
@@ -32,12 +32,15 @@ #include <linux/sched.h>
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/time.h>
 
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 #include <asm/pdc.h>
 #include <asm/uaccess.h>
+#include <asm/vdso_datapage.h>
+#include <asm/compat.h>
 
 #define DEFINE(sym, val) \
 	asm volatile("\n->" #sym " %0 " #val : : "i" (val))

@@ -297,5 +300,29 @@ int main(void)
 	DEFINE(EXCDATA_IP, offsetof(struct exception_data, fault_ip));
 	DEFINE(EXCDATA_SPACE, offsetof(struct exception_data, fault_space));
 	DEFINE(EXCDATA_ADDR, offsetof(struct exception_data, fault_addr));
+
+	/* timeval/timezone offsets for use by vdso */
+	DEFINE(TZONE_TZ_MINWEST, offsetof(struct timezone, tz_minuteswest));
+	DEFINE(TZONE_TZ_DSTTIME, offsetof(struct timezone, tz_dsttime));
+
+	/* vdso datapage offsets */
+	DEFINE(VDSO_SYSCALL_MAP32, offsetof(struct vdso_data, syscall_map_32));
+#ifdef CONFIG_64BIT
+	DEFINE(VDSO_SYSCALL_MAP64, offsetof(struct vdso_data, syscall_map_64));
+#endif
+	DEFINE(VDSO_TZ_MINUTEWEST, offsetof(struct vdso_data, tz_minuteswest));
+	DEFINE(VDSO_TZ_DSTTIME, offsetof(struct vdso_data, tz_dsttime));
+	DEFINE(VDSO_WTOM_CLOCK_SEC, offsetof(struct vdso_data, wtom_clock_sec));
+	DEFINE(VDSO_WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec));
+
+#ifdef CONFIG_64BIT
+	DEFINE(TVAL64_TV_SEC, offsetof(struct timeval, tv_sec));
+	DEFINE(TVAL64_TV_USEC, offsetof(struct timeval, tv_usec));
+	DEFINE(TVAL32_TV_SEC, offsetof(struct compat_timeval, tv_sec));
+	DEFINE(TVAL32_TV_USEC, offsetof(struct compat_timeval, tv_usec));
+#else
+	DEFINE(TVAL32_TV_SEC, offsetof(struct timeval, tv_sec));
+	DEFINE(TVAL32_TV_USEC, offsetof(struct timeval, tv_usec));
+#endif
 	return 0;
 }

617 lines not on this page · raw message

index 0e449f9..06c74de 100644
@@ -29,6 +29,7 @@ #include <asm/tlb.h>
 #include <asm/pdc_chassis.h>
 #include <asm/mmzone.h>
 #include <asm/sections.h>
+#include <asm/vdso.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 

@@ -541,6 +542,8 @@ #ifdef CONFIG_DEBUG_KERNEL /* double-san
 	       _text, _etext,
 	       ((unsigned long)_etext - (unsigned long)_text) >> 10);
 #endif
+
+	vdso_init();
 }
 
 unsigned long *empty_zero_page __read_mostly;

index 9c3ac4b..d49902d 100644
@@ -1,4 +1,9 @@
 #ifndef __ASMPARISC_AUXVEC_H
 #define __ASMPARISC_AUXVEC_H
 
+/* The vDSO location. We have to use the same value as x86 for glibc's
+ * sake :-)
+ */
+#define AT_SYSINFO_EHDR		33
+
 #endif

index 2bc41f2..b62563d 100644
@@ -83,13 +83,13 @@ static inline void flush_cache_range(str
 {
 	int sr3;
 
-	if (!vma->vm_mm->context) {
+	if (!vma->vm_mm->context.space_id) {
 		BUG();
 		return;
 	}
 
 	sr3 = mfsp(3);
-	if (vma->vm_mm->context == sr3) {
+	if (vma->vm_mm->context.space_id == sr3) {
 		flush_user_dcache_range(start,end);
 		flush_user_icache_range(start,end);
 	} else {

@@ -149,7 +149,7 @@ flush_user_cache_page_non_current(struct
 
 	/* make us current */
 	mtctl(__pa(vma->vm_mm->pgd), 25);
-	mtsp(vma->vm_mm->context, 3);
+	mtsp(vma->vm_mm->context.space_id, 3);
 
 	flush_user_dcache_page(vmaddr);
 	if(vma->vm_flags & VM_EXEC)

@@ -164,7 +164,7 @@ flush_user_cache_page_non_current(struct
 static inline void
 __flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr)
 {
-	if (likely(vma->vm_mm->context == mfsp(3))) {
+	if (likely(vma->vm_mm->context.space_id == mfsp(3))) {
 		flush_user_dcache_page(vmaddr);
 		if (vma->vm_flags & VM_EXEC)
 			flush_user_icache_page(vmaddr);

@@ -176,7 +176,7 @@ __flush_cache_page(struct vm_area_struct
 static inline void
 flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long pfn)
 {
-	BUG_ON(!vma->vm_mm->context);
+	BUG_ON(!vma->vm_mm->context.space_id);
 
 	if (likely(translation_exists(vma, vmaddr, pfn)))
 		__flush_cache_page(vma, vmaddr);

index adea65f..81e232d 100644
@@ -297,6 +297,17 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
 
 struct task_struct;
 
+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES
+struct linux_binprm;
+extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+				       int executable_stack);
+#define VDSO_AUX_ENT(a,b) NEW_AUX_ENT(a,b);
+
+#define ARCH_DLINFO						\
+do {								\
+	NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso_base); \
+} while (0)
+
 extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);
 #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
 

index 6a310cf..b9175c9 100644
@@ -1,7 +1,9 @@
 #ifndef _PARISC_MMU_H_
 #define _PARISC_MMU_H_
 
-/* On parisc, we store the space id here */
-typedef unsigned long mm_context_t;
+typedef struct {
+	unsigned long space_id;
+	unsigned long vdso_base;
+} mm_context_t;
 
 #endif /* _PARISC_MMU_H_ */

index 9c05836..0fa9679 100644
@@ -21,24 +21,24 @@ init_new_context(struct task_struct *tsk
 {
 	BUG_ON(atomic_read(&mm->mm_users) != 1);
 
-	mm->context = alloc_sid();
+	mm->context.space_id = alloc_sid();
 	return 0;
 }
 
 static inline void
 destroy_context(struct mm_struct *mm)
 {
-	free_sid(mm->context);
-	mm->context = 0;
+	free_sid(mm->context.space_id);
+	mm->context.space_id = 0;
 }
 
 static inline void load_context(mm_context_t context)
 {
-	mtsp(context, 3);
+	mtsp(context.space_id, 3);
 #if SPACEID_SHIFT == 0
-	mtctl(context << 1,8);
+	mtctl(context.space_id << 1,8);
 #else
-	mtctl(context >> (SPACEID_SHIFT - 1),8);
+	mtctl(context.space_id >> (SPACEID_SHIFT - 1),8);
 #endif
 }
 

@@ -65,8 +65,8 @@ static inline void activate_mm(struct mm
 
 	BUG_ON(next == &init_mm); /* Should never happen */
 
-	if (next->context == 0)
-	    next->context = alloc_sid();
+	if (next->context.space_id == 0)
+	    next->context.space_id = alloc_sid();
 
 	switch_mm(prev,next,current);
 }

index dcf9047..091048d 100644
@@ -12,9 +12,11 @@ # define PAGE_SHIFT	16
 #else
 # error "unknown default kernel page size"
 #endif
-#define PAGE_SIZE	(1UL << PAGE_SHIFT)
+#define PAGE_SIZE	(1 << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
+/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
+#define __HAVE_ARCH_GATE_AREA		1
 
 #ifndef __ASSEMBLY__
 

index fd7866d..74ba37b 100644
@@ -181,7 +181,7 @@ typedef unsigned int elf_caddr_t;
 
 #define start_thread_som(regs, new_pc, new_sp) do {	\
 	unsigned long *sp = (unsigned long *)new_sp;	\
-	__u32 spaceid = (__u32)current->mm->context;	\
+	__u32 spaceid = (__u32)current->mm->context.space_id;	\
 	unsigned long pc = (unsigned long)new_pc;	\
 	/* offset pc for priv. level */			\
 	pc |= 3;					\

@@ -285,7 +285,7 @@ #endif
 
 #define start_thread(regs, new_pc, new_sp) do {		\
 	elf_addr_t *sp = (elf_addr_t *)new_sp;		\
-	__u32 spaceid = (__u32)current->mm->context;	\
+	__u32 spaceid = (__u32)current->mm->context.space_id;	\
 	elf_addr_t pc = (elf_addr_t)new_pc | 3;		\
 	elf_caddr_t *argv = (elf_caddr_t *)bprm->exec + 1;	\
 							\

index f662e83..5625b76 100644
@@ -47,9 +47,9 @@ #ifdef CONFIG_SMP
 	flush_tlb_all();
 #else
 	if (mm) {
-		if (mm->context != 0)
-			free_sid(mm->context);
-		mm->context = alloc_sid();
+		if (mm->context.space_id != 0)
+			free_sid(mm->context.space_id);
+		mm->context.space_id = alloc_sid();
 		if (mm == current->active_mm)
 			load_context(mm->context);
 	}

@@ -66,7 +66,7 @@ static inline void flush_tlb_page(struct
 	/* For one page, it's not worth testing the split_tlb variable */
 
 	mb();
-	mtsp(vma->vm_mm->context,1);
+	mtsp(vma->vm_mm->context.space_id,1);
 	purge_tlb_start();
 	pdtlb(addr);
 	pitlb(addr);

@@ -82,7 +82,7 @@ static inline void flush_tlb_range(struc
 	if (npages >= 512)  /* 2MB of space: arbitrary, should be tuned */
 		flush_tlb_all();
 	else {
-		mtsp(vma->vm_mm->context,1);
+		mtsp(vma->vm_mm->context.space_id,1);
 		purge_tlb_start();
 		if (split_tlb) {
 			while (npages--) {

44 lines not on this page · raw message

43 lines not on this page · raw message