linux-2.5.44_vsyscall_A1

diff -Nru a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
@@ -69,8 +69,15 @@
 unsigned long cpu_khz;	/* Detected as we calibrate the TSC */
 
 extern rwlock_t xtime_lock;
+#ifdef CONFIG_VSYSCALL
+unsigned long __wall_jiffies __section_wall_jiffies;
+struct timespec __xtime __section_xtime;
+struct timezone __sys_tz __section_sys_tz;
+volatile unsigned long __jiffies __section_jiffies;
+#else /* CONFIG_VSYSCALL */
 extern unsigned long wall_jiffies;
-
+#endif /* CONFIG_VSYSCALL */
+ 
 spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
 
 spinlock_t i8253_lock = SPIN_LOCK_UNLOCKED;

@@ -110,6 +117,7 @@
 void do_settimeofday(struct timeval *tv)
 {
 	write_lock_irq(&xtime_lock);
+	vxtime_lock();
 	/*
 	 * This is revolting. We need to set "xtime" correctly. However, the
 	 * value in this location is the value at the most recent update of

@@ -126,6 +134,8 @@
 
 	xtime.tv_sec = tv->tv_sec;
 	xtime.tv_nsec = (tv->tv_usec * 1000);
+	vxtime_unlock();
+
 	time_adjust = 0;		/* stop active adjtime() */
 	time_status |= STA_UNSYNC;
 	time_maxerror = NTP_PHASE_LIMIT;

@@ -277,11 +287,11 @@
 	 * locally disabled. -arca
 	 */
 	write_lock(&xtime_lock);
-
+	vxtime_lock();
 	timer->mark_offset();
  
 	do_timer_interrupt(irq, NULL, regs);
-
+	vxtime_unlock();
 	write_unlock(&xtime_lock);
 
 }

diff -Nru a/arch/i386/kernel/timers/timer_tsc.c b/arch/i386/kernel/timers/timer_tsc.c
@@ -10,23 +10,28 @@
 #include <linux/cpufreq.h>
 
 #include <asm/timer.h>
+#include <asm/vsyscall.h>
 #include <asm/io.h>
 
 extern int x86_udelay_tsc;
 extern spinlock_t i8253_lock;
 
 static int use_tsc;
+#ifndef CONFIG_VSYSCALL
 /* Number of usecs that the last interrupt was delayed */
 static int delay_at_last_interrupt;
-
 static unsigned long last_tsc_low; /* lsb 32 bits of Time Stamp Counter */
-
 /* Cached *multiplier* to convert TSC counts to microseconds.
  * (see the equation below).
  * Equal to 2^32 * (1 / (clocks per usec) ).
  * Initialized in time_init.
  */
 unsigned long fast_gettimeoffset_quotient;
+#else /* CONFIG_VSYSCALL */
+int __delay_at_last_interrupt __section_delay_at_last_interrupt;
+unsigned long __last_tsc_low __section_last_tsc_low;
+unsigned long __fast_gettimeoffset_quotient __section_fast_gettimeoffset_quotient;
+#endif /* CONFIG_VSYSCALL */
 
 static unsigned long get_offset_tsc(void)
 {

199 lines not on this page · raw message

diff -Nru a/include/asm-i386/fixmap.h b/include/asm-i386/fixmap.h
@@ -18,6 +18,7 @@
 #include <asm/acpi.h>
 #include <asm/apicdef.h>
 #include <asm/page.h>
+#include <asm/vsyscall.h>
 #ifdef CONFIG_HIGHMEM
 #include <linux/threads.h>
 #include <asm/kmap_types.h>

@@ -49,6 +50,10 @@
  * fix-mapped?
  */
 enum fixed_addresses {
+#ifdef CONFIG_VSYSCALL
+	VSYSCALL_LAST_PAGE,
+	VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
+#endif /* CONFIG_VSYSCALL */
 #ifdef CONFIG_X86_LOCAL_APIC
 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
 #endif

diff -Nru a/include/asm-i386/pgtable.h b/include/asm-i386/pgtable.h
@@ -139,11 +139,14 @@
 #define __PAGE_KERNEL_RO	(__PAGE_KERNEL & ~_PAGE_RW)
 #define __PAGE_KERNEL_NOCACHE	(__PAGE_KERNEL | _PAGE_PCD)
 #define __PAGE_KERNEL_LARGE	(__PAGE_KERNEL | _PAGE_PSE)
-
+#define __PAGE_KERNEL_VSYSCALL \
+	(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)
+	
 #define PAGE_KERNEL		__pgprot(__PAGE_KERNEL)
 #define PAGE_KERNEL_RO		__pgprot(__PAGE_KERNEL_RO)
 #define PAGE_KERNEL_NOCACHE	__pgprot(__PAGE_KERNEL_NOCACHE)
 #define PAGE_KERNEL_LARGE	__pgprot(__PAGE_KERNEL_LARGE)
+#define PAGE_KERNEL_VSYSCALL __pgprot(__PAGE_KERNEL_VSYSCALL)
 
 /*
  * The i386 can't do page protection for execute, and considers that

53 lines not on this page · raw message

diff -Nru a/arch/i386/kernel/vsyscall.c b/arch/i386/kernel/vsyscall.c
@@ -23,6 +23,7 @@
 #include <linux/kernel.h>
 #include <linux/timer.h>
 #include <linux/sched.h>
+#include <linux/proc_fs.h>
 
 #include <asm/vsyscall.h>
 #include <asm/pgtable.h>

@@ -45,7 +46,7 @@
 
 #else
 long __vxtime_sequence[2] __section_vxtime_sequence;
-
+static unsigned long vsyscall_ptr;
 static inline void do_vgettimeofday(struct timeval * tv)
 {
 	long sequence;

@@ -163,6 +164,7 @@
 	pm = pmd_offset(pd,(unsigned long)&__last_tsc_low);
 	pm->pmd |= _PAGE_USER;
 
+	vsyscall_ptr = (unsigned long)&vgettimeofday;
 }
 
 static int __init vsyscall_init(void)

@@ -173,7 +175,7 @@
 	if ((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime))
 		panic("vtime link addr broken");
 	if (VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE))
-		panic("fixmap first vsyscall %lx should be %lx", __fix_to_virt(VSYSCALL_FIRST_PAGE),
+		panic("fixmap first vsyscall %lx should be %x", __fix_to_virt(VSYSCALL_FIRST_PAGE),
 		      VSYSCALL_ADDR(0));
 
 	/* XXX: we'll also need to make sure the TSC is 

@@ -193,7 +195,42 @@
 	printk("VSYSCALL: fixmap virt addr: 0x%lx\n",
 		__fix_to_virt(VSYSCALL_FIRST_PAGE));
 
+	init_vsyscall_proc();
 	return 0;
 }
 
 __initcall(vsyscall_init);
+
+
+/* /proc entry */
+#define HEX_DIGITS 8
+static int vsyscall_read_proc (char *page, char **start, off_t off,
+			int count, int *eof, void *data)
+{
+	if (count < HEX_DIGITS+1)
+		return -EINVAL;
+	return sprintf (page, "0x%08lx\n", vsyscall_ptr);
+}
+static int vsyscall_write_proc (struct file *file, const char *buffer,
+					unsigned long count, void *data)
+{
+	return count;
+}
+
+void init_vsyscall_proc (void)
+{
+	struct proc_dir_entry *entry;
+	int i;
+
+	/* create /proc/vsyscall */
+	entry = create_proc_entry("vsyscall", S_IROTH, NULL);
+
+	if (!entry)
+	    return;
+
+	entry->nlink = 1;
+	entry->data = NULL;
+	entry->read_proc = vsyscall_read_proc;
+	entry->write_proc = vsyscall_write_proc;
+
+}