Changeset 21

Timestamp:

11/13/05 00:24:09 (6 years ago)

Author:

dkaplan1

Message:

Most of RTC driver works. Sometimes get fatal exception in interrupt handler,
but sometimes not. Don't know WTF is going on. But I just ran a good test
program 3 times in a row and it completely worked.

Lots of other code changes here, will be doc'd later

Files:

• arch/i386/kernel/callgate.c (modified) (6 diffs)
• arch/i386/kernel/entry.S (modified) (2 diffs)
• arch/i386/kernel/irq.c (modified) (2 diffs)
• arch/i386/kernel/traps.c (modified) (2 diffs)
• Documentation/DAPI.txt (modified) (2 diffs)
• drivers/char/misc.c (modified) (1 diff)
• fs/file_table.c (modified) (3 diffs)
• fs/ioctl.c (modified) (1 diff)
• fs/proc/generic.c (modified) (1 diff)
• fs/read_write.c (modified) (3 diffs)
• include/asm-i386/callgate.h (modified) (1 diff)
• include/asm-i386/dapi.h (modified) (14 diffs)
• include/linux/module.h (modified) (1 diff)
• include/linux/poll.h (modified) (1 diff)
• include/linux/sched.h (modified) (1 diff)
• include/linux/wait.h (modified) (2 diffs)
• kernel/exit.c (modified) (1 diff)
• kernel/fork.c (modified) (2 diffs)
• kernel/module.c (modified) (3 diffs)
• kernel/printk.c (modified) (1 diff)
• kernel/sched.c (modified) (2 diffs)
• kernel/timer.c (modified) (1 diff)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -102 +102 @@
-struct task_struct *mod_get_current(void) {
-    struct task_struct *tsk=current;
-
+ {
-        return tsk->currentaddr;
-
+
+
-    tsk->currentmapped=1;
-    return tsk->currentaddr;
@@ -116 +117 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-7
+8
-        "ja done2\n\t"
-        "call *callgate_table2(,%ecx,4)\n\t"
@@ -123 +124 @@
-        "leave\n\t"
-        "lret $8\n\t"
-
+, mod_signal_pending
-);
-
@@ -348 +349 @@
-    return tsk->exit_code;*/
-
-
+, ptrbitmap & USE_RESERVED
-    if (!tsk) {
-        printk(KERN_ERR "Could not find worker thread for address %x\n", addr);
@@ -420 +421 @@
-            if (addrs[i]) {
-                ClearPageReserved(pfn_to_page(__pa(argv[i]) >> PAGE_SHIFT));
+                ClearPageReserved(pfn_to_page((__pa(argv[i]) >> PAGE_SHIFT) + 1));
-                vunmap(origmems[i]);
-            }
@@ -452 +454 @@
-    vma->vm_mm=&init_mm;
-    SetPageReserved(pfn_to_page(__pa(kernel_struct) >> PAGE_SHIFT));
+
+    SetPageReserved(pfn_to_page((__pa(kernel_struct) >> PAGE_SHIFT) + 1));
-    remap_page_range(vma, addr, __pa(kernel_struct), size, PAGE_KERNEL);
-    addr+=(unsigned long) kernel_struct & (PAGE_SIZE -1);

arch/i386/kernel/entry.S

@@ -302 +302 @@
-        testb $_TIF_NEED_RESCHED, %cl
-        jz work_notifysig
+        #NEW FOR RING CYCLE
+        testb $1, CS(%esp)
+        jz work_notifysig
+        testb $2, CS(%esp)
+        jz work_notifysig
-work_resched:
-        call user_schedule
@@ -912 +917 @@
-        .long sys_mq_getsetattr
-        .long sys_ni_syscall            /* reserved for kexec */
-
-
+
+
+
-
-syscall_table_size=(.-sys_call_table)

arch/i386/kernel/irq.c

@@ -47 +47 @@
-#include <asm/desc.h>
-#include <asm/irq.h>
-
+
-/*
- * Linux has a controller-independent x86 interrupt architecture.
@@ -230 +230 @@
-        do {
-                status |= action->flags;
-
-
+
+
+
+
+
+
+
+
+
-        } while (action);
-        if (status & SA_SAMPLE_RANDOM)

arch/i386/kernel/traps.c

@@ -58 +58 @@
-#include "mach_traps.h"
-
+//Enable to treat driver gp faults like kernel ones
+#define DEBUG_DRIVER
+
+
-asmlinkage int system_call(void);
-asmlinkage void lcall7(void);
@@ -461 +465 @@
-      //driver thread
-      printk("General protection fault in driver thread at %x\n", regs->eip);
+#ifdef DEBUG_DRIVER
+      goto gp_in_kernel;
+#endif
-      //die("general protection", regs, error_code);
-      current->thread.error_code=error_code;

Documentation/DAPI.txt

@@ -72 +72 @@
-to add 1 to the parameter count when deciding which jump table to add to.
-
-callgate
+dapi
-the name of the functino you are implementing.  The value of the macro should
-be a pushl instruction which pushes the number of the function (the location
@@ -121 +121 @@
-callgate_table2: .long x,y      callgate_table2: .long x, y, misc_register
-
-callgate
+dapi
-#define CALLGATE_misc_register "pushl $3\n\t" since here misc_register is the
-third function in the jump table.

drivers/char/misc.c

@@ -52 +52 @@
-#include <linux/kmod.h>
-
+#include <asm/callgate.h>
-/*
- * Head entry for the doubly linked miscdevice list

fs/file_table.c

@@ -18 +18 @@
-#include <linux/cdev.h>
-
+#include <asm/callgate.h>
-/* sysctl tunables... */
-struct files_stat_struct files_stat = {
@@ -146 +147 @@
-        struct inode * inode = file->f_dentry->d_inode;
-
-
-
+
+
+
+
+
+
+
+
-        security_file_free(file);
-}
@@ -177 +184 @@
-        locks_remove_flock(file);
-
-
-
+
+
+
+
+
+
+
+
-        security_file_free(file);
-        if (unlikely(inode->i_cdev != NULL))

fs/ioctl.c

@@ -13 +13 @@
-#include <asm/uaccess.h>
-#include <asm/ioctls.h>
+#include <asm/callgate.h>
-
-static int file_ioctl(struct file *filp,unsigned int cmd,unsigned long arg)

fs/proc/generic.c

@@ -21 +21 @@
-#include <asm/bitops.h>
-
+#include <asm/callgate.h>
-static ssize_t proc_file_read(struct file *file, char __user *buf,
-                              size_t nbytes, loff_t *ppos);

fs/read_write.c

@@ -17 +17 @@
-#include <asm/uaccess.h>
-#include <asm/unistd.h>
+#include <asm/callgate.h>
-
-struct file_operations generic_ro_fops = {
@@ -231 +232 @@
-                                        args[2]=(unsigned long) count;
-                                        args[3]=(unsigned long) pos;
-0
+9
-                                }
-                        }
@@ -296 +297 @@
-                                        args[2]=(unsigned long) count;
-                                        args[3]=(unsigned long) pos;
-0
+9
-                                }
-                        }

include/asm-i386/callgate.h

@@ -28 +28 @@
-//FLAGS for calldriver
-#define NO_WAIT 0x80000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#endif

include/asm-i386/dapi.h

@@ -2 +2 @@
-#define ASM_DAPI_H
-
-#include <asm/callgate.h>
-#include <asm-generic/errno-base.h>
-
+/* So here's what going on:
+ * we have a jump table for drivers calling into the kernel
+ * there is a seperate entry point based on the number of parameters the function takes
+ * here are defines so we can easily locate where they are in the jump table
+ */
+
+//0 parameter functions
+#define CALLGATE_mod_get_current "pushl $1\n\t"
+#define CALLGATE_schedule "pushl $2\n\t"
+#define CALLGATE_mod_get_jiffies "pushl $3\n\t"
+//1 parameter functions
+#define CALLGATE_DRIVERPRINTDIAG "pushl $1\n\t"
+#define CALLGATE_DOEXIT "pushl $2\n\t"
+#define CALLGATE_DODRIVERFINISH "pushl $3\n\t"
+#define CALLGATE_misc_register "pushl $4\n\t"
+#define CALLGATE_misc_deregister "pushl $5\n\t"
+#define CALLGATE_unregister_sysctl_table "pushl $6\n\t"
+#define CALLGATE_del_timer "pushl $7\n\t"
+#define CALLGATE_signal_pending "pushl $8\n\t"
+//2 parameter functions
+#define CALLGATE_release_region "pushl $1\n\t"
+#define CALLGATE_release_mem_region "pushl $2\n\t"
+#define CALLGATE_register_sysctl_table "pushl $3\n\t"
+#define CALLGATE_mod_timer "pushl $4\n\t"
+#define CALLGATE___mod_timer "pushl $5\n\t"
+#define CALLGATE_add_wait_queue "pushl $6\n\t"
+#define CALLGATE_remove_wait_queue "pushl $7\n\t"
+#define CALLGATE_free_irq "pushl $8\n\t"
+#define CALLGATE_remove_proc_entry "pushl $9\n\t"
+//3 parameter functions
+#define CALLGATE_REGISTERCHRDEV "pushl $1\n\t"
+#define CALLGATE_copy_from_user "pushl $2\n\t"
+#define CALLGATE_copy_to_user "pushl $3\n\t"
+#define CALLGATE_no_llseek "pushl $4\n\t"
+#define CALLGATE_request_region "pushl $5\n\t"
+#define CALLGATE_request_mem_region "pushl $6\n\t"
+#define CALLGATE_kill_fasync "pushl $7\n\t"
+#define CALLGATE_poll_wait "pushl $8\n\t"
+//4 parameter functions
+#define CALLGATE___wake_up "pushl $1\n\t"
+#define CALLGATE_fasync_helper "pushl $2\n\t"
+//#define CALLGATE___request_region "pushl $1\n\t"
+
+//5 parameter functions
+#define CALLGATE_request_irq "pushl $1\n\t"
+#define CALLGATE_create_proc_read_entry "pushl $2\n\t"
+//10 parameter functions
+#define CALLGATE_printk "pushl $1\n\t"
+//15 parameter functions
+#define CALLGATE_sprintf "pushl $1\n\t"
+
+
+#define CALLEE  "ecx", "edx"
-#define make_wrap0(func, ret) \
-    static inline ret func ( void ) { \
-        ret myret;  \
-        asm volatile (  CALLGATE_ ## func  \
-1
-
+0
+:: CALLEE 
-        return myret;  \
-    }
@@ -19 +71 @@
-                CALLGATE_ ## func  \
-                LCALL1       \
-
+: CALLEE
-        return myret;  \
-    }
@@ -31 +83 @@
-                CALLGATE_ ## func  \
-                LCALL2       \
-
+: CALLEE
-        return myret;  \
-    }
@@ -44 +96 @@
-                CALLGATE_ ## func  \
-                LCALL3       \
-
+:CALLEE
-        return myret;  \
-    }
@@ -58 +110 @@
-                CALLGATE_ ## func  \
-                LCALL4       \
-
+:CALLEE
-        return myret;  \
-    }
@@ -72 +124 @@
-                CALLGATE_ ## func  \
-                LCALL5       \
-
+:CALLEE
-        return myret;  \
-    }
@@ -78 +130 @@
-    static inline void func ( void ) { \
-        asm volatile (  CALLGATE_ ## func  \
-1
-
+0
+:::CALLEE
-    }
-#define make_void_wrap1(func, type1) \
@@ -86 +138 @@
-                CALLGATE_ ## func  \
-                LCALL1       \
-
+:CALLEE
-    }
-
@@ -96 +148 @@
-                CALLGATE_ ## func  \
-                LCALL2       \
-
+:CALLEE
-    }
-
@@ -107 +159 @@
-                CALLGATE_ ## func  \
-                LCALL3       \
-
+:CALLEE
-    }
-
@@ -119 +171 @@
-                CALLGATE_ ## func  \
-                LCALL4       \
-
+:CALLEE
-    }
-#define make_wrap10(func, ret, type1, ... ) \
@@ -203 +255 @@
-make_wrap2(register_sysctl_table, struct ctl_table_header*, struct ctl_table*, int)
-make_void_wrap1(unregister_sysctl_table, struct ctl_table_header*)
-make_void_wrap0(schedule)
-make_wrap5(request_irq, int, unsigned int, irqhandler, unsigned long, const char*, void *)
-make_wrap2(mod_timer, int, struct timer_list*, unsigned long)
@@ -213 +264 @@
-make_void_wrap2(add_wait_queue, struct __wait_queue_head *, struct __wait_queue*)
-make_void_wrap2(remove_wait_queue, struct __wait_queue_head *, struct __wait_queue*)
-
+_
-make_wrap5(create_proc_read_entry, struct proc_dir_entry*, const char*, unsigned long, struct proc_dir_entry *, readproc * , void *) 
-make_void_wrap2(free_irq, unsigned int, void *)
@@ -219 +270 @@
-make_wrap15(sprintf, int, char *, const char *)
-make_wrap0(mod_get_jiffies, unsigned long)
-
+
+
+
+
+
+
+
-static inline void arediculouslylongnamesoitwontconflictiwthanythingbutgccwontcomplainaboutsprintf(void) {
-    sprintf(NULL, NULL, NULL);

include/linux/module.h

@@ -54 +54 @@
-extern void cleanup_module(void);
-
-
+, int use_reserved
-extern char *find_module_by_thread(unsigned long addr);
-

include/linux/poll.h

@@ -27 +27 @@
-                p->qproc(filp, wait_address, p);
-}
+extern void mod_poll_wait(struct file *, wait_queue_head_t *, poll_table *);
-#endif
-#ifdef MODULE

include/linux/sched.h

@@ -1007 +1007 @@
-        clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED);
-}
-
+
-static inline int signal_pending(struct task_struct *p)
-{
-        return unlikely(test_tsk_thread_flag(p,TIF_SIGPENDING));
-}
-
+
+
+
+
+
-static inline int need_resched(void)
-{

include/linux/wait.h

@@ -81 +81 @@
-}
-
-FASTCALL(add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)
+add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait
-extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait));
-FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait)
+remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait
-
-static inline void __add_wait_queue(wait_queue_head_t *head, wait_queue_t *new)
@@ -105 +105 @@
-}
-
-FASTCALL(__wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key)
+__wake_up(wait_queue_head_t *q, unsigned int mode, int nr, void *key
-extern void FASTCALL(__wake_up_locked(wait_queue_head_t *q, unsigned int mode));
-extern void FASTCALL(__wake_up_sync(wait_queue_head_t *q, unsigned int mode, int nr));

kernel/exit.c

@@ -841 +841 @@
-    if (tsk->currentmapped) {
-        ClearPageReserved(pfn_to_page(__pa(tsk) >> PAGE_SHIFT));
+        ClearPageReserved(pfn_to_page((__pa(tsk) >> PAGE_SHIFT) + 1));
-        vunmap(tsk->origcurrentaddr);
-        tsk->currentmapped=0;
-    }
--
++
-    tsk->bytes_to_pop=0;
-    tsk->available=1;

kernel/fork.c

@@ -99 +99 @@
-{
-        unsigned long flags;
-
-        wait->flags &= ~WQ_FLAG_EXCLUSIVE;
-        spin_lock_irqsave(&q->lock, flags);
@@ -123 +122 @@
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&q->lock, flags);
-        __remove_wait_queue(q, wait);

kernel/module.c

@@ -629 +629 @@
-  testargs=31415926;
-  if (mod->exit)
-0
+USE_RESERVED
-        down(&module_mutex);
-  //NEW: get rid of threads
@@ -1931 +1931 @@
-}
-
-
+, int use_reserved
-{
-    struct task_struct *tsk=NULL;
@@ -1944 +1944 @@
-                within(addr, mod->module_core, mod->core_size)) {
-            //Now find an availalbe one
-NR_DRIVERTHREADS
+(NR_DRIVERTHREADS-1+use_reserved)
-                if (mod->worker_threads[i]->available) {
-                    tsk=mod->worker_threads[i]; 

kernel/printk.c

@@ -377 +377 @@
-}
-
-void
-
-KERNEL DIAGNOSTIC MESSAGE"
+unsigned long param
+
+Called to print %x\n", param
-}
-

kernel/sched.c

@@ -2177 +2177 @@
-#endif
-
-
+asmlinkage 
-    schedule();
-}
@@ -4060 +4060 @@
-EXPORT_SYMBOL(__preempt_write_lock);
-#endif /* defined(CONFIG_SMP) && defined(CONFIG_PREEMPT) */
+
+int mod_signal_pending(struct task_struct *p) {
+    return signal_pending(p);
+}

kernel/timer.c

@@ -37 +37 @@
-#include <asm/div64.h>
-#include <asm/timex.h>
-
+
-/*
- * per-CPU timer vector definitions:

.version

@@ -1 @@
-02
+38