nommu UML
Subsystems (7)
v11 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
v11:
- clean up userspace return routine and integrate to userspace() ([04/13])
- fix direction flag issue on using nolibc memcpy ([04/13])
- fix a crash issue when using usermode helper ([06/13])
- test with out-of-tree kunit-uapi patches (which uses umh)
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/
v10:
- fix wrong comment on gs register handling ([09/13])
- remove unnecessary code of early syscall implementation ([04/13])
- https://lore.kernel.org/all/[email protected]/
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])
- https://lore.kernel.org/all/[email protected]/
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 | 25 --- arch/um/kernel/um_arch.c | 3 + arch/um/nommu/Makefile | 3 + arch/um/nommu/os-Linux/Makefile | 7 + arch/um/nommu/os-Linux/seccomp.c | 87 +++++++++++ arch/um/nommu/os-Linux/signal.c | 24 +++ arch/um/nommu/trap.c | 201 +++++++++++++++++++++++++ arch/um/os-Linux/Makefile | 3 +- arch/um/os-Linux/mem.c | 4 + arch/um/os-Linux/process.c | 138 ++++++++++++++++- arch/um/os-Linux/signal.c | 11 +- arch/um/os-Linux/skas/process.c | 126 ---------------- 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/asm/syscall.h | 6 + arch/x86/um/nommu/Makefile | 8 + arch/x86/um/nommu/do_syscall_64.c | 75 +++++++++ arch/x86/um/nommu/entry_64.S | 114 ++++++++++++++ arch/x86/um/nommu/os-Linux/Makefile | 6 + arch/x86/um/nommu/os-Linux/mcontext.c | 26 ++++ arch/x86/um/nommu/syscalls.h | 18 +++ arch/x86/um/nommu/syscalls_64.c | 121 +++++++++++++++ arch/x86/um/shared/sysdep/mcontext.h | 5 + arch/x86/um/shared/sysdep/ptrace.h | 2 +- arch/x86/um/vdso/vma.c | 17 ++- fs/Kconfig.binfmt | 2 +- 45 files changed, 1312 insertions(+), 209 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/seccomp.c create mode 100644 arch/um/nommu/os-Linux/signal.c create mode 100644 arch/um/nommu/trap.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: e66ae377fe219c98d3d5b8a0d35da4413a5390ca
Signature · 1 line
2.43.0
PATCH RESEND v11 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 RESEND v11 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 | 25 ------- arch/um/os-Linux/Makefile | 3 +- arch/um/os-Linux/process.c | 128 ++++++++++++++++++++++++++++++++ arch/um/os-Linux/skas/process.c | 126 ------------------------------- 8 files changed, 213 insertions(+), 189 deletions(-) create mode 100644 arch/um/kernel/mem-pgtable.c
arch/um/kernel/Makefile +3 -2
@@ -16,9 +16,10 @@ always-$(KBUILD_BUILTIN) := 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);
@@ -299,3 +302,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 -25
@@ -16,31 +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 ; -} - -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/process.c +128 -0
147 lines not on this page · raw message
arch/um/os-Linux/skas/process.c +0 -126
157 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH RESEND v11 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
@@ -18,11 +18,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
@@ -98,8 +98,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 RESEND v11 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/asm/syscall.h | 6 ++ arch/x86/um/nommu/Makefile | 8 +++ arch/x86/um/nommu/do_syscall_64.c | 32 +++++++++ arch/x86/um/nommu/entry_64.S | 112 ++++++++++++++++++++++++++++++ arch/x86/um/nommu/syscalls.h | 16 +++++ 6 files changed, 178 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/asm/syscall.h +6 -0
@@ -20,4 +20,10 @@ static inline int syscall_get_arch(struct task_struct *task) #endif } +#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 /* __UM_ASM_SYSCALL_H */
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 +32 -0
@@ -0,0 +1,32 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include <linux/kernel.h> +#include <linux/ptrace.h> +#include <kern_util.h> +#include <asm/syscall.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; + +if (likely (syscall < NR_syscalls)) { +unsigned long ret; + + ret = (*sys_call_table[syscall])(UPT_SYSCALL_ARG1 (®s->regs), +UPT_SYSCALL_ARG2 (®s->regs), +UPT_SYSCALL_ARG3 (®s->regs), +UPT_SYSCALL_ARG4 (®s->regs), +UPT_SYSCALL_ARG5 (®s->regs), +UPT_SYSCALL_ARG6 (®s->regs)); +PT_REGS_SET_SYSCALL_RETURN (regs, ret); + } + +PT_REGS_SYSCALL_RET (regs) = regs->regs.gp[HOST_AX ]; + +/* handle tasks and signals at the end */ +interrupt_end (); +}
arch/x86/um/nommu/entry_64.S new file +112 -0
112 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
Signature · 1 line
2.43.0
PATCH RESEND v11 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/seccomp.c | 87 +++++++++++++++++++++++++++ arch/um/nommu/os-Linux/signal.c | 16 +++++ 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 | 15 +++++ arch/x86/um/shared/sysdep/mcontext.h | 4 ++ 13 files changed, 164 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/seccomp.c create mode 100644 arch/um/nommu/os-Linux/signal.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
@@ -426,6 +426,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 := seccomp.o 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/seccomp.c new file +87 -0
87 lines not on this page · raw message
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/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 +15 -0
@@ -0,0 +1,15 @@ +// 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> + +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); + +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 RESEND v11 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 | 2 ++ arch/x86/um/nommu/syscalls.h | 2 ++ arch/x86/um/nommu/syscalls_64.c | 50 ++++++++++++++++++++++++++++ 6 files changed, 58 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 +2 -0
@@ -86,6 +86,8 @@ END(__kernel_vsyscall) */ ENTRY(userspace) + /* set stack and pt_regs to the current task */ + call arch_set_stack_to_current /* clear direction flag to meet ABI */ cld /* align the stack for x86_64 ABI */
arch/x86/um/nommu/syscalls.h +2 -0
@@ -13,4 +13,6 @@extern long current_top_of_stack;extern long current_ptregs; +void arch_set_stack_to_current (void ); +#endif
arch/x86/um/nommu/syscalls_64.c new file +50 -0
50 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH RESEND v11 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>
@@ -177,6 +178,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 <asm/syscall.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;
@@ -13,6 +41,9 @@ __visible void do_syscall_64(struct pt_regs *regs) syscall =PT_SYSCALL_NR (regs->regs.gp);UPT_SYSCALL_NR (®s->regs) = 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)) {unsigned long ret;
@@ -29,4 +60,10 @@ __visible void do_syscall_64(struct pt_regs *regs)/* handle tasks and signals at the end */ 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
PATCH RESEND v11 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 RESEND v11 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 | 8 + arch/um/nommu/trap.c | 201 ++++++++++++++++++++++++++ arch/um/os-Linux/signal.c | 3 +- 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 +- 9 files changed, 235 insertions(+), 3 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 nommu_relay_signal (void *ptr); +#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 +8 -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,10 @@ void sigsys_handler(int sig, struct siginfo *si,/* hook syscall via SIGSYS */ set_mc_sigsys_hook (mc); } + +void nommu_relay_signal (void *ptr) +{ +mcontext_t *mc = (mcontext_t *) ptr; + +set_mc_relay_signal (mc); +}
arch/um/nommu/trap.c new file +201 -0
201 lines not on this page · raw message
arch/um/os-Linux/signal.c +2 -1
@@ -40,9 +40,10 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)int save_errno = errno; r.is_user =0 ; +if (mc) +get_regs_from_mc (&r, mc);if (sig ==SIGSEGV ) {/* For segfaults, we want the data from the sigcontext. */ -get_regs_from_mc (&r, mc);GET_FAULTINFO_FROM_MC (r.faultinfo, mc); }
arch/x86/um/nommu/do_syscall_64.c +6 -0
@@ -44,6 +44,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)) {unsigned long ret;
@@ -61,6 +64,9 @@ __visible void do_syscall_64(struct pt_regs *regs)/* handle tasks and signals at the end */ 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
@@ -4,10 +4,21 @@#include <asm/ptrace.h> #include <sysdep/ptrace.h> #include <sysdep/mcontext.h> +#include <os.h> +#include "../syscalls.h" 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); +void set_mc_relay_signal (mcontext_t *mc) +{ +/* configure stack and userspace returning routine as +* instruction pointer +*/ + mc->gregs[REG_RSP ] = (unsigned long ) current_top_of_stack; + mc->gregs[REG_RIP ] = (unsigned long ) userspace; +} +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_relay_signal (mcontext_t *mc);#endif #ifdef __i386__
arch/x86/um/shared/sysdep/ptrace.h +1 -1
@@ -53,7 +53,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 RESEND v11 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
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 11 lines · Hajime Tazaki
The commit
8fe743b5eba0("PCI: AddCONFIG_MMUdependency") 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_IOBASEto be able to bypasspci_unmap_iospace()call.
This doesn't make a lot of sense to me. Why would we even want to build PCI on NOMMU-UML if PCI in general is dependent on MMU now?
It's not like ARCH=um with PCI and NOMMU has any value even for testing if such a configuration cannot exist in reality?
johannes
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 14 lines · Johannes Berg
Quoted 11 lines · Hajime Tazaki
The commit
8fe743b5eba0("PCI: AddCONFIG_MMUdependency") 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_IOBASEto be able to bypasspci_unmap_iospace()call.
Quoted 5 lines
This doesn't make a lot of sense to me. Why would we even want to build PCI on NOMMU-UML if PCI in general is dependent on MMU now?
It's not like ARCH=um with PCI and NOMMU has any value even for testing if such a configuration cannot exist in reality?
totally understand your point.
now I see that we don't have to have this work around by using --kconfig_add option to kunit.py.
# like --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n (in addition to --kconfig_add CONFIG_MMU=n).
so I'll drop this patch in the next version.
thanks,
-- Hajime
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 6 lines · Hajime Tazaki
Quoted 5 lines
This doesn't make a lot of sense to me. Why would we even want to build PCI on NOMMU-UML if PCI in general is dependent on MMU now?
It's not like ARCH=um with PCI and NOMMU has any value even for testing if such a configuration cannot exist in reality?
Quoted 7 lines
totally understand your point.
now I see that we don't have to have this work around by using --kconfig_add option to
kunit.py.# like --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n (in addition to --kconfig_add CONFIG_MMU=n).
That's not what I mean. I think it should be made impossible to build the broken code.
The problem is probably UML_PCI_OVER_VIRTIO selecting UML_PCI selecting various PCI code, but nothing depends on PCI in the first place. Which it should, then?
johannes
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 10 lines · Johannes Berg
Quoted 8 lines · Hajime Tazaki
Quoted 5 lines
This doesn't make a lot of sense to me. Why would we even want to build PCI on NOMMU-UML if PCI in general is dependent on MMU now?
It's not like ARCH=um with PCI and NOMMU has any value even for testing if such a configuration cannot exist in reality?
totally understand your point.
Quoted 8 lines
Quoted 5 lines
now I see that we don't have to have this work around by using --kconfig_add option to
kunit.py.# like --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n (in addition to --kconfig_add CONFIG_MMU=n).That's not what I mean. I think it should be made impossible to build the broken code.
okay.
# I think now I lost the point...
currently, drivers/pci/Kconfig (CONFIG_PCI) marks as depends on MMU, so we cannot select it when CONFIG_MMU=n.
but it's different with kunit when using them via kunit.py config,
it first adds
CONFIG_VIRTIO_UML=y
CONFIG_UML_PCI_OVER_VIRTIO=y
via tools/testing/kunit/configs/arch_uml.config, and then add
CONIFG_MMU=n
via --kconfig_add CONFIG_MMU=n.
and then execute make ARCH=um olddefconfig, which in turn enables CONFIG_UML_PCI_OVER_VIRTIO.
if we append "--kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n" to kunit.py, it will overwrite the arch_uml.config.
# I don't know how kunit handles those appended CONFIG entries, though..
my goal is simple; to test !MMU code via kunit.
my original patch or the additional kconfig argument (--kconfig_add) satisfies this goal.
Quoted 3 lines
The problem is probably
UML_PCI_OVER_VIRTIOselectingUML_PCIselecting various PCI code, but nothing depends on PCI in the first place. Which it should, then?
I don't understand the 'nothing depends on PCI...' part. care to elaborate ?
thanks,
-- Hajime
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 1 line · Hajime Tazaki
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU,
Right.
Quoted 1 line
so we cannot select it when
CONFIG_MMU=n.
Actually, I believe that's not true, I think it *can* select something even if you override the 'depends on' it has, it just causes a warning in Kconfig.
But I don't think PCI is even selected, UML_PCI is selected, and then that selects PCI_MSI which should really only be reachable when PCI is enabled, so this perhaps does nothing? Not sure ...
Quoted 1 line
but it's different with kunit when using them via
kunit.pyconfig,
It really isn't, you just don't see everything because kunit.py hides the build from you.
Quoted 10 lines
it first adds
CONFIG_VIRTIO_UML=y
CONFIG_UML_PCI_OVER_VIRTIO=yvia
tools/testing/kunit/configs/arch_uml.config, and then addCONIFG_MMU=n
via --kconfig_add
CONFIG_MMU=n.
Sure. But that should disable CONFIG_UML_PCI_OVER_VIRTIO, and it doesn't now.
Quoted 2 lines
and then execute make ARCH=um olddefconfig, which in turn enables
CONFIG_UML_PCI_OVER_VIRTIO.
Keeps it, let's say.
Quoted 2 lines
if we append "--kconfig_add
CONFIG_UML_PCI_OVER_VIRTIO=n" tokunit.py, it will overwrite the arch_uml.config.
Yeah but that being required doesn't make sense - the Kconfig should express the correct dependencies.
Quoted 1 line
# I don't know how kunit handles those appended CONFIG entries, though..
It just puts them into the file and runs oldconfig, I guess?
Quoted 1 line
my goal is simple; to test !MMU code via kunit.
Sure.
Quoted 2 lines
my original patch or the additional kconfig argument (--kconfig_add) satisfies this goal.
Sure. But both are the wrong solution, as I said, the Kconfig should express the correct dependencies.
Quoted 6 lines
Quoted 3 lines
The problem is probably
UML_PCI_OVER_VIRTIOselectingUML_PCIselecting various PCI code, but nothing depends on PCI in the first place. Which it should, then?I don't understand the 'nothing depends on PCI...' part. care to elaborate ?
See above, I think?
My gut feeling is that UML_PCI_OVER_VIRTIO should depend on PCI but I don't know if that then doesn't end up in some kind of circular dependency.
johannes
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 3 lines · Johannes Berg
My gut feeling is that
UML_PCI_OVER_VIRTIOshould depend on PCI but I don't know if that then doesn't end up in some kind of circular dependency.
And all the discussion is also true for UML_PCI_OVER_VFIO which also selects UML_PCI.
johannes
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
In reply to Johannes BergQuoted 4 lines · Johannes Berg
My gut feeling is that
UML_PCI_OVER_VIRTIOshould depend on PCI but I don't know if that then doesn't end up in some kind of circular dependency.
No, that _is_ wrong, and it will end up in a circular dependency, because for UML_PCI we currently do FORCE_PCI and then we have PCI and HAVE_PCI and it all messes up ... Which is all correct right now.
That still seems reasonable (why give the choice of selecting PCI after having selected VFIO/virtio PCI), but then with !MMU it can't work, so the pieces there just need to depend on MMU.
johannes
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
In reply to Johannes Bergthanks Johannes, I think I got a clearer view than before.
I guess Kconfig does the right thing.
And Kunit does the right too but an additional job which Kunit does prevents run tests w/ !MMU.
Quoted 6 lines
Quoted 3 lines
CONIFG_MMU=n
via --kconfig_add
CONFIG_MMU=n.Sure. But that should disable
CONFIG_UML_PCI_OVER_VIRTIO, and it doesn't now.
Kconfig (via kunit.py config) disables CONFIG_UML_PCI_OVER_VIRTIO correctly.
But after that, Kunit does the additional job, validate_config() (in kunit_kernel.py), which checks the configs (arch_uml.config + --kconfig_add) is a subset of the final result of .config.
When I applied a patch below:
arch/um/drivers/Kconfig +2 -0
@@ -159,6 +159,7 @@ config UML_RTC config UML_PCI bool + depends on MMU select FORCE_PCI select IRQ_MSI_LIB select UML_IOMEM_EMULATION
@@ -170,6 +171,7 @@ config UML_PCI_OVER_VIRTIO bool "Enable PCI over VIRTIO device simulation" # in theory, just VIRTIO is enough, but that causes recursion depends on VIRTIO_UML + depends on MMU select UML_PCI
and do
./tools/testing/kunit/kunit.py config --kconfig_add CONFIG_MMU=n
the validation currently gives the following error:
ERROR:root:Not all Kconfig options selected in kunitconfig were in the generated .config. This is probably due to unsatisfied dependencies.
Missing: CONFIG_UML_PCI_OVER_VIRTIO=y
Note: many Kconfig options aren't available on UML. You can try
running on a different architecture with something like
"--arch=x86_64".
so, if I give an additional --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n to the command line, the validation passes, because the configs (arch_uml.config + --kconfig_add) becomes the subset of the final result.
what I can handle this would be either of them:
1) use --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n when using kunit w/ !MMU, and drop this patch from the series (no modification to the tree)
2) prepare a different file for !MMU & ARCH=um testing (e.g., arch_uml_nommu.config), and add an option to kunit.py to switch MMU or !MMU
3) implement virtio-pci for !MMU and propose to remove the restriction of CONFIG_PCI depends on CONFIG_MMU.
2) will be removed when 3) is done so, I'm hesitating to propose a patch used by whole tree.
so, I think 1) is (not the best but) a reasonable solution, with a note in nommu-uml specific document (i.e., [PATCH 12/13]).
Let me know what you think.
-- Hajime
Quoted 74 lines · Johannes Berg
Quoted 1 line · Hajime Tazaki
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU,Right.
Quoted 1 line
so we cannot select it when
CONFIG_MMU=n.Actually, I believe that's not true, I think it *can* select something even if you override the 'depends on' it has, it just causes a warning in
Kconfig.But I don't think PCI is even selected,
UML_PCIis selected, and then that selectsPCI_MSIwhich should really only be reachable when PCI is enabled, so this perhaps does nothing? Not sure ...Quoted 1 line
but it's different with kunit when using them via
kunit.pyconfig,It really isn't, you just don't see everything because
kunit.pyhides the build from you.Quoted 10 lines
it first adds
CONFIG_VIRTIO_UML=y
CONFIG_UML_PCI_OVER_VIRTIO=yvia
tools/testing/kunit/configs/arch_uml.config, and then addCONIFG_MMU=n
via --kconfig_add
CONFIG_MMU=n.Sure. But that should disable
CONFIG_UML_PCI_OVER_VIRTIO, and it doesn't now.Quoted 2 lines
and then execute make ARCH=um olddefconfig, which in turn enables
CONFIG_UML_PCI_OVER_VIRTIO.Keeps it, let's say.
Quoted 2 lines
if we append "--kconfig_add
CONFIG_UML_PCI_OVER_VIRTIO=n" tokunit.py, it will overwrite the arch_uml.config.Yeah but that being required doesn't make sense - the
Kconfigshould express the correct dependencies.Quoted 1 line
# I don't know how kunit handles those appended CONFIG entries, though..
It just puts them into the file and runs oldconfig, I guess?
Quoted 1 line
my goal is simple; to test !MMU code via kunit.
Sure.
Quoted 2 lines
my original patch or the additional kconfig argument (--kconfig_add) satisfies this goal.
Sure. But both are the wrong solution, as I said, the
Kconfigshould express the correct dependencies.Quoted 6 lines
Quoted 3 lines
The problem is probably
UML_PCI_OVER_VIRTIOselectingUML_PCIselecting various PCI code, but nothing depends on PCI in the first place. Which it should, then?I don't understand the 'nothing depends on PCI...' part. care to elaborate ?
See above, I think?
My gut feeling is that
UML_PCI_OVER_VIRTIOshould depend on PCI but I don't know if that then doesn't end up in some kind of circular dependency.johannes
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
arch/um/drivers/Kconfig config UML_RTC · line 162
Quoted 9 lines · Hajime Tazaki
arch/um/drivers/Kconfig +1
-0@@ -159,6 +159,7 @@ config UML_RTC config UML_PCI bool + depends on MMU
That won't do anything since you elsewhere have "select UML_PCI" independent of MMU.
arch/um/drivers/Kconfig config UML_PCI_OVER_VIRTIO · line 175
Quoted 6 lines
arch/um/drivers/Kconfig +1
-0@@ -170,6 +171,7 @@ config UML_PCI_OVER_VIRTIO bool "Enable PCI over VIRTIO device simulation" # in theory, just VIRTIO is enough, but that causes recursion depends on VIRTIO_UML + depends on MMU select UML_PCI
Right, but you also need that for UML_PCI_OVER_VFIO.
Quoted 8 lines
and do
./tools/testing/kunit/kunit.pyconfig --kconfig_addCONFIG_MMU=nthe validation currently gives the following error:
ERROR:root:Not all
Kconfigoptions selected in kunitconfig were in the generated .config. This is probably due to unsatisfied dependencies.
Missing:CONFIG_UML_PCI_OVER_VIRTIO=y
Well, OK, but that's fair - you did specifically override MMU=n, and virtio-over-pci needs it.
Quoted 8 lines
1) use --kconfig_add
CONFIG_UML_PCI_OVER_VIRTIO=nwhen using kunit w/ !MMU, and drop this patch from the series (no modification to the tree)
2) prepare a different file for !MMU & ARCH=um testing (e.g., arch_uml_nommu.config), and add an option tokunit.pyto switch MMU or !MMU
3) implement virtio-pci for !MMU and propose to remove the restriction ofCONFIG_PCIdepends onCONFIG_MMU.
Quoted 5 lines
2) will be removed when 3) is done so, I'm hesitating to propose a patch used by whole tree.
so, I think 1) is (not the best but) a reasonable solution, with a note in nommu-uml specific document (i.e., [PATCH 12/13]).
I don't think (3) makes any sense at all, we should just _never_ do that. !MMU is really here in UML for testing to support other architectures that are !MMU, and since by today's definitions no other architecture can have PCI without MMU, it makes no sense for UML to have that (and complicate the PCI code unnecessarily, etc.)
I think it's entirely reasonable to have overriding CONFIG_MMU=n to also necessitate overriding CONFIG_UML_PCI_OVER_VIRTIO, i.e. (1).
As to whether or not to add a specific config file, honestly I don't really know or even care - you'd have to ask the people who actually want to test !MMU.
johannes
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 8 lines · Johannes Berg
Quoted 6 lines · Hajime Tazaki
arch/um/drivers/Kconfig +0
-0@@ -159,6 +159,7 @@ config UML_RTC
Quoted 6 lines
arch/um/drivers/Kconfig config UML_RTC · line 162
Quoted 3 lines
arch/um/drivers/Kconfig +1
-0config UML_PCI bool + depends on MMUThat won't do anything since you elsewhere have "select
UML_PCI" independent of MMU.
i see.
Quoted 8 lines
arch/um/drivers/Kconfig config UML_PCI_OVER_VIRTIO · line 175
Quoted 6 lines
arch/um/drivers/Kconfig +1
-0@@ -170,6 +171,7 @@ config UML_PCI_OVER_VIRTIO bool "Enable PCI over VIRTIO device simulation" # in theory, just VIRTIO is enough, but that causes recursion depends on VIRTIO_UML + depends on MMU select UML_PCIRight, but you also need that for
UML_PCI_OVER_VFIO.
thanks, I understand too.
Quoted 26 lines
Quoted 8 lines
and do
./tools/testing/kunit/kunit.pyconfig --kconfig_addCONFIG_MMU=nthe validation currently gives the following error:
ERROR:root:Not all
Kconfigoptions selected in kunitconfig were in the generated .config. This is probably due to unsatisfied dependencies.
Missing:CONFIG_UML_PCI_OVER_VIRTIO=yWell, OK, but that's fair - you did specifically override MMU=n, and virtio-over-pci needs it.
Quoted 8 lines
1) use --kconfig_add
CONFIG_UML_PCI_OVER_VIRTIO=nwhen using kunit w/ !MMU, and drop this patch from the series (no modification to the tree)
2) prepare a different file for !MMU & ARCH=um testing (e.g., arch_uml_nommu.config), and add an option tokunit.pyto switch MMU or !MMU
3) implement virtio-pci for !MMU and propose to remove the restriction ofCONFIG_PCIdepends onCONFIG_MMU.Quoted 5 lines
2) will be removed when 3) is done so, I'm hesitating to propose a patch used by whole tree.
so, I think 1) is (not the best but) a reasonable solution, with a note in nommu-uml specific document (i.e., [PATCH 12/13]).
Quoted 8 lines
I don't think (3) makes any sense at all, we should just _never_ do that. !MMU is really here in UML for testing to support other architectures that are !MMU, and since by today's definitions no other architecture can have PCI without MMU, it makes no sense for UML to have that (and complicate the PCI code unnecessarily, etc.)
I think it's entirely reasonable to have overriding
CONFIG_MMU=nto also necessitate overridingCONFIG_UML_PCI_OVER_VIRTIO, i.e. (1).
okay, I'll go for this direction in the next series.
Quoted 3 lines
As to whether or not to add a specific config file, honestly I don't really know or even care - you'd have to ask the people who actually want to test !MMU.
indeed, this will be the out of this series if needed.
-- Hajime
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
In reply to Hajime TazakiHi Tazaki-san,
CC arnd
Quoted 17 lines · Hajime Tazaki
Quoted 15 lines · Johannes Berg
Quoted 13 lines · Hajime Tazaki
Quoted 5 lines
This doesn't make a lot of sense to me. Why would we even want to build PCI on NOMMU-UML if PCI in general is dependent on MMU now?
It's not like ARCH=um with PCI and NOMMU has any value even for testing if such a configuration cannot exist in reality?
totally understand your point.
now I see that we don't have to have this work around by using --kconfig_add option to
kunit.py.# like --kconfig_add CONFIG_UML_PCI_OVER_VIRTIO=n (in addition to --kconfig_add CONFIG_MMU=n).
Quoted 8 lines
Quoted 2 lines
That's not what I mean. I think it should be made impossible to build the broken code.
okay.
# I think now I lost the point...currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU, so we cannot select it whenCONFIG_MMU=n.
That is a fairly recent change, see commit 8fe743b5eba0abfb ("PCI:
Add CONFIG_MMU dependency") in v6.16-rc1. As this is not a "hard" dependency, perhaps it should be reverted, iff you are willing to take care of the casual breakage?
Quoted 26 lines
but it's different with kunit when using them via
kunit.pyconfig,it first adds
CONFIG_VIRTIO_UML=y
CONFIG_UML_PCI_OVER_VIRTIO=yvia
tools/testing/kunit/configs/arch_uml.config, and then addCONIFG_MMU=n
via --kconfig_add
CONFIG_MMU=n.and then execute make ARCH=um olddefconfig, which in turn enables
CONFIG_UML_PCI_OVER_VIRTIO.if we append "--kconfig_add
CONFIG_UML_PCI_OVER_VIRTIO=n" tokunit.py, it will overwrite the arch_uml.config.# I don't know how kunit handles those appended CONFIG entries, though..
my goal is simple; to test !MMU code via kunit.
my original patch or the additional kconfig argument (--kconfig_add) satisfies this goal.
Quoted 6 lines
Quoted 3 lines
The problem is probably
UML_PCI_OVER_VIRTIOselectingUML_PCIselecting various PCI code, but nothing depends on PCI in the first place. Which it should, then?I don't understand the 'nothing depends on PCI...' part. care to elaborate ?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Johannes Berg
maintainerRe: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Quoted 8 lines · Geert Uytterhoeven
Quoted 3 lines
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU, so we cannot select it whenCONFIG_MMU=n.That is a fairly recent change, see commit
8fe743b5eba0abfb("PCI:
AddCONFIG_MMUdependency") in v6.16-rc1. As this is not a "hard" dependency, perhaps it should be reverted, iff you are willing to take care of the casual breakage?
Why though? UML with PCI can't really be a functional thing, only a testing thing, and testing PCI on !MMU when that is actually impossible in non-simulation is pointless?
johannes
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Hello Geert, Johannes,
Quoted 6 lines · Johannes Berg
Quoted 4 lines · Geert Uytterhoeven
Quoted 3 lines
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU, so we cannot select it whenCONFIG_MMU=n.
Quoted 8 lines
Quoted 4 lines
That is a fairly recent change, see commit
8fe743b5eba0abfb("PCI:
AddCONFIG_MMUdependency") in v6.16-rc1. As this is not a "hard" dependency, perhaps it should be reverted, iff you are willing to take care of the casual breakage?Why though? UML with PCI can't really be a functional thing, only a testing thing, and testing PCI on !MMU when that is actually impossible in non-simulation is pointless?
currently nommu UML doesn't come with using PCI except building under kunit (ARCH=um), but I have in my mind to use it under !MMU environment, so would be an option in the future.
and this series doesn't include PCI w/ !MMU.
so, I would propose the modification to revert the MMU dependency when time has come.
btw, what do you mean by "hard" dependency in this context, Geert ?
-- Hajime
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Hi Hajime,
Quoted 19 lines · Hajime Tazaki
Quoted 4 lines · Johannes Berg
Quoted 3 lines · Geert Uytterhoeven
Quoted 2 lines
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU, so we cannot select it whenCONFIG_MMU=n.Quoted 8 lines
Quoted 4 lines
That is a fairly recent change, see commit
8fe743b5eba0abfb("PCI:
AddCONFIG_MMUdependency") in v6.16-rc1. As this is not a "hard" dependency, perhaps it should be reverted, iff you are willing to take care of the casual breakage?Why though? UML with PCI can't really be a functional thing, only a testing thing, and testing PCI on !MMU when that is actually impossible in non-simulation is pointless?
currently nommu UML doesn't come with using PCI except building under kunit (ARCH=um), but I have in my mind to use it under !MMU environment, so would be an option in the future.
Quoted 6 lines
and this series doesn't include PCI w/ !MMU.
so, I would propose the modification to revert the MMU dependency when time has come.
btw, what do you mean by "hard" dependency in this context, Geert ?
I mean the PCI core does not really require an MMU, and PCI in-se should work without it (e.g. on Coldfire MCF54xx). Arnd added the dependency to avoid having to deal with future build regressions.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
In reply to Hajime TazakiQuoted 15 lines · Hajime Tazaki
Quoted 5 lines · Johannes Berg
Quoted 4 lines · Geert Uytterhoeven
Quoted 3 lines
currently,
drivers/pci/Kconfig(CONFIG_PCI) marks as depends on MMU, so we cannot select it whenCONFIG_MMU=n.Quoted 8 lines
Quoted 4 lines
That is a fairly recent change, see commit
8fe743b5eba0abfb("PCI:
AddCONFIG_MMUdependency") in v6.16-rc1. As this is not a "hard" dependency, perhaps it should be reverted, iff you are willing to take care of the casual breakage?Why though? UML with PCI can't really be a functional thing, only a testing thing, and testing PCI on !MMU when that is actually impossible in non-simulation is pointless?
Quoted 8 lines
currently nommu UML doesn't come with using PCI except building under kunit (ARCH=um), but I have in my mind to use it under !MMU environment, so would be an option in the future.
and this series doesn't include PCI w/ !MMU.
so, I would propose the modification to revert the MMU dependency when time has come.
The reason why it's currently disabled is that it was causing extra work to fix build failures in random PCI drivers that individually have a CONFIG_MMU dependency. Since we know that none of the NOMMU boards we support uses PCI, this was an easy way to avoid work.
While there are still developers that care about NOMMU Linux and test it on the platforms they use, the NOMMU build failures usually end up in code that are irrelevant for their use cases, so neither the platform owners nor the driver authors care deeply about fixing that combination.
If you want to be able to use PCI drivers on UML-NOMMU, you can probably use
config PCI
depends on MMU || UML
so it will be ignored by the build bots on other architectures. You'll still have to decide whether to fix driver code when regressions in PCI drivers happen, add 'depends on !UML' to individual drivers, or just live with randconfig failures.
Arnd
Re: [PATCH RESEND v11 10/13] um: nommu: a work around for MMU dependency to PCI driver
Hello Arnd,
Quoted 23 lines · Arnd Bergmann
Quoted 8 lines
currently nommu UML doesn't come with using PCI except building under kunit (ARCH=um), but I have in my mind to use it under !MMU environment, so would be an option in the future.
and this series doesn't include PCI w/ !MMU.
so, I would propose the modification to revert the MMU dependency when time has come.
The reason why it's currently disabled is that it was causing extra work to fix build failures in random PCI drivers that individually have a
CONFIG_MMUdependency. Since we know that none of the NOMMU boards we support uses PCI, this was an easy way to avoid work.While there are still developers that care about NOMMU Linux and test it on the platforms they use, the NOMMU build failures usually end up in code that are irrelevant for their use cases, so neither the platform owners nor the driver authors care deeply about fixing that combination.
If you want to be able to use PCI drivers on UML-NOMMU, you can probably use
Quoted 7 lines
config PCI
depends on MMU || UMLso it will be ignored by the build bots on other architectures. You'll still have to decide whether to fix driver code when regressions in PCI drivers happen, add 'depends on !UML' to individual drivers, or just live with randconfig failures.
thanks for the detail information.
yes, when nommu UML wish to use PCI drivers in the future, I'll take this approach to be able to use it.
-- Hajime
PATCH RESEND v11 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 RESEND v11 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.17-rc5 uml/next +tree). + +.. csv-table:: lmbench (usec) + :header: ,native,um,um-mmu(s),um-nommu(s) + + select-10 ,0.5319,36.1214,24.2795,2.9174 + select-100 ,1.6019,34.6049,28.8865,3.8080 + select-1000 ,12.2588,43.6838,48.7438,12.7872 + syscall ,0.1644,35.0321,53.2119,2.5981 + read ,0.3055,31.5509,45.8538,2.7068 + write ,0.2512,31.3609,29.2636,2.6948 + stat ,1.8894,43.8477,49.6121,3.1908 + open/close ,3.2973,77.5123,68.9431,6.2575 + fork+sh ,1110.3000,7359.5000,4618.6667,439.4615 + fork+execve ,510.8182,2834.0000,2461.1667,139.7848 + +.. csv-table:: do_getpid bench (nsec) + :header: ,native,um,um-mmu(s),um-nommu(s) + + getpid , 161 , 34477 , 26242 , 2599 + +(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
@@ -26300,6 +26300,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 RESEND v11 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
@@ -32,16 +32,19 @@ 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 HAVE_SYSCALL_TRACEPOINTS select THREAD_INFO_IN_TASK select SPARSE_IRQ + 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
Quoted 10 lines · Hajime Tazaki
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
I think this will need attention of um people etc. but THANK YOU for sending this :)
If we can get this in that'd be _very useful_ for nommu testing for us in mm especially :)
Cheers, Lorenzo
Quoted 165 lines
v11:
- clean up userspace return routine and integrate touserspace()([04/13])
- fix direction flag issue on using nolibc memcpy ([04/13])
- fix a crash issue when using usermode helper ([06/13])
- test with out-of-tree kunit-uapi patches (which uses umh)
- https://lore.kernel.org/all/[email protected]/
- https://lore.kernel.org/all/[email protected]/v10:
- fix wrong comment on gs register handling ([09/13])
- remove unnecessary code of early syscall implementation ([04/13])
- https://lore.kernel.org/all/[email protected]/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])
- https://lore.kernel.org/all/[email protected]/v8:
- rebase with the latest uml/next branch
- clean upsegv_handlerto 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]
- fixarch_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 forbinfmt_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:
- addarch/um/nommu,arch/x86/um/nommuto contain !MMU specific codes
- remove zpoline patch
- dropbinfmt_elf_fdpicpatch
- reduce ifndefCONFIG_MMUif possible
- split to elf header cleanup patch [01/13]
- fix kernel test robot warnings [06/13]
- fix coding styles [07/13]
- movetask_top_of_stackdefinition [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 toMAINTAINERSfile
- 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 ifndefCONFIG_MMU
- convertUML_CONFIG_MMUtoCONFIG_MMUas 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 systemDocumentation/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 | 25 --- arch/um/kernel/um_arch.c | 3 + arch/um/nommu/Makefile | 3 + arch/um/nommu/os-Linux/Makefile | 7 + arch/um/nommu/os-Linux/seccomp.c | 87 +++++++++++ arch/um/nommu/os-Linux/signal.c | 24 +++ arch/um/nommu/trap.c | 201 +++++++++++++++++++++++++ arch/um/os-Linux/Makefile | 3 +- arch/um/os-Linux/mem.c | 4 + arch/um/os-Linux/process.c | 138 ++++++++++++++++- arch/um/os-Linux/signal.c | 11 +- arch/um/os-Linux/skas/process.c | 126 ---------------- 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/asm/syscall.h | 6 + arch/x86/um/nommu/Makefile | 8 + arch/x86/um/nommu/do_syscall_64.c | 75 +++++++++ arch/x86/um/nommu/entry_64.S | 114 ++++++++++++++ arch/x86/um/nommu/os-Linux/Makefile | 6 + arch/x86/um/nommu/os-Linux/mcontext.c | 26 ++++ arch/x86/um/nommu/syscalls.h | 18 +++ arch/x86/um/nommu/syscalls_64.c | 121 +++++++++++++++ arch/x86/um/shared/sysdep/mcontext.h | 5 + arch/x86/um/shared/sysdep/ptrace.h | 2 +- arch/x86/um/vdso/vma.c | 17 ++- fs/Kconfig.binfmt | 2 +- 45 files changed, 1312 insertions(+), 209 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/seccomp.c create mode 100644 arch/um/nommu/os-Linux/signal.c create mode 100644 arch/um/nommu/trap.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.cbase-commit:
e66ae377fe219c98d3d5b8a0d35da4413a5390ca--
2.43.0