October 2018 - Linux-kselftest-mirror

[PATCH 4.18 001/168] rseq/selftests: fix parametrized test with -fpie

by Greg Kroah-Hartman

4.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> commit ce01a1575f45bf319e374592656441021a7f5823 upstream. On x86-64, the parametrized selftest code for rseq crashes with a segmentation fault when compiled with -fpie. This happens when the param_test binary is loaded at an address beyond 32-bit on x86-64. The issue is caused by use of a 32-bit register to hold the address of the loop counter variable. Fix this by using a 64-bit register to calculate the address of the loop counter variables as an offset from rip. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: "Paul E . McKenney" <paulmck(a)linux.vnet.ibm.com> Cc: <stable(a)vger.kernel.org> # v4.18 Cc: Shuah Khan <shuah(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Joel Fernandes <joelaf(a)google.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Dave Watson <davejwatson(a)fb.com> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Andi Kleen <andi(a)firstfloor.org> Cc: linux-kselftest(a)vger.kernel.org Cc: "H . Peter Anvin" <hpa(a)zytor.com> Cc: Chris Lameter <cl(a)linux.com> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: Michael Kerrisk <mtk.manpages(a)gmail.com> Cc: "Paul E . McKenney" <paulmck(a)linux.vnet.ibm.com> Cc: Paul Turner <pjt(a)google.com> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: Josh Triplett <josh(a)joshtriplett.org> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Ben Maurer <bmaurer(a)fb.com> Cc: Andy Lutomirski <luto(a)amacapital.net> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Shuah Khan (Samsung OSG) <shuah(a)kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- tools/testing/selftests/rseq/param_test.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) --- a/tools/testing/selftests/rseq/param_test.c +++ b/tools/testing/selftests/rseq/param_test.c @@ -56,15 +56,13 @@ unsigned int yield_mod_cnt, nr_abort; printf(fmt, ## __VA_ARGS__); \ } while (0) -#if defined(__x86_64__) || defined(__i386__) +#ifdef __i386__ #define INJECT_ASM_REG "eax" #define RSEQ_INJECT_CLOBBER \ , INJECT_ASM_REG -#ifdef __i386__ - #define RSEQ_INJECT_ASM(n) \ "mov asm_loop_cnt_" #n ", %%" INJECT_ASM_REG "\n\t" \ "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \ @@ -76,9 +74,16 @@ unsigned int yield_mod_cnt, nr_abort; #elif defined(__x86_64__) +#define INJECT_ASM_REG_P "rax" +#define INJECT_ASM_REG "eax" + +#define RSEQ_INJECT_CLOBBER \ + , INJECT_ASM_REG_P \ + , INJECT_ASM_REG + #define RSEQ_INJECT_ASM(n) \ - "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG "\n\t" \ - "mov (%%" INJECT_ASM_REG "), %%" INJECT_ASM_REG "\n\t" \ + "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG_P "\n\t" \ + "mov (%%" INJECT_ASM_REG_P "), %%" INJECT_ASM_REG "\n\t" \ "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \ "jz 333f\n\t" \ "222:\n\t" \ @@ -86,10 +91,6 @@ unsigned int yield_mod_cnt, nr_abort; "jnz 222b\n\t" \ "333:\n\t" -#else -#error "Unsupported architecture" -#endif - #elif defined(__ARMEL__) #define RSEQ_INJECT_INPUT \

6 years

1
0
0 0

[PATCH 0/3] namei: implement various scoping AT_* flags

by Aleksa Sarai

The need for some sort of control over VFS's path resolution (to avoid malicious paths resulting in inadvertent breakouts) has been a very long-standing desire of many userspace applications. This patchset is a revival of Al Viro's old AT_NO_JUMPS[1] patchset with a few additions. The most obvious change is that AT_NO_JUMPS has been split as dicussed in the original thread, along with a further split of AT_NO_PROCLINKS which means that each individual property of AT_NO_JUMPS is now a separate flag: * Path-based escapes from the starting-point using "/" or ".." are blocked by AT_BENEATH. * Mountpoint crossings are blocked by AT_XDEV. * /proc/$pid/fd/$fd resolution is blocked by AT_NO_PROCLINKS (more correctly it actually blocks any user of nd_jump_link() because it allows out-of-VFS path resolution manipulation). AT_NO_JUMPS is now effectively (AT_BENEATH|AT_XDEV|AT_NO_PROCLINKS). At Linus' suggestion in the original thread, I've also implemented AT_NO_SYMLINKS which just denies _all_ symlink resolution (including "proclink" resolution). An additional improvement was made to AT_XDEV. The original AT_NO_JUMPS path didn't consider "/tmp/.." as a mountpoint crossing -- this patch blocks this as well (feel free to ask me to remove it if you feel this is not sane). Currently I've only enabled these for openat(2) and the stat(2) family. I would hope we could enable it for basically every *at(2) syscall -- but many of them appear to not have a @flags argument and thus we'll need to add several new syscalls to do this. I'm more than happy to send those patches, but I'd prefer to know that this preliminary work is acceptable before doing a bunch of copy-paste to add new sets of *at(2) syscalls. One additional feature I've implemented is AT_THIS_ROOT (I imagine this is probably going to be more contentious than the refresh of AT_NO_JUMPS, so I've included it in a separate patch). The patch itself describes my reasoning, but the shortened version of the premise is that continer runtimes need to have a way to resolve paths within a potentially malicious rootfs. Container runtimes currently do this in userspace[2] which has implicit race conditions that are not resolvable in userspace (or use fork+exec+chroot and SCM_RIGHTS passing which is inefficient). AT_THIS_ROOT allows for per-call chroot-like semantics for path resolution, which would be invaluable for us -- and the implementation is basically identical to AT_BENEATH (except that we don't return errors when someone actually hits the root). I've added some selftests for this, but it's not clear to me whether they should live here or in xfstests (as far as I can tell there are no other VFS tests in selftests, while there are some tests that look like generic VFS tests in xfstests). If you'd prefer them to be included in xfstests, let me know. [1]: https://lore.kernel.org/patchwork/patch/784221/ [2]: https://github.com/cyphar/filepath-securejoin Aleksa Sarai (3): namei: implement O_BENEATH-style AT_* flags namei: implement AT_THIS_ROOT chroot-like path resolution selftests: vfs: add AT_* path resolution tests fs/fcntl.c | 2 +- fs/namei.c | 158 ++++++++++++------ fs/open.c | 10 ++ fs/stat.c | 15 +- include/linux/fcntl.h | 3 +- include/linux/namei.h | 8 + include/uapi/asm-generic/fcntl.h | 20 +++ include/uapi/linux/fcntl.h | 10 ++ tools/testing/selftests/Makefile | 1 + tools/testing/selftests/vfs/.gitignore | 1 + tools/testing/selftests/vfs/Makefile | 13 ++ tools/testing/selftests/vfs/at_flags.h | 40 +++++ tools/testing/selftests/vfs/common.sh | 37 ++++ .../selftests/vfs/tests/0001_at_beneath.sh | 72 ++++++++ .../selftests/vfs/tests/0002_at_xdev.sh | 54 ++++++ .../vfs/tests/0003_at_no_proclinks.sh | 50 ++++++ .../vfs/tests/0004_at_no_symlinks.sh | 49 ++++++ .../selftests/vfs/tests/0005_at_this_root.sh | 66 ++++++++ tools/testing/selftests/vfs/vfs_helper.c | 154 +++++++++++++++++ 19 files changed, 707 insertions(+), 56 deletions(-) create mode 100644 tools/testing/selftests/vfs/.gitignore create mode 100644 tools/testing/selftests/vfs/Makefile create mode 100644 tools/testing/selftests/vfs/at_flags.h create mode 100644 tools/testing/selftests/vfs/common.sh create mode 100755 tools/testing/selftests/vfs/tests/0001_at_beneath.sh create mode 100755 tools/testing/selftests/vfs/tests/0002_at_xdev.sh create mode 100755 tools/testing/selftests/vfs/tests/0003_at_no_proclinks.sh create mode 100755 tools/testing/selftests/vfs/tests/0004_at_no_symlinks.sh create mode 100755 tools/testing/selftests/vfs/tests/0005_at_this_root.sh create mode 100644 tools/testing/selftests/vfs/vfs_helper.c -- 2.19.0

6 years

12
52
0 0

[PATCH] selftests: usbip: add wait after attach and before checking port status

by Shuah Khan (Samsung OSG)

Add sleep between attach and "usbip port" check to make sure status is updated. Running attach and query back shows incorrect status. Signed-off-by: Shuah Khan (Samsung OSG) <shuah(a)kernel.org> --- tools/testing/selftests/drivers/usb/usbip/usbip_test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh index a72df93cf1f8..128f0ab24307 100755 --- a/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh +++ b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh @@ -141,6 +141,10 @@ echo "Import devices from localhost - should work" src/usbip attach -r localhost -b $busid; echo "==============================================================" +# Wait for sysfs file to be updated. Without this sleep, usbip port +# shows no imported devices. +sleep 3; + echo "List imported devices - expect to see imported devices"; src/usbip port; echo "==============================================================" -- 2.17.0

6 years

1
0
0 0

Re: [PATCH 2/2] media: rc: self test for IR encoders and decoders

by Shuah Khan

Hi Sean, Thanks for the patch. I just happened to see this when Mauro sent it to me. Doesn't look like linux-ksefltest and I weren't on the patch? On 07/17/2018 03:33 PM, Sean Young (by way of Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org>) wrote: > ir-loopback can transmit IR on one rc device and check the correct > scancode and protocol is decoded on a different rc device. This can be > used to check IR transmission between two rc devices. Using rc-loopback, > we use it to check the IR encoders and decoders themselves. > > Signed-off-by: Sean Young <sean(a)mess.org> > --- > tools/testing/selftests/Makefile | 1 + > tools/testing/selftests/ir/.gitignore | 1 + > tools/testing/selftests/ir/Makefile | 19 ++ > tools/testing/selftests/ir/config | 12 ++ > tools/testing/selftests/ir/ir-loopback.c | 209 ++++++++++++++++++++++ > tools/testing/selftests/ir/ir-loopback.sh | 28 +++ > 6 files changed, 270 insertions(+) > create mode 100644 tools/testing/selftests/ir/.gitignore > create mode 100644 tools/testing/selftests/ir/Makefile > create mode 100644 tools/testing/selftests/ir/config > create mode 100644 tools/testing/selftests/ir/ir-loopback.c > create mode 100755 tools/testing/selftests/ir/ir-loopback.sh Why not add to the existing media directory? ../selftests/media_tests? > > diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile > index f1fe492c8e17..995034ea5546 100644 > --- a/tools/testing/selftests/Makefile > +++ b/tools/testing/selftests/Makefile > @@ -15,6 +15,7 @@ TARGETS += futex > TARGETS += gpio > TARGETS += intel_pstate > TARGETS += ipc > +TARGETS += ir Does this test depend on any hardware being present in the system? > TARGETS += kcmp > TARGETS += kvm > TARGETS += lib > diff --git a/tools/testing/selftests/ir/.gitignore b/tools/testing/selftests/ir/.gitignore > new file mode 100644 > index 000000000000..87bf2989b678 > --- /dev/null > +++ b/tools/testing/selftests/ir/.gitignore > @@ -0,0 +1 @@ > +ir-loopback > diff --git a/tools/testing/selftests/ir/Makefile b/tools/testing/selftests/ir/Makefile > new file mode 100644 > index 000000000000..501b464e56b5 > --- /dev/null > +++ b/tools/testing/selftests/ir/Makefile > @@ -0,0 +1,19 @@ > +# SPDX-License-Identifier: GPL-2.0 > +uname_M := $(shell uname -m 2>/dev/null || echo not) > +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/i386/) > +ifeq ($(ARCH),i386) > + ARCH := x86 > + CFLAGS := -DCONFIG_X86_32 -D__i386__ > +endif > +ifeq ($(ARCH),x86_64) > + ARCH := x86 > + CFLAGS := -DCONFIG_X86_64 -D__x86_64__ > +endif > + > +CFLAGS += -I../../../../usr/include/ > + > +TEST_PROGS := ir-loopback.sh > + > +TEST_GEN_PROGS := ir-loopback Looks like ir-loopback get run from ir-loopback.sh. TEST_GEN_PROGS_EXTENDED is the right variable to use in this case. TEST_GEN_PROGS_EXTENDED := ir-loopback > + > +include ../lib.mk > diff --git a/tools/testing/selftests/ir/config b/tools/testing/selftests/ir/config > new file mode 100644 > index 000000000000..78e041e9319e > --- /dev/null > +++ b/tools/testing/selftests/ir/config > @@ -0,0 +1,12 @@ > +CONFIG_RC_CORE=y > +CONFIG_RC_LOOPBACK=y > +CONFIG_IR_NEC_DECODER=m > +CONFIG_IR_RC5_DECODER=m > +CONFIG_IR_RC6_DECODER=m > +CONFIG_IR_JVC_DECODER=m > +CONFIG_IR_SONY_DECODER=m > +CONFIG_IR_SANYO_DECODER=m > +CONFIG_IR_SHARP_DECODER=m > +CONFIG_IR_MCE_KBD_DECODER=m > +CONFIG_IR_XMP_DECODER=m > +CONFIG_IR_IMON_DECODER=m > diff --git a/tools/testing/selftests/ir/ir-loopback.c b/tools/testing/selftests/ir/ir-loopback.c > new file mode 100644 > index 000000000000..95b6f0f2f1f5 > --- /dev/null > +++ b/tools/testing/selftests/ir/ir-loopback.c > @@ -0,0 +1,209 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// test ir decoder > +// > +// Copyright (C) 2018 Sean Young <sean(a)mess.org> > + > +// When sending LIRC_MODE_SCANCODE, the IR will be encoded. rc-loopback > +// will send this IR to the receiver side, where we try to read the decoded > +// IR. Decoding happens in a separate kernel thread, so we will need to > +// wait until that is scheduled, hence we use poll to check for read > +// readiness. > + > +#include <linux/lirc.h> > +#include <errno.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <stdbool.h> > +#include <string.h> > +#include <unistd.h> > +#include <poll.h> > +#include <time.h> > +#include <sys/types.h> > +#include <sys/ioctl.h> > +#include <dirent.h> > +#include <sys/stat.h> > +#include <fcntl.h> > + > +#define TEST_SCANCODES 10 > +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) > + > +static const struct { > + enum rc_proto proto; > + const char *name; > + unsigned int mask; > + const char *decoder; > +} protocols[] = { > + { RC_PROTO_RC5, "rc-5", 0x1f7f, "rc-5" }, > + { RC_PROTO_RC5X_20, "rc-5x-20", 0x1f7f3f, "rc-5" }, > + { RC_PROTO_RC5_SZ, "rc-5-sz", 0x2fff, "rc-5-sz" }, > + { RC_PROTO_JVC, "jvc", 0xffff, "jvc" }, > + { RC_PROTO_SONY12, "sony-12", 0x1f007f, "sony" }, > + { RC_PROTO_SONY15, "sony-15", 0xff007f, "sony" }, > + { RC_PROTO_SONY20, "sony-20", 0x1fff7f, "sony" }, > + { RC_PROTO_NEC, "nec", 0xffff, "nec" }, > + { RC_PROTO_NECX, "nec-x", 0xffffff, "nec" }, > + { RC_PROTO_NEC32, "nec-32", 0xffffffff, "nec" }, > + { RC_PROTO_SANYO, "sanyo", 0x1fffff, "sanyo" }, > + { RC_PROTO_RC6_0, "rc-6-0", 0xffff, "rc-6" }, > + { RC_PROTO_RC6_6A_20, "rc-6-6a-20", 0xfffff, "rc-6" }, > + { RC_PROTO_RC6_6A_24, "rc-6-6a-24", 0xffffff, "rc-6" }, > + { RC_PROTO_RC6_6A_32, "rc-6-6a-32", 0xffffffff, "rc-6" }, > + { RC_PROTO_RC6_MCE, "rc-6-mce", 0x00007fff, "rc-6" }, > + { RC_PROTO_SHARP, "sharp", 0x1fff, "sharp" }, > +}; > + > +int lirc_open(const char *rc) > +{ > + struct dirent *dent; > + char buf[100]; > + DIR *d; > + int fd; > + > + snprintf(buf, sizeof(buf), "/sys/class/rc/%s", rc); > + > + d = opendir(buf); > + if (!d) { > + printf("cannot open %s: %m\n", buf); > + exit(1); > + } In this case, you will have to differentiate file not found case and use ksft_exit_skip() to skip the test. > + > + while ((dent = readdir(d)) != NULL) { > + if (!strncmp(dent->d_name, "lirc", 4)) { > + snprintf(buf, sizeof(buf), "/dev/%s", dent->d_name); > + break; > + } > + } > + > + if (!dent) { > + printf("cannot find lirc device for %s\n", rc); > + exit(1); > + } This might be a Skip condition as opposed to error. In general when test can't be run due unmet dependencies, please use Skip and not fail. > + > + closedir(d); > + > + fd = open(buf, O_RDWR | O_NONBLOCK); > + if (fd == -1) { > + printf("cannot open: %s: %m\n", buf); > + exit(1); > + } > + > + return fd; > +} > + > +int main(int argc, char **argv) > +{ > + unsigned int mode; > + char buf[100]; > + int rlircfd, wlircfd, protocolfd, i, n; > + int errors = 0; > + > + srand(time(NULL)); > + > + if (argc != 3) { > + printf("Usage: %s <write rcN> <read rcN>n", argv[0]); > + return 2; > + } > + Please don't use random return codes. Return codes are interpreted by the common framework. Please check kselftest.h to see which one makes sense. > + rlircfd = lirc_open(argv[2]); > + mode = LIRC_MODE_SCANCODE; > + if (ioctl(rlircfd, LIRC_SET_REC_MODE, &mode)) { > + printf("failed to set scancode rec mode %s: %m\n", argv[2]); > + return 1; > + } > + Please don't use random return codes. Return codes are interpreted by the common framework. Please check kselftest.h to see which one makes sense. > + wlircfd = lirc_open(argv[1]); > + if (ioctl(wlircfd, LIRC_SET_SEND_MODE, &mode)) { > + printf("failed to set scancode send mode %s: %m\n", argv[1]); > + return 1; > + } > + Same as above. > + snprintf(buf, sizeof(buf), "/sys/class/rc/%s/protocols", argv[2]); > + protocolfd = open(buf, O_WRONLY); > + if (protocolfd == -1) { > + printf("failed to open %s: %m\n", buf); > + return 1; > + } > + Same as above. > + printf("Sending IR on %s and receiving IR on %s.\n", argv[1], argv[2]); > + > + for (i=0; i<ARRAY_SIZE(protocols); i++) { > + if (write(protocolfd, protocols[i].decoder, > + strlen(protocols[i].decoder)) == -1) { > + printf("failed to set write decoder\n"); > + return 1; > + } > + > + printf("Testing protocol %s for decoder %s (%d/%d)...\n", > + protocols[i].name, protocols[i].decoder, > + i + 1, (int)ARRAY_SIZE(protocols)); > + > + for (n=0; n<TEST_SCANCODES; n++) { > + unsigned scancode = rand() & protocols[i].mask; > + unsigned rc_proto = protocols[i].proto; > + > + if (rc_proto == RC_PROTO_RC6_MCE) > + scancode |= 0x800f0000; > + > + if (rc_proto == RC_PROTO_NECX && > + (((scancode >> 16) ^ ~(scancode >> 8)) & 0xff) == 0) > + continue; > + > + if (rc_proto == RC_PROTO_NEC32 && > + (((scancode >> 8) ^ ~scancode) & 0xff) == 0) > + continue; > + > + struct lirc_scancode lsc = { > + .rc_proto = rc_proto, > + .scancode = scancode > + }; > + > + printf("Testing scancode:%x\n", scancode); > + > + while (write(wlircfd, &lsc, sizeof(lsc)) < 0) { > + if (errno == EINTR) > + continue; > + > + printf("failed to send ir: %m\n"); > + return 1; > + } > + > + struct pollfd pfd = { .fd = rlircfd, .events = POLLIN }; > + struct lirc_scancode lsc2; > + > + poll(&pfd, 1, 1000); > + > + bool decoded = true; > + > + while (read(rlircfd, &lsc2, sizeof(lsc2)) < 0) { > + if (errno == EINTR) > + continue; > + > + printf("no scancode decoded: %m\n"); > + errors++; > + decoded = false; > + break; > + } > + > + if (!decoded) > + continue; > + > + if (lsc.rc_proto != lsc2.rc_proto) { > + printf("decoded protocol is different: %d\n", lsc2.rc_proto); > + errors++; > + } > + > + if (lsc.scancode != lsc2.scancode) { > + printf("decoded scancode is different: %llx\n", lsc2.scancode); > + errors++; > + } > + } > + > + printf("OK\n"); > + } > + > + close(rlircfd); > + close(wlircfd); > + close(protocolfd); > + > + return errors > 0; > +} > diff --git a/tools/testing/selftests/ir/ir-loopback.sh b/tools/testing/selftests/ir/ir-loopback.sh > new file mode 100755 > index 000000000000..72be64a45cc5 > --- /dev/null > +++ b/tools/testing/selftests/ir/ir-loopback.sh > @@ -0,0 +1,28 @@ > +#!/bin/bash > +# SPDX-License-Identifier: GPL-2.0 > + > +GREEN='\033[0;92m' > +RED='\033[0;31m' > +NC='\033[0m' # No Color > + > +modprobe rc-loopback Please check rc-loopback exists or not and handle modprobe failures. If module doesn't exit, the test should exit with skip code. > + > +for i in /sys/class/rc/rc* > +do > + if grep -q DRV_NAME=rc-loopback $i/uevent > + then > + RCDEV=$(echo $i | sed sQ/sys/class/rc/QQ) > + fi > +done > + > +if [ -n $RCDEV ]; > +then > + TYPE=ir-loopback > + ./ir-loopback $RCDEV $RCDEV > + ret=$? > + if [ $ret -ne 0 ]; then > + echo -e ${RED}"FAIL: $TYPE"${NC} > + else > + echo -e ${GREEN}"PASS: $TYPE"${NC} > + fi > +fi > Please check tools/testing/selftests/lib/*.sh for examples on how to handle loading test modules and error/skip conditions. Please refer to the following or other tests that call ksft_* interfaces. tools/testing/selftests/membarrier tools/testing/selftests/breakpoints thanks, -- Shuah

6 years

2
1
0 0

[PATCH backport for 4.18] rseq/selftests: fix parametrized test with -fpie

by Mathieu Desnoyers

commit ce01a1575f45bf319e374592656441021a7f5823 upstream. On x86-64, the parametrized selftest code for rseq crashes with a segmentation fault when compiled with -fpie. This happens when the param_test binary is loaded at an address beyond 32-bit on x86-64. The issue is caused by use of a 32-bit register to hold the address of the loop counter variable. Fix this by using a 64-bit register to calculate the address of the loop counter variables as an offset from rip. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> Acked-by: "Paul E . McKenney" <paulmck(a)linux.vnet.ibm.com> Cc: <stable(a)vger.kernel.org> # v4.18 Cc: Shuah Khan <shuah(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Joel Fernandes <joelaf(a)google.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Catalin Marinas <catalin.marinas(a)arm.com> Cc: Dave Watson <davejwatson(a)fb.com> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Andi Kleen <andi(a)firstfloor.org> Cc: linux-kselftest(a)vger.kernel.org Cc: "H . Peter Anvin" <hpa(a)zytor.com> Cc: Chris Lameter <cl(a)linux.com> Cc: Russell King <linux(a)arm.linux.org.uk> Cc: Michael Kerrisk <mtk.manpages(a)gmail.com> Cc: "Paul E . McKenney" <paulmck(a)linux.vnet.ibm.com> Cc: Paul Turner <pjt(a)google.com> Cc: Boqun Feng <boqun.feng(a)gmail.com> Cc: Josh Triplett <josh(a)joshtriplett.org> Cc: Steven Rostedt <rostedt(a)goodmis.org> Cc: Ben Maurer <bmaurer(a)fb.com> Cc: Andy Lutomirski <luto(a)amacapital.net> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> --- tools/testing/selftests/rseq/param_test.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/rseq/param_test.c b/tools/testing/selftests/rseq/param_test.c index 615252331813..4bc071525bf7 100644 --- a/tools/testing/selftests/rseq/param_test.c +++ b/tools/testing/selftests/rseq/param_test.c @@ -56,15 +56,13 @@ unsigned int yield_mod_cnt, nr_abort; printf(fmt, ## __VA_ARGS__); \ } while (0) -#if defined(__x86_64__) || defined(__i386__) +#ifdef __i386__ #define INJECT_ASM_REG "eax" #define RSEQ_INJECT_CLOBBER \ , INJECT_ASM_REG -#ifdef __i386__ - #define RSEQ_INJECT_ASM(n) \ "mov asm_loop_cnt_" #n ", %%" INJECT_ASM_REG "\n\t" \ "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \ @@ -76,9 +74,16 @@ unsigned int yield_mod_cnt, nr_abort; #elif defined(__x86_64__) +#define INJECT_ASM_REG_P "rax" +#define INJECT_ASM_REG "eax" + +#define RSEQ_INJECT_CLOBBER \ + , INJECT_ASM_REG_P \ + , INJECT_ASM_REG + #define RSEQ_INJECT_ASM(n) \ - "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG "\n\t" \ - "mov (%%" INJECT_ASM_REG "), %%" INJECT_ASM_REG "\n\t" \ + "lea asm_loop_cnt_" #n "(%%rip), %%" INJECT_ASM_REG_P "\n\t" \ + "mov (%%" INJECT_ASM_REG_P "), %%" INJECT_ASM_REG "\n\t" \ "test %%" INJECT_ASM_REG ",%%" INJECT_ASM_REG "\n\t" \ "jz 333f\n\t" \ "222:\n\t" \ @@ -86,10 +91,6 @@ unsigned int yield_mod_cnt, nr_abort; "jnz 222b\n\t" \ "333:\n\t" -#else -#error "Unsupported architecture" -#endif - #elif defined(__ARMEL__) #define RSEQ_INJECT_INPUT \ -- 2.17.1

6 years

3
2
0 0

selftests/rseq: run_param_test.sh runs long

by Naresh Kamboju

Restart able sequences test "run_param_test.sh" test case running long on target devices. I have listed test duration on x86_64, arm64 and arm32. Steps: # cd selftests/rseq # time ./run_param_test.sh x86_64: real 10m7.311s user 3m5.740s sys 20m11.961s Juno-r2 (arm64): real 26m33.530s user 13m40.909s sys 116m52.032s Dragonboard-410c (arm64): More than hour and counting Beagleboard x15 (arm32): More than hour and counting Full test job on Juno (arm64): https://lkft.validation.linaro.org/scheduler/job/451267#L1331 Full test job on x15 (arm32): https://lkft.validation.linaro.org/scheduler/job/451310 Any chance we could reduce the number of loops (REPS=1000) ? or Is it more of bench marking performance test case than functional test case ? Single test case running more than hour on device under testing (DUT) is not a great idea for testing per commit / push. Your feedback is appreciated on running or skipping (exclude from default run) this test case from selftest full run. Thank you. Best regards Naresh Kamboju

6 years

2
2
0 0

[GIT PULL] kselftest fixes update for Linux-4.19-rc7

by Shuah Khan

Hi Greg, Please pull the following kselftest for 4.19-rc7. linux-kselftest-4.19-rc7 This fixes update for 4.19-rc7 consists one fix to rseq test to prevent it from seg-faulting when compiled with -fpie. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 7876320f88802b22d4e2daf7eb027dd14175a0f8: Linux 4.19-rc4 (2018-09-16 11:52:37 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-4.19-rc7 for you to fetch changes up to ce01a1575f45bf319e374592656441021a7f5823: rseq/selftests: fix parametrized test with -fpie (2018-09-27 12:59:19 -0600) ---------------------------------------------------------------- linux-kselftest-4.19-rc7 This fixes update for 4.19-rc7 consists one fix to rseq test to prevent it from seg-faulting when compiled with -fpie. ---------------------------------------------------------------- Mathieu Desnoyers (1): rseq/selftests: fix parametrized test with -fpie tools/testing/selftests/rseq/param_test.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ----------------------------------------------------------------

6 years

2
1
0 0

[PATCH v3 1/2] selftests: gpio: restructure Makefile

by Daniel Díaz

From: Fathi Boudra <fathi.boudra(a)linaro.org> This patch cleans up the Makefile by restructuring a couple of things, namely: 1) change explicit paths in targets for variables 2) substitute a variable (BINARIES) for another, part of the selftests build system (TEST_PROGS_EXTENDED) 3) proper cleaning up of the EXTRA objects The resulting Makefile is much more readable and manageable. Signed-off-by: Fathi Boudra <fathi.boudra(a)linaro.org> Signed-off-by: Daniel Díaz <daniel.diaz(a)linaro.org> --- tools/testing/selftests/gpio/Makefile | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile index 4665cdb..a4a01ec8 100644 --- a/tools/testing/selftests/gpio/Makefile +++ b/tools/testing/selftests/gpio/Makefile @@ -1,28 +1,26 @@ # SPDX-License-Identifier: GPL-2.0 +CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/ +LDLIBS += -lmount -I/usr/include/libmount + TEST_PROGS := gpio-mockup.sh -TEST_FILES := gpio-mockup-sysfs.sh $(BINARIES) -BINARIES := gpio-mockup-chardev -EXTRA_PROGS := ../gpiogpio-event-mon ../gpiogpio-hammer ../gpiolsgpio -EXTRA_DIRS := ../gpioinclude/ -EXTRA_OBJS := ../gpiogpio-event-mon-in.o ../gpiogpio-event-mon.o -EXTRA_OBJS += ../gpiogpio-hammer-in.o ../gpiogpio-utils.o ../gpiolsgpio-in.o -EXTRA_OBJS += ../gpiolsgpio.o +TEST_FILES := gpio-mockup-sysfs.sh +TEST_PROGS_EXTENDED := gpio-mockup-chardev + +GPIODIR := ../../../gpio +GPIOOBJ := gpio-utils.o include ../lib.mk -all: $(BINARIES) +all: $(TEST_PROGS_EXTENDED) override define CLEAN - $(RM) $(BINARIES) $(EXTRA_PROGS) $(EXTRA_OBJS) - $(RM) -r $(EXTRA_DIRS) + $(RM) $(TEST_PROGS_EXTENDED) + $(MAKE) -C $(GPIODIR) clean endef -CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/ -LDLIBS += -lmount -I/usr/include/libmount - -$(BINARIES):| khdr -$(BINARIES): ../../../gpio/gpio-utils.o +$(TEST_PROGS_EXTENDED):| khdr +$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) -../../../gpio/gpio-utils.o: - make ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C ../../../gpio +$(GPIODIR)/$(GPIOOBJ): + $(MAKE) -C $(GPIODIR) -- 2.7.4

6 years

2
3
0 0

[PATCH v6 00/11] arm64: untag user pointers passed to the kernel

by Andrey Konovalov

arm64 has a feature called Top Byte Ignore, which allows to embed pointer tags into the top byte of each pointer. Userspace programs (such as HWASan, a memory debugging tool [1]) might use this feature and pass tagged user pointers to the kernel through syscalls or other interfaces. This patch makes a few of the kernel interfaces accept tagged user pointers. The kernel is already able to handle user faults with tagged pointers and has the untagged_addr macro, which this patchset reuses. Thanks! [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html Changes in v6: - Added annotations for user pointer casts found by sparse. - Rebased onto 050cdc6c (4.19-rc1+). Changes in v5: - Added 3 new patches that add untagging to places found with static analysis. - Rebased onto 44c929e1 (4.18-rc8). Changes in v4: - Added a selftest for checking that passing tagged pointers to the kernel succeeds. - Rebased onto 81e97f013 (4.18-rc1+). Changes in v3: - Rebased onto e5c51f30 (4.17-rc6+). - Added linux-arch@ to the list of recipients. Changes in v2: - Rebased onto 2d618bdf (4.17-rc3+). - Removed excessive untagging in gup.c. - Removed untagging pointers returned from __uaccess_mask_ptr. Changes in v1: - Rebased onto 4.17-rc1. Changes in RFC v2: - Added "#ifndef untagged_addr..." fallback in linux/uaccess.h instead of defining it for each arch individually. - Updated Documentation/arm64/tagged-pointers.txt. - Dropped "mm, arm64: untag user addresses in memory syscalls". - Rebased onto 3eb2ce82 (4.16-rc7). Andrey Konovalov (11): arm64: add type casts to untagged_addr macro uaccess: add untagged_addr definition for other arches arm64: untag user addresses in access_ok and __uaccess_mask_ptr mm, arm64: untag user addresses in mm/gup.c lib, arm64: untag addrs passed to strncpy_from_user and strnlen_user arm64: untag user address in __do_user_fault fs, arm64: untag user address in copy_mount_options usb, arm64: untag user addresses in devio arm64: update Documentation/arm64/tagged-pointers.txt selftests, arm64: add a selftest for passing tagged pointers to kernel arm64: annotate user pointers casts detected by sparse Documentation/arm64/tagged-pointers.txt | 5 +-- arch/arm64/include/asm/compat.h | 2 +- arch/arm64/include/asm/uaccess.h | 16 ++++++---- arch/arm64/kernel/perf_callchain.c | 4 +-- arch/arm64/kernel/signal.c | 16 +++++----- arch/arm64/kernel/signal32.c | 6 ++-- arch/arm64/mm/fault.c | 4 +-- block/compat_ioctl.c | 15 +++++---- drivers/ata/libata-scsi.c | 2 +- drivers/block/loop.c | 2 +- drivers/gpio/gpiolib.c | 8 +++-- drivers/input/evdev.c | 2 +- drivers/media/dvb-core/dvb_frontend.c | 3 +- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 9 +++--- drivers/mmc/core/block.c | 6 ++-- drivers/mtd/mtdchar.c | 2 +- drivers/net/tap.c | 2 +- drivers/net/tun.c | 2 +- drivers/spi/spidev.c | 6 ++-- drivers/tty/tty_ioctl.c | 3 +- drivers/tty/vt/vt_ioctl.c | 5 +-- drivers/usb/core/devio.c | 10 ++++-- drivers/vfio/vfio.c | 6 ++-- drivers/video/fbdev/core/fbmem.c | 4 +-- drivers/xen/gntdev.c | 6 ++-- drivers/xen/privcmd.c | 4 +-- fs/aio.c | 2 +- fs/autofs/dev-ioctl.c | 3 +- fs/autofs/root.c | 2 +- fs/binfmt_elf.c | 10 +++--- fs/btrfs/ioctl.c | 2 +- fs/compat_ioctl.c | 32 ++++++++++--------- fs/ext2/ioctl.c | 2 +- fs/ext4/ioctl.c | 2 +- fs/fat/file.c | 3 +- fs/fuse/file.c | 2 +- fs/namespace.c | 2 +- fs/readdir.c | 4 +-- fs/signalfd.c | 10 +++--- include/linux/mm.h | 2 +- include/linux/pagemap.h | 8 ++--- include/linux/socket.h | 2 +- include/linux/uaccess.h | 4 +++ ipc/shm.c | 4 +-- kernel/futex.c | 6 ++-- kernel/futex_compat.c | 2 +- kernel/power/user.c | 2 +- kernel/signal.c | 2 +- lib/iov_iter.c | 16 +++++----- lib/strncpy_from_user.c | 4 ++- lib/strnlen_user.c | 6 ++-- lib/test_kasan.c | 2 +- mm/gup.c | 4 +++ mm/memory.c | 2 +- mm/migrate.c | 4 +-- mm/process_vm_access.c | 13 ++++---- net/bluetooth/hidp/sock.c | 2 +- net/compat.c | 12 ++++--- sound/core/control_compat.c | 5 +-- sound/core/pcm_native.c | 5 +-- sound/core/timer_compat.c | 3 +- tools/testing/selftests/arm64/.gitignore | 1 + tools/testing/selftests/arm64/Makefile | 11 +++++++ .../testing/selftests/arm64/run_tags_test.sh | 12 +++++++ tools/testing/selftests/arm64/tags_test.c | 19 +++++++++++ 65 files changed, 232 insertions(+), 147 deletions(-) create mode 100644 tools/testing/selftests/arm64/.gitignore create mode 100644 tools/testing/selftests/arm64/Makefile create mode 100755 tools/testing/selftests/arm64/run_tags_test.sh create mode 100644 tools/testing/selftests/arm64/tags_test.c -- 2.19.0.rc0.228.g281dcd1b4d0-goog

6 years

6
32
0 0

[PATCH net-next] selftests/tls: Fix recv(MSG_PEEK) & splice() test cases

by Vakul Garg

TLS test cases splice_from_pipe, send_and_splice & recv_peek_multiple_records expect to receive a given nummber of bytes and then compare them against the number of bytes which were sent. Therefore, system call recv() must not return before receiving the requested number of bytes, otherwise the subsequent memcmp() fails. This patch passes MSG_WAITALL flag to recv() so that it does not return prematurely before requested number of bytes are copied to receive buffer. Signed-off-by: Vakul Garg <vakul.garg(a)nxp.com> --- tools/testing/selftests/net/tls.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index 11d54c36ae49..fac68d710f35 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -288,7 +288,7 @@ TEST_F(tls, splice_from_pipe) ASSERT_GE(pipe(p), 0); EXPECT_GE(write(p[1], mem_send, send_len), 0); EXPECT_GE(splice(p[0], NULL, self->fd, NULL, send_len, 0), 0); - EXPECT_GE(recv(self->cfd, mem_recv, send_len, 0), 0); + EXPECT_EQ(recv(self->cfd, mem_recv, send_len, MSG_WAITALL), send_len); EXPECT_EQ(memcmp(mem_send, mem_recv, send_len), 0); } @@ -322,13 +322,13 @@ TEST_F(tls, send_and_splice) ASSERT_GE(pipe(p), 0); EXPECT_EQ(send(self->fd, test_str, send_len2, 0), send_len2); - EXPECT_NE(recv(self->cfd, buf, send_len2, 0), -1); + EXPECT_EQ(recv(self->cfd, buf, send_len2, MSG_WAITALL), send_len2); EXPECT_EQ(memcmp(test_str, buf, send_len2), 0); EXPECT_GE(write(p[1], mem_send, send_len), send_len); EXPECT_GE(splice(p[0], NULL, self->fd, NULL, send_len, 0), send_len); - EXPECT_GE(recv(self->cfd, mem_recv, send_len, 0), 0); + EXPECT_EQ(recv(self->cfd, mem_recv, send_len, MSG_WAITALL), send_len); EXPECT_EQ(memcmp(mem_send, mem_recv, send_len), 0); } @@ -516,17 +516,17 @@ TEST_F(tls, recv_peek_multiple_records) len = strlen(test_str_second) + 1; EXPECT_EQ(send(self->fd, test_str_second, len, 0), len); - len = sizeof(buf); + len = strlen(test_str_first); memset(buf, 0, len); - EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1); + EXPECT_EQ(recv(self->cfd, buf, len, MSG_PEEK | MSG_WAITALL), len); /* MSG_PEEK can only peek into the current record. */ - len = strlen(test_str_first) + 1; + len = strlen(test_str_first); EXPECT_EQ(memcmp(test_str_first, buf, len), 0); - len = sizeof(buf); + len = strlen(test_str) + 1; memset(buf, 0, len); - EXPECT_NE(recv(self->cfd, buf, len, 0), -1); + EXPECT_EQ(recv(self->cfd, buf, len, MSG_WAITALL), len); /* Non-MSG_PEEK will advance strparser (and therefore record) * however. @@ -543,9 +543,9 @@ TEST_F(tls, recv_peek_multiple_records) len = strlen(test_str_second) + 1; EXPECT_EQ(send(self->fd, test_str_second, len, 0), len); - len = sizeof(buf); + len = strlen(test_str) + 1; memset(buf, 0, len); - EXPECT_NE(recv(self->cfd, buf, len, MSG_PEEK), -1); + EXPECT_EQ(recv(self->cfd, buf, len, MSG_PEEK | MSG_WAITALL), len); len = strlen(test_str) + 1; EXPECT_EQ(memcmp(test_str, buf, len), 0); -- 2.13.6

6 years

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror October 2018