nommu UML
Subsystems (7)
v9 cover nommu UML
This patchset is another spin of nommu mode addition to UML. It would be nice to hear about your opinions on that.
There are still several limitations/issues which we already found; here is the list of those issues.
- memory mapped by loadable modules are not distinguished from userspace memory.
-- Hajime
v9:
- rebase with the latest uml/next branch
- add performance numbers of new SECCOMP mode, and update results ([12/13])
- add a workaround for upstream change on MMU depedency to PCI drivers ([10/13])
v8:
- rebase with the latest uml/next branch
- clean up segv_handler to align with the latest uml ([9/12])
- https://lore.kernel.org/all/[email protected]/
v7:
- properly handle FP register upon signal delivery [10/13]
- update benchmark result with new FP register handling [12/13]
- fix arch_has_single_step() for !MMU case [07/13]
- revert stack alignment as it is in uml/fixes tree [10/13]
- https://lore.kernel.org/all/[email protected]/
v6:
- rebase to the latest uml/next tree
- more clean up on mmu/nommu for signal handling [10/13]
- rename functions of mcontext routines [06,10/13]
- added Acked-by tag for binfmt_elf_fdpic [02/13]
- https://lore.kernel.org/linux-um/[email protected]/
v5:
- clean up stack manipulation code [05,06,07,10/13]
- https://lore.kernel.org/linux-um/[email protected]/
v4:
- add arch/um/nommu, arch/x86/um/nommu to contain !MMU specific codes
- remove zpoline patch
- drop binfmt_elf_fdpic patch
- reduce ifndef CONFIG_MMU if possible
- split to elf header cleanup patch [01/13]
- fix kernel test robot warnings [06/13]
- fix coding styles [07/13]
- move task_top_of_stack definition [05/13]
- https://lore.kernel.org/linux-um/[email protected]/
v3:
- https://lore.kernel.org/linux-um/[email protected]/
- add seccomp-based syscall hook in addition to zpoline [06/13]
- remove RFC, add a line to MAINTAINERS file
- fix kernel test robot warnings [02/13,08/13,10/13]
- add base-commit tag to cover letter
- pull the latest uml/next
- clean up SIGSEGV handling [10/13]
- detect fsgsbase availability with elf aux vector [08/13]
- simplify vdso code with macros [09/13]
RFC v2:
- https://lore.kernel.org/linux-um/[email protected]/
- base branch is now uml/linux.git instead of torvalds/linux.git.
- reorganize the patch series to clean up
- fixed various coding styles issues
- clean up exec code path [07/13]
- fixed the crash/SIGSEGV case on userspace programs [10/13]
- add seccomp filter to limit syscall caller address [06/13]
- detect fsgsbase availability with sigsetjmp/siglongjmp [08/13]
- removes unrelated changes
- removes unneeded ifndef CONFIG_MMU
- convert UML_CONFIG_MMU to CONFIG_MMU as using uml/linux.git
- proposed a patch of maple-tree issue (resolving a limitation in RFC v1)
https://lore.kernel.org/linux-mm/[email protected]/
RFC:
- https://lore.kernel.org/linux-um/[email protected]/
Hajime Tazaki (13):
x86/um: nommu: elf loader for fdpic
um: decouple MMU specific code from the common part
um: nommu: memory handling
x86/um: nommu: syscall handling
um: nommu: seccomp syscalls hook
x86/um: nommu: process/thread handling
um: nommu: configure fs register on host syscall invocation x86/um/vdso: nommu: vdso memory update
x86/um: nommu: signal handling
um: nommu: a work around for MMU dependency to PCI driver
um: change machine name for uname output
um: nommu: add documentation of nommu UML
um: nommu: plug nommu code into build system
Documentation/virt/uml/nommu-uml.rst | 180 ++++++++++++++++++++++ MAINTAINERS | 1 + arch/um/Kconfig | 14 +- arch/um/Makefile | 10 ++ arch/um/configs/x86_64_nommu_defconfig | 54 +++++++ arch/um/include/asm/dma.h | 13 ++ arch/um/include/asm/futex.h | 4 + arch/um/include/asm/mmu.h | 8 + arch/um/include/asm/mmu_context.h | 2 + arch/um/include/asm/ptrace-generic.h | 8 +- arch/um/include/asm/uaccess.h | 7 +- arch/um/include/shared/kern_util.h | 6 + arch/um/include/shared/os.h | 16 ++ arch/um/kernel/Makefile | 5 +- arch/um/kernel/mem-pgtable.c | 55 +++++++ arch/um/kernel/mem.c | 38 +---- arch/um/kernel/process.c | 25 +++ arch/um/kernel/skas/process.c | 27 ---- arch/um/kernel/um_arch.c | 3 + arch/um/nommu/Makefile | 3 + arch/um/nommu/os-Linux/Makefile | 7 + arch/um/nommu/os-Linux/signal.c | 29 ++++ arch/um/nommu/trap.c | 194 ++++++++++++++++++++++++ arch/um/os-Linux/Makefile | 8 +- arch/um/os-Linux/internal.h | 5 + arch/um/os-Linux/mem.c | 4 + arch/um/os-Linux/process.c | 144 +++++++++++++++++- arch/um/os-Linux/seccomp.c | 87 +++++++++++ arch/um/os-Linux/signal.c | 8 + arch/um/os-Linux/skas/process.c | 132 ---------------- arch/um/os-Linux/start_up.c | 25 ++- arch/um/os-Linux/util.c | 3 +- arch/x86/um/Makefile | 7 +- arch/x86/um/asm/elf.h | 8 +- arch/x86/um/nommu/Makefile | 8 + arch/x86/um/nommu/do_syscall_64.c | 80 ++++++++++ arch/x86/um/nommu/entry_64.S | 113 ++++++++++++++ arch/x86/um/nommu/os-Linux/Makefile | 6 + arch/x86/um/nommu/os-Linux/mcontext.c | 24 +++ arch/x86/um/nommu/syscalls.h | 16 ++ arch/x86/um/nommu/syscalls_64.c | 115 ++++++++++++++ arch/x86/um/shared/sysdep/mcontext.h | 5 + arch/x86/um/shared/sysdep/ptrace.h | 2 +- arch/x86/um/shared/sysdep/syscalls_64.h | 6 + arch/x86/um/vdso/vma.c | 17 ++- fs/Kconfig.binfmt | 2 +- 46 files changed, 1318 insertions(+), 216 deletions(-) create mode 100644 Documentation/virt/uml/nommu-uml.rst create mode 100644 arch/um/configs/x86_64_nommu_defconfig create mode 100644 arch/um/kernel/mem-pgtable.c create mode 100644 arch/um/nommu/Makefile create mode 100644 arch/um/nommu/os-Linux/Makefile create mode 100644 arch/um/nommu/os-Linux/signal.c create mode 100644 arch/um/nommu/trap.c create mode 100644 arch/um/os-Linux/seccomp.c create mode 100644 arch/x86/um/nommu/Makefile create mode 100644 arch/x86/um/nommu/do_syscall_64.c create mode 100644 arch/x86/um/nommu/entry_64.S create mode 100644 arch/x86/um/nommu/os-Linux/Makefile create mode 100644 arch/x86/um/nommu/os-Linux/mcontext.c create mode 100644 arch/x86/um/nommu/syscalls.h create mode 100644 arch/x86/um/nommu/syscalls_64.c
base-commit: cfc4ca8986bb1f6182da6cd7bb57f228590b4643
Signature · 1 line
2.43.0
PATCH v9 1/13 x86/um: nommu: elf loader for fdpic
As UML supports CONFIG_MMU=n case, it has to use an alternate ELF loader, FDPIC ELF loader. In this commit, we added necessary definitions in the arch, as UML has not been used so far. It also updates Kconfig file to use BINFMT_ELF_FDPIC under !MMU environment.
--- arch/um/include/asm/mmu.h | 5 +++++ arch/um/include/asm/ptrace-generic.h | 6 ++++++ arch/x86/um/asm/elf.h | 8 ++++++-- fs/Kconfig.binfmt | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-)
arch/um/include/asm/mmu.h +5 -0
@@ -17,6 +17,11 @@ typedef struct mm_context {/* Address range in need of a TLB sync */ unsigned long sync_tlb_range_from;unsigned long sync_tlb_range_to; + +#ifdef CONFIG_BINFMT_ELF_FDPIC +unsigned long exec_fdpic_loadmap; +unsigned long interp_fdpic_loadmap; +#endif } mm_context_t;#endif
arch/um/include/asm/ptrace-generic.h +6 -0
@@ -29,6 +29,12 @@ struct pt_regs {#define PTRACE_OLDSETOPTIONS 21 +#ifdef CONFIG_BINFMT_ELF_FDPIC +#define PTRACE_GETFDPIC 31 +#define PTRACE_GETFDPIC_EXEC 0 +#define PTRACE_GETFDPIC_INTERP 1 +#endif +struct task_struct ; extern long subarch_ptrace(struct task_struct *child, long request,
arch/x86/um/asm/elf.h +6 -2
@@ -9,6 +9,7 @@#include <skas.h> #define CORE_DUMP_USE_REGSET +#define ELF_FDPIC_CORE_EFLAGS 0#ifdef CONFIG_X86_32
@@ -190,8 +191,11 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,extern unsigned long um_vdso_addr;#define AT_SYSINFO_EHDR 33 -#define ARCH_DLINFO NEW_AUX_ENT(AT_SYSINFO_EHDR, um_vdso_addr) - +#define ARCH_DLINFO \ +do { \ + NEW_AUX_ENT(AT_SYSINFO_EHDR, um_vdso_addr); \ + NEW_AUX_ENT(AT_MINSIGSTKSZ, 0); \ +} while (0)#endif typedef unsigned long elf_greg_t ;
fs/Kconfig.binfmt +1 -1
@@ -58,7 +58,7 @@ config ARCH_USE_GNU_PROPERTY config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y if !BINFMT_ELF - depends on ARM || ((M68K || RISCV || SUPERH || XTENSA) && !MMU) + depends on ARM || ((M68K || RISCV || SUPERH || UML || XTENSA) && !MMU) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load
Signature · 1 line
2.43.0
PATCH v9 2/13 um: decouple MMU specific code from the common part
In reply to Hajime TazakiThis splits the memory, process related code with common and MMU specific parts in order to avoid ifdefs in .c file and duplication between MMU and !MMU.
--- arch/um/kernel/Makefile | 5 +- arch/um/kernel/mem-pgtable.c | 55 +++++++++++++ arch/um/kernel/mem.c | 35 --------- arch/um/kernel/process.c | 25 ++++++ arch/um/kernel/skas/process.c | 27 ------- arch/um/os-Linux/Makefile | 3 +- arch/um/os-Linux/internal.h | 5 ++ arch/um/os-Linux/process.c | 134 ++++++++++++++++++++++++++++++++ arch/um/os-Linux/skas/process.c | 132 ------------------------------- 9 files changed, 224 insertions(+), 197 deletions(-) create mode 100644 arch/um/kernel/mem-pgtable.c
arch/um/kernel/Makefile +3 -2
@@ -16,9 +16,10 @@ extra-y := vmlinux.lds obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \ physmem.o process.o ptrace.o reboot.o sigio.o \ - signal.o sysrq.o time.o tlb.o trap.o \ - um_arch.o umid.o kmsg_dump.o capflags.o skas/ + signal.o sysrq.o time.o \ + um_arch.o umid.o kmsg_dump.o capflags.o obj-y += load_file.o +obj-$(CONFIG_MMU) += mem-pgtable.o tlb.o trap.o skas/ obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o obj-$(CONFIG_GPROF) += gprof_syms.o
arch/um/kernel/mem-pgtable.c new file +55 -0
55 lines not on this page · raw message
arch/um/kernel/mem.c +0 -35
@@ -6,7 +6,6 @@#include <linux/stddef.h> #include <linux/module.h> #include <linux/memblock.h> -#include <linux/mm.h> #include <linux/swap.h> #include <linux/slab.h> #include <linux/init.h>
@@ -207,45 +206,11 @@ void free_initmem(void) { } -/* Allocate and free page tables. */ - -pgd_t *pgd_alloc (struct mm_struct *mm) -{ -pgd_t *pgd =__pgd_alloc (mm,0 ); - -if (pgd) -memcpy (pgd +USER_PTRS_PER_PGD , - swapper_pg_dir +USER_PTRS_PER_PGD , - (PTRS_PER_PGD -USER_PTRS_PER_PGD ) *sizeof (pgd_t)); - -return pgd; -} -void *uml_kmalloc (int size,int flags) {return kmalloc (size, flags); } -static const pgprot_t protection_map[16 ] = { - [VM_NONE ] =PAGE_NONE , - [VM_READ ] =PAGE_READONLY , - [VM_WRITE ] =PAGE_COPY , - [VM_WRITE |VM_READ ] =PAGE_COPY , - [VM_EXEC ] =PAGE_READONLY , - [VM_EXEC |VM_READ ] =PAGE_READONLY , - [VM_EXEC |VM_WRITE ] =PAGE_COPY , - [VM_EXEC |VM_WRITE |VM_READ ] =PAGE_COPY , - [VM_SHARED ] =PAGE_NONE , - [VM_SHARED |VM_READ ] =PAGE_READONLY , - [VM_SHARED |VM_WRITE ] =PAGE_SHARED , - [VM_SHARED |VM_WRITE |VM_READ ] =PAGE_SHARED , - [VM_SHARED |VM_EXEC ] =PAGE_READONLY , - [VM_SHARED |VM_EXEC |VM_READ ] =PAGE_READONLY , - [VM_SHARED |VM_EXEC |VM_WRITE ] =PAGE_SHARED , - [VM_SHARED |VM_EXEC |VM_WRITE |VM_READ ] =PAGE_SHARED -}; -DECLARE_VM_GET_PAGE_PROT -void mark_rodata_ro (void ) {unsigned long rodata_start =PFN_ALIGN (__start_rodata);
arch/um/kernel/process.c +25 -0
@@ -25,6 +25,7 @@#include <linux/tick.h> #include <linux/threads.h> #include <linux/resume_user_mode.h> +#include <linux/start_kernel.h> #include <asm/current.h> #include <asm/mmu_context.h> #include <asm/switch_to.h>
@@ -46,6 +47,8 @@struct task_struct *cpu_tasks[NR_CPUS ];EXPORT_SYMBOL (cpu_tasks); +static char cpu0_irqstack[THREAD_SIZE ]__aligned(THREAD_SIZE) ; +void free_stack (unsigned long stack,int order) {free_pages (stack, order);
@@ -295,3 +298,25 @@ unsigned long __get_wchan(struct task_struct *p)return 0 ; } + + +static int __init start_kernel_proc (void *unused) +{ +block_signals_trace (); + +start_kernel (); +return 0 ; +} + +int __init start_uml (void ) +{ +stack_protections ((unsigned long ) &cpu0_irqstack); +set_sigstack (cpu0_irqstack,THREAD_SIZE ); + +init_new_thread_signals (); + + init_task.thread.request.thread.proc = start_kernel_proc; + init_task.thread.request.thread.arg =NULL ; +return start_idle_thread (task_stack_page (&init_task), + &init_task.thread.switch_buf); +}
arch/um/kernel/skas/process.c +0 -27
@@ -16,33 +16,6 @@#include <skas.h> #include <kern_util.h> -extern void start_kernel (void ); - -static int __init start_kernel_proc (void *unused) -{ -block_signals_trace (); - -start_kernel (); -return 0 ; -} - -extern int userspace_pid[]; - -static char cpu0_irqstack[THREAD_SIZE ]__aligned(THREAD_SIZE) ; - -int __init start_uml (void ) -{ -stack_protections ((unsigned long ) &cpu0_irqstack); -set_sigstack (cpu0_irqstack,THREAD_SIZE ); - -init_new_thread_signals (); - - init_task.thread.request.thread.proc = start_kernel_proc; - init_task.thread.request.thread.arg =NULL ; -return start_idle_thread (task_stack_page (&init_task), - &init_task.thread.switch_buf); -} -unsigned long current_stub_stack (void ) {if (current->mm ==NULL )
arch/um/os-Linux/Makefile +2 -1
@@ -8,7 +8,8 @@ KCOV_INSTRUMENT := n obj-y = execvp.o file.o helper.o irq.o main.o mem.o process.o \ registers.o sigio.o signal.o start_up.o time.o tty.o \ - umid.o user_syms.o util.o skas/ + umid.o user_syms.o util.o +obj-$(CONFIG_MMU) += skas/ CFLAGS_signal.o += -Wframe-larger-than=4096
arch/um/os-Linux/internal.h +5 -0
@@ -5,6 +5,11 @@#include <mm_id.h> #include <stub-data.h> +/* +* process.c +*/ +extern int userspace_pid[]; +/* * elf_aux.c */
arch/um/os-Linux/process.c +134 -0
153 lines not on this page · raw message
arch/um/os-Linux/skas/process.c +0 -132
163 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v9 3/13 um: nommu: memory handling
In reply to Hajime TazakiThis commit adds memory operations on UML under !MMU environment.
Some part of the original UML code relying on CONFIG_MMU are excluded from compilation when !CONFIG_MMU. Additionally, generic functions such as uaccess, futex, memcpy/strnlen/strncpy can be used as user- and kernel-space share the address space in !CONFIG_MMU mode.
--- arch/um/Makefile | 4 ++++ arch/um/include/asm/futex.h | 4 ++++ arch/um/include/asm/mmu.h | 3 +++ arch/um/include/asm/mmu_context.h | 2 ++ arch/um/include/asm/uaccess.h | 7 ++++--- arch/um/kernel/mem.c | 3 ++- arch/um/os-Linux/mem.c | 4 ++++ arch/um/os-Linux/process.c | 4 ++-- 8 files changed, 25 insertions(+), 6 deletions(-)
arch/um/Makefile +4 -0
@@ -46,6 +46,10 @@ ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) ARCH_INCLUDE += -I$(srctree)/$(HOST_DIR)/um/shared KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um +ifneq ($(CONFIG_MMU),y) +core-y += $(ARCH_DIR)/nommu/ +endif + # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # named - it's a common symbol in libpcap, so we get a binary which crashes. #
arch/um/include/asm/futex.h +4 -0
@@ -7,8 +7,12 @@#include <asm/errno.h> +#ifdef CONFIG_MMU int arch_futex_atomic_op_inuser (int op,u32 oparg,int *oval,u32 __user *uaddr);int futex_atomic_cmpxchg_inatomic (u32 *uval,u32 __user *uaddr,u32 oldval,u32 newval); +#else +#include <asm-generic/futex.h> +#endif #endif
arch/um/include/asm/mmu.h +3 -0
@@ -18,10 +18,13 @@ typedef struct mm_context {unsigned long sync_tlb_range_from;unsigned long sync_tlb_range_to; +#ifndef CONFIG_MMU +unsigned long end_brk;#ifdef CONFIG_BINFMT_ELF_FDPIC unsigned long exec_fdpic_loadmap;unsigned long interp_fdpic_loadmap;#endif +#endif /* !CONFIG_MMU */ } mm_context_t;#endif
arch/um/include/asm/mmu_context.h +2 -0
@@ -36,11 +36,13 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, } } +#ifdef CONFIG_MMU #define init_new_context init_new_contextextern int init_new_context (struct task_struct *task,struct mm_struct *mm);#define destroy_context destroy_contextextern void destroy_context (struct mm_struct *mm); +#endif #include <asm-generic/mmu_context.h>
arch/um/include/asm/uaccess.h +4 -3
@@ -23,6 +23,7 @@#define __addr_range_nowrap (addr, size) \ ((unsigned long) (addr) <= ((unsigned long) (addr) + (size))) +#ifdef CONFIG_MMU extern unsigned long raw_copy_from_user (void *to,const void __user *from,unsigned long n);extern unsigned long raw_copy_to_user (void __user *to,const void *from,unsigned long n);extern unsigned long __clear_user (void __user *mem,unsigned long len);
@@ -34,9 +35,6 @@ static inline int __access_ok(const void __user *ptr, unsigned long size);#define INLINE_COPY_FROM_USER #define INLINE_COPY_TO_USER - -#include <asm-generic/uaccess.h> -static inline int __access_ok (const void __user *ptr,unsigned long size) {unsigned long addr = (unsigned long )ptr;
@@ -70,5 +68,8 @@ do { \barrier (); \ current->thread.segv_continue =NULL ; \ } while (0) +#endif + +#include <asm-generic/uaccess.h> #endif
arch/um/kernel/mem.c +2 -1
@@ -64,7 +64,8 @@ void __init arch_mm_preinit(void)* to be turned on. */ brk_end = (unsigned long )UML_ROUND_UP (sbrk (0 )); -map_memory (brk_end,__pa (brk_end), uml_reserved - brk_end,1 ,1 ,0 ); +map_memory (brk_end,__pa (brk_end), uml_reserved - brk_end,1 ,1 , + !IS_ENABLED (CONFIG_MMU ));memblock_free ((void *)brk_end, uml_reserved - brk_end); uml_reserved = brk_end; min_low_pfn =PFN_UP (__pa (uml_reserved));
arch/um/os-Linux/mem.c +4 -0
@@ -213,6 +213,10 @@ int __init create_mem_file(unsigned long long len) {int err, fd; +/* NOMMU kernel uses -1 as a fd for further use (e.g., mmap) */ +if (!IS_ENABLED (CONFIG_MMU )) +return -1 ; + fd =create_tmp_file (len); err =os_set_exec_close (fd);
arch/um/os-Linux/process.c +2 -2
@@ -99,8 +99,8 @@ int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len, prot = (r ?PROT_READ :0 ) | (w ?PROT_WRITE :0 ) | (x ?PROT_EXEC :0 ); - loc =mmap64 ((void *) virt, len, prot,MAP_SHARED |MAP_FIXED , - fd, off); + loc =mmap64 ((void *) virt, len, prot,MAP_SHARED |MAP_FIXED | + (!IS_ENABLED (CONFIG_MMU ) ?MAP_ANONYMOUS :0 ), fd, off);if (loc ==MAP_FAILED )return -errno;return 0 ;
Signature · 1 line
2.43.0
PATCH v9 4/13 x86/um: nommu: syscall handling
In reply to Hajime TazakiThis commit introduces an entry point of syscall interface for !MMU mode. It uses an entry function, __kernel_vsyscall, a kernel-wide global symbol accessible from any locations.
Although it isn't in the scope of this commit, it can be also exposed via vdso image which is directly accessible from userspace. A standard library (i.e., libc) can utilize this entry point to implement syscall wrapper; we can also use this by hooking syscall for unmodified userspace applications/libraries, which will be implemented in the subsequent commit.
This only supports 64-bit mode of x86 architecture.
--- arch/x86/um/Makefile | 4 ++ arch/x86/um/nommu/Makefile | 8 +++ arch/x86/um/nommu/do_syscall_64.c | 37 ++++++++++ arch/x86/um/nommu/entry_64.S | 91 +++++++++++++++++++++++++ arch/x86/um/nommu/syscalls.h | 16 +++++ arch/x86/um/shared/sysdep/syscalls_64.h | 6 ++ 6 files changed, 162 insertions(+) create mode 100644 arch/x86/um/nommu/Makefile create mode 100644 arch/x86/um/nommu/do_syscall_64.c create mode 100644 arch/x86/um/nommu/entry_64.S create mode 100644 arch/x86/um/nommu/syscalls.h
arch/x86/um/Makefile +4 -0
@@ -32,6 +32,10 @@ obj-y += syscalls_64.o vdso/ subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \ ../lib/memmove_64.o ../lib/memset_64.o +ifneq ($(CONFIG_MMU),y) +obj-y += nommu/ +endif + endif subarch-$(CONFIG_MODULES) += ../kernel/module.o
arch/x86/um/nommu/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +ifeq ($(CONFIG_X86_32),y) + BITS := 32 +else + BITS := 64 +endif + +obj-y = do_syscall_$(BITS).o entry_$(BITS).o
arch/x86/um/nommu/do_syscall_64.c new file +37 -0
@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <kern_util.h> +#include <sysdep/syscalls.h> +#include <os.h> + +__visible void do_syscall_64(struct pt_regs *regs) +{ +int syscall; + + syscall =PT_SYSCALL_NR (regs->regs.gp); +UPT_SYSCALL_NR (®s->regs) = syscall; + +pr_debug ("syscall(%d) (current=%lx) (fn=%lx)\n" , + syscall, (unsigned long )current, + (unsigned long )sys_call_table[syscall]); + +if (likely (syscall < NR_syscalls)) { +PT_REGS_SET_SYSCALL_RETURN (regs, +EXECUTE_SYSCALL (syscall, regs)); + } + +pr_debug ("syscall(%d) --> %lx\n" , syscall, + regs->regs.gp[HOST_AX ]); + +PT_REGS_SYSCALL_RET (regs) = regs->regs.gp[HOST_AX ]; + +/* execve succeeded */ +if (syscall == __NR_execve && regs->regs.gp[HOST_AX ] ==0 ) +userspace (¤t->thread.regs.regs); + +/* force do_signal() --> is_syscall() */ +set_thread_flag (TIF_SIGPENDING ); +interrupt_end (); +}
arch/x86/um/nommu/entry_64.S new file +91 -0
91 lines not on this page · raw message
arch/x86/um/nommu/syscalls.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __UM_NOMMU_SYSCALLS_H +#define __UM_NOMMU_SYSCALLS_H + + +#define task_top_of_stack (task) \ +({ \ + unsigned long __ptr = (unsigned long)task->stack; \ + __ptr += THREAD_SIZE; \ + __ptr; \ +}) + +extern long current_top_of_stack; +extern long current_ptregs; + +#endif
arch/x86/um/shared/sysdep/syscalls_64.h +6 -0
@@ -25,4 +25,10 @@ extern syscall_handler_t *sys_call_table[];extern syscall_handler_t sys_modify_ldt;extern syscall_handler_t sys_arch_prctl; +#ifndef CONFIG_MMU +extern void do_syscall_64 (struct pt_regs *regs); +extern long __kernel_vsyscall (int64_t a0,int64_t a1,int64_t a2,int64_t a3, +int64_t a4,int64_t a5,int64_t a6); +#endif +#endif
Signature · 1 line
2.43.0
Re: [PATCH v9 04/13] x86/um: nommu: syscall handling
Hi,
Quoted 71 lines · Hajime Tazaki
This commit introduces an entry point of syscall interface for !MMU mode. It uses an entry function,
__kernel_vsyscall, a kernel-wide global symbol accessible from any locations.Although it isn't in the scope of this commit, it can be also exposed via vdso image which is directly accessible from userspace. A standard library (i.e., libc) can utilize this entry point to implement syscall wrapper; we can also use this by hooking syscall for unmodified userspace applications/libraries, which will be implemented in the subsequent commit.
This only supports 64-bit mode of x86 architecture.
Signed-off-by Hajime Tazaki <[email protected]>Signed-off-by Ricardo Koller <[email protected]>---
arch/x86/um/Makefile | 4 ++ arch/x86/um/nommu/Makefile | 8 +++ arch/x86/um/nommu/do_syscall_64.c | 37 ++++++++++ arch/x86/um/nommu/entry_64.S | 91 +++++++++++++++++++++++++ arch/x86/um/nommu/syscalls.h | 16 +++++arch/x86/um/shared/sysdep/syscalls_64.h| 6 ++6 files changed, 162 insertions(+)create mode 100644
arch/x86/um/nommu/Makefilecreate mode 100644arch/x86/um/nommu/do_syscall_64.ccreate mode 100644arch/x86/um/nommu/entry_64.Screate mode 100644arch/x86/um/nommu/syscalls.harch/x86/um/Makefile +0
-0@@ -32,6 +32,10 @@ obj-y += syscalls_64.o vdso/ subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \
../lib/memmove_64.o../lib/memset_64.oarch/x86/um/Makefile +4
-0+ifneq ($(CONFIG_MMU),y) +obj-y += nommu/ +endif +endif
subarch-$(CONFIG_MODULES) +=../kernel/module.oarch/x86/um/nommu/Makefile new file +8
-0@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +ifeq ($(CONFIG_X86_32),y) + BITS := 32 +else + BITS := 64 +endif + +obj-y = do_syscall_$(BITS).o entry_$(BITS).oarch/x86/um/nommu/do_syscall_64.c new file +8
-0@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <kern_util.h> +#include <sysdep/syscalls.h> +#include <os.h> +
arch/x86/um/nommu/do_syscall_64.c line 18
Quoted 10 lines
arch/x86/um/nommu/do_syscall_64.c new file +10
-0+__visible void do_syscall_64(struct pt_regs *regs) +{ +int syscall; + + syscall =PT_SYSCALL_NR (regs->regs.gp); +UPT_SYSCALL_NR (®s->regs) = syscall; + +pr_debug ("syscall(%d) (current=%lx) (fn=%lx)\n" , + syscall, (unsigned long )current, + (unsigned long )sys_call_table[syscall]);
You probably want to drop the pr_debug from the syscall path.
arch/x86/um/nommu/do_syscall_64.c line 32
Quoted 13 lines
arch/x86/um/nommu/do_syscall_64.c new file +13
-0+if (likely (syscall < NR_syscalls)) { +PT_REGS_SET_SYSCALL_RETURN (regs, +EXECUTE_SYSCALL (syscall, regs)); + } + +pr_debug ("syscall(%d) --> %lx\n" , syscall, + regs->regs.gp[HOST_AX ]); + +PT_REGS_SYSCALL_RET (regs) = regs->regs.gp[HOST_AX ]; + +/* execve succeeded */ +if (syscall == __NR_execve && regs->regs.gp[HOST_AX ] ==0 ) +userspace (¤t->thread.regs.regs);
That said, this is what I am stumbling over. Why do you need to jump into userspace() here? It seems odd to me to need a special case in the syscall path itself.
Aren't there other possibilities to hook/override the kernel task state?
arch/x86/um/nommu/do_syscall_64.c line 36
Quoted 4 lines
arch/x86/um/nommu/do_syscall_64.c new file +4
-0+ +/* force do_signal() --> is_syscall() */ +set_thread_flag (TIF_SIGPENDING ); +interrupt_end ();
Same here. The MMU UML code seems to also do this, but restricted to ptrace'd processes? Maybe I am just missing something obvious …
Benjamin
Quoted 135 lines
arch/x86/um/nommu/do_syscall_64.c new file +1
-0+}arch/x86/um/nommu/entry_64.S new file +91
-0@@ -0,0 +1,91 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/errno.h> + +#include <linux/linkage.h> +#include <asm/percpu.h> +#include <asm/desc.h> + +#include "../entry/calling.h" + +#ifdef CONFIG_SMP +#error need to stash these variables somewhere else +#endif + +#define UM_GLOBAL_VAR(x) .data; .align 8; .globl x; x:; .long 0 + +UM_GLOBAL_VAR(current_top_of_stack) +UM_GLOBAL_VAR(current_ptregs) + +.code64 +.section .entry.text, "ax" + +.align 8 +#undef ENTRY +#define ENTRY(x) .text; .globl x; .type x,%function; x: +#undef END +#define END(x) .size x, . - x + +/* + * %rcx has the return address (we set it before entering __kernel_vsyscall). + * + * Registers on entry: + * rax system call number + * rcx return address + * rdi arg0 + * rsi arg1 + * rdx arg2 + * r10 arg3 + * r8 arg4 + * r9 arg5 + * + * (note: we are allowed to mess with r11: r11 is callee-clobbered + * register in C ABI) + */ +ENTRY(__kernel_vsyscall) + + movq %rsp, %r11 + + /* Point rsp to the top of the ptregs array, so we can + just fill it with a bunch of push'es. */ + movq current_ptregs, %rsp + + /* 8 bytes * 20 registers (plus 8 for the push) */ + addq $168, %rsp + + /* Construct struct pt_regs on stack */ + pushq $0 /* pt_regs->ss (index 20) */ + pushq %r11 /* pt_regs->sp */ + pushfq /* pt_regs->flags */ + pushq $0 /* pt_regs->cs */ + pushq %rcx /* pt_regs->ip */ + pushq %rax /* pt_regs->orig_ax */ + + PUSH_AND_CLEAR_REGS rax=$-ENOSYS + + mov %rsp, %rdi + + /* + * Switch to current top of stack, so "current->" points + * to the right task. + */ + movq current_top_of_stack, %rsp + + call do_syscall_64 + + movq current_ptregs, %rsp + + POP_REGS + + addq $8, %rsp /* skip orig_ax */ + popq %rcx /* pt_regs->ip */ + addq $8, %rsp /* skip cs */ + addq $8, %rsp /* skip flags */ + popq %rsp + + /* + * not return w/ ret but w/ jmp as the stack is already popped before + * entering __kernel_vsyscall + */ + jmp *%rcx + +END(__kernel_vsyscall)arch/x86/um/nommu/syscalls.h new file +16
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __UM_NOMMU_SYSCALLS_H +#define __UM_NOMMU_SYSCALLS_H + + +#define task_top_of_stack (task) \ +({ \ + unsigned long __ptr = (unsigned long)task->stack; \ + __ptr += THREAD_SIZE; \ + __ptr; \ +}) + +extern long current_top_of_stack; +extern long current_ptregs; + +#endif arch/x86/um/shared/sysdep/syscalls_64.h +0
-0@@ -25,4 +25,10 @@ extern syscall_handler_t *sys_call_table[]; extern syscall_handler_t sys_modify_ldt; extern syscall_handler_t sys_arch_prctl;arch/x86/um/shared/sysdep/syscalls_64.h +6
-0+#ifndef CONFIG_MMU +extern void do_syscall_64 (struct pt_regs *regs); +extern long __kernel_vsyscall (int64_t a0,int64_t a1,int64_t a2,int64_t a3, + int64_t a4, int64_t a5, int64_t a6); +#endif +#endif
Re: [PATCH v9 04/13] x86/um: nommu: syscall handling
Quoted 18 lines · Benjamin Berg
Quoted 18 lines
arch/x86/um/nommu/do_syscall_64.c new file +12
-0@@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <kern_util.h> +#include <sysdep/syscalls.h> +#include <os.h> + +__visible void do_syscall_64(struct pt_regs *regs) +{ +int syscall; +
Quoted 8 lines
arch/x86/um/nommu/do_syscall_64.c line 18
Quoted 6 lines
arch/x86/um/nommu/do_syscall_64.c new file +6
-0+ syscall =PT_SYSCALL_NR (regs->regs.gp); +UPT_SYSCALL_NR (®s->regs) = syscall; + +pr_debug ("syscall(%d) (current=%lx) (fn=%lx)\n" , + syscall, (unsigned long )current, + (unsigned long )sys_call_table[syscall]);You probably want to drop the
pr_debugfrom the syscall path.
okay, I'll update those parts.
Quoted 11 lines
Quoted 11 lines
arch/x86/um/nommu/do_syscall_64.c new file +11
-0+if (likely (syscall < NR_syscalls)) { +PT_REGS_SET_SYSCALL_RETURN (regs, +EXECUTE_SYSCALL (syscall, regs)); + } + +pr_debug ("syscall(%d) --> %lx\n" , syscall, + regs->regs.gp[HOST_AX ]); + +PT_REGS_SYSCALL_RET (regs) = regs->regs.gp[HOST_AX ]; + +/* execve succeeded */
Quoted 8 lines
arch/x86/um/nommu/do_syscall_64.c line 32
Quoted 2 lines
arch/x86/um/nommu/do_syscall_64.c new file +2
-0+if (syscall == __NR_execve && regs->regs.gp[HOST_AX ] ==0 ) +userspace (¤t->thread.regs.regs);That said, this is what I am stumbling over. Why do you need to jump into
userspace()here? It seems odd to me to need a special case in the syscall path itself.
Aren't there other possibilities to hook/override the kernel task state?
thanks, I found that this is a leftover of our early implementation which doesn't have a proper schedule upon an exit from syscall. we can remove this part and I'll fix them after more investigation.
Quoted 6 lines
arch/x86/um/nommu/do_syscall_64.c line 36
Quoted 3 lines
arch/x86/um/nommu/do_syscall_64.c new file +3
-0+/* force do_signal() --> is_syscall() */ +set_thread_flag (TIF_SIGPENDING ); +interrupt_end ();Same here. The MMU UML code seems to also do this, but restricted to ptrace'd processes? Maybe I am just missing something obvious …
nommu doesn't have separate process/context to indicate a schedule to the context here (syscall). without that part we do not have a chance to schedule tasks and signals to userspace.
But the force on SIGPENDING flag is not actually needed so, I'll remove that part.
thanks for pointing out.
-- Hajime
PATCH v9 5/13 um: nommu: seccomp syscalls hook
In reply to Hajime TazakiThis commit adds syscall hook with seccomp.
Using seccomp raises SIGSYS to UML process, which is captured in the (UML) kernel, then jumps to the syscall entry point, __kernel_vsyscall, to hook the original syscall instructions.
The SIGSYS signal is raised upon the execution from uml_reserved and high_physmem, which locates userspace memory.
It also renames existing static function, sigsys_handler(), in start_up.c to avoid name conflicts between them.
--- arch/um/include/shared/kern_util.h | 2 + arch/um/include/shared/os.h | 10 +++ arch/um/kernel/um_arch.c | 3 + arch/um/nommu/Makefile | 3 + arch/um/nommu/os-Linux/Makefile | 7 +++ arch/um/nommu/os-Linux/signal.c | 16 +++++ arch/um/os-Linux/Makefile | 5 ++ arch/um/os-Linux/seccomp.c | 87 +++++++++++++++++++++++++++ arch/um/os-Linux/signal.c | 8 +++ arch/um/os-Linux/start_up.c | 4 +- arch/x86/um/nommu/Makefile | 2 +- arch/x86/um/nommu/os-Linux/Makefile | 6 ++ arch/x86/um/nommu/os-Linux/mcontext.c | 13 ++++ arch/x86/um/shared/sysdep/mcontext.h | 4 ++ 14 files changed, 167 insertions(+), 3 deletions(-) create mode 100644 arch/um/nommu/Makefile create mode 100644 arch/um/nommu/os-Linux/Makefile create mode 100644 arch/um/nommu/os-Linux/signal.c create mode 100644 arch/um/os-Linux/seccomp.c create mode 100644 arch/x86/um/nommu/os-Linux/Makefile create mode 100644 arch/x86/um/nommu/os-Linux/mcontext.c
arch/um/include/shared/kern_util.h +2 -0
@@ -66,6 +66,8 @@ extern void segv_handler(int sig, struct siginfo *unused_si, struct uml_pt_regsextern void winch (int sig,struct siginfo *unused_si,struct uml_pt_regs *regs,void *mc);extern void fatal_sigsegv (void ) __attribute__ ((noreturn)); +extern void sigsys_handler (int sig,struct siginfo *si,struct uml_pt_regs *regs, +void *mc);void um_idle_sleep (void );
arch/um/include/shared/os.h +10 -0
@@ -338,4 +338,14 @@ extern void um_trace_signals_off(void);/* time-travel */ extern void deliver_time_travel_irqs (void ); +/* seccomp.c */ +#ifdef CONFIG_MMU +static inline int os_setup_seccomp (void ) +{ +return 0 ; +} +#else +extern int os_setup_seccomp (void ); +#endif +#endif
arch/um/kernel/um_arch.c +3 -0
@@ -431,6 +431,9 @@ void __init setup_arch(char **cmdline_p)add_bootloader_randomness (rng_seed,sizeof (rng_seed));memzero_explicit (rng_seed,sizeof (rng_seed)); } + +/* install seccomp filter */ +os_setup_seccomp (); }void __init arch_cpu_finalize_init (void )
arch/um/nommu/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y := os-Linux/
arch/um/nommu/os-Linux/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y := signal.o +USER_OBJS := $(obj-y) + +include $(srctree)/arch/um/scripts/Makefile.rules +USER_CFLAGS+=-I$(srctree)/arch/um/os-Linux
arch/um/nommu/os-Linux/signal.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <signal.h> +#include <kern_util.h> +#include <os.h> +#include <sysdep/mcontext.h> +#include <sys/ucontext.h> + +void sigsys_handler (int sig,struct siginfo *si, +struct uml_pt_regs *regs,void *ptr) +{ +mcontext_t *mc = (mcontext_t *) ptr; + +/* hook syscall via SIGSYS */ +set_mc_sigsys_hook (mc); +}
arch/um/os-Linux/Makefile +5 -0
@@ -21,4 +21,9 @@ USER_OBJS := $(user-objs-y) elf_aux.o execvp.o file.o helper.o irq.o \ main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ tty.o umid.o util.o +ifneq ($(CONFIG_MMU),y) +obj-y += seccomp.o +USER_OBJS += seccomp.o +endif + include $(srctree)/arch/um/scripts/Makefile.rules
arch/um/os-Linux/seccomp.c new file +87 -0
87 lines not on this page · raw message
arch/um/os-Linux/signal.c +8 -0
@@ -20,6 +20,7 @@#include <um_malloc.h> #include <sys/ucontext.h> #include <timetravel.h> +#include <linux/compiler_attributes.h> void (*sig_info[NSIG ])(int ,struct siginfo *,struct uml_pt_regs *,void *mc) = { [SIGTRAP ] = relay_signal,
@@ -30,6 +31,7 @@ void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *, void *mc) = [SIGSEGV] = segv_handler, [SIGIO] = sigio_handler, [SIGCHLD] = sigchld_handler, + [SIGSYS] = sigsys_handler, };static void sig_handler_common (int sig,struct siginfo *si,mcontext_t *mc)
@@ -176,6 +178,11 @@ static void sigusr1_handler(int sig, struct siginfo *unused_si, mcontext_t *mc)uml_pm_wake (); } +__weak void sigsys_handler (int sig,struct siginfo *unused_si, +struct uml_pt_regs *regs,void *mc) +{ +} +void register_pm_wake_signal (void ) {set_handler (SIGUSR1 );
@@ -187,6 +194,7 @@ static void (*handlers[_NSIG])(int sig, struct siginfo *si, mcontext_t *mc) = { [SIGILL] = sig_handler, [SIGFPE] = sig_handler, [SIGTRAP] = sig_handler, + [SIGSYS] = sig_handler, [SIGIO] = sig_handler, [SIGWINCH] = sig_handler,
arch/um/os-Linux/start_up.c +2 -2
@@ -238,7 +238,7 @@ extern unsigned long *exec_fp_regs;__initdata static struct stub_data *seccomp_test_stub_data; -static void __init sigsys_handler (int sig,siginfo_t *info,void *p) +static void __init _sigsys_handler (int sig,siginfo_t *info,void *p) {ucontext_t *uc = p;
@@ -273,7 +273,7 @@ static int __init seccomp_helper(void *data) sizeof(seccomp_test_stub_data->sigstack)); sa.sa_flags =SA_ONSTACK |SA_NODEFER |SA_SIGINFO ; - sa.sa_sigaction = (void *) sigsys_handler; + sa.sa_sigaction = (void *) _sigsys_handler; sa.sa_restorer =NULL ;if (sigaction (SIGSYS , &sa,NULL ) <0 )exit (2 );
arch/x86/um/nommu/Makefile +1 -1
@@ -5,4 +5,4 @@ else BITS := 64 endif -obj-y = do_syscall_$(BITS).o entry_$(BITS).o +obj-y = do_syscall_$(BITS).o entry_$(BITS).o os-Linux/
arch/x86/um/nommu/os-Linux/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y = mcontext.o +USER_OBJS := mcontext.o + +include $(srctree)/arch/um/scripts/Makefile.rules
arch/x86/um/nommu/os-Linux/mcontext.c new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <sys/ucontext.h> +#define __FRAME_OFFSETS +#include <asm/ptrace.h> +#include <sysdep/ptrace.h> +#include <sysdep/mcontext.h> +#include <sysdep/syscalls.h> + +void set_mc_sigsys_hook (mcontext_t *mc) +{ + mc->gregs[REG_RCX ] = mc->gregs[REG_RIP ]; + mc->gregs[REG_RIP ] = (unsigned long ) __kernel_vsyscall; +}
arch/x86/um/shared/sysdep/mcontext.h +4 -0
@@ -17,6 +17,10 @@ extern int get_stub_state(struct uml_pt_regs *regs, struct stub_data *data,extern int set_stub_state (struct uml_pt_regs *regs,struct stub_data *data,int single_stepping); +#ifndef CONFIG_MMU +extern void set_mc_sigsys_hook (mcontext_t *mc); +#endif +#ifdef __i386__#define GET_FAULTINFO_FROM_MC (fi, mc) \
Signature · 1 line
2.43.0
PATCH v9 6/13 x86/um: nommu: process/thread handling
In reply to Hajime TazakiSince ptrace facility isn't used under !MMU of UML, there is different code path to invoke processes/threads; there are no external process used, and need to properly configure some of registers (fs segment register for TLS, etc) on every context switch, etc.
Signals aren't delivered in non-ptrace syscall entry/leave so, we also need to handle pending signal by ourselves.
ptrace related syscalls are not tested yet so, marked arch_has_single_step() unsupported in !MMU environment.
--- arch/um/include/asm/ptrace-generic.h | 2 +- arch/x86/um/Makefile | 3 +- arch/x86/um/nommu/Makefile | 2 +- arch/x86/um/nommu/entry_64.S | 22 ++++++++++++++ arch/x86/um/nommu/syscalls_64.c | 44 ++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 arch/x86/um/nommu/syscalls_64.c
arch/um/include/asm/ptrace-generic.h +1 -1
@@ -14,7 +14,7 @@ struct pt_regs {struct uml_pt_regs regs; }; -#define arch_has_single_step () (1) +#define arch_has_single_step () (IS_ENABLED(CONFIG_MMU))#define EMPTY_REGS { .regs = EMPTY_UML_PT_REGS }
arch/x86/um/Makefile +2 -1
@@ -27,7 +27,8 @@ subarch-y += ../kernel/sys_ia32.o else -obj-y += syscalls_64.o vdso/ +obj-y += vdso/ +obj-$(CONFIG_MMU) += syscalls_64.o subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o \ ../lib/memmove_64.o ../lib/memset_64.o
arch/x86/um/nommu/Makefile +1 -1
@@ -5,4 +5,4 @@ else BITS := 64 endif -obj-y = do_syscall_$(BITS).o entry_$(BITS).o os-Linux/ +obj-y = do_syscall_$(BITS).o entry_$(BITS).o syscalls_$(BITS).o os-Linux/
arch/x86/um/nommu/entry_64.S +22 -0
@@ -89,3 +89,25 @@ ENTRY(__kernel_vsyscall) jmp *%rcx END(__kernel_vsyscall) + +// void userspace(struct uml_pt_regs *regs) +ENTRY(userspace) + + /* align the stack for x86_64 ABI */ + and $-0x10, %rsp + /* Handle any immediate reschedules or signals */ + call interrupt_end + + movq current_ptregs, %rsp + + POP_REGS + + addq $8, %rsp /* skip orig_ax */ + popq %r11 /* pt_regs->ip */ + addq $8, %rsp /* skip cs */ + addq $8, %rsp /* skip flags */ + popq %rsp + + jmp *%r11 + +END(userspace)
arch/x86/um/nommu/syscalls_64.c new file +44 -0
44 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v9 06/13] x86/um: nommu: process/thread handling
Hi,
Quoted 118 lines · Hajime Tazaki
Since ptrace facility isn't used under !MMU of UML, there is different code path to invoke processes/threads; there are no external process used, and need to properly configure some of registers (fs segment register for TLS, etc) on every context switch, etc.
Signals aren't delivered in non-ptrace syscall entry/leave so, we also need to handle pending signal by ourselves.
ptrace related syscalls are not tested yet so, marked
arch_has_single_step()unsupported in !MMU environment.Signed-off-by Hajime Tazaki <[email protected]>Signed-off-by Ricardo Koller <[email protected]>---
arch/um/include/asm/ptrace-generic.h | 2 +- arch/x86/um/Makefile | 3 +- arch/x86/um/nommu/Makefile | 2 +- arch/x86/um/nommu/entry_64.S | 22 ++++++++++++++ arch/x86/um/nommu/syscalls_64.c | 44 ++++++++++++++++++++++++++++5 files changed, 70 insertions(+), 3 deletions(-)create mode 100644
arch/x86/um/nommu/syscalls_64.carch/um/include/asm/ptrace-generic.h +0
-0@@ -14,7 +14,7 @@ struct pt_regs { struct uml_pt_regs regs; };arch/um/include/asm/ptrace-generic.h +1
-1-#define arch_has_single_step () (1) +#define arch_has_single_step () (IS_ENABLED(CONFIG_MMU))
#defineEMPTY_REGS{ .regs =EMPTY_UML_PT_REGS}arch/x86/um/Makefile +0
-0@@ -27,7 +27,8 @@ subarch-y += ../kernel/sys_ia32.o
elsearch/x86/um/Makefile +2
-1-obj-y += syscalls_64.o vdso/ +obj-y += vdso/ +obj-$(CONFIG_MMU) += syscalls_64.o
subarch-y =../lib/csum-partial_64.o../lib/memcpy_64.o\
../lib/memmove_64.o../lib/memset_64.oarch/x86/um/nommu/Makefile +0
-0@@ -5,4 +5,4 @@ elseBITS := 64
endifarch/x86/um/nommu/Makefile +1
-1-obj-y = do_syscall_$(BITS).o entry_$(BITS).o os-Linux/ +obj-y = do_syscall_$(BITS).o entry_$(BITS).o syscalls_$(BITS).o os-Linux/arch/x86/um/nommu/entry_64.S +0
-0@@ -89,3 +89,25 @@ ENTRY(__kernel_vsyscall)jmp *%rcx
END(__kernel_vsyscall)arch/x86/um/nommu/entry_64.S +22
-0+ +// void userspace(struct uml_pt_regs *regs) +ENTRY(userspace) + + /* align the stack for x86_64 ABI */ + and $-0x10, %rsp + /* Handle any immediate reschedules or signals */ + call interrupt_end + + movq current_ptregs, %rsp + + POP_REGS + + addq $8, %rsp /* skip orig_ax */ + popq %r11 /* pt_regs->ip */ + addq $8, %rsp /* skip cs */ + addq $8, %rsp /* skip flags */ + popq %rsp + + jmp *%r11 + +END(userspace)arch/x86/um/nommu/syscalls_64.c new file +23
-0@@ -0,0 +1,44 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2003 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) +* Copyright 2003 PathScale, Inc. +* +* Licensed under the GPL +*/ + +#include <linux/sched.h> +#include <linux/sched/mm.h> +#include <linux/syscalls.h> +#include <linux/uaccess.h> +#include <asm/prctl.h> /* XXX This should get the constants from libc */ +#include <registers.h> +#include <os.h> +#include "syscalls.h" + +void arch_switch_to (struct task_struct *to) +{ +/* +* In !CONFIG_MMU, it doesn't ptrace thus, +* The FS_BASE/GS_BASE registers are saved here. +*/
arch/x86/um/nommu/syscalls_64.c line 33
Quoted 10 lines
arch/x86/um/nommu/syscalls_64.c new file +10
-0+ current_top_of_stack =task_top_of_stack (to); + current_ptregs = (long )task_pt_regs (to); + +if ((to->thread.regs.regs.gp[FS_BASE /sizeof (unsigned long )] ==0 ) || + (to->mm == NULL)) +return ; + +/* this changes the FS on every context switch */ +arch_prctl (to,ARCH_SET_FS , + (void __user *) to->thread.regs.regs.gp[FS_BASE / sizeof(unsigned long)]);
Hmm, the comment mentions FS_BASE/GS_BASE, but here you only handle FS_BASE? Is that intentional?
Benjamin
Quoted 11 lines
arch/x86/um/nommu/syscalls_64.c new file +11
-0+} + +SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, + unsigned long, prot, unsigned long, flags, + unsigned long, fd, unsigned long, off) +{ +if (off & ~PAGE_MASK ) +return -EINVAL ; + +return ksys_mmap_pgoff (addr, len, prot, flags, fd, off >>PAGE_SHIFT ); +}
Re: [PATCH v9 06/13] x86/um: nommu: process/thread handling
Hello,
Quoted 11 lines · Benjamin Berg
Quoted 11 lines
arch/x86/um/nommu/syscalls_64.c new file +11
-0+void arch_switch_to (struct task_struct *to) +{ +/* +* In !CONFIG_MMU, it doesn't ptrace thus, +* The FS_BASE/GS_BASE registers are saved here. +*/ + current_top_of_stack =task_top_of_stack (to); + current_ptregs = (long )task_pt_regs (to); + +if ((to->thread.regs.regs.gp[FS_BASE /sizeof (unsigned long )] ==0 ) || + (to->mm == NULL))
Quoted 8 lines
arch/x86/um/nommu/syscalls_64.c line 33
Quoted 5 lines
arch/x86/um/nommu/syscalls_64.c new file +5
-0+return ; + +/* this changes the FS on every context switch */ +arch_prctl (to,ARCH_SET_FS , + (void __user *) to->thread.regs.regs.gp[FS_BASE / sizeof(unsigned long)]);Hmm, the comment mentions FS_BASE/GS_BASE, but here you only handle
FS_BASE? Is that intentional?
thanks for the comment.
my intention is only specific to fs_base as I saw the register needs to restore during this switch while with gs_base I didn't. I can update it if I see a real issue without it.
The comment needs to be updated (I guess this is copied/pasted from the original arch_switch_to comment).
-- Hajime
PATCH v9 7/13 um: nommu: configure fs register on host syscall invocation
In reply to Hajime TazakiAs userspace on UML/!MMU also need to configure %fs register when it is running to correctly access thread structure, host syscalls implemented in os-Linux drivers may be puzzled when they are called. Thus it has to configure %fs register via arch_prctl(SET_FS) on every host syscalls.
--- arch/um/include/shared/os.h | 6 +++ arch/um/os-Linux/process.c | 6 +++ arch/um/os-Linux/start_up.c | 21 +++++++++ arch/x86/um/nommu/do_syscall_64.c | 37 ++++++++++++++++ arch/x86/um/nommu/syscalls_64.c | 71 +++++++++++++++++++++++++++++++ 5 files changed, 141 insertions(+)
arch/um/include/shared/os.h +6 -0
@@ -189,6 +189,7 @@ extern void check_host_supports_tls(int *supports_tls, int *tls_min);extern void get_host_cpu_features (void (*flags_helper_func)(char *line),void (*cache_helper_func)(char *line)); +extern int host_has_fsgsbase;/* mem.c */ extern int create_mem_file (unsigned long long len);
@@ -213,6 +214,11 @@ extern int os_protect_memory(void *addr, unsigned long len,extern int os_unmap_memory (void *addr,int len);extern int os_drop_memory (void *addr,int length);extern int can_drop_memory (void ); +extern int os_arch_prctl (int pid,int option,unsigned long *arg); +#ifndef CONFIG_MMU +extern long long host_fs; +#endif +void os_set_pdeathsig (void );
arch/um/os-Linux/process.c +6 -0
@@ -16,6 +16,7 @@#include <sys/prctl.h> #include <sys/wait.h> #include <asm/unistd.h> +#include <sys/syscall.h> /* For SYS_xxx definitions */ #include <linux/threads.h> #include <init.h> #include <longjmp.h>
@@ -178,6 +179,11 @@ int __init can_drop_memory(void)return ok; } +int os_arch_prctl (int pid,int option,unsigned long *arg2) +{ +return syscall (SYS_arch_prctl, option, arg2); +} +void init_new_thread_signals (void ) {set_handler (SIGSEGV );
arch/um/os-Linux/start_up.c +21 -0
@@ -20,6 +20,8 @@#include <sys/resource.h> #include <asm/ldt.h> #include <asm/unistd.h> +#include <sys/auxv.h> +#include <asm/hwcap2.h> #include <init.h> #include <os.h> #include <kern_util.h>
@@ -36,6 +38,8 @@#include <skas.h> #include "internal.h" +int host_has_fsgsbase; +static void ptrace_child (void ) {int ret;
@@ -459,6 +463,20 @@ __uml_setup("seccomp=", uml_seccomp_config," This is insecure and should only be used with a trusted userspace\n\n" ); +static void __init check_fsgsbase (void ) +{ +unsigned long auxv =getauxval (AT_HWCAP2 ); + +os_info ("Checking FSGSBASE instructions..." ); +if (auxv &HWCAP2_FSGSBASE ) { + host_has_fsgsbase =1 ; +os_info ("OK\n" ); + }else { + host_has_fsgsbase =0 ; +os_info ("disabled\n" ); + } +} +void __init os_early_checks (void ) {int pid;
@@ -484,6 +502,9 @@ void __init os_early_checks(void) using_seccomp =0 ;check_ptrace (); +/* probe fsgsbase instruction */ +check_fsgsbase (); + pid =start_ptraced_child ();if (init_pid_registers (pid))fatal ("Failed to initialize default registers" );
arch/x86/um/nommu/do_syscall_64.c +37 -0
@@ -2,10 +2,38 @@#include <linux/kernel.h> #include <linux/ptrace.h> +#include <asm/fsgsbase.h> +#include <asm/prctl.h> #include <kern_util.h> #include <sysdep/syscalls.h> #include <os.h> +static int os_x86_arch_prctl (int pid,int option,unsigned long *arg2) +{ +if (!host_has_fsgsbase) +return os_arch_prctl (pid, option, arg2); + +switch (option) { +case ARCH_SET_FS : +wrfsbase (*arg2); +break ; +case ARCH_SET_GS : +wrgsbase (*arg2); +break ; +case ARCH_GET_FS : + *arg2 =rdfsbase (); +break ; +case ARCH_GET_GS : + *arg2 =rdgsbase (); +break ; +default : +pr_warn ("%s: unsupported option: 0x%x" , __func__, option); +break ; + } + +return 0 ; +} + __visible void do_syscall_64(struct pt_regs *regs) {int syscall;
@@ -17,6 +45,9 @@ __visible void do_syscall_64(struct pt_regs *regs) syscall, (unsigned long )current, (unsigned long)sys_call_table[syscall]); +/* set fs register to the original host one */ +os_x86_arch_prctl (0 ,ARCH_SET_FS , (void *)host_fs); +if (likely (syscall < NR_syscalls)) {PT_REGS_SET_SYSCALL_RETURN (regs,EXECUTE_SYSCALL (syscall, regs));
@@ -34,4 +65,10 @@ __visible void do_syscall_64(struct pt_regs *regs)/* force do_signal() --> is_syscall() */ set_thread_flag (TIF_SIGPENDING );interrupt_end (); + +/* restore back fs register to userspace configured one */ +os_x86_arch_prctl (0 ,ARCH_SET_FS , + (void *)(current->thread.regs.regs.gp[FS_BASE + /sizeof (unsigned long )])); + }
arch/x86/um/nommu/syscalls_64.c +71 -0
82 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v9 07/13] um: nommu: configure fs register on host syscall invocation
Quoted 4 lines · Hajime Tazaki
As userspace on UML/!MMU also need to configure %fs register when it is running to correctly access thread structure, host syscalls implemented in os-Linux drivers may be puzzled when they are called. Thus it has to configure %fs register via
arch_prctl(SET_FS)on every host syscalls.
Really, I still think that we should "just" get rid of libc entirely inside UML. That would avoid so many weird/potential issues …
Doesn't change the fact that FS/GS needs to be restored when doing thread switches and such. Though one might be able to do it entirely within arch_switch_to then.
Benjamin
Quoted 264 lines
Signed-off-by Hajime Tazaki <[email protected]>Signed-off-by Ricardo Koller <[email protected]>---
arch/um/include/shared/os.h | 6 +++ arch/um/os-Linux/process.c | 6 +++ arch/um/os-Linux/start_up.c | 21 +++++++++arch/x86/um/nommu/do_syscall_64.c| 37 ++++++++++++++++ arch/x86/um/nommu/syscalls_64.c | 71 +++++++++++++++++++++++++++++++5 files changed, 141 insertions(+)arch/um/include/shared/os.h +0
-0@@ -189,6 +189,7 @@ extern void check_host_supports_tls(int *supports_tls, int *tls_min);extern void get_host_cpu_features(
void (*flags_helper_func)(char *line), void (*cache_helper_func)(char *line)); +extern inthost_has_fsgsbase;
/*mem.c*/
extern intcreate_mem_file(unsigned long long len);arch/um/include/shared/os.h +5
-0@@ -213,6 +214,11 @@ extern int os_protect_memory(void *addr, unsigned long len, extern int os_unmap_memory(void *addr, int len); extern int os_drop_memory(void *addr, int length); extern int can_drop_memory(void); +extern int os_arch_prctl (int pid,int option,unsigned long *arg); +#ifndef CONFIG_MMU +extern long long host_fs; +#endif +
voidos_set_pdeathsig(void);arch/um/os-Linux/process.c +1
-0@@ -16,6 +16,7 @@ #include <sys/prctl.h> #include <sys/wait.h> #include <asm/unistd.h> +#include <sys/syscall.h> /* For SYS_xxx definitions */ #include <linux/threads.h> #include <init.h> #include <longjmp.h>@@ -178,6 +179,11 @@ int __init can_drop_memory(void) return ok; }arch/um/os-Linux/process.c +5
-0+int os_arch_prctl (int pid,int option,unsigned long *arg2) +{ +return syscall (SYS_arch_prctl, option, arg2); +} +void
init_new_thread_signals(void)
{
set_handler(SIGSEGV);arch/um/os-Linux/start_up.c +2
-0@@ -20,6 +20,8 @@ #include <sys/resource.h> #include <asm/ldt.h> #include <asm/unistd.h> +#include <sys/auxv.h> +#include <asm/hwcap2.h> #include <init.h> #include <os.h> #include <kern_util.h>@@ -36,6 +38,8 @@ #include <skas.h> #include "internal.h"arch/um/os-Linux/start_up.c +2
-0+int host_has_fsgsbase; +static void
ptrace_child(void)
{
int ret;arch/um/os-Linux/start_up.c +0
-0@@ -459,6 +463,20 @@ __uml_setup("seccomp=", uml_seccomp_config," This is insecure and should only be used with a trusted userspace\n\n" );
arch/um/os-Linux/start_up.c +14
-0+static void __init check_fsgsbase (void ) +{ +unsigned long auxv =getauxval (AT_HWCAP2 ); + +os_info ("Checking FSGSBASE instructions..." ); +if (auxv &HWCAP2_FSGSBASE ) { + host_has_fsgsbase =1 ; +os_info ("OK\n" ); + }else { + host_has_fsgsbase =0 ; +os_info ("disabled\n" ); + } +} +void
__initos_early_checks(void)
{
int pid;arch/um/os-Linux/start_up.c +0
-0@@ -484,6 +502,9 @@ void __init os_early_checks(void) using_seccomp = 0; check_ptrace();arch/um/os-Linux/start_up.c +3
-0+/* probe fsgsbase instruction */ +check_fsgsbase (); +pid =
start_ptraced_child();
if (init_pid_registers(pid))
fatal("Failed to initialize default registers");arch/x86/um/nommu/do_syscall_64.c +0
-0@@ -2,10 +2,38 @@
#include <linux/kernel.h>
#include <linux/ptrace.h>arch/x86/um/nommu/do_syscall_64.c +2
-0+#include <asm/fsgsbase.h> +#include <asm/prctl.h> #include <
kern_util.h>
#include <sysdep/syscalls.h>
#include <os.h>arch/x86/um/nommu/do_syscall_64.c +26
-0+static int os_x86_arch_prctl (int pid,int option,unsigned long *arg2) +{ +if (!host_has_fsgsbase) +return os_arch_prctl (pid, option, arg2); + +switch (option) { +case ARCH_SET_FS : +wrfsbase (*arg2); +break ; +case ARCH_SET_GS : +wrgsbase (*arg2); +break ; +case ARCH_GET_FS : + *arg2 =rdfsbase (); +break ; +case ARCH_GET_GS : + *arg2 =rdgsbase (); +break ; +default : +pr_warn ("%s: unsupported option: 0x%x" , __func__, option); +break ; + } + +return 0 ; +} +__visible void
do_syscall_64(struct pt_regs *regs){
int syscall;arch/x86/um/nommu/do_syscall_64.c +0
-0@@ -17,6 +45,9 @@ __visible void do_syscall_64(struct pt_regs *regs) syscall, (unsigned long)current, (unsigned long)sys_call_table[syscall]);arch/x86/um/nommu/do_syscall_64.c +3
-0+/* set fs register to the original host one */ +os_x86_arch_prctl (0 ,ARCH_SET_FS , (void *)host_fs); +if (
likely(syscall < NR_syscalls)) {PT_REGS_SET_SYSCALL_RETURN(regs, EXECUTE_SYSCALL(syscall, regs));arch/x86/um/nommu/do_syscall_64.c +6
-0@@ -34,4 +65,10 @@ __visible void do_syscall_64(struct pt_regs *regs) /* force do_signal() --> is_syscall() */ set_thread_flag(TIF_SIGPENDING); interrupt_end(); + +/* restore back fs register to userspace configured one */ +os_x86_arch_prctl (0 ,ARCH_SET_FS , + (void *)(current->thread.regs.regs.gp[FS_BASE + / sizeof(unsigned long)])); + }arch/x86/um/nommu/syscalls_64.c +2
-0@@ -13,8 +13,70 @@ #include <asm/prctl.h> /* XXX This should get the constants from libc */ #include <registers.h> #include <os.h> +#include <asm/thread_info.h> +#include <asm/mman.h> #include "syscalls.h"arch/x86/um/nommu/syscalls_64.c +60
-0+/* +* The guest libc can change FS, which confuses the host libc. +* In fact, changing FS directly is not supported (check +* man arch_prctl). So, whenever we make a host syscall, +* we should be changing FS to the original FS (not the +* one set by the guest libc). This original FS is stored +* in host_fs. +*/ +long long host_fs =-1 ; + +long arch_prctl (struct task_struct *task,int option, +unsigned long __user *arg2) +{ +long ret = -EINVAL ; +unsigned long *ptr = arg2, tmp; + +switch (option) { +case ARCH_SET_FS : +if (host_fs ==-1 ) +os_arch_prctl (0 ,ARCH_GET_FS , (void *)&host_fs); + ret =0 ; +break ; +case ARCH_SET_GS : + ret =0 ; +break ; +case ARCH_GET_FS : +case ARCH_GET_GS : + ptr = &tmp; +break ; + } + + ret =os_arch_prctl (0 , option, ptr); +if (ret) +return ret; + +switch (option) { +case ARCH_SET_FS : + current->thread.regs.regs.gp[FS_BASE /sizeof (unsigned long )] = + (unsigned long ) arg2; +break ; +case ARCH_SET_GS : + current->thread.regs.regs.gp[GS_BASE /sizeof (unsigned long )] = + (unsigned long ) arg2; +break ; +case ARCH_GET_FS : + ret =put_user (current->thread.regs.regs.gp[FS_BASE /sizeof (unsigned long )], arg2); +break ; +case ARCH_GET_GS : + ret =put_user (current->thread.regs.regs.gp[GS_BASE /sizeof (unsigned long )], arg2); +break ; + } + +return ret; +} + +SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2) +{ +return arch_prctl (current, option, (unsigned long __user *) arg2); +} +void
arch_switch_to(struct task_struct *to)
{
/*arch/x86/um/nommu/syscalls_64.c +0
-0@@ -42,3 +104,12 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
returnksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT); }arch/x86/um/nommu/syscalls_64.c +9
-0+ +static int __init um_nommu_setup_hostfs (void ) +{ +/* initialize the host_fs value at boottime */ +os_arch_prctl (0 ,ARCH_GET_FS , (void *)&host_fs); + +return 0 ; +} +arch_initcall (um_nommu_setup_hostfs);
Re: [PATCH v9 07/13] um: nommu: configure fs register on host syscall invocation
Quoted 9 lines · Benjamin Berg
Quoted 4 lines · Hajime Tazaki
As userspace on UML/!MMU also need to configure %fs register when it is running to correctly access thread structure, host syscalls implemented in os-Linux drivers may be puzzled when they are called. Thus it has to configure %fs register via
arch_prctl(SET_FS)on every host syscalls.Really, I still think that we should "just" get rid of libc entirely inside UML. That would avoid so many weird/potential issues …
I'm not sure if I understand your point.
Q1) what do you mean by 'get rid of libc entirely' here ?
do you mean the following code block adds the dependency ?
+ int os_arch_prctl(int pid, int option, unsigned long *arg2)
+ {
+ return syscall(SYS_arch_prctl, option, arg2);
+ }
I guess this can be replaced with inline assembly instead of using libc's one. but this is the code under os-Linux, which I thought we're allowed to use the host code ?
Q2) "That would avoid so many weird/potential issues …" I'm new to this; I'm wondering what kind of issues did you see ?
Quoted 3 lines
Doesn't change the fact that FS/GS needs to be restored when doing thread switches and such. Though one might be able to do it entirely within
arch_switch_tothen.
I believe this is already done in arch_switch_to. This particular patch does the control to the host context.
-- Hajime
Re: [PATCH v9 07/13] um: nommu: configure fs register on host syscall invocation
Quoted 27 lines · Hajime Tazaki
Quoted 11 lines · Benjamin Berg
Quoted 8 lines · Hajime Tazaki
As userspace on UML/!MMU also need to configure %fs register when it is
running to correctly access thread structure, host syscalls implemented
in os-Linux drivers may be puzzled when they are called. Thus it has to
configure %fs register viaarch_prctl(SET_FS)on every host syscalls.Quoted 3 lines
Really, I still think that we should "just" get rid of libc entirely
inside UML. That would avoid so many weird/potential issues …I'm not sure if I understand your point.
Q1) what do you mean by 'get rid of libc entirely' here ? do you mean the following code block adds the dependency ?
+ intos_arch_prctl(int pid, int option, unsigned long *arg2)
+ {
+ returnsyscall(SYS_arch_prctl, option, arg2);
+ }
Quoted 7 lines
I guess this can be replaced with inline assembly instead of using libc's one. but this is the code under os-Linux, which I thought we're
allowed to use the host code ?Q2) "That would avoid so many weird/potential issues …" I'm new to this; I'm wondering what kind of issues did you see ?
Oh, I am just being annoyed by libc in general in UM. It isn't specific to this patchset.
An example is that we need to keep malloc() working for libc. Which I would think is kind of weird. Or we had issues because libc turned on rseq and that was inherited into userspace, causing random crashes and such.
Quoted 7 lines
Quoted 4 lines
Doesn't change the fact that FS/GS needs to be restored when doing thread switches and such. Though one might be able to do it entirely
withinarch_switch_tothen.I believe this is already done in arch_switch_to. This particular patch does the control to the host context.
OK, need to look at that again a bit. I haven't really wrapped my mind around how everything fits together, so I probably got some stuff wrong.
Benjamin
Re: [PATCH v9 07/13] um: nommu: configure fs register on host syscall invocation
Quoted 37 lines · Benjamin Berg
Quoted 27 lines · Hajime Tazaki
Quoted 11 lines · Benjamin Berg
Quoted 8 lines · Hajime Tazaki
As userspace on UML/!MMU also need to configure %fs register when it is
running to correctly access thread structure, host syscalls implemented
in os-Linux drivers may be puzzled when they are called. Thus it has to
configure %fs register viaarch_prctl(SET_FS)on every host syscalls.Quoted 3 lines
Really, I still think that we should "just" get rid of libc entirely
inside UML. That would avoid so many weird/potential issues …I'm not sure if I understand your point.
Q1) what do you mean by 'get rid of libc entirely' here ? do you mean the following code block adds the dependency ?
+ intos_arch_prctl(int pid, int option, unsigned long *arg2)
+ {
+ returnsyscall(SYS_arch_prctl, option, arg2);
+ }Quoted 7 lines
I guess this can be replaced with inline assembly instead of using libc's one. but this is the code under os-Linux, which I thought we're
allowed to use the host code ?Q2) "That would avoid so many weird/potential issues …" I'm new to this; I'm wondering what kind of issues did you see ?
Quoted 7 lines
Oh, I am just being annoyed by libc in general in UM. It isn't specific to this patchset.
An example is that we need to keep
malloc()working for libc. Which I would think is kind of weird. Or we had issues because libc turned on rseq and that was inherited into userspace, causing random crashes and such.
I understand, thanks for the input.
Quoted 11 lines
Quoted 7 lines
Quoted 4 lines
Doesn't change the fact that FS/GS needs to be restored when doing thread switches and such. Though one might be able to do it entirely
withinarch_switch_tothen.I believe this is already done in arch_switch_to. This particular patch does the control to the host context.
OK, need to look at that again a bit. I haven't really wrapped my mind around how everything fits together, so I probably got some stuff wrong.
anyway, thanks for your time to look at this.
-- Hajime
PATCH v9 8/13 x86/um/vdso: nommu: vdso memory update
In reply to Hajime TazakiOn !MMU mode, the address of vdso is accessible from userspace. This commit implements the entry point by pointing a block of page address.
This commit also add memory permission configuration of vdso page to be executable.
--- arch/x86/um/vdso/vma.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
arch/x86/um/vdso/vma.c +15 -2
@@ -9,6 +9,7 @@#include <asm/page.h> #include <asm/elf.h> #include <linux/init.h> +#include <os.h> static unsigned int __read_mostly vdso_enabled =1 ;unsigned long um_vdso_addr;
@@ -21,14 +22,24 @@ static int __init init_vdso(void) {BUG_ON (vdso_end - vdso_start >PAGE_SIZE ); - um_vdso_addr = task_size -PAGE_SIZE ; - um_vdso =alloc_page (GFP_KERNEL );if (!um_vdso) goto oom;copy_page (page_address (um_vdso), vdso_start); +#ifdef CONFIG_MMU + um_vdso_addr = task_size -PAGE_SIZE ; +#else +/* this is fine with NOMMU as everything is accessible */ + um_vdso_addr = (unsigned long )page_address (um_vdso); +os_protect_memory ((void *)um_vdso_addr, vdso_end - vdso_start,1 ,0 ,1 ); +#endif + +pr_info ("vdso_start=%lx um_vdso_addr=%lx pg_um_vdso=%lx" , + (unsigned long )vdso_start, um_vdso_addr, + (unsigned long )page_address (um_vdso)); +return 0 ; oom:
@@ -39,6 +50,7 @@ static int __init init_vdso(void) }subsys_initcall (init_vdso); +#ifdef CONFIG_MMU int arch_setup_additional_pages (struct linux_binprm *bprm,int uses_interp) {struct vm_area_struct *vma;
@@ -63,3 +75,4 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp) return IS_ERR(vma) ? PTR_ERR(vma) : 0; } +#endif
Signature · 1 line
2.43.0
PATCH v9 9/13 x86/um: nommu: signal handling
In reply to Hajime TazakiThis commit updates the behavior of signal handling under !MMU environment. It adds the alignment code for signal frame as the frame is used in userspace as-is.
floating point register is carefully handling upon entry/leave of syscall routine so that signal handlers can read/write the contents of the register.
It also adds the follow up routine for SIGSEGV as a signal delivery runs in the same stack frame while we have to avoid endless SIGSEGV.
--- arch/um/include/shared/kern_util.h | 4 + arch/um/nommu/Makefile | 2 +- arch/um/nommu/os-Linux/signal.c | 13 ++ arch/um/nommu/trap.c | 194 ++++++++++++++++++++++++++ arch/x86/um/nommu/do_syscall_64.c | 6 + arch/x86/um/nommu/os-Linux/mcontext.c | 11 ++ arch/x86/um/shared/sysdep/mcontext.h | 1 + arch/x86/um/shared/sysdep/ptrace.h | 2 +- 8 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 arch/um/nommu/trap.c
arch/um/include/shared/kern_util.h +4 -0
@@ -73,4 +73,8 @@ void um_idle_sleep(void);void kasan_map_memory (void *start,size_t len); +#ifndef CONFIG_MMU +extern void arch_sigsegv_handler (int sig,struct siginfo *si,void *mc); +#endif +#endif
arch/um/nommu/Makefile +1 -1
@@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y := os-Linux/ +obj-y := trap.o os-Linux/
arch/um/nommu/os-Linux/signal.c +13 -0
@@ -5,6 +5,7 @@#include <os.h> #include <sysdep/mcontext.h> #include <sys/ucontext.h> +#include <as-layout.h> void sigsys_handler (int sig,struct siginfo *si,struct uml_pt_regs *regs,void *ptr)
@@ -14,3 +15,15 @@ void sigsys_handler(int sig, struct siginfo *si,/* hook syscall via SIGSYS */ set_mc_sigsys_hook (mc); } + +void arch_sigsegv_handler (int sig,struct siginfo *si,void *ptr) +{ +mcontext_t *mc = (mcontext_t *) ptr; + +/* !MMU specific part; detection of userspace */ +if (mc->gregs[REG_RIP ] > uml_reserved && + mc->gregs[REG_RIP ] < high_physmem) { +/* !MMU: force handle signals after rt_sigreturn() */ +set_mc_userspace_relay_signal (mc); + } +}
arch/um/nommu/trap.c new file +194 -0
194 lines not on this page · raw message
arch/x86/um/nommu/do_syscall_64.c +6 -0
@@ -48,6 +48,9 @@ __visible void do_syscall_64(struct pt_regs *regs)/* set fs register to the original host one */ os_x86_arch_prctl (0 ,ARCH_SET_FS , (void *)host_fs); +/* save fp registers */ + asmvolatile ("fxsaveq %0" :"=m" (*(struct _xstate *)regs->regs.fp)); +if (likely (syscall < NR_syscalls)) {PT_REGS_SET_SYSCALL_RETURN (regs,EXECUTE_SYSCALL (syscall, regs));
@@ -66,6 +69,9 @@ __visible void do_syscall_64(struct pt_regs *regs)set_thread_flag (TIF_SIGPENDING );interrupt_end (); +/* restore fp registers */ + asmvolatile ("fxrstorq %0" : :"m" ((current->thread.regs.regs.fp))); +/* restore back fs register to userspace configured one */ os_x86_arch_prctl(0, ARCH_SET_FS, (void *)(current->thread.regs.regs.gp[FS_BASE
arch/x86/um/nommu/os-Linux/mcontext.c +11 -0
@@ -6,6 +6,17 @@#include <sysdep/mcontext.h> #include <sysdep/syscalls.h> +static void __userspace_relay_signal (void ) +{ +/* XXX: dummy syscall */ + __asm__volatile ("call *%0" : :"r" (__kernel_vsyscall),"a" (39 ) :); +} + +void set_mc_userspace_relay_signal (mcontext_t *mc) +{ + mc->gregs[REG_RIP ] = (unsigned long ) __userspace_relay_signal; +} +void set_mc_sigsys_hook (mcontext_t *mc) { mc->gregs[REG_RCX ] = mc->gregs[REG_RIP ];
arch/x86/um/shared/sysdep/mcontext.h +1 -0
@@ -19,6 +19,7 @@ extern int set_stub_state(struct uml_pt_regs *regs, struct stub_data *data,#ifndef CONFIG_MMU extern void set_mc_sigsys_hook (mcontext_t *mc); +extern void set_mc_userspace_relay_signal (mcontext_t *mc);#endif #ifdef __i386__
arch/x86/um/shared/sysdep/ptrace.h +1 -1
@@ -65,7 +65,7 @@ struct uml_pt_regs {int is_user;/* Dynamically sized FP registers (holds an XSTATE) */ -unsigned long fp[]; + unsigned long fp[] __attribute__((aligned(16))); };#define EMPTY_UML_PT_REGS { }
Signature · 1 line
2.43.0
PATCH v9 10/13 um: nommu: a work around for MMU dependency to PCI driver
In reply to Hajime TazakiThe commit 8fe743b5eba0 ("PCI: Add CONFIG_MMU dependency") restricts the PCI base driver to depend on MMU. While nommu UML _can_ implement PCI drivers over PCI devices (e.g., virtio-pci), the current nommu UML doesn't implement it.
But without PCI drivers kunit complains as config for kunit (arch_uml.config) defines the dependency to PCI drivers.
This commit fixes the issue of this compile failures when building PCI drivers with nommu UML. In particular, the fix is to undefine the constant PCI_IOBASE to be able to bypass pci_unmap_iospace() call.
When we will support PCI drivers for nommu UML, we will refactor this code.
--- arch/um/include/asm/dma.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/um/include/asm/dma.h +13 -0
@@ -4,6 +4,19 @@#include <asm/io.h> +/** +* now the PCI core driver depends on CONFIG_MMU in linus tree, nommu +* UML cannot build with PCI but without PCI kunit doesn't build due +* to the dependency to the CONFIG_VIRTIO_UML. +* +* This is a workaround to silence build failures on kunit, which is +* valid until nommu UML supports PCI drivers (e.g., virtio-pci) in a +* future. +*/ +#ifndef CONFIG_MMU +#undef PCI_IOBASE +#endif +extern unsigned long uml_physmem;#define MAX_DMA_ADDRESS (uml_physmem)
Signature · 1 line
2.43.0
PATCH v9 11/13 um: change machine name for uname output
In reply to Hajime TazakiThis commit tries to display MMU/!MMU mode from the output of uname(2) so that users can distinguish which mode of UML is running right now.
--- arch/um/Makefile | 6 ++++++ arch/um/os-Linux/util.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)
arch/um/Makefile +6 -0
@@ -153,6 +153,12 @@ export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) $(CC_FLAGS_ CLEAN_FILES += linux x.i gmon.out MRPROPER_FILES += $(HOST_DIR)/include/generated +ifeq ($(CONFIG_MMU),y) +UTS_MACHINE := "um" +else +UTS_MACHINE := "um\(nommu\)" +endif + archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f
arch/um/os-Linux/util.c +2 -1
@@ -65,7 +65,8 @@ void setup_machinename(char *machine_out) }# endif #endif -strcpy (machine_out, host.machine); +strcat (machine_out,"/" ); +strcat (machine_out, host.machine); }void setup_hostinfo (char *buf,int len)
Signature · 1 line
2.43.0
PATCH v9 12/13 um: nommu: add documentation of nommu UML
In reply to Hajime TazakiThis commit adds an initial documentation for !MMU mode of UML.
--- Documentation/virt/uml/nommu-uml.rst | 180 +++++++++++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 181 insertions(+) create mode 100644 Documentation/virt/uml/nommu-uml.rst
Documentation/virt/uml/nommu-uml.rst new file +180 -0
@@ -0,0 +1,180 @@ +.. SPDX-License-Identifier: GPL-2.0 + +UML has been built with CONFIG_MMU since day 0. The patchset +introduces the nommu mode on UML in a different angle from what Linux +Kernel Library tried. + +.. contents:: :local: + +What is it for ? +================ + +- Alleviate syscall hook overhead implemented with ptrace(2) +- To exercises nommu code over UML (and over KUnit) +- Less dependency to host facilities + + +How it works ? +============== + +To illustrate how this feature works, the below shows how syscalls are +called under nommu/UML environment. + +- boot kernel, install seccomp filter if ``syscall`` instructions are + called from userspace memory based on the address of instruction + pointer +- (userspace starts) +- calls ``vfork``/``execve`` syscalls +- ``SIGSYS`` signal raised, handler calls syscall entry point ``__kernel_vsyscall`` +- call handler function in ``sys_call_table[]`` and follow how UML syscall + works. +- return to userspace + + +What are the differences from MMU-full UML ? +============================================ + +The current nommu implementation adds 3 different functions which +MMU-full UML doesn't have: + +- kernel address space can directly be accessible from userspace + - so, ``uaccess()`` always returns 1 + - generic implementation of memcpy/strcpy/futex is also used +- alternate syscall entrypoint without ptrace +- alternate syscall hook + - hook syscall by seccomp filter + +With those modifications, it allows us to use unmodified userspace +binaries with nommu UML. + + +History +======= + +This feature was originally introduced by Ricardo Koller at Open +Source Summit NA 2020, then integrated with the syscall translation +functionality with the clean up to the original code. + +Building and run +================ + +:: + + make ARCH=um x86_64_nommu_defconfig + make ARCH=um + +will build UML with ``CONFIG_MMU=n`` applied. + +Kunit tests can run with the following command:: + + ./tools/testing/kunit/kunit.py run --kconfig_add CONFIG_MMU=n + +To run a typical Linux distribution, we need nommu-aware userspace. +We can use a stock version of Alpine Linux with nommu-built version of +busybox and musl-libc. + + +Preparing root filesystem +========================= + +nommu UML requires to use a specific standard library which is aware +of nommu kernel. We have tested custom-build musl-libc and busybox, +both of which have built-in support for nommu kernels. + +There are no available Linux distributions for nommu under x86_64 +architecture, so we need to prepare our own image for the root +filesystem. We use Alpine Linux as a base distribution and replace +busybox and musl-libc on top of that. The following are the step to +prepare the filesystem for the quick start:: + + container_id=$(docker create ghcr.io/thehajime/alpine:3.20.3-um-nommu) + docker start $container_id + docker wait $container_id + docker export $container_id > alpine.tar + docker rm $container_id + + mnt=$(mktemp -d) + dd if=/dev/zero of=alpine.ext4 bs=1 count=0 seek=1G + sudo chmod og+wr "alpine.ext4" + yes 2>/dev/null | mkfs.ext4 "alpine.ext4" || true + sudo mount "alpine.ext4" $mnt + sudo tar -xf alpine.tar -C $mnt + sudo umount $mnt + +This will create a file image, ``alpine.ext4``, which contains busybox +and musl with nommu build on the Alpine Linux root filesystem. The +file can be specified to the argument ``ubd0=`` to the UML command line:: + + ./vmlinux ubd0=./alpine.ext4 rw mem=1024m loglevel=8 init=/sbin/init + +We plan to upstream apk packages for busybox and musl so that we can +follow the proper procedure to set up the root filesystem. + + +Quick start with docker +======================= + +There is a docker image that you can quickly start with a simple step:: + + docker run -it -v /dev/shm:/dev/shm --rm ghcr.io/thehajime/alpine:3.20.3-um-nommu + +This will launch a UML instance with an pre-configured root filesystem. + +Benchmark +========= + +The below shows an example of performance measurement conducted with +lmbench and (self-crafted) getpid benchmark (with v6.15-rc0 uml/next +tree). + +.. csv-table:: lmbench (usec) + :header: ,native,um,um-mmu(s),um-nommu(s) + + select-10 ,0.5224,28.3882,27.2839,3.0046 + select-100 ,1.5641,30.3775,28.8091,3.8546 + select-1000 ,11.6922,38.2021,32.5367,12.2568 + syscall ,0.1635,27.8278,24.8049,2.6957 + read ,0.3063,29.0073,23.5953,2.8127 + write ,0.2531,29.6342,26.3339,2.7932 + stat ,1.8827,41.2546,34.6495,3.3199 + open/close ,3.2548,67.5806,62.4781,6.4189 + fork+sh ,1108.8000,5618.0000,3604.6667,456.0476 + fork+execve ,519.1579,2242.8000,1425.7500,138.1316 + +.. csv-table:: do_getpid bench (nsec) + :header: ,native,um,um-mmu(s),um-nommu(s) + + getpid , 162 , 27049 , 24444 , 2696 + +(um-nommu(s) is with seccomp syscall hook, um-mmu(s) is SECCOMP mode, +respectively) + +Limitations +=========== + +generic nommu limitations +------------------------- +Since this port is a kernel of nommu architecture so, the +implementation inherits the characteristics of other nommu kernels +(riscv, arm, etc), described below. + +- vfork(2) should be used instead of fork(2) +- ELF loader only loads PIE (position independent executable) binaries +- processes share the address space among others +- mmap(2) offers a subset of functionalities (e.g., unsupported + MMAP_FIXED) + +Thus, we have limited options to userspace programs. We have tested +Alpine Linux with musl-libc, which has a support nommu kernel. + +supported architecture +---------------------- +The current implementation of nommu UML only works on x86_64 SUBARCH. +We have not tested with 32-bit environment. + + +Further readings about NOMMU UML +================================ + +- NOMMU UML (original code by Ricardo Koller) + - https://static.sched.com/hosted_files/ossna2020/ec/kollerr_linux_um_nommu.pdf
MAINTAINERS +1 -0
@@ -25753,6 +25753,7 @@ USER-MODE LINUX (UML) M: Richard Weinberger <[email protected]> M: Anton Ivanov <[email protected]> M: Johannes Berg <[email protected]> +M: Hajime Tazaki <[email protected]> L: [email protected] S: Maintained W: http://user-mode-linux.sourceforge.net
Signature · 1 line
2.43.0
PATCH v9 13/13 um: nommu: plug nommu code into build system
In reply to Hajime TazakiAdd nommu kernel for um build. defconfig is also provided.
--- arch/um/Kconfig | 14 ++++++- arch/um/configs/x86_64_nommu_defconfig | 54 ++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 arch/um/configs/x86_64_nommu_defconfig
arch/um/Kconfig +12 -2
@@ -31,14 +31,17 @@ config UML select ARCH_SUPPORTS_LTO_CLANG_THIN select TRACE_IRQFLAGS_SUPPORT select TTY # Needed for line.c - select HAVE_ARCH_VMAP_STACK + select HAVE_ARCH_VMAP_STACK if MMU select HAVE_RUST select ARCH_HAS_UBSAN select HAVE_ARCH_TRACEHOOK select THREAD_INFO_IN_TASK + select UACCESS_MEMCPY if !MMU + select GENERIC_STRNLEN_USER if !MMU + select GENERIC_STRNCPY_FROM_USER if !MMU config MMU - bool + bool "MMU-based Paged Memory Management Support" if 64BIT default y config UML_DMA_EMULATION
@@ -185,8 +188,15 @@ config MAGIC_SYSRQ The keys are documented in <file:Documentation/admin-guide/sysrq.rst>. Don't say Y unless you really know what this hack does. +config ARCH_FORCE_MAX_ORDER + int "Order of maximal physically contiguous allocations" if EXPERT + default "10" if MMU + default "16" if !MMU + config KERNEL_STACK_ORDER int "Kernel stack size order" + default 3 if !MMU + range 3 10 if !MMU default 2 if 64BIT range 2 10 if 64BIT default 1 if !64BIT
arch/um/configs/x86_64_nommu_defconfig new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.43.0