diff -Nur linux-2.4.25_vanilla/arch/i386/config.in linux-2.4.25/arch/i386/config.in --- linux-2.4.25_vanilla/arch/i386/config.in 2004-02-20 16:17:34.000000000 +0100 +++ linux-2.4.25/arch/i386/config.in 2004-02-20 16:51:35.000000000 +0100 @@ -343,6 +343,11 @@ bool ' Use real mode APM BIOS call to power off' CONFIG_APM_REAL_MODE_POWER_OFF fi +define_bool CONFIG_PROC_MM y + +comment '/proc/mm (host-skas support) has been enabled; to disable it' +comment 'unapply the skas patch' + source drivers/acpi/Config.in endmenu diff -Nur linux-2.4.25_vanilla/arch/i386/kernel/ldt.c linux-2.4.25/arch/i386/kernel/ldt.c --- linux-2.4.25_vanilla/arch/i386/kernel/ldt.c 2004-02-20 16:17:34.000000000 +0100 +++ linux-2.4.25/arch/i386/kernel/ldt.c 2004-02-20 17:27:09.000000000 +0100 @@ -53,7 +53,7 @@ wmb(); pc->ldt = newldt; pc->size = mincount; - if (reload) { + if (reload && (¤t->active_mm->context == pc)) { load_LDT(pc); #ifdef CONFIG_SMP if (current->mm->cpu_vm_mask != (1<context.sem); mm->context.size = 0; - old_mm = current->mm; if (old_mm && old_mm->context.size > 0) { down(&old_mm->context.sem); retval = copy_ldt(&mm->context, &old_mm->context); @@ -102,6 +100,10 @@ return retval; } +int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { + return __init_new_context(current->mm, mm); +} + /* * No need to lock the MM as we are the last user * Do not touch the ldt register, we are already @@ -118,11 +120,10 @@ } } -static int read_ldt(void * ptr, unsigned long bytecount) +static int read_ldt(struct mm_struct * mm, void * ptr, unsigned long bytecount) { int err; unsigned long size; - struct mm_struct * mm = current->mm; if (!mm->context.size) return 0; @@ -166,9 +167,8 @@ return err; } -static int write_ldt(void * ptr, unsigned long bytecount, int oldmode) +static int write_ldt(struct mm_struct * mm, void * ptr, unsigned long bytecount, int oldmode) { - struct mm_struct * mm = current->mm; __u32 entry_1, entry_2, *lp; int error; struct modify_ldt_ldt_s ldt_info; @@ -192,7 +192,7 @@ down(&mm->context.sem); if (ldt_info.entry_number >= mm->context.size) { - error = alloc_ldt(¤t->mm->context, ldt_info.entry_number+1, 1); + error = alloc_ldt(&mm->context, ldt_info.entry_number+1, 1); if (error < 0) goto out_unlock; } @@ -240,23 +240,27 @@ return error; } -asmlinkage int sys_modify_ldt(int func, void *ptr, unsigned long bytecount) +int modify_ldt(struct mm_struct * mm, int func, void *ptr, unsigned long bytecount) { int ret = -ENOSYS; switch (func) { case 0: - ret = read_ldt(ptr, bytecount); + ret = read_ldt(mm, ptr, bytecount); break; case 1: - ret = write_ldt(ptr, bytecount, 1); + ret = write_ldt(mm, ptr, bytecount, 1); break; case 2: ret = read_default_ldt(ptr, bytecount); break; case 0x11: - ret = write_ldt(ptr, bytecount, 0); + ret = write_ldt(mm, ptr, bytecount, 0); break; } return ret; } + +asmlinkage int sys_modify_ldt(int func, void *ptr, unsigned long bytecount) { + return modify_ldt(current->mm, func, ptr, bytecount); +} diff -Nur linux-2.4.25_vanilla/arch/i386/kernel/ptrace.c linux-2.4.25/arch/i386/kernel/ptrace.c --- linux-2.4.25_vanilla/arch/i386/kernel/ptrace.c 2003-09-11 21:03:50.000000000 +0200 +++ linux-2.4.25/arch/i386/kernel/ptrace.c 2004-02-20 17:27:09.000000000 +0100 @@ -147,6 +147,11 @@ put_stack_long(child, EFL_OFFSET, tmp); } +extern int modify_ldt(struct mm_struct *mm, int func, void *ptr, + unsigned long bytecount); + +extern struct mm_struct *proc_mm_get_mm(int fd); + asmlinkage int sys_ptrace(long request, long pid, long addr, long data) { struct task_struct *child; @@ -419,6 +424,53 @@ break; } + case PTRACE_FAULTINFO: { + struct ptrace_faultinfo fault; + + fault = ((struct ptrace_faultinfo) + { .is_write = child->thread.error_code, + .addr = child->thread.cr2 }); + ret = copy_to_user((unsigned long *) data, &fault, + sizeof(fault)); + break; + } + case PTRACE_SIGPENDING: + ret = copy_to_user((unsigned long *) data, + &child->pending.signal, + sizeof(child->pending.signal)); + break; + + case PTRACE_LDT: { + struct ptrace_ldt ldt; + + if(copy_from_user(&ldt, (unsigned long *) data, + sizeof(ldt))){ + ret = -EIO; + break; + } + ret = modify_ldt(child->mm, ldt.func, ldt.ptr, ldt.bytecount); + break; + } + +#ifdef CONFIG_PROC_MM + case PTRACE_SWITCH_MM: { + struct mm_struct *old = child->mm; + struct mm_struct *new = proc_mm_get_mm(data); + + if(IS_ERR(new)){ + ret = PTR_ERR(new); + break; + } + + atomic_inc(&new->mm_users); + child->mm = new; + child->active_mm = new; + mmput(old); + ret = 0; + break; + } +#endif + default: ret = -EIO; break; diff -Nur linux-2.4.25_vanilla/arch/i386/kernel/sys_i386.c linux-2.4.25/arch/i386/kernel/sys_i386.c --- linux-2.4.25_vanilla/arch/i386/kernel/sys_i386.c 2003-09-11 21:03:50.000000000 +0200 +++ linux-2.4.25/arch/i386/kernel/sys_i386.c 2004-02-20 17:00:57.000000000 +0100 @@ -40,7 +40,7 @@ } /* common code for old and new mmaps */ -static inline long do_mmap2( +long do_mmap2(struct mm_struct *mm, unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff) @@ -55,9 +55,9 @@ goto out; } - down_write(¤t->mm->mmap_sem); - error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); + down_write(&mm->mmap_sem); + error = do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff); + up_write(&mm->mmap_sem); if (file) fput(file); @@ -69,7 +69,7 @@ unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff) { - return do_mmap2(addr, len, prot, flags, fd, pgoff); + return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff); } /* @@ -100,7 +100,7 @@ if (a.offset & ~PAGE_MASK) goto out; - err = do_mmap2(a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT); + err = do_mmap2(current->mm, a.addr, a.len, a.prot, a.flags, a.fd, a.offset >> PAGE_SHIFT); out: return err; } diff -Nur linux-2.4.25_vanilla/include/asm-i386/processor.h linux-2.4.25/include/asm-i386/processor.h --- linux-2.4.25_vanilla/include/asm-i386/processor.h 2004-02-20 16:18:04.000000000 +0100 +++ linux-2.4.25/include/asm-i386/processor.h 2004-02-20 17:19:41.000000000 +0100 @@ -433,6 +433,8 @@ static inline void copy_segments(struct task_struct *p, struct mm_struct * mm) { } static inline void release_segments(struct mm_struct * mm) { } +extern int __init_new_context(struct mm_struct *old_mm, struct mm_struct *mm); + /* * Return saved PC of a blocked thread. */ diff -Nur linux-2.4.25_vanilla/include/asm-i386/ptrace.h linux-2.4.25/include/asm-i386/ptrace.h --- linux-2.4.25_vanilla/include/asm-i386/ptrace.h 2003-09-11 21:03:50.000000000 +0200 +++ linux-2.4.25/include/asm-i386/ptrace.h 2004-02-20 17:00:57.000000000 +0100 @@ -51,6 +51,22 @@ #define PTRACE_SETOPTIONS 21 +struct ptrace_faultinfo { + int is_write; + unsigned long addr; +}; + +struct ptrace_ldt { + int func; + void *ptr; + unsigned long bytecount; +}; + +#define PTRACE_FAULTINFO 52 +#define PTRACE_SIGPENDING 53 +#define PTRACE_LDT 54 +#define PTRACE_SWITCH_MM 55 + /* options set using PTRACE_SETOPTIONS */ #define PTRACE_O_TRACESYSGOOD 0x00000001 diff -Nur linux-2.4.25_vanilla/include/linux/mm.h linux-2.4.25/include/linux/mm.h --- linux-2.4.25_vanilla/include/linux/mm.h 2003-12-06 19:47:45.000000000 +0100 +++ linux-2.4.25/include/linux/mm.h 2004-02-20 17:00:57.000000000 +0100 @@ -505,6 +505,9 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, unsigned long start, int len, int write, int force, struct page **pages, struct vm_area_struct **vmas); +extern long do_mprotect(struct mm_struct *mm, unsigned long start, + size_t len, unsigned long prot); + /* * On a two-level page table, this ends up being trivial. Thus the * inlining and the symmetry break with pte_alloc() that does all @@ -552,9 +555,10 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); -extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, - unsigned long len, unsigned long prot, - unsigned long flag, unsigned long pgoff); +extern unsigned long do_mmap_pgoff(struct mm_struct *mm, + struct file *file, unsigned long addr, + unsigned long len, unsigned long prot, + unsigned long flag, unsigned long pgoff); static inline unsigned long do_mmap(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, @@ -564,7 +568,7 @@ if ((offset + PAGE_ALIGN(len)) < offset) goto out; if (!(offset & ~PAGE_MASK)) - ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT); + ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag, offset >> PAGE_SHIFT); out: return ret; } diff -Nur linux-2.4.25_vanilla/include/linux/proc_mm.h linux-2.4.25/include/linux/proc_mm.h --- linux-2.4.25_vanilla/include/linux/proc_mm.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.4.25/include/linux/proc_mm.h 2004-02-20 17:00:57.000000000 +0100 @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) + * Licensed under the GPL + */ + +#ifndef __PROC_MM_H +#define __PROC_MM_H + +#define MM_MMAP 54 +#define MM_MUNMAP 55 +#define MM_MPROTECT 56 +#define MM_COPY_SEGMENTS 57 + +struct mm_mmap { + unsigned long addr; + unsigned long len; + unsigned long prot; + unsigned long flags; + unsigned long fd; + unsigned long offset; +}; + +struct mm_munmap { + unsigned long addr; + unsigned long len; +}; + +struct mm_mprotect { + unsigned long addr; + unsigned long len; + unsigned int prot; +}; + +struct proc_mm_op { + int op; + union { + struct mm_mmap mmap; + struct mm_munmap munmap; + struct mm_mprotect mprotect; + int copy_segments; + } u; +}; + +#endif diff -Nur linux-2.4.25_vanilla/mm/Makefile linux-2.4.25/mm/Makefile --- linux-2.4.25_vanilla/mm/Makefile 2003-09-11 21:03:50.000000000 +0200 +++ linux-2.4.25/mm/Makefile 2004-02-20 17:00:57.000000000 +0100 @@ -17,5 +17,6 @@ shmem.o obj-$(CONFIG_HIGHMEM) += highmem.o +obj-$(CONFIG_PROC_MM) += proc_mm.o include $(TOPDIR)/Rules.make diff -Nur linux-2.4.25_vanilla/mm/mmap.c linux-2.4.25/mm/mmap.c --- linux-2.4.25_vanilla/mm/mmap.c 2004-02-20 16:18:11.000000000 +0100 +++ linux-2.4.25/mm/mmap.c 2004-02-20 17:00:57.000000000 +0100 @@ -391,10 +391,11 @@ return 0; } -unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, unsigned long len, - unsigned long prot, unsigned long flags, unsigned long pgoff) +unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file, + unsigned long addr, unsigned long len, + unsigned long prot, unsigned long flags, + unsigned long pgoff) { - struct mm_struct * mm = current->mm; struct vm_area_struct * vma, * prev; unsigned int vm_flags; int correct_wcount = 0; diff -Nur linux-2.4.25_vanilla/mm/mprotect.c linux-2.4.25/mm/mprotect.c --- linux-2.4.25_vanilla/mm/mprotect.c 2003-12-06 19:47:48.000000000 +0100 +++ linux-2.4.25/mm/mprotect.c 2004-02-20 17:00:57.000000000 +0100 @@ -264,7 +264,8 @@ return 0; } -asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot) +long do_mprotect(struct mm_struct *mm, unsigned long start, size_t len, + unsigned long prot) { unsigned long nstart, end, tmp; struct vm_area_struct * vma, * next, * prev; @@ -281,9 +282,9 @@ if (end == start) return 0; - down_write(¤t->mm->mmap_sem); + down_write(&mm->mmap_sem); - vma = find_vma_prev(current->mm, start, &prev); + vma = find_vma_prev(mm, start, &prev); error = -ENOMEM; if (!vma || vma->vm_start > start) goto out; @@ -332,6 +333,11 @@ prev->vm_mm->map_count--; } out: - up_write(¤t->mm->mmap_sem); + up_write(&mm->mmap_sem); return error; } + +asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot) +{ + return(do_mprotect(current->mm, start, len, prot)); +} diff -Nur linux-2.4.25_vanilla/mm/proc_mm.c linux-2.4.25/mm/proc_mm.c --- linux-2.4.25_vanilla/mm/proc_mm.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.4.25/mm/proc_mm.c 2004-02-20 17:19:40.000000000 +0100 @@ -0,0 +1,174 @@ +/* + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) + * Licensed under the GPL + */ + +#include "linux/proc_fs.h" +#include "linux/proc_mm.h" +#include "linux/file.h" +#include "asm/uaccess.h" +#include "asm/mmu_context.h" + +static struct file_operations proc_mm_fops; + +struct mm_struct *proc_mm_get_mm(int fd) +{ + struct mm_struct *ret = ERR_PTR(-EBADF); + struct file *file; + + file = fget(fd); + if (!file) + goto out; + + ret = ERR_PTR(-EINVAL); + if(file->f_op != &proc_mm_fops) + goto out_fput; + + ret = file->private_data; + + out_fput: + fput(file); + out: + return(ret); +} + +extern long do_mmap2(struct mm_struct *mm, unsigned long addr, + unsigned long len, unsigned long prot, + unsigned long flags, unsigned long fd, + unsigned long pgoff); + +static ssize_t write_proc_mm(struct file *file, const char *buffer, + size_t count, loff_t *ppos) +{ + struct mm_struct *mm = file->private_data; + struct proc_mm_op req; + int n, ret; + + if(count > sizeof(req)) + return(-EINVAL); + + n = copy_from_user(&req, buffer, count); + if(n != 0) + return(-EFAULT); + + ret = count; + switch(req.op){ + case MM_MMAP: { + struct mm_mmap *map = &req.u.mmap; + + ret = do_mmap2(mm, map->addr, map->len, map->prot, + map->flags, map->fd, map->offset >> PAGE_SHIFT); + if((ret & ~PAGE_MASK) == 0) + ret = count; + + break; + } + case MM_MUNMAP: { + struct mm_munmap *unmap = &req.u.munmap; + + down_write(&mm->mmap_sem); + ret = do_munmap(mm, unmap->addr, unmap->len); + up_write(&mm->mmap_sem); + + if(ret == 0) + ret = count; + break; + } + case MM_MPROTECT: { + struct mm_mprotect *protect = &req.u.mprotect; + + ret = do_mprotect(mm, protect->addr, protect->len, + protect->prot); + if(ret == 0) + ret = count; + break; + } + + case MM_COPY_SEGMENTS: { + struct mm_struct *from = proc_mm_get_mm(req.u.copy_segments); + + if(IS_ERR(from)){ + ret = PTR_ERR(from); + break; + } + + /*mm_copy_segments(from, mm);*/ + __init_new_context(from, mm); + break; + } + default: + ret = -EINVAL; + break; + } + + return(ret); +} + +static int open_proc_mm(struct inode *inode, struct file *file) +{ + struct mm_struct *mm = mm_alloc(); + int ret; + + ret = -ENOMEM; + if(mm == NULL) + goto out_mem; + + ret = init_new_context(current, mm); + if(ret) + goto out_free; + + spin_lock(&mmlist_lock); + list_add(&mm->mmlist, ¤t->mm->mmlist); + mmlist_nr++; + spin_unlock(&mmlist_lock); + + file->private_data = mm; + + return(0); + + out_free: + mmput(mm); + out_mem: + return(ret); +} + +static int release_proc_mm(struct inode *inode, struct file *file) +{ + struct mm_struct *mm = file->private_data; + + mmput(mm); + return(0); +} + +static struct file_operations proc_mm_fops = { + .open = open_proc_mm, + .release = release_proc_mm, + .write = write_proc_mm, +}; + +static int make_proc_mm(void) +{ + struct proc_dir_entry *ent; + + ent = create_proc_entry("mm", 0222, &proc_root); + if(ent == NULL){ + printk("make_proc_mm : Failed to register /proc/mm\n"); + return(0); + } + ent->proc_fops = &proc_mm_fops; + + return(0); +} + +__initcall(make_proc_mm); + +/* + * Overrides for Emacs so that we follow Linus's tabbing style. + * Emacs will notice this stuff at the end of the file and automatically + * adjust the settings for this buffer only. This must remain at the end + * of the file. + * --------------------------------------------------------------------------- + * Local variables: + * c-file-style: "linux" + * End: + */