SKAS3 for 2.6.23
Subsystems (5)
A skas3 patch which works on 2.6.23 is below. There were a couple of problems that I fixed which are described in the changelog. With this on the host and a UML close to what's currently in -mm, I get ~85% of native performance on a kernel build. With skas0, the best I've seen is ~75%.
Thanks to [email protected] for sending me a patch that patched cleanly into 2.6.23.
2.6.24 is going to be even more interesting, given the x86 merge.
Jeff
Signature · 17 lines
Work email - jdike at linux dot intel dot com commit 7d984ebee7c1263b24904f049e898a37bf85f522 Author: Jeff Dike <[email protected]> Date: Sat Dec 8 09:07:59 2007 -0500 Fixed skas3 patch for 2.6.23. Brokenness in 2.6.23 included use of current->mm in the mmap path causing new maps to be done in the UML kernel address space rather than the process address space. The -EINVAL that everyone started seeing with 2.6.23 was caused by a change in procfs. file->f_ops was no longer proc_mm_ops, but proc_reg_ops, with proc_mm_ops hidden elsewhere. This broke the sanity checking in proc_mm_get_mm which made sure that it was getting a /proc/mm descriptor by checking that file->f_ops was &proc_mm_ops.
arch/i386/Kconfig +20 -0
@@ -612,6 +612,26 @@ config X86_PAE has the cost of more pagetable lookup overhead, and also consumes more pagetable space per process. +config PROC_MM + bool "/proc/mm support" + default y + +config PROC_MM_DUMPABLE + bool "Make UML childs /proc/<pid> completely browsable" + default n + help + If in doubt, say N. + + This fiddles with some settings to make sure /proc/<pid> is completely + browsable by who started UML, at the expense of some additional + locking (maybe this could slow down the runned UMLs of a few percents, + I've not tested this). + + Also, if there is a bug in this feature, there is some little + possibility to do privilege escalation if you have UML installed + setuid (which you shouldn't have done) or if UML changes uid on + startup (which will be a good thing, when enabled) ... + # Common NUMA Features config NUMA bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
arch/i386/kernel/ldt.c +36 -22
144 lines not on this page · raw message
arch/i386/kernel/ptrace.c +61 -0
73 lines not on this page · raw message
arch/i386/kernel/sys_i386.c +21 -6
@@ -23,6 +23,7 @@#include <asm/uaccess.h> #include <asm/unistd.h> #include <asm/ipc.h> +#include <asm/proc_mm.h> /* * sys_pipe() is the normal C calling standard for creating
@@ -41,13 +42,12 @@ asmlinkage int sys_pipe(unsigned long __user * fildes)return error; } -asmlinkage long sys_mmap2 (unsigned long addr,unsigned long len, -unsigned long prot,unsigned long flags, -unsigned long fd,unsigned long pgoff) +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) {int error = -EBADF ;struct file *file =NULL ; -struct mm_struct *mm = current->mm; flags &= ~(MAP_EXECUTABLE |MAP_DENYWRITE );if (!(flags &MAP_ANONYMOUS )) {
@@ -57,7 +57,7 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, }down_write (&mm->mmap_sem); - error =do_mmap_pgoff (file, addr, len, prot, flags, pgoff); + error =__do_mmap_pgoff (mm, file, addr, len, prot, flags, pgoff);up_write (&mm->mmap_sem);if (file)
@@ -66,6 +66,18 @@ out:return error; } +asmlinkage long sys_mmap2 (unsigned long addr,unsigned long len, +unsigned long prot,unsigned long flags, +unsigned long fd,unsigned long pgoff) +{ +long ret =do_mmap2 (current->mm, addr, len, prot, flags, fd, pgoff); + +/* A tail call would reorder parameters on the stack and they would then +* be restored at the wrong places. */ +prevent_tail_call (ret); +return ret; +} +/* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than
@@ -94,8 +106,11 @@ asmlinkage int old_mmap(struct mmap_arg_struct __user *arg)if (a.offset & ~PAGE_MASK ) goto out; - err =sys_mmap2 (a.addr, a.len, a.prot, a.flags, + err =do_mmap2 (current->mm, a.addr, a.len, a.prot, a.flags, a.fd, a.offset >>PAGE_SHIFT ); +/* A tail call would reorder parameters on the stack and they would then +* be restored at the wrong places. */ +prevent_tail_call (err); out:return err; }
arch/um/include/skas_ptrace.h +4 -0
@@ -6,6 +6,8 @@#ifndef __SKAS_PTRACE_H#define __SKAS_PTRACE_H +#ifndef PTRACE_FAULTINFO +#define PTRACE_FAULTINFO 52#define PTRACE_SWITCH_MM 55
@@ -13,6 +15,8 @@#endif +#endif +/* * Overrides for Emacs so that we follow Linus's tabbing style. * Emacs will notice this stuff at the end of the file and automatically
arch/x86_64/Kconfig +20 -0
@@ -522,6 +522,26 @@ config SWIOTLB access 32-bits of memory can be used on systems with more than 3 GB of memory. If unsure, say Y. +config PROC_MM + bool "/proc/mm support" + default y + +config PROC_MM_DUMPABLE + bool "Make UML childs /proc/<pid> completely browsable" + default n + help + If in doubt, say N. + + This fiddles with some settings to make sure /proc/<pid> is completely + browsable by who started UML, at the expense of some additional + locking (maybe this could slow down the runned UMLs of a few percents, + I've not tested this). + + Also, if there is a bug in this feature, there is some little + possibility to do privilege escalation if you have UML installed + setuid (which you shouldn't have done) or if UML changes uid on + startup (which will be a good thing, when enabled) ... + config X86_MCE bool "Machine check support" if EMBEDDED default y
arch/x86_64/ia32/ptrace32.c +68 -0
92 lines not on this page · raw message
arch/x86_64/ia32/sys_ia32.c +12 -4
@@ -693,11 +693,10 @@ sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)return ret; } -asmlinkage long sys32_mmap2 (unsigned long addr,unsigned long len, -unsigned long prot,unsigned long flags, +long do32_mmap2 (struct mm_struct *mm,unsigned long addr, +unsigned long len,unsigned long prot,unsigned long flags,unsigned long fd,unsigned long pgoff) { -struct mm_struct *mm = current->mm;unsigned long error;struct file * file =NULL ;
@@ -709,7 +708,7 @@ asmlinkage long sys32_mmap2(unsigned long addr, unsigned long len, }down_write (&mm->mmap_sem); - error =do_mmap_pgoff (file, addr, len, prot, flags, pgoff); + error =__do_mmap_pgoff (mm, file, addr, len, prot, flags, pgoff);up_write (&mm->mmap_sem);if (file)
@@ -717,6 +716,15 @@ asmlinkage long sys32_mmap2(unsigned long addr, unsigned long len,return error; } +/* XXX: this wrapper can be probably removed, we can simply use the 64-bit +* version.*/ +asmlinkage long sys32_mmap2 (unsigned long addr,unsigned long len, +unsigned long prot,unsigned long flags, +unsigned long fd,unsigned long pgoff) +{ +return do32_mmap2 (current->mm, addr, len, prot, flags, fd, pgoff); +} +asmlinkage long sys32_olduname (struct oldold_utsname __user * name) {int err;
arch/x86_64/kernel/ldt.c +32 -23
146 lines not on this page · raw message
arch/x86_64/kernel/ptrace.c +70 -0
82 lines not on this page · raw message
arch/x86_64/kernel/sys_x86_64.c +11 -4
@@ -19,6 +19,7 @@#include <asm/uaccess.h> #include <asm/ia32.h> +#include <asm/proc_mm.h> /* * sys_pipe() is the normal C calling standard for creating
@@ -37,7 +38,7 @@ asmlinkage long sys_pipe(int __user *fildes)return error; } -asmlinkage long sys_mmap (unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags, +long do64_mmap (struct mm_struct *mm,unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags,unsigned long fd,unsigned long off) {long error;
@@ -55,9 +56,9 @@ asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prif (!file) goto out; } -down_write (¤t->mm->mmap_sem); - error =do_mmap_pgoff (file, addr, len, prot, flags, off >>PAGE_SHIFT ); -up_write (¤t->mm->mmap_sem); +down_write (&mm->mmap_sem); + error =__do_mmap_pgoff (mm, file, addr, len, prot, flags, off >>PAGE_SHIFT ); +up_write (&mm->mmap_sem);if (file)fput (file);
@@ -65,6 +66,12 @@ out:return error; } +asmlinkage long sys_mmap (unsigned long addr,unsigned long len,unsigned long prot,unsigned long flags, +unsigned long fd,unsigned long off) +{ +return do64_mmap (current->mm, addr, len, prot, flags, fd, off); +} +static void find_start_end (unsigned long flags,unsigned long *begin,unsigned long *end) {
arch/x86_64/mm/Makefile +1 -0
@@ -7,5 +7,6 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_K8_NUMA) += k8topology.o obj-$(CONFIG_ACPI_NUMA) += srat.o +obj-$(CONFIG_PROC_MM) += proc_mm.o hugetlbpage-y = ../../i386/mm/hugetlbpage.o
arch/x86_64/mm/proc_mm.c new file +85 -0
85 lines not on this page · raw message
include/asm-i386/desc.h +3 -0
@@ -216,6 +216,9 @@ static inline unsigned long get_desc_base(unsigned long *desc) return base; } +extern int __modify_ldt (struct mm_struct * mm,int func,void __user *ptr, +unsigned long bytecount); +#else /* __ASSEMBLY__ */ /*
include/asm-i386/mmu_context.h +17 -2
@@ -5,6 +5,7 @@#include <asm/atomic.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> +#include <asm/semaphore.h> #include <asm/paravirt.h> #ifndef CONFIG_PARAVIRT #include <asm-generic/mm_hooks.h>
@@ -17,11 +18,22 @@ static inline void paravirt_activate_mm(struct mm_struct *prev,/* -* Used for LDT copy/destruction. +* Used for LDT initialization/destruction. You cannot copy an LDT with +* init_new_context, since it thinks you are passing it a new LDT and won't +* deallocate its old content. */ int init_new_context (struct task_struct *tsk,struct mm_struct *mm);void destroy_context (struct mm_struct *mm); +/* LDT initialization for a clean environment - needed for SKAS.*/ +static inline void init_new_empty_context (struct mm_struct *mm) +{ +init_MUTEX (&mm->context.sem); + mm->context.size =0 ; +} + +/* LDT copy for SKAS - for the above problem.*/ +int copy_context (struct mm_struct *mm,struct mm_struct *old_mm);static inline void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk) {
@@ -40,6 +52,10 @@ static inline void switch_mm(struct mm_struct *prev, {int cpu =smp_processor_id (); +#ifdef CONFIG_SMP + prev =per_cpu (cpu_tlbstate, cpu).active_mm; +#endif +if (likely (prev != next)) {/* stop flush ipis for the previous mm */ cpu_clear (cpu, prev->cpu_vm_mask);
@@ -61,7 +77,6 @@ static inline void switch_mm(struct mm_struct *prev,#ifdef CONFIG_SMP else {per_cpu (cpu_tlbstate, cpu).state =TLBSTATE_OK ; -BUG_ON (per_cpu (cpu_tlbstate, cpu).active_mm != next);if (!cpu_test_and_set (cpu, next->cpu_vm_mask)) {/* We were in lazy tlb mode and leave_mm disabled
include/asm-i386/proc_mm.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef __ASM_PROC_MM +#define __ASM_PROC_MM + +#include <asm/page.h> + +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 inline long __do_mmap (struct mm_struct *mm,unsigned long addr, +unsigned long len,unsigned long prot, +unsigned long flags,unsigned long fd, +unsigned long off) +{ +return do_mmap2 (mm, addr, len, prot, flags, fd, off >>PAGE_SHIFT ); +} + +#endif /* __ASM_PROC_MM */
include/asm-i386/ptrace.h +29 -0
@@ -60,4 +60,33 @@ static inline int v8086_mode(struct pt_regs *regs)extern unsigned long profile_pc (struct pt_regs *regs);#endif /* __KERNEL__ */ +/*For SKAS3 support.*/ +#ifndef _LINUX_PTRACE_STRUCT_DEF +#define _LINUX_PTRACE_STRUCT_DEF + +#define PTRACE_FAULTINFO 52 +/* 53 was used for PTRACE_SIGPENDING, don't reuse it. */ +#define PTRACE_LDT 54 +#define PTRACE_SWITCH_MM 55 +#define PTRACE_EX_FAULTINFO 56 + +struct ptrace_faultinfo { +int is_write; +unsigned long addr; +}; + +struct ptrace_ex_faultinfo { +int is_write; +unsigned long addr; +int trap_no; +}; + +struct ptrace_ldt { +int func; +void *ptr; +unsigned long bytecount; +}; + +#endif /*ifndef _LINUX_PTRACE_STRUCT_DEF*/ +#endif
include/asm-x86_64/desc.h +3 -0
@@ -169,6 +169,9 @@ static inline void load_LDT(mm_context_t *pc)extern struct desc_ptr idt_descr; +extern int __modify_ldt (struct mm_struct * mm,int func,void __user *ptr, +unsigned long bytecount); +#endif /* !__ASSEMBLY__ */ #endif
include/asm-x86_64/mmu_context.h +18 -2
@@ -7,14 +7,29 @@#include <asm/pda.h> #include <asm/pgtable.h> #include <asm/tlbflush.h> +#include <asm/semaphore.h> #include <asm-generic/mm_hooks.h> /* * possibly do the LDT unload here? +* Used for LDT initialization/destruction. You cannot copy an LDT with +* init_new_context, since it thinks you are passing it a new LDT and won't +* deallocate its old content. */ +int init_new_context (struct task_struct *tsk,struct mm_struct *mm);void destroy_context (struct mm_struct *mm); +/* LDT initialization for a clean environment - needed for SKAS.*/ +static inline void init_new_empty_context (struct mm_struct *mm) +{ +init_MUTEX (&mm->context.sem); + mm->context.size =0 ; +} + +/* LDT copy for SKAS - for the above problem.*/ +int copy_context (struct mm_struct *mm,struct mm_struct *old_mm); +static inline void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk) {#ifdef CONFIG_SMP
@@ -32,6 +47,9 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk) {unsigned cpu =smp_processor_id (); +#ifdef CONFIG_SMP + prev =read_pda (active_mm); +#endif if (likely (prev != next)) {/* stop flush ipis for the previous mm */ cpu_clear (cpu, prev->cpu_vm_mask);
@@ -48,8 +66,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,#ifdef CONFIG_SMP else {write_pda (mmu_state,TLBSTATE_OK ); -if (read_pda (active_mm) != next) -out_of_line_bug ();if (!cpu_test_and_set (cpu, next->cpu_vm_mask)) {/* We were in lazy tlb mode and leave_mm disabled * tlb flush IPI delivery. We must reload CR3
include/asm-x86_64/proc_mm.h new file +58 -0
58 lines not on this page · raw message
include/asm-x86_64/ptrace-abi.h +6 -0
@@ -42,6 +42,12 @@#define PTRACE_GETFPXREGS 18#define PTRACE_SETFPXREGS 19 +#define PTRACE_FAULTINFO 52 +/* 53 was used for PTRACE_SIGPENDING, don't reuse it. */ +#define PTRACE_LDT 54 +#define PTRACE_SWITCH_MM 55 +#define PTRACE_EX_FAULTINFO 56 +/* only useful for access 32bit programs */ #define PTRACE_GET_THREAD_AREA 25#define PTRACE_SET_THREAD_AREA 26
include/asm-x86_64/ptrace.h +53 -0
59 lines not on this page · raw message
include/linux/mm.h +15 -4
@@ -5,6 +5,7 @@#ifdef __KERNEL__ +#include <linux/proc_mm.h> #include <linux/gfp.h> #include <linux/list.h> #include <linux/mmzone.h>
@@ -1066,11 +1067,18 @@ extern int install_special_mapping(struct mm_struct *mm,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, +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_pgoff (struct file *file,unsigned long addr,unsigned long len,unsigned long prot, -unsigned long flag,unsigned long pgoff); -extern unsigned long mmap_region (struct file *file,unsigned long addr, -unsigned long len,unsigned long flags, +unsigned long flag,unsigned long pgoff) { +return __do_mmap_pgoff (current->mm, file, addr, len, prot, flag, pgoff); +} + +extern unsigned long mmap_region (struct mm_struct *mm,struct file *file, +unsigned long addr,unsigned long len,unsigned long flags,unsigned int vm_flags,unsigned long pgoff,int accountable);
@@ -1089,6 +1097,9 @@ out:extern int do_munmap (struct mm_struct *,unsigned long ,size_t ); +extern long do_mprotect (struct mm_struct *mm,unsigned long start, +size_t len,unsigned long prot); +extern unsigned long do_brk (unsigned long ,unsigned long );/* filemap.c */
include/linux/proc_mm.h new file +113 -0
113 lines not on this page · raw message
mm/Makefile +5 -0
@@ -28,5 +28,10 @@ obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o +obj-$(CONFIG_PROC_MM) += proc_mm.o + +ifeq ($(CONFIG_PROC_MM),y) +obj-m += proc_mm-mod.o +endif obj-$(CONFIG_QUICKLIST) += quicklist.o
mm/fremap.c +3 -2
@@ -190,8 +190,9 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,unsigned long addr; flags &=MAP_NONBLOCK ; - addr =mmap_region (vma->vm_file, start, size, - flags, vma->vm_flags, pgoff,1 ); + addr =mmap_region (current->mm, vma->vm_file, start, + size, flags, vma->vm_flags, pgoff, +1 );if (IS_ERR_VALUE (addr)) { err = addr; }else {
mm/mmap.c +8 -9
@@ -888,12 +888,11 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,/* * The caller must hold down_write(current->mm->mmap_sem). */ - -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 inode *inode;unsigned int vm_flags;int error;
@@ -1024,10 +1023,10 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,if (error)return error; -return mmap_region (file, addr, len, flags, vm_flags, pgoff, +return mmap_region (mm, file, addr, len, flags, vm_flags, pgoff, accountable); } -EXPORT_SYMBOL (do_mmap_pgoff); +EXPORT_SYMBOL (__do_mmap_pgoff);/* * Some shared mappigns will want the pages marked read-only
@@ -1063,12 +1062,12 @@ int vma_wants_writenotify(struct vm_area_struct *vma) } -unsigned long mmap_region (struct file *file,unsigned long addr, +unsigned long mmap_region (struct mm_struct *mm, +struct file *file,unsigned long addr,unsigned long len,unsigned long flags,unsigned int vm_flags,unsigned long pgoff,int accountable) { -struct mm_struct *mm = current->mm;struct vm_area_struct *vma, *prev;int correct_wcount =0 ;int error;
mm/mprotect.c +15 -5
@@ -214,8 +214,9 @@ fail:return error; } -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 vm_flags, nstart, end, tmp, reqprot;struct vm_area_struct *vma, *prev;
@@ -245,9 +246,9 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot) vm_flags =calc_vm_prot_bits (prot); -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) goto out;
@@ -309,6 +310,15 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot) } } 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) +{ +long ret =do_mprotect (current->mm, start, len, prot); +/* A tail call would reorder parameters on the stack and they would then +* be restored at the wrong places. */ +prevent_tail_call (ret); +return ret; +}
mm/proc_mm-mod.c new file +50 -0
50 lines not on this page · raw message
mm/proc_mm.c new file +299 -0
299 lines not on this page · raw message
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 6 lines · Jeff Dike
A skas3 patch which works on 2.6.23 is below. There were a couple of problems that I fixed which are described in the changelog. With this on the host and a UML close to what's currently in -mm, I get ~85% of native performance on a kernel build. With skas0, the best I've seen is ~75%.
Quoted 6 lines
Thanks to [email protected] for sending me a patch that patched cleanly into 2.6.23.
2.6.24 is going to be even more interesting, given the x86 merge.
Jeff
This has just made my day. I just wish I had access to my main work machine now. I can't wait to test this.
Karol Swietlicki
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
On 8 Dec 2007, Karol Swietlicki outgrape:
Quoted 1 line
I can't wait to test this.
WORKSFORME, nice and fast again just in time for weeks of unattended operation as I head out for a nice long Newtonmass break. :)
(so it had better not crash! ;} )
Signature · 13 lines
`The rest is a tale of post and counter-post.' --- Ian Rawlings
describes USENET
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-develQuoted 1 line · Jeff Dike
A skas3 patch which works on 2.6.23 is below.
BTW, it would appear that applying this patch breaks building the resulting kernel as a guest kernel, at least on x86_64. asm-x86_64/proc_mm.h doesn't end up in asm/, and the #includes don't use asm/arch. I don't know if it's intended that this should work as a guest kernel?
Daniel
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 10 lines · Daniel Gryniewicz
Quoted 1 line · Jeff Dike
A skas3 patch which works on 2.6.23 is below.
BTW, it would appear that applying this patch breaks building the resulting kernel as a guest kernel, at least on
x86_64.asm-x86_64/proc_mm.hdoesn't end up in asm/, and the #includes don't use asm/arch. I don't know if it's intended that this should work as a guest kernel?Daniel
Okay, attached is a patch against 2.6.23.9 + skas3 patch to make it build (and run) as a UML guest. I've only tested it on x86_64 (but I did use SUBARCH=i386). I went the route of minimal changes to get it to build, as just including things from asm/arch/ didn't work very well.
Daniel
arch/um/sys-i386/ptrace_user.c +1 -1
@@ -9,7 +9,7 @@#include <unistd.h> #include "ptrace_user.h" /* Grr, asm/user.h includes asm/ptrace.h, so has to follow ptrace_user.h */ -#include <asm/user.h> +#include <sys/user.h> #include "kern_util.h" #include "sysdep/thread.h" #include "user.h"
include/asm-um/compat.h +9 -0
@@ -0,0 +1,9 @@ +#ifndef _ASM_X86_64_COMPAT_H +#define _ASM_X86_64_COMPAT_H + +typedef s32 compat_int_t ; +typedef s32 compat_long_t ; +typedef u32 compat_uint_t ; +typedef u32 compat_ulong_t ; + +#endif /* _ASM_X86_64_COMPAT_H */
include/asm-um/proc_mm.h +1 -0
@@ -0,0 +1 @@ +#include <asm/arch/proc_mm.h>
include/asm-um/ptrace-x86_64.h +11 -0
@@ -87,4 +87,15 @@ extern void arch_switch_to_skas(struct textern long arch_prctl_skas (struct task_struct *task,int code,unsigned long __user *addr); +struct ptrace_faultinfo { +int is_write; +unsigned long addr; +}; + +struct ptrace_ldt { +int func; +void *ptr; +unsigned long bytecount; +}; +#endif
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 4 lines · Daniel Gryniewicz
Okay, attached is a patch against 2.6.23.9 + skas3 patch to make it build (and run) as a UML guest. I've only tested it on
x86_64(but I did use SUBARCH=i386). I went the route of minimal changes to get it to build, as just including things from asm/arch/ didn't work very well.
Thanks, I've dropped this into my tree.
Jeff
Signature · 12 lines
Work email - jdike at linux dot intel dot com ------------------------------------------------------------------------- SF.Net email is sponsored by: Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://sourceforge.net/services/buy/index.php _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel