Changeset 16

Timestamp:

10/29/05 20:46:21 (6 years ago)

Author:

dkaplan1

Message:

Added thread pool. Process startup and cleanup seems pretty smooth. NOTE
this code experiences a BUG as documented about exec's failing ~10 seconds
after a rmmod

Files:

• arch/i386/kernel/callgate.c (modified) (5 diffs)
• arch/i386/kernel/process.c (modified) (6 diffs)
• arch/i386/kernel/signal.c (modified) (1 diff)
• arch/i386/kernel/traps.c (modified) (3 diffs)
• include/linux/module.h (modified) (3 diffs)
• include/linux/sched.h (modified) (3 diffs)
• kernel/fork.c (modified) (3 diffs)
• kernel/module.c (modified) (12 diffs)
• kernel/sched.c (modified) (5 diffs)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -64 +64 @@
-void *ring1_driver_helper;
-void *ring2_driver_helper;
+void *ring1_nop;
+void *ring2_nop;
-
-void callgate_entry1(int oldcs, unsigned long param1);
@@ -212 +214 @@
-        "ud2\n"
-        ".previous");
+
+extern void ring_nop(void);
+extern void end_of_nop(void);
+__asm__("ring_nop : ret \n\t"
+        "end_of_nop:ud2\n\t");
-void create_driver_helpers(void)
-{
@@ -220 +227 @@
-    memcpy(ring1_driver_helper, driver_thread_helper, size_of_asm);
-    memcpy(ring2_driver_helper, driver_thread_helper, size_of_asm);
+    size_of_asm=end_of_nop - ring_nop;
+    
+    ring1_nop=__vmalloc(size_of_asm, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, VMALLOC_RING1);
+    ring2_nop=__vmalloc(size_of_asm, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, VMALLOC_RING2);
+    
+    memcpy(ring1_nop, ring_nop, size_of_asm);
+    memcpy(ring2_nop, ring_nop, size_of_asm);
-    create_callgate((unsigned long) callgate_entry1, 2, 1);
-    create_callgate((unsigned long) callgate_entry2, 2, 2);
@@ -257 +271 @@
-    if (!tsk) {
-        printk(KERN_ERR "Could not find worker thread for address %x\n", addr);
-
+
+
-    }
-    if (tsk->flags & PF_DEAD) {
@@ -263 +278 @@
-        return -ENODEV;
-    }
-
+/*
-        printk(KERN_ERR "Thread busy...increase size of driver thread pool\n");
-        return -1;
-
+*/
-    tsk->available=0;
-    //Set memory map
-    if (mm) {
+        atomic_dec(&tsk->mm->mm_users);
+        atomic_dec(&tsk->mm->mm_count);
-        atomic_inc(&mm->mm_users);
-        atomic_inc(&mm->mm_count);

arch/i386/kernel/process.c

@@ -62 +62 @@
-extern void *ring1_driver_helper;
-extern void *ring2_driver_helper;
+
+extern void driver_exit(int error_code);
-
-
@@ -347 +349 @@
-}
-*/
+extern void *ring1_nop;
+extern void *ring2_nop;
-int create_driver_thread(unsigned long flags, int ring)
-{
@@ -354 +358 @@
-  int pid;
-        memset(&regs, 0, sizeof(regs));
-
+
-//      regs.edx = (unsigned long) arg;
-
@@ -365 +369 @@
-      regs.xcs = __RING1_CS;
-      regs.xss = __RING1_DS;
-
+
+
-      orig_stack= __vmalloc(8192, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, VMALLOC_RING1);
-  //    printk("Created ring 1 stack at %x", stack_start);
@@ -375 +380 @@
-      regs.xcs = __RING2_CS;
-      regs.xss = __RING2_DS;
+      regs.ebx=(unsigned long) ring2_nop;
-      regs.eip = (unsigned long) ring2_driver_helper;
-      orig_stack= __vmalloc(8192, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, VMALLOC_RING2);
@@ -389 +395 @@
-        /* Ok, create the new process.. */
-  //printk("Calling do_fork");
-STOPPED | CLONE_VM | CLONE_UNTRACED | CLONE_PARENT
+VM | CLONE_UNTRACED | CLONE_PARENTINIT  
-  find_task_by_pid(pid)->orig_stack=orig_stack;
-1
+0
-  return pid;
-}

arch/i386/kernel/signal.c

@@ -560 +560 @@
-         */
-//      if ((regs->xcs & 3) != 3)
-  if ((regs->xcs & 3)==1)
-      printk("Sending signal to ring 1 driver thread!\n");
-  if (!(regs->xcs & 3))
-                return 1;

arch/i386/kernel/traps.c

@@ -27 +27 @@
-#include <linux/ptrace.h>
-#include <linux/version.h>
+#include <linux/syscalls.h>
-
-#ifdef CONFIG_EISA
@@ -437 +438 @@
-DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, get_cr2())
+void do_unload_module(void *myaddr) {
+    char *name;
+    int ret;
+    unsigned long addr=(unsigned long) myaddr;
+    printk("Attempting to unload module\n");
+    name=find_module_by_thread(addr);
+    printk("Address we got was %x, module is %s\n", addr, name);
+    ret=sys_delete_module(name, 0);
+    printk("delete returned %d which is %d", ret, -ret);
+}
+static DECLARE_WORK(mytask, do_unload_module, NULL);
+static struct workqueue_struct *mywq;
-asmlinkage void do_general_protection(struct pt_regs * regs, long error_code)
-{
@@ -454 +467 @@
-      current->thread.error_code=error_code;
-      current->thread.trap_no=13;
+      current->exit_signal=-1;
-      force_sig(SIGKILL, current);
+      printk("Unloading module cleanly...\n");
+      mywq=create_workqueue("gp");
+      mytask.data=(void*) regs->eip;
+      //queue_work(mywq, &mytask);
-      return;
-          

include/linux/module.h

@@ -28 +28 @@
-#define MODULE_SUPPORTED_DEVICE(name)
-
+//Number of threads in driver thread pool
+#define NR_DRIVERTHREADS 10
+
-/* v850 toolchain uses a `_' prefix for all user symbols */
-#ifndef MODULE_SYMBOL_PREFIX
@@ -52 +55 @@
-
-extern struct task_struct *find_worker_thread(unsigned long addr);
+extern char *find_module_by_thread(unsigned long addr);
-
-/* Archs provide a method of finding the correct exception table. */
@@ -317 +321 @@
-
-  /*task struct of worker thread*/
-
+s[NR_DRIVERTHREADS]
-
-  /*ring we got loaded in*/

include/linux/sched.h

@@ -55 +55 @@
-#define CLONE_CHILD_SETTID      0x01000000      /* set the TID in the child */
-#define CLONE_STOPPED           0x02000000      /* Start in stopped state */
-
+
-/*
- * List of flags we want to share for kernel threads,
@@ -739 +739 @@
-extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state));
-extern int FASTCALL(wake_up_process(struct task_struct * tsk));
-
+, unsigned long clone_flags
-#ifdef CONFIG_SMP
- extern void kick_process(struct task_struct *tsk);
@@ -745 +745 @@
-#else
- static inline void kick_process(struct task_struct *tsk) { }
-
+, unsigned long clone_flags
- {
-
+, clone_flags
- }
-#endif

kernel/fork.c

@@ -1048 +1048 @@
-        if (clone_flags & CLONE_PARENT)
-                p->real_parent = current->real_parent;
+  else if (clone_flags & CLONE_PARENTINIT)
+      p->real_parent=&init_task;
-        else
-                p->real_parent = current;
@@ -1202 +1204 @@
-                         * We'll start up with an immediate SIGSTOP.
-                         */
-/*
-*/
+
+
-                }
-
@@ -1219 +1221 @@
-                         */
-                        if (clone_flags & CLONE_VM)
-
+, clone_flags
-                        else
-
+, clone_flags
-        //      } else {
-if (clone_flags & CLONE_STOPPED) {
-                        int cpu = get_cpu();
-
-
+//
-                        if (cpu_is_offline(task_cpu(p)))
-                                set_task_cpu(p, cpu);

kernel/module.c

@@ -562 +562 @@
-        int ret, forced = 0;
-  unsigned long testargs;
+  int i;
-        if (!capable(CAP_SYS_MODULE))
-                return -EPERM;
-
-
-
+
+
+
+
+
+
+
+
-        name[MODULE_NAME_LEN-1] = '\0';
-
@@ -577 +583 @@
-                goto out;
-        }
-
-        if (!list_empty(&mod->modules_which_use_me)) {
-                /* Other modules depend on us: get rid of them first. */
@@ -627 +632 @@
-        down(&module_mutex);
-  //NEW: get rid of threads
-
-
+
+
+
+
+
+
+
+
+
+
-        free_module(mod);
+  print_modules();
-        down(&notify_mutex);
-        notifier_call_chain(&module_notify_list, MODULE_STATE_GONE,
@@ -1476 +1490 @@
-        /* Suck in entire file: we'll want most of it. */
-        /* vmalloc barfs on "unusual" numbers.  Check here */
-//     
+       //
-        if (len > 64 * 1024 * 1024 || (hdr = __vmalloc(len, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, VMALLOC_RING1)) == NULL)
-                return ERR_PTR(-ENOMEM);
@@ -1604 +1618 @@
-
-        if (pcpuindex) {
+    printk("wtf?\n");
-                /* We have a special allocation for this section. */
-                percpu = percpu_modalloc(sechdrs[pcpuindex].sh_size,
@@ -1614 +1629 @@
-                mod->percpu = percpu;
-        }
+  //New
+  else
+      mod->percpu=0;
-
-        /* Determine total sizes, and put offsets in sh_entsize.  For now
@@ -1636 +1654 @@
-        memset(ptr, 0, mod->init_size);
-        mod->module_init = ptr;
-
+
-        /* Transfer each section which specifies SHF_ALLOC */
-        DEBUGP("final section addresses:\n");
@@ -1660 +1678 @@
-        /* Module has been moved. */
-        mod = (void *)sechdrs[modindex].sh_addr;
-
+
-        /* Now we've moved module, initialize linked lists, etc. */
-        module_unload_init(mod);
@@ -1808 +1826 @@
-        int ret;
-  int pid;
+  int i;
-  /* Must have permission */
-        if (!capable(CAP_SYS_MODULE))
-                return -EPERM;
-
-        /* Only one module load at a time, please */
-        if (down_interruptible(&module_mutex) != 0)
@@ -1858 +1876 @@
-  //FIXME: Figure out what ring to load module in (how?)
-  mod->ring=1;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-
-
-
-
-
+
+
-  printk("Invoking init method...\n");
-  ret=calldriver((unsigned long) mod->init, NULL, 0, NULL, 0);
@@ -1916 +1938 @@
-    struct task_struct *tsk=NULL;
-    struct module *mod;
+    int i=0;
-    if (!addr)
-        return NULL;
@@ -1922 +1945 @@
-    list_for_each_entry(mod, &modules, list) {
-        if (within(addr, mod->module_init, mod->init_size) ||
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-
+
-    spin_unlock_irq(&modlist_lock);
-    return tsk;
+}
+
+char *find_module_by_thread(unsigned long addr)
+{
+    struct module *mod;
+    if (!addr)
+        return NULL;
+    spin_lock_irq(&modlist_lock);
+    list_for_each_entry(mod, &modules, list) {
+        if (within(addr, mod->module_init, mod->init_size) ||
+                within(addr, mod->module_core, mod->core_size)) {
+            spin_unlock_irq(&modlist_lock);
+            return mod->name;
+        }
+    }
+    spin_unlock_irq(&modlist_lock);
+    return NULL;
-}
-

kernel/sched.c

@@ -927 +927 @@
- * that must be done for every newly created process.
- */
-
+, unsigned long clone_flags
-{
-        unsigned long flags;
@@ -949 +949 @@
-        p->prio = effective_prio(p);
-        set_task_cpu(p, smp_processor_id());
-
-        if (unlikely(!current->array))
-                __activate_task(p, rq);
@@ -1270 +1269 @@
-        p->prio = effective_prio(p);
-        set_task_cpu(p, cpu);
-
-        if (cpu == this_cpu) {
-                if (unlikely(!current->array))
@@ -1289 +1287 @@
-                        resched_task(rq->curr);
-        }
-
-        double_rq_unlock(this_rq, rq);
-        local_irq_restore(flags);
@@ -3976 +3973 @@
-        rq->idle = current;
-        set_task_cpu(current, smp_processor_id());
-
+, 0
-
-        /*

.version

@@ -1 @@
-46
+81