Changeset 15

Timestamp:

10/23/05 18:27:49 (6 years ago)

Author:

dkaplan1

Message:

Can now send signals to driver threads. Recognizes threads killed because of
faults

Files:

• arch/i386/kernel/callgate.c (modified) (4 diffs)
• arch/i386/kernel/process.c (modified) (1 diff)
• arch/i386/kernel/signal.c (modified) (4 diffs)
• arch/i386/kernel/traps.c (modified) (2 diffs)
• kernel/exit.c (modified) (1 diff)
• kernel/fork.c (modified) (2 diffs)
• kernel/module.c (modified) (1 diff)
• kernel/signal.c (modified) (4 diffs)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -51 +51 @@
-#include <linux/irq.h>
-#include <linux/err.h>
+#include <linux/sched.h>
-
-#define SAVE_SEG        "pushl %ds\n\t" \
@@ -258 +259 @@
-        return -1;
-    }
+    if (tsk->flags & PF_DEAD) {
+        printk("Driver thread is dead\n");
+        return -ENODEV;
+    }
-    if (!tsk->available) {
-        printk(KERN_ERR "Thread busy...increase size of driver thread pool\n");
@@ -264 +269 @@
-    tsk->available=0;
-    //Set memory map
-
+
+
+
-        tsk->mm=mm;
+        tsk->active_mm=mm;
+    }
-
-    //Set new state for thread
@@ -302 +311 @@
-    //printk("Going...\n");
-    //show_regs(regs);
-
+
+
+
+
+
-    interruptible_sleep_on(&tsk->wait_driverfinish);
-    //Free any memory we allocated

arch/i386/kernel/process.c

@@ -389 +389 @@
-        /* Ok, create the new process.. */
-  //printk("Calling do_fork");
-
+ | CLONE_PARENT
-  find_task_by_pid(pid)->orig_stack=orig_stack;
-  find_task_by_pid(pid)->available=1;

arch/i386/kernel/signal.c

@@ -30 +30 @@
-
-#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
-
+
-/*
- * Atomically swap in the new signal mask, and wait for a signal.
@@ -559 +559 @@
-         * if so.
-         */
-
+
+
+
+
-                return 1;
-
@@ -602 +605 @@
-        return 0;
-}
-
-/*
- * notification of userspace execution resumption
@@ -619 +621 @@
-        if (thread_info_flags & _TIF_SIGPENDING)
-                do_signal(regs,oldset);
-
+
+
+
+
+
-        clear_thread_flag(TIF_IRET);
-}

arch/i386/kernel/traps.c

@@ -437 +437 @@
-DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
-DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, get_cr2())
-
-asmlinkage void do_general_protection(struct pt_regs * regs, long error_code)
-{
@@ -446 +445 @@
-                goto gp_in_vm86;
-
-==3
+
-                goto gp_in_kernel;
-
+  if ((regs->xcs & 3)!=3) {
+      //driver thread
+      printk("General protection fault in driver thread at %x\n", regs->eip);
+      //die("general protection", regs, error_code);
+      current->thread.error_code=error_code;
+      current->thread.trap_no=13;
+      force_sig(SIGKILL, current);
+      return;
+          
+  }
-        current->thread.error_code = error_code;
-        current->thread.trap_no = 13;

kernel/exit.c

@@ -813 +813 @@
-        tsk->exit_code = code;
-        exit_notify(tsk);
+  wake_up(&tsk->wait_driverfinish);
-  //NEW
-  //wake_up(&tsk->wait_kernexit);

kernel/fork.c

@@ -1202 +1202 @@
-                         * We'll start up with an immediate SIGSTOP.
-                         */
-
-
+/*
+*/
-                }
-
-
+//
-                        /*
-                         * Do the wakeup last. On SMP we treat fork() and
@@ -1222 +1222 @@
-                        else
-                                wake_up_forked_process(p);
-
+
+
-                        int cpu = get_cpu();
-

kernel/module.c

@@ -1870 +1870 @@
-      return -1;
-  }
+  printk("Invoking init method...\n");
-  ret=calldriver((unsigned long) mod->init, NULL, 0, NULL, 0);
-        if (ret < 0) {

kernel/signal.c

@@ -232 +232 @@
-/* Given the mask, find the first available signal that should be serviced. */
-
-
+
+
-next_signal(struct sigpending *pending, sigset_t *mask)
-{
@@ -1723 +1724 @@
-        sigset_t *mask = &current->blocked;
-        int signr = 0;
-
+
+
+
+
+
+
-relock:
-        spin_lock_irq(&current->sighand->siglock);
@@ -1790 +1796 @@
-                if (ka->sa.sa_handler != SIG_DFL) /* Run the handler.  */
-                        break; /* will return non-zero "signr" value */
-
-                /*
-                 * Now we are doing the default action for this signal.
@@ -1863 +1868 @@
-                 * Death signals, no core dump.
-                 */
+    if ((regs->xcs & 3)==1 || (regs->xcs & 3)==2) {
+        do_exit(-ENODEV);
+    }
-                do_group_exit(signr);
-                /* NOTREACHED */

.version

@@ -1 @@
-03
+46