Rework stub syscall and page table handling
Subsystems (2)
cover Rework stub syscall and page table handling
From: Benjamin Berg <[email protected]>
This patchset reworks the stub syscall handling and also redos how page table updates are tracked and synchronized. Some of this originated in the SECCOMP patchset, but it became clear that these refactorings make sense independently as they result in a considerably fewer page faults.
As an example, these changes bring the runtime of one of the hostapd hwsim test modules from 121 seconds down to 103 seconds. Actual results will depend heavily on how pagefault heavy the workload is.
Lowering the amount of pagefaults is due to proactively syncing PTEs that are set (and were previously unset) and also delaying synchronization so that multiple updates can be done in one step rather than requiring multiple task switches.
This refactoring also fixes various odd corner cases in how UML was handling memory and cloning of MMs. As part of this work, support for LDTs has been dropped. My expectation is that this is not a problem as it should only be needed by legacy applications.
Benjamin Berg (12):
um: Remove stub-data.h include from common-offsets.h
um: Create signal stack memory assignment in stub_data
um: Add generic stub_syscall6 function
um: Rework syscall handling
um: compress memory related stub syscalls while adding them
um: remove LDT support
um: remove copy_context_skas0
um: Delay flushing syscalls until the thread is restarted
um: Do not flush MM in flush_thread
um: remove force_flush_all from fork_handler
um: simplify and consolidate TLB updates
um: refactor TLB update handling
arch/um/include/asm/mmu.h | 10 +- arch/um/include/asm/mmu_context.h | 2 - arch/um/include/asm/pgtable.h | 32 ++ arch/um/include/asm/tlbflush.h | 46 +- arch/um/include/shared/as-layout.h | 2 +- arch/um/include/shared/common-offsets.h | 5 - arch/um/include/shared/os.h | 27 +- arch/um/include/shared/skas/mm_id.h | 2 +- arch/um/include/shared/skas/skas.h | 2 + arch/um/include/shared/skas/stub-data.h | 35 +- arch/um/include/shared/user.h | 8 + arch/um/kernel/exec.c | 9 - arch/um/kernel/process.c | 2 - arch/um/kernel/skas/Makefile | 9 +- arch/um/kernel/skas/clone.c | 48 --- arch/um/kernel/skas/mmu.c | 33 +- arch/um/kernel/skas/process.c | 18 + arch/um/kernel/skas/stub.c | 69 +++ arch/um/kernel/tlb.c | 551 ++++-------------------- arch/um/kernel/trap.c | 15 +- arch/um/os-Linux/skas/mem.c | 248 ++++++----- arch/um/os-Linux/skas/process.c | 121 +----- arch/um/os-Linux/start_up.c | 1 + arch/x86/um/Makefile | 4 +- arch/x86/um/asm/mm_context.h | 70 --- arch/x86/um/ldt.c | 380 ---------------- arch/x86/um/shared/sysdep/stub.h | 1 + arch/x86/um/shared/sysdep/stub_32.h | 29 +- arch/x86/um/shared/sysdep/stub_64.h | 23 +- arch/x86/um/stub_32.S | 56 --- arch/x86/um/stub_64.S | 50 --- arch/x86/um/tls_32.c | 1 + 32 files changed, 543 insertions(+), 1366 deletions(-) delete mode 100644 arch/um/kernel/skas/clone.c create mode 100644 arch/um/kernel/skas/stub.c delete mode 100644 arch/x86/um/asm/mm_context.h delete mode 100644 arch/x86/um/ldt.c delete mode 100644 arch/x86/um/stub_32.S delete mode 100644 arch/x86/um/stub_64.S
Signature · 1 line
2.44.0
PATCH 1/12 um: Remove stub-data.h include from common-offsets.h
From: Benjamin Berg <[email protected]>
Further commits will require values from common-offsets.h inside stub-data.h. Resolve the possible circular dependency and simply use offsetof() inside stub_32.h and stub_64.h.
--- arch/um/include/shared/common-offsets.h | 5 ----- arch/x86/um/shared/sysdep/stub_32.h | 7 ++++--- arch/x86/um/shared/sysdep/stub_64.h | 7 ++++--- 3 files changed, 8 insertions(+), 11 deletions(-)
arch/um/include/shared/common-offsets.h +0 -5
@@ -1,6 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ /* for use by sys-$SUBARCH/kernel-offsets.c */ -#include <stub-data.h> DEFINE (KERNEL_MADV_REMOVE ,MADV_REMOVE );
@@ -30,7 +29,3 @@ DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);DEFINE (UML_CONFIG_UML_TIME_TRAVEL_SUPPORT ,CONFIG_UML_TIME_TRAVEL_SUPPORT );#endif -/* for stub */ -DEFINE (UML_STUB_FIELD_OFFSET , offsetof(struct stub_data , offset)); -DEFINE (UML_STUB_FIELD_CHILD_ERR , offsetof(struct stub_data , child_err)); -DEFINE (UML_STUB_FIELD_FD , offsetof(struct stub_data , fd));
arch/x86/um/shared/sysdep/stub_32.h +4 -3
@@ -6,6 +6,7 @@#ifndef __SYSDEP_STUB_H#define __SYSDEP_STUB_H +#include <stddef.h> #include <asm/ptrace.h> #include <generated/asm-offsets.h>
@@ -98,9 +99,9 @@ static __always_inline void remap_stack_and_trap(void) : :"g" (~(STUB_DATA_PAGES *UM_KERN_PAGE_SIZE -1 )),"g" (STUB_MMAP_NR ), -"g" (UML_STUB_FIELD_FD ), -"g" (UML_STUB_FIELD_OFFSET ), -"g" (UML_STUB_FIELD_CHILD_ERR ), +"g" (offsetof(struct stub_data , fd)), +"g" (offsetof(struct stub_data , offset)), +"g" (offsetof(struct stub_data , child_err)),"c" (STUB_DATA_PAGES *UM_KERN_PAGE_SIZE ),"d" (PROT_READ |PROT_WRITE ),"S" (MAP_FIXED |MAP_SHARED )
arch/x86/um/shared/sysdep/stub_64.h +4 -3
@@ -6,6 +6,7 @@#ifndef __SYSDEP_STUB_H#define __SYSDEP_STUB_H +#include <stddef.h> #include <sysdep/ptrace_user.h> #include <generated/asm-offsets.h> #include <linux/stddef.h>
@@ -101,9 +102,9 @@ static __always_inline void remap_stack_and_trap(void)"g" (STUB_MMAP_NR ),"g" (~(STUB_DATA_PAGES *UM_KERN_PAGE_SIZE -1 )),"g" (MAP_FIXED |MAP_SHARED ), -"g" (UML_STUB_FIELD_FD ), -"g" (UML_STUB_FIELD_OFFSET ), -"g" (UML_STUB_FIELD_CHILD_ERR ), +"g" (offsetof(struct stub_data , fd)), +"g" (offsetof(struct stub_data , offset)), +"g" (offsetof(struct stub_data , child_err)),"S" (STUB_DATA_PAGES *UM_KERN_PAGE_SIZE ),"d" (PROT_READ |PROT_WRITE ) :
Signature · 1 line
2.44.0
PATCH 2/12 um: Create signal stack memory assignment in stub_data
In reply to [email protected]From: Benjamin Berg <[email protected]>
When we switch to use seccomp, we need both the signal stack and other data (i.e. syscall information) to co-exist in the stub data. To facilitate this, start by defining separate memory areas for the stack and syscall data.
This moves the signal stack onto a new page as the memory area is not sufficient to hold both signal stack and syscall information.
Only change the signal stack setup for now, as the syscall code will be reworked later.
--- arch/um/include/shared/as-layout.h | 2 +- arch/um/include/shared/skas/stub-data.h | 9 +++++++++ arch/um/kernel/skas/clone.c | 6 ++++-- arch/um/kernel/skas/mmu.c | 4 ++++ arch/um/os-Linux/skas/process.c | 11 ++++++----- 5 files changed, 24 insertions(+), 8 deletions(-)
arch/um/include/shared/as-layout.h +1 -1
@@ -23,7 +23,7 @@#define STUB_START stub_start#define STUB_CODE STUB_START#define STUB_DATA (STUB_CODE + UM_KERN_PAGE_SIZE) -#define STUB_DATA_PAGES 1/* must be a power of two */ +#define STUB_DATA_PAGES 2/* must be a power of two */ #define STUB_END (STUB_DATA + STUB_DATA_PAGES * UM_KERN_PAGE_SIZE)#ifndef __ASSEMBLY__
arch/um/include/shared/skas/stub-data.h +9 -0
@@ -8,10 +8,19 @@#ifndef __STUB_DATA_H#define __STUB_DATA_H +#include <linux/compiler_types.h> +#include <as-layout.h> +struct stub_data {unsigned long offset;int fd;long parent_err, child_err; + +/* 128 leaves enough room for additional fields in the struct */ +unsigned char syscall_data[UM_KERN_PAGE_SIZE -128 ]__aligned(16) ; + +/* Stack for our signal handlers and for calling into . */ +unsigned char sigstack[UM_KERN_PAGE_SIZE ]__aligned(UM_KERN_PAGE_SIZE) ; };#endif
arch/um/kernel/skas/clone.c +4 -2
@@ -27,9 +27,11 @@ stub_clone_handler(void)struct stub_data *data =get_stub_data ();long err; +/* syscall data as a temporary stack area (bottom half). */ err =stub_syscall2 (__NR_clone,CLONE_PARENT |CLONE_FILES |SIGCHLD , - (unsigned long )data + -STUB_DATA_PAGES *UM_KERN_PAGE_SIZE /2 ); + (unsigned long ) data->syscall_data + +sizeof (data->syscall_data) /2 - +sizeof (void *));if (err) { data->parent_err = err; goto done;
arch/um/kernel/skas/mmu.c +4 -0
@@ -13,6 +13,10 @@#include <as-layout.h> #include <os.h> #include <skas.h> +#include <stub-data.h> + +/* Ensure the stub_data struct covers the allocated area */ +static_assert (sizeof (struct stub_data ) ==STUB_DATA_PAGES *UM_KERN_PAGE_SIZE );int init_new_context (struct task_struct *task,struct mm_struct *mm) {
arch/um/os-Linux/skas/process.c +6 -5
@@ -470,11 +470,12 @@ static int __init init_thread_regs(void) thread_regs[REGS_IP_INDEX ] =STUB_CODE + (unsigned long ) stub_clone_handler - (unsigned long ) __syscall_stub_start; - thread_regs[REGS_SP_INDEX ] =STUB_DATA +STUB_DATA_PAGES *UM_KERN_PAGE_SIZE - -sizeof (void *); -#ifdef __SIGNAL_FRAMESIZE - thread_regs[REGS_SP_INDEX ] -= __SIGNAL_FRAMESIZE; -#endif + +/* syscall data as a temporary stack area (top half). */ + thread_regs[REGS_SP_INDEX ] =STUB_DATA + + offsetof(struct stub_data , syscall_data) + +sizeof (((struct stub_data *)0 )->syscall_data) - +sizeof (void *);return 0 ; }
Signature · 1 line
2.44.0
PATCH 3/12 um: Add generic stub_syscall6 function
In reply to [email protected]From: Benjamin Berg <[email protected]>
This function will be used by the new syscall handling code.
--- arch/x86/um/shared/sysdep/stub_32.h | 22 ++++++++++++++++++++++ arch/x86/um/shared/sysdep/stub_64.h | 16 ++++++++++++++++ 2 files changed, 38 insertions(+)
arch/x86/um/shared/sysdep/stub_32.h +22 -0
@@ -80,6 +80,28 @@ static __always_inline long stub_syscall5(long syscall, long arg1, long arg2,return ret; } +static __always_inline long stub_syscall6 (long syscall,long arg1,long arg2, +long arg3,long arg4,long arg5, +long arg6) +{ +struct syscall_args { +int ebx, ebp; + } args = { arg1, arg6 }; +long ret; + + __asm__volatile ("pushl %%ebp;" +"movl 0x4(%%ebx),%%ebp;" +"movl (%%ebx),%%ebx;" +"int $0x80;" +"popl %%ebp" + :"=a" (ret) + :"0" (syscall),"b" (&args), +"c" (arg2),"d" (arg3),"S" (arg4),"D" (arg5) + :"memory" ); + +return ret; +} + static __always_inline void trap_myself(void) { __asm("int3" );
arch/x86/um/shared/sysdep/stub_64.h +16 -0
@@ -80,6 +80,22 @@ static __always_inline long stub_syscall5(long syscall, long arg1, long arg2,return ret; } +static __always_inline long stub_syscall6 (long syscall,long arg1,long arg2, +long arg3,long arg4,long arg5, +long arg6) +{ +long ret; + + __asm__volatile ("movq %5,%%r10 ; movq %6,%%r8 ; movq %7,%%r9 ; " + __syscall + :"=a" (ret) + :"0" (syscall),"D" (arg1),"S" (arg2),"d" (arg3), +"g" (arg4),"g" (arg5),"g" (arg6) + : __syscall_clobber, "r10", "r8", "r9"); + +return ret; +} + static __always_inline void trap_myself(void) { __asm("int3" );
Signature · 1 line
2.44.0
PATCH 4/12 um: Rework syscall handling
In reply to [email protected]From: Benjamin Berg <[email protected]>
Rework syscall handling to be platform independent. Also create a clean split between queueing of syscalls and flushing them out, removing the need to keep state in the code that triggers the syscalls.
The code adds syscall_data_len to the global mm_id structure. This will be used later to allow surrounding code to track whether syscalls still need to run and if errors occurred.
--- arch/um/include/shared/os.h | 22 +-- arch/um/include/shared/skas/mm_id.h | 1 + arch/um/include/shared/skas/stub-data.h | 35 +++- arch/um/include/shared/user.h | 8 + arch/um/kernel/exec.c | 10 +- arch/um/kernel/skas/Makefile | 7 +- arch/um/kernel/skas/clone.c | 2 +- arch/um/kernel/skas/stub.c | 80 +++++++++ arch/um/kernel/tlb.c | 42 +++-- arch/um/os-Linux/skas/mem.c | 212 +++++++++++------------- arch/um/os-Linux/skas/process.c | 4 +- arch/x86/um/Makefile | 2 +- arch/x86/um/ldt.c | 41 ++--- arch/x86/um/shared/sysdep/stub.h | 1 + arch/x86/um/stub_32.S | 56 ------- arch/x86/um/stub_64.S | 50 ------ 16 files changed, 275 insertions(+), 298 deletions(-) create mode 100644 arch/um/kernel/skas/stub.c delete mode 100644 arch/x86/um/stub_32.S delete mode 100644 arch/x86/um/stub_64.S
arch/um/include/shared/os.h +9 -13
@@ -268,19 +268,15 @@ extern long long os_persistent_clock_emulation(void);extern long long os_nsecs (void );/* skas/mem.c */ -extern long run_syscall_stub (struct mm_id * mm_idp, -int syscall,unsigned long *args,long expected, -void **addr,int done); -extern long syscall_stub_data (struct mm_id * mm_idp, -unsigned long *data,int data_count, -void **addr,void **stub_addr); -extern int map (struct mm_id * mm_idp,unsigned long virt, -unsigned long len,int prot,int phys_fd, -unsigned long long offset,int done,void **data); -extern int unmap (struct mm_id * mm_idp,unsigned long addr,unsigned long len, -int done,void **data); -extern int protect (struct mm_id * mm_idp,unsigned long addr, -unsigned long len,unsigned int prot,int done,void **data); +int syscall_stub_flush (struct mm_id *mm_idp); +struct stub_syscall *syscall_stub_alloc (struct mm_id *mm_idp); + +void map (struct mm_id *mm_idp,unsigned long virt, +unsigned long len,int prot,int phys_fd, +unsigned long long offset); +void unmap (struct mm_id *mm_idp,unsigned long addr,unsigned long len); +void protect (struct mm_id *mm_idp,unsigned long addr, +unsigned long len,unsigned int prot);/* skas/process.c */ extern int is_skas_winch (int pid,int fd,void *data);
arch/um/include/shared/skas/mm_id.h +1 -0
@@ -13,6 +13,7 @@ struct mm_id { } u;unsigned long stack;int kill; +int syscall_data_len; };#endif
arch/um/include/shared/skas/stub-data.h +33 -2
@@ -10,14 +10,45 @@#include <linux/compiler_types.h> #include <as-layout.h> +#include <sysdep/tls.h> + +#define STUB_NEXT_SYSCALL (s) \ + ((struct stub_syscall *) (((unsigned long) s) + (s)->cmd_len)) + +enum stub_syscall_type { +STUB_SYSCALL_UNSET =0 , +STUB_SYSCALL_MMAP , +STUB_SYSCALL_MUNMAP , +STUB_SYSCALL_MPROTECT , +STUB_SYSCALL_LDT , +}; + +struct stub_syscall { +union { +struct { +unsigned long addr; +unsigned long length; +unsigned long offset; +int fd; +int prot; + } mem; +struct { +user_desc_t desc; +int func; + } ldt; + }; + +enum stub_syscall_type syscall; +};struct stub_data {unsigned long offset;int fd; -long parent_err, child_err; +long err, child_err; +int syscall_data_len;/* 128 leaves enough room for additional fields in the struct */ -unsigned char syscall_data[UM_KERN_PAGE_SIZE -128 ]__aligned(16) ; +struct stub_syscall syscall_data[(UM_KERN_PAGE_SIZE -128 ) /sizeof (struct stub_syscall )]__aligned(16) ;/* Stack for our signal handlers and for calling into . */ unsigned char sigstack[UM_KERN_PAGE_SIZE ]__aligned(UM_KERN_PAGE_SIZE) ;
arch/um/include/shared/user.h +8 -0
@@ -42,11 +42,19 @@ extern void panic(const char *fmt, ...)#define printk (...) _printk(__VA_ARGS__)extern int _printk (const char *fmt, ...) __attribute__ ((format (printf,1 ,2 ))); +extern void print_hex_dump (const char *level,const char *prefix_str, +int prefix_type,int rowsize,int groupsize, +const void *buf,size_t len,_Bool ascii);#else static inline int printk (const char *fmt, ...) {return 0 ; } +static inline void print_hex_dump (const char *level,const char *prefix_str, +int prefix_type,int rowsize,int groupsize, +const void *buf,size_t len,_Bool ascii) +{ +}#endif extern int in_aton (char *str);
arch/um/kernel/exec.c +3 -7
@@ -22,15 +22,11 @@void flush_thread (void ) { -void *data =NULL ; -int ret; -arch_flush_thread (¤t->thread.arch); - ret =unmap (¤t->mm->context.id,0 ,TASK_SIZE ,1 , &data); -if (ret) { -printk (KERN_ERR "%s - clearing address space failed, err = %d\n" , - __func__, ret); +unmap (¤t->mm->context.id,0 ,TASK_SIZE ); +if (syscall_stub_flush (¤t->mm->context.id) <0 ) { +printk (KERN_ERR "%s - clearing address space failed" , __func__);force_sig (SIGKILL ); } get_safe_registers(current_pt_regs()->regs.gp,
arch/um/kernel/skas/Makefile +4 -3
@@ -3,14 +3,15 @@ # Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) # -obj-y := clone.o mmu.o process.o syscall.o uaccess.o +obj-y := clone.o stub.o mmu.o process.o syscall.o uaccess.o -# clone.o is in the stub, so it can't be built with profiling +# clone.o and stub.o are in the stub, so it can't be built with profiling # GCC hardened also auto-enables -fpic, but we need %ebx so it can't work -> # disable it CFLAGS_clone.o := $(CFLAGS_NO_HARDENING) -UNPROFILE_OBJS := clone.o +CFLAGS_stub.o := $(CFLAGS_NO_HARDENING) +UNPROFILE_OBJS := clone.o stub.o KCOV_INSTRUMENT := n
arch/um/kernel/skas/clone.c +1 -1
@@ -33,7 +33,7 @@ stub_clone_handler(void)sizeof (data->syscall_data) /2 - sizeof(void *));if (err) { - data->parent_err = err; + data->err = err; goto done; }
arch/um/kernel/skas/stub.c new file +80 -0
80 lines not on this page · raw message
arch/um/kernel/tlb.c +20 -22
79 lines not on this page · raw message
arch/um/os-Linux/skas/mem.c +98 -114
277 lines not on this page · raw message
arch/um/os-Linux/skas/process.c +2 -2
@@ -497,7 +497,7 @@ int copy_context_skas0(unsigned long new_stack, int pid) *data = ((struct stub_data ) { .offset =MMAP_OFFSET (new_offset), .fd = new_fd, - .parent_err = -ESRCH , + .err = -ESRCH , .child_err =0 , });
@@ -534,7 +534,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)wait_stub_done (pid); - pid = data->parent_err; + pid = data->err;if (pid <0 ) {printk (UM_KERN_ERR "%s - stub-parent reports error %d\n" , __func__, -pid);
arch/x86/um/Makefile +1 -1
@@ -11,7 +11,7 @@ endif obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \ ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ - stub_$(BITS).o stub_segv.o \ + stub_segv.o \ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \ mem_$(BITS).o subarch.o os-Linux/
arch/x86/um/ldt.c +14 -27
86 lines not on this page · raw message
arch/x86/um/shared/sysdep/stub.h +1 -0
@@ -12,4 +12,5 @@#endif extern void stub_segv_handler (int ,siginfo_t *,void *); +extern void stub_syscall_handler (void );extern void stub_clone_handler (void );
arch/x86/um/stub_32.S deleted +0 -56
56 lines not on this page · raw message
arch/x86/um/stub_64.S deleted +0 -50
50 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH 5/12 um: compress memory related stub syscalls while adding them
In reply to [email protected]From: Benjamin Berg <[email protected]>
To keep the number of syscalls that the stub has to do lower, compress two consecutive syscalls of the same type if the second is just a continuation of the first.
--- arch/um/os-Linux/skas/mem.c | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+)
arch/um/os-Linux/skas/mem.c +39 -0
@@ -152,12 +152,37 @@ struct stub_syscall *syscall_stub_alloc(struct mm_id *mm_idp)return sc; } +static struct stub_syscall *syscall_stub_get_previous (struct mm_id *mm_idp, +int syscall_type, +unsigned long virt) +{ +if (mm_idp->syscall_data_len >0 ) { +struct stub_data *proc_data = (void *) mm_idp->stack; +struct stub_syscall *sc; + + sc = &proc_data->syscall_data[mm_idp->syscall_data_len -1 ]; + +if (sc->syscall == syscall_type && + sc->mem.addr + sc->mem.length == virt) +return sc; + } + +return NULL ; +}void map (struct mm_id *mm_idp,unsigned long virt,unsigned long len,int prot,int phys_fd,unsigned long long offset) {struct stub_syscall *sc; +/* Compress with previous syscall if that is possible */ + sc =syscall_stub_get_previous (mm_idp,STUB_SYSCALL_MMAP , virt); +if (sc && sc->mem.prot == prot && sc->mem.fd == phys_fd && + sc->mem.offset ==MMAP_OFFSET (offset - sc->mem.length)) { + sc->mem.length += len; +return ; + } + sc =syscall_stub_alloc (mm_idp); sc->syscall =STUB_SYSCALL_MMAP ; sc->mem.addr = virt;
@@ -171,6 +196,13 @@ void unmap(struct mm_id *mm_idp, unsigned long addr, unsigned long len) {struct stub_syscall *sc; +/* Compress with previous syscall if that is possible */ + sc =syscall_stub_get_previous (mm_idp,STUB_SYSCALL_MUNMAP , addr); +if (sc) { + sc->mem.length += len; +return ; + } + sc =syscall_stub_alloc (mm_idp); sc->syscall =STUB_SYSCALL_MUNMAP ; sc->mem.addr = addr;
@@ -182,6 +214,13 @@ void protect(struct mm_id *mm_idp, unsigned long addr, unsigned long len, {struct stub_syscall *sc; +/* Compress with previous syscall if that is possible */ + sc =syscall_stub_get_previous (mm_idp,STUB_SYSCALL_MPROTECT , addr); +if (sc && sc->mem.prot == prot) { + sc->mem.length += len; +return ; + } + sc =syscall_stub_alloc (mm_idp); sc->syscall =STUB_SYSCALL_MPROTECT ; sc->mem.addr = addr;
Signature · 1 line
2.44.0
PATCH 6/12 um: remove LDT support
In reply to [email protected]From: Benjamin Berg <[email protected]>
The current LDT code has a few issues that mean it should be redone in a different way once we always start with a fresh MM even when cloning.
In a new and better world, the kernel would just ensure its own LDT is clear at startup. At that point, all that is needed is a simple function to populate the LDT from another MM in arch_dup_mmap combined with some tracking of the installed LDT entries for each MM.
Note that the old implementation was even incorrect with regard to reading, as it copied out the LDT entries in the internal format rather than converting them to the userspace structure.
Removal should be fine as the LDT is not used for thread-local storage anymore.
--- arch/um/include/asm/mmu.h | 6 - arch/um/include/shared/skas/stub-data.h | 21 +- arch/um/kernel/skas/mmu.c | 8 - arch/um/kernel/skas/stub.c | 11 - arch/um/os-Linux/start_up.c | 1 + arch/x86/um/Makefile | 2 +- arch/x86/um/asm/mm_context.h | 70 ----- arch/x86/um/ldt.c | 367 ------------------------ arch/x86/um/tls_32.c | 1 + 9 files changed, 10 insertions(+), 477 deletions(-) delete mode 100644 arch/x86/um/asm/mm_context.h delete mode 100644 arch/x86/um/ldt.c
arch/um/include/asm/mmu.h +0 -6
@@ -7,17 +7,11 @@#define __ARCH_UM_MMU_H#include <mm_id.h> -#include <asm/mm_context.h> typedef struct mm_context {struct mm_id id; -struct uml_arch_mm_context arch; }mm_context_t ;extern void __switch_mm (struct mm_id * mm_idp); -/* Avoid tangled inclusion with asm/ldt.h */ -extern long init_new_ldt (struct mm_context *to_mm,struct mm_context *from_mm); -extern void free_ldt (struct mm_context *mm); -#endif
arch/um/include/shared/skas/stub-data.h +7 -14
@@ -20,23 +20,16 @@ enum stub_syscall_type {STUB_SYSCALL_MMAP ,STUB_SYSCALL_MUNMAP , STUB_SYSCALL_MPROTECT, - STUB_SYSCALL_LDT, };struct stub_syscall { -union { -struct { -unsigned long addr; -unsigned long length; -unsigned long offset; -int fd; -int prot; - } mem; -struct { -user_desc_t desc; -int func; - } ldt; - }; +struct { +unsigned long addr; +unsigned long length; +unsigned long offset; +int fd; +int prot; + } mem;enum stub_syscall_type syscall; };
arch/um/kernel/skas/mmu.c +0 -8
@@ -45,13 +45,6 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm) goto out_free; } - ret =init_new_ldt (to_mm, from_mm); -if (ret <0 ) { -printk (KERN_ERR "init_new_context_skas - init_ldt" -" failed, errno = %d\n" , ret); - goto out_free; - } -return 0 ; out_free:
@@ -79,5 +72,4 @@ void destroy_context(struct mm_struct *mm)os_kill_ptraced_process (mmu->id.u.pid,1 );free_pages (mmu->id.stack,ilog2 (STUB_DATA_PAGES )); -free_ldt (mmu); }
arch/um/kernel/skas/stub.c +0 -11
@@ -45,17 +45,6 @@ static __always_inline int syscall_handler(struct stub_data *d)return -1 ; }break ; -case STUB_SYSCALL_LDT : - res =stub_syscall3 (__NR_modify_ldt, sc->ldt.func, - (unsigned long ) &sc->ldt.desc, -sizeof (sc->ldt.desc)); -/* We only write, so the expected result is zero */ -if (res) { - d->err = res; - d->syscall_data_len = i; -return -1 ; - } -break ;default : d->err =-95 ;/* EOPNOTSUPP */ d->syscall_data_len = i;
arch/um/os-Linux/start_up.c +1 -0
@@ -17,6 +17,7 @@#include <sys/wait.h> #include <sys/time.h> #include <sys/resource.h> +#include <asm/ldt.h> #include <asm/unistd.h> #include <init.h> #include <os.h>
arch/x86/um/Makefile +1 -1
@@ -9,7 +9,7 @@ else BITS := 64 endif -obj-y = bugs_$(BITS).o delay.o fault.o ldt.o \ +obj-y = bugs_$(BITS).o delay.o fault.o \ ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal.o \ stub_segv.o \ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \
arch/x86/um/asm/mm_context.h deleted +0 -70
70 lines not on this page · raw message
arch/x86/um/ldt.c deleted +0 -367
367 lines not on this page · raw message
arch/x86/um/tls_32.c +1 -0
@@ -11,6 +11,7 @@#include <os.h> #include <skas.h> #include <sysdep/tls.h> +#include <asm/desc.h> /* * If needed we can detect when it's uninitialized.
Signature · 1 line
2.44.0
PATCH 7/12 um: remove copy_context_skas0
In reply to [email protected]From: Benjamin Berg <[email protected]>
The kernel flushes the memory ranges anyway for CoW and does not assume that the userspace process has anything set up already. So, start with a fresh process for the new mm context.
--- arch/um/include/shared/os.h | 1 - arch/um/kernel/skas/Makefile | 8 +-- arch/um/kernel/skas/clone.c | 50 --------------- arch/um/kernel/skas/mmu.c | 20 +++--- arch/um/os-Linux/skas/process.c | 108 -------------------------------- 5 files changed, 10 insertions(+), 177 deletions(-) delete mode 100644 arch/um/kernel/skas/clone.c
arch/um/include/shared/os.h +0 -1
@@ -281,7 +281,6 @@ void protect(struct mm_id *mm_idp, unsigned long addr,/* skas/process.c */ extern int is_skas_winch (int pid,int fd,void *data);extern int start_userspace (unsigned long stub_stack); -extern int copy_context_skas0 (unsigned long stack,int pid);extern void userspace (struct uml_pt_regs *regs,unsigned long *aux_fp_regs);extern void new_thread (void *stack,jmp_buf *buf,void (*handler)(void ));extern void switch_threads (jmp_buf *me,jmp_buf *you);
arch/um/kernel/skas/Makefile +3 -5
@@ -3,16 +3,14 @@ # Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) # -obj-y := clone.o stub.o mmu.o process.o syscall.o uaccess.o +obj-y := stub.o mmu.o process.o syscall.o uaccess.o -# clone.o and stub.o are in the stub, so it can't be built with profiling +# stub.o is in the stub, so it can't be built with profiling # GCC hardened also auto-enables -fpic, but we need %ebx so it can't work -> # disable it -CFLAGS_clone.o := $(CFLAGS_NO_HARDENING) CFLAGS_stub.o := $(CFLAGS_NO_HARDENING) -UNPROFILE_OBJS := clone.o stub.o - +UNPROFILE_OBJS := stub.o KCOV_INSTRUMENT := n include $(srctree)/arch/um/scripts/Makefile.rules
arch/um/kernel/skas/clone.c deleted +0 -50
50 lines not on this page · raw message
arch/um/kernel/skas/mmu.c +7 -13
@@ -20,8 +20,7 @@ static_assert(sizeof(struct stub_data) == STUB_DATA_PAGES * UM_KERN_PAGE_SIZE);int init_new_context (struct task_struct *task,struct mm_struct *mm) { -struct mm_context *from_mm =NULL ; -struct mm_context *to_mm = &mm->context; +struct mm_id *new_id = &mm->context.id;unsigned long stack =0 ;int ret = -ENOMEM ;
@@ -29,27 +28,22 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm)if (stack ==0 ) goto out; - to_mm->id.stack = stack; -if (current->mm !=NULL && current->mm != &init_mm) - from_mm = ¤t->mm->context; + new_id->stack = stack;block_signals_trace (); -if (from_mm) - to_mm->id.u.pid =copy_context_skas0 (stack, - from_mm->id.u.pid); -else to_mm->id.u.pid =start_userspace (stack); + new_id->u.pid =start_userspace (stack);unblock_signals_trace (); -if (to_mm->id.u.pid <0 ) { - ret = to_mm->id.u.pid; +if (new_id->u.pid <0 ) { + ret = new_id->u.pid; goto out_free; }return 0 ; out_free: -if (to_mm->id.stack !=0 ) -free_pages (to_mm->id.stack,ilog2 (STUB_DATA_PAGES )); +if (new_id->stack !=0 ) +free_pages (new_id->stack,ilog2 (STUB_DATA_PAGES )); out:return ret; }
arch/um/os-Linux/skas/process.c +0 -108
114 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH 8/12 um: Delay flushing syscalls until the thread is restarted
In reply to [email protected]From: Benjamin Berg <[email protected]>
As running the syscalls is expensive due to context switches, we should do so as late as possible in case more syscalls need to be queued later on. This will also benefit a later move to a SECCOMP enabled userspace as in that case the need of extra context switches is removed entirely.
--- arch/um/include/asm/tlbflush.h | 2 ++ arch/um/include/shared/os.h | 4 +++ arch/um/include/shared/skas/mm_id.h | 1 - arch/um/include/shared/skas/skas.h | 1 + arch/um/kernel/skas/process.c | 8 +++++ arch/um/kernel/tlb.c | 21 ++------------ arch/um/os-Linux/skas/mem.c | 45 +++++++++++++++++------------ arch/um/os-Linux/skas/process.c | 12 ++++++-- 8 files changed, 52 insertions(+), 42 deletions(-)
arch/um/include/asm/tlbflush.h +2 -0
@@ -28,4 +28,6 @@ extern void flush_tlb_kernel_vm(void);extern void flush_tlb_kernel_range (unsigned long start,unsigned long end);extern void __flush_tlb_one (unsigned long addr); +void report_enomem (void ); +#endif
arch/um/include/shared/os.h +4 -0
@@ -191,6 +191,9 @@ extern void get_host_cpu_features(/* mem.c */ extern int create_mem_file (unsigned long long len); +/* tlb.c */ +extern void report_enomem (void ); +/* process.c */ extern unsigned long os_process_pc (int pid);extern int os_process_parent (int pid);
@@ -270,6 +273,7 @@ extern long long os_nsecs(void);/* skas/mem.c */ int syscall_stub_flush (struct mm_id *mm_idp);struct stub_syscall *syscall_stub_alloc (struct mm_id *mm_idp); +void syscall_stub_dump_error (struct mm_id *mm_idp); void map(struct mm_id *mm_idp, unsigned long virt, unsigned long len, int prot, int phys_fd,
arch/um/include/shared/skas/mm_id.h +0 -1
@@ -12,7 +12,6 @@ struct mm_id {int pid; } u;unsigned long stack; -int kill;int syscall_data_len; };
arch/um/include/shared/skas/skas.h +1 -0
@@ -15,5 +15,6 @@ extern void new_thread_handler(void);extern void handle_syscall (struct uml_pt_regs *regs);extern long execute_syscall_skas (void *r);extern unsigned long current_stub_stack (void ); +extern struct mm_id *current_mm_id (void );#endif
arch/um/kernel/skas/process.c +8 -0
@@ -53,3 +53,11 @@ unsigned long current_stub_stack(void)return current->mm->context.id.stack; } + +struct mm_id *current_mm_id (void ) +{ +if (current->mm ==NULL ) +return NULL ; + +return ¤t->mm->context.id; +}
arch/um/kernel/tlb.c +2 -19
@@ -52,7 +52,7 @@ struct host_vm_change { .index = 0, \ .force = force }) -static void report_enomem (void ) +void report_enomem (void ) {printk (KERN_ERR "UML ran out of memory on the host side! " "This can happen due to a memory limitation or "
@@ -337,15 +337,6 @@ static void fix_range_common(struct mm_struct *mm, unsigned long start_addr,if (!ret) ret =do_ops (&hvc, hvc.index,1 ); - -/* This is not an else because ret is modified above */ -if (ret) { -struct mm_id *mm_idp = ¤t->mm->context.id; - -printk (KERN_ERR "fix_range_common: failed, killing current " -"process: %d\n" ,task_tgid_vnr (current)); - mm_idp->kill =1 ; - } }static int flush_tlb_kernel_range_common (unsigned long start,unsigned long end)
@@ -460,7 +451,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long address)pmd_t *pmd;pte_t *pte;struct mm_struct *mm = vma->vm_mm; -int r, w, x, prot, err =0 ; +int r, w, x, prot;struct mm_id *mm_id; address &=PAGE_MASK ;
@@ -508,14 +499,6 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long address) }else if (pte_newprot (*pte))protect (mm_id, address,PAGE_SIZE , prot); - err =syscall_stub_flush (mm_id); -if (err) { -if (err == -ENOMEM ) -report_enomem (); - - goto kill; - } - *pte =pte_mkuptodate (*pte);return ;
arch/um/os-Linux/skas/mem.c +26 -19
58 lines not on this page · raw message
arch/um/os-Linux/skas/process.c +9 -3
@@ -252,7 +252,6 @@ static int userspace_tramp(void *stack) }int userspace_pid[NR_CPUS ]; -int kill_userspace_mm[NR_CPUS ];/** * start_userspace() - prepare a new userspace process
@@ -344,8 +343,16 @@ void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs)interrupt_end ();while (1 ) { -if (kill_userspace_mm[0 ]) +/* Flush out any pending syscalls */ + err =syscall_stub_flush (current_mm_id ()); +if (err) { +if (err == -ENOMEM ) +report_enomem (); + +printk (UM_KERN_ERR "%s - Error flushing stub syscalls: %d" , + __func__, -err);fatal_sigsegv (); + }/* * This can legitimately fail if the process loads a
@@ -576,5 +583,4 @@ void reboot_skas(void)void __switch_mm (struct mm_id *mm_idp) { userspace_pid[0 ] = mm_idp->u.pid; - kill_userspace_mm[0 ] = mm_idp->kill; }
Signature · 1 line
2.44.0
PATCH 9/12 um: Do not flush MM in flush_thread
In reply to [email protected]From: Benjamin Berg <[email protected]>
There should be no need to flush the memory in flush_thread. Doing this likely worked around some issue where memory was still incorrectly mapped when creating or cloning an MM.
With the removal of the special clone path, that isn't relevant anymore. However, add the flush into MM initialization so that any new userspace MM is guaranteed to be clean.
--- arch/um/kernel/exec.c | 5 ----- arch/um/kernel/skas/mmu.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-)
arch/um/kernel/exec.c +0 -5
@@ -24,11 +24,6 @@ void flush_thread(void) {arch_flush_thread (¤t->thread.arch); -unmap (¤t->mm->context.id,0 ,TASK_SIZE ); -if (syscall_stub_flush (¤t->mm->context.id) <0 ) { -printk (KERN_ERR "%s - clearing address space failed" , __func__); -force_sig (SIGKILL ); - }get_safe_registers (current_pt_regs ()->regs.gp,current_pt_regs ()->regs.fp);
arch/um/kernel/skas/mmu.c +3 -0
@@ -39,6 +39,9 @@ int init_new_context(struct task_struct *task, struct mm_struct *mm) goto out_free; } +/* Ensure the new MM is clean and nothing unwanted is mapped */ +unmap (new_id,0 ,TASK_SIZE ); +return 0 ; out_free:
Signature · 1 line
2.44.0
PATCH 10/12 um: remove force_flush_all from fork_handler
In reply to [email protected]From: Benjamin Berg <[email protected]>
There should be no need for this. It may be that this used to work around another issue where after a clone the MM was in a bad state.
--- arch/um/include/asm/mmu_context.h | 2 -- arch/um/kernel/process.c | 2 -- arch/um/kernel/tlb.c | 46 +++++++++++-------------------- 3 files changed, 16 insertions(+), 34 deletions(-)
arch/um/include/asm/mmu_context.h +0 -2
@@ -13,8 +13,6 @@#include <asm/mm_hooks.h> #include <asm/mmu.h> -extern void force_flush_all (void ); -#define activate_mm activate_mmstatic inline void activate_mm (struct mm_struct *old,struct mm_struct *new) {
arch/um/kernel/process.c +0 -2
@@ -139,8 +139,6 @@ void new_thread_handler(void)/* Called magically, see new_thread_handler above */ void fork_handler (void ) { -force_flush_all (); -schedule_tail (current->thread.prev_sched);/*
arch/um/kernel/tlb.c +16 -30
136 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH 11/12 um: simplify and consolidate TLB updates
In reply to [email protected]From: Benjamin Berg <[email protected]>
The HVC update was mostly used to compress consecutive calls into one. This is mostly relevant for userspace where it is already handled by the syscall stub code.
Simplify the whole logic and consolidate it for both kernel and userspace. This does remove the sequential syscall compression for the kernel, however that shouldn't be the main factor in most runs.
--- arch/um/include/shared/os.h | 12 +- arch/um/kernel/tlb.c | 386 ++++++++---------------------------- arch/um/os-Linux/skas/mem.c | 18 +- 3 files changed, 99 insertions(+), 317 deletions(-)
arch/um/include/shared/os.h +6 -6
@@ -275,12 +275,12 @@ int syscall_stub_flush(struct mm_id *mm_idp);struct stub_syscall *syscall_stub_alloc (struct mm_id *mm_idp);void syscall_stub_dump_error (struct mm_id *mm_idp); -void map (struct mm_id *mm_idp,unsigned long virt, -unsigned long len,int prot,int phys_fd, -unsigned long long offset); -void unmap (struct mm_id *mm_idp,unsigned long addr,unsigned long len); -void protect (struct mm_id *mm_idp,unsigned long addr, -unsigned long len,unsigned int prot); +int map (struct mm_id *mm_idp,unsigned long virt, +unsigned long len,int prot,int phys_fd, +unsigned long long offset); +int unmap (struct mm_id *mm_idp,unsigned long addr,unsigned long len); +int protect (struct mm_id *mm_idp,unsigned long addr, +unsigned long len,unsigned int prot);/* skas/process.c */ extern int is_skas_winch (int pid,int fd,void *data);
arch/um/kernel/tlb.c +81 -305
486 lines not on this page · raw message
arch/um/os-Linux/skas/mem.c +12 -6
@@ -177,7 +177,7 @@ static struct stub_syscall *syscall_stub_get_previous(struct mm_id *mm_idp,return NULL ; } -void map (struct mm_id *mm_idp,unsigned long virt,unsigned long len,int prot, +int map (struct mm_id *mm_idp,unsigned long virt,unsigned long len,int prot,int phys_fd,unsigned long long offset) {struct stub_syscall *sc;
@@ -187,7 +187,7 @@ void map(struct mm_id *mm_idp, unsigned long virt, unsigned long len, int prot,if (sc && sc->mem.prot == prot && sc->mem.fd == phys_fd && sc->mem.offset ==MMAP_OFFSET (offset - sc->mem.length)) { sc->mem.length += len; -return ; +return 0 ; } sc =syscall_stub_alloc (mm_idp);
@@ -197,9 +197,11 @@ void map(struct mm_id *mm_idp, unsigned long virt, unsigned long len, int prot, sc->mem.prot = prot; sc->mem.fd = phys_fd; sc->mem.offset =MMAP_OFFSET (offset); + +return 0 ; } -void unmap (struct mm_id *mm_idp,unsigned long addr,unsigned long len) +int unmap (struct mm_id *mm_idp,unsigned long addr,unsigned long len) {struct stub_syscall *sc;
@@ -207,16 +209,18 @@ void unmap(struct mm_id *mm_idp, unsigned long addr, unsigned long len) sc =syscall_stub_get_previous (mm_idp,STUB_SYSCALL_MUNMAP , addr);if (sc) { sc->mem.length += len; -return ; +return 0 ; } sc =syscall_stub_alloc (mm_idp); sc->syscall =STUB_SYSCALL_MUNMAP ; sc->mem.addr = addr; sc->mem.length = len; + +return 0 ; } -void protect (struct mm_id *mm_idp,unsigned long addr,unsigned long len, +int protect (struct mm_id *mm_idp,unsigned long addr,unsigned long len,unsigned int prot) {struct stub_syscall *sc;
@@ -225,7 +229,7 @@ void protect(struct mm_id *mm_idp, unsigned long addr, unsigned long len, sc =syscall_stub_get_previous (mm_idp,STUB_SYSCALL_MPROTECT , addr);if (sc && sc->mem.prot == prot) { sc->mem.length += len; -return ; +return 0 ; } sc =syscall_stub_alloc (mm_idp);
@@ -233,4 +237,6 @@ void protect(struct mm_id *mm_idp, unsigned long addr, unsigned long len, sc->mem.addr = addr; sc->mem.length = len; sc->mem.prot = prot; + +return 0 ; }
Signature · 1 line
2.44.0
PATCH 12/12 um: refactor TLB update handling
In reply to [email protected]From: Benjamin Berg <[email protected]>
Conceptually, we want the memory mappings to always be up to date and represent whatever is in the TLB. To ensure that, we need to sync them over in the userspace case and for the kernel we need to process the mappings.
The kernel will call flush_tlb_* if page table entries that were valid before become invalid. Unfortunately, this is not the case if entries are added.
As such, change both flush_tlb_* and set_ptes to track the memory range that has to be synchronized. For the kernel, we need to execute a flush_tlb_kern_* immediately but we can wait for the first page fault in case of set_ptes. For userspace in contrast we only store that a range of memory needs to be synced and do so whenever we switch to that process.
--- arch/um/include/asm/mmu.h | 4 + arch/um/include/asm/pgtable.h | 32 +++++++ arch/um/include/asm/tlbflush.h | 44 ++++++++-- arch/um/include/shared/skas/skas.h | 1 + arch/um/kernel/skas/process.c | 10 +++ arch/um/kernel/tlb.c | 136 +++-------------------------- arch/um/kernel/trap.c | 15 +++- arch/um/os-Linux/skas/process.c | 2 + 8 files changed, 108 insertions(+), 136 deletions(-)
arch/um/include/asm/mmu.h +4 -0
@@ -10,6 +10,10 @@typedef struct mm_context {struct mm_id id; + +/* Address range in need of a TLB sync */ +long int sync_tlb_range_from; +long int sync_tlb_range_to; }mm_context_t ;extern void __switch_mm (struct mm_id * mm_idp);
arch/um/include/asm/pgtable.h +32 -0
@@ -244,6 +244,38 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval)#define PFN_PTE_SHIFT PAGE_SHIFT +static inline void um_tlb_mark_sync (struct mm_struct *mm,unsigned long start, +unsigned long end) +{ +if (!mm->context.sync_tlb_range_to) { + mm->context.sync_tlb_range_from = start; + mm->context.sync_tlb_range_to = end; + }else { +if (start < mm->context.sync_tlb_range_from) + mm->context.sync_tlb_range_from = start; +if (end > mm->context.sync_tlb_range_to) + mm->context.sync_tlb_range_to = end; + } +} + +#define set_ptes set_ptes +static inline void set_ptes (struct mm_struct *mm,unsigned long addr, +pte_t *ptep,pte_t pte,int nr) +{ +/* Basically the default implementation */ +size_t length = nr *PAGE_SIZE ; + +for (;;) { +set_pte (ptep, pte); +if (--nr ==0 ) +break ; + ptep++; + pte =__pte (pte_val (pte) + (nr <<PFN_PTE_SHIFT )); + } + +um_tlb_mark_sync (mm, addr, addr + length); +} +#define __HAVE_ARCH_PTE_SAMEstatic inline int pte_same (pte_t pte_a,pte_t pte_b) {
arch/um/include/asm/tlbflush.h +35 -9
59 lines not on this page · raw message
arch/um/include/shared/skas/skas.h +1 -0
@@ -16,5 +16,6 @@ extern void handle_syscall(struct uml_pt_regs *regs);extern long execute_syscall_skas (void *r);extern unsigned long current_stub_stack (void );extern struct mm_id *current_mm_id (void ); +extern void current_mm_sync (void );#endif
arch/um/kernel/skas/process.c +10 -0
@@ -8,6 +8,8 @@#include <linux/sched/task_stack.h> #include <linux/sched/task.h> +#include <asm/tlbflush.h> +#include <as-layout.h> #include <kern.h> #include <os.h>
@@ -61,3 +63,11 @@ struct mm_id *current_mm_id(void)return ¤t->mm->context.id; } + +void current_mm_sync (void ) +{ +if (current->mm ==NULL ) +return ; + +um_tlb_sync (current->mm); +}
arch/um/kernel/tlb.c +12 -124
174 lines not on this page · raw message
arch/um/kernel/trap.c +12 -3
@@ -113,7 +113,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,#if 0 WARN_ON (!pte_young (*pte) || (is_write && !pte_dirty (*pte)));#endif -flush_tlb_page (vma, address); + out:mmap_read_unlock (mm); out_nosemaphore:
@@ -210,8 +210,17 @@ unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user,if (!is_user && regs) current->thread.segv_regs = container_of(regs, struct pt_regs, regs); -if (!is_user && (address >= start_vm) && (address < end_vm)) { -flush_tlb_kernel_vm (); +if (!is_user && init_mm.context.sync_tlb_range_to) { +/* +* Kernel has pending updates from set_ptes that were not +* flushed yet. Syncing them should fix the pagefault (if not +* we'll get here again and panic). +*/ + err =um_tlb_sync (&init_mm); +if (err == -ENOMEM ) +report_enomem (); +if (err) +panic ("Failed to sync kernel TLBs: %d" , err); goto out; }else if (current->mm ==NULL ) {
arch/um/os-Linux/skas/process.c +2 -0
@@ -343,6 +343,8 @@ void userspace(struct uml_pt_regs *regs, unsigned long *aux_fp_regs)interrupt_end ();while (1 ) { +current_mm_sync (); +/* Flush out any pending syscalls */ err =syscall_stub_flush (current_mm_id ());if (err) {
Signature · 1 line
2.44.0
Re: [PATCH 12/12] um: refactor TLB update handling
arch/um/include/asm/mmu.h line 16
Quoted 12 lines · On 4/18/24 5:23 PM, [email protected] wrote:
arch/um/include/asm/mmu.h +4
-0@@ -10,6 +10,10 @@ typedef struct mm_context { struct mm_id id; + + /* Address range in need of a TLB sync */ + long int sync_tlb_range_from; + long int sync_tlb_range_to;
Why not "unsigned long"?
Quoted 14 lines
arch/um/include/asm/mmu.h +0
-0} mm_context_t;extern void __switch_mm (struct mm_id * mm_idp);arch/um/include/asm/pgtable.h +3
-0@@ -244,6 +244,38 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval)#define PFN_PTE_SHIFT PAGE_SHIFT +static inline void um_tlb_mark_sync (struct mm_struct *mm,unsigned long start, +unsigned long end) +{
arch/um/include/asm/pgtable.h static inline void set_pte(pte_t *pteptr, pte_t pteval) · line 259
Quoted 10 lines
arch/um/include/asm/pgtable.h +10
-0+if (!mm->context.sync_tlb_range_to) { + mm->context.sync_tlb_range_from = start; + mm->context.sync_tlb_range_to = end; + }else { +if (start < mm->context.sync_tlb_range_from) + mm->context.sync_tlb_range_from = start; +if (end > mm->context.sync_tlb_range_to) + mm->context.sync_tlb_range_to = end; + } +}
IIUC, in some cases, the range [sync_tlb_range_from, sync_tlb_range_to) might become very large when merging non-adjacent ranges? Could that be an issue?
Quoted 51 lines
arch/um/include/asm/tlbflush.h +25
-9@@ -9,24 +9,50 @@#include <linux/mm.h> /* -* TLB flushing: +* In UML, we need to sync the TLB over by using mmap/munmap/mprotect syscalls +* from the process handling the MM (which can be the kernel itself). +* +* To track updates, we can hook into set_ptes and flush_tlb_*. With set_ptes +* we catch all PTE transitions where memory that was unusable becomes usable. +* While with flush_tlb_* we can track any memory that becomes unusable and +* even if a higher layer of the page table was modified. +* +* So, we simply track updates using both methods and mark the memory area to +* be synced later on. The only special case is that flush_tlb_kern_* needs to +* be executed immediately as there is no good synchronization point in that +* case. In contrast, in the set_ptes case we can wait for the next kernel +* segfault before we do the synchornization. * -* - flush_tlb() flushes the current mm struct TLBs * - flush_tlb_all() flushes all processes TLBs * - flush_tlb_mm(mm) flushes the specified mm context TLB's * - flush_tlb_page(vma, vmaddr) flushes one page -* - flush_tlb_kernel_vm() flushes the kernel vm area * - flush_tlb_range(vma, start, end) flushes a range of pages +* - flush_tlb_kernel_range(start, end) flushes a range of kernel pages */ +extern int um_tlb_sync (struct mm_struct *mm); +extern void flush_tlb_all (void );extern void flush_tlb_mm (struct mm_struct *mm); -extern void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, -unsigned long end); -extern void flush_tlb_page (struct vm_area_struct *vma,unsigned long address); -extern void flush_tlb_kernel_vm (void ); -extern void flush_tlb_kernel_range (unsigned long start,unsigned long end); -extern void __flush_tlb_one (unsigned long addr); + +static void flush_tlb_page (struct vm_area_struct *vma,unsigned long address) +{ +um_tlb_mark_sync (vma->vm_mm, address, address +PAGE_SIZE ); +} + +static void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, +unsigned long end) +{
arch/um/include/asm/tlbflush.h line 55
Quoted 10 lines
arch/um/include/asm/tlbflush.h +10
-0+um_tlb_mark_sync (vma->vm_mm, start, end); +} + +static void flush_tlb_kernel_range (unsigned long start,unsigned long end) +{ +um_tlb_mark_sync (&init_mm, start, end); + +/* Kernel needs to be synced immediately */ +um_tlb_sync (&init_mm); +}
Nit: this is a header file, these functions should be defined as inline functions.
Quoted 4 lines
arch/um/kernel/tlb.c +0
-0
[...]
arch/um/kernel/tlb.c void flush_tlb_all(void) · line 305
Quoted 10 lines
arch/um/kernel/tlb.c +0
-9-void flush_tlb_kernel_range (unsigned long start,unsigned long end) -{ -flush_tlb_kernel_range_common (start, end); -} - -void flush_tlb_kernel_vm (void ) -{ -flush_tlb_kernel_range_common (start_vm, end_vm); -}
The build breaks with this change, as there is still a call to flush_tlb_kernel_vm() in ubd.
Regards,
Tiwei
Re: [PATCH 12/12] um: refactor TLB update handling
Quoted 15 lines · Tiwei Bie
arch/um/include/asm/mmu.h line 16
Quoted 12 lines · On 4/18/24 5:23 PM, [email protected] wrote:
arch/um/include/asm/mmu.h +0
-0@@ -10,6 +10,10 @@
typedef structmm_context{
structmm_idid;arch/um/include/asm/mmu.h +4
-0+ +/* Address range in need of a TLB sync */ +long int sync_tlb_range_from; +long int sync_tlb_range_to;Why not "unsigned long"?
Oops, yes, it should be "unsigned long".
Quoted 24 lines
Quoted 24 lines
}
mm_context_t;
extern void__switch_mm(struct mm_id * mm_idp);arch/um/include/asm/pgtable.h +0
-0@@ -244,6 +244,38 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval)
#definePFN_PTE_SHIFTPAGE_SHIFT
+static inline void um_tlb_mark_sync(structmm_struct*mm, unsigned long start,arch/um/include/asm/pgtable.h +8
-0+ unsigned long end) +{ +if (!mm->context.sync_tlb_range_to) { + mm->context.sync_tlb_range_from = start; + mm->context.sync_tlb_range_to = end; + }else { +if (start < mm->context.sync_tlb_range_from) + mm->context.sync_tlb_range_from = start;
Quoted 8 lines
arch/um/include/asm/pgtable.h static inline void set_pte(pte_t *pteptr, pte_t pteval) · line 259
Quoted 4 lines
arch/um/include/asm/pgtable.h +4
-0+if (end > mm->context.sync_tlb_range_to) + mm->context.sync_tlb_range_to = end; + } +}IIUC, in some cases, the range [
sync_tlb_range_from,sync_tlb_range_to) might become very large when merging non-adjacent ranges? Could that be an issue?
I figured it is not a big problem. It will result in scanning the entire page table once to check whether the NEW_PAGE bit is set on any PTE. I am assuming that this will happen almost never and scanning the page table (but not doing syscalls) is reasonably cheap at the end.
Quoted 55 lines
Quoted 55 lines
arch/um/include/asm/tlbflush.h +0
-0@@ -9,24 +9,50 @@ #include <linux/mm.h>
/*
- * TLB flushing:
+ * In UML, we need to sync the TLB over by using mmap/munmap/mprotect syscalls
+ * from the process handling the MM (which can be the kernel itself).
+ *
+ * To track updates, we can hook intoset_ptesand flush_tlb_*. Withset_ptes
+ * we catch all PTE transitions where memory that was unusable becomes usable.
+ * While with flush_tlb_* we can track any memory that becomes unusable and
+ * even if a higher layer of the page table was modified.
+ *
+ * So, we simply track updates using both methods and mark the memory area to
+ * be synced later on. The only special case is that flush_tlb_kern_* needs to
+ * be executed immediately as there is no good synchronization point in that
+ * case. In contrast, in theset_ptescase we can wait for the next kernel
+ * segfault before we do the synchornization.
*
- * -flush_tlb()flushes the current mm struct TLBs
* -flush_tlb_all()flushes all processes TLBs
* -flush_tlb_mm(mm)flushes the specified mm context TLB's
* -flush_tlb_page(vma, vmaddr)flushes one page
- * -flush_tlb_kernel_vm()flushes the kernel vm area
* -flush_tlb_range(vma, start, end)flushes a range of pages
+ * -flush_tlb_kernel_range(start, end)flushes a range of kernel pages */arch/um/include/asm/tlbflush.h +2
-0+extern int um_tlb_sync (struct mm_struct *mm); +extern void
flush_tlb_all(void);
extern voidflush_tlb_mm(struct mm_struct *mm);arch/um/include/asm/tlbflush.h +13
-6-extern void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, - unsigned long end); -extern void flush_tlb_page (struct vm_area_struct *vma,unsigned long address); -extern void flush_tlb_kernel_vm (void ); -extern void flush_tlb_kernel_range (unsigned long start,unsigned long end); -extern void __flush_tlb_one (unsigned long addr); + +static void flush_tlb_page (struct vm_area_struct *vma,unsigned long address) +{ +um_tlb_mark_sync (vma->vm_mm, address, address +PAGE_SIZE ); +} + +static void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, + unsigned long end) +{ +um_tlb_mark_sync (vma->vm_mm, start, end); +} + +static void flush_tlb_kernel_range (unsigned long start,unsigned long end)
Quoted 8 lines
arch/um/include/asm/tlbflush.h line 55
Quoted 6 lines
arch/um/include/asm/tlbflush.h +6
-0+{ +um_tlb_mark_sync (&init_mm, start, end); + +/* Kernel needs to be synced immediately */ +um_tlb_sync (&init_mm); +}Nit: this is a header file, these functions should be defined as inline functions.
Yup, thanks!
Quoted 20 lines
Quoted 4 lines
arch/um/kernel/tlb.c +0
-0[...]
arch/um/kernel/tlb.c void flush_tlb_all(void) · line 305
Quoted 11 lines
-voidflush_tlb_kernel_range(unsigned long start, unsigned long end)arch/um/kernel/tlb.c +0
-8-{ -flush_tlb_kernel_range_common (start, end); -} - -void flush_tlb_kernel_vm (void ) -{ -flush_tlb_kernel_range_common (start_vm, end_vm); -}The build breaks with this change, as there is still a call to
flush_tlb_kernel_vm()in ubd.
Oh, thanks for the pointer!
I do not see a good reason for that call to even exist. My best theory right now is that it existed to avoid later pagefaults for new memory regions (the vmalloc?). So a workaround that is not needed anymore with this patch.
Benjamin
Re: [PATCH 12/12] um: refactor TLB update handling
Quoted 143 lines · Benjamin Berg
Quoted 7 lines · Tiwei Bie
Quoted 6 lines · On 4/18/24 5:23 PM, [email protected] wrote:
arch/um/include/asm/mmu.h +0
-0@@ -10,6 +10,10 @@Quoted 8 lines
arch/um/include/asm/mmu.h line 16
Quoted 6 lines
arch/um/include/asm/mmu.h +4
-0typedef struct mm_context { struct mm_id id; + + /* Address range in need of a TLB sync */ + long int sync_tlb_range_from; + long int sync_tlb_range_to;Why not "unsigned long"?
Oops, yes, it should be "unsigned long".
Quoted 24 lines
Quoted 24 lines
arch/um/include/asm/mmu.h +0
-0} mm_context_t; extern void __switch_mm(struct mm_id * mm_idp);arch/um/include/asm/pgtable.h +9
-0@@ -244,6 +244,38 @@ static inline void set_pte(pte_t *pteptr, pte_t pteval) #define PFN_PTE_SHIFT PAGE_SHIFT +static inline void um_tlb_mark_sync (struct mm_struct *mm,unsigned long start, + unsigned long end) +{ +if (!mm->context.sync_tlb_range_to) { + mm->context.sync_tlb_range_from = start; + mm->context.sync_tlb_range_to = end; + }else { +if (start < mm->context.sync_tlb_range_from) + mm->context.sync_tlb_range_from = start;Quoted 8 lines
arch/um/include/asm/pgtable.h static inline void set_pte(pte_t *pteptr, pte_t pteval) · line 259
Quoted 4 lines
arch/um/include/asm/pgtable.h +4
-0+if (end > mm->context.sync_tlb_range_to) + mm->context.sync_tlb_range_to = end; + } +}IIUC, in some cases, the range [
sync_tlb_range_from,sync_tlb_range_to) might become very large when merging non-adjacent ranges? Could that be an issue?I figured it is not a big problem. It will result in scanning the entire page table once to check whether the
NEW_PAGEbit is set on any PTE. I am assuming that this will happen almost never and scanning the page table (but not doing syscalls) is reasonably cheap at the end.Quoted 55 lines
Quoted 55 lines
arch/um/include/asm/tlbflush.h +29
-9@@ -9,24 +9,50 @@ #include <linux/mm.h> /* - * TLB flushing: +* In UML, we need to sync the TLB over by using mmap/munmap/mprotect syscalls +* from the process handling the MM (which can be the kernel itself). +* +* To track updates, we can hook into set_ptes and flush_tlb_*. With set_ptes +* we catch all PTE transitions where memory that was unusable becomes usable. +* While with flush_tlb_* we can track any memory that becomes unusable and +* even if a higher layer of the page table was modified. +* +* So, we simply track updates using both methods and mark the memory area to +* be synced later on. The only special case is that flush_tlb_kern_* needs to +* be executed immediately as there is no good synchronization point in that +* case. In contrast, in the set_ptes case we can wait for the next kernel +* segfault before we do the synchornization. * - * - flush_tlb() flushes the current mm struct TLBs* - flush_tlb_all() flushes all processes TLBs * - flush_tlb_mm(mm) flushes the specified mm context TLB's * - flush_tlb_page(vma, vmaddr) flushes one page - * - flush_tlb_kernel_vm() flushes the kernel vm area* - flush_tlb_range(vma, start, end) flushes a range of pages +* - flush_tlb_kernel_range(start, end) flushes a range of kernel pages */ +extern int um_tlb_sync (struct mm_struct *mm); + extern void flush_tlb_all(void); extern void flush_tlb_mm(struct mm_struct *mm); -extern void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, - unsigned long end); -extern void flush_tlb_page (struct vm_area_struct *vma,unsigned long address); -extern void flush_tlb_kernel_vm (void ); -extern void flush_tlb_kernel_range (unsigned long start,unsigned long end); -extern void __flush_tlb_one (unsigned long addr); + +static void flush_tlb_page (struct vm_area_struct *vma,unsigned long address) +{ +um_tlb_mark_sync (vma->vm_mm, address, address +PAGE_SIZE ); +} + +static void flush_tlb_range (struct vm_area_struct *vma,unsigned long start, + unsigned long end) +{ +um_tlb_mark_sync (vma->vm_mm, start, end); +} + +static void flush_tlb_kernel_range (unsigned long start,unsigned long end)Quoted 8 lines
arch/um/include/asm/tlbflush.h line 55
Quoted 6 lines
arch/um/include/asm/tlbflush.h +6
-0+{ +um_tlb_mark_sync (&init_mm, start, end); + +/* Kernel needs to be synced immediately */ +um_tlb_sync (&init_mm); +}Nit: this is a header file, these functions should be defined as inline functions.
Yup, thanks!
Quoted 20 lines
Quoted 4 lines
arch/um/kernel/tlb.c +0
-0[...]
arch/um/kernel/tlb.c void flush_tlb_all(void) · line 305
Quoted 11 lines
-void
flush_tlb_kernel_range(unsigned long start, unsigned long end)arch/um/kernel/tlb.c +0
-8-{ -flush_tlb_kernel_range_common (start, end); -} - -void flush_tlb_kernel_vm (void ) -{ -flush_tlb_kernel_range_common (start_vm, end_vm); -}The build breaks with this change, as there is still a call to
flush_tlb_kernel_vm()in ubd.
Quoted 8 lines
Oh, thanks for the pointer!
I do not see a good reason for that call to even exist. My best theory right now is that it existed to avoid later pagefaults for new memory regions (the vmalloc?). So a workaround that is not needed anymore with this patch.
It is there since prehistoric times.
No idea why and what it's doing. IMHO it is not needed.
Quoted 6 lines
Benjamin
Signature · 2 lines
Anton R. Ivanov https://www.kot-begemot.co.uk/
Hello Benjamin,
Quoted 6 lines · On 4/18/24 5:23 PM, [email protected] wrote:
From: Benjamin Berg <[email protected]>
This patchset reworks the stub syscall handling and also redos how page table updates are tracked and synchronized. Some of this originated in the SECCOMP patchset, but it became clear that these refactorings make sense independently as they result in a considerably fewer page faults.
I saw your SECCOMP patchset. It's pretty cool! Just wondering if you're about to post a new version soon. :)
PS. Just FYI, gVisor also implemented a SECCOMP based platform which is also very interesting:
https://gvisor.dev/blog/2023/04/28/systrap-release/
https://github.com/google/gvisor/tree/master/pkg/sentry/platform/systrap
Regards,
Tiwei
Hi Tiwei,
Quoted 10 lines · Tiwei Bie
Quoted 6 lines · On 4/18/24 5:23 PM, [email protected] wrote:
From: Benjamin Berg <[email protected]>
This patchset reworks the stub syscall handling and also redos how page table updates are tracked and synchronized. Some of this originated in the SECCOMP patchset, but it became clear that these refactorings make sense independently as they result in a considerably fewer page faults.
I saw your SECCOMP patchset. It's pretty cool! Just wondering if you're about to post a new version soon. :)
I am planning to work on it again, but it is not very high on my priority list. So, could be quite soon or some months :-)
In the ARM support thread ("UML for arm64"), there were some ideas to use FD passing in order to protect memory mappings better. Doing that should allow the SECCOMP approach to scale to SMP and will also simplify the security model.
Making those changes will take a bit of thought and experimentation. Nothing really big though, it pretty much boils down to using sockets for (some of) the synchronization and replacing mprotect with mmap so the FD can authorize the operation.
Quoted 5 lines
PS. Just FYI, gVisor also implemented a SECCOMP based platform which is also very interesting:
https://gvisor.dev/blog/2023/04/28/systrap-release/
https://github.com/google/gvisor/tree/master/pkg/sentry/platform/systrap
It is a good choice if you want to catch syscalls and do some custom handling in userspace. Just annoying that it is still stuck on classic BPF :-)
Benjamin
Quoted 20 lines · Benjamin Berg
Quoted 10 lines · Tiwei Bie
Quoted 6 lines · On 4/18/24 5:23 PM, [email protected] wrote:
From: Benjamin Berg <[email protected]>
This patchset reworks the stub syscall handling and also redos how page table updates are tracked and synchronized. Some of this originated in the SECCOMP patchset, but it became clear that these refactorings make sense independently as they result in a considerably fewer page faults.
I saw your SECCOMP patchset. It's pretty cool! Just wondering if you're about to post a new version soon. :)
I am planning to work on it again, but it is not very high on my priority list. So, could be quite soon or some months :-)
In the ARM support thread ("UML for arm64"), there were some ideas to use FD passing in order to protect memory mappings better. Doing that should allow the SECCOMP approach to scale to SMP and will also simplify the security model.
Quoted 4 lines
Making those changes will take a bit of thought and experimentation. Nothing really big though, it pretty much boils down to using sockets for (some of) the synchronization and replacing mprotect with mmap so the FD can authorize the operation.
Cool. Thanks for the details! Looking forward to your new version. :)
Regards,
Tiwei