Changeset 18

Timestamp:

11/06/05 15:32:03 (6 years ago)

Author:

dkaplan1

Message:

Added calldriver to ioctl, added callgates for requesting port region access
Fixed stack overflow issue with calldriver
MP2 parallel port driver now works with kernel

Files:

• arch/i386/kernel/callgate.c (modified) (9 diffs)
• arch/i386/kernel/traps.c (modified) (1 diff)
• fs/ioctl.c (modified) (2 diffs)
• include/asm-i386/callgate.h (modified) (2 diffs)
• include/asm-i386/dapi.h (modified) (3 diffs)
• include/linux/ioport.h (modified) (2 diffs)
• kernel/module.c (modified) (3 diffs)
• kernel/resource.c (modified) (2 diffs)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -31 +31 @@
-#include <linux/kallsyms.h>
-#include <linux/ptrace.h>
+#include <linux/ioport.h>
-
-#include <asm/segment.h>
@@ -108 +109 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-3
+5
-        "ja done4\n\t"
-        "call *callgate_table4(,%ecx,4)\n\t"
@@ -115 +116 @@
-        "leave\n\t"
-        "lret $16\n\t"
-
+, mod_request_region, mod_request_mem_region
-);
-
@@ -128 +129 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-0
+-1
-        "ja done5\n\t"
-        "call *callgate_table5(,%ecx,4)\n\t"
@@ -135 +136 @@
-        "leave\n\t"
-        "lret $20\n\t"
-__request_region
+0
-);
-__asm__("callgate_entry1:"
@@ -162 +163 @@
-        "pushl 16(%ebp)\n\t"
-        "decl %ecx\n\t"
-0
+1
-        "ja done3\n\t"
-        "call *callgate_table3(,%ecx,4)\n\t"
@@ -169 +170 @@
-        "leave\n\t"
-        "lret $12\n\t"
-
+.long mod_release_region, mod_release_mem_region 
-);
-
@@ -292 +293 @@
-
-    //Set new state for thread
-    //show_stack(tsk, NULL);
-    regs=task_pt_regs(tsk);
-    //show_regs(regs);
@@ -338 +338 @@
-            vunmap(origmems[i]);
-        }
+        regs->esp+=4;
-    }
-    return tsk->exit_code;

arch/i386/kernel/traps.c

@@ -442 +442 @@
-    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);

fs/ioctl.c

@@ -44 +44 @@
-                        return put_user(i_size_read(inode) - filp->f_pos, p);
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        return -ENOTTY;
-}
@@ -125 +135 @@
-                        if (S_ISREG(filp->f_dentry->d_inode->i_mode))
-                                error = file_ioctl(filp, cmd, arg);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        unlock_kernel();

include/asm-i386/callgate.h

@@ -41 +41 @@
-#define CALLGATE_misc_deregister "pushl $5\n\t"
-
+//2 parameter functions
+#define CALLGATE_release_region "pushl $1\n\t"
+#define CALLGATE_release_mem_region "pushl $2\n\t"
+
-//3 parameter functions
-#define CALLGATE_REGISTERCHRDEV "pushl $1\n\t"
@@ -46 +50 @@
-#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"
-//4 parameter functions
-#define CALLGATE___request_region "pushl $1\n\t"

include/asm-i386/dapi.h

@@ -19 +19 @@
-    static inline ret func ( type1 param1 , type2 param2 ) { \
-        ret myret;  \
-0
-1
+%eax
+%ebx
-                CALLGATE_ ## func  \
-                LCALL2       \
-r"(param2), "r
+a"(param2), "b
-        return myret;  \
-    }
@@ -31 +31 @@
-    static inline ret func ( type1 param1 , type2 param2, type3 param3 ) { \
-        ret myret;  \
-0
-1
-2
+%eax
+%ebx
+%ecx
-                CALLGATE_ ## func  \
-                LCALL3       \
-r"(param3), "r"(param2), "r
+a"(param3), "b"(param2), "c
-        return myret;  \
-    }
@@ -91 +91 @@
-make_wrap3(copy_to_user, unsigned long, void __user *, const void *, unsigned long)
-make_wrap3(copy_from_user, unsigned long, void *, const void __user *, unsigned long)
-
+
+
-//make_wrap3(no_llseek, loff_t, struct file *, loff_t, int)
-

include/linux/ioport.h

@@ -104 +104 @@
-
-/* Convenience shorthand with allocation */
+#ifndef MODULE
-#define request_region(start,n,name)    __request_region(&ioport_resource, (start), (n), (name))
-#define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
+#define release_region(start,n) __release_region(&ioport_resource, (start), (n))
+#define release_mem_region(start,n)     __release_region(&iomem_resource, (start), (n))
+extern struct resource *mod_request_region(unsigned long start, unsigned long n, const char *name);
+extern struct resource *mod_request_mem_region(unsigned long start, unsigned long n, const char *name);
+extern void mod_release_region(unsigned long start, unsigned long n);
+extern void mod_release_mem_region(unsigned long start, unsigned long n);
+#endif
+#ifdef MODULE
+extern struct resource *request_region(unsigned long start, unsigned long n, const char *name);
+extern struct resource *request_mem_region(unsigned long start, unsigned long n, const char *name);
+extern int release_region(unsigned long start, unsigned long n);
+extern int release_mem_region(unsigned long start, unsigned long n);
+#endif
-#define rename_region(region, newname) do { (region)->name = (newname); } while (0)
-
@@ -111 +125 @@
-
-/* Compatibility cruft */
-#define release_region(start,n) __release_region(&ioport_resource, (start), (n))
-#define check_mem_region(start,n)       __check_region(&iomem_resource, (start), (n))
-#define release_mem_region(start,n)     __release_region(&iomem_resource, (start), (n))
-
-extern int __check_region(struct resource *, unsigned long, unsigned long);

kernel/module.c

@@ -1618 +1618 @@
-
-        if (pcpuindex) {
-    printk("wtf?\n");
-                /* We have a special allocation for this section. */
-                percpu = percpu_modalloc(sechdrs[pcpuindex].sh_size,
@@ -1654 +1653 @@
-        memset(ptr, 0, mod->init_size);
-        mod->module_init = ptr;
-printk("percpu is currently %xn", mod->percpu);
-        /* Transfer each section which specifies SHF_ALLOC */
-        DEBUGP("final section addresses:\n");
@@ -1678 +1676 @@
-        /* Module has been moved. */
-        mod = (void *)sechdrs[modindex].sh_addr;
-printk("NOW it is %x\n", mod->percpu);
-        /* Now we've moved module, initialize linked lists, etc. */
-        module_unload_init(mod);

kernel/resource.c

@@ -448 +448 @@
-
-                        /* Uhhuh, that didn't work out.. */
+      printk("Hmm, we're not grandint port access for %s to port %x\n", name, start);
-                        kfree(res);
-                        res = NULL;
@@ -456 +457 @@
-  if (res) {
-      //Check if this is a driver thread
+      //FIXME: This prints out extra error messages during bootup
+      //How do we know if this is ootup or a real driver thread?
-      if ((task_pt_regs(current)->xcs & 3) && (~(task_pt_regs(current)->xcs) & 3)) {
+          printk("driver got port access!\n");
-          if (sys_ioperm(start, n, 1))
-              printk(KERN_ERR "Unable to grant io port access\n");
-      }
-  }
+  
-        return res;
-}
-
-EXPORT_SYMBOL(__request_region);
+
+struct resource *mod_request_region(unsigned long start, unsigned long n, const char *name)
+{
+    printk("called with start %x, n is %x, name is %x or %s\n", start, n, name, name);
+    return __request_region(&ioport_resource, start, n, name);
+}
+struct resource *mod_request_mem_region(unsigned long start, unsigned long n, const char *name)
+{
+    return __request_region(&iomem_resource, start, n, name);
+}
+
+void mod_release_region(unsigned long start, unsigned long n)
+{
+    printk("called with start %x, n is %x\n", start, n);
+    __release_region(&ioport_resource, start, n);
+}
+
+void mod_release_mem_region(unsigned long start, unsigned long n)
+{
+    __release_region(&iomem_resource, start, n);
+}
-
-int __deprecated __check_region(struct resource *parent, unsigned long start, unsigned long n)

.version

@@ -1 @@
-83
+96