riscv: Add COMPAT mode support for rv64
Subsystems (16)
[email protected]
maintainerv10 cover riscv: Add COMPAT mode support for rv64
From: Guo Ren <[email protected]>
Currently, most 64-bit architectures (x86, parisc, powerpc, arm64, s390, mips, sparc) have supported COMPAT mode. But they all have history issues and can't use standard linux unistd.h. RISC-V would be first standard __SYSCALL_COMPAT user of include/uapi/asm-generic /unistd.h.
The patchset are based on v5.17-rc8, you can compare rv64-compat v.s. rv32-native in qemu with following steps:
- Prepare rv32 rootfs & fw_jump.bin by buildroot.org
$ git clone git://git.busybox.net/buildroot $ cd buildroot $ make qemu_riscv32_virt_defconfig O=qemu_riscv32_virt_defconfig $ make -C qemu_riscv32_virt_defconfig $ make qemu_riscv64_virt_defconfig O=qemu_riscv64_virt_defconfig $ make -C qemu_riscv64_virt_defconfig (Got fw_jump.bin & rootfs.ext2 in qemu_riscvXX_virt_defconfig/images)
- Prepare Linux rv32 & rv64 Image
$ git clone [email protected]:c-sky/csky-linux.git -b riscv_compat_v10 linux $ cd linux $ echo "CONFIG_STRICT_KERNEL_RWX=n" >> arch/riscv/configs/defconfig $ echo "CONFIG_STRICT_MODULE_RWX=n" >> arch/riscv/configs/defconfig $ make ARCH=riscv CROSS_COMPILE=riscv32-buildroot-linux-gnu- O=../build-rv32/ rv32_defconfig $ make ARCH=riscv CROSS_COMPILE=riscv32-buildroot-linux-gnu- O=../build-rv32/ Image $ make ARCH=riscv CROSS_COMPILE=riscv64-buildroot-linux-gnu- O=../build-rv64/ defconfig $ make ARCH=riscv CROSS_COMPILE=riscv64-buildroot-linux-gnu- O=../build-rv64/ Image
- Prepare Qemu:
$ git clone https://gitlab.com/qemu-project/qemu.git -b master linux $ cd qemu $ ./configure --target-list="riscv64-softmmu riscv32-softmmu" $ make
Now let's compare rv64-compat with rv32-native memory footprint with almost the same defconfig, rootfs, opensbi in one qemu.
- Run rv64 with rv32 rootfs in compat mode:
$ ./build/qemu-system-riscv64 -cpu rv64 -M virt -m 64m -nographic -bios qemu_riscv64_virt_defconfig/images/fw_jump.bin -kernel build-rv64/Image -drive file qemu_riscv32_virt_defconfig/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -append "rootwait root=/dev/vda ro console=ttyS0 earlycon=sbi" -netdev user,id=net0 -device virtio-net-device,netdev=net0
QEMU emulator version 6.2.50 (v6.2.0-29-g196d7182c8) OpenSBI v0.9
[ 0.000000] Linux version 5.16.0-rc6-00017-g750f87086bdd-dirty (guoren@guoren-Z87-HD3) (riscv64-unknown-linux-gnu-gcc (GCC) 10.2.0, GNU ld (GNU Binutils) 2.37) #96 SMP Tue Dec 28 21:01:55 CST 2021 [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000 [ 0.000000] Machine model: riscv-virtio,qemu [ 0.000000] earlycon: sbi0 at I/O port 0x0 (options '') [ 0.000000] printk: bootconsole [sbi0] enabled [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] DMA32 [mem 0x0000000080200000-0x0000000083ffffff] [ 0.000000] Normal empty [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000080200000-0x0000000083ffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000080200000-0x0000000083ffffff] [ 0.000000] SBI specification v0.2 detected [ 0.000000] SBI implementation ID=0x1 Version=0x9 [ 0.000000] SBI TIME extension detected [ 0.000000] SBI IPI extension detected [ 0.000000] SBI RFENCE extension detected [ 0.000000] SBI v0.2 HSM extension detected [ 0.000000] riscv: ISA extensions acdfhimsu [ 0.000000] riscv: ELF capabilities acdfim [ 0.000000] percpu: Embedded 17 pages/cpu s30696 r8192 d30744 u69632 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 15655 [ 0.000000] Kernel command line: rootwait root=/dev/vda ro console=ttyS0 earlycon=sbi [ 0.000000] Dentry cache hash table entries: 8192 (order: 4, 65536 bytes, linear) [ 0.000000] Inode-cache hash table entries: 4096 (order: 3, 32768 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] Virtual kernel memory layout: [ 0.000000] fixmap : 0xffffffcefee00000 - 0xffffffceff000000 (2048 kB) [ 0.000000] pci io : 0xffffffceff000000 - 0xffffffcf00000000 ( 16 MB) [ 0.000000] vmemmap : 0xffffffcf00000000 - 0xffffffcfffffffff (4095 MB) [ 0.000000] vmalloc : 0xffffffd000000000 - 0xffffffdfffffffff (65535 MB) [ 0.000000] lowmem : 0xffffffe000000000 - 0xffffffe003e00000 ( 62 MB) [ 0.000000] kernel : 0xffffffff80000000 - 0xffffffffffffffff (2047 MB) [ 0.000000] Memory: 52788K/63488K available (6184K kernel code, 888K rwdata, 1917K rodata, 294K init, 297K bss, 10700K reserved, 0K cma-reserved) [ 0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=1. [ 0.000000] rcu: RCU debug extended QS entry/exit. [ 0.000000] Tracing variant of Tasks RCU enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=1 [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] riscv-intc: 64 local interrupts mapped [ 0.000000] plic: plic@c000000: mapped 53 interrupts with 1 handlers for 2 contexts. ... Welcome to Buildroot buildroot login: root # cat /proc/cpuinfo processor : 0 hart : 0 isa : rv64imafdcsuh mmu : sv48
# file /bin/busybox /bin/busybox: setuid ELF 32-bit LSB shared object, UCB RISC-V, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-riscv32-ilp32d.so.1, for GNU/Linux 5.15.0, stripped # ca[ 78.386630] random: fast init done # cat /proc/meminfo MemTotal: 53076 kB MemFree: 40264 kB MemAvailable: 40244 kB Buffers: 236 kB Cached: 1560 kB SwapCached: 0 kB Active: 1700 kB Inactive: 516 kB Active(anon): 40 kB Inactive(anon): 424 kB Active(file): 1660 kB Inactive(file): 92 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 0 kB SwapFree: 0 kB Dirty: 0 kB Writeback: 0 kB AnonPages: 444 kB Mapped: 1188 kB Shmem: 44 kB KReclaimable: 952 kB Slab: 5744 kB SReclaimable: 952 kB SUnreclaim: 4792 kB KernelStack: 624 kB PageTables: 156 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 26536 kB Committed_AS: 1748 kB VmallocTotal: 67108863 kB VmallocUsed: 652 kB VmallocChunk: 0 kB Percpu: 80 kB #
- Run rv32 with rv32 rootfs:
$ ./build/qemu-system-riscv32 -cpu rv32 -M virt -m 64m -nographic -bios qemu_riscv32_virt_defconfig/images/fw_jump.bin -kernel build-rv32/Image -drive file qemu_riscv32_virt_defconfig/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -append "rootwait root=/dev/vda ro console=ttyS0 earlycon=sbi" -netdev user,id=net0 -device virtio-net-device,netdev=net0
QEMU emulator version 6.2.50 (v6.2.0-29-g196d7182c8) OpenSBI v0.9
[ 0.000000] Linux version 5.16.0-rc6-00017-g750f87086bdd-dirty (guoren@guoren-Z87-HD3) (riscv32-buildroot-linux-gnu-gcc.br_real (Buildroot 2021.11-201-g7600ca7960-dirty) 10.3.0, GNU ld (GNU Binutils) 2.36.1) #7 SMP Tue Dec 28 21:02:21 CST 2021 [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80400000 [ 0.000000] Machine model: riscv-virtio,qemu [ 0.000000] earlycon: sbi0 at I/O port 0x0 (options '') [ 0.000000] printk: bootconsole [sbi0] enabled [ 0.000000] efi: UEFI not found. [ 0.000000] Zone ranges: [ 0.000000] Normal [mem 0x0000000080400000-0x0000000083ffffff] [ 0.000000] Movable zone start for each node [ 0.000000] Early memory node ranges [ 0.000000] node 0: [mem 0x0000000080400000-0x0000000083ffffff] [ 0.000000] Initmem setup node 0 [mem 0x0000000080400000-0x0000000083ffffff] [ 0.000000] SBI specification v0.2 detected [ 0.000000] SBI implementation ID=0x1 Version=0x9 [ 0.000000] SBI TIME extension detected [ 0.000000] SBI IPI extension detected [ 0.000000] SBI RFENCE extension detected [ 0.000000] SBI v0.2 HSM extension detected [ 0.000000] riscv: ISA extensions acdfhimsu [ 0.000000] riscv: ELF capabilities acdfim [ 0.000000] percpu: Embedded 12 pages/cpu s16600 r8192 d24360 u49152 [ 0.000000] Built 1 zonelists, mobility grouping on. Total pages: 15240 [ 0.000000] Kernel command line: rootwait root=/dev/vda ro console=ttyS0 earlycon=sbi [ 0.000000] Dentry cache hash table entries: 8192 (order: 3, 32768 bytes, linear) [ 0.000000] Inode-cache hash table entries: 4096 (order: 2, 16384 bytes, linear) [ 0.000000] mem auto-init: stack:off, heap alloc:off, heap free:off [ 0.000000] Virtual kernel memory layout: [ 0.000000] fixmap : 0x9dc00000 - 0x9e000000 (4096 kB) [ 0.000000] pci io : 0x9e000000 - 0x9f000000 ( 16 MB) [ 0.000000] vmemmap : 0x9f000000 - 0x9fffffff ( 15 MB) [ 0.000000] vmalloc : 0xa0000000 - 0xbfffffff ( 511 MB) [ 0.000000] lowmem : 0xc0000000 - 0xc3c00000 ( 60 MB) [ 0.000000] Memory: 51924K/61440K available (6117K kernel code, 695K rwdata, 1594K rodata, 255K init, 241K bss, 9516K reserved, 0K cma-reserved) [ 0.000000] SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [ 0.000000] rcu: Hierarchical RCU implementation. [ 0.000000] rcu: RCU restricting CPUs from NR_CPUS=8 to nr_cpu_ids=1. [ 0.000000] rcu: RCU debug extended QS entry/exit. [ 0.000000] Tracing variant of Tasks RCU enabled. [ 0.000000] rcu: RCU calculated value of scheduler-enlistment delay is 25 jiffies. [ 0.000000] rcu: Adjusting geometry for rcu_fanout_leaf=16, nr_cpu_ids=1 [ 0.000000] NR_IRQS: 64, nr_irqs: 64, preallocated irqs: 0 [ 0.000000] riscv-intc: 32 local interrupts mapped [ 0.000000] plic: plic@c000000: mapped 53 interrupts with 1 handlers for 2 contexts. ... Welcome to Buildroot buildroot login: root # cat /proc/cpuinfo processor : 0 hart : 0 isa : rv32imafdcsuh mmu : sv32
# file /bin/busybox /bin/busybox: setuid ELF 32-bit LSB shared object, UCB RISC-V, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-riscv32-ilp32d.so.1, for GNU/Linux 5.15.0, stripped [ 79.320589] random: fast init done # cat /proc/meminfo MemTotal: 52176 kB MemFree: 41012 kB MemAvailable: 42176 kB Buffers: 644 kB Cached: 2724 kB SwapCached: 0 kB Active: 3128 kB Inactive: 752 kB Active(anon): 40 kB Inactive(anon): 516 kB Active(file): 3088 kB Inactive(file): 236 kB Unevictable: 0 kB Mlocked: 0 kB SwapTotal: 0 kB SwapFree: 0 kB Dirty: 4 kB Writeback: 0 kB AnonPages: 556 kB Mapped: 2172 kB Shmem: 44 kB KReclaimable: 656 kB Slab: 3684 kB SReclaimable: 656 kB SUnreclaim: 3028 kB KernelStack: 312 kB PageTables: 88 kB NFS_Unstable: 0 kB Bounce: 0 kB WritebackTmp: 0 kB CommitLimit: 26088 kB Committed_AS: 2088 kB VmallocTotal: 524287 kB VmallocUsed: 12 kB VmallocChunk: 0 kB Percpu: 60 kB #
Some conclusions:
- kernel statics:
64: Memory: 52788K/63488K available (6184K kernel code, 888K rwdata, 1917K rodata, 294K init, 297K bss, 10700K reserved) 32: Memory: 51924K/61440K available (6117K kernel code, 695K rwdata, 1594K rodata, 255K init, 241K bss, 9516K reserved)
rv32 better than rv64: 1% 22% 17% 13% 19% 11%
The code size is very similar, but data size rv32 would be better.
- rv32 kernel runtime KernelStack, Slab... are smaller,
rv64: MemTotal: 53076 kB, MemFree: 40264 kB
rv32: MemTotal: 52176 + 2048 kB, MemFree: 41012 + 2048 kB
rv32 better than rv64: 2% 6%
(Because opensbi problem, we could add another 2MB for rv32.) Overall in 64MB memory situation, rv64-compat is 6% worse than rv32-native at memory footprint. If the userspace memory usage increases, I think the gap will be further reduced.
Changes in v10:
- Fixup arm64 compile error with compat_statfs definition
- Fixup compat_sys_fadvise64_64 function arguments error cause ltp failure
Changes in v9:
- Fixup rv32 call rv64 segment fault
- Ready for 5.18
Changes in v8:
- Enhanced elf_check_arch with EI_CLASS
- Fixup SR_UXL doesn't exist in CONFIG_32BIT
- Add Tested-by with Heiko
- Update qemu compile tips with upstream repo
Changes in v7:
- Re-construct compat_vdso/Makefile
- Fixup disable COMPAT compile error by csr.h's macro.
- Optimize coding convention for lo/hi in compat.h
Changes in v6:
- Rebase on linux-5.17-rc5
- Optimize hw capability check for elf
- Optimize comment in thread_info.h
- Optimize start_thread with SR_UXL setting
- Optimize vdso.c with direct panic
Changes in v5:
- Rebase on linux-5.17-rc2
- Include consolidate the fcntl patches by Christoph Hellwig
- Remove F_GETLK64/F_SETLK64/F_SETLKW64 from asm/compat.h
- Change COMPAT_RLIM_INFINITY from 0x7fffffff to 0xffffffff
- Bring back "Add hw-cap detect in setup_arch patch" in v1
Changes in v4:
- Rebase on linux-5.17-rc1
- Optimize compat_sys_call_table implementation with Arnd's advice
- Add reviewed-by for Arnd. Thx :)
- Remove FIXME comment in elf.h
- Optimize Cleanup duplicate definitions in compat.h with Arnd's advice
Changes in v3:
- Rebase on newest master (pre linux-5.17-rc1)
- Using newest qemu version v7 for test
- Remove fcntl common modification
- Fixup SET_PERSONALITY in elf.h by Arnd
- Fixup KVM Kconfig
- Update Acked-by & Reviewed-by
Changes in v2:
- Add __ARCH_WANT_COMPAT_STAT suggested
- Cleanup fcntl compatduplicate definitions
- Cleanup compat.h
- Move rv32_defconfig into Makefile
- Fixup rv64 rootfs boot failed, remove hw_compat_mode_detect
- Move SYSVIPC_COMPAT into init/Kconfig
- Simplify compat_elf_check
Christoph Hellwig (3):
uapi: simplify __ARCH_FLOCK{,64}_PAD a little
uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
compat: consolidate the compat_flock{,64} definition
Christoph Hellwig (3):
uapi: simplify __ARCH_FLOCK{,64}_PAD a little
uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
compat: consolidate the compat_flock{,64} definition
Guo Ren (17):
kconfig: Add SYSVIPC_COMPAT for all architectures
fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT
asm-generic: compat: Cleanup duplicate definitions
syscalls: compat: Fix the missing part for __SYSCALL_COMPAT
riscv: Fixup difference with defconfig
riscv: compat: Add basic compat data type implementation
riscv: compat: Re-implement TASK_SIZE for COMPAT_32BIT
riscv: compat: syscall: Add compat_sys_call_table implementation
riscv: compat: syscall: Add entry.S implementation
riscv: compat: process: Add UXL_32 support in start_thread
riscv: compat: Add elf.h implementation
riscv: compat: Add hw capability check for elf
riscv: compat: vdso: Add COMPAT_VDSO base code implementation
riscv: compat: vdso: Add setup additional pages implementation
riscv: compat: signal: Add rt_frame implementation
riscv: compat: ptrace: Add compat_arch_ptrace implement
riscv: compat: Add COMPAT Kbuild skeletal support
arch/arm64/Kconfig | 4 - arch/arm64/include/asm/compat.h | 93 +------ arch/arm64/include/asm/unistd.h | 1 + arch/mips/Kconfig | 5 - arch/mips/include/asm/compat.h | 41 +-- arch/mips/include/asm/unistd.h | 2 + arch/mips/include/uapi/asm/fcntl.h | 30 +-- arch/parisc/Kconfig | 4 - arch/parisc/include/asm/compat.h | 45 +--- arch/parisc/include/asm/unistd.h | 1 + arch/powerpc/Kconfig | 5 - arch/powerpc/include/asm/compat.h | 50 +--- arch/powerpc/include/asm/unistd.h | 1 + arch/riscv/Kconfig | 19 ++ arch/riscv/Makefile | 9 + arch/riscv/configs/rv32_defconfig | 135 ---------- arch/riscv/include/asm/compat.h | 129 ++++++++++ arch/riscv/include/asm/csr.h | 7 + arch/riscv/include/asm/elf.h | 50 +++- arch/riscv/include/asm/mmu.h | 1 + arch/riscv/include/asm/pgtable.h | 13 +- arch/riscv/include/asm/processor.h | 6 +- arch/riscv/include/asm/syscall.h | 1 + arch/riscv/include/asm/thread_info.h | 1 + arch/riscv/include/asm/unistd.h | 11 + arch/riscv/include/asm/vdso.h | 9 + arch/riscv/include/uapi/asm/unistd.h | 2 +- arch/riscv/kernel/Makefile | 3 + arch/riscv/kernel/compat_signal.c | 243 ++++++++++++++++++ arch/riscv/kernel/compat_syscall_table.c | 19 ++ arch/riscv/kernel/compat_vdso/.gitignore | 2 + arch/riscv/kernel/compat_vdso/Makefile | 78 ++++++ arch/riscv/kernel/compat_vdso/compat_vdso.S | 8 + .../kernel/compat_vdso/compat_vdso.lds.S | 3 + arch/riscv/kernel/compat_vdso/flush_icache.S | 3 + .../compat_vdso/gen_compat_vdso_offsets.sh | 5 + arch/riscv/kernel/compat_vdso/getcpu.S | 3 + arch/riscv/kernel/compat_vdso/note.S | 3 + arch/riscv/kernel/compat_vdso/rt_sigreturn.S | 3 + arch/riscv/kernel/entry.S | 18 +- arch/riscv/kernel/process.c | 37 +++ arch/riscv/kernel/ptrace.c | 87 ++++++- arch/riscv/kernel/signal.c | 13 +- arch/riscv/kernel/sys_riscv.c | 6 +- arch/riscv/kernel/vdso.c | 105 +++++--- arch/riscv/kernel/vdso/vdso.S | 6 +- arch/s390/Kconfig | 3 - arch/s390/include/asm/compat.h | 99 +------ arch/s390/include/asm/unistd.h | 1 + arch/sparc/Kconfig | 5 - arch/sparc/include/asm/compat.h | 61 ++--- arch/sparc/include/asm/unistd.h | 1 + arch/x86/Kconfig | 4 - arch/x86/include/asm/compat.h | 104 ++------ arch/x86/include/asm/unistd.h | 1 + fs/open.c | 24 ++ fs/read_write.c | 16 ++ fs/stat.c | 2 +- fs/sync.c | 9 + include/asm-generic/compat.h | 113 ++++++++ include/linux/compat.h | 68 +++++ include/uapi/asm-generic/fcntl.h | 23 +- include/uapi/asm-generic/unistd.h | 4 +- init/Kconfig | 4 + mm/fadvise.c | 11 + mm/readahead.c | 7 + tools/include/uapi/asm-generic/fcntl.h | 21 +- tools/include/uapi/asm-generic/unistd.h | 4 +- 68 files changed, 1207 insertions(+), 698 deletions(-) delete mode 100644 arch/riscv/configs/rv32_defconfig create mode 100644 arch/riscv/include/asm/compat.h create mode 100644 arch/riscv/kernel/compat_signal.c create mode 100644 arch/riscv/kernel/compat_syscall_table.c create mode 100644 arch/riscv/kernel/compat_vdso/.gitignore create mode 100644 arch/riscv/kernel/compat_vdso/Makefile create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.S create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.lds.S create mode 100644 arch/riscv/kernel/compat_vdso/flush_icache.S create mode 100755 arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh create mode 100644 arch/riscv/kernel/compat_vdso/getcpu.S create mode 100644 arch/riscv/kernel/compat_vdso/note.S create mode 100644 arch/riscv/kernel/compat_vdso/rt_sigreturn.S
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 1/20 uapi: simplify __ARCH_FLOCK{,64}_PAD a little
From: Christoph Hellwig <[email protected]>
Don't bother to define the symbols empty, just don't use them. That makes the intent a little more clear.
Remove the unused HAVE_ARCH_STRUCT_FLOCK64 define and merge the 32-bit mips struct flock into the generic one.
Add a new __ARCH_FLOCK_EXTRA_SYSID macro following the style of __ARCH_FLOCK_PAD to avoid having a separate definition just for one architecture.
--- arch/mips/include/uapi/asm/fcntl.h | 26 +++----------------------- include/uapi/asm-generic/fcntl.h | 19 +++++++------------ tools/include/uapi/asm-generic/fcntl.h | 19 +++++++------------ 3 files changed, 17 insertions(+), 47 deletions(-)
arch/mips/include/uapi/asm/fcntl.h +3 -23
@@ -50,30 +50,10 @@#define F_SETLKW64 35#endif -/* -* The flavours of struct flock. "struct flock" is the ABI compliant -* variant. Finally struct flock64 is the LFS variant of struct flock. As -* a historic accident and inconsistence with the ABI definition it doesn't -* contain all the same fields as struct flock. -*/ -#if _MIPS_SIM != _MIPS_SIM_ABI64 - -#include <linux/types.h> - -struct flock { -short l_type; -short l_whence; -__kernel_off_t l_start; -__kernel_off_t l_len; -long l_sysid; -__kernel_pid_t l_pid; -long pad[4 ]; -}; - -#define HAVE_ARCH_STRUCT_FLOCK - -#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ +#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid; +#define __ARCH_FLOCK_PAD long pad[4]; +#endif #include <asm-generic/fcntl.h>
include/uapi/asm-generic/fcntl.h +7 -12
@@ -192,25 +192,19 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024 -#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; - __ARCH_FLOCK_PAD -}; +#ifdef __ARCH_FLOCK_EXTRA_SYSID + __ARCH_FLOCK_EXTRA_SYSID#endif - -#ifndef HAVE_ARCH_STRUCT_FLOCK64 -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +#ifdef __ARCH_FLOCK_PAD + __ARCH_FLOCK_PAD#endif +};struct flock64 {short l_type;
@@ -218,8 +212,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD -}; #endif +};#endif /* _ASM_GENERIC_FCNTL_H */
tools/include/uapi/asm-generic/fcntl.h +7 -12
@@ -187,25 +187,19 @@ struct f_owner_ex {#define F_LINUX_SPECIFIC_BASE 1024 -#ifndef HAVE_ARCH_STRUCT_FLOCK -#ifndef __ARCH_FLOCK_PAD -#define __ARCH_FLOCK_PAD -#endif -struct flock {short l_type;short l_whence;__kernel_off_t l_start;__kernel_off_t l_len;__kernel_pid_t l_pid; - __ARCH_FLOCK_PAD -}; +#ifdef __ARCH_FLOCK_EXTRA_SYSID + __ARCH_FLOCK_EXTRA_SYSID#endif - -#ifndef HAVE_ARCH_STRUCT_FLOCK64 -#ifndef __ARCH_FLOCK64_PAD -#define __ARCH_FLOCK64_PAD +#ifdef __ARCH_FLOCK_PAD + __ARCH_FLOCK_PAD#endif +};struct flock64 {short l_type;
@@ -213,8 +207,9 @@ struct flock64 {__kernel_loff_t l_start;__kernel_loff_t l_len;__kernel_pid_t l_pid; +#ifdef __ARCH_FLOCK64_PAD__ARCH_FLOCK64_PAD -}; #endif +};#endif /* _ASM_GENERIC_FCNTL_H */
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 2/20 uapi: always define F_GETLK64/F_SETLK64/F_SETLKW64 in fcntl.h
In reply to [email protected]From: Christoph Hellwig <[email protected]>
The F_GETLK64/F_SETLK64/F_SETLKW64 fcntl opcodes are only implemented for the 32-bit syscall APIs, but are also needed for compat handling on 64-bit kernels.
Consolidate them in unistd.h instead of definining the internal compat definitions in compat.h, which is rather error prone (e.g. parisc gets the values wrong currently).
Note that before this change they were never visible to userspace due to the fact that CONFIG_64BIT is only set for kernel builds.
--- arch/arm64/include/asm/compat.h | 4 ---- arch/mips/include/asm/compat.h | 4 ---- arch/mips/include/uapi/asm/fcntl.h | 4 ++-- arch/powerpc/include/asm/compat.h | 4 ---- arch/s390/include/asm/compat.h | 4 ---- arch/sparc/include/asm/compat.h | 4 ---- arch/x86/include/asm/compat.h | 4 ---- include/uapi/asm-generic/fcntl.h | 4 ++-- tools/include/uapi/asm-generic/fcntl.h | 2 -- 9 files changed, 4 insertions(+), 30 deletions(-)
arch/arm64/include/asm/compat.h +0 -4
@@ -73,10 +73,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/mips/include/asm/compat.h +0 -4
@@ -65,10 +65,6 @@ struct compat_flock {s32 pad[4 ]; }; -#define F_GETLK64 33 -#define F_SETLK64 34 -#define F_SETLKW64 35 -struct compat_flock64 {short l_type;short l_whence;
arch/mips/include/uapi/asm/fcntl.h +2 -2
@@ -44,11 +44,11 @@#define F_SETOWN 24/* for sockets. */ #define F_GETOWN 23/* for sockets. */ -#ifndef __mips64 +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#define F_GETLK64 33/* using 'struct flock64' */ #define F_SETLK64 34#define F_SETLKW64 35 -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #if _MIPS_SIM != _MIPS_SIM_ABI64#define __ARCH_FLOCK_EXTRA_SYSID long l_sysid;
arch/powerpc/include/asm/compat.h +0 -4
@@ -52,10 +52,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/s390/include/asm/compat.h +0 -4
@@ -110,10 +110,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/sparc/include/asm/compat.h +0 -4
@@ -84,10 +84,6 @@ struct compat_flock {short __unused; }; -#define F_GETLK64 12 -#define F_SETLK64 13 -#define F_SETLKW64 14 -struct compat_flock64 {short l_type;short l_whence;
arch/x86/include/asm/compat.h +0 -4
@@ -58,10 +58,6 @@ struct compat_flock {compat_pid_t l_pid; }; -#define F_GETLK64 12/* using 'struct flock64' */ -#define F_SETLK64 13 -#define F_SETLKW64 14 -/* * IA32 uses 4 byte alignment for 64 bit quantities, * so we need to pack this structure.
include/uapi/asm-generic/fcntl.h +2 -2
@@ -116,13 +116,13 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT +#if __BITS_PER_LONG ==32 || defined(__KERNEL__)#ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif +#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */ #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
tools/include/uapi/asm-generic/fcntl.h +0 -2
@@ -115,13 +115,11 @@#define F_GETSIG 11/* for sockets. */ #endif -#ifndef CONFIG_64BIT #ifndef F_GETLK64 #define F_GETLK64 12/* using 'struct flock64' */ #define F_SETLK64 13#define F_SETLKW64 14#endif -#endif #ifndef F_SETOWN_EX #define F_SETOWN_EX 15
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 3/20 compat: consolidate the compat_flock{,64} definition
In reply to [email protected]From: Christoph Hellwig <[email protected]>
Provide a single common definition for the compat_flock and compat_flock64 structures using the same tricks as for the native variants. Another extra define is added for the packing required on x86.
--- arch/arm64/include/asm/compat.h | 16 ---------------- arch/mips/include/asm/compat.h | 19 ++----------------- arch/parisc/include/asm/compat.h | 16 ---------------- arch/powerpc/include/asm/compat.h | 16 ---------------- arch/s390/include/asm/compat.h | 16 ---------------- arch/sparc/include/asm/compat.h | 18 +----------------- arch/x86/include/asm/compat.h | 20 +++----------------- include/linux/compat.h | 31 +++++++++++++++++++++++++++++++ 8 files changed, 37 insertions(+), 115 deletions(-)
arch/arm64/include/asm/compat.h +0 -16
@@ -65,22 +65,6 @@ struct compat_stat {compat_ulong_t __unused4[2 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {int f_type;int f_bsize;
arch/mips/include/asm/compat.h +2 -17
@@ -55,23 +55,8 @@ struct compat_stat {s32 st_pad4[14 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -s32 l_sysid; -compat_pid_t l_pid; -s32 pad[4 ]; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; +#define __ARCH_COMPAT_FLOCK_EXTRA_SYSID s32 l_sysid; +#define __ARCH_COMPAT_FLOCK_PAD s32 pad[4];struct compat_statfs {int f_type;
arch/parisc/include/asm/compat.h +0 -16
@@ -53,22 +53,6 @@ struct compat_stat {u32 st_spare4[3 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {s32 f_type;s32 f_bsize;
arch/powerpc/include/asm/compat.h +0 -16
@@ -44,22 +44,6 @@ struct compat_stat {u32 __unused4[2 ]; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {int f_type;int f_bsize;
arch/s390/include/asm/compat.h +0 -16
@@ -102,22 +102,6 @@ struct compat_stat {u32 __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -}; -struct compat_statfs {u32 f_type;u32 f_bsize;
arch/sparc/include/asm/compat.h +1 -17
@@ -75,23 +75,7 @@ struct compat_stat64 {unsigned int __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -short __unused; -}; - -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -short __unused; -}; +#define __ARCH_COMPAT_FLOCK_PAD short __unused;struct compat_statfs {int f_type;
arch/x86/include/asm/compat.h +3 -17
@@ -50,25 +50,11 @@ struct compat_stat {u32 __unused5; }; -struct compat_flock { -short l_type; -short l_whence; -compat_off_t l_start; -compat_off_t l_len; -compat_pid_t l_pid; -}; -/* -* IA32 uses 4 byte alignment for 64 bit quantities, -* so we need to pack this structure. +* IA32 uses 4 byte alignment for 64 bit quantities, so we need to pack the +* compat flock64 structure. */ -struct compat_flock64 { -short l_type; -short l_whence; -compat_loff_t l_start; -compat_loff_t l_len; -compat_pid_t l_pid; -} __attribute__((packed)); +#define __ARCH_NEED_COMPAT_FLOCK64_PACKEDstruct compat_statfs {int f_type;
include/linux/compat.h +31 -0
@@ -258,6 +258,37 @@ struct compat_rlimit {compat_ulong_t rlim_max; }; +#ifdef __ARCH_NEED_COMPAT_FLOCK64_PACKED +#define __ARCH_COMPAT_FLOCK64_PACK __attribute__((packed)) +#else +#define __ARCH_COMPAT_FLOCK64_PACK +#endif + +struct compat_flock { +short l_type; +short l_whence; +compat_off_t l_start; +compat_off_t l_len; +#ifdef __ARCH_COMPAT_FLOCK_EXTRA_SYSID + __ARCH_COMPAT_FLOCK_EXTRA_SYSID +#endif +compat_pid_t l_pid; +#ifdef __ARCH_COMPAT_FLOCK_PAD + __ARCH_COMPAT_FLOCK_PAD +#endif +}; + +struct compat_flock64 { +short l_type; +short l_whence; +compat_loff_t l_start; +compat_loff_t l_len; +compat_pid_t l_pid; +#ifdef __ARCH_COMPAT_FLOCK64_PAD + __ARCH_COMPAT_FLOCK64_PAD +#endif +} __ARCH_COMPAT_FLOCK64_PACK; +struct compat_rusage {struct old_timeval32 ru_utime;struct old_timeval32 ru_stime;
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 4/20 kconfig: Add SYSVIPC_COMPAT for all architectures
In reply to [email protected]From: Guo Ren <[email protected]>
The existing per-arch definitions are pretty much historic cruft. Move SYSVIPC_COMPAT into init/Kconfig.
--- arch/arm64/Kconfig | 4 ---- arch/mips/Kconfig | 5 ----- arch/parisc/Kconfig | 4 ---- arch/powerpc/Kconfig | 5 ----- arch/s390/Kconfig | 3 --- arch/sparc/Kconfig | 5 ----- arch/x86/Kconfig | 4 ---- init/Kconfig | 4 ++++ 8 files changed, 4 insertions(+), 30 deletions(-)
arch/arm64/Kconfig +0 -4
@@ -2114,10 +2114,6 @@ config DMI endmenu -config SYSVIPC_COMPAT - def_bool y - depends on COMPAT && SYSVIPC - menu "Power management options" source "kernel/power/Kconfig"
arch/mips/Kconfig +0 -5
@@ -3170,16 +3170,12 @@ config MIPS32_COMPAT config COMPAT bool -config SYSVIPC_COMPAT - bool - config MIPS32_O32 bool "Kernel support for o32 binaries" depends on 64BIT select ARCH_WANT_OLD_COMPAT_IPC select COMPAT select MIPS32_COMPAT - select SYSVIPC_COMPAT if SYSVIPC help Select this option if you want to run o32 binaries. These are pure 32-bit binaries as used by the 32-bit Linux/MIPS port. Most of
@@ -3193,7 +3189,6 @@ config MIPS32_N32 select ARCH_WANT_COMPAT_IPC_PARSE_VERSION select COMPAT select MIPS32_COMPAT - select SYSVIPC_COMPAT if SYSVIPC help Select this option if you want to run n32 binaries. These are 64-bit binaries using 32-bit quantities for addressing and certain
arch/parisc/Kconfig +0 -4
@@ -345,10 +345,6 @@ config COMPAT def_bool y depends on 64BIT -config SYSVIPC_COMPAT - def_bool y - depends on COMPAT && SYSVIPC - config AUDIT_ARCH def_bool y
arch/powerpc/Kconfig +0 -5
@@ -291,11 +291,6 @@ config COMPAT select ARCH_WANT_OLD_COMPAT_IPC select COMPAT_OLD_SIGACTION -config SYSVIPC_COMPAT - bool - depends on COMPAT && SYSVIPC - default y - config SCHED_OMIT_FRAME_POINTER bool default y
arch/s390/Kconfig +0 -3
@@ -459,9 +459,6 @@ config COMPAT (and some other stuff like libraries and such) is needed for executing 31 bit applications. It is safe to say "Y". -config SYSVIPC_COMPAT - def_bool y if COMPAT && SYSVIPC - config SMP def_bool y
arch/sparc/Kconfig +0 -5
@@ -488,9 +488,4 @@ config COMPAT select ARCH_WANT_OLD_COMPAT_IPC select COMPAT_OLD_SIGACTION -config SYSVIPC_COMPAT - bool - depends on COMPAT && SYSVIPC - default y - source "drivers/sbus/char/Kconfig"
arch/x86/Kconfig +0 -4
@@ -2860,10 +2860,6 @@ config COMPAT if COMPAT config COMPAT_FOR_U64_ALIGNMENT def_bool y - -config SYSVIPC_COMPAT - def_bool y - depends on SYSVIPC endif endmenu
init/Kconfig +4 -0
@@ -386,6 +386,10 @@ config SYSVIPC_SYSCTL depends on SYSCTL default y +config SYSVIPC_COMPAT + def_bool y + depends on COMPAT && SYSVIPC + config POSIX_MQUEUE bool "POSIX Message Queues" depends on NET
Signature · 1 line
2.25.1
Re: [PATCH V10 04/20] kconfig: Add SYSVIPC_COMPAT for all architectures
Quoted 6 lines · On Sat, Apr 2, 2022 at 10:36 PM <[email protected]> wrote:
From: Guo Ren <[email protected]>
The existing per-arch definitions are pretty much historic cruft. Move
SYSVIPC_COMPATinto init/Kconfig.
Quoted 7 lines
Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Tested-by Heiko Stuebner <[email protected]>Cc Palmer Dabbelt <[email protected]>---
Please use "arch:" or something for the commit subject.
I want to see "kconfig:" for
changes under scripts/kconfig/.
Signature · 2 lines
Best Regards Masahiro Yamada
Guo Ren
maintainerRe: [PATCH V10 04/20] kconfig: Add SYSVIPC_COMPAT for all architectures
Quoted 16 lines · Masahiro Yamada
Quoted 6 lines · On Sat, Apr 2, 2022 at 10:36 PM <[email protected]> wrote:
From: Guo Ren <[email protected]>
The existing per-arch definitions are pretty much historic cruft. Move
SYSVIPC_COMPATinto init/Kconfig.Quoted 7 lines
Signed-off-by Guo Ren <[email protected]>Signed-off-by Guo Ren <[email protected]>Acked-by Arnd Bergmann <[email protected]>Reviewed-by Christoph Hellwig <[email protected]>Tested-by Heiko Stuebner <[email protected]>Cc Palmer Dabbelt <[email protected]>---
Quoted 4 lines
Please use "arch:" or something for the commit subject.
I want to see "kconfig:" for
changes underscripts/kconfig/.
Okay
Quoted 6 lines
--
Best Regards
Masahiro Yamada
Signature · 4 lines
Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/
[email protected]
maintainerPATCH v10 5/20 fs: stat: compat: Add __ARCH_WANT_COMPAT_STAT
In reply to [email protected]From: Guo Ren <[email protected]>
RISC-V doesn't neeed compat_stat, so using __ARCH_WANT_COMPAT_STAT to exclude unnecessary SYSCALL functions.
--- arch/arm64/include/asm/unistd.h | 1 + arch/mips/include/asm/unistd.h | 2 ++ arch/parisc/include/asm/unistd.h | 1 + arch/powerpc/include/asm/unistd.h | 1 + arch/s390/include/asm/unistd.h | 1 + arch/sparc/include/asm/unistd.h | 1 + arch/x86/include/asm/unistd.h | 1 + fs/stat.c | 2 +- 8 files changed, 9 insertions(+), 1 deletion(-)
arch/arm64/include/asm/unistd.h +1 -0
@@ -3,6 +3,7 @@* Copyright (C) 2012 ARM Ltd. */ #ifdef CONFIG_COMPAT +#define __ARCH_WANT_COMPAT_STAT#define __ARCH_WANT_COMPAT_STAT64#define __ARCH_WANT_SYS_GETHOSTNAME#define __ARCH_WANT_SYS_PAUSE
arch/mips/include/asm/unistd.h +2 -0
@@ -50,6 +50,8 @@# ifdef CONFIG_32BIT # define __ARCH_WANT_STAT64# define __ARCH_WANT_SYS_TIME32 +# else +# define __ARCH_WANT_COMPAT_STAT# endif # ifdef CONFIG_MIPS32_O32 # define __ARCH_WANT_SYS_TIME32
arch/parisc/include/asm/unistd.h +1 -0
@@ -168,6 +168,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \#define __ARCH_WANT_SYS_CLONE#define __ARCH_WANT_SYS_CLONE3#define __ARCH_WANT_COMPAT_SYS_SENDFILE +#define __ARCH_WANT_COMPAT_STAT#ifdef CONFIG_64BIT #define __ARCH_WANT_SYS_TIME
arch/powerpc/include/asm/unistd.h +1 -0
@@ -44,6 +44,7 @@#define __ARCH_WANT_SYS_TIME#define __ARCH_WANT_SYS_UTIME#define __ARCH_WANT_SYS_NEWFSTATAT +#define __ARCH_WANT_COMPAT_STAT#define __ARCH_WANT_COMPAT_SYS_SENDFILE#endif #define __ARCH_WANT_SYS_FORK
arch/s390/include/asm/unistd.h +1 -0
@@ -28,6 +28,7 @@#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK# ifdef CONFIG_COMPAT +# define __ARCH_WANT_COMPAT_STAT# define __ARCH_WANT_SYS_TIME32# define __ARCH_WANT_SYS_UTIME32# endif
arch/sparc/include/asm/unistd.h +1 -0
@@ -46,6 +46,7 @@#define __ARCH_WANT_SYS_TIME#define __ARCH_WANT_SYS_UTIME#define __ARCH_WANT_COMPAT_SYS_SENDFILE +#define __ARCH_WANT_COMPAT_STAT#endif #ifdef __32bit_syscall_numbers__
arch/x86/include/asm/unistd.h +1 -0
@@ -22,6 +22,7 @@# include <asm/unistd_32_ia32.h> # define __ARCH_WANT_SYS_TIME# define __ARCH_WANT_SYS_UTIME +# define __ARCH_WANT_COMPAT_STAT# define __ARCH_WANT_COMPAT_SYS_PREADV64# define __ARCH_WANT_COMPAT_SYS_PWRITEV64# define __ARCH_WANT_COMPAT_SYS_PREADV64V2
fs/stat.c +1 -1
@@ -639,7 +639,7 @@ SYSCALL_DEFINE5(statx,return do_statx (dfd, filename, flags, mask, buffer); } -#ifdef CONFIG_COMPAT +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_STAT)static int cp_compat_stat (struct kstat *stat,struct compat_stat __user *ubuf) {struct compat_stat tmp;
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 6/20 asm-generic: compat: Cleanup duplicate definitions
In reply to [email protected]From: Guo Ren <[email protected]>
There are 7 64bit architectures that support Linux COMPAT mode to run 32bit applications. A lot of definitions are duplicate:
- COMPAT_USER_HZ
- COMPAT_RLIM_INFINITY
- COMPAT_OFF_T_MAX
- __compat_uid_t, __compat_uid_t
- compat_dev_t
- compat_ipc_pid_t
- struct compat_flock
- struct compat_flock64
- struct compat_statfs
- struct compat_ipc64_perm, compat_semid64_ds, compat_msqid64_ds, compat_shmid64_ds
Cleanup duplicate definitions and merge them into asm-generic.
--- arch/arm64/include/asm/compat.h | 73 +++----------------- arch/mips/include/asm/compat.h | 18 ++--- arch/parisc/include/asm/compat.h | 29 ++------ arch/powerpc/include/asm/compat.h | 30 ++------- arch/s390/include/asm/compat.h | 79 ++++------------------ arch/sparc/include/asm/compat.h | 39 ++++------- arch/x86/include/asm/compat.h | 80 ++++------------------ include/asm-generic/compat.h | 106 ++++++++++++++++++++++++++++++ 8 files changed, 170 insertions(+), 284 deletions(-)
arch/arm64/include/asm/compat.h +9 -64
@@ -8,6 +8,15 @@#define compat_mode_t compat_mode_ttypedef u16 compat_mode_t ; +#define __compat_uid_t __compat_uid_t +typedef u16 __compat_uid_t ; +typedef u16 __compat_gid_t ; + +#define compat_ipc_pid_t compat_ipc_pid_t +typedef u16 compat_ipc_pid_t ; + +#define compat_statfs compat_statfs +#include <asm-generic/compat.h> #ifdef CONFIG_COMPAT
@@ -19,21 +28,15 @@ typedef u16 compat_mode_t;#include <linux/sched.h> #include <linux/sched/task_stack.h> -#define COMPAT_USER_HZ 100#ifdef __AARCH64EB__#define COMPAT_UTS_MACHINE "armv8b\0\0"#else #define COMPAT_UTS_MACHINE "armv8l\0\0"#endif -typedef u16 __compat_uid_t ; -typedef u16 __compat_gid_t ;typedef u16 __compat_uid16_t ;typedef u16 __compat_gid16_t ; -typedef u32 compat_dev_t ;typedef s32 compat_nlink_t ; -typedef u16 compat_ipc_pid_t ; -typedef __kernel_fsid_t compat_fsid_t ;struct compat_stat {#ifdef __AARCH64EB__
@@ -87,64 +90,6 @@ struct compat_statfs {#define compat_user_stack_pointer () (user_stack_pointer(task_pt_regs(current)))#define COMPAT_MINSIGSTKSZ 2048 -struct compat_ipc64_perm { -compat_key_t key; -__compat_uid32_t uid; -__compat_gid32_t gid; -__compat_uid32_t cuid; -__compat_gid32_t cgid; -unsigned short mode; -unsigned short __pad1; -unsigned short seq; -unsigned short __pad2; -compat_ulong_t unused1; -compat_ulong_t unused2; -}; - -struct compat_semid64_ds { -struct compat_ipc64_perm sem_perm; -compat_ulong_t sem_otime; -compat_ulong_t sem_otime_high; -compat_ulong_t sem_ctime; -compat_ulong_t sem_ctime_high; -compat_ulong_t sem_nsems; -compat_ulong_t __unused3; -compat_ulong_t __unused4; -}; - -struct compat_msqid64_ds { -struct compat_ipc64_perm msg_perm; -compat_ulong_t msg_stime; -compat_ulong_t msg_stime_high; -compat_ulong_t msg_rtime; -compat_ulong_t msg_rtime_high; -compat_ulong_t msg_ctime; -compat_ulong_t msg_ctime_high; -compat_ulong_t msg_cbytes; -compat_ulong_t msg_qnum; -compat_ulong_t msg_qbytes; -compat_pid_t msg_lspid; -compat_pid_t msg_lrpid; -compat_ulong_t __unused4; -compat_ulong_t __unused5; -}; - -struct compat_shmid64_ds { -struct compat_ipc64_perm shm_perm; -compat_size_t shm_segsz; -compat_ulong_t shm_atime; -compat_ulong_t shm_atime_high; -compat_ulong_t shm_dtime; -compat_ulong_t shm_dtime_high; -compat_ulong_t shm_ctime; -compat_ulong_t shm_ctime_high; -compat_pid_t shm_cpid; -compat_pid_t shm_lpid; -compat_ulong_t shm_nattch; -compat_ulong_t __unused4; -compat_ulong_t __unused5; -}; -static inline int is_compat_task (void ) {return test_thread_flag (TIF_32BIT );
arch/mips/include/asm/compat.h +7 -11
@@ -9,28 +9,28 @@#include <asm/page.h> #include <asm/ptrace.h> +#define __compat_uid_t __compat_uid_ttypedef s32 __compat_uid_t ;typedef s32 __compat_gid_t ; +typedef __compat_uid_t __compat_uid32_t ;typedef __compat_gid_t __compat_gid32_t ;#define __compat_uid32_t __compat_uid32_t -#define __compat_gid32_t __compat_gid32_t + +#define compat_statfs compat_statfs +#define compat_ipc64_perm compat_ipc64_perm#define _COMPAT_NSIG 128/* Don't ask !$@#% ... */ #define _COMPAT_NSIG_BPW 32typedef u32 compat_sigset_word ; +#define COMPAT_RLIM_INFINITY 0x7fffffffUL +#include <asm-generic/compat.h> -#define COMPAT_USER_HZ 100#define COMPAT_UTS_MACHINE "mips\0\0\0" -typedef u32 compat_dev_t ;typedef u32 compat_nlink_t ; -typedef s32 compat_ipc_pid_t ; -typedef struct { -s32 val[2 ]; -}compat_fsid_t ;struct compat_stat {compat_dev_t st_dev;
@@ -73,10 +73,6 @@ struct compat_statfs {int f_spare[5 ]; }; -#define COMPAT_RLIM_INFINITY 0x7fffffffUL - -#define COMPAT_OFF_T_MAX 0x7fffffff -struct compat_ipc64_perm {compat_key_t key;__compat_uid32_t uid;
arch/parisc/include/asm/compat.h +5 -24
@@ -11,16 +11,16 @@#define compat_mode_t compat_mode_ttypedef u16 compat_mode_t ; +#define compat_ipc_pid_t compat_ipc_pid_t +typedef u16 compat_ipc_pid_t ; + +#define compat_ipc64_perm compat_ipc64_perm +#include <asm-generic/compat.h> -#define COMPAT_USER_HZ 100#define COMPAT_UTS_MACHINE "parisc\0\0" -typedef u32 __compat_uid_t ; -typedef u32 __compat_gid_t ; -typedef u32 compat_dev_t ;typedef u16 compat_nlink_t ; -typedef u16 compat_ipc_pid_t ;struct compat_stat {compat_dev_t st_dev;/* dev_t is 32 bits on parisc */
@@ -53,21 +53,6 @@ struct compat_stat {u32 st_spare4[3 ]; }; -struct compat_statfs { -s32 f_type; -s32 f_bsize; -s32 f_blocks; -s32 f_bfree; -s32 f_bavail; -s32 f_files; -s32 f_ffree; -__kernel_fsid_t f_fsid; -s32 f_namelen; -s32 f_frsize; -s32 f_flags; -s32 f_spare[4 ]; -}; -struct compat_sigcontext {compat_int_t sc_flags;compat_int_t sc_gr[32 ];/* PSW in sc_gr[0] */
@@ -77,10 +62,6 @@ struct compat_sigcontext {compat_int_t sc_sar;/* cr11 */ }; -#define COMPAT_RLIM_INFINITY 0xffffffff - -#define COMPAT_OFF_T_MAX 0x7fffffff -struct compat_ipc64_perm {compat_key_t key;__compat_uid_t uid;
arch/powerpc/include/asm/compat.h +5 -25
@@ -8,21 +8,20 @@#include <linux/types.h> #include <linux/sched.h> +#define compat_ipc_pid_t compat_ipc_pid_t +typedef u16 compat_ipc_pid_t ; + +#define compat_ipc64_perm compat_ipc64_perm +#include <asm-generic/compat.h> -#define COMPAT_USER_HZ 100#ifdef __BIG_ENDIAN__#define COMPAT_UTS_MACHINE "ppc\0\0"#else #define COMPAT_UTS_MACHINE "ppcle\0\0"#endif -typedef u32 __compat_uid_t ; -typedef u32 __compat_gid_t ; -typedef u32 compat_dev_t ;typedef s16 compat_nlink_t ; -typedef u16 compat_ipc_pid_t ; -typedef __kernel_fsid_t compat_fsid_t ;struct compat_stat {compat_dev_t st_dev;
@@ -44,25 +43,6 @@ struct compat_stat {u32 __unused4[2 ]; }; -struct compat_statfs { -int f_type; -int f_bsize; -int f_blocks; -int f_bfree; -int f_bavail; -int f_files; -int f_ffree; -compat_fsid_t f_fsid; -int f_namelen;/* SunOS ignores this field. */ -int f_frsize; -int f_flags; -int f_spare[4 ]; -}; - -#define COMPAT_RLIM_INFINITY 0xffffffff - -#define COMPAT_OFF_T_MAX 0x7fffffff -/* * ipc64_perm is actually 32/64bit clean but since the compat layer refers to * it we may as well define it.
arch/s390/include/asm/compat.h +12 -67
104 lines not on this page · raw message
arch/sparc/include/asm/compat.h +14 -25
@@ -9,17 +9,25 @@#define compat_mode_t compat_mode_ttypedef u16 compat_mode_t ; +#define __compat_uid_t __compat_uid_t +typedef u16 __compat_uid_t ; +typedef u16 __compat_gid_t ; + +#define compat_dev_t compat_dev_t +typedef u16 compat_dev_t ; + +#define compat_ipc_pid_t compat_ipc_pid_t +typedef u16 compat_ipc_pid_t ; + +#define compat_ipc64_perm compat_ipc64_perm + +#define COMPAT_RLIM_INFINITY 0x7fffffff +#include <asm-generic/compat.h> -#define COMPAT_USER_HZ 100#define COMPAT_UTS_MACHINE "sparc\0\0" -typedef u16 __compat_uid_t ; -typedef u16 __compat_gid_t ; -typedef u16 compat_dev_t ;typedef s16 compat_nlink_t ; -typedef u16 compat_ipc_pid_t ; -typedef __kernel_fsid_t compat_fsid_t ;struct compat_stat {compat_dev_t st_dev;
@@ -77,25 +85,6 @@ struct compat_stat64 {#define __ARCH_COMPAT_FLOCK_PAD short __unused; -struct compat_statfs { -int f_type; -int f_bsize; -int f_blocks; -int f_bfree; -int f_bavail; -int f_files; -int f_ffree; -compat_fsid_t f_fsid; -int f_namelen;/* SunOS ignores this field. */ -int f_frsize; -int f_flags; -int f_spare[4 ]; -}; - -#define COMPAT_RLIM_INFINITY 0x7fffffff - -#define COMPAT_OFF_T_MAX 0x7fffffff -struct compat_ipc64_perm {compat_key_t key;__compat_uid32_t uid;
arch/x86/include/asm/compat.h +12 -68
97 lines not on this page · raw message
include/asm-generic/compat.h +106 -0
122 lines not on this page · raw message
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 7/20 syscalls: compat: Fix the missing part for __SYSCALL_COMPAT
In reply to [email protected]From: Guo Ren <[email protected]>
Make "uapi asm unistd.h" could be used for architectures' COMPAT mode. The __SYSCALL_COMPAT is first used in riscv.
--- include/uapi/asm-generic/unistd.h | 4 ++-- tools/include/uapi/asm-generic/unistd.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/uapi/asm-generic/unistd.h +2 -2
@@ -383,7 +383,7 @@ __SYSCALL(__NR_syslog, sys_syslog)/* kernel/ptrace.c */ #define __NR_ptrace 117 -__SYSCALL (__NR_ptrace, sys_ptrace) +__SC_COMP (__NR_ptrace, sys_ptrace, compat_sys_ptrace) /* kernel/sched/core.c */#define __NR_sched_setparam 118
@@ -779,7 +779,7 @@ __SYSCALL(__NR_rseq, sys_rseq)#define __NR_kexec_file_load 294__SYSCALL (__NR_kexec_file_load, sys_kexec_file_load) /* 295 through 402 are unassigned to sync up with generic numbers, don't use */ -#if __BITS_PER_LONG ==32 +#if defined(__SYSCALL_COMPAT) || __BITS_PER_LONG ==32 #define __NR_clock_gettime64 403 __SYSCALL(__NR_clock_gettime64, sys_clock_gettime)#define __NR_clock_settime64 404
tools/include/uapi/asm-generic/unistd.h +2 -2
@@ -383,7 +383,7 @@ __SYSCALL(__NR_syslog, sys_syslog)/* kernel/ptrace.c */ #define __NR_ptrace 117 -__SYSCALL (__NR_ptrace, sys_ptrace) +__SC_COMP (__NR_ptrace, sys_ptrace, compat_sys_ptrace) /* kernel/sched/core.c */#define __NR_sched_setparam 118
@@ -779,7 +779,7 @@ __SYSCALL(__NR_rseq, sys_rseq)#define __NR_kexec_file_load 294__SYSCALL (__NR_kexec_file_load, sys_kexec_file_load) /* 295 through 402 are unassigned to sync up with generic numbers, don't use */ -#if __BITS_PER_LONG ==32 +#if defined(__SYSCALL_COMPAT) || __BITS_PER_LONG ==32 #define __NR_clock_gettime64 403 __SYSCALL(__NR_clock_gettime64, sys_clock_gettime)#define __NR_clock_settime64 404
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 8/20 riscv: Fixup difference with defconfig
In reply to [email protected]From: Guo Ren <[email protected]>
Let's follow the origin patch's spirit:
The only difference between rv32_defconfig and defconfig is that rv32_defconfig has CONFIG_ARCH_RV32I=y.
This is helpful to compare rv64-compat-rv32 v.s. rv32-linux.
--- arch/riscv/Makefile | 4 + arch/riscv/configs/rv32_defconfig | 135 ------------------------------ 2 files changed, 4 insertions(+), 135 deletions(-) delete mode 100644 arch/riscv/configs/rv32_defconfig
arch/riscv/Makefile +4 -0
@@ -154,3 +154,7 @@ PHONY += rv64_randconfig rv64_randconfig: $(Q)$(MAKE) KCONFIG_ALLCONFIG=$(srctree)/arch/riscv/configs/64-bit.config \ -f $(srctree)/Makefile randconfig + +PHONY += rv32_defconfig +rv32_defconfig: + $(Q)$(MAKE) -f $(srctree)/Makefile defconfig 32-bit.config
arch/riscv/configs/rv32_defconfig deleted +0 -135
135 lines not on this page · raw message
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 9/20 riscv: compat: Add basic compat data type implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Implement riscv asm/compat.h for struct compat_xxx, is_compat_task, compat_user_regset, regset convert.
The rv64 compat.h has inherited most of the structs from the generic one.
--- arch/riscv/include/asm/compat.h | 129 +++++++++++++++++++++++++++ arch/riscv/include/asm/thread_info.h | 1 + 2 files changed, 130 insertions(+) create mode 100644 arch/riscv/include/asm/compat.h
arch/riscv/include/asm/compat.h new file +129 -0
@@ -0,0 +1,129 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_COMPAT_H +#define __ASM_COMPAT_H + +#define COMPAT_UTS_MACHINE "riscv\0\0" + +/* +* Architecture specific compatibility types +*/ +#include <linux/types.h> +#include <linux/sched.h> +#include <linux/sched/task_stack.h> +#include <asm-generic/compat.h> + +static inline int is_compat_task (void ) +{ +return test_thread_flag (TIF_32BIT ); +} + +struct compat_user_regs_struct { +compat_ulong_t pc; +compat_ulong_t ra; +compat_ulong_t sp; +compat_ulong_t gp; +compat_ulong_t tp; +compat_ulong_t t0; +compat_ulong_t t1; +compat_ulong_t t2; +compat_ulong_t s0; +compat_ulong_t s1; +compat_ulong_t a0; +compat_ulong_t a1; +compat_ulong_t a2; +compat_ulong_t a3; +compat_ulong_t a4; +compat_ulong_t a5; +compat_ulong_t a6; +compat_ulong_t a7; +compat_ulong_t s2; +compat_ulong_t s3; +compat_ulong_t s4; +compat_ulong_t s5; +compat_ulong_t s6; +compat_ulong_t s7; +compat_ulong_t s8; +compat_ulong_t s9; +compat_ulong_t s10; +compat_ulong_t s11; +compat_ulong_t t3; +compat_ulong_t t4; +compat_ulong_t t5; +compat_ulong_t t6; +}; + +static inline void regs_to_cregs (struct compat_user_regs_struct *cregs, +struct pt_regs *regs) +{ + cregs->pc = (compat_ulong_t ) regs->epc; + cregs->ra = (compat_ulong_t ) regs->ra; + cregs->sp = (compat_ulong_t ) regs->sp; + cregs->gp = (compat_ulong_t ) regs->gp; + cregs->tp = (compat_ulong_t ) regs->tp; + cregs->t0 = (compat_ulong_t ) regs->t0; + cregs->t1 = (compat_ulong_t ) regs->t1; + cregs->t2 = (compat_ulong_t ) regs->t2; + cregs->s0 = (compat_ulong_t ) regs->s0; + cregs->s1 = (compat_ulong_t ) regs->s1; + cregs->a0 = (compat_ulong_t ) regs->a0; + cregs->a1 = (compat_ulong_t ) regs->a1; + cregs->a2 = (compat_ulong_t ) regs->a2; + cregs->a3 = (compat_ulong_t ) regs->a3; + cregs->a4 = (compat_ulong_t ) regs->a4; + cregs->a5 = (compat_ulong_t ) regs->a5; + cregs->a6 = (compat_ulong_t ) regs->a6; + cregs->a7 = (compat_ulong_t ) regs->a7; + cregs->s2 = (compat_ulong_t ) regs->s2; + cregs->s3 = (compat_ulong_t ) regs->s3; + cregs->s4 = (compat_ulong_t ) regs->s4; + cregs->s5 = (compat_ulong_t ) regs->s5; + cregs->s6 = (compat_ulong_t ) regs->s6; + cregs->s7 = (compat_ulong_t ) regs->s7; + cregs->s8 = (compat_ulong_t ) regs->s8; + cregs->s9 = (compat_ulong_t ) regs->s9; + cregs->s10 = (compat_ulong_t ) regs->s10; + cregs->s11 = (compat_ulong_t ) regs->s11; + cregs->t3 = (compat_ulong_t ) regs->t3; + cregs->t4 = (compat_ulong_t ) regs->t4; + cregs->t5 = (compat_ulong_t ) regs->t5; + cregs->t6 = (compat_ulong_t ) regs->t6; +}; + +static inline void cregs_to_regs (struct compat_user_regs_struct *cregs, +struct pt_regs *regs) +{ + regs->epc = (unsigned long ) cregs->pc; + regs->ra = (unsigned long ) cregs->ra; + regs->sp = (unsigned long ) cregs->sp; + regs->gp = (unsigned long ) cregs->gp; + regs->tp = (unsigned long ) cregs->tp; + regs->t0 = (unsigned long ) cregs->t0; + regs->t1 = (unsigned long ) cregs->t1; + regs->t2 = (unsigned long ) cregs->t2; + regs->s0 = (unsigned long ) cregs->s0; + regs->s1 = (unsigned long ) cregs->s1; + regs->a0 = (unsigned long ) cregs->a0; + regs->a1 = (unsigned long ) cregs->a1; + regs->a2 = (unsigned long ) cregs->a2; + regs->a3 = (unsigned long ) cregs->a3; + regs->a4 = (unsigned long ) cregs->a4; + regs->a5 = (unsigned long ) cregs->a5; + regs->a6 = (unsigned long ) cregs->a6; + regs->a7 = (unsigned long ) cregs->a7; + regs->s2 = (unsigned long ) cregs->s2; + regs->s3 = (unsigned long ) cregs->s3; + regs->s4 = (unsigned long ) cregs->s4; + regs->s5 = (unsigned long ) cregs->s5; + regs->s6 = (unsigned long ) cregs->s6; + regs->s7 = (unsigned long ) cregs->s7; + regs->s8 = (unsigned long ) cregs->s8; + regs->s9 = (unsigned long ) cregs->s9; + regs->s10 = (unsigned long ) cregs->s10; + regs->s11 = (unsigned long ) cregs->s11; + regs->t3 = (unsigned long ) cregs->t3; + regs->t4 = (unsigned long ) cregs->t4; + regs->t5 = (unsigned long ) cregs->t5; + regs->t6 = (unsigned long ) cregs->t6; +}; + +#endif /* __ASM_COMPAT_H */
arch/riscv/include/asm/thread_info.h +1 -0
@@ -91,6 +91,7 @@ struct thread_info {#define TIF_SECCOMP 8/* syscall secure computing */ #define TIF_NOTIFY_SIGNAL 9/* signal notifications exist */ #define TIF_UPROBE 10/* uprobe breakpoint or singlestep */ +#define TIF_32BIT 11/* compat-mode 32bit process */ #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 10/20 riscv: compat: Support TASK_SIZE for compat mode
In reply to [email protected]From: Guo Ren <[email protected]>
Make TASK_SIZE from const to dynamic detect TIF_32BIT flag function. Refer to arm64 to implement DEFAULT_MAP_WINDOW_64 for efi-stub.
Limit 32-bit compatible process in 0-2GB virtual address range (which is enough for real scenarios), because it could avoid address sign extend problem when 32-bit enter 64-bit and ease software design.
The standard 32-bit TASK_SIZE is 0x9dc00000:FIXADDR_START, and compared to a compatible 32-bit, it increases 476MB for the application's virtual address.
--- arch/riscv/include/asm/pgtable.h | 13 +++++++++++-- arch/riscv/include/asm/processor.h | 6 +++++- 2 files changed, 16 insertions(+), 3 deletions(-)
arch/riscv/include/asm/pgtable.h +11 -2
@@ -705,8 +705,17 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma,* 63–48 all equal to bit 47, or else a page-fault exception will occur." */ #ifdef CONFIG_64BIT -#define TASK_SIZE (PGDIR_SIZE * PTRS_PER_PGD / 2) -#define TASK_SIZE_MIN (PGDIR_SIZE_L3 * PTRS_PER_PGD / 2) +#define TASK_SIZE_64 (PGDIR_SIZE * PTRS_PER_PGD / 2) +#define TASK_SIZE_MIN (PGDIR_SIZE_L3 * PTRS_PER_PGD / 2) + +#ifdef CONFIG_COMPAT +#define TASK_SIZE_32 (_AC(0x80000000, UL) - PAGE_SIZE) +#define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ + TASK_SIZE_32 : TASK_SIZE_64) +#else +#define TASK_SIZE TASK_SIZE_64 +#endif +#else #define TASK_SIZE FIXADDR_START#define TASK_SIZE_MIN TASK_SIZE
arch/riscv/include/asm/processor.h +5 -1
@@ -19,7 +19,11 @@#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE / 3)#define STACK_TOP TASK_SIZE -#define STACK_TOP_MAX STACK_TOP +#ifdef CONFIG_64BIT +#define STACK_TOP_MAX TASK_SIZE_64 +#else +#define STACK_TOP_MAX TASK_SIZE +#endif #define STACK_ALIGN 16#ifndef __ASSEMBLY__
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 11/20 riscv: compat: syscall: Add compat_sys_call_table implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Implement compat sys_call_table and some system call functions:
truncate64, ftruncate64, fallocate, pread64, pwrite64, sync_file_range, readahead, fadvise64_64 which need argument translation.
--- arch/riscv/include/asm/syscall.h | 1 + arch/riscv/include/asm/unistd.h | 11 +++++++ arch/riscv/include/uapi/asm/unistd.h | 2 +- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/compat_syscall_table.c | 19 ++++++++++++ arch/riscv/kernel/sys_riscv.c | 6 ++-- fs/open.c | 24 +++++++++++++++ fs/read_write.c | 16 ++++++++++ fs/sync.c | 9 ++++++ include/asm-generic/compat.h | 7 +++++ include/linux/compat.h | 37 ++++++++++++++++++++++++ mm/fadvise.c | 11 +++++++ mm/readahead.c | 7 +++++ 13 files changed, 148 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/kernel/compat_syscall_table.c
arch/riscv/include/asm/syscall.h +1 -0
@@ -16,6 +16,7 @@/* The array of function pointers for syscalls. */ extern void *const sys_call_table[]; +extern void *const compat_sys_call_table[];/* * Only the low 32 bits of orig_r0 are meaningful, so we return int.
arch/riscv/include/asm/unistd.h +11 -0
@@ -11,6 +11,17 @@#define __ARCH_WANT_SYS_CLONE#define __ARCH_WANT_MEMFD_SECRET +#ifdef CONFIG_COMPAT +#define __ARCH_WANT_COMPAT_TRUNCATE64 +#define __ARCH_WANT_COMPAT_FTRUNCATE64 +#define __ARCH_WANT_COMPAT_FALLOCATE +#define __ARCH_WANT_COMPAT_PREAD64 +#define __ARCH_WANT_COMPAT_PWRITE64 +#define __ARCH_WANT_COMPAT_SYNC_FILE_RANGE +#define __ARCH_WANT_COMPAT_READAHEAD +#define __ARCH_WANT_COMPAT_FADVISE64_64 +#endif +#include <uapi/asm/unistd.h> #define NR_syscalls (__NR_syscalls)
arch/riscv/include/uapi/asm/unistd.h +1 -1
@@ -15,7 +15,7 @@* along with this program. If not, see <https://www.gnu.org/licenses/>. */ -#ifdef __LP64__ +#if defined(__LP64__) && !defined(__SYSCALL_COMPAT)#define __ARCH_WANT_NEW_STAT#define __ARCH_WANT_SET_GET_RLIMIT#endif /* __LP64__ */
arch/riscv/kernel/Makefile +1 -0
@@ -68,3 +68,4 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_EFI) += efi.o +obj-$(CONFIG_COMPAT) += compat_syscall_table.o
arch/riscv/kernel/compat_syscall_table.c new file +19 -0
@@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#define __SYSCALL_COMPAT + +#include <linux/compat.h> +#include <linux/syscalls.h> +#include <asm-generic/mman-common.h> +#include <asm-generic/syscalls.h> +#include <asm/syscall.h> + +#undef __SYSCALL +#define __SYSCALL (nr, call) [nr] = (call), + +asmlinkage long compat_sys_rt_sigreturn (void ); + +void *const compat_sys_call_table[__NR_syscalls] = { + [0 ... __NR_syscalls -1 ] = sys_ni_syscall, +#include <asm/unistd.h> +};
arch/riscv/kernel/sys_riscv.c +4 -2
@@ -33,7 +33,9 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, {return riscv_sys_mmap (addr, len, prot, flags, fd, offset,0 ); } -#else +#endif + +#if defined(CONFIG_32BIT ) || defined(CONFIG_COMPAT ) SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, unsigned long, fd, off_t, offset)
@@ -44,7 +46,7 @@ SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,*/ return riscv_sys_mmap(addr, len, prot, flags, fd, offset, 12); } -#endif /* !CONFIG_64BIT */ +#endif /* * Allows the instruction cache to be flushed from userspace. Despite RISC-V
fs/open.c +24 -0
@@ -224,6 +224,21 @@ SYSCALL_DEFINE2(ftruncate64, unsigned int, fd, loff_t, length) }#endif /* BITS_PER_LONG == 32 */ +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_TRUNCATE64) +COMPAT_SYSCALL_DEFINE3(truncate64, const char __user *, pathname, + compat_arg_u64_dual(length)) +{ +return ksys_truncate (pathname,compat_arg_u64_glue (length)); +} +#endif + +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_FTRUNCATE64) +COMPAT_SYSCALL_DEFINE3(ftruncate64, unsigned int, fd, + compat_arg_u64_dual(length)) +{ +return ksys_ftruncate (fd,compat_arg_u64_glue (length)); +} +#endif int vfs_fallocate (struct file *file,int mode,loff_t offset,loff_t len) {
@@ -339,6 +354,15 @@ SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)return ksys_fallocate (fd, mode, offset, len); } +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_FALLOCATE) +COMPAT_SYSCALL_DEFINE6 (fallocate, int, fd, int, mode,compat_arg_u64_dual (offset), + compat_arg_u64_dual(len)) +{ +return ksys_fallocate (fd, mode,compat_arg_u64_glue (offset), +compat_arg_u64_glue (len)); +} +#endif +/* * access() needs to use the real uid/gid, not the effective uid/gid. * We do this by temporarily clearing all FS-related capabilities and
fs/read_write.c +16 -0
@@ -681,6 +681,14 @@ SYSCALL_DEFINE4(pread64, unsigned int, fd, char __user *, buf,return ksys_pread64 (fd, buf, count, pos); } +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_PREAD64) +COMPAT_SYSCALL_DEFINE5(pread64, unsigned int, fd, char __user *, buf, + size_t, count, compat_arg_u64_dual(pos)) +{ +return ksys_pread64 (fd, buf, count,compat_arg_u64_glue (pos)); +} +#endif +ssize_t ksys_pwrite64 (unsigned int fd,const char __user *buf,size_t count,loff_t pos) {
@@ -707,6 +715,14 @@ SYSCALL_DEFINE4(pwrite64, unsigned int, fd, const char __user *, buf,return ksys_pwrite64 (fd, buf, count, pos); } +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_PWRITE64) +COMPAT_SYSCALL_DEFINE5(pwrite64, unsigned int, fd, const char __user *, buf, + size_t, count, compat_arg_u64_dual(pos)) +{ +return ksys_pwrite64 (fd, buf, count,compat_arg_u64_glue (pos)); +} +#endif +static ssize_t do_iter_readv_writev (struct file *filp,struct iov_iter *iter,loff_t *ppos,int type,rwf_t flags) {
fs/sync.c +9 -0
@@ -373,6 +373,15 @@ SYSCALL_DEFINE4(sync_file_range, int, fd, loff_t, offset, loff_t, nbytes,return ksys_sync_file_range (fd, offset, nbytes, flags); } +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_SYNC_FILE_RANGE) +COMPAT_SYSCALL_DEFINE6 (sync_file_range, int, fd,compat_arg_u64_dual (offset), + compat_arg_u64_dual(nbytes), unsigned int, flags) +{ +return ksys_sync_file_range (fd,compat_arg_u64_glue (offset), +compat_arg_u64_glue (nbytes), flags); +} +#endif +/* It would be nice if people remember that not all the world's an i386 when they introduce new system calls */ SYSCALL_DEFINE4(sync_file_range2, int, fd, unsigned int, flags,
include/asm-generic/compat.h +7 -0
@@ -14,6 +14,13 @@#define COMPAT_OFF_T_MAX 0x7fffffff#endif +#if !defined(compat_arg_u64) && !defined(CONFIG_CPU_BIG_ENDIAN ) +#define compat_arg_u64 (name) u32 name##_lo, u32 name##_hi +#define compat_arg_u64_dual (name) u32, name##_lo, u32, name##_hi +#define compat_arg_u64_glue (name) (((u64)name##_lo & 0xffffffffUL) | \ + ((u64)name##_hi << 32)) +#endif +/* These types are common across all compat ABIs */ typedef u32 compat_size_t ;typedef s32 compat_ssize_t ;
include/linux/compat.h +37 -0
@@ -926,6 +926,43 @@ asmlinkage long compat_sys_sigaction(int sig,/* obsolete: net/socket.c */ asmlinkage long compat_sys_socketcall (int call,u32 __user *args); +#ifdef __ARCH_WANT_COMPAT_TRUNCATE64 +asmlinkage long compat_sys_truncate64 (const char __user *pathname,compat_arg_u64 (len )); +#endif + +#ifdef __ARCH_WANT_COMPAT_FTRUNCATE64 +asmlinkage long compat_sys_ftruncate64 (unsigned int fd,compat_arg_u64 (len )); +#endif + +#ifdef __ARCH_WANT_COMPAT_FALLOCATE +asmlinkage long compat_sys_fallocate (int fd,int mode,compat_arg_u64 (offset ), +compat_arg_u64 (len )); +#endif + +#ifdef __ARCH_WANT_COMPAT_PREAD64 +asmlinkage long compat_sys_pread64 (unsigned int fd,char __user *buf,size_t count, +compat_arg_u64 (pos )); +#endif + +#ifdef __ARCH_WANT_COMPAT_PWRITE64 +asmlinkage long compat_sys_pwrite64 (unsigned int fd,const char __user *buf,size_t count, +compat_arg_u64 (pos )); +#endif + +#ifdef __ARCH_WANT_COMPAT_SYNC_FILE_RANGE +asmlinkage long compat_sys_sync_file_range (int fd,compat_arg_u64 (pos ), +compat_arg_u64 (nbytes ),unsigned int flags); +#endif + +#ifdef __ARCH_WANT_COMPAT_FADVISE64_64 +asmlinkage long compat_sys_fadvise64_64 (int fd,compat_arg_u64 (pos ), +compat_arg_u64 (len ),int advice); +#endif + +#ifdef __ARCH_WANT_COMPAT_READAHEAD +asmlinkage long compat_sys_readahead (int fd,compat_arg_u64 (offset ),size_t count); +#endif +#endif /* CONFIG_ARCH_HAS_SYSCALL_WRAPPER */ /**
mm/fadvise.c +11 -0
@@ -215,5 +215,16 @@ SYSCALL_DEFINE4(fadvise64, int, fd, loff_t, offset, size_t, len, int, advice)return ksys_fadvise64_64 (fd, offset, len, advice); } +#endif + +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_FADVISE64_64) + +COMPAT_SYSCALL_DEFINE6 (fadvise64_64, int, fd,compat_arg_u64_dual (offset), + compat_arg_u64_dual(len), int, advice) +{ +return ksys_fadvise64_64 (fd,compat_arg_u64_glue (offset), +compat_arg_u64_glue (len), advice); +} +#endif #endif
mm/readahead.c +7 -0
@@ -640,6 +640,13 @@ SYSCALL_DEFINE3(readahead, int, fd, loff_t, offset, size_t, count)return ksys_readahead (fd, offset, count); } +#if defined(CONFIG_COMPAT ) && defined(__ARCH_WANT_COMPAT_READAHEAD) +COMPAT_SYSCALL_DEFINE4(readahead, int, fd, compat_arg_u64_dual(offset), size_t, count) +{ +return ksys_readahead (fd,compat_arg_u64_glue (offset), count); +} +#endif +/** * readahead_expand - Expand a readahead request * @ractl: The request to be expanded
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 12/20 riscv: compat: syscall: Add entry.S implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Implement the entry of compat_sys_call_table[] in asm. Ref to riscv-privileged spec 4.1.1 Supervisor Status Register (sstatus):
BIT[32:33] = UXL[1:0]:
- 1:32
- 2:64
- 3:128
--- arch/riscv/include/asm/csr.h | 7 +++++++ arch/riscv/kernel/entry.S | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-)
arch/riscv/include/asm/csr.h +7 -0
@@ -36,6 +36,13 @@#define SR_SD _AC(0x8000000000000000, UL)/* FS/XS dirty */ #endif +#ifdef CONFIG_64BIT +#define SR_UXL _AC(0x300000000, UL)/* XLEN mask for U-mode */ +#define SR_UXL_32 _AC(0x100000000, UL)/* XLEN = 32 for U-mode */ +#define SR_UXL_64 _AC(0x200000000, UL)/* XLEN = 64 for U-mode */ +#define SR_UXL_SHIFT 32 +#endif +/* SATP flags */ #ifndef CONFIG_64BIT #define SATP_PPN _AC(0x003FFFFF, UL)
arch/riscv/kernel/entry.S +16 -2
@@ -207,13 +207,27 @@ check_syscall_nr: * Syscall number held in a7. * If syscall number is above allowed value, redirect to ni_syscall. */ - bgeu a7, t0, 1f + bgeu a7, t0, 3f +#ifdef CONFIG_COMPAT + REG_L s0, PT_STATUS(sp) + srli s0, s0, SR_UXL_SHIFT + andi s0, s0, (SR_UXL >> SR_UXL_SHIFT) + li t0, (SR_UXL_32 >> SR_UXL_SHIFT) + sub t0, s0, t0 + bnez t0, 1f + + /* Call compat_syscall */ + la s0, compat_sys_call_table + j 2f +1: +#endif /* Call syscall */ la s0, sys_call_table +2: slli t0, a7, RISCV_LGPTR add s0, s0, t0 REG_L s0, 0(s0) -1: +3: jalr s0 ret_from_syscall:
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 13/20 riscv: compat: process: Add UXL_32 support in start_thread
In reply to [email protected]From: Guo Ren <[email protected]>
If the current task is in COMPAT mode, set SR_UXL_32 in status for returning userspace. We need CONFIG _COMPAT to prevent compiling errors with rv32 defconfig.
--- arch/riscv/kernel/process.c | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/riscv/kernel/process.c +9 -0
@@ -97,6 +97,15 @@ void start_thread(struct pt_regs *regs, unsigned long pc, } regs->epc = pc; regs->sp = sp; + +#ifdef CONFIG_64BIT + regs->status &= ~SR_UXL ; + +if (is_compat_task ()) + regs->status |=SR_UXL_32 ; +else + regs->status |=SR_UXL_64 ; +#endif }void flush_thread (void )
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 14/20 riscv: compat: Add elf.h implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Implement necessary type and macro for compat elf. See the code comment for detail.
--- arch/riscv/include/asm/elf.h | 41 +++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-)
arch/riscv/include/asm/elf.h +40 -1
@@ -8,6 +8,8 @@#ifndef _ASM_RISCV_ELF_H#define _ASM_RISCV_ELF_H +#include <uapi/linux/elf.h> +#include <linux/compat.h> #include <uapi/asm/elf.h> #include <asm/auxvec.h> #include <asm/byteorder.h>
@@ -18,11 +20,13 @@*/ #define ELF_ARCH EM_RISCV +#ifndef ELF_CLASS #ifdef CONFIG_64BIT #define ELF_CLASS ELFCLASS64#else #define ELF_CLASS ELFCLASS32#endif +#endif #define ELF_DATA ELFDATA2LSB
@@ -31,6 +35,8 @@*/ #define elf_check_arch (x) ((x)->e_machine == EM_RISCV) +#define compat_elf_check_arch (x) ((x)->e_machine == EM_RISCV) +#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE (PAGE_SIZE)
@@ -43,8 +49,14 @@#define ELF_ET_DYN_BASE ((TASK_SIZE / 3) * 2)#ifdef CONFIG_64BIT +#ifdef CONFIG_COMPAT +#define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ + 0x7ff >> (PAGE_SHIFT - 12) : \ + 0x3ffff >> (PAGE_SHIFT - 12)) +#else #define STACK_RND_MASK (0x3ffff >> (PAGE_SHIFT - 12))#endif +#endif /* * This yields a mask that user programs can use to figure out what * instruction set this CPU supports. This could be done in user space,
@@ -60,11 +72,19 @@ extern unsigned long elf_hwcap;*/ #define ELF_PLATFORM (NULL) +#define COMPAT_ELF_PLATFORM (NULL) +#ifdef CONFIG_MMU #define ARCH_DLINFO \ do { \ +/* \ +* Note that we add ulong after elf_addr_t because \ +* casting current->mm->context.vdso triggers a cast \ +* warning of cast from pointer to integer for \ +* COMPAT ELFCLASS32. \ +*/ \NEW_AUX_ENT (AT_SYSINFO_EHDR , \ - (elf_addr_t)current->mm->context.vdso); \ + (elf_addr_t )(ulong )current->mm->context.vdso); \NEW_AUX_ENT (AT_L1I_CACHESIZE , \get_cache_size (1 ,CACHE_TYPE_INST )); \ NEW_AUX_ENT(AT_L1I_CACHEGEOMETRY, \
@@ -90,4 +110,23 @@ do { \ *(struct user_regs_struct *)regs; \ }while (0 ); +#ifdef CONFIG_COMPAT + +#define SET_PERSONALITY (ex) \ +do { if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \ + set_thread_flag(TIF_32BIT); \ + else \ + clear_thread_flag(TIF_32BIT); \ + if (personality(current->personality) != PER_LINUX32) \ + set_personality(PER_LINUX | \ + (current->personality & (~PER_MASK))); \ +} while (0) + +#define COMPAT_ELF_ET_DYN_BASE ((TASK_SIZE_32 / 3) * 2) + +/* rv32 registers */ +typedef compat_ulong_t compat_elf_greg_t ; +typedef compat_elf_greg_t compat_elf_gregset_t [ELF_NGREG ]; + +#endif /* CONFIG_COMPAT */ #endif /* _ASM_RISCV_ELF_H */
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 15/20 riscv: compat: Add hw capability check for elf
In reply to [email protected]From: Guo Ren <[email protected]>
Detect hardware COMPAT (32bit U-mode) capability in rv64. If not support COMPAT mode in hw, compat_elf_check_arch would return false by compat_binfmt_elf.c
Add CLASS to enhance (compat_)elf_check_arch to distinguish 32BIT/64BIT elf.
--- arch/riscv/include/asm/elf.h | 6 ++++-- arch/riscv/kernel/process.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-)
arch/riscv/include/asm/elf.h +4 -2
@@ -33,9 +33,11 @@/* * This is used to ensure we don't load something for the wrong architecture. */ -#define elf_check_arch (x) ((x)->e_machine == EM_RISCV) +#define elf_check_arch (x) (((x)->e_machine == EM_RISCV) && \ + ((x)->e_ident[EI_CLASS] == ELF_CLASS)) -#define compat_elf_check_arch (x) ((x)->e_machine == EM_RISCV) +extern bool compat_elf_check_arch (Elf32_Ehdr *hdr); +#define compat_elf_check_arch compat_elf_check_arch#define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE (PAGE_SIZE)
arch/riscv/kernel/process.c +28 -0
@@ -83,6 +83,34 @@ void show_regs(struct pt_regs *regs)dump_backtrace (regs,NULL ,KERN_DEFAULT ); } +#ifdef CONFIG_COMPAT +static bool compat_mode_supported__read_mostly ; + +bool compat_elf_check_arch (Elf32_Ehdr *hdr) +{ +return compat_mode_supported && + hdr->e_machine ==EM_RISCV && + hdr->e_ident[EI_CLASS ] ==ELFCLASS32 ; +} + +static int __init compat_mode_detect (void ) +{ +unsigned long tmp =csr_read (CSR_STATUS ); + +csr_write (CSR_STATUS , (tmp & ~SR_UXL ) |SR_UXL_32 ); + compat_mode_supported = + (csr_read (CSR_STATUS ) &SR_UXL ) ==SR_UXL_32 ; + +csr_write (CSR_STATUS , tmp); + +pr_info ("riscv: ELF compat mode %s" , + compat_mode_supported ?"supported" :"failed" ); + +return 0 ; +} +early_initcall (compat_mode_detect); +#endif +void start_thread (struct pt_regs *regs,unsigned long pc,unsigned long sp) {
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 16/20 riscv: compat: vdso: Add COMPAT_VDSO base code implementation
In reply to [email protected]From: Guo Ren <[email protected]>
There is no vgettimeofday supported in rv32 that makes simple to generate rv32 vdso code which only needs riscv64 compiler. Other architectures need change compiler or -m (machine parameter) to support vdso32 compiling. If rv32 support vgettimeofday (which cause C compile) in future, we would add CROSS_COMPILE to support that makes more requirement on compiler enviornment.
linux-rv64/arch/riscv/kernel/compat_vdso/compat_vdso.so.dbg:
file format elf64-littleriscv
Disassembly of section .text:
0000000000000800 <__vdso_rt_sigreturn>:
800: 08b00893 li a7,139
804: 00000073 ecall
808: 0000 unimp
...000000000000080c <__vdso_getcpu>:
80c: 0a800893 li a7,168
810: 00000073 ecall
814: 8082 ret
...0000000000000818 <__vdso_flush_icache>:
818: 10300893 li a7,259 81c: 00000073 ecall 820: 8082 ret
linux-rv32/arch/riscv/kernel/vdso/vdso.so.dbg:
file format elf32-littleriscv
Disassembly of section .text:
00000800 <__vdso_rt_sigreturn>:
800: 08b00893 li a7,139
804: 00000073 ecall
808: 0000 unimp
...0000080c <__vdso_getcpu>:
80c: 0a800893 li a7,168
810: 00000073 ecall
814: 8082 ret
...00000818 <__vdso_flush_icache>:
818: 10300893 li a7,259 81c: 00000073 ecall 820: 8082 ret
Finally, reuse all *.S from vdso in compat_vdso that makes implementation clear and readable.
--- arch/riscv/Makefile | 5 ++ arch/riscv/include/asm/vdso.h | 9 +++ arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/compat_vdso/.gitignore | 2 + arch/riscv/kernel/compat_vdso/Makefile | 78 +++++++++++++++++++ arch/riscv/kernel/compat_vdso/compat_vdso.S | 8 ++ .../kernel/compat_vdso/compat_vdso.lds.S | 3 + arch/riscv/kernel/compat_vdso/flush_icache.S | 3 + .../compat_vdso/gen_compat_vdso_offsets.sh | 5 ++ arch/riscv/kernel/compat_vdso/getcpu.S | 3 + arch/riscv/kernel/compat_vdso/note.S | 3 + arch/riscv/kernel/compat_vdso/rt_sigreturn.S | 3 + arch/riscv/kernel/vdso/vdso.S | 6 +- 13 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/kernel/compat_vdso/.gitignore create mode 100644 arch/riscv/kernel/compat_vdso/Makefile create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.S create mode 100644 arch/riscv/kernel/compat_vdso/compat_vdso.lds.S create mode 100644 arch/riscv/kernel/compat_vdso/flush_icache.S create mode 100755 arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh create mode 100644 arch/riscv/kernel/compat_vdso/getcpu.S create mode 100644 arch/riscv/kernel/compat_vdso/note.S create mode 100644 arch/riscv/kernel/compat_vdso/rt_sigreturn.S
arch/riscv/Makefile +5 -0
@@ -112,12 +112,17 @@ libs-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a PHONY += vdso_install vdso_install: $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso $@ + $(if $(CONFIG_COMPAT),$(Q)$(MAKE) \ + $(build)=arch/riscv/kernel/compat_vdso $@) ifeq ($(KBUILD_EXTMOD),) ifeq ($(CONFIG_MMU),y) prepare: vdso_prepare vdso_prepare: prepare0 $(Q)$(MAKE) $(build)=arch/riscv/kernel/vdso include/generated/vdso-offsets.h + $(if $(CONFIG_COMPAT),$(Q)$(MAKE) \ + $(build)=arch/riscv/kernel/compat_vdso include/generated/compat_vdso-offsets.h) + endif endif
arch/riscv/include/asm/vdso.h +9 -0
@@ -21,6 +21,15 @@#define VDSO_SYMBOL (base, name) \ (void __user *)((unsigned long)(base) + __vdso_##name##_offset) + +#ifdef CONFIG_COMPAT +#include <generated/compat_vdso-offsets.h> + +#define COMPAT_VDSO_SYMBOL (base, name) \ + (void __user *)((unsigned long)(base) + compat__vdso_##name##_offset) + +#endif /* CONFIG_COMPAT */ +#endif /* !__ASSEMBLY__ */ #endif /* CONFIG_MMU */
arch/riscv/kernel/Makefile +1 -0
@@ -69,3 +69,4 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_EFI) += efi.o obj-$(CONFIG_COMPAT) += compat_syscall_table.o +obj-$(CONFIG_COMPAT) += compat_vdso/
arch/riscv/kernel/compat_vdso/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +compat_vdso.lds
arch/riscv/kernel/compat_vdso/Makefile new file +78 -0
78 lines not on this page · raw message
arch/riscv/kernel/compat_vdso/compat_vdso.S new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#define vdso_start compat_vdso_start +#define vdso_end compat_vdso_end + +#define __VDSO_PATH "arch/riscv/kernel/compat_vdso/compat_vdso.so" + +#include <../vdso/vdso.S>
arch/riscv/kernel/compat_vdso/compat_vdso.lds.S new file +3 -0
@@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <../vdso/vdso.lds.S>
arch/riscv/kernel/compat_vdso/flush_icache.S new file +3 -0
@@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <../vdso/flush_icache.S>
arch/riscv/kernel/compat_vdso/gen_compat_vdso_offsets.sh new file +5 -0
@@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +LC_ALL=C +sed -n -e 's/^[0]\+\(0[0-9a-fA-F]*\) . \(__vdso_[a-zA-Z0-9_]*\)$/\#define compat\2_offset\t0x\1/p'
arch/riscv/kernel/compat_vdso/getcpu.S new file +3 -0
@@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <../vdso/getcpu.S>
arch/riscv/kernel/compat_vdso/note.S new file +3 -0
@@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <../vdso/note.S>
arch/riscv/kernel/compat_vdso/rt_sigreturn.S new file +3 -0
@@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <../vdso/rt_sigreturn.S>
arch/riscv/kernel/vdso/vdso.S +5 -1
@@ -7,12 +7,16 @@ #include <linux/linkage.h> #include <asm/page.h> +#ifndef __VDSO_PATH +#define __VDSO_PATH "arch/riscv/kernel/vdso/vdso.so" +#endif + __PAGE_ALIGNED_DATA .globl vdso_start, vdso_end .balign PAGE_SIZE vdso_start: - .incbin "arch/riscv/kernel/vdso/vdso.so" + .incbin __VDSO_PATH .balign PAGE_SIZE vdso_end:
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 17/20 riscv: compat: vdso: Add setup additional pages implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Reconstruct __setup_additional_pages() by appending vdso info pointer argument to meet compat_vdso_info requirement. And change vm_special_mapping *dm, *cm initialization into static.
--- arch/riscv/include/asm/elf.h | 5 ++ arch/riscv/include/asm/mmu.h | 1 + arch/riscv/kernel/vdso.c | 105 +++++++++++++++++++++++------------ 3 files changed, 76 insertions(+), 35 deletions(-)
arch/riscv/include/asm/elf.h +5 -0
@@ -130,5 +130,10 @@ do { if ((ex).e_ident[EI_CLASS] == ELFCLASS32) \typedef compat_ulong_t compat_elf_greg_t ;typedef compat_elf_greg_t compat_elf_gregset_t [ELF_NGREG ]; +extern int compat_arch_setup_additional_pages (struct linux_binprm *bprm, +int uses_interp); +#define compat_arch_setup_additional_pages \ + compat_arch_setup_additional_pages +#endif /* CONFIG_COMPAT */ #endif /* _ASM_RISCV_ELF_H */
arch/riscv/include/asm/mmu.h +1 -0
@@ -16,6 +16,7 @@ typedef struct {atomic_long_t id;#endif void *vdso; +void *vdso_info;#ifdef CONFIG_SMP /* A local icache flush is needed before user execution can resume. */ cpumask_t icache_stale_mask;
arch/riscv/kernel/vdso.c +70 -35
209 lines not on this page · raw message
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 18/20 riscv: compat: signal: Add rt_frame implementation
In reply to [email protected]From: Guo Ren <[email protected]>
Implement compat_setup_rt_frame for sigcontext save & restore. The main process is the same with signal, but the rv32 pt_regs' size is different from rv64's, so we needs convert them.
--- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/compat_signal.c | 243 ++++++++++++++++++++++++++++++ arch/riscv/kernel/signal.c | 13 +- 3 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/kernel/compat_signal.c
arch/riscv/kernel/Makefile +1 -0
@@ -69,4 +69,5 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_EFI) += efi.o obj-$(CONFIG_COMPAT) += compat_syscall_table.o +obj-$(CONFIG_COMPAT) += compat_signal.o obj-$(CONFIG_COMPAT) += compat_vdso/
arch/riscv/kernel/compat_signal.c new file +243 -0
243 lines not on this page · raw message
arch/riscv/kernel/signal.c +12 -1
@@ -6,6 +6,7 @@* Copyright (C) 2012 Regents of the University of California */ +#include <linux/compat.h> #include <linux/signal.h> #include <linux/uaccess.h> #include <linux/syscalls.h>
@@ -229,6 +230,11 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,return 0 ; } +#ifdef CONFIG_COMPAT +extern int compat_setup_rt_frame (struct ksignal *ksig,sigset_t *set, +struct pt_regs *regs); +#endif +static void handle_signal (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *oldset =sigmask_to_save ();
@@ -258,8 +264,13 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) } } +#ifdef CONFIG_COMPAT /* Set up the stack frame */ - ret =setup_rt_frame (ksig, oldset, regs); +if (is_compat_task ()) + ret =compat_setup_rt_frame (ksig, oldset, regs); + else +#endif + ret =setup_rt_frame (ksig, oldset, regs);signal_setup_done (ret, ksig,0 ); }
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 19/20 riscv: compat: ptrace: Add compat_arch_ptrace implement
In reply to [email protected]From: Guo Ren <[email protected]>
Now, you can use native gdb on riscv64 for rv32 app debugging.
$ uname -a Linux buildroot 5.16.0-rc4-00036-gbef6b82fdf23-dirty #53 SMP Mon Dec 20 23:06:53 CST 2021 riscv64 GNU/Linux $ cat /proc/cpuinfo processor : 0 hart : 0 isa : rv64imafdcsuh mmu : sv48
$ file /bin/busybox /bin/busybox: setuid ELF 32-bit LSB shared object, UCB RISC-V, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-riscv32-ilp32d.so.1, for GNU/Linux 5.15.0, stripped $ file /usr/bin/gdb /usr/bin/gdb: ELF 32-bit LSB shared object, UCB RISC-V, version 1 (GNU/Linux), dynamically linked, interpreter /lib/ld-linux-riscv32-ilp32d.so.1, for GNU/Linux 5.15.0, stripped $ /usr/bin/gdb /bin/busybox GNU gdb (GDB) 10.2 Copyright (C) 2021 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> ... Reading symbols from /bin/busybox... (No debugging symbols found in /bin/busybox) (gdb) b main Breakpoint 1 at 0x8ddc (gdb) r Starting program: /bin/busybox Failed to read a valid object file image from memory.
Breakpoint 1, 0x555a8ddc in main ()
(gdb) i r
ra 0x77df0b74 0x77df0b74 sp 0x7fdd3d10 0x7fdd3d10 gp 0x5567e800 0x5567e800 <bb_common_bufsiz1+160> tp 0x77f64280 0x77f64280 t0 0x0 0 t1 0x555a6fac 1431990188 t2 0x77dd8db4 2011008436 fp 0x7fdd3e34 0x7fdd3e34 s1 0x7fdd3e34 2145205812 a0 0xffffffff -1 a1 0x2000 8192 a2 0x7fdd3e3c 2145205820 a3 0x0 0 a4 0x7fdd3d30 2145205552 a5 0x555a8dc0 1431997888 a6 0x77f2c170 2012397936 a7 0x6a7c7a2f 1786542639 s2 0x0 0 s3 0x0 0 s4 0x555a8dc0 1431997888 s5 0x77f8a3a8 2012783528 s6 0x7fdd3e3c 2145205820 s7 0x5567cecc 1432866508 --Type <RET> for more, q to quit, c to continue without paging-- s8 0x1 1 s9 0x0 0 s10 0x55634448 1432568904 s11 0x0 0 t3 0x77df0bb8 2011106232 t4 0x42fc 17148 t5 0x0 0 t6 0x40 64 pc 0x555a8ddc 0x555a8ddc <main+28>
(gdb) si0x555a78f0 in mallopt@plt ()
(gdb) c
Continuing.
BusyBox v1.34.1 (2021-12-19 22:39:48 CST) multi-call binary. BusyBox is copyrighted by many authors between 1998-2015. Licensed under GPLv2. See source distribution for detailed copyright notices.
Usage: busybox [function [arguments]...]
or: busybox --list[-full]
...
[Inferior 1 (process 107) exited normally]
(gdb) q
--- arch/riscv/kernel/ptrace.c | 87 +++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 5 deletions(-)
arch/riscv/kernel/ptrace.c +82 -5
@@ -12,6 +12,7 @@#include <asm/thread_info.h> #include <asm/switch_to.h> #include <linux/audit.h> +#include <linux/compat.h> #include <linux/ptrace.h> #include <linux/elf.h> #include <linux/regset.h>
@@ -111,11 +112,6 @@ static const struct user_regset_view riscv_user_native_view = { .n = ARRAY_SIZE(riscv_user_regset), }; -const struct user_regset_view *task_user_regset_view (struct task_struct *task) -{ -return &riscv_user_native_view; -} -struct pt_regs_offset {const char *name;int offset;
@@ -273,3 +269,84 @@ __visible void do_syscall_trace_exit(struct pt_regs *regs)trace_sys_exit (regs,regs_return_value (regs));#endif } + +#ifdef CONFIG_COMPAT +static int compat_riscv_gpr_get (struct task_struct *target, +const struct user_regset *regset, +struct membuf to) +{ +struct compat_user_regs_struct cregs; + +regs_to_cregs (&cregs,task_pt_regs (target)); + +return membuf_write (&to, &cregs, +sizeof (struct compat_user_regs_struct )); +} + +static int compat_riscv_gpr_set (struct task_struct *target, +const struct user_regset *regset, +unsigned int pos,unsigned int count, +const void *kbuf,const void __user *ubuf) +{ +int ret; +struct compat_user_regs_struct cregs; + + ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &cregs,0 ,-1 ); + +cregs_to_regs (&cregs,task_pt_regs (target)); + +return ret; +} + +static const struct user_regset compat_riscv_user_regset[] = { + [REGSET_X ] = { + .core_note_type =NT_PRSTATUS , + .n =ELF_NGREG , + .size =sizeof (compat_elf_greg_t), + .align =sizeof (compat_elf_greg_t), + .regset_get = compat_riscv_gpr_get, + .set = compat_riscv_gpr_set, + }, +#ifdef CONFIG_FPU + [REGSET_F] = { + .core_note_type =NT_PRFPREG , + .n =ELF_NFPREG , + .size =sizeof (elf_fpreg_t), + .align =sizeof (elf_fpreg_t), + .regset_get = riscv_fpr_get, + .set = riscv_fpr_set, + }, +#endif +}; + +static const struct user_regset_view compat_riscv_user_native_view = { + .name ="riscv" , + .e_machine =EM_RISCV , + .regsets = compat_riscv_user_regset, + .n =ARRAY_SIZE (compat_riscv_user_regset), +}; + +long compat_arch_ptrace (struct task_struct *child,compat_long_t request, +compat_ulong_t caddr,compat_ulong_t cdata) +{ +long ret = -EIO ; + +switch (request) { +default : + ret =compat_ptrace_request (child, request, caddr, cdata); +break ; + } + +return ret; +} +#endif /* CONFIG_COMPAT */ + +const struct user_regset_view *task_user_regset_view (struct task_struct *task) +{ +#ifdef CONFIG_COMPAT +if (test_tsk_thread_flag (task,TIF_32BIT )) +return &compat_riscv_user_native_view; + else +#endif +return &riscv_user_native_view; +}
Signature · 1 line
2.25.1
[email protected]
maintainerPATCH v10 20/20 riscv: compat: Add COMPAT Kbuild skeletal support
In reply to [email protected]From: Guo Ren <[email protected]>
Adds initial skeletal COMPAT Kbuild (Running 32bit U-mode on 64bit S-mode) support.
- Setup kconfig & dummy functions for compiling.
- Implement compat_start_thread by the way.
--- arch/riscv/Kconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/riscv/Kconfig +19 -0
@@ -73,6 +73,7 @@ config RISCV select HAVE_ARCH_KGDB if !XIP_KERNEL select HAVE_ARCH_KGDB_QXFER_PKT select HAVE_ARCH_MMAP_RND_BITS if MMU + select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK select HAVE_ARCH_TRANSPARENT_HUGEPAGE if 64BIT && MMU
@@ -123,12 +124,18 @@ config ARCH_MMAP_RND_BITS_MIN default 18 if 64BIT default 8 +config ARCH_MMAP_RND_COMPAT_BITS_MIN + default 8 + # max bits determined by the following formula: # VA_BITS - PAGE_SHIFT - 3 config ARCH_MMAP_RND_BITS_MAX default 24 if 64BIT # SV39 based default 17 +config ARCH_MMAP_RND_COMPAT_BITS_MAX + default 17 + # set if we run in machine mode, cleared if we run in supervisor mode config RISCV_M_MODE bool
@@ -406,6 +413,18 @@ config CRASH_DUMP For more details see Documentation/admin-guide/kdump/kdump.rst +config COMPAT + bool "Kernel support for 32-bit U-mode" + default 64BIT + depends on 64BIT && MMU + help + This option enables support for a 32-bit U-mode running under a 64-bit + kernel at S-mode. riscv32-specific components such as system calls, + the user helper functions (vdso), signal rt_frame functions and the + ptrace interface are handled appropriately by the kernel. + + If you want to execute 32-bit userspace applications, say Y. + endmenu menu "Boot options"
Signature · 1 line
2.25.1