Changeset 27

Timestamp:

02/05/06 15:42:13 (6 years ago)

Author:

dkaplan1

Message:

Changed calldriver arguments and references. Now includes size and flags
Added map_pages function to map full pages
Added linked lists of mappings
Added linked lists of usage counts
Modified map_struct to look in list for cached mapping
NO UNMAPPING CODE (yet)

Files:

• arch/i386/kernel/callgate.c (modified) (12 diffs)
• arch/i386/kernel/irq.c (modified) (1 diff)
• drivers/char/misc.c (modified) (1 diff)
• fs/file_table.c (modified) (2 diffs)
• fs/ioctl.c (modified) (2 diffs)
• fs/open.c (modified) (1 diff)
• fs/proc/generic.c (modified) (1 diff)
• fs/read_write.c (modified) (10 diffs)
• include/asm-i386/callgate.h (modified) (1 diff)
• include/linux/sched.h (modified) (1 diff)
• kernel/module.c (modified) (2 diffs)
• kernel/timer.c (modified) (1 diff)
• .version (modified) (1 diff)

arch/i386/kernel/callgate.c

@@ -66 +66 @@
-                        "popl %ds\n\t"
-
+#define PAGE_OF(addr) ((addr) & PAGE_MASK)
+
-//#define NO_PARAMS
-void *ring1_driver_helper;
@@ -106 +108 @@
-void do_benchmark(unsigned long hi, unsigned long lo);
-void lcall_nop(void);
+unsigned long map_pages(void *virt_addr, unsigned long count, int ring, void **origmem);
+
+struct driver_usage {
+        void *driver_id;
+        struct driver_usage *next;
+};
+
+struct ring_page_map {
+        unsigned long pa; //Physical address of page (page aligned)
+        int num_pages; //Number of consecutive pages in this mapping
+        unsigned long vaddr; //Virtual address of page in driver space
+        void *origaddr; //Virtual address for vunmap
+   struct driver_usage *refs; //Head of linked list of drivers using this mapping       
+        struct ring_page_map *next; //Next mapping
+};
+
+struct ring_page_map *ring1_head;
+struct ring_page_map *ring2_head;
+
+
-struct task_struct *mod_get_current(void) {
-    struct task_struct *tsk=current;
@@ -113 +135 @@
-    if (!tsk->ring)
-        return current;
-+PAGE_SIZE, tsk->ring, &tsk->origcurrentaddr
+, tsk->ring, 1, tsk->driver_id
-    tsk->currentmapped=1;
-    return tsk->currentaddr;
@@ -330 +352 @@
-    create_callgate((unsigned long) callgate_entry15, 2, 15);
-    create_callgate((unsigned long) lcall_nop, 2, 0);
+
+         ring1_head=ring2_head=NULL;
-}
-
-//Cannot call from no context (ie interrupt handler)
-unsigned long *argv, int argc, struct mm_struct *mm, unsigned long ptrbitmap
+void **argv, unsigned int *sizes, int argc, struct mm_struct *mm, unsigned long ptrbitmap, unsigned long flags
-{
-    struct task_struct *tsk;
@@ -341 +365 @@
-    int i;
-    void * origmems[argc];
-ptrbitmap
+flags
-    {
-        printk(KERN_ERR "Cannot call driver code from interrupt handler\n");
@@ -358 +382 @@
-    return tsk->exit_code;*/
-
-ptrbitmap
+flags
-    if (!tsk) {
-        printk(KERN_ERR "Could not find worker thread for address %x\n", addr);
@@ -405 +429 @@
-        if (ptrbitmap & (1 << (argc))) {
-            //this is a ptr, so map it in
-
-
+
-//            addrs[argc]=0;
-            *(unsigned long*)(regs->esp)=addrs[argc];
-        } else {
-            addrs[argc]=0;
-
+(unsigned long) 
-        }
-    }
@@ -417 +440 @@
-#endif    
-    wake_up_process(tsk);
-ptrbitmap
+flags
-        tsk->bytes_to_pop=0;
-        sleep_on(&tsk->wait_driverfinish);
@@ -426 +449 @@
-//                ClearPageReserved(pfn_to_page(__pa(argv[i]) >> PAGE_SHIFT));
-//                ClearPageReserved(pfn_to_page((__pa(argv[i]) >> PAGE_SHIFT) + 1));
-
+//
-            }
-            regs->esp+=4;
@@ -438 +461 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    struct vm_area_struct *vma;
-    unsigned long addr=0;
-    int res1, res2;
-kernel_struct || !size
+virt_addr || !count || count > 2
-        return -EINVAL;
-    vma=(struct vm_area_struct*) kmalloc(sizeof(struct vm_area_struct), GFP_KERNEL);
-    down_write(&init_mm.mmap_sem);
-
+    //Is the +1 needed?  I'm not sure...
-    if (ring == 1)
-+ size
+* (count+1)
-    else if (ring == 2)
-+ size
+* (count+1)
-    else
-        BUG();
@@ -459 +552 @@
-    
-    vma->vm_mm=&init_mm;
-kernel_struct
-kernel_struct
+virt_addr
+virt_addr
-    if (!res1)
-kernel_struct
+virt_addr
-    if (!res2)    
-kernel_struct
-kernel_struct), size
+virt_addr
+virt_addr), PAGE_SIZE * count
-    if (!res1)    
-kernel_struct
+virt_addr
-    if (!res2)
-
-
+
-    
-out:    up_write(&init_mm.mmap_sem);
@@ -476 +568 @@
-        return addr;
-}
-    
-        
-

arch/i386/kernel/irq.c

@@ -233 +233 @@
-        retval |= action->handler(irq, action->dev_id, regs);
-    else {
-
-args, 3, NULL, NO_WAIT | 0
+
+my_args, my_sizes, 3, NULL, 0, NO_WAIT
-        retval|=IRQ_HANDLED;
-    }

drivers/char/misc.c

@@ -173 +173 @@
-                err=file->f_op->open(inode,file);
-      else {
-
-
-
+
+
-      }
-

fs/file_table.c

@@ -151 +151 @@
-          file->f_op->release(inode, file);
-      else {
-
-args, 2, current->mm, 3
+
+rel_args, rel_sizes, 2, current->mm, 3, 0
-      }
-  }
@@ -188 +188 @@
-          file->f_op->release(inode, file);
-      else {
-
-args, 2, current->mm, 3
+
+rel_args, rel_sizes, 2, current->mm, 3, 0
-      }
-  }

fs/ioctl.c

@@ -49 +49 @@
-          return filp->f_op->ioctl(inode, filp, cmd, arg);
-      else {
-
-
-
-
-
-
+
+
-      }
-  }
@@ -140 +136 @@
-              error = filp->f_op->ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
-          else {
-
-
-
-
-
-
+
+
-          }
-      }

fs/open.c

@@ -802 +802 @@
-                        error = f->f_op->open(inode,f);
-                else {
-
-
-
+
+
-                }
-                if (error)

fs/proc/generic.c

@@ -121 +121 @@
-                    count, &eof, dp->data);
-        } else {
-
-args, 6, current->mm, 19
+
+proc_args, proc_sizes, 6, current->mm, 19, 0
-        }
-                } else

fs/read_write.c

@@ -187 +187 @@
-        struct kiocb kiocb;
-        ssize_t ret;
-        unsigned long args[4];
-
-        init_sync_kiocb(&kiocb, filp);
@@ -194 +193 @@
-                ret = filp->f_op->aio_read(&kiocb, buf, len, kiocb.ki_pos);
-        else {
-args[0]=(unsigned long) &kiocb;
-args[1]=(unsigned long) buf;
-args[2]=(unsigned long) len;
-args[3]=(unsigned long) kiocb.ki_pos;
-rgs, 4, current->mm
+//Well, the last parameter is actually 64-bits
+//We could deal with this, it would require extra work though
+//Let's just assume no one will ever call this function
+CALLDRIVER_PREP4(aio, &kiocb, buf, len, (unsigned long) kiocb.ki_pos)
+io_args,aio_sizes, 4, current->mm, 1
-        }
-
@@ -213 +212 @@
-        struct inode *inode = file->f_dentry->d_inode;
-        ssize_t ret;
-        unsigned long args[4];
-
-        if (!(file->f_mode & FMODE_READ))
@@ -228 +226 @@
-                                        ret = file->f_op->read(file, buf, count, pos);
-                                else {
-
-
-
-
-
+
+
-                                }
-                        }
@@ -251 +246 @@
-        struct kiocb kiocb;
-        ssize_t ret;
-        unsigned long args[4];
-
-        init_sync_kiocb(&kiocb, filp);
@@ -258 +252 @@
-                ret = filp->f_op->aio_write(&kiocb, buf, len, kiocb.ki_pos);
-        else {
-
-
-
-
-
+
+
+
-        }
-
@@ -278 +270 @@
-        struct inode *inode = file->f_dentry->d_inode;
-        ssize_t ret;
-        unsigned long args[4];
-
-        if (!(file->f_mode & FMODE_WRITE))
@@ -293 +284 @@
-                                        ret = file->f_op->write(file, buf, count, pos);
-                                else {
-
-
-
-
-
+
+
-                                }
-                        }
@@ -589 +577 @@
-        ssize_t retval;
-        int fput_needed_in, fput_needed_out;
-        unsigned long args[5];
-
-        /*
@@ -654 +641 @@
-                retval = in_file->f_op->sendfile(in_file, ppos, count, file_send_actor, out_file);
-        else {
-
-
-
-
-
-
+
+
-        }
-

include/asm-i386/callgate.h

@@ -23 +23 @@
-struct mm_struct;
-struct task_struct;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-//FLAGS for calldriver
-80000000
-40000000
+00000001
+00000002
-#endif

include/linux/sched.h

@@ -527 +527 @@
-    int bytes_to_pop;
-    struct task_struct *caller;
+         void *driver_id;
-};
-

kernel/module.c

@@ -630 +630 @@
-if (mod->ring) {
-  if (mod->exit)
-0,  NULL
+NULL, 0,  NULL, 0
-        down(&module_mutex);
-  //NEW: get rid of threads
@@ -1912 +1912 @@
-      }
-      mod->worker_threads[i]->ring=mod->ring;
+      mod->worker_threads[i]->driver_id=mod;
-  }
-  schedule();
-  printk("mod pointer is %x, per cpu is %d\n", mod, mod->percpu);
-  printk("Invoking init method...\n");
-0, NULL
+NULL, 0, NULL, 0
-} else {
-        ret=mod->init();

kernel/timer.c

@@ -458 +458 @@
-                          fn(data);
-      else {
-
-
+
+
+
-      }
-                        spin_lock_irq(&base->lock);

.version

@@ -1 @@
-
+