November 2023 - Linux-kselftest-mirror

[RESEND PATCH 0/2] add loongarch and riscv support for kprobe args test

by Yu Liao

Yu Liao (2): selftests/ftrace: add loongarch support for kprobe args char tests selftests/ftrace: Add riscv support for kprobe arg tests .../selftests/ftrace/test.d/kprobe/kprobe_args_char.tc | 6 ++++++ .../selftests/ftrace/test.d/kprobe/kprobe_args_string.tc | 3 +++ .../selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 ++++ 3 files changed, 13 insertions(+) -- 2.25.1

6 months, 3 weeks

3
4
0 0

[PATCH v3 0/6] KVM RISC-V Conditional Operations

by Anup Patel

This series extends KVM RISC-V to allow Guest/VM discover and use conditional operations related ISA extensions (namely XVentanaCondOps and Zicond). To try these patches, use KVMTOOL from riscv_zbx_zicntr_smstateen_condops_v1 branch at: https://github.com/avpatel/kvmtool.git These patches are based upon the latest riscv_kvm_queue and can also be found in the riscv_kvm_condops_v3 branch at: https://github.com/avpatel/linux.git Changes since v2: - Dropped patch1, patch2, and patch5 since these patches don't meet the requirements of patch acceptance policy. Changes since v1: - Rebased the series on riscv_kvm_queue - Split PATCH1 and PATCH2 of v1 series into two patches - Added separate test configs for XVentanaCondOps and Zicond in PATCH7 of v1 series. Anup Patel (6): dt-bindings: riscv: Add Zicond extension entry RISC-V: Detect Zicond from ISA string RISC-V: KVM: Allow Zicond extension for Guest/VM KVM: riscv: selftests: Add senvcfg register to get-reg-list test KVM: riscv: selftests: Add smstateen registers to get-reg-list test KVM: riscv: selftests: Add condops extensions to get-reg-list test .../devicetree/bindings/riscv/extensions.yaml | 6 +++ arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kernel/cpufeature.c | 1 + arch/riscv/kvm/vcpu_onereg.c | 2 + .../selftests/kvm/riscv/get-reg-list.c | 54 +++++++++++++++++++ 6 files changed, 65 insertions(+) -- 2.34.1

6 months, 3 weeks

4
11
0 0

PSA: This list is being migrated (no action required)

by Konstantin Ryabitsev

Hello, all: This list is being migrated to new vger infrastructure. No action is required on your part and there will be no change in how you interact with this list after the migration is completed. There will be a short 30-minute delay to the list archives on lore.kernel.org. Once the backend work is done, I will follow up with another message. -K

6 months, 3 weeks

1
1
0 0

[PATCH] Kunit to check the longest symbol length

by Sergio González Collado

The longest length of a symbol (KSYM_NAME_LEN) was increased to 512 in the reference [1]. This patch adds a kunit test to check the longest symbol length. [1] https://lore.kernel.org/lkml/20220802015052.10452-6-ojeda@kernel.org/ Signed-off-by: Sergio González Collado <sergio.collado(a)gmail.com> --- lib/Kconfig.debug | 9 +++ lib/Makefile | 1 + lib/longest_symbol_kunit.c | 120 +++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 lib/longest_symbol_kunit.c diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index fa307f93fa2e..7c0ae4373aa6 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2760,6 +2760,15 @@ config FORTIFY_KUNIT_TEST by the str*() and mem*() family of functions. For testing runtime traps of FORTIFY_SOURCE, see LKDTM's "FORTIFY_*" tests. +config LONGEST_SYM_KUNIT_TEST + tristate "Test the longest symbol possible" if !KUNIT_ALL_TESTS + depends on KUNIT && KPROBES + default KUNIT_ALL_TESTS + help + Tests the longest symbol possible + + If unsure, say N. + config HW_BREAKPOINT_KUNIT_TEST bool "Test hw_breakpoint constraints accounting" if !KUNIT_ALL_TESTS depends on HAVE_HW_BREAKPOINT diff --git a/lib/Makefile b/lib/Makefile index 740109b6e2c8..82ac084b6bc6 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -402,6 +402,7 @@ obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o obj-$(CONFIG_STRCAT_KUNIT_TEST) += strcat_kunit.o obj-$(CONFIG_STRSCPY_KUNIT_TEST) += strscpy_kunit.o obj-$(CONFIG_SIPHASH_KUNIT_TEST) += siphash_kunit.o +obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o diff --git a/lib/longest_symbol_kunit.c b/lib/longest_symbol_kunit.c new file mode 100644 index 000000000000..6282fbb7e991 --- /dev/null +++ b/lib/longest_symbol_kunit.c @@ -0,0 +1,120 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Test the longest symbol length. Execute with: + * ./tools/testing/kunit/kunit.py run longest-symbol + * --arch=x86_64 --kconfig_add CONFIG_KPROBES=y --kconfig_add CONFIG_MODULES=y + * --kconfig_add CONFIG_RETPOLINE=n + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <kunit/test.h> +#include <linux/stringify.h> +#include <linux/kprobes.h> +#include <linux/kallsyms.h> + +#define DI(name) s##name##name +#define DDI(name) DI(n##name##name) +#define DDDI(name) DDI(n##name##name) +#define DDDDI(name) DDDI(n##name##name) +#define DDDDDI(name) DDDDI(n##name##name) + +#define PLUS1(name) __PASTE(name, e) + +/*Generate a symbol whose name length is 511 */ +#define LONGEST_SYM_NAME DDDDDI(g1h2i3j4k5l6m7n) + +/*Generate a symbol whose name length is 512 */ +#define LONGEST_SYM_NAME_PLUS1 PLUS1(LONGEST_SYM_NAME) + +#define RETURN_LONGEST_SYM 0xAAAAA +#define RETURN_LONGEST_SYM_PLUS1 0x55555 + +noinline int LONGEST_SYM_NAME(void) +{ + return RETURN_LONGEST_SYM; +} + +noinline int LONGEST_SYM_NAME_PLUS1(void) +{ + return RETURN_LONGEST_SYM_PLUS1; +} + +_Static_assert(sizeof(__stringify(LONGEST_SYM_NAME)) == KSYM_NAME_LEN, +"Incorrect symbol length found. Expected KSYM_NAME_LEN: " +__stringify(KSYM_NAME) ", but found: " +__stringify(sizeof(LONGEST_SYM_NAME))); + +static void test_longest_symbol(struct kunit *test) +{ + KUNIT_EXPECT_EQ(test, RETURN_LONGEST_SYM, LONGEST_SYM_NAME()); +}; + +static void test_longest_symbol_kallsyms(struct kunit *test) +{ + unsigned long (*kallsyms_lookup_name)(const char *name); + static int (*longest_sym)(void); + + struct kprobe kp = { + .symbol_name = "kallsyms_lookup_name", + }; + + if (register_kprobe(&kp) < 0) { + pr_info("%s: kprobe not registered\n", __func__); + KUNIT_FAIL(test, "test_longest_symbol kallsysms: kprobe not registered\n"); + return; + } + + kunit_warn(test, "test_longest_symbol kallsyms: kprobe registered\n"); + kallsyms_lookup_name = (unsigned long (*)(const char *name))kp.addr; + unregister_kprobe(&kp); + + longest_sym = + (void *) kallsyms_lookup_name(__stringify(LONGEST_SYM_NAME)); + KUNIT_EXPECT_EQ(test, RETURN_LONGEST_SYM, longest_sym()); +}; + +static void test_longest_symbol_plus1(struct kunit *test) +{ + KUNIT_EXPECT_EQ(test, RETURN_LONGEST_SYM_PLUS1, LONGEST_SYM_NAME_PLUS1()); +}; + +static void test_longest_symbol_plus1_kallsyms(struct kunit *test) +{ + unsigned long (*kallsyms_lookup_name)(const char *name); + static int (*longest_sym_plus1)(void); + + struct kprobe kp = { + .symbol_name = "kallsyms_lookup_name", + }; + + if (register_kprobe(&kp) < 0) { + pr_info("%s: kprobe not registered\n", __func__); + KUNIT_FAIL(test, "test_longest_symbol kallsysms: kprobe not registered\n"); + return; + } + + kunit_warn(test, "test_longest_symbol_plus1 kallsyms: kprobe registered\n"); + kallsyms_lookup_name = (unsigned long (*)(const char *name))kp.addr; + unregister_kprobe(&kp); + + longest_sym_plus1 = + (void *) kallsyms_lookup_name(__stringify(LONGEST_SYM_NAME_PLUS1)); + KUNIT_EXPECT_NULL(test, longest_sym_plus1); +}; + +static struct kunit_case longest_symbol_test_cases[] = { + KUNIT_CASE(test_longest_symbol), + KUNIT_CASE(test_longest_symbol_kallsyms), + KUNIT_CASE(test_longest_symbol_plus1), + KUNIT_CASE(test_longest_symbol_plus1_kallsyms), + {} +}; + +static struct kunit_suite longest_symbol_test_suite = { + .name = "longest-symbol", + .test_cases = longest_symbol_test_cases, +}; +kunit_test_suite(longest_symbol_test_suite); + +MODULE_LICENSE("GPL"); -- 2.39.2

6 months, 3 weeks

4
6
0 0

[PATCH 0/2] Fuse submount_lookup needs to be initialized

by Krister Johansen

Hi Miklos, I got a couple of bug reports[1][2] this morning from teams that are tracking regresssions in linux-next. My patch 513dfacefd71 ("fuse: share lookup state between submount and its parent") is causing panics in the fuse unmount path. The reports came from users with SLUB_DEBUG enabled, and the additional debug sanitization catches the fact that the submount_lookup field isn't getting initialized which could lead to a subsequently bogus attempt to access the submount_lookup structure and adjust its refcount. I've added SLUB_DEBUG to my testing kconfig, and have reproduced the problem using the memfd self-test that was triggering the problem for both reporters. With the fix that follows this e-mail, I see no more erroneous accesses of poisoned slub memory. I'm a bit unsure of the desired approach for fixing these kinds of problems. I'm also away from the office on Nov 10th and Nov 13th, but expect to be back on the console on the Nov 14th. Given the gap, I've prepared a pair of patches, but we only need one. The first is simply a followup fix that addresses the problem in a subsequent one-line commit. If you'd rather revert the entire bad patch and go again, the second patch in the series is a v5 of the original with the submount_lookup initialization added. Either should do, but I wasn't sure which approach was preferable. Thanks, and my apologies for the inconvenience. -K [1] https://lore.kernel.org/linux-fsdevel/CA+G9fYue-dV7t-NrOhWwGshvyboXjb2B6HpC… [2] https://lore.kernel.org/intel-gfx/SJ1PR11MB6129508509896AD7D0E03114B9AFA@SJ…

6 months, 3 weeks

2
3
0 0

selftests: memfd: run_fuse_test.sh - fuse_evict_inode - fs/fuse/inode.c:162 - panic

by Naresh Kamboju

Following kernel panic noticed while running selftests: memfd: run_fuse_test.sh on arm64 Juno-r2 and x86 devices running Linux next-20231109. Reported-by: Linux Kernel Functional Testing <lkft(a)linaro.org> log: --- # timeout set to 45 # selftests: memfd: run_fuse_test.sh # opening: ./mnt/memfd # fuse: DONE [ 1931.860330] Unable to handle kernel paging request at virtual address 005a5a5a5a5a5a5a [ 1931.868645] Mem abort info: [ 1931.871505] ESR = 0x0000000096000021 [ 1931.875311] EC = 0x25: DABT (current EL), IL = 32 bits [ 1931.880805] SET = 0, FnV = 0 [ 1931.883924] EA = 0, S1PTW = 0 [ 1931.887563] FSC = 0x21: alignment fault [ 1931.891618] Data abort info: [ 1931.894542] ISV = 0, ISS = 0x00000021, ISS2 = 0x00000000 [ 1931.900219] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 1931.905305] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 1931.910692] [005a5a5a5a5a5a5a] address between user and kernel address ranges [ 1931.918091] Internal error: Oops: 0000000096000021 [#1] PREEMPT SMP [ 1931.924375] Modules linked in: gpio_sim onboard_usb_hub tda998x hdlcd crct10dif_ce cec drm_dma_helper dm_mod [last unloaded: gpio_mockup] [ 1931.936789] CPU: 1 PID: 20739 Comm: fusermount Not tainted 6.6.0-next-20231109 #1 [ 1931.944295] Hardware name: ARM Juno development board (r2) (DT) [ 1931.950224] pstate: 40000005 (nZcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 1931.957205] pc : fuse_evict_inode (arch/arm64/include/asm/atomic_ll_sc.h:96 (discriminator 3) arch/arm64/include/asm/atomic.h:51 (discriminator 3) include/linux/atomic/atomic-arch-fallback.h:944 (discriminator 3) include/linux/atomic/atomic-instrumented.h:401 (discriminator 3) include/linux/refcount.h:272 (discriminator 3) include/linux/refcount.h:315 (discriminator 3) include/linux/refcount.h:333 (discriminator 3) fs/fuse/inode.c:137 (discriminator 3) fs/fuse/inode.c:166 (discriminator 3)) [ 1931.961586] lr : fuse_evict_inode (fs/fuse/inode.c:162) [ 1931.965868] sp : ffff80008792ba90 [ 1931.969189] x29: ffff80008792ba90 x28: ffff000800b58040 x27: 0000000000000000 [ 1931.976358] x26: 0000000000000000 x25: ffff800080508f98 x24: ffff80008316a008 [ 1931.983519] x23: ffff80008316a008 x22: ffff80008424a020 x21: ffff00082a514c00 [ 1931.990679] x20: 5a5a5a5a5a5a5a5a x19: ffff000838828780 x18: 0000000000000000 [ 1931.997840] x17: ffff80008050e610 x16: ffff80008050e5bc x15: ffff80008050e3e8 [ 1932.005003] x14: ffff80008050df10 x13: ffff800080769c60 x12: ffff8000851f6388 [ 1932.012165] x11: 0000000000000645 x10: 0000000000000645 x9 : ffff800081c0e0b4 [ 1932.019332] x8 : ffff80008792b988 x7 : 0000000000000000 x6 : ffff800084a75fe8 [ 1932.026495] x5 : 0000000000000000 x4 : 0000000000000001 x3 : ffff80008424a968 [ 1932.033659] x2 : 0000000000000002 x1 : ffff000800b58040 x0 : 0000000000000001 [ 1932.040820] Call trace: [ 1932.043272] fuse_evict_inode (arch/arm64/include/asm/atomic_ll_sc.h:96 (discriminator 3) arch/arm64/include/asm/atomic.h:51 (discriminator 3) include/linux/atomic/atomic-arch-fallback.h:944 (discriminator 3) include/linux/atomic/atomic-instrumented.h:401 (discriminator 3) include/linux/refcount.h:272 (discriminator 3) include/linux/refcount.h:315 (discriminator 3) include/linux/refcount.h:333 (discriminator 3) fs/fuse/inode.c:137 (discriminator 3) fs/fuse/inode.c:166 (discriminator 3)) [ 1932.047296] evict (fs/inode.c:669) [ 1932.050279] iput_final (fs/inode.c:1776) [ 1932.053694] iput.part.0 (fs/inode.c:1803) [ 1932.057280] iput (fs/inode.c:1803) [ 1932.060085] dentry_unlink_inode (fs/dcache.c:402) [ 1932.064281] __dentry_kill (arch/arm64/include/asm/current.h:19 arch/arm64/include/asm/preempt.h:47 fs/dcache.c:610) [ 1932.067956] shrink_dentry_list (include/linux/list.h:373 (discriminator 2) fs/dcache.c:1179 (discriminator 2)) [ 1932.072067] shrink_dcache_parent (fs/dcache.c:1652) [ 1932.076433] shrink_dcache_for_umount (fs/dcache.c:1682 fs/dcache.c:1698) [ 1932.081062] generic_shutdown_super (fs/super.c:647) [ 1932.085518] kill_anon_super (fs/super.c:1254) [ 1932.089277] fuse_kill_sb_anon (fs/fuse/fuse_i.h:895 fs/fuse/inode.c:1912) [ 1932.093298] deactivate_locked_super (fs/super.c:489) [ 1932.097753] deactivate_super (fs/super.c:522) [ 1932.101599] cleanup_mnt (fs/namespace.c:139 fs/namespace.c:1257) [ 1932.105097] __cleanup_mnt (fs/namespace.c:1264) [ 1932.108680] task_work_run (kernel/task_work.c:182) [ 1932.112266] do_notify_resume (include/linux/resume_user_mode.h:49 arch/arm64/kernel/signal.c:1305) [ 1932.116283] el0_svc (arch/arm64/kernel/entry-common.c:137 arch/arm64/kernel/entry-common.c:144 arch/arm64/kernel/entry-common.c:679) [ 1932.119345] el0t_64_sync_handler (arch/arm64/kernel/entry-common.c:697) [ 1932.123710] el0t_64_sync (arch/arm64/kernel/entry.S:595) [ 1932.127383] Code: f9026a7f 17ffffd9 52800020 f9800291 (885f7e81) All code ======== 0: f9026a7f str xzr, [x19, #1232] 4: 17ffffd9 b 0xffffffffffffff68 8: 52800020 mov w0, #0x1 // #1 c: f9800291 prfm pstl1strm, [x20] 10:* 885f7e81 ldxr w1, [x20] <-- trapping instruction Code starting with the faulting instruction =========================================== 0: 885f7e81 ldxr w1, [x20] [ 1932.133486] ---[ end trace 0000000000000000 ]--- [ 1932.138111] Kernel panic - not syncing: Oops: Fatal exception [ 1932.143867] SMP: stopping secondary CPUs [ 1932.148008] Kernel Offset: disabled [ 1932.151498] CPU features: 0x1,0000020c,3c020000,0100421b [ 1932.156820] Memory Limit: none [ 1932.159880] ---[ end Kernel panic - not syncing: Oops: Fatal exception ]--- Links: - https://lkft.validation.linaro.org/scheduler/job/7006578#L6164 - https://lkft.validation.linaro.org/scheduler/job/7006482#L9235 metadata: git_ref: master git_repo: https://gitlab.com/Linaro/lkft/mirrors/next/linux-next git_sha: b622d91ca201bf97582e9b09ebbaab005ecee86f git_describe: next-20231109 kernel_version: 6.6.0 kernel-config: https://storage.tuxsuite.com/public/linaro/lkft/builds/2Xv92VPrzXNNmQil9l8b… artifact-location: https://storage.tuxsuite.com/public/linaro/lkft/builds/2Xv92VPrzXNNmQil9l8b… toolchain: gcc-13 -- Linaro LKFT https://lkft.linaro.org

6 months, 3 weeks

2
1
0 0

[PATCH 0/2] selftests/nolibc: run-user improvements

by Thomas Weißschuh

A small bugfix for "run-user XARCH=ppc64le" and run-user support for run-tests.sh. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Thomas Weißschuh (2): selftests/nolibc: introduce QEMU_ARCH_USER selftests/nolibc: run-tests.sh: enable testing via qemu-user tools/testing/selftests/nolibc/Makefile | 5 ++++- tools/testing/selftests/nolibc/run-tests.sh | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) --- base-commit: ba335752620565c25c3028fff9496bb8ef373602 change-id: 20770915-nolibc-run-user-845375a3ec4f Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

6 months, 3 weeks

4
7
0 0

[PATCH] selftests: sud_test: return correct emulated syscall value on RISC-V

by Clément Léger

Currently, the sud_test expects the emulated syscall to return the emulated syscall number. This assumption only works on architectures were the syscall calling convention use the same register for syscall number/syscall return value. This is not the case for RISC-V and thus the return value must be also emulated using the provided ucontext. Signed-off-by: Clément Léger <cleger(a)rivosinc.com> --- tools/testing/selftests/syscall_user_dispatch/sud_test.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/syscall_user_dispatch/sud_test.c b/tools/testing/selftests/syscall_user_dispatch/sud_test.c index b5d592d4099e..1b5553c19700 100644 --- a/tools/testing/selftests/syscall_user_dispatch/sud_test.c +++ b/tools/testing/selftests/syscall_user_dispatch/sud_test.c @@ -158,6 +158,14 @@ static void handle_sigsys(int sig, siginfo_t *info, void *ucontext) /* In preparation for sigreturn. */ SYSCALL_DISPATCH_OFF(glob_sel); + + /* + * Modify interrupted context returned value according to syscall + * calling convention + */ +#if defined(__riscv) + ((ucontext_t*)ucontext)->uc_mcontext.__gregs[REG_A0] = MAGIC_SYSCALL_1; +#endif } TEST(dispatch_and_return) -- 2.40.1

6 months, 3 weeks

2
3
0 0

[PATCH v2] tools/nolibc: mips: add support for PIC

by Thomas Weißschuh

MIPS requires some extra instructions to set up the $gp register for the with a pointer to the global data area. This isn't needed for non-PIC builds, but this patch enables the code unconditionally to prevent bitrot. Also enable PIC in one of the test configurations for ongoing validation. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- Changes in v2: - Preserver 8-byte alignment of stack pointer - Link to v1: https://lore.kernel.org/r/20231108-nolibc-pic-v1-1-9b7a429d5a6d@weissschuh.… --- tools/include/nolibc/arch-mips.h | 7 ++++++- tools/testing/selftests/nolibc/Makefile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/include/nolibc/arch-mips.h b/tools/include/nolibc/arch-mips.h index 3a2c76716b83..62cc50ef3288 100644 --- a/tools/include/nolibc/arch-mips.h +++ b/tools/include/nolibc/arch-mips.h @@ -184,8 +184,13 @@ void __attribute__((weak, noreturn, optimize("Os", "omit-frame-pointer"))) __no_ __asm__ volatile ( ".set push\n" ".set noreorder\n" - ".option pic0\n" + "bal 1f\n" /* prime $ra for .cpload */ + "nop\n" + "1:\n" + ".cpload $ra\n" "move $a0, $sp\n" /* save stack pointer to $a0, as arg1 of _start_c */ + "addiu $sp, $sp, -4\n" /* space for .cprestore to store $gp */ + ".cprestore 0\n" "li $t0, -8\n" "and $sp, $sp, $t0\n" /* $sp must be 8-byte aligned */ "addiu $sp, $sp, -16\n" /* the callee expects to save a0..a3 there */ diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 508435b8ac2a..484bb02d8e6c 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -144,7 +144,7 @@ CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2) CFLAGS_s390 = -m64 -CFLAGS_mips32le = -EL -mabi=32 +CFLAGS_mips32le = -EL -mabi=32 -fPIC CFLAGS_mips32be = -EB -mabi=32 CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 -W -Wall -Wextra \ --- base-commit: ba335752620565c25c3028fff9496bb8ef373602 change-id: 20770914-nolibc-pic-30043ffb0403 Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

6 months, 3 weeks

1
0
0 0

[PATCH] tools/nolibc: mips: add support for PIC

by Thomas Weißschuh

MIPS requires some extra instructions to set up the $gp register for the with a pointer to the global data area. This isn't needed for non-PIC builds, but this patch enables the code unconditionally to prevent bitrot. Also enable PIC in one of the test configurations for ongoing validation. Signed-off-by: Thomas Weißschuh <linux(a)weissschuh.net> --- tools/include/nolibc/arch-mips.h | 7 ++++++- tools/testing/selftests/nolibc/Makefile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/include/nolibc/arch-mips.h b/tools/include/nolibc/arch-mips.h index 3a2c76716b83..e9a01847c2b8 100644 --- a/tools/include/nolibc/arch-mips.h +++ b/tools/include/nolibc/arch-mips.h @@ -184,10 +184,15 @@ void __attribute__((weak, noreturn, optimize("Os", "omit-frame-pointer"))) __no_ __asm__ volatile ( ".set push\n" ".set noreorder\n" - ".option pic0\n" + "bal 1f\n" /* prime $ra for .cpload */ + "nop\n" + "1:\n" + ".cpload $ra\n" "move $a0, $sp\n" /* save stack pointer to $a0, as arg1 of _start_c */ "li $t0, -8\n" "and $sp, $sp, $t0\n" /* $sp must be 8-byte aligned */ + "addiu $sp, $sp, -4\n" /* space for .cprestore to store $gp */ + ".cprestore 0\n" "addiu $sp, $sp, -16\n" /* the callee expects to save a0..a3 there */ "jal _start_c\n" /* transfer to c runtime */ " nop\n" /* delayed slot */ diff --git a/tools/testing/selftests/nolibc/Makefile b/tools/testing/selftests/nolibc/Makefile index 508435b8ac2a..484bb02d8e6c 100644 --- a/tools/testing/selftests/nolibc/Makefile +++ b/tools/testing/selftests/nolibc/Makefile @@ -144,7 +144,7 @@ CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple) CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2) CFLAGS_s390 = -m64 -CFLAGS_mips32le = -EL -mabi=32 +CFLAGS_mips32le = -EL -mabi=32 -fPIC CFLAGS_mips32be = -EB -mabi=32 CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all)) CFLAGS ?= -Os -fno-ident -fno-asynchronous-unwind-tables -std=c89 -W -Wall -Wextra \ --- base-commit: ba335752620565c25c3028fff9496bb8ef373602 change-id: 20770914-nolibc-pic-30043ffb0403 Best regards, -- Thomas Weißschuh <linux(a)weissschuh.net>

6 months, 3 weeks

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror November 2023