- Linux-kselftest-mirror - lists.linaro.org

[PATCH AUTOSEL 5.1 40/59] selftests: set sysctl bc_forwarding properly in router_broadcast.sh

by Sasha Levin

From: Xin Long <lucien.xin(a)gmail.com> [ Upstream commit 67c0aaa1eaec60e9dab301012bdebe6726ae04bd ] sysctl setting bc_forwarding for $rp2 is needed when ping_test_from h2, otherwise the bc packets from $rp2 won't be forwarded. This patch is to add this setting for $rp2. Also, as ping_test_from does grep "$from" only, which could match some unexpected output, some test case doesn't really work, like: # ping_test_from $h2 198.51.200.255 198.51.200.2 PING 198.51.200.255 from 198.51.100.2 veth3: 56(84) bytes of data. 64 bytes from 198.51.100.1: icmp_seq=1 ttl=64 time=0.336 ms When doing grep $form (198.51.200.2), the output could still match. So change to grep "bytes from $from" instead. Fixes: 40f98b9af943 ("selftests: add a selftest for directed broadcast forwarding") Signed-off-by: Xin Long <lucien.xin(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/net/forwarding/router_broadcast.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_broadcast.sh b/tools/testing/selftests/net/forwarding/router_broadcast.sh index 9a678ece32b4..4eac0a06f451 100755 --- a/tools/testing/selftests/net/forwarding/router_broadcast.sh +++ b/tools/testing/selftests/net/forwarding/router_broadcast.sh @@ -145,16 +145,19 @@ bc_forwarding_disable() { sysctl_set net.ipv4.conf.all.bc_forwarding 0 sysctl_set net.ipv4.conf.$rp1.bc_forwarding 0 + sysctl_set net.ipv4.conf.$rp2.bc_forwarding 0 } bc_forwarding_enable() { sysctl_set net.ipv4.conf.all.bc_forwarding 1 sysctl_set net.ipv4.conf.$rp1.bc_forwarding 1 + sysctl_set net.ipv4.conf.$rp2.bc_forwarding 1 } bc_forwarding_restore() { + sysctl_restore net.ipv4.conf.$rp2.bc_forwarding sysctl_restore net.ipv4.conf.$rp1.bc_forwarding sysctl_restore net.ipv4.conf.all.bc_forwarding } @@ -171,7 +174,7 @@ ping_test_from() log_info "ping $dip, expected reply from $from" ip vrf exec $(master_name_get $oif) \ $PING -I $oif $dip -c 10 -i 0.1 -w $PING_TIMEOUT -b 2>&1 \ - | grep $from &> /dev/null + | grep "bytes from $from" > /dev/null check_err_fail $fail $? } -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 32/59] selftests: vm: install test_vmalloc.sh for run_vmtests

by Sasha Levin

From: Naresh Kamboju <naresh.kamboju(a)linaro.org> [ Upstream commit bc2cce3f2ebcae02aa4bb29e3436bf75ee674c32 ] Add test_vmalloc.sh to TEST_FILES to make sure it gets installed for run_vmtests. Fixed below error: ./run_vmtests: line 217: ./test_vmalloc.sh: No such file or directory Tested with: make TARGETS=vm install INSTALL_PATH=$PWD/x Signed-off-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/vm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index e13eb6cc8901..05306c58ff9f 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,6 +25,8 @@ TEST_GEN_FILES += virtual_address_range TEST_PROGS := run_vmtests +TEST_FILES := test_vmalloc.sh + KSFT_KHDR_INSTALL := 1 include ../lib.mk -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 31/59] userfaultfd: selftest: fix compiler warning

by Sasha Levin

From: Alakesh Haloi <alakesh.haloi(a)gmail.com> [ Upstream commit 98a13a8d253999cf25eb16d901c35fbd2a8455c4 ] Fixes following compiler warning userfaultfd.c: In function ‘usage’: userfaultfd.c:126:2: warning: format not a string literal and no format arguments [-Wformat-security] fprintf(stderr, examples); Signed-off-by: Alakesh Haloi <alakesh.haloi(a)gmail.com> Reviewed-by: Peter Xu <peterx(a)redhat.com> Reviewed-by: Mike Rapoport <rppt(a)linux.ibm.com> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/vm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 5d1db824f73a..b3e6497b080c 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -123,7 +123,7 @@ static void usage(void) fprintf(stderr, "Supported <test type>: anon, hugetlb, " "hugetlb_shared, shmem\n\n"); fprintf(stderr, "Examples:\n\n"); - fprintf(stderr, examples); + fprintf(stderr, "%s", examples); exit(1); } -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 30/59] kselftest/cgroup: fix incorrect test_core skip

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit f97f3f8839eb9de5843066d80819884f7722c8c5 ] The test_core will skip the test_cgcore_no_internal_process_constraint_on_threads test case if the 'cpu' controller missing in root's subtree_control. In fact we need to set the 'cpu' in subtree_control, to make the testing meaningful. ./test_core ... ok 4 # skip test_cgcore_no_internal_process_constraint_on_threads ... Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Tejun Heo <tj(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Claudio Zumbo <claudioz(a)fb.com> Cc: Claudio <claudiozumbo(a)gmail.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index d78f1c5366d3..79053a4f4783 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -198,7 +198,7 @@ static int test_cgcore_no_internal_process_constraint_on_threads(const char *roo char *parent = NULL, *child = NULL; if (cg_read_strstr(root, "cgroup.controllers", "cpu") || - cg_read_strstr(root, "cgroup.subtree_control", "cpu")) { + cg_write(root, "cgroup.subtree_control", "+cpu")) { ret = KSFT_SKIP; goto cleanup; } -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 29/59] kselftest/cgroup: fix unexpected testing failure on test_core

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit 00e38a5d753d7788852f81703db804a60a84c26e ] The cgroup testing relys on the root cgroup's subtree_control setting, If the 'memory' controller isn't set, some test cases will be failed as following: $sudo ./test_core not ok 1 test_cgcore_internal_process_constraint ok 2 test_cgcore_top_down_constraint_enable not ok 3 test_cgcore_top_down_constraint_disable ... To correct this unexpected failure, this patch write the 'memory' to subtree_control of root to get a right result. Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Tejun Heo <tj(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Claudio Zumbo <claudioz(a)fb.com> Cc: Claudio <claudiozumbo(a)gmail.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index be59f9c34ea2..d78f1c5366d3 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -376,6 +376,11 @@ int main(int argc, char *argv[]) if (cg_find_unified_root(root, sizeof(root))) ksft_exit_skip("cgroup v2 isn't mounted\n"); + + if (cg_read_strstr(root, "cgroup.subtree_control", "memory")) + if (cg_write(root, "cgroup.subtree_control", "+memory")) + ksft_exit_skip("Failed to set memory controller\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { switch (tests[i].fn(root)) { case KSFT_PASS: -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 28/59] kselftest/cgroup: fix unexpected testing failure on test_memcontrol

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit f6131f28057d4fd8922599339e701a2504e0f23d ] The cgroup testing relies on the root cgroup's subtree_control setting, If the 'memory' controller isn't set, all test cases will be failed as following: $ sudo ./test_memcontrol not ok 1 test_memcg_subtree_control not ok 2 test_memcg_current ok 3 # skip test_memcg_min not ok 4 test_memcg_low not ok 5 test_memcg_high not ok 6 test_memcg_max not ok 7 test_memcg_oom_events ok 8 # skip test_memcg_swap_max not ok 9 test_memcg_sock not ok 10 test_memcg_oom_group_leaf_events not ok 11 test_memcg_oom_group_parent_events not ok 12 test_memcg_oom_group_score_events To correct this unexpected failure, this patch write the 'memory' to subtree_control of root to get a right result. Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Tejun Heo <tj(a)kernel.org> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> Cc: Jay Kamat <jgkamat(a)fb.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_memcontrol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 6f339882a6ca..c19a97dd02d4 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1205,6 +1205,10 @@ int main(int argc, char **argv) if (cg_read_strstr(root, "cgroup.controllers", "memory")) ksft_exit_skip("memory controller isn't available\n"); + if (cg_read_strstr(root, "cgroup.subtree_control", "memory")) + if (cg_write(root, "cgroup.subtree_control", "+memory")) + ksft_exit_skip("Failed to set memory controller\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { switch (tests[i].fn(root)) { case KSFT_PASS: -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH net-next v2 0/3] UDP GSO audit tests

by Fred Klassen

Updates to UDP GSO selftests ot optionally stress test CMSG subsytem, and report the reliability and performance of both TX Timestamping and ZEROCOPY messages. Fred Klassen (3): net/udpgso_bench_tx: options to exercise TX CMSG net/udpgso_bench.sh add UDP GSO audit tests net/udpgso_bench.sh test fails on error tools/testing/selftests/net/udpgso_bench.sh | 51 +++- tools/testing/selftests/net/udpgso_bench_tx.c | 324 ++++++++++++++++++++++++-- 2 files changed, 357 insertions(+), 18 deletions(-) -- 2.11.0

5 years, 11 months

2
8
0 0

kselftest build broken?

by Dmitry Vyukov

Hi, I've tried to build kselftests for several years now, but I always find the build broken. Which makes me wonder if the instructions are broken or something. I follow the instructions in Documentation/dev-tools/kselftest.rst and start with "make -C tools/testing/selftests". Here is the errors I get on the upstream commit 16d72dd4891fecc1e1bf7ca193bb7d5b9804c038: error: unable to create target: 'No available targets are compatible with triple "bpf"' 1 error generated. Makefile:259: recipe for target 'elfdep' failed Makefile:156: recipe for target 'all' failed Makefile:106: recipe for target '/linux/tools/testing/selftests/bpf/libbpf.a' failed test_execve.c:4:10: fatal error: cap-ng.h: No such file or directory ../lib.mk:138: recipe for target '/linux/tools/testing/selftests/capabilities/test_execve' failed gpio-mockup-chardev.c:20:10: fatal error: libmount.h: No such file or directory <builtin>: recipe for target 'gpio-mockup-chardev' failed fuse_mnt.c:17:10: fatal error: fuse.h: No such file or directory ../lib.mk:138: recipe for target '/linux/tools/testing/selftests/memfd/fuse_mnt' failed collect2: error: ld returned 1 exit status ../lib.mk:138: recipe for target '/linux/tools/testing/selftests/mqueue/mq_open_tests' failed reuseport_bpf_numa.c:24:10: fatal error: numa.h: No such file or directory ../lib.mk:138: recipe for target '/linux/tools/testing/selftests/net/reuseport_bpf_numa' failed mlock-random-test.c:8:10: fatal error: sys/capability.h: No such file or directory ../lib.mk:138: recipe for target '/linux/tools/testing/selftests/vm/mlock-random-test' failed Here is full log: https://gist.githubusercontent.com/dvyukov/47430636e160f297b657df5ba2efa82b… I have libelf-dev installed. Do I need to install something else? Or run some other command? Thanks

5 years, 11 months

4
19
0 0

[PATCH] bpf: selftests: Fix warning in flow_dissector

by Arthur Fabre

Building the userspace part of the flow_dissector resulted in: prog_tests/flow_dissector.c: In function ‘tx_tap’: prog_tests/flow_dissector.c:176:9: warning: implicit declaration of function ‘writev’; did you mean ‘write’? [-Wimplicit-function-declaration] return writev(fd, iov, ARRAY_SIZE(iov)); ^~~~~~ write Include <sys/uio.h> to fix this. Signed-off-by: Arthur Fabre <afabre(a)cloudflare.com> --- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c index fbd1d88a6095..c938283ac232 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -3,6 +3,7 @@ #include <error.h> #include <linux/if.h> #include <linux/if_tun.h> +#include <sys/uio.h> #define CHECK_FLOW_KEYS(desc, got, expected) \ CHECK_ATTR(memcmp(&got, &expected, sizeof(got)) != 0, \ -- 2.20.1

5 years, 11 months

2
2
0 0

[PATCH v5 00/10] Support using MSI interrupts in ntb_transport

by Logan Gunthorpe

This is another resend as there has been no feedback since v4. Seems Jon has been MIA this past cycle so hopefully he appears on the list soon. I've addressed the feedback so far and rebased on the latest kernel and would like this to be considered for merging this cycle. The only outstanding issue I know of is that it still will not work with IDT hardware, but ntb_transport doesn't work with IDT hardware and there is still no sensible common infrastructure to support ntb_peer_mw_set_trans(). Thus, I decline to consider that complication in this patchset. However, I'll be happy to review work that adds this feature in the future. Also, as the port number and resource index stuff is a bit complicated, I made a quick out of tree test fixture to ensure it's correct[1]. As an excerise I also wrote some test code[2] using the upcomming KUnit feature. Logan [1] https://repl.it/repls/ExcitingPresentFile [2] https://github.com/sbates130272/linux-p2pmem/commits/ntb_kunit -- Changes in v5: * Rebased onto v5.2-rc1 (plus the patches in ntb-next) -- Changes in v4: * Rebased onto v5.1-rc6 (No changes) * Numerous grammar and spelling mistakes spotted by Bjorn -- Changes in v3: * Rebased onto v5.1-rc1 (Dropped the first two patches as they have been merged, and cleaned up some minor conflicts in the PCI tree) * Added a new patch (#3) to calculate logical port numbers that are port numbers from 0 to (number of ports - 1). This is then used in ntb_peer_resource_idx() to fix the issues brought up by Serge. * Fixed missing __iomem and iowrite calls (as noticed by Serge) * Added patch 10 which describes ntb_msi_test in the documentation file (as requested by Serge) * A couple other minor nits and documentation fixes -- Changes in v2: * Cleaned up the changes in intel_irq_remapping.c to make them less confusing and add a comment. (Per discussion with Jacob and Joerg) * Fixed a nit from Bjorn and collected his Ack * Added a Kconfig dependancy on CONFIG_PCI_MSI for CONFIG_NTB_MSI as the Kbuild robot hit a random config that didn't build without it. * Worked in a callback for when the MSI descriptor changes so that the clients can resend the new address and data values to the peer. On my test system this was never necessary, but there may be other platforms where this can occur. I tested this by hacking in a path to rewrite the MSI descriptor when I change the cpu affinity of an IRQ. There's a bit of uncertainty over the latency of the change, but without hardware this can acctually occur on we can't test this. This was the result of a discussion with Dave. -- This patch series adds optional support for using MSI interrupts instead of NTB doorbells in ntb_transport. This is desirable seeing doorbells on current hardware are quite slow and therefore switching to MSI interrupts provides a significant performance gain. On switchtec hardware, a simple apples-to-apples comparison shows ntb_netdev/iperf numbers going from 3.88Gb/s to 14.1Gb/s when switching to MSI interrupts. To do this, a couple changes are required outside of the NTB tree: 1) The IOMMU must know to accept MSI requests from aliased bused numbers seeing NTB hardware typically sends proxied request IDs through additional requester IDs. The first patch in this series adds support for the Intel IOMMU. A quirk to add these aliases for switchtec hardware was already accepted. See commit ad281ecf1c7d ("PCI: Add DMA alias quirk for Microsemi Switchtec NTB") for a description of NTB proxy IDs and why this is necessary. 2) NTB transport (and other clients) may often need more MSI interrupts than the NTB hardware actually advertises support for. However, seeing these interrupts will not be triggered by the hardware but through an NTB memory window, the hardware does not actually need support or need to know about them. Therefore we add the concept of Virtual MSI interrupts which are allocated just like any other MSI interrupt but are not programmed into the hardware's MSI table. This is done in Patch 2 and then made use of in Patch 3. The remaining patches in this series add a library for dealing with MSI interrupts, a test client and finally support in ntb_transport. The series is based off of v5.1-rc6 plus the patches in ntb-next. A git repo is available here: https://github.com/sbates130272/linux-p2pmem/ ntb_transport_msi_v4 Thanks, Logan -- Logan Gunthorpe (10): PCI/MSI: Support allocating virtual MSI interrupts PCI/switchtec: Add module parameter to request more interrupts NTB: Introduce helper functions to calculate logical port number NTB: Introduce functions to calculate multi-port resource index NTB: Rename ntb.c to support multiple source files in the module NTB: Introduce MSI library NTB: Introduce NTB MSI Test Client NTB: Add ntb_msi_test support to ntb_test NTB: Add MSI interrupt support to ntb_transport NTB: Describe the ntb_msi_test client in the documentation. Documentation/ntb.txt | 27 ++ drivers/ntb/Kconfig | 11 + drivers/ntb/Makefile | 3 + drivers/ntb/{ntb.c => core.c} | 0 drivers/ntb/msi.c | 415 +++++++++++++++++++++++ drivers/ntb/ntb_transport.c | 169 ++++++++- drivers/ntb/test/Kconfig | 9 + drivers/ntb/test/Makefile | 1 + drivers/ntb/test/ntb_msi_test.c | 433 ++++++++++++++++++++++++ drivers/pci/msi.c | 54 ++- drivers/pci/switch/switchtec.c | 12 +- include/linux/msi.h | 8 + include/linux/ntb.h | 196 ++++++++++- include/linux/pci.h | 9 + tools/testing/selftests/ntb/ntb_test.sh | 54 ++- 15 files changed, 1386 insertions(+), 15 deletions(-) rename drivers/ntb/{ntb.c => core.c} (100%) create mode 100644 drivers/ntb/msi.c create mode 100644 drivers/ntb/test/ntb_msi_test.c -- 2.20.1

5 years, 11 months

2
12
0 0

[PATCH v4 0/3] Fix vDSO clock_getres()

by Vincenzo Frascino

clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. A possible fix is to change the vdso implementation of clock_getres, keeping a copy of hrtimer_resolution in vdso data and using that directly [1]. This patchset implements the proposed fix for arm64, powerpc, s390, nds32 and adds a test to verify that the syscall and the vdso library implementation of clock_getres return the same values. Even if these patches are unified by the same topic, there is no dependency between them, hence they can be merged singularly by each arch maintainer. Note: arm64 and nds32 respective fixes have been merged in 5.2-rc1, hence they have been removed from this series. [1] https://marc.info/?l=linux-arm-kernel&m=155110381930196&w=2 Changes: -------- v4: - Address review comments. v3: - Rebased on 5.2-rc1. - Address review comments. v2: - Rebased on 5.1-rc5. - Addressed review comments. Cc: Christophe Leroy <christophe.leroy(a)c-s.fr> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Martin Schwidefsky <schwidefsky(a)de.ibm.com> Cc: Heiko Carstens <heiko.carstens(a)de.ibm.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Vincenzo Frascino (3): powerpc: Fix vDSO clock_getres() s390: Fix vDSO clock_getres() kselftest: Extend vDSO selftest to clock_getres arch/powerpc/include/asm/vdso_datapage.h | 2 + arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +- arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso32/clock_getres.S | 12 +- arch/s390/kernel/vdso64/clock_getres.S | 10 +- tools/testing/selftests/vDSO/Makefile | 2 + .../selftests/vDSO/vdso_clock_getres.c | 124 ++++++++++++++++++ 12 files changed, 155 insertions(+), 16 deletions(-) create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c -- 2.21.0

5 years, 11 months

3
14
0 0

[PATCH] selftests/net: skip psock_tpacket test if KALLSYMS was not enabled

by Po-Hsu Lin

The psock_tpacket test will need to access /proc/kallsyms, this would require the kernel config CONFIG_KALLSYMS to be enabled first. Check the file existence to determine if we can run this test. Signed-off-by: Po-Hsu Lin <po-hsu.lin(a)canonical.com> --- tools/testing/selftests/net/run_afpackettests | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/run_afpackettests b/tools/testing/selftests/net/run_afpackettests index ea5938e..8b42e8b 100755 --- a/tools/testing/selftests/net/run_afpackettests +++ b/tools/testing/selftests/net/run_afpackettests @@ -21,12 +21,16 @@ fi echo "--------------------" echo "running psock_tpacket test" echo "--------------------" -./in_netns.sh ./psock_tpacket -if [ $? -ne 0 ]; then - echo "[FAIL]" - ret=1 +if [ -f /proc/kallsyms ]; then + ./in_netns.sh ./psock_tpacket + if [ $? -ne 0 ]; then + echo "[FAIL]" + ret=1 + else + echo "[PASS]" + fi else - echo "[PASS]" + echo "[SKIP] CONFIG_KALLSYMS not enabled" fi echo "--------------------" -- 2.7.4

5 years, 11 months

2
2
0 0

[PATCH v16 00/16] arm64: untag user pointers passed to the kernel

by Andrey Konovalov

=== Overview 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. Right now the kernel is already able to handle user faults with tagged pointers, due to these patches: 1. 81cddd65 ("arm64: traps: fix userspace cache maintenance emulation on a tagged pointer") 2. 7dcd9dd8 ("arm64: hw_breakpoint: fix watchpoint matching for tagged pointers") 3. 276e9327 ("arm64: entry: improve data abort handling of tagged pointers") This patchset extends tagged pointer support to syscall arguments. As per the proposed ABI change [3], tagged pointers are only allowed to be passed to syscalls when they point to memory ranges obtained by anonymous mmap() or sbrk() (see the patchset [3] for more details). For non-memory syscalls this is done by untaging user pointers when the kernel performs pointer checking to find out whether the pointer comes from userspace (most notably in access_ok). The untagging is done only when the pointer is being checked, the tag is preserved as the pointer makes its way through the kernel and stays tagged when the kernel dereferences the pointer when perfoming user memory accesses. Memory syscalls (mprotect, etc.) don't do user memory accesses but rather deal with memory ranges, and untagged pointers are better suited to describe memory ranges internally. Thus for memory syscalls we untag pointers completely when they enter the kernel. === Other approaches One of the alternative approaches to untagging that was considered is to completely strip the pointer tag as the pointer enters the kernel with some kind of a syscall wrapper, but that won't work with the countless number of different ioctl calls. With this approach we would need a custom wrapper for each ioctl variation, which doesn't seem practical. An alternative approach to untagging pointers in memory syscalls prologues is to inspead allow tagged pointers to be passed to find_vma() (and other vma related functions) and untag them there. Unfortunately, a lot of find_vma() callers then compare or subtract the returned vma start and end fields against the pointer that was being searched. Thus this approach would still require changing all find_vma() callers. === Testing The following testing approaches has been taken to find potential issues with user pointer untagging: 1. Static testing (with sparse [2] and separately with a custom static analyzer based on Clang) to track casts of __user pointers to integer types to find places where untagging needs to be done. 2. Static testing with grep to find parts of the kernel that call find_vma() (and other similar functions) or directly compare against vm_start/vm_end fields of vma. 3. Static testing with grep to find parts of the kernel that compare user pointers with TASK_SIZE or other similar consts and macros. 4. Dynamic testing: adding BUG_ON(has_tag(addr)) to find_vma() and running a modified syzkaller version that passes tagged pointers to the kernel. Based on the results of the testing the requried patches have been added to the patchset. === Notes This patchset is meant to be merged together with "arm64 relaxed ABI" [3]. This patchset is a prerequisite for ARM's memory tagging hardware feature support [4]. This patchset has been merged into the Pixel 2 & 3 kernel trees and is now being used to enable testing of Pixel phones with HWASan. Thanks! [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html [2] https://github.com/lucvoo/sparse-dev/commit/5f960cb10f56ec2017c128ef9d16060… [3] https://lkml.org/lkml/2019/3/18/819 [4] https://community.arm.com/processors/b/blog/posts/arm-a-profile-architectur… Changes in v16: - Moved untagging for memory syscalls from arm64 wrappers back to generic code. - Dropped untagging for the following memory syscalls: brk, mmap, munmap; mremap (only dropped for new_address); mmap_pgoff (not used on arm64); remap_file_pages (deprecated); shmat, shmdt (work on shared memory). - Changed kselftest to LD_PRELOAD a shared library that overrides malloc to return tagged pointers. - Rebased onto 5.2-rc3. Changes in v15: - Removed unnecessary untagging from radeon_ttm_tt_set_userptr(). - Removed unnecessary untagging from amdgpu_ttm_tt_set_userptr(). - Moved untagging to validate_range() in userfaultfd code. - Moved untagging to ib_uverbs_(re)reg_mr() from mlx4_get_umem_mr(). - Rebased onto 5.1. Changes in v14: - Moved untagging for most memory syscalls to an arm64 specific implementation, instead of doing that in the common code. - Dropped "net, arm64: untag user pointers in tcp_zerocopy_receive", since the provided user pointers don't come from an anonymous map and thus are not covered by this ABI relaxation. - Dropped "kernel, arm64: untag user pointers in prctl_set_mm*". - Moved untagging from __check_mem_type() to tee_shm_register(). - Updated untagging for the amdgpu and radeon drivers to cover the MMU notifier, as suggested by Felix. - Since this ABI relaxation doesn't actually allow tagged instruction pointers, dropped the following patches: - Dropped "tracing, arm64: untag user pointers in seq_print_user_ip". - Dropped "uprobes, arm64: untag user pointers in find_active_uprobe". - Dropped "bpf, arm64: untag user pointers in stack_map_get_build_id_offset". - Rebased onto 5.1-rc7 (37624b58). Changes in v13: - Simplified untagging in tcp_zerocopy_receive(). - Looked at find_vma() callers in drivers/, which allowed to identify a few other places where untagging is needed. - Added patch "mm, arm64: untag user pointers in get_vaddr_frames". - Added patch "drm/amdgpu, arm64: untag user pointers in amdgpu_ttm_tt_get_user_pages". - Added patch "drm/radeon, arm64: untag user pointers in radeon_ttm_tt_pin_userptr". - Added patch "IB/mlx4, arm64: untag user pointers in mlx4_get_umem_mr". - Added patch "media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get". - Added patch "tee/optee, arm64: untag user pointers in check_mem_type". - Added patch "vfio/type1, arm64: untag user pointers". Changes in v12: - Changed untagging in tcp_zerocopy_receive() to also untag zc->address. - Fixed untagging in prctl_set_mm* to only untag pointers for vma lookups and validity checks, but leave them as is for actual user space accesses. - Updated the link to the v2 of the "arm64 relaxed ABI" patchset [3]. - Dropped the documentation patch, as the "arm64 relaxed ABI" patchset [3] handles that. Changes in v11: - Added "uprobes, arm64: untag user pointers in find_active_uprobe" patch. - Added "bpf, arm64: untag user pointers in stack_map_get_build_id_offset" patch. - Fixed "tracing, arm64: untag user pointers in seq_print_user_ip" to correctly perform subtration with a tagged addr. - Moved untagged_addr() from SYSCALL_DEFINE3(mprotect) and SYSCALL_DEFINE4(pkey_mprotect) to do_mprotect_pkey(). - Moved untagged_addr() definition for other arches from include/linux/memory.h to include/linux/mm.h. - Changed untagging in strn*_user() to perform userspace accesses through tagged pointers. - Updated the documentation to mention that passing tagged pointers to memory syscalls is allowed. - Updated the test to use malloc'ed memory instead of stack memory. Changes in v10: - Added "mm, arm64: untag user pointers passed to memory syscalls" back. - New patch "fs, arm64: untag user pointers in fs/userfaultfd.c". - New patch "net, arm64: untag user pointers in tcp_zerocopy_receive". - New patch "kernel, arm64: untag user pointers in prctl_set_mm*". - New patch "tracing, arm64: untag user pointers in seq_print_user_ip". Changes in v9: - Rebased onto 4.20-rc6. - Used u64 instead of __u64 in type casts in the untagged_addr macro for arm64. - Added braces around (addr) in the untagged_addr macro for other arches. Changes in v8: - Rebased onto 65102238 (4.20-rc1). - Added a note to the cover letter on why syscall wrappers/shims that untag user pointers won't work. - Added a note to the cover letter that this patchset has been merged into the Pixel 2 kernel tree. - Documentation fixes, in particular added a list of syscalls that don't support tagged user pointers. Changes in v7: - Rebased onto 17b57b18 (4.19-rc6). - Dropped the "arm64: untag user address in __do_user_fault" patch, since the existing patches already handle user faults properly. - Dropped the "usb, arm64: untag user addresses in devio" patch, since the passed pointer must come from a vma and therefore be untagged. - Dropped the "arm64: annotate user pointers casts detected by sparse" patch (see the discussion to the replies of the v6 of this patchset). - Added more context to the cover letter. - Updated Documentation/arm64/tagged-pointers.txt. 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). Signed-off-by: Andrey Konovalov <andreyknvl(a)google.com> Andrey Konovalov (16): uaccess: add untagged_addr definition for other arches arm64: untag user pointers in access_ok and __uaccess_mask_ptr lib, arm64: untag user pointers in strn*_user mm: untag user pointers in do_pages_move arm64: untag user pointers passed to memory syscalls mm, arm64: untag user pointers in mm/gup.c mm, arm64: untag user pointers in get_vaddr_frames fs, arm64: untag user pointers in copy_mount_options fs, arm64: untag user pointers in fs/userfaultfd.c drm/amdgpu, arm64: untag user pointers drm/radeon, arm64: untag user pointers in radeon_gem_userptr_ioctl IB, arm64: untag user pointers in ib_uverbs_(re)reg_mr() media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get tee, arm64: untag user pointers in tee_shm_register vfio/type1, arm64: untag user pointers in vaddr_get_pfn selftests, arm64: add a selftest for passing tagged pointers to kernel arch/arm64/include/asm/uaccess.h | 10 +++-- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + drivers/gpu/drm/radeon/radeon_gem.c | 2 + drivers/infiniband/core/uverbs_cmd.c | 4 ++ drivers/media/v4l2-core/videobuf-dma-contig.c | 9 ++-- drivers/tee/tee_shm.c | 1 + drivers/vfio/vfio_iommu_type1.c | 2 + fs/namespace.c | 2 +- fs/userfaultfd.c | 22 +++++----- include/linux/mm.h | 4 ++ lib/strncpy_from_user.c | 3 +- lib/strnlen_user.c | 3 +- mm/frame_vector.c | 2 + mm/gup.c | 4 ++ mm/madvise.c | 2 + mm/mempolicy.c | 3 ++ mm/migrate.c | 1 + mm/mincore.c | 2 + mm/mlock.c | 4 ++ mm/mprotect.c | 2 + mm/mremap.c | 2 + mm/msync.c | 2 + tools/testing/selftests/arm64/.gitignore | 1 + tools/testing/selftests/arm64/Makefile | 22 ++++++++++ .../testing/selftests/arm64/run_tags_test.sh | 12 ++++++ tools/testing/selftests/arm64/tags_lib.c | 42 +++++++++++++++++++ tools/testing/selftests/arm64/tags_test.c | 18 ++++++++ 28 files changed, 163 insertions(+), 22 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_lib.c create mode 100644 tools/testing/selftests/arm64/tags_test.c -- 2.22.0.rc1.311.g5d7573a151-goog

5 years, 11 months

9
71
0 0

[bug report] pidfd: add polling selftests

by Dan Carpenter

Hello Joel Fernandes (Google), The patch 233ad92edbea: "pidfd: add polling selftests" from Apr 30, 2019, leads to the following static checker warning: ./tools/testing/selftests/pidfd/pidfd_test.c:522 test_pidfd_poll_leader_exit() error: uninitialized symbol 'ret'. ./tools/testing/selftests/pidfd/pidfd_test.c 485 static void test_pidfd_poll_leader_exit(int use_waitpid) 486 { 487 int pid, pidfd = 0; 488 int status, ret; 489 time_t prog_start = time(NULL); 490 const char *test_name = "pidfd_poll check for premature notification on non-empty" 491 "group leader exit"; 492 493 child_exit_secs = mmap(NULL, sizeof *child_exit_secs, PROT_READ | PROT_WRITE, 494 MAP_SHARED | MAP_ANONYMOUS, -1, 0); 495 496 if (child_exit_secs == MAP_FAILED) 497 ksft_exit_fail_msg("%s test: mmap failed (errno %d)\n", 498 test_name, errno); 499 500 ksft_print_msg("Parent: pid: %d\n", getpid()); 501 pid = pidfd_clone(CLONE_PIDFD, &pidfd, child_poll_leader_exit_test); 502 if (pid < 0) 503 ksft_exit_fail_msg("%s test: pidfd_clone failed (ret %d, errno %d)\n", 504 test_name, pid, errno); 505 506 ksft_print_msg("Parent: Waiting for Child (%d) to complete.\n", pid); 507 508 if (use_waitpid) { 509 ret = waitpid(pid, &status, 0); 510 if (ret == -1) 511 ksft_print_msg("Parent: error\n"); 512 } else { 513 /* 514 * This sleep tests for the case where if the child exits, and is in 515 * EXIT_ZOMBIE, but the thread group leader is non-empty, then the poll 516 * doesn't prematurely return even though there are active threads 517 */ 518 sleep(1); 519 poll_pidfd(test_name, pidfd); "ret" is not initialized on this path. 520 } 521 522 if (ret == pid) ^^^ 523 ksft_print_msg("Parent: Child process waited for.\n"); 524 525 time_t since_child_exit = time(NULL) - *child_exit_secs; 526 527 ksft_print_msg("Time since child exit: %lu\n", since_child_exit); regards, dan carpenter

5 years, 11 months

1
0
0 0

[PATCH v2 0/2] firmware: Add support for loading compressed files

by Takashi Iwai

Hi, here are the rest and the main part of patches to add the support for loading the compressed firmware files. The patch was slightly refactored for more easily enhancing for other compression formats (if anyone wants). Also the selftest patch is included. The functionality doesn't change from the previous patchset. thanks, Takashi === Takashi Iwai (2): firmware: Add support for loading compressed files selftests: firmware: Add compressed firmware tests drivers/base/firmware_loader/Kconfig | 18 +++ drivers/base/firmware_loader/firmware.h | 8 +- drivers/base/firmware_loader/main.c | 147 ++++++++++++++++++++-- tools/testing/selftests/firmware/fw_filesystem.sh | 73 +++++++++-- tools/testing/selftests/firmware/fw_lib.sh | 7 ++ tools/testing/selftests/firmware/fw_run_tests.sh | 1 + 6 files changed, 232 insertions(+), 22 deletions(-) -- 2.16.4

5 years, 11 months

1
3
0 0

[PATCH v3 15/20] docs: move protection-keys.rst to the core-api book

by Mauro Carvalho Chehab

This document is used by multiple architectures: $ echo $(git grep -l pkey_mprotect arch|cut -d'/' -f 2|sort|uniq) alpha arm arm64 ia64 m68k microblaze mips parisc powerpc s390 sh sparc x86 xtensa So, let's move it to the core book and adjust the links to it accordingly. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- Documentation/core-api/index.rst | 1 + Documentation/{x86 => core-api}/protection-keys.rst | 0 Documentation/x86/index.rst | 1 - arch/powerpc/Kconfig | 2 +- arch/x86/Kconfig | 2 +- tools/testing/selftests/x86/protection_keys.c | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename Documentation/{x86 => core-api}/protection-keys.rst (100%) diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst index ee1bb8983a88..2466a4c51031 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst @@ -34,6 +34,7 @@ Core utilities timekeeping boot-time-mm memory-hotplug + protection-keys Interfaces for kernel debugging diff --git a/Documentation/x86/protection-keys.rst b/Documentation/core-api/protection-keys.rst similarity index 100% rename from Documentation/x86/protection-keys.rst rename to Documentation/core-api/protection-keys.rst diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index ae36fc5fc649..f2de1b2d3ac7 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst @@ -19,7 +19,6 @@ x86-specific Documentation tlb mtrr pat - protection-keys intel_mpx amd-memory-encryption pti diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 8c1c636308c8..3b795a0cab62 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -898,7 +898,7 @@ config PPC_MEM_KEYS page-based protections, but without requiring modification of the page tables when an application changes protection domains. - For details, see Documentation/vm/protection-keys.rst + For details, see Documentation/core-api/protection-keys.rst If unsure, say y. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 2bbbd4d1ba31..d87d53fcd261 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1911,7 +1911,7 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS page-based protections, but without requiring modification of the page tables when an application changes protection domains. - For details, see Documentation/x86/protection-keys.txt + For details, see Documentation/core-api/protection-keys.rst If unsure, say y. diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index 5d546dcdbc80..480995bceefa 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Tests x86 Memory Protection Keys (see Documentation/x86/protection-keys.txt) + * Tests x86 Memory Protection Keys (see Documentation/core-api/protection-keys.rst) * * There are examples in here of: * * how to set protection keys on memory -- 2.21.0

5 years, 11 months

2
1
0 0

[GIT PULL] Kselftest second fixes update for Linux 5.2-rc4

by Shuah Khan

Hi Linus, Please pull the following second Kselftest fixes update for Linux 5.2 rc4. This Kselftest second fixes update for Linux 5.2-rc4 consists of a single fix for vm test build failure regression when it is built by itself. I found this while I was sanity checking the first fixes update for Linux 5.2. Would like to get this into rc4. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit bc2cce3f2ebcae02aa4bb29e3436bf75ee674c32: selftests: vm: install test_vmalloc.sh for run_vmtests (2019-05-30 08:32:57 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.2-rc4-2 for you to fetch changes up to e2e88325f4bcaea51f454723971f7b5ee0e1aa80: selftests: vm: Fix test build failure when built by itself (2019-06-05 16:05:40 -0600) ---------------------------------------------------------------- linux-kselftest-5.2-rc4-2 This Kselftest second fixes update for Linux 5.2-rc4 consists of a single fix for vm test build failure regression when it is built by itself. ---------------------------------------------------------------- Shuah Khan (1): selftests: vm: Fix test build failure when built by itself tools/testing/selftests/vm/Makefile | 4 ---- 1 file changed, 4 deletions(-) ----------------------------------------------------------------

5 years, 11 months

2
1
0 0

[PATCH for 5.2 08/12] rseq/selftests: arm: use udf instruction for RSEQ_SIG

by Mathieu Desnoyers

Use udf as the guard instruction for the restartable sequence abort handler. Previously, the chosen signature was not a valid instruction, based on the assumption that it could always sit in a literal pool. However, there are compilation environments in which literal pools are not availble, for instance execute-only code. Therefore, we need to choose a signature value that is also a valid instruction. Handle compiling with -mbig-endian on ARMv6+, which generates binaries with mixed code vs data endianness (little endian code, big endian data). Else mismatch between code endianness for the generated signatures and data endianness for the RSEQ_SIG parameter passed to the rseq registration will trigger application segmentation faults when the kernel try to abort rseq critical sections. Prior to ARMv6, -mbig-endian generates big-endian code and data, so endianness should not be reversed in that case. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> CC: Peter Zijlstra <peterz(a)infradead.org> CC: Thomas Gleixner <tglx(a)linutronix.de> CC: Joel Fernandes <joelaf(a)google.com> CC: Catalin Marinas <catalin.marinas(a)arm.com> CC: Dave Watson <davejwatson(a)fb.com> CC: Will Deacon <will.deacon(a)arm.com> CC: Shuah Khan <shuah(a)kernel.org> 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: linux-api(a)vger.kernel.org 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/rseq-arm.h | 52 +++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/rseq/rseq-arm.h b/tools/testing/selftests/rseq/rseq-arm.h index 5f262c54364f..e8ccfc37d685 100644 --- a/tools/testing/selftests/rseq/rseq-arm.h +++ b/tools/testing/selftests/rseq/rseq-arm.h @@ -5,7 +5,54 @@ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers(a)efficios.com> */ -#define RSEQ_SIG 0x53053053 +/* + * RSEQ_SIG uses the udf A32 instruction with an uncommon immediate operand + * value 0x5de3. This traps if user-space reaches this instruction by mistake, + * and the uncommon operand ensures the kernel does not move the instruction + * pointer to attacker-controlled code on rseq abort. + * + * The instruction pattern in the A32 instruction set is: + * + * e7f5def3 udf #24035 ; 0x5de3 + * + * This translates to the following instruction pattern in the T16 instruction + * set: + * + * little endian: + * def3 udf #243 ; 0xf3 + * e7f5 b.n <7f5> + * + * pre-ARMv6 big endian code: + * e7f5 b.n <7f5> + * def3 udf #243 ; 0xf3 + * + * ARMv6+ -mbig-endian generates mixed endianness code vs data: little-endian + * code and big-endian data. Ensure the RSEQ_SIG data signature matches code + * endianness. Prior to ARMv6, -mbig-endian generates big-endian code and data + * (which match), so there is no need to reverse the endianness of the data + * representation of the signature. However, the choice between BE32 and BE8 + * is done by the linker, so we cannot know whether code and data endianness + * will be mixed before the linker is invoked. + */ + +#define RSEQ_SIG_CODE 0xe7f5def3 + +#ifndef __ASSEMBLER__ + +#define RSEQ_SIG_DATA \ + ({ \ + int sig; \ + asm volatile ( "b 2f\n\t" \ + "1: .inst " __rseq_str(RSEQ_SIG_CODE) "\n\t" \ + "2:\n\t" \ + "ldr %[sig], 1b\n\t" \ + : [sig] "=r" (sig)); \ + sig; \ + }) + +#define RSEQ_SIG RSEQ_SIG_DATA + +#endif #define rseq_smp_mb() __asm__ __volatile__ ("dmb" ::: "memory", "cc") #define rseq_smp_rmb() __asm__ __volatile__ ("dmb" ::: "memory", "cc") @@ -78,7 +125,8 @@ do { \ __rseq_str(table_label) ":\n\t" \ ".word " __rseq_str(version) ", " __rseq_str(flags) "\n\t" \ ".word " __rseq_str(start_ip) ", 0x0, " __rseq_str(post_commit_offset) ", 0x0, " __rseq_str(abort_ip) ", 0x0\n\t" \ - ".word " __rseq_str(RSEQ_SIG) "\n\t" \ + ".arm\n\t" \ + ".inst " __rseq_str(RSEQ_SIG_CODE) "\n\t" \ __rseq_str(label) ":\n\t" \ teardown \ "b %l[" __rseq_str(abort_label) "]\n\t" -- 2.11.0

5 years, 11 months

1
3
0 0

[PATCH AUTOSEL 4.9 02/20] selftests: netfilter: missing error check when setting up veth interface

by Sasha Levin

From: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> [ Upstream commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 ] A test for the basic NAT functionality uses ip command which needs veth device. There is a condition where the kernel support for veth is not compiled into the kernel and the test script breaks. This patch contains code for reasonable error display and correct code exit. Signed-off-by: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> Acked-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/netfilter/nft_nat.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 8ec76681605c..f25f72a75cf3 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh @@ -23,7 +23,11 @@ ip netns add ns0 ip netns add ns1 ip netns add ns2 -ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 +ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: No virtual ethernet pair device support in kernel" + exit $ksft_skip +fi ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 ip -net ns0 link set lo up -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.14 05/31] selftests: netfilter: missing error check when setting up veth interface

by Sasha Levin

From: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> [ Upstream commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 ] A test for the basic NAT functionality uses ip command which needs veth device. There is a condition where the kernel support for veth is not compiled into the kernel and the test script breaks. This patch contains code for reasonable error display and correct code exit. Signed-off-by: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> Acked-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/netfilter/nft_nat.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 8ec76681605c..f25f72a75cf3 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh @@ -23,7 +23,11 @@ ip netns add ns0 ip netns add ns1 ip netns add ns2 -ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 +ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: No virtual ethernet pair device support in kernel" + exit $ksft_skip +fi ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 ip -net ns0 link set lo up -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.19 07/49] selftests: netfilter: missing error check when setting up veth interface

by Sasha Levin

From: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> [ Upstream commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 ] A test for the basic NAT functionality uses ip command which needs veth device. There is a condition where the kernel support for veth is not compiled into the kernel and the test script breaks. This patch contains code for reasonable error display and correct code exit. Signed-off-by: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> Acked-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/netfilter/nft_nat.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 8ec76681605c..f25f72a75cf3 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh @@ -23,7 +23,11 @@ ip netns add ns0 ip netns add ns1 ip netns add ns2 -ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 +ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: No virtual ethernet pair device support in kernel" + exit $ksft_skip +fi ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 ip -net ns0 link set lo up -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 14/70] selftests: netfilter: missing error check when setting up veth interface

by Sasha Levin

From: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> [ Upstream commit 82ce6eb1dd13fd12e449b2ee2c2ec051e6f52c43 ] A test for the basic NAT functionality uses ip command which needs veth device. There is a condition where the kernel support for veth is not compiled into the kernel and the test script breaks. This patch contains code for reasonable error display and correct code exit. Signed-off-by: Jeffrin Jose T <jeffrin(a)rajagiritech.edu.in> Acked-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/netfilter/nft_nat.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 3194007cf8d1..a59c5fd4e987 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh @@ -23,7 +23,11 @@ ip netns add ns0 ip netns add ns1 ip netns add ns2 -ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 +ip link add veth0 netns ns0 type veth peer name eth0 netns ns1 > /dev/null 2>&1 +if [ $? -ne 0 ];then + echo "SKIP: No virtual ethernet pair device support in kernel" + exit $ksft_skip +fi ip link add veth1 netns ns0 type veth peer name eth0 netns ns2 ip -net ns0 link set lo up -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH] selftests: vm: Fix test build failure when built by itself

by Shuah Khan

vm test build fails when test is built by itself using make -C tools/testing/selftests/vm or cd tools/testing/selftests/vm; make When the test is built invoking its Makefile directly, it defines OUTPUT which conflicts with lib.mk's logic to install headers. make --no-builtin-rules INSTALL_HDR_PATH=$OUTPUT/usr \ ARCH=x86 -C ../../../.. headers_install make[1]: Entering directory '/mnt/data/lkml/linux_5.2' REMOVE shmparam.h rm: cannot remove '/usr/include/asm-generic/shmparam.h': Permission denied scripts/Makefile.headersinst:96: recipe for target '/usr/include/asm-generic/.install' failed make[3]: *** [/usr/include/asm-generic/.install] Error 1 scripts/Makefile.headersinst:32: recipe for target 'asm-generic' failed make[2]: *** [asm-generic] Error 2 Makefile:1199: recipe for target 'headers_install' failed make[1]: *** [headers_install] Error 2 make[1]: Leaving directory '/mnt/data/lkml/linux_5.2' ../lib.mk:52: recipe for target 'khdr' failed make: *** [khdr] Error 2 Fixes: 8ce72dc32578 ("selftests: fix headers_install circular dependency") Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> --- tools/testing/selftests/vm/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index 05306c58ff9f..9534dc2bc929 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -1,10 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 # Makefile for vm selftests -ifndef OUTPUT - OUTPUT := $(shell pwd) -endif - CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) LDLIBS = -lrt TEST_GEN_FILES = compaction_test -- 2.17.1

5 years, 11 months

1
0
0 0

[GIT PULL] Kselftest fixes update for Linux 5.2-rc4

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 5.2-rc4. This Kselftest update for Linux 5.2-rc4 consists of - Alex Shi's fixes to cgroup tests - Alakesh Haloi's fix to userfaultfd compiler warning - Naresh Kamboju's fix to vm install to include test script to run the test. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit eff82a263b5cfa3427fd9dbfedd96da94fdc9f19: selftests: rtc: rtctest: specify timeouts (2019-05-24 13:39:58 -0600) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.2-rc4 for you to fetch changes up to bc2cce3f2ebcae02aa4bb29e3436bf75ee674c32: selftests: vm: install test_vmalloc.sh for run_vmtests (2019-05-30 08:32:57 -0600) ---------------------------------------------------------------- linux-kselftest-5.2-rc4 This Kselftest update for Linux 5.2-rc4 consists of - Alex Shi's fixes to cgroup tests - Alakesh Haloi's fix to userfaultfd compiler warning - Naresh Kamboju's fix to vm install to include test script to run the test. ---------------------------------------------------------------- Alakesh Haloi (1): userfaultfd: selftest: fix compiler warning Alex Shi (3): kselftest/cgroup: fix unexpected testing failure on test_memcontrol kselftest/cgroup: fix unexpected testing failure on test_core kselftest/cgroup: fix incorrect test_core skip Naresh Kamboju (1): selftests: vm: install test_vmalloc.sh for run_vmtests tools/testing/selftests/cgroup/test_core.c | 7 ++++++- tools/testing/selftests/cgroup/test_memcontrol.c | 4 ++++ tools/testing/selftests/vm/Makefile | 2 ++ tools/testing/selftests/vm/userfaultfd.c | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------

5 years, 11 months

2
1
0 0

selftests: bpf: test_sock_fields: Error: in_bpf_create_map_xattr(sk_pkt_out_cnt)Invalid

by Naresh Kamboju

Do you see this failure at your end? Our environment is build on host and install them on target device and run on Device under test (DUT). Did i miss any kernel config fragments ? bpf: test_sock_fields_ # # libbpf Error in bpf_create_map_xattr(sk_pkt_out_cnt)Invalid argument(22). Retrying without BTF. Error: in_bpf_create_map_xattr(sk_pkt_out_cnt)Invalid # # libbpf failed to create map (name 'sk_pkt_out_cnt') Invalid argument failed: to_create # # libbpf failed to load object 'test_sock_fields_kern.o' failed: to_load # # main(439)FAILbpf_prog_load_xattr() err-22 err-22: _ # [FAIL] 22 selftests bpf test_sock_fields selftests: bpf_test_sock_fields [FAIL] Full test log, https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20190605/testru… Config: http://snapshots.linaro.org/openembedded/lkft/lkft/sumo/intel-corei7-64/lkf… Test results for comparison, https://qa-reports.linaro.org/lkft/linux-next-oe/tests/kselftest/bpf_test_s… Best regards Naresh Kamboju

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.9 13/17] selftests/timers: Add missing fflush(stdout) calls

by Sasha Levin

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit fe48319243a626c860fd666ca032daacc2ba84a5 ] When running under a pipe, some timer tests would not report output in real-time because stdout flushes were missing after printf()s that lacked a newline. This adds them to restore real-time status output that humans can enjoy. Signed-off-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/timers/adjtick.c | 1 + tools/testing/selftests/timers/leapcrash.c | 1 + tools/testing/selftests/timers/mqueue-lat.c | 1 + tools/testing/selftests/timers/nanosleep.c | 1 + tools/testing/selftests/timers/nsleep-lat.c | 1 + tools/testing/selftests/timers/raw_skew.c | 1 + tools/testing/selftests/timers/set-tai.c | 1 + tools/testing/selftests/timers/set-tz.c | 2 ++ tools/testing/selftests/timers/threadtest.c | 1 + tools/testing/selftests/timers/valid-adjtimex.c | 2 ++ 10 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c index 9887fd538fec..91316ab4b041 100644 --- a/tools/testing/selftests/timers/adjtick.c +++ b/tools/testing/selftests/timers/adjtick.c @@ -147,6 +147,7 @@ int check_tick_adj(long tickval) eppm = get_ppm_drift(); printf("%lld usec, %lld ppm", systick + (systick * eppm / MILLION), eppm); + fflush(stdout); tx1.modes = 0; adjtimex(&tx1); diff --git a/tools/testing/selftests/timers/leapcrash.c b/tools/testing/selftests/timers/leapcrash.c index a1071bdbdeb7..a77c70b47495 100644 --- a/tools/testing/selftests/timers/leapcrash.c +++ b/tools/testing/selftests/timers/leapcrash.c @@ -114,6 +114,7 @@ int main(void) } clear_time_state(); printf("."); + fflush(stdout); } printf("[OK]\n"); return ksft_exit_pass(); diff --git a/tools/testing/selftests/timers/mqueue-lat.c b/tools/testing/selftests/timers/mqueue-lat.c index a2a3924d0b41..efdb62470052 100644 --- a/tools/testing/selftests/timers/mqueue-lat.c +++ b/tools/testing/selftests/timers/mqueue-lat.c @@ -113,6 +113,7 @@ int main(int argc, char **argv) int ret; printf("Mqueue latency : "); + fflush(stdout); ret = mqueue_lat_test(); if (ret < 0) { diff --git a/tools/testing/selftests/timers/nanosleep.c b/tools/testing/selftests/timers/nanosleep.c index ff942ff7c9b3..2e6e94c02a33 100644 --- a/tools/testing/selftests/timers/nanosleep.c +++ b/tools/testing/selftests/timers/nanosleep.c @@ -153,6 +153,7 @@ int main(int argc, char **argv) continue; printf("Nanosleep %-31s ", clockstring(clockid)); + fflush(stdout); length = 10; while (length <= (NSEC_PER_SEC * 10)) { diff --git a/tools/testing/selftests/timers/nsleep-lat.c b/tools/testing/selftests/timers/nsleep-lat.c index 2d7898fda0f1..ac06cf10a5c2 100644 --- a/tools/testing/selftests/timers/nsleep-lat.c +++ b/tools/testing/selftests/timers/nsleep-lat.c @@ -166,6 +166,7 @@ int main(int argc, char **argv) continue; printf("nsleep latency %-26s ", clockstring(clockid)); + fflush(stdout); length = 10; while (length <= (NSEC_PER_SEC * 10)) { diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c index 0ab937a17ebb..4e631da7f956 100644 --- a/tools/testing/selftests/timers/raw_skew.c +++ b/tools/testing/selftests/timers/raw_skew.c @@ -124,6 +124,7 @@ int main(int argv, char **argc) printf("WARNING: ADJ_OFFSET in progress, this will cause inaccurate results\n"); printf("Estimating clock drift: "); + fflush(stdout); sleep(120); get_monotonic_and_raw(&mon, &raw); diff --git a/tools/testing/selftests/timers/set-tai.c b/tools/testing/selftests/timers/set-tai.c index dc88dbc8831f..3ae76ab483de 100644 --- a/tools/testing/selftests/timers/set-tai.c +++ b/tools/testing/selftests/timers/set-tai.c @@ -66,6 +66,7 @@ int main(int argc, char **argv) printf("tai offset started at %i\n", ret); printf("Checking tai offsets can be properly set: "); + fflush(stdout); for (i = 1; i <= 60; i++) { ret = set_tai(i); ret = get_tai(); diff --git a/tools/testing/selftests/timers/set-tz.c b/tools/testing/selftests/timers/set-tz.c index f4184928b16b..b038131c9682 100644 --- a/tools/testing/selftests/timers/set-tz.c +++ b/tools/testing/selftests/timers/set-tz.c @@ -76,6 +76,7 @@ int main(int argc, char **argv) printf("tz_minuteswest started at %i, dst at %i\n", min, dst); printf("Checking tz_minuteswest can be properly set: "); + fflush(stdout); for (i = -15*60; i < 15*60; i += 30) { ret = set_tz(i, dst); ret = get_tz_min(); @@ -87,6 +88,7 @@ int main(int argc, char **argv) printf("[OK]\n"); printf("Checking invalid tz_minuteswest values are caught: "); + fflush(stdout); if (!set_tz(-15*60-1, dst)) { printf("[FAILED] %i didn't return failure!\n", -15*60-1); diff --git a/tools/testing/selftests/timers/threadtest.c b/tools/testing/selftests/timers/threadtest.c index e632e116f05e..a4bf736dd842 100644 --- a/tools/testing/selftests/timers/threadtest.c +++ b/tools/testing/selftests/timers/threadtest.c @@ -175,6 +175,7 @@ int main(int argc, char **argv) strftime(buf, 255, "%a, %d %b %Y %T %z", localtime(&start)); printf("%s\n", buf); printf("Testing consistency with %i threads for %ld seconds: ", thread_count, runtime); + fflush(stdout); /* spawn */ for (i = 0; i < thread_count; i++) diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c index 60fe3c569bd9..a747645d79f4 100644 --- a/tools/testing/selftests/timers/valid-adjtimex.c +++ b/tools/testing/selftests/timers/valid-adjtimex.c @@ -134,6 +134,7 @@ int validate_freq(void) /* Set the leap second insert flag */ printf("Testing ADJ_FREQ... "); + fflush(stdout); for (i = 0; i < NUM_FREQ_VALID; i++) { tx.modes = ADJ_FREQUENCY; tx.freq = valid_freq[i]; @@ -261,6 +262,7 @@ int set_bad_offset(long sec, long usec, int use_nano) int validate_set_offset(void) { printf("Testing ADJ_SETOFFSET... "); + fflush(stdout); /* Test valid values */ if (set_offset(NSEC_PER_SEC - 1, 1)) -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.14 20/24] selftests/timers: Add missing fflush(stdout) calls

by Sasha Levin

From: Kees Cook <keescook(a)chromium.org> [ Upstream commit fe48319243a626c860fd666ca032daacc2ba84a5 ] When running under a pipe, some timer tests would not report output in real-time because stdout flushes were missing after printf()s that lacked a newline. This adds them to restore real-time status output that humans can enjoy. Signed-off-by: Kees Cook <keescook(a)chromium.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/timers/adjtick.c | 1 + tools/testing/selftests/timers/leapcrash.c | 1 + tools/testing/selftests/timers/mqueue-lat.c | 1 + tools/testing/selftests/timers/nanosleep.c | 1 + tools/testing/selftests/timers/nsleep-lat.c | 1 + tools/testing/selftests/timers/raw_skew.c | 1 + tools/testing/selftests/timers/set-tai.c | 1 + tools/testing/selftests/timers/set-tz.c | 2 ++ tools/testing/selftests/timers/threadtest.c | 1 + tools/testing/selftests/timers/valid-adjtimex.c | 2 ++ 10 files changed, 12 insertions(+) diff --git a/tools/testing/selftests/timers/adjtick.c b/tools/testing/selftests/timers/adjtick.c index 0caca3a06bd2..54d8d87f36b3 100644 --- a/tools/testing/selftests/timers/adjtick.c +++ b/tools/testing/selftests/timers/adjtick.c @@ -136,6 +136,7 @@ int check_tick_adj(long tickval) eppm = get_ppm_drift(); printf("%lld usec, %lld ppm", systick + (systick * eppm / MILLION), eppm); + fflush(stdout); tx1.modes = 0; adjtimex(&tx1); diff --git a/tools/testing/selftests/timers/leapcrash.c b/tools/testing/selftests/timers/leapcrash.c index 830c462f605d..dc80728ed191 100644 --- a/tools/testing/selftests/timers/leapcrash.c +++ b/tools/testing/selftests/timers/leapcrash.c @@ -101,6 +101,7 @@ int main(void) } clear_time_state(); printf("."); + fflush(stdout); } printf("[OK]\n"); return ksft_exit_pass(); diff --git a/tools/testing/selftests/timers/mqueue-lat.c b/tools/testing/selftests/timers/mqueue-lat.c index 1867db5d6f5e..7916cf5cc6ff 100644 --- a/tools/testing/selftests/timers/mqueue-lat.c +++ b/tools/testing/selftests/timers/mqueue-lat.c @@ -102,6 +102,7 @@ int main(int argc, char **argv) int ret; printf("Mqueue latency : "); + fflush(stdout); ret = mqueue_lat_test(); if (ret < 0) { diff --git a/tools/testing/selftests/timers/nanosleep.c b/tools/testing/selftests/timers/nanosleep.c index 8adb0bb51d4d..71b5441c2fd9 100644 --- a/tools/testing/selftests/timers/nanosleep.c +++ b/tools/testing/selftests/timers/nanosleep.c @@ -142,6 +142,7 @@ int main(int argc, char **argv) continue; printf("Nanosleep %-31s ", clockstring(clockid)); + fflush(stdout); length = 10; while (length <= (NSEC_PER_SEC * 10)) { diff --git a/tools/testing/selftests/timers/nsleep-lat.c b/tools/testing/selftests/timers/nsleep-lat.c index c3c3dc10db17..eb3e79ed7b4a 100644 --- a/tools/testing/selftests/timers/nsleep-lat.c +++ b/tools/testing/selftests/timers/nsleep-lat.c @@ -155,6 +155,7 @@ int main(int argc, char **argv) continue; printf("nsleep latency %-26s ", clockstring(clockid)); + fflush(stdout); length = 10; while (length <= (NSEC_PER_SEC * 10)) { diff --git a/tools/testing/selftests/timers/raw_skew.c b/tools/testing/selftests/timers/raw_skew.c index dcf73c5dab6e..b41d8dd0c40c 100644 --- a/tools/testing/selftests/timers/raw_skew.c +++ b/tools/testing/selftests/timers/raw_skew.c @@ -112,6 +112,7 @@ int main(int argv, char **argc) printf("WARNING: ADJ_OFFSET in progress, this will cause inaccurate results\n"); printf("Estimating clock drift: "); + fflush(stdout); sleep(120); get_monotonic_and_raw(&mon, &raw); diff --git a/tools/testing/selftests/timers/set-tai.c b/tools/testing/selftests/timers/set-tai.c index 70fed27d8fd3..8c4179ee2ca2 100644 --- a/tools/testing/selftests/timers/set-tai.c +++ b/tools/testing/selftests/timers/set-tai.c @@ -55,6 +55,7 @@ int main(int argc, char **argv) printf("tai offset started at %i\n", ret); printf("Checking tai offsets can be properly set: "); + fflush(stdout); for (i = 1; i <= 60; i++) { ret = set_tai(i); ret = get_tai(); diff --git a/tools/testing/selftests/timers/set-tz.c b/tools/testing/selftests/timers/set-tz.c index 877fd5532fee..62bd33eb16f0 100644 --- a/tools/testing/selftests/timers/set-tz.c +++ b/tools/testing/selftests/timers/set-tz.c @@ -65,6 +65,7 @@ int main(int argc, char **argv) printf("tz_minuteswest started at %i, dst at %i\n", min, dst); printf("Checking tz_minuteswest can be properly set: "); + fflush(stdout); for (i = -15*60; i < 15*60; i += 30) { ret = set_tz(i, dst); ret = get_tz_min(); @@ -76,6 +77,7 @@ int main(int argc, char **argv) printf("[OK]\n"); printf("Checking invalid tz_minuteswest values are caught: "); + fflush(stdout); if (!set_tz(-15*60-1, dst)) { printf("[FAILED] %i didn't return failure!\n", -15*60-1); diff --git a/tools/testing/selftests/timers/threadtest.c b/tools/testing/selftests/timers/threadtest.c index 759c9c06f1a0..cf3e48919874 100644 --- a/tools/testing/selftests/timers/threadtest.c +++ b/tools/testing/selftests/timers/threadtest.c @@ -163,6 +163,7 @@ int main(int argc, char **argv) strftime(buf, 255, "%a, %d %b %Y %T %z", localtime(&start)); printf("%s\n", buf); printf("Testing consistency with %i threads for %ld seconds: ", thread_count, runtime); + fflush(stdout); /* spawn */ for (i = 0; i < thread_count; i++) diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c index d9d3ab93b31a..5397de708d3c 100644 --- a/tools/testing/selftests/timers/valid-adjtimex.c +++ b/tools/testing/selftests/timers/valid-adjtimex.c @@ -123,6 +123,7 @@ int validate_freq(void) /* Set the leap second insert flag */ printf("Testing ADJ_FREQ... "); + fflush(stdout); for (i = 0; i < NUM_FREQ_VALID; i++) { tx.modes = ADJ_FREQUENCY; tx.freq = valid_freq[i]; @@ -250,6 +251,7 @@ int set_bad_offset(long sec, long usec, int use_nano) int validate_set_offset(void) { printf("Testing ADJ_SETOFFSET... "); + fflush(stdout); /* Test valid values */ if (set_offset(NSEC_PER_SEC - 1, 1)) -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 4.19 26/36] selftests: fib_rule_tests: fix local IPv4 address typo

by Sasha Levin

From: Hangbin Liu <liuhangbin(a)gmail.com> [ Upstream commit fc82d93e57e3d41f79eff19031588b262fc3d0b6 ] The IPv4 testing address are all in 192.51.100.0 subnet. It doesn't make sense to set a 198.51.100.1 local address. Should be a typo. Fixes: 65b2b4939a64 ("selftests: net: initial fib rule tests") Signed-off-by: Hangbin Liu <liuhangbin(a)gmail.com> Reviewed-by: David Ahern <dsahern(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/net/fib_rule_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/selftests/net/fib_rule_tests.sh index d84193bdc307..dbd90ca73e44 100755 --- a/tools/testing/selftests/net/fib_rule_tests.sh +++ b/tools/testing/selftests/net/fib_rule_tests.sh @@ -55,7 +55,7 @@ setup() $IP link add dummy0 type dummy $IP link set dev dummy0 up - $IP address add 198.51.100.1/24 dev dummy0 + $IP address add 192.51.100.1/24 dev dummy0 $IP -6 address add 2001:db8:1::1/64 dev dummy0 set +e -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 40/60] selftests: fib_rule_tests: fix local IPv4 address typo

by Sasha Levin

From: Hangbin Liu <liuhangbin(a)gmail.com> [ Upstream commit fc82d93e57e3d41f79eff19031588b262fc3d0b6 ] The IPv4 testing address are all in 192.51.100.0 subnet. It doesn't make sense to set a 198.51.100.1 local address. Should be a typo. Fixes: 65b2b4939a64 ("selftests: net: initial fib rule tests") Signed-off-by: Hangbin Liu <liuhangbin(a)gmail.com> Reviewed-by: David Ahern <dsahern(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/net/fib_rule_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/fib_rule_tests.sh b/tools/testing/selftests/net/fib_rule_tests.sh index 4b7e107865bf..1ba069967fa2 100755 --- a/tools/testing/selftests/net/fib_rule_tests.sh +++ b/tools/testing/selftests/net/fib_rule_tests.sh @@ -55,7 +55,7 @@ setup() $IP link add dummy0 type dummy $IP link set dev dummy0 up - $IP address add 198.51.100.1/24 dev dummy0 + $IP address add 192.51.100.1/24 dev dummy0 $IP -6 address add 2001:db8:1::1/64 dev dummy0 set +e -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH AUTOSEL 5.1 27/60] selftests/bpf: fix bpf_get_current_task

by Sasha Levin

From: Alexei Starovoitov <ast(a)kernel.org> [ Upstream commit 7ed4b4e60bb1dd3df7a45dfbde3a96efce9df7eb ] Fix bpf_get_current_task() declaration. Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Acked-by: Andrii Nakryiko <andriin(a)fb.com> Signed-off-by: Daniel Borkmann <daniel(a)iogearbox.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index c81fc350f7ad..a43a52cdd3f0 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -246,7 +246,7 @@ static int (*bpf_skb_change_type)(void *ctx, __u32 type) = (void *) BPF_FUNC_skb_change_type; static unsigned int (*bpf_get_hash_recalc)(void *ctx) = (void *) BPF_FUNC_get_hash_recalc; -static unsigned long long (*bpf_get_current_task)(void *ctx) = +static unsigned long long (*bpf_get_current_task)(void) = (void *) BPF_FUNC_get_current_task; static int (*bpf_skb_change_tail)(void *ctx, __u32 len, __u64 flags) = (void *) BPF_FUNC_skb_change_tail; -- 2.20.1

5 years, 11 months

1
0
0 0

[PATCH v1 0/9] KVM selftests for s390x

by Thomas Huth

This patch series enables the KVM selftests for s390x. As a first test, the sync_regs from x86 has been adapted to s390x, and after a fix for KVM_CAP_MAX_VCPU_ID on s390x, the kvm_create_max_vcpus is now enabled here, too. Please note that the ucall() interface is not used yet - since s390x neither has PIO nor MMIO, this needs some more work first before it becomes usable (we likely should use a DIAG hypercall here, which is what the sync_reg test is currently using, too... I started working on that topic, but did not finish that work yet, so I decided to not include it yet). RFC -> v1: - Rebase, needed to add the first patch for vcpu_nested_state_get/set - Added patch to introduce VM_MODE_DEFAULT macro - Improved/cleaned up the code in processor.c - Added patch to fix KVM_CAP_MAX_VCPU_ID on s390x - Added patch to enable the kvm_create_max_vcpus on s390x and aarch64 Andrew Jones (1): kvm: selftests: aarch64: fix default vm mode Thomas Huth (8): KVM: selftests: Wrap vcpu_nested_state_get/set functions with x86 guard KVM: selftests: Guard struct kvm_vcpu_events with __KVM_HAVE_VCPU_EVENTS KVM: selftests: Introduce a VM_MODE_DEFAULT macro for the default bits KVM: selftests: Align memory region addresses to 1M on s390x KVM: selftests: Add processor code for s390x KVM: selftests: Add the sync_regs test for s390x KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID KVM: selftests: Move kvm_create_max_vcpus test to generic code MAINTAINERS | 2 + arch/mips/kvm/mips.c | 3 + arch/powerpc/kvm/powerpc.c | 3 + arch/s390/kvm/kvm-s390.c | 1 + arch/x86/kvm/x86.c | 3 + tools/testing/selftests/kvm/Makefile | 7 +- .../testing/selftests/kvm/include/kvm_util.h | 10 + .../selftests/kvm/include/s390x/processor.h | 22 ++ .../kvm/{x86_64 => }/kvm_create_max_vcpus.c | 3 +- .../selftests/kvm/lib/aarch64/processor.c | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 25 +- .../selftests/kvm/lib/s390x/processor.c | 286 ++++++++++++++++++ .../selftests/kvm/lib/x86_64/processor.c | 2 +- .../selftests/kvm/s390x/sync_regs_test.c | 151 +++++++++ virt/kvm/arm/arm.c | 3 + virt/kvm/kvm_main.c | 2 - 16 files changed, 514 insertions(+), 11 deletions(-) create mode 100644 tools/testing/selftests/kvm/include/s390x/processor.h rename tools/testing/selftests/kvm/{x86_64 => }/kvm_create_max_vcpus.c (93%) create mode 100644 tools/testing/selftests/kvm/lib/s390x/processor.c create mode 100644 tools/testing/selftests/kvm/s390x/sync_regs_test.c -- 2.21.0

5 years, 11 months

6
35
0 0

[PATCH] kbuild: teach kselftest-merge to find nested config files

by Dan Rue

Current implementation of kselftest-merge only finds config files that are one level deep using `$(srctree)/tools/testing/selftests/*/config`. Often, config files are added in nested directories, and do not get picked up by kselftest-merge. Use `find` to catch all config files under `$(srctree)/tools/testing/selftests` instead. Signed-off-by: Dan Rue <dan.rue(a)linaro.org> --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a45f84a7e811..e99e7f9484af 100644 --- a/Makefile +++ b/Makefile @@ -1228,9 +1228,8 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m $(objtree)/.config \ - $(srctree)/tools/testing/selftests/*/config + $(Q)find $(srctree)/tools/testing/selftests -name config | \ + xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig # --------------------------------------------------------------------------- -- 2.21.0

5 years, 11 months

3
4
0 0

bpf: test_xdp_vlan.sh: Kernel panic: Unable to handle kernel paging request at virtual address 000080096d61a000

by Naresh Kamboju

Kernel panic while running bpf: test_xdp_vlan.sh test case on arm64 Juno hardware Linux version 5.2.0-rc3-next-20190604 bpf: test_xdp_vlan.sh # --- 100.64.41.2 ping statistics --- 100.64.41.2: ping_statistics # # 3 packets transmitted, 3 received, 0% packet loss, time 2049ms packets: transmitted,_3 # # rtt min/avg/max/mdev = 0.172/0.193/0.205/0.022 ms min/avg/max/mdev: =_0.172/0.193/0.205/0.022 # # PING 100.64.41.1 (100.64.41.1) 56(84) bytes of data. 100.64.41.1: (100.64.41.1)_56(84) # # 64 bytes from 100.64.41.1 icmp_seq=1 ttl=64 time=0.146 ms bytes: from_100.64.41.1 # # 64 bytes from 100.64.41.1 icmp_seq=2 ttl=64 time=0.182 ms bytes: from_100.64.41.1 # [ 492.263541] ip6_tunnel: gre6_dev xmit: Local address not yet configured! [ 788.768658] ip6_tunnel: gre6_dev xmit: Local address not yet configured! [ 940.373938] Unable to handle kernel paging request at virtual address 000080096d61a000 [ 940.381873] Mem abort info: [ 940.384717] ESR = 0x96000004 [ 940.387797] Exception class = DABT (current EL), IL = 32 bits [ 940.393715] SET = 0, FnV = 0 [ 940.396788] EA = 0, S1PTW = 0 [ 940.399949] Data abort info: [ 940.402805] ISV = 0, ISS = 0x00000004 [ 940.406647] CM = 0, WnR = 0 [ 940.409639] user pgtable: 4k pages, 48-bit VAs, pgdp=000000093bee0000 [ 940.416065] [000080096d61a000] pgd=0000000000000000 [ 940.421079] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 940.426598] Modules linked in: sit act_gact cls_flower cls_bpf sch_ingress xt_tcpudp iptable_filter ip_tables x_tables tun algif_hash af_alg tda998x drm_kms_helper drm crct10dif_ce drm_panel_orientation_quirks fuse [last unloaded: test_bpf] [ 940.447715] CPU: 2 PID: 8748 Comm: ping Not tainted 5.2.0-rc3-next-20190604 #1 [ 940.454865] Hardware name: ARM Juno development board (r2) (DT) [ 940.460727] pstate: 80000005 (Nzcv daif -PAN -UAO) [ 940.465480] pc : ip6_pol_route+0x1f4/0x738 [ 940.469537] lr : ip6_pol_route+0x1d8/0x738 [ 940.473590] sp : ffff000013fb3010 [ 940.476870] x29: ffff000013fb3010 x28: ffff000011be3000 [ 940.482132] x27: ffff80096f228a00 x26: ffff80096f364000 [ 940.487393] x25: ffff000010da3500 x24: 000000000000004e [ 940.492654] x23: ffff00001198e000 x22: ffff000013fb3240 [ 940.497915] x21: ffff00001195f000 x20: ffff80096bf95a00 [ 940.503175] x19: ffff000013fb3268 x18: 0000000000000000 [ 940.508435] x17: 0000000000000001 x16: 0000000000000000 [ 940.513696] x15: 0000000000000000 x14: 1312111000000000 [ 940.518956] x13: 0002ccaf00000000 x12: 5cf61adb01002c22 [ 940.524216] x11: 0000000000000002 x10: 0000000000000003 [ 940.529477] x9 : 0000000000000000 x8 : ffff00001195f848 [ 940.534738] x7 : ffff000013fb2ffb x6 : 0000000000000000 [ 940.539998] x5 : ffff80096f364000 x4 : 0000000000000001 [ 940.545258] x3 : 0000000000000004 x2 : 000080096d61a000 [ 940.550519] x1 : ffff80092e761700 x0 : 0000000000000000 [ 940.555780] Call trace: [ 940.558202] ip6_pol_route+0x1f4/0x738 [ 940.561914] ip6_pol_route_input+0x4c/0x60 [ 940.565971] fib6_rule_lookup+0xc8/0x170 [ 940.569855] ip6_route_input_lookup+0x70/0x88 [ 940.574169] ip6_route_input+0xe4/0x238 [ 940.577969] ip6_rcv_finish_core.isra.0+0x48/0x168 [ 940.582713] ip6_rcv_finish+0x68/0xc0 [ 940.586339] ipv6_rcv+0x70/0x228 [ 940.589536] __netif_receive_skb_one_core+0x68/0x90 [ 940.594366] __netif_receive_skb+0x28/0x80 [ 940.598422] process_backlog+0xe4/0x240 [ 940.602220] net_rx_action+0x120/0x4a8 [ 940.605933] __do_softirq+0x11c/0x580 [ 940.609559] do_softirq.part.3+0x94/0x98 [ 940.613442] __local_bh_enable_ip+0x12c/0x138 [ 940.617756] ip6_finish_output2+0x220/0xb98 [ 940.621898] __ip6_finish_output+0x1e8/0x2a8 [ 940.626126] ip6_finish_output+0x38/0xd0 [ 940.630010] ip6_output+0x80/0x350 [ 940.633378] bpf_lwt_xmit_reroute+0x2a8/0x4b0 [ 940.637692] bpf_xmit+0x120/0x178 [ 940.640972] lwtunnel_xmit+0xd0/0x210 [ 940.644600] ip_finish_output2+0x488/0xa80 [ 940.648654] __ip_finish_output+0x204/0x318 [ 940.652795] ip_finish_output+0x38/0xd0 [ 940.656592] ip_output+0x108/0x2f8 [ 940.659959] ip_local_out+0x5c/0x98 [ 940.663411] ip_send_skb+0x2c/0xb8 [ 940.666778] ip_push_pending_frames+0x44/0x50 [ 940.671093] raw_sendmsg+0xa7c/0xe20 [ 940.674633] inet_sendmsg+0x4c/0x238 [ 940.678173] sock_sendmsg+0x34/0x50 [ 940.681627] __sys_sendto+0x120/0x150 [ 940.685252] __arm64_sys_sendto+0x30/0x40 [ 940.689223] el0_svc_common.constprop.0+0x7c/0x180 [ 940.693967] el0_svc_handler+0x34/0x90 [ 940.697678] el0_svc+0x8/0xc [ 940.700531] Code: b9001020 f9403fa0 d538d082 f9402400 (f8626813) [ 940.706579] ---[ end trace 8a07ef53f23b6533 ]--- [ 940.711150] Kernel panic - not syncing: Fatal exception in interrupt [ 940.717449] SMP: stopping secondary CPUs [ 940.721536] Kernel Offset: disabled [ 940.724989] CPU features: 0x0002,24006004 [ 940.728957] Memory Limit: none [ 940.731998] ---[ end Kernel panic - not syncing: Fatal exception in interrupt ]--- [1] https://lkft.validation.linaro.org/scheduler/job/760547#L23242 Best regards Naresh Kamboju

5 years, 11 months

1
0
0 0

BUG: kernel NULL pointer dereference, address: 00000000: memcpy+0x1d/0x30

by Naresh Kamboju

While running selftest bpf: test_maps the kernel BUG found on i386 kernel running on x86_64 machine Linux version 5.2.0-rc3-next-20190604 Full test log can be found in the below link [1] # helper_fill_hashmap(261)FAILfailed to create hashmap err Cannot allocate memory, flags 0x0 to: create_hashmap # # Fork 1024 tasks to 'test_update_delete' 1024: tasks_to # # Fork 1024 tasks to 'test_update_delete' 1024: tasks_to # # Fork 100 tasks to 'test_hashmap' 100: tasks_to # # Fork 100 tasks to 'test_hashmap_percpu' 100: tasks_to # # Fork 100 tasks to 'test_hashmap_sizes' [ 93.249753] BUG: kernel NULL pointer dereference, address: 00000000 [ 93.256586] #PF: supervisor read access in kernel mode [ 93.261714] #PF: error_code(0x0000) - not-present page [ 93.266846] *pde = 00000000 [ 93.269722] Oops: 0000 [#1] SMP [ 93.272859] CPU: 0 PID: 4354 Comm: test_sockmap Not tainted 5.2.0-rc3-next-20190604 #1 [ 93.280763] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.0b 07/27/2017 [ 93.288235] EIP: memcpy+0x1d/0x30 [ 93.291547] Code: 59 58 eb 85 90 90 90 90 90 90 90 90 90 3e 8d 74 26 00 55 89 e5 57 56 89 c7 53 89 d6 89 cb c1 e9 02 f3 a5 89 d9 83 e1 03 74 02 <f3> a4 5b 5e 5f 5d c3 8d b6 00 00 00 00 8d bf 00 00 00 00 3e 8d 74 [ 93.310291] EAX: e2ca9000 EBX: 00000001 ECX: 00000001 EDX: 00000000 [ 93.316548] ESI: 00000000 EDI: e2ca9000 EBP: e3d8799c ESP: e3d87990 [ 93.322806] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010202 [ 93.329582] CR0: 80050033 CR2: 00000000 CR3: 20d21000 CR4: 003406d0 [ 93.335841] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 93.342097] DR6: fffe0ff0 DR7: 00000400 [ 93.345929] Call Trace: [ 93.348391] bpf_msg_push_data+0x635/0x660 [ 93.352492] ___bpf_prog_run+0xa0d/0x15a0 [ 93.356529] ? __lock_acquire+0x1fe/0x1360 [ 93.360626] __bpf_prog_run32+0x4b/0x70 [ 93.364461] ? sk_psock_msg_verdict+0x5/0x290 [ 93.368842] sk_psock_msg_verdict+0xad/0x290 [ 93.373105] ? sk_psock_msg_verdict+0xad/0x290 [ 93.377543] ? lockdep_hardirqs_on+0xec/0x1a0 [ 93.381896] ? __local_bh_enable_ip+0x78/0xf0 [ 93.386255] tcp_bpf_send_verdict+0x29c/0x3b0 [ 93.390615] tcp_bpf_sendpage+0x233/0x3d0 [ 93.394629] ? __lock_acquire+0x1fe/0x1360 [ 93.398754] ? __lock_acquire+0x1fe/0x1360 [ 93.402850] ? lock_release+0x8b/0x280 [ 93.406593] ? find_get_entry+0x136/0x300 [ 93.410599] ? touch_atime+0x34/0xd0 [ 93.414177] ? copy_page_to_iter+0x245/0x400 [ 93.418441] ? lockdep_hardirqs_on+0xec/0x1a0 [ 93.422793] ? tcp_bpf_send_verdict+0x3b0/0x3b0 [ 93.427325] inet_sendpage+0x53/0x1f0 [ 93.430981] ? inet_recvmsg+0x1e0/0x1e0 [ 93.434812] ? kernel_sendpage+0x40/0x40 [ 93.438728] kernel_sendpage+0x1e/0x40 [ 93.442474] sock_sendpage+0x24/0x30 [ 93.446054] pipe_to_sendpage+0x59/0xa0 [ 93.449894] ? direct_splice_actor+0x40/0x40 [ 93.454166] __splice_from_pipe+0xde/0x1c0 [ 93.458264] ? direct_splice_actor+0x40/0x40 [ 93.462535] ? direct_splice_actor+0x40/0x40 [ 93.466801] splice_from_pipe+0x59/0x80 [ 93.470641] ? splice_from_pipe+0x80/0x80 [ 93.474652] ? generic_splice_sendpage+0x20/0x20 [ 93.479262] generic_splice_sendpage+0x18/0x20 [ 93.483701] ? direct_splice_actor+0x40/0x40 [ 93.487971] direct_splice_actor+0x2d/0x40 [ 93.492065] splice_direct_to_actor+0x127/0x240 [ 93.496597] ? generic_pipe_buf_nosteal+0x10/0x10 [ 93.501302] do_splice_direct+0x7e/0xc0 [ 93.505134] do_sendfile+0x20d/0x3e0 [ 93.508739] sys_sendfile+0xac/0xd0 [ 93.512232] ? lock_release+0x8b/0x280 [ 93.515984] do_fast_syscall_32+0x8e/0x320 [ 93.520084] entry_SYSENTER_32+0x70/0xc8 [ 93.524009] EIP: 0xb7f9d7a1 [ 93.526807] Code: 8b 98 60 cd ff ff 85 d2 89 c8 74 02 89 0a 5b 5d c3 8b 04 24 c3 8b 14 24 c3 8b 1c 24 c3 8b 3c 24 c3 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 93.545542] EAX: ffffffda EBX: 0000001a ECX: 0000001e EDX: 00000000 [ 93.551799] ESI: 00000001 EDI: 0000001a EBP: 00000001 ESP: bfa67a64 [ 93.558057] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000206 [ 93.564836] Modules linked in: tun algif_hash af_alg x86_pkg_temp_thermal fuse [ 93.572082] CR2: 0000000000000000 [ 93.575411] ---[ end trace c106584042e12a8d ]--- [ 93.580046] EIP: memcpy+0x1d/0x30 [ 93.583355] Code: 59 58 eb 85 90 90 90 90 90 90 90 90 90 3e 8d 74 26 00 55 89 e5 57 56 89 c7 53 89 d6 89 cb c1 e9 02 f3 a5 89 d9 83 e1 03 74 02 <f3> a4 5b 5e 5f 5d c3 8d b6 00 00 00 00 8d bf 00 00 00 00 3e 8d 74 [ 93.602092] EAX: e2ca9000 EBX: 00000001 ECX: 00000001 EDX: 00000000 [ 93.608349] ESI: 00000000 EDI: e2ca9000 EBP: e3d8799c ESP: d967e49c [ 93.614607] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010202 [ 93.621408] CR0: 80050033 CR2: 00000000 CR3: 20d21000 CR4: 003406d0 [ 93.627694] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 93.633951] DR6: fffe0ff0 DR7: 00000400 [ 93.637783] BUG: sleeping function called from invalid context at /usr/src/kernel/include/linux/percpu-rwsem.h:34 [ 93.648035] in_atomic(): 1, irqs_disabled(): 1, pid: 4354, name: test_sockmap [ 93.655156] INFO: lockdep is turned off. [ 93.659074] irq event stamp: 1538 [ 93.662408] hardirqs last enabled at (1537): [<d902cadf>] _raw_spin_unlock_irqrestore+0x2f/0x50 [ 93.671200] hardirqs last disabled at (1538): [<d840182c>] trace_hardirqs_off_thunk+0xc/0x10 [ 93.679624] softirqs last enabled at (1532): [<d8d1b849>] lock_sock_nested+0x39/0x90 [ 93.687465] softirqs last disabled at (1530): [<d8d1b83f>] lock_sock_nested+0x2f/0x90 [ 93.695284] CPU: 0 PID: 4354 Comm: test_sockmap Tainted: G D 5.2.0-rc3-next-20190604 #1 [ 93.704573] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.0b 07/27/2017 [ 93.712043] Call Trace: [ 93.714490] dump_stack+0x66/0x96 [ 93.717800] ___might_sleep+0x13e/0x230 [ 93.721629] __might_sleep+0x33/0x80 [ 93.725200] exit_signals+0x2a/0x200 [ 93.728771] do_exit+0x8e/0xbb0 [ 93.731910] ? do_fast_syscall_32+0x8e/0x320 [ 93.736182] rewind_stack_do_exit+0x11/0x13 [ 93.740356] EIP: 0xb7f9d7a1 [ 93.743150] Code: 8b 98 60 cd ff ff 85 d2 89 c8 74 02 89 0a 5b 5d c3 8b 04 24 c3 8b 14 24 c3 8b 1c 24 c3 8b 3c 24 c3 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 93.761887] EAX: ffffffda EBX: 0000001a ECX: 0000001e EDX: 00000000 [ 93.768142] ESI: 00000001 EDI: 0000001a EBP: 00000001 ESP: bfa67a64 [ 93.774406] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000206 100: tasks_to [ 93.781266] note: test_sockmap[4354] exited with preempt_count 2 # # Fork 100 tasks to 'test_hashmap_walk' 100: tasks_to # # helper_fill_hashmap(261)FAILfailed to create hashmap err Cannot allocate memory, flags 0x0 [1] https://lkft.validation.linaro.org/scheduler/job/760391#L13640 Best regards Naresh Kamboju

5 years, 11 months

1
0
0 0

bpf: test_btf : kernel Oops: 207 : PC is at memcpy+0xc0/0x330

by Naresh Kamboju

while running kernel selftest bpf: test_btf the following kernel oops detected on beaglebone x15 board. Linux version 5.2.0-rc3-next-20190604 Full test log link can be found below [1] bpf: test_btf_ # # BTF GET_INFO test[3] (Large bpf_btf_info) OK GET_INFO: test[3]_(Large # # BTF GET_INFO test[4] (BTF ID) OK GET_INFO: test[4]_(BTF # [ 341.144885] 8<--- cut here --- [ 341.148164] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 341.156443] pgd = b0902156 [ 341.159294] [00000000] *pgd=9655e003, *pmd=ff918003 [ 341.164229] Internal error: Oops: 207 [#1] SMP ARM [ 341.169052] Modules linked in: tun sha1_generic sha1_arm_neon sha1_arm algif_hash af_alg snd_soc_simple_card snd_soc_simple_card_utils snd_soc_core ac97_bus snd_pcm_dmaengine snd_pcm snd_timer snd soundcore fuse [ 341.187962] CPU: 0 PID: 6773 Comm: test_sockmap Not tainted 5.2.0-rc3-next-20190604 #1 [ 341.195923] Hardware name: Generic DRA74X (Flattened Device Tree) [ 341.202058] PC is at memcpy+0xc0/0x330 [ 341.205836] LR is at bpf_msg_push_data+0x70c/0x728 [ 341.210654] pc : [<c12da820>] lr : [<c10ea4a4>] psr: 800b0013 [ 341.216957] sp : e99ad6cc ip : 00000002 fp : e99ad83c [ 341.222212] r10: d1bdc000 r9 : 00000001 r8 : 00000000 [ 341.227467] r7 : cd1de000 r6 : 00000000 r5 : d1bdc000 r4 : 00000000 [ 341.234032] r3 : 00000000 r2 : 80000000 r1 : 00000000 r0 : cd1de000 [ 341.240597] Flags: Nzcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user [ 341.247771] Control: 30c5387d Table: 91b19880 DAC: fffffffd [ 341.253553] Process test_sockmap (pid: 6773, stack limit = 0x3ad4028c) [ 341.260118] Stack: (0xe99ad6cc to 0xe99ae000) [ 341.264502] d6c0: cd1de000 00000000 c10ea4a4 00000000 00000000 [ 341.272725] d6e0: 00000000 00000000 00000000 00000000 00000000 00000000 ea2759a0 00000001 [ 341.280948] d700: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.289171] d720: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.297394] d740: 00000000 00000000 00000000 00000000 00000000 00000000 e99ad78c d03f0580 [ 341.305615] d760: 00000004 d03f0000 00000007 000003a9 00000000 00000000 00000000 00000000 [ 341.313836] d780: 00000000 00000000 00000000 00000000 d03f0000 c0581f6c 00000060 c1e09fd0 [ 341.322060] d7a0: e99ad85c e99ad7b0 c04c1d1c 00000000 c06c3638 c1dc19b8 e99ad7ec d03f0540 [ 341.330283] d7c0: 00000002 d03f0000 00000007 000003a9 00000001 d03f0560 d03f0000 e3444ce4 [ 341.338506] d7e0: 00000060 c1e09fd0 e99ad8a4 e99ad7f8 cbc66e00 e99ad8a8 c1419868 c059b69c [ 341.346730] d800: 00000000 00000000 e99ad824 e99ad818 c04e3b7c f006b240 e99ad8b8 c1419868 [ 341.354954] d820: c10e9d98 00000000 00000000 c0581ddc e99ad894 e99ad840 c0581f6c c10e9da4 [ 341.363175] d840: 00000000 00000000 00000000 00000000 00000000 00000000 f5388145 290412b8 [ 341.371399] d860: c2432908 00000000 f08d7937 c1e08488 f006b028 00000011 c11cd828 f006b000 [ 341.379620] d880: e99ad9e4 c1fc9e37 e99ad934 e99ad898 c0584910 c0581e48 00000000 00000000 [ 341.387841] d8a0: 00000005 00000004 00000003 00000002 00000001 00000000 cbc66ee8 00000000 [ 341.396063] d8c0: d1bdc000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.404286] d8e0: 00000000 00000000 d1bdc000 00000000 cbc66ee0 00000000 00000007 00000006 [ 341.412509] d900: 00000010 c1fc9e37 e99ad8b8 00000000 cf380840 c10fdef4 c11cd828 9fdbe7c7 [ 341.420732] d920: d1bdc000 d1bdc000 e99ad984 e99ad938 c10fdf18 c05848d0 00000000 00000000 [ 341.428954] d940: c10fde14 c0459978 e99ad97c e99ad958 c056165c e7bdd400 000001ff d1bdc000 [ 341.437178] d960: e7bdd400 00000011 cf380840 00000000 e99ad9e4 c1fc9e37 e99ad9cc e99ad988 [ 341.445407] d980: c11cd828 c10fde20 c11cda3c 00000000 00000000 e99ad9a0 00000000 00000000 [ 341.453631] d9a0: 00000001 e7bdd400 cf380840 eb6d1030 c1e08488 00000000 00000003 c1fc9e37 [ 341.461855] d9c0: e99adcac e99ad9d0 c11cdb60 c11cd518 00000000 00000000 c11cd90c e8577024 [ 341.470078] d9e0: 00000020 00000001 00000000 00000000 00000001 00000001 00000000 00000001 [ 341.478300] da00: 00000000 00000000 00000000 00000000 eb6d1030 00000000 00000001 00000000 [ 341.486522] da20: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.494742] da40: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.502965] da60: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.511184] da80: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 [ 341.519406] daa0: 00000000 00000000 00000000 00000000 00000000 00000087 00000001 d03f0500 [ 341.527628] dac0: d03f0000 c1e47f04 00000000 c1e09fd0 e99adb8c e99adae0 c04c1d1c c04c10d0 [ 341.535850] dae0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000078 [ 341.544074] db00: d03f04f0 00000087 00000000 00000000 c2432908 c2638640 00000087 d03f0500 [ 341.552296] db20: c1e08488 c2418b30 406293ec 295bca2f 00000000 00000000 00000000 00000000 [ 341.560517] db40: 00000000 00000000 d03f04f0 00000078 e99adb84 e99adb60 c040e488 00000087 [ 341.568741] db60: 00000001 d03f0500 d03f0000 c1e47f04 00000000 c1e09fd0 e99adc34 e99adb88 [ 341.576961] db80: c04c1d1c c04c10d0 ffffe000 c1fcaf30 c069cddc c1e47f04 e99adbbc e99adba8 [ 341.585182] dba0: c04c19e0 c04c1864 d03f04f0 00000087 00000000 00000000 c2432908 c2638640 [ 341.593405] dbc0: 00000087 d03f0500 c1e08488 c2418b30 406293ec 295bca2f e99adc24 e99adbe8 [ 341.601628] dbe0: c04fe13c c05615d4 00000001 00000000 c069cddc e99adc54 e99adc2c e99adc08 [ 341.609851] dc00: c040e488 c040ce94 c1e08488 00000000 ffffe000 c1fcaf30 c069cddc c1e47f04 [ 341.618073] dc20: e99adc64 e99adc30 d03f0000 c04fe13c ffffe000 c1fcaf30 c069cddc c1e47f04 [ 341.626294] dc40: e99adc64 e99adc50 c04c19e0 c04c1864 c1dc1000 c04fe13c e99adc8c e99adc68 [ 341.634517] dc60: c056165c c04c18d8 c1e47e40 400b0013 00000001 e99adce0 c069cddc 9fdbe7c7 [ 341.642738] dc80: e99adccc cf380840 c11cd90c e776d400 eb6d1030 00000010 00000001 c1938660 [ 341.650959] dca0: e99adcf4 e99adcb0 c119c98c c11cd918 00000000 e3444a98 e99add14 e99adcd0 [ 341.659180] dcc0: c069ce08 c069cd10 5cf61726 c119c908 c10933a0 00000000 00000000 c06b7624 [ 341.667403] dce0: 00000001 c1938660 e99add14 e99adcf8 c1093390 c119c914 00000000 e3444a98 [ 341.675624] dd00: e7cd5110 c1e08488 e99add2c e99add18 c10933d8 c1093368 00000000 0000026d [ 341.683846] dd20: e99add64 e99add30 c06b7694 c10933ac e99add38 00000000 00000000 00000000 [ 341.692067] dd40: c1e08488 9fdbe7c7 e7bdc800 e99adda0 d3b2fcc0 00000018 e99add9c e99add68 [ 341.700289] dd60: c06b8a04 c06b7630 e99ade60 00000000 00000000 c1e08488 d3b2fcc0 c06b7624 [ 341.708510] dd80: e68598c0 00000000 00000001 e99adf20 e99addfc e99adda0 c06b9214 c06b897c [ 341.716731] dda0: 00000001 00000001 00000000 e68598c0 00000000 00000000 00000000 00000000 [ 341.724953] ddc0: 00000000 00000000 00000000 9fdbe7c7 00000000 c06b9240 e99adea0 00000001 [ 341.733176] dde0: 00000000 00000010 00000000 00000001 e99ade14 e99ade00 c06b9270 c06b91a4 [ 341.741398] de00: 00000000 c06b7624 e99ade34 e99ade18 c06b761c c06b924c 00000000 e99adea0 [ 341.749621] de20: 00000001 d3b2fcc0 e99ade9c e99ade38 c06b7ff0 c06b75dc 00000000 c067a2dc [ 341.757842] de40: 00000001 c1e08488 00000000 c06b75d0 00000000 e9949a00 00000010 00000000 [ 341.766065] de60: 00000011 00000000 e99adf1c 9fdbe7c7 00020000 c1e08488 e99adf18 00000010 [ 341.774285] de80: 00000000 e9949a00 e99adf20 e68598c0 e99adef4 e99adea0 c06b8238 c06b7edc [ 341.782507] dea0: 00000001 00000001 00000000 e68598c0 00000010 00000000 e99adf20 00000000 [ 341.790729] dec0: 00000000 00000000 d03f0000 9fdbe7c7 c1e08488 c1e08488 e9949a00 fffff000 [ 341.798952] dee0: 00000fff 00000001 e99adf5c e99adef8 c067ac74 c06b8198 00000001 00000000 [ 341.807174] df00: e776d420 00000000 00000000 00000000 e68598c0 e9949a00 00000010 00000000 [ 341.815397] df20: 00000000 00000000 c1e08488 9fdbe7c7 00000001 c1e08488 00000001 00000000 [ 341.823618] df40: 00000000 c04011c4 0000001e 00000001 e99adfa4 e99adf60 c067c2a4 c067aaa4 [ 341.831841] df60: fffff000 00000fff e99adfac e99adf78 c1dc1000 9fdbe7c7 e99adfac bef7ca44 [ 341.840063] df80: 00000001 00000200 000000bb c04011c4 e99ac000 000000bb 00000000 e99adfa8 [ 341.848285] dfa0: c0401000 c067c1b8 bef7ca44 00000001 0000001a 0000001e 00000000 00000001 [ 341.856508] dfc0: bef7ca44 00000001 00000200 000000bb 00000001 0000001e 0000001a 00000010 [ 341.864729] dfe0: 00045034 bef7c884 000137c0 b6e76d7c 200b0010 0000001a 00000000 00000000 [ 341.872948] Backtrace: [ 341.875425] [<c10e9d98>] (bpf_msg_push_data) from [<c0581f6c>] (___bpf_prog_run+0x130/0x1bbc) [ 341.883999] r10:c0581ddc r9:00000000 r8:00000000 r7:c10e9d98 r6:c1419868 r5:e99ad8b8 [ 341.891869] r4:f006b240 [ 341.894426] [<c0581e3c>] (___bpf_prog_run) from [<c0584910>] (__bpf_prog_run32+0x4c/0x68) [ 341.902649] r10:c1fc9e37 r9:e99ad9e4 r8:f006b000 r7:c11cd828 r6:00000011 r5:f006b028 [ 341.910520] r4:c1e08488 [ 341.913079] [<c05848c4>] (__bpf_prog_run32) from [<c10fdf18>] (sk_psock_msg_verdict+0x104/0x354) [ 341.921909] r4:d1bdc000 [ 341.924470] [<c10fde14>] (sk_psock_msg_verdict) from [<c11cd828>] (tcp_bpf_send_verdict+0x31c/0x400) [ 341.933654] r10:c1fc9e37 r9:e99ad9e4 r8:00000000 r7:cf380840 r6:00000011 r5:e7bdd400 [ 341.941524] r4:d1bdc000 [ 341.944083] [<c11cd50c>] (tcp_bpf_send_verdict) from [<c11cdb60>] (tcp_bpf_sendpage+0x254/0x3c4) [ 341.952914] r10:c1fc9e37 r9:00000003 r8:00000000 r7:c1e08488 r6:eb6d1030 r5:cf380840 [ 341.960784] r4:e7bdd400 [ 341.963343] [<c11cd90c>] (tcp_bpf_sendpage) from [<c119c98c>] (inet_sendpage+0x84/0x294) [ 341.971480] r10:c1938660 r9:00000001 r8:00000010 r7:eb6d1030 r6:e776d400 r5:c11cd90c [ 341.979350] r4:cf380840 [ 341.981906] [<c119c908>] (inet_sendpage) from [<c1093390>] (kernel_sendpage+0x34/0x44) [ 341.989868] r10:c1938660 r9:00000001 r8:c06b7624 r7:00000000 r6:00000000 r5:c10933a0 [ 341.997738] r4:c119c908 [ 342.000290] [<c109335c>] (kernel_sendpage) from [<c10933d8>] (sock_sendpage+0x38/0x40) [ 342.008248] r4:c1e08488 [ 342.010805] [<c10933a0>] (sock_sendpage) from [<c06b7694>] (pipe_to_sendpage+0x70/0xa4) [ 342.018856] [<c06b7624>] (pipe_to_sendpage) from [<c06b8a04>] (__splice_from_pipe+0x94/0x1cc) [ 342.027424] r7:00000018 r6:d3b2fcc0 r5:e99adda0 r4:e7bdc800 [ 342.033122] [<c06b8970>] (__splice_from_pipe) from [<c06b9214>] (splice_from_pipe+0x7c/0xa8) [ 342.041605] r10:e99adf20 r9:00000001 r8:00000000 r7:e68598c0 r6:c06b7624 r5:d3b2fcc0 [ 342.049475] r4:c1e08488 [ 342.052032] [<c06b9198>] (splice_from_pipe) from [<c06b9270>] (generic_splice_sendpage+0x30/0x38) [ 342.060953] r10:00000001 r9:00000000 r8:00000010 r7:00000000 r6:00000001 r5:e99adea0 [ 342.068822] r4:c06b9240 [ 342.071377] [<c06b9240>] (generic_splice_sendpage) from [<c06b761c>] (direct_splice_actor+0x4c/0x54) [ 342.080562] [<c06b75d0>] (direct_splice_actor) from [<c06b7ff0>] (splice_direct_to_actor+0x120/0x2bc) [ 342.089827] r4:d3b2fcc0 [ 342.092383] [<c06b7ed0>] (splice_direct_to_actor) from [<c06b8238>] (do_splice_direct+0xac/0xe4) [ 342.101218] r10:e68598c0 r9:e99adf20 r8:e9949a00 r7:00000000 r6:00000010 r5:e99adf18 [ 342.109088] r4:c1e08488 [ 342.111645] [<c06b818c>] (do_splice_direct) from [<c067ac74>] (do_sendfile+0x1dc/0x420) [ 342.119693] r8:00000001 r7:00000fff r6:fffff000 r5:e9949a00 r4:c1e08488 [ 342.126436] [<c067aa98>] (do_sendfile) from [<c067c2a4>] (sys_sendfile+0xf8/0x11c) [ 342.134048] r10:00000001 r9:0000001e r8:c04011c4 r7:00000000 r6:00000000 r5:00000001 [ 342.141917] r4:c1e08488 [ 342.144475] [<c067c1ac>] (sys_sendfile) from [<c0401000>] (ret_fast_syscall+0x0/0x28) [ 342.152346] Exception stack(0xe99adfa8 to 0xe99adff0) [ 342.157428] dfa0: bef7ca44 00000001 0000001a 0000001e 00000000 00000001 [ 342.165650] dfc0: bef7ca44 00000001 00000200 000000bb 00000001 0000001e 0000001a 00000010 [ 342.173870] dfe0: 00045034 bef7c884 000137c0 b6e76d7c [ 342.178951] r10:000000bb r9:e99ac000 r8:c04011c4 r7:000000bb r6:00000200 r5:00000001 [ 342.186822] r4:bef7ca44 [ 342.189377] Code: e4808004 e480e004 e8bd01e0 e1b02f82 (14d13001) [ 342.195755] ---[ end trace d2353d98cf59813b ]--- [1] https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20190604/testru…

5 years, 11 months

1
0
0 0

[PATCH v2 18/22] docs: move protection-keys.rst to the core-api book

by Mauro Carvalho Chehab

This document is used by multiple architectures: $ echo $(git grep -l pkey_mprotect arch|cut -d'/' -f 2|sort|uniq) alpha arm arm64 ia64 m68k microblaze mips parisc powerpc s390 sh sparc x86 xtensa So, let's move it to the core book and adjust the links to it accordingly. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- Documentation/core-api/index.rst | 1 + Documentation/{x86 => core-api}/protection-keys.rst | 0 Documentation/x86/index.rst | 1 - arch/powerpc/Kconfig | 2 +- arch/x86/Kconfig | 2 +- tools/testing/selftests/x86/protection_keys.c | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename Documentation/{x86 => core-api}/protection-keys.rst (100%) diff --git a/Documentation/core-api/index.rst b/Documentation/core-api/index.rst index ee1bb8983a88..2466a4c51031 100644 --- a/Documentation/core-api/index.rst +++ b/Documentation/core-api/index.rst @@ -34,6 +34,7 @@ Core utilities timekeeping boot-time-mm memory-hotplug + protection-keys Interfaces for kernel debugging diff --git a/Documentation/x86/protection-keys.rst b/Documentation/core-api/protection-keys.rst similarity index 100% rename from Documentation/x86/protection-keys.rst rename to Documentation/core-api/protection-keys.rst diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst index ae36fc5fc649..f2de1b2d3ac7 100644 --- a/Documentation/x86/index.rst +++ b/Documentation/x86/index.rst @@ -19,7 +19,6 @@ x86-specific Documentation tlb mtrr pat - protection-keys intel_mpx amd-memory-encryption pti diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 1120ff8ac715..e437aa3e78b4 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -898,7 +898,7 @@ config PPC_MEM_KEYS page-based protections, but without requiring modification of the page tables when an application changes protection domains. - For details, see Documentation/vm/protection-keys.rst + For details, see Documentation/core-api/protection-keys.rst If unsure, say y. diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 23de3b9da480..61244bdb886f 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1911,7 +1911,7 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS page-based protections, but without requiring modification of the page tables when an application changes protection domains. - For details, see Documentation/x86/protection-keys.txt + For details, see Documentation/core-api/protection-keys.rst If unsure, say y. diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c index 5d546dcdbc80..480995bceefa 100644 --- a/tools/testing/selftests/x86/protection_keys.c +++ b/tools/testing/selftests/x86/protection_keys.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Tests x86 Memory Protection Keys (see Documentation/x86/protection-keys.txt) + * Tests x86 Memory Protection Keys (see Documentation/core-api/protection-keys.rst) * * There are examples in here of: * * how to set protection keys on memory -- 2.21.0

5 years, 11 months

1
0
0 0

[PATCH v15 00/17] arm64: untag user pointers passed to the kernel

by Andrey Konovalov

=== Overview 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. Right now the kernel is already able to handle user faults with tagged pointers, due to these patches: 1. 81cddd65 ("arm64: traps: fix userspace cache maintenance emulation on a tagged pointer") 2. 7dcd9dd8 ("arm64: hw_breakpoint: fix watchpoint matching for tagged pointers") 3. 276e9327 ("arm64: entry: improve data abort handling of tagged pointers") This patchset extends tagged pointer support to syscall arguments. As per the proposed ABI change [3], tagged pointers are only allowed to be passed to syscalls when they point to memory ranges obtained by anonymous mmap() or sbrk() (see the patchset [3] for more details). For non-memory syscalls this is done by untaging user pointers when the kernel performs pointer checking to find out whether the pointer comes from userspace (most notably in access_ok). The untagging is done only when the pointer is being checked, the tag is preserved as the pointer makes its way through the kernel and stays tagged when the kernel dereferences the pointer when perfoming user memory accesses. Memory syscalls (mmap, mprotect, etc.) don't do user memory accesses but rather deal with memory ranges, and untagged pointers are better suited to describe memory ranges internally. Thus for memory syscalls we untag pointers completely when they enter the kernel. === Other approaches One of the alternative approaches to untagging that was considered is to completely strip the pointer tag as the pointer enters the kernel with some kind of a syscall wrapper, but that won't work with the countless number of different ioctl calls. With this approach we would need a custom wrapper for each ioctl variation, which doesn't seem practical. An alternative approach to untagging pointers in memory syscalls prologues is to inspead allow tagged pointers to be passed to find_vma() (and other vma related functions) and untag them there. Unfortunately, a lot of find_vma() callers then compare or subtract the returned vma start and end fields against the pointer that was being searched. Thus this approach would still require changing all find_vma() callers. === Testing The following testing approaches has been taken to find potential issues with user pointer untagging: 1. Static testing (with sparse [2] and separately with a custom static analyzer based on Clang) to track casts of __user pointers to integer types to find places where untagging needs to be done. 2. Static testing with grep to find parts of the kernel that call find_vma() (and other similar functions) or directly compare against vm_start/vm_end fields of vma. 3. Static testing with grep to find parts of the kernel that compare user pointers with TASK_SIZE or other similar consts and macros. 4. Dynamic testing: adding BUG_ON(has_tag(addr)) to find_vma() and running a modified syzkaller version that passes tagged pointers to the kernel. Based on the results of the testing the requried patches have been added to the patchset. === Notes This patchset is meant to be merged together with "arm64 relaxed ABI" [3]. This patchset is a prerequisite for ARM's memory tagging hardware feature support [4]. This patchset has been merged into the Pixel 2 & 3 kernel trees and is now being used to enable testing of Pixel phones with HWASan. Thanks! [1] http://clang.llvm.org/docs/HardwareAssistedAddressSanitizerDesign.html [2] https://github.com/lucvoo/sparse-dev/commit/5f960cb10f56ec2017c128ef9d16060… [3] https://lkml.org/lkml/2019/3/18/819 [4] https://community.arm.com/processors/b/blog/posts/arm-a-profile-architectur… Changes in v15: - Removed unnecessary untagging from radeon_ttm_tt_set_userptr(). - Removed unnecessary untagging from amdgpu_ttm_tt_set_userptr(). - Moved untagging to validate_range() in userfaultfd code. - Moved untagging to ib_uverbs_(re)reg_mr() from mlx4_get_umem_mr(). - Rebased onto 5.1. Changes in v14: - Moved untagging for most memory syscalls to an arm64 specific implementation, instead of doing that in the common code. - Dropped "net, arm64: untag user pointers in tcp_zerocopy_receive", since the provided user pointers don't come from an anonymous map and thus are not covered by this ABI relaxation. - Dropped "kernel, arm64: untag user pointers in prctl_set_mm*". - Moved untagging from __check_mem_type() to tee_shm_register(). - Updated untagging for the amdgpu and radeon drivers to cover the MMU notifier, as suggested by Felix. - Since this ABI relaxation doesn't actually allow tagged instruction pointers, dropped the following patches: - Dropped "tracing, arm64: untag user pointers in seq_print_user_ip". - Dropped "uprobes, arm64: untag user pointers in find_active_uprobe". - Dropped "bpf, arm64: untag user pointers in stack_map_get_build_id_offset". - Rebased onto 5.1-rc7 (37624b58). Changes in v13: - Simplified untagging in tcp_zerocopy_receive(). - Looked at find_vma() callers in drivers/, which allowed to identify a few other places where untagging is needed. - Added patch "mm, arm64: untag user pointers in get_vaddr_frames". - Added patch "drm/amdgpu, arm64: untag user pointers in amdgpu_ttm_tt_get_user_pages". - Added patch "drm/radeon, arm64: untag user pointers in radeon_ttm_tt_pin_userptr". - Added patch "IB/mlx4, arm64: untag user pointers in mlx4_get_umem_mr". - Added patch "media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get". - Added patch "tee/optee, arm64: untag user pointers in check_mem_type". - Added patch "vfio/type1, arm64: untag user pointers". Changes in v12: - Changed untagging in tcp_zerocopy_receive() to also untag zc->address. - Fixed untagging in prctl_set_mm* to only untag pointers for vma lookups and validity checks, but leave them as is for actual user space accesses. - Updated the link to the v2 of the "arm64 relaxed ABI" patchset [3]. - Dropped the documentation patch, as the "arm64 relaxed ABI" patchset [3] handles that. Changes in v11: - Added "uprobes, arm64: untag user pointers in find_active_uprobe" patch. - Added "bpf, arm64: untag user pointers in stack_map_get_build_id_offset" patch. - Fixed "tracing, arm64: untag user pointers in seq_print_user_ip" to correctly perform subtration with a tagged addr. - Moved untagged_addr() from SYSCALL_DEFINE3(mprotect) and SYSCALL_DEFINE4(pkey_mprotect) to do_mprotect_pkey(). - Moved untagged_addr() definition for other arches from include/linux/memory.h to include/linux/mm.h. - Changed untagging in strn*_user() to perform userspace accesses through tagged pointers. - Updated the documentation to mention that passing tagged pointers to memory syscalls is allowed. - Updated the test to use malloc'ed memory instead of stack memory. Changes in v10: - Added "mm, arm64: untag user pointers passed to memory syscalls" back. - New patch "fs, arm64: untag user pointers in fs/userfaultfd.c". - New patch "net, arm64: untag user pointers in tcp_zerocopy_receive". - New patch "kernel, arm64: untag user pointers in prctl_set_mm*". - New patch "tracing, arm64: untag user pointers in seq_print_user_ip". Changes in v9: - Rebased onto 4.20-rc6. - Used u64 instead of __u64 in type casts in the untagged_addr macro for arm64. - Added braces around (addr) in the untagged_addr macro for other arches. Changes in v8: - Rebased onto 65102238 (4.20-rc1). - Added a note to the cover letter on why syscall wrappers/shims that untag user pointers won't work. - Added a note to the cover letter that this patchset has been merged into the Pixel 2 kernel tree. - Documentation fixes, in particular added a list of syscalls that don't support tagged user pointers. Changes in v7: - Rebased onto 17b57b18 (4.19-rc6). - Dropped the "arm64: untag user address in __do_user_fault" patch, since the existing patches already handle user faults properly. - Dropped the "usb, arm64: untag user addresses in devio" patch, since the passed pointer must come from a vma and therefore be untagged. - Dropped the "arm64: annotate user pointers casts detected by sparse" patch (see the discussion to the replies of the v6 of this patchset). - Added more context to the cover letter. - Updated Documentation/arm64/tagged-pointers.txt. 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). Signed-off-by: Andrey Konovalov <andreyknvl(a)google.com> Andrey Konovalov (17): uaccess: add untagged_addr definition for other arches arm64: untag user pointers in access_ok and __uaccess_mask_ptr lib, arm64: untag user pointers in strn*_user mm: add ksys_ wrappers to memory syscalls arms64: untag user pointers passed to memory syscalls mm: untag user pointers in do_pages_move mm, arm64: untag user pointers in mm/gup.c mm, arm64: untag user pointers in get_vaddr_frames fs, arm64: untag user pointers in copy_mount_options fs, arm64: untag user pointers in fs/userfaultfd.c drm/amdgpu, arm64: untag user pointers drm/radeon, arm64: untag user pointers in radeon_gem_userptr_ioctl IB, arm64: untag user pointers in ib_uverbs_(re)reg_mr() media/v4l2-core, arm64: untag user pointers in videobuf_dma_contig_user_get tee, arm64: untag user pointers in tee_shm_register vfio/type1, arm64: untag user pointers in vaddr_get_pfn selftests, arm64: add a selftest for passing tagged pointers to kernel arch/arm64/include/asm/uaccess.h | 10 +- arch/arm64/kernel/sys.c | 128 ++++++++++++++++- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 + drivers/gpu/drm/radeon/radeon_gem.c | 2 + drivers/infiniband/core/uverbs_cmd.c | 4 + drivers/media/v4l2-core/videobuf-dma-contig.c | 9 +- drivers/tee/tee_shm.c | 1 + drivers/vfio/vfio_iommu_type1.c | 2 + fs/namespace.c | 2 +- fs/userfaultfd.c | 22 +-- include/linux/mm.h | 4 + include/linux/syscalls.h | 22 +++ ipc/shm.c | 7 +- lib/strncpy_from_user.c | 3 +- lib/strnlen_user.c | 3 +- mm/frame_vector.c | 2 + mm/gup.c | 4 + mm/madvise.c | 129 +++++++++--------- mm/mempolicy.c | 21 ++- mm/migrate.c | 1 + mm/mincore.c | 57 ++++---- mm/mlock.c | 20 ++- mm/mmap.c | 30 +++- mm/mprotect.c | 6 +- mm/mremap.c | 27 ++-- mm/msync.c | 35 +++-- 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 | 21 +++ 31 files changed, 436 insertions(+), 164 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.21.0.1020.gf2820cf01a-goog

5 years, 11 months

13
98
0 0

Re: [PATCH 22/22] docs: fix broken documentation links

by Michael S. Tsirkin

On Thu, May 30, 2019 at 10:17:32PM +0200, Federico Vaga wrote: > On Thursday, May 30, 2019 1:23:53 AM CEST Mauro Carvalho Chehab wrote: > > Mostly due to x86 and acpi conversion, several documentation > > links are still pointing to the old file. Fix them. > > For the Italian documentation I just send I patch to fix them in a dedicated > patch Acked-by: Michael S. Tsirkin <mst(a)redhat.com> for the vhost change. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> > > --- > > Documentation/acpi/dsd/leds.txt | 2 +- > > Documentation/admin-guide/kernel-parameters.rst | 6 +++--- > > Documentation/admin-guide/kernel-parameters.txt | 16 ++++++++-------- > > Documentation/admin-guide/ras.rst | 2 +- > > .../devicetree/bindings/net/fsl-enetc.txt | 7 +++---- > > .../bindings/pci/amlogic,meson-pcie.txt | 2 +- > > .../bindings/regulator/qcom,rpmh-regulator.txt | 2 +- > > Documentation/devicetree/booting-without-of.txt | 2 +- > > Documentation/driver-api/gpio/board.rst | 2 +- > > Documentation/driver-api/gpio/consumer.rst | 2 +- > > .../firmware-guide/acpi/enumeration.rst | 2 +- > > .../firmware-guide/acpi/method-tracing.rst | 2 +- > > Documentation/i2c/instantiating-devices | 2 +- > > Documentation/sysctl/kernel.txt | 4 ++-- > > .../translations/it_IT/process/howto.rst | 2 +- > > .../it_IT/process/stable-kernel-rules.rst | 4 ++-- > > .../translations/zh_CN/process/4.Coding.rst | 2 +- > > Documentation/x86/x86_64/5level-paging.rst | 2 +- > > Documentation/x86/x86_64/boot-options.rst | 4 ++-- > > .../x86/x86_64/fake-numa-for-cpusets.rst | 2 +- > > MAINTAINERS | 6 +++--- > > arch/arm/Kconfig | 2 +- > > arch/arm64/kernel/kexec_image.c | 2 +- > > arch/powerpc/Kconfig | 2 +- > > arch/x86/Kconfig | 16 ++++++++-------- > > arch/x86/Kconfig.debug | 2 +- > > arch/x86/boot/header.S | 2 +- > > arch/x86/entry/entry_64.S | 2 +- > > arch/x86/include/asm/bootparam_utils.h | 2 +- > > arch/x86/include/asm/page_64_types.h | 2 +- > > arch/x86/include/asm/pgtable_64_types.h | 2 +- > > arch/x86/kernel/cpu/microcode/amd.c | 2 +- > > arch/x86/kernel/kexec-bzimage64.c | 2 +- > > arch/x86/kernel/pci-dma.c | 2 +- > > arch/x86/mm/tlb.c | 2 +- > > arch/x86/platform/pvh/enlighten.c | 2 +- > > drivers/acpi/Kconfig | 10 +++++----- > > drivers/net/ethernet/faraday/ftgmac100.c | 2 +- > > .../fieldbus/Documentation/fieldbus_dev.txt | 4 ++-- > > drivers/vhost/vhost.c | 2 +- > > include/acpi/acpi_drivers.h | 2 +- > > include/linux/fs_context.h | 2 +- > > include/linux/lsm_hooks.h | 2 +- > > mm/Kconfig | 2 +- > > security/Kconfig | 2 +- > > tools/include/linux/err.h | 2 +- > > tools/objtool/Documentation/stack-validation.txt | 4 ++-- > > tools/testing/selftests/x86/protection_keys.c | 2 +- > > 48 files changed, 77 insertions(+), 78 deletions(-) > > > > diff --git a/Documentation/acpi/dsd/leds.txt > > b/Documentation/acpi/dsd/leds.txt index 81a63af42ed2..cc58b1a574c5 100644 > > --- a/Documentation/acpi/dsd/leds.txt > > +++ b/Documentation/acpi/dsd/leds.txt > > @@ -96,4 +96,4 @@ where > > > > <URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-da > > ta-extension-UUID-v1.1.pdf>, referenced 2019-02-21. > > > > -[7] Documentation/acpi/dsd/data-node-reference.txt > > +[7] Documentation/firmware-guide/acpi/dsd/data-node-references.rst > > diff --git a/Documentation/admin-guide/kernel-parameters.rst > > b/Documentation/admin-guide/kernel-parameters.rst index > > 0124980dca2d..8d3273e32eb1 100644 > > --- a/Documentation/admin-guide/kernel-parameters.rst > > +++ b/Documentation/admin-guide/kernel-parameters.rst > > @@ -167,7 +167,7 @@ parameter is applicable:: > > X86-32 X86-32, aka i386 architecture is enabled. > > X86-64 X86-64 architecture is enabled. > > More X86-64 boot options can be found in > > - Documentation/x86/x86_64/boot-options.txt > . > > + Documentation/x86/x86_64/boot-options.rst. > > X86 Either 32-bit or 64-bit x86 (same as X86-32+X86-64) > > X86_UV SGI UV support is enabled. > > XEN Xen support is enabled > > @@ -181,10 +181,10 @@ In addition, the following text indicates that the > > option:: Parameters denoted with BOOT are actually interpreted by the boot > > loader, and have no meaning to the kernel directly. > > Do not modify the syntax of boot loader parameters without extreme > > -need or coordination with <Documentation/x86/boot.txt>. > > +need or coordination with <Documentation/x86/boot.rst>. > > > > There are also arch-specific kernel-parameters not documented here. > > -See for example <Documentation/x86/x86_64/boot-options.txt>. > > +See for example <Documentation/x86/x86_64/boot-options.rst>. > > > > Note that ALL kernel parameters listed below are CASE SENSITIVE, and that > > a trailing = on the name of any parameter states that that parameter will > > diff --git a/Documentation/admin-guide/kernel-parameters.txt > > b/Documentation/admin-guide/kernel-parameters.txt index > > 138f6664b2e2..4a02d1346635 100644 > > --- a/Documentation/admin-guide/kernel-parameters.txt > > +++ b/Documentation/admin-guide/kernel-parameters.txt > > @@ -53,7 +53,7 @@ > > ACPI_DEBUG_PRINT statements, e.g., > > ACPI_DEBUG_PRINT((ACPI_DB_INFO, ... > > The debug_level mask defaults to "info". > See > > - Documentation/acpi/debug.txt for more > information about > > + Documentation/firmware-guide/acpi/debug.rst > for more information about > > debug layers and levels. > > > > Enable processor driver info messages: > > @@ -963,7 +963,7 @@ > > for details. > > > > nompx [X86] Disables Intel Memory Protection > Extensions. > > - See Documentation/x86/intel_mpx.txt for > more > > + See Documentation/x86/intel_mpx.rst for > more > > information about the feature. > > > > nopku [X86] Disable Memory Protection Keys CPU > feature found > > @@ -1189,7 +1189,7 @@ > > that is to be dynamically loaded by Linux. > If there are > > multiple variables with the same name but > with different > > vendor GUIDs, all of them will be loaded. > See > > - Documentation/acpi/ssdt-overlays.txt for > details. > > + Documentation/admin-guide/acpi/ssdt- > overlays.rst for details. > > > > > > eisa_irq_edge= [PARISC,HW] > > @@ -2383,7 +2383,7 @@ > > > > mce [X86-32] Machine Check Exception > > > > - mce=option [X86-64] See Documentation/x86/x86_64/boot- > options.txt > > + mce=option [X86-64] See Documentation/x86/x86_64/boot- > options.rst > > > > md= [HW] RAID subsystems devices and level > > See Documentation/admin-guide/md.rst. > > @@ -2439,7 +2439,7 @@ > > set according to the > > CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE > kernel config > > option. > > - See Documentation/memory-hotplug.txt. > > + See Documentation/admin-guide/mm/memory- > hotplug.rst. > > > > memmap=exactmap [KNL,X86] Enable setting of an exact > > E820 memory map, as specified by the user. > > @@ -2528,7 +2528,7 @@ > > mem_encrypt=on: Activate > SME > > mem_encrypt=off: Do not activate SME > > > > - Refer to Documentation/x86/amd-memory- > encryption.txt > > + Refer to Documentation/virtual/kvm/amd- > memory-encryption.rst > > for details on when memory encryption can > be activated. > > > > mem_sleep_default= [SUSPEND] Default system suspend mode: > > @@ -3528,7 +3528,7 @@ > > See Documentation/blockdev/paride.txt. > > > > pirq= [SMP,APIC] Manual mp-table setup > > - See Documentation/x86/i386/IO-APIC.txt. > > + See Documentation/x86/i386/IO-APIC.rst. > > > > plip= [PPT,NET] Parallel port network link > > Format: { parport<nr> | timid | 0 } > > @@ -5054,7 +5054,7 @@ > > Can be used multiple times for multiple > devices. > > > > vga= [BOOT,X86-32] Select a particular video > mode > > - See Documentation/x86/boot.txt and > > + See Documentation/x86/boot.rst and > > Documentation/svga.txt. > > Use vga=ask for menu. > > This is actually a boot loader parameter; > the value is > > diff --git a/Documentation/admin-guide/ras.rst > > b/Documentation/admin-guide/ras.rst index c7495e42e6f4..2b20f5f7380d 100644 > > --- a/Documentation/admin-guide/ras.rst > > +++ b/Documentation/admin-guide/ras.rst > > @@ -199,7 +199,7 @@ Architecture (MCA)\ [#f3]_. > > mode). > > > > .. [#f3] For more details about the Machine Check Architecture (MCA), > > - please read Documentation/x86/x86_64/machinecheck at the Kernel tree. > > + please read Documentation/x86/x86_64/machinecheck.rst at the Kernel tree. > > > > EDAC - Error Detection And Correction > > ************************************* > > diff --git a/Documentation/devicetree/bindings/net/fsl-enetc.txt > > b/Documentation/devicetree/bindings/net/fsl-enetc.txt index > > c812e25ae90f..25fc687419db 100644 > > --- a/Documentation/devicetree/bindings/net/fsl-enetc.txt > > +++ b/Documentation/devicetree/bindings/net/fsl-enetc.txt > > @@ -16,8 +16,8 @@ Required properties: > > In this case, the ENETC node should include a "mdio" sub-node > > that in turn should contain the "ethernet-phy" node describing the > > external phy. Below properties are required, their bindings > > -already defined in ethernet.txt or phy.txt, under > > -Documentation/devicetree/bindings/net/*. > > +already defined in Documentation/devicetree/bindings/net/ethernet.txt or > > +Documentation/devicetree/bindings/net/phy.txt. > > > > Required: > > > > @@ -51,8 +51,7 @@ Example: > > connection: > > > > In this case, the ENETC port node defines a fixed link connection, > > -as specified by "fixed-link.txt", under > > -Documentation/devicetree/bindings/net/*. > > +as specified by Documentation/devicetree/bindings/net/fixed-link.txt. > > > > Required: > > > > diff --git a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > > b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt index > > 12b18f82d441..efa2c8b9b85a 100644 > > --- a/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > > +++ b/Documentation/devicetree/bindings/pci/amlogic,meson-pcie.txt > > @@ -3,7 +3,7 @@ Amlogic Meson AXG DWC PCIE SoC controller > > Amlogic Meson PCIe host controller is based on the Synopsys DesignWare PCI > > core. It shares common functions with the PCIe DesignWare core driver and > > inherits common properties defined in > > -Documentation/devicetree/bindings/pci/designware-pci.txt. > > +Documentation/devicetree/bindings/pci/designware-pcie.txt. > > > > Additional properties are described here: > > > > diff --git > > a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt index > > 7ef2dbe48e8a..14d2eee96b3d 100644 > > --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt > > @@ -97,7 +97,7 @@ Second Level Nodes - Regulators > > sent for this regulator including those which are > for a > > strictly lower power state. > > > > -Other properties defined in Documentation/devicetree/bindings/regulator.txt > > +Other properties defined in > > Documentation/devicetree/bindings/regulator/regulator.txt may also be used. > > regulator-initial-mode and regulator-allowed-modes may be specified for > > VRM regulators using mode values from > > include/dt-bindings/regulator/qcom,rpmh-regulator.h. > > regulator-allow-bypass diff --git > > a/Documentation/devicetree/booting-without-of.txt > > b/Documentation/devicetree/booting-without-of.txt index > > e86bd2f64117..60f8640f2b2f 100644 > > --- a/Documentation/devicetree/booting-without-of.txt > > +++ b/Documentation/devicetree/booting-without-of.txt > > @@ -277,7 +277,7 @@ it with special cases. > > the decompressor (the real mode entry point goes to the same 32bit > > entry point once it switched into protected mode). That entry point > > supports one calling convention which is documented in > > - Documentation/x86/boot.txt > > + Documentation/x86/boot.rst > > The physical pointer to the device-tree block (defined in chapter II) > > is passed via setup_data which requires at least boot protocol 2.09. > > The type filed is defined as > > diff --git a/Documentation/driver-api/gpio/board.rst > > b/Documentation/driver-api/gpio/board.rst index b37f3f7b8926..ce91518bf9f4 > > 100644 > > --- a/Documentation/driver-api/gpio/board.rst > > +++ b/Documentation/driver-api/gpio/board.rst > > @@ -101,7 +101,7 @@ with the help of _DSD (Device Specific Data), introduced > > in ACPI 5.1:: } > > > > For more information about the ACPI GPIO bindings see > > -Documentation/acpi/gpio-properties.txt. > > +Documentation/firmware-guide/acpi/gpio-properties.rst. > > > > Platform Data > > ------------- > > diff --git a/Documentation/driver-api/gpio/consumer.rst > > b/Documentation/driver-api/gpio/consumer.rst index > > 5e4d8aa68913..fdecb6d711db 100644 > > --- a/Documentation/driver-api/gpio/consumer.rst > > +++ b/Documentation/driver-api/gpio/consumer.rst > > @@ -437,7 +437,7 @@ case, it will be handled by the GPIO subsystem > > automatically. However, if the _DSD is not present, the mappings between > > GpioIo()/GpioInt() resources and GPIO connection IDs need to be provided by > > device drivers. > > > > -For details refer to Documentation/acpi/gpio-properties.txt > > +For details refer to Documentation/firmware-guide/acpi/gpio-properties.rst > > > > > > Interacting With the Legacy GPIO Subsystem > > diff --git a/Documentation/firmware-guide/acpi/enumeration.rst > > b/Documentation/firmware-guide/acpi/enumeration.rst index > > 850be9696931..1252617b520f 100644 > > --- a/Documentation/firmware-guide/acpi/enumeration.rst > > +++ b/Documentation/firmware-guide/acpi/enumeration.rst > > @@ -339,7 +339,7 @@ a code like this:: > > There are also devm_* versions of these functions which release the > > descriptors once the device is released. > > > > -See Documentation/acpi/gpio-properties.txt for more information about the > > +See Documentation/firmware-guide/acpi/gpio-properties.rst for more > > information about the _DSD binding related to GPIOs. > > > > MFD devices > > diff --git a/Documentation/firmware-guide/acpi/method-tracing.rst > > b/Documentation/firmware-guide/acpi/method-tracing.rst index > > d0b077b73f5f..0aa7e2c5d32a 100644 > > --- a/Documentation/firmware-guide/acpi/method-tracing.rst > > +++ b/Documentation/firmware-guide/acpi/method-tracing.rst > > @@ -68,7 +68,7 @@ c. Filter out the debug layer/level matched logs when the > > specified > > > > Where: > > 0xXXXXXXXX/0xYYYYYYYY > > - Refer to Documentation/acpi/debug.txt for possible debug layer/level > > + Refer to Documentation/firmware-guide/acpi/debug.rst for possible > > debug layer/level masking values. > > \PPPP.AAAA.TTTT.HHHH > > Full path of a control method that can be found in the ACPI namespace. > > diff --git a/Documentation/i2c/instantiating-devices > > b/Documentation/i2c/instantiating-devices index 0d85ac1935b7..5a3e2f331e8c > > 100644 > > --- a/Documentation/i2c/instantiating-devices > > +++ b/Documentation/i2c/instantiating-devices > > @@ -85,7 +85,7 @@ Method 1c: Declare the I2C devices via ACPI > > ------------------------------------------- > > > > ACPI can also describe I2C devices. There is special documentation for this > > -which is currently located at Documentation/acpi/enumeration.txt. +which > > is currently located at Documentation/firmware-guide/acpi/enumeration.rst. > > > > > > Method 2: Instantiate the devices explicitly > > diff --git a/Documentation/sysctl/kernel.txt > > b/Documentation/sysctl/kernel.txt index f0c86fbb3b48..92f7f34b021a 100644 > > --- a/Documentation/sysctl/kernel.txt > > +++ b/Documentation/sysctl/kernel.txt > > @@ -155,7 +155,7 @@ is 0x15 and the full version number is 0x234, this file > > will contain the value 340 = 0x154. > > > > See the type_of_loader and ext_loader_type fields in > > -Documentation/x86/boot.txt for additional information. > > +Documentation/x86/boot.rst for additional information. > > > > ============================================================== > > > > @@ -167,7 +167,7 @@ The complete bootloader version number. In the example > > above, this file will contain the value 564 = 0x234. > > > > See the type_of_loader and ext_loader_ver fields in > > -Documentation/x86/boot.txt for additional information. > > +Documentation/x86/boot.rst for additional information. > > > > ============================================================== > > > > diff --git a/Documentation/translations/it_IT/process/howto.rst > > b/Documentation/translations/it_IT/process/howto.rst index > > 9903ac7c566b..44e6077730e8 100644 > > --- a/Documentation/translations/it_IT/process/howto.rst > > +++ b/Documentation/translations/it_IT/process/howto.rst > > @@ -131,7 +131,7 @@ Di seguito una lista di file che sono presenti nei > > sorgente del kernel e che "Linux kernel patch submission format" > > http://linux.yyz.us/patch-format.html > > > > - :ref:`Documentation/process/translations/it_IT/stable-api-nonsense.rst > > <it_stable_api_nonsense>` + > > :ref:`Documentation/translations/it_IT/process/stable-api-nonsense.rst > > <it_stable_api_nonsense>` > > > > Questo file descrive la motivazioni sottostanti la conscia decisione di > > non avere un API stabile all'interno del kernel, incluso cose come: diff > > --git a/Documentation/translations/it_IT/process/stable-kernel-rules.rst > > b/Documentation/translations/it_IT/process/stable-kernel-rules.rst index > > 48e88e5ad2c5..4f206cee31a7 100644 > > --- a/Documentation/translations/it_IT/process/stable-kernel-rules.rst > > +++ b/Documentation/translations/it_IT/process/stable-kernel-rules.rst > > @@ -33,7 +33,7 @@ Regole sul tipo di patch che vengono o non vengono > > accettate nei sorgenti - Non deve includere alcuna correzione "banale" > > (correzioni grammaticali, pulizia dagli spazi bianchi, eccetera). > > - Deve rispettare le regole scritte in > > - :ref:`Documentation/translation/it_IT/process/submitting-patches.rst > > <it_submittingpatches>` + > > :ref:`Documentation/translations/it_IT/process/submitting-patches.rst > > <it_submittingpatches>` - Questa patch o una equivalente deve esistere già > > nei sorgenti principali di Linux > > > > @@ -43,7 +43,7 @@ Procedura per sottomettere patch per i sorgenti -stable > > > > - Se la patch contiene modifiche a dei file nelle cartelle net/ o > > drivers/net, allora seguite le linee guida descritte in > > - :ref:`Documentation/translation/it_IT/networking/netdev-FAQ.rst > > <it_netdev-FAQ>`; + > > :ref:`Documentation/translations/it_IT/networking/netdev-FAQ.rst > > <it_netdev-FAQ>`; ma solo dopo aver verificato al seguente indirizzo che la > > patch non sia già in coda: > > > > https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state= > > *&q=&archive= diff --git > > a/Documentation/translations/zh_CN/process/4.Coding.rst > > b/Documentation/translations/zh_CN/process/4.Coding.rst index > > 5301e9d55255..8bb777941394 100644 > > --- a/Documentation/translations/zh_CN/process/4.Coding.rst > > +++ b/Documentation/translations/zh_CN/process/4.Coding.rst > > @@ -241,7 +241,7 @@ scripts/coccinelle目录下已经打包了相当多的内核“语义补丁” > > > > 任何添加新用户空间界面的代码（包括新的sysfs或/proc文件）都应该包含该界面的 > > 文档，该文档使用户空间开发人员能够知道他们在使用什么。请参阅 > > -Documentation/abi/readme，了解如何格式化此文档以及需要提供哪些信息。 > > +Documentation/ABI/README，了解如何格式化此文档以及需要提供哪些信息。 > > > > 文件 :ref:`Documentation/admin-guide/kernel-parameters.rst > > <kernelparameters>` 描述了内核的所有引导时间参数。任何添加新参数的补丁都应该向该文件添加适当的 > > diff --git a/Documentation/x86/x86_64/5level-paging.rst > > b/Documentation/x86/x86_64/5level-paging.rst index > > ab88a4514163..44856417e6a5 100644 > > --- a/Documentation/x86/x86_64/5level-paging.rst > > +++ b/Documentation/x86/x86_64/5level-paging.rst > > @@ -20,7 +20,7 @@ physical address space. This "ought to be enough for > > anybody" ©. QEMU 2.9 and later support 5-level paging. > > > > Virtual memory layout for 5-level paging is described in > > -Documentation/x86/x86_64/mm.txt > > +Documentation/x86/x86_64/mm.rst > > > > > > Enabling 5-level paging > > diff --git a/Documentation/x86/x86_64/boot-options.rst > > b/Documentation/x86/x86_64/boot-options.rst index > > 2f69836b8445..6a4285a3c7a4 100644 > > --- a/Documentation/x86/x86_64/boot-options.rst > > +++ b/Documentation/x86/x86_64/boot-options.rst > > @@ -9,7 +9,7 @@ only the AMD64 specific ones are listed here. > > > > Machine check > > ============= > > -Please see Documentation/x86/x86_64/machinecheck for sysfs runtime > > tunables. +Please see Documentation/x86/x86_64/machinecheck.rst for sysfs > > runtime tunables. > > > > mce=off > > Disable machine check > > @@ -89,7 +89,7 @@ APICs > > Don't use the local APIC (alias for i386 compatibility) > > > > pirq=... > > - See Documentation/x86/i386/IO-APIC.txt > > + See Documentation/x86/i386/IO-APIC.rst > > > > noapictimer > > Don't set up the APIC timer > > diff --git a/Documentation/x86/x86_64/fake-numa-for-cpusets.rst > > b/Documentation/x86/x86_64/fake-numa-for-cpusets.rst index > > 74fbb78b3c67..04df57b9aa3f 100644 > > --- a/Documentation/x86/x86_64/fake-numa-for-cpusets.rst > > +++ b/Documentation/x86/x86_64/fake-numa-for-cpusets.rst > > @@ -18,7 +18,7 @@ For more information on the features of cpusets, see > > Documentation/cgroup-v1/cpusets.txt. > > There are a number of different configurations you can use for your needs. > > For more information on the numa=fake command line option and its various > > ways of -configuring fake nodes, see > > Documentation/x86/x86_64/boot-options.txt. +configuring fake nodes, see > > Documentation/x86/x86_64/boot-options.rst. > > > > For the purposes of this introduction, we'll assume a very primitive NUMA > > emulation setup of "numa=fake=4*512,". This will split our system memory > > into diff --git a/MAINTAINERS b/MAINTAINERS > > index 5cfbea4ce575..a38d7273705a 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -3874,7 +3874,7 @@ > > F: Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt > > F: Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt > > F: Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt > > F: Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt > > -F: Documentation/hwmon/lochnagar > > +F: Documentation/hwmon/lochnagar.rst > > > > CISCO FCOE HBA DRIVER > > M: Satish Kharat <satishkh(a)cisco.com> > > @@ -11272,7 +11272,7 @@ NXP FXAS21002C DRIVER > > M: Rui Miguel Silva <rmfrfs(a)gmail.com> > > L: linux-iio(a)vger.kernel.org > > S: Maintained > > -F: Documentation/devicetree/bindings/iio/gyroscope/fxas21002c.txt > > +F: Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt > > F: drivers/iio/gyro/fxas21002c_core.c > > F: drivers/iio/gyro/fxas21002c.h > > F: drivers/iio/gyro/fxas21002c_i2c.c > > @@ -13043,7 +13043,7 @@ M: Niklas Cassel <niklas.cassel(a)linaro.org> > > L: netdev(a)vger.kernel.org > > S: Maintained > > F: drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c > > -F: Documentation/devicetree/bindings/net/qcom,dwmac.txt > > +F: Documentation/devicetree/bindings/net/qcom,ethqos.txt > > > > QUALCOMM GENERIC INTERFACE I2C DRIVER > > M: Alok Chauhan <alokc(a)codeaurora.org> > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > > index 8869742a85df..0f220264cc23 100644 > > --- a/arch/arm/Kconfig > > +++ b/arch/arm/Kconfig > > @@ -1263,7 +1263,7 @@ config SMP > > uniprocessor machines. On a uniprocessor machine, the kernel > > will run faster if you say N here. > > > > - See also <file:Documentation/x86/i386/IO-APIC.txt>, > > + See also <file:Documentation/x86/i386/IO-APIC.rst>, > > <file:Documentation/lockup-watchdogs.txt> and the SMP-HOWTO > available at > > <http://tldp.org/HOWTO/SMP-HOWTO.html>. > > > > diff --git a/arch/arm64/kernel/kexec_image.c > > b/arch/arm64/kernel/kexec_image.c index 07bf740bea91..31cc2f423aa8 100644 > > --- a/arch/arm64/kernel/kexec_image.c > > +++ b/arch/arm64/kernel/kexec_image.c > > @@ -53,7 +53,7 @@ static void *image_load(struct kimage *image, > > > > /* > > * We require a kernel with an unambiguous Image header. Per > > - * Documentation/booting.txt, this is the case when image_size > > + * Documentation/arm64/booting.txt, this is the case when > image_size > > * is non-zero (practically speaking, since v3.17). > > */ > > h = (struct arm64_image_header *)kernel; > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > > index 8c1c636308c8..e868d2bd48b8 100644 > > --- a/arch/powerpc/Kconfig > > +++ b/arch/powerpc/Kconfig > > @@ -898,7 +898,7 @@ config PPC_MEM_KEYS > > page-based protections, but without requiring modification of > the > > page tables when an application changes protection domains. > > > > - For details, see Documentation/vm/protection-keys.rst > > + For details, see Documentation/x86/protection-keys.rst > > > > If unsure, say y. > > > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > > index 2bbbd4d1ba31..78fdf2dd71d1 100644 > > --- a/arch/x86/Kconfig > > +++ b/arch/x86/Kconfig > > @@ -395,7 +395,7 @@ config SMP > > Y to "Enhanced Real Time Clock Support", below. The "Advanced > Power > > Management" code will be disabled if you say Y here. > > > > - See also <file:Documentation/x86/i386/IO-APIC.txt>, > > + See also <file:Documentation/x86/i386/IO-APIC.rst>, > > <file:Documentation/lockup-watchdogs.txt> and the SMP-HOWTO > available at > > <http://www.tldp.org/docs.html#howto>. > > > > @@ -1290,7 +1290,7 @@ config MICROCODE > > the Linux kernel. > > > > The preferred method to load microcode from a detached initrd is > > described - in Documentation/x86/microcode.txt. For that you > need to > > enable + in Documentation/x86/microcode.rst. For that you need to enable > > CONFIG_BLK_DEV_INITRD in order for the loader to be able to scan the initrd > > for microcode blobs. > > > > @@ -1329,7 +1329,7 @@ config MICROCODE_OLD_INTERFACE > > It is inadequate because it runs too late to be able to properly > > load microcode on a machine and it needs special tools. Instead, > you > > should've switched to the early loading method with the initrd > or > > - builtin microcode by now: Documentation/x86/microcode.txt > > + builtin microcode by now: Documentation/x86/microcode.rst > > > > config X86_MSR > > tristate "/dev/cpu/*/msr - Model-specific register support" > > @@ -1478,7 +1478,7 @@ config X86_5LEVEL > > A kernel with the option enabled can be booted on machines that > > support 4- or 5-level paging. > > > > - See Documentation/x86/x86_64/5level-paging.txt for more > > + See Documentation/x86/x86_64/5level-paging.rst for more > > information. > > > > Say N if unsure. > > @@ -1626,7 +1626,7 @@ config ARCH_MEMORY_PROBE > > depends on X86_64 && MEMORY_HOTPLUG > > help > > This option enables a sysfs memory/probe interface for testing. > > - See Documentation/memory-hotplug.txt for more information. > > + See Documentation/admin-guide/mm/memory-hotplug.rst for more > > information. If you are unsure how to answer this question, answer N. > > > > config ARCH_PROC_KCORE_TEXT > > @@ -1783,7 +1783,7 @@ config MTRR > > You can safely say Y even if your machine doesn't have MTRRs, > you'll > > just add about 9 KB to your kernel. > > > > - See <file:Documentation/x86/mtrr.txt> for more information. > > + See <file:Documentation/x86/mtrr.rst> for more information. > > > > config MTRR_SANITIZER > > def_bool y > > @@ -1895,7 +1895,7 @@ config X86_INTEL_MPX > > process and adds some branches to paths used during > > exec() and munmap(). > > > > - For details, see Documentation/x86/intel_mpx.txt > > + For details, see Documentation/x86/intel_mpx.rst > > > > If unsure, say N. > > > > @@ -1911,7 +1911,7 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS > > page-based protections, but without requiring modification of > the > > page tables when an application changes protection domains. > > > > - For details, see Documentation/x86/protection-keys.txt > > + For details, see Documentation/x86/protection-keys.rst > > > > If unsure, say y. > > > > diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug > > index f730680dc818..59f598543203 100644 > > --- a/arch/x86/Kconfig.debug > > +++ b/arch/x86/Kconfig.debug > > @@ -156,7 +156,7 @@ config IOMMU_DEBUG > > code. When you use it make sure you have a big enough > > IOMMU/AGP aperture. Most of the options enabled by this can > > be set more finegrained using the iommu= command line > > - options. See Documentation/x86/x86_64/boot-options.txt for more > > + options. See Documentation/x86/x86_64/boot-options.rst for more > > details. > > > > config IOMMU_LEAK > > diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S > > index 850b8762e889..90d791ca1a95 100644 > > --- a/arch/x86/boot/header.S > > +++ b/arch/x86/boot/header.S > > @@ -313,7 +313,7 @@ start_sys_seg: .word SYSSEG > # obsolete and meaningless, > > but just > > > > type_of_loader: .byte 0 # 0 means ancient > bootloader, newer > > # bootloaders know > to change this. > > - # See > Documentation/x86/boot.txt for > > + # See > Documentation/x86/boot.rst for > > # assigned ids > > > > # flags, unused bits must be zero (RFU) bit within loadflags > > diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S > > index 11aa3b2afa4d..33f9fc38d014 100644 > > --- a/arch/x86/entry/entry_64.S > > +++ b/arch/x86/entry/entry_64.S > > @@ -8,7 +8,7 @@ > > * > > * entry.S contains the system-call and fault low-level handling routines. > > * > > - * Some of this is documented in Documentation/x86/entry_64.txt > > + * Some of this is documented in Documentation/x86/entry_64.rst > > * > > * A note on terminology: > > * - iret frame: Architecture defined interrupt frame from SS to RIP > > diff --git a/arch/x86/include/asm/bootparam_utils.h > > b/arch/x86/include/asm/bootparam_utils.h index f6f6ef436599..101eb944f13c > > 100644 > > --- a/arch/x86/include/asm/bootparam_utils.h > > +++ b/arch/x86/include/asm/bootparam_utils.h > > @@ -24,7 +24,7 @@ static void sanitize_boot_params(struct boot_params > > *boot_params) * IMPORTANT NOTE TO BOOTLOADER AUTHORS: do not simply clear > > * this field. The purpose of this field is to guarantee > > * compliance with the x86 boot spec located in > > - * Documentation/x86/boot.txt . That spec says that the > > + * Documentation/x86/boot.rst . That spec says that the > > * *whole* structure should be cleared, after which only the > > * portion defined by struct setup_header (boot_params->hdr) > > * should be copied in. > > diff --git a/arch/x86/include/asm/page_64_types.h > > b/arch/x86/include/asm/page_64_types.h index 793c14c372cb..288b065955b7 > > 100644 > > --- a/arch/x86/include/asm/page_64_types.h > > +++ b/arch/x86/include/asm/page_64_types.h > > @@ -48,7 +48,7 @@ > > > > #define __START_KERNEL_map _AC(0xffffffff80000000, UL) > > > > -/* See Documentation/x86/x86_64/mm.txt for a description of the memory map. > > */ +/* See Documentation/x86/x86_64/mm.rst for a description of the memory > > map. */ > > > > #define __PHYSICAL_MASK_SHIFT 52 > > > > diff --git a/arch/x86/include/asm/pgtable_64_types.h > > b/arch/x86/include/asm/pgtable_64_types.h index 88bca456da99..52e5f5f2240d > > 100644 > > --- a/arch/x86/include/asm/pgtable_64_types.h > > +++ b/arch/x86/include/asm/pgtable_64_types.h > > @@ -103,7 +103,7 @@ extern unsigned int ptrs_per_p4d; > > #define PGDIR_MASK (~(PGDIR_SIZE - 1)) > > > > /* > > - * See Documentation/x86/x86_64/mm.txt for a description of the memory map. > > + * See Documentation/x86/x86_64/mm.rst for a description of the memory > > map. * > > * Be very careful vs. KASLR when changing anything here. The KASLR address > > * range must not overlap with anything except the KASAN shadow area, which > > diff --git a/arch/x86/kernel/cpu/microcode/amd.c > > b/arch/x86/kernel/cpu/microcode/amd.c index e1f3ba19ba54..06d4e67f31ab > > 100644 > > --- a/arch/x86/kernel/cpu/microcode/amd.c > > +++ b/arch/x86/kernel/cpu/microcode/amd.c > > @@ -61,7 +61,7 @@ static u8 amd_ucode_patch[PATCH_MAX_SIZE]; > > > > /* > > * Microcode patch container file is prepended to the initrd in cpio > > - * format. See Documentation/x86/microcode.txt > > + * format. See Documentation/x86/microcode.rst > > */ > > static const char > > ucode_path[] __maybe_unused = "kernel/x86/microcode/AuthenticAMD.bin"; > > diff --git a/arch/x86/kernel/kexec-bzimage64.c > > b/arch/x86/kernel/kexec-bzimage64.c index 22f60dd26460..b07e7069b09e 100644 > > --- a/arch/x86/kernel/kexec-bzimage64.c > > +++ b/arch/x86/kernel/kexec-bzimage64.c > > @@ -416,7 +416,7 @@ static void *bzImage64_load(struct kimage *image, char > > *kernel, efi_map_offset = params_cmdline_sz; > > efi_setup_data_offset = efi_map_offset + ALIGN(efi_map_sz, 16); > > > > - /* Copy setup header onto bootparams. Documentation/x86/boot.txt > */ > > + /* Copy setup header onto bootparams. Documentation/x86/boot.rst */ > > setup_header_size = 0x0202 + kernel[0x0201] - setup_hdr_offset; > > > > /* Is there a limit on setup header size? */ > > diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c > > index dcd272dbd0a9..f62b498b18fb 100644 > > --- a/arch/x86/kernel/pci-dma.c > > +++ b/arch/x86/kernel/pci-dma.c > > @@ -70,7 +70,7 @@ void __init pci_iommu_alloc(void) > > } > > > > /* > > - * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel > > + * See <Documentation/x86/x86_64/boot-options.rst> for the iommu kernel > > * parameter documentation. > > */ > > static __init int iommu_setup(char *p) > > diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c > > index 7f61431c75fb..400c1ba033aa 100644 > > --- a/arch/x86/mm/tlb.c > > +++ b/arch/x86/mm/tlb.c > > @@ -711,7 +711,7 @@ void native_flush_tlb_others(const struct cpumask > > *cpumask, } > > > > /* > > - * See Documentation/x86/tlb.txt for details. We choose 33 > > + * See Documentation/x86/tlb.rst for details. We choose 33 > > * because it is large enough to cover the vast majority (at > > * least 95%) of allocations, and is small enough that we are > > * confident it will not cause too much overhead. Each single > > diff --git a/arch/x86/platform/pvh/enlighten.c > > b/arch/x86/platform/pvh/enlighten.c index 1861a2ba0f2b..c0a502f7e3a7 100644 > > --- a/arch/x86/platform/pvh/enlighten.c > > +++ b/arch/x86/platform/pvh/enlighten.c > > @@ -86,7 +86,7 @@ static void __init init_pvh_bootparams(bool xen_guest) > > } > > > > /* > > - * See Documentation/x86/boot.txt. > > + * See Documentation/x86/boot.rst. > > * > > * Version 2.12 supports Xen entry point but we will use default > x86/PC > > * environment (i.e. hardware_subarch 0). > > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > > index 283ee94224c6..2438f37f2ca1 100644 > > --- a/drivers/acpi/Kconfig > > +++ b/drivers/acpi/Kconfig > > @@ -333,7 +333,7 @@ config ACPI_CUSTOM_DSDT_FILE > > depends on !STANDALONE > > help > > This option supports a custom DSDT by linking it into the > kernel. > > - See Documentation/acpi/dsdt-override.txt > > + See Documentation/admin-guide/acpi/dsdt-override.rst > > > > Enter the full path name to the file which includes the AmlCode > > or dsdt_aml_code declaration. > > @@ -355,7 +355,7 @@ config ACPI_TABLE_UPGRADE > > This option provides functionality to upgrade arbitrary ACPI > tables > > via initrd. No functional change if no ACPI tables are passed > via > > initrd, therefore it's safe to say Y. > > - See Documentation/acpi/initrd_table_override.txt for details > > + See Documentation/admin-guide/acpi/initrd_table_override.rst for > details > > > > config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD > > bool "Override ACPI tables from built-in initrd" > > @@ -365,7 +365,7 @@ config ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD > > This option provides functionality to override arbitrary ACPI > tables > > from built-in uncompressed initrd. > > > > - See Documentation/acpi/initrd_table_override.txt for details > > + See Documentation/admin-guide/acpi/initrd_table_override.rst for > details > > > > config ACPI_DEBUG > > bool "Debug Statements" > > @@ -374,7 +374,7 @@ config ACPI_DEBUG > > output and increases the kernel size by around 50K. > > > > Use the acpi.debug_layer and acpi.debug_level kernel command- > line > > - parameters documented in Documentation/acpi/debug.txt and > > + parameters documented in Documentation/firmware-guide/acpi/ > debug.rst and > > Documentation/admin-guide/kernel-parameters.rst to control the type and > > amount of debug output. > > > > @@ -445,7 +445,7 @@ config ACPI_CUSTOM_METHOD > > help > > This debug facility allows ACPI AML methods to be inserted and/ > or > > replaced without rebooting the system. For details refer to: > > - Documentation/acpi/method-customizing.txt. > > + Documentation/firmware-guide/acpi/method-customizing.rst. > > > > NOTE: This option is security sensitive, because it allows > arbitrary > > kernel memory to be written to by root (uid=0) users, allowing > them > > diff --git a/drivers/net/ethernet/faraday/ftgmac100.c > > b/drivers/net/ethernet/faraday/ftgmac100.c index b17b79e612a3..ac6280ad43a1 > > 100644 > > --- a/drivers/net/ethernet/faraday/ftgmac100.c > > +++ b/drivers/net/ethernet/faraday/ftgmac100.c > > @@ -1075,7 +1075,7 @@ static int ftgmac100_mii_probe(struct ftgmac100 *priv, > > phy_interface_t intf) } > > > > /* Indicate that we support PAUSE frames (see comment in > > - * Documentation/networking/phy.txt) > > + * Documentation/networking/phy.rst) > > */ > > phy_support_asym_pause(phydev); > > > > diff --git a/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt > > b/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt index > > 56af3f650fa3..89fb8e14676f 100644 > > --- a/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt > > +++ b/drivers/staging/fieldbus/Documentation/fieldbus_dev.txt > > @@ -54,8 +54,8 @@ a limited few common behaviours and properties. This > > allows us to define a simple interface consisting of a character device and > > a set of sysfs files: > > > > See: > > -Documentation/ABI/testing/sysfs-class-fieldbus-dev > > -Documentation/ABI/testing/fieldbus-dev-cdev > > +drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev > > +drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev > > > > Note that this simple interface does not provide a way to modify adapter > > configuration settings. It is therefore useful only for adapters that get > > their diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c > > index 1e3ed41ae1f3..69938dbae2d0 100644 > > --- a/drivers/vhost/vhost.c > > +++ b/drivers/vhost/vhost.c > > @@ -1694,7 +1694,7 @@ EXPORT_SYMBOL_GPL(vhost_dev_ioctl); > > > > /* TODO: This is really inefficient. We need something like get_user() > > * (instruction directly accesses the data, with an exception table entry > > - * returning -EFAULT). See Documentation/x86/exception-tables.txt. > > + * returning -EFAULT). See Documentation/x86/exception-tables.rst. > > */ > > static int set_bit_to_user(int nr, void __user *addr) > > { > > diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h > > index de1804aeaf69..98e3db7a89cd 100644 > > --- a/include/acpi/acpi_drivers.h > > +++ b/include/acpi/acpi_drivers.h > > @@ -25,7 +25,7 @@ > > #define ACPI_MAX_STRING 80 > > > > /* > > - * Please update drivers/acpi/debug.c and Documentation/acpi/debug.txt > > + * Please update drivers/acpi/debug.c and > > Documentation/firmware-guide/acpi/debug.rst * if you add to this list. > > */ > > #define ACPI_BUS_COMPONENT 0x00010000 > > diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h > > index 1f966670c8dc..623eb58560b9 100644 > > --- a/include/linux/fs_context.h > > +++ b/include/linux/fs_context.h > > @@ -85,7 +85,7 @@ struct fs_parameter { > > * Superblock creation fills in ->root whereas reconfiguration begins with > > this * already set. > > * > > - * See Documentation/filesystems/mounting.txt > > + * See Documentation/filesystems/mount_api.txt > > */ > > struct fs_context { > > const struct fs_context_operations *ops; > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > > index 47f58cfb6a19..df1318d85f7d 100644 > > --- a/include/linux/lsm_hooks.h > > +++ b/include/linux/lsm_hooks.h > > @@ -77,7 +77,7 @@ > > * state. This is called immediately after commit_creds(). > > * > > * Security hooks for mount using fs_context. > > - * [See also Documentation/filesystems/mounting.txt] > > + * [See also Documentation/filesystems/mount_api.txt] > > * > > * @fs_context_dup: > > * Allocate and attach a security structure to sc->security. This > pointer > > diff --git a/mm/Kconfig b/mm/Kconfig > > index ee8d1f311858..6e5fb81bde4b 100644 > > --- a/mm/Kconfig > > +++ b/mm/Kconfig > > @@ -165,7 +165,7 @@ config MEMORY_HOTPLUG_DEFAULT_ONLINE > > onlining policy (/sys/devices/system/memory/auto_online_blocks) > which > > determines what happens to newly added memory regions. Policy > setting > > can always be changed at runtime. > > - See Documentation/memory-hotplug.txt for more information. > > + See Documentation/admin-guide/mm/memory-hotplug.rst for more > > information. > > > > Say Y here if you want all hot-plugged memory blocks to appear > in > > 'online' state by default. > > diff --git a/security/Kconfig b/security/Kconfig > > index aeac3676dd4d..6d75ed71970c 100644 > > --- a/security/Kconfig > > +++ b/security/Kconfig > > @@ -62,7 +62,7 @@ config PAGE_TABLE_ISOLATION > > ensuring that the majority of kernel addresses are not mapped > > into userspace. > > > > - See Documentation/x86/pti.txt for more details. > > + See Documentation/x86/pti.rst for more details. > > > > config SECURITY_INFINIBAND > > bool "Infiniband Security Hooks" > > diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h > > index 2f5a12b88a86..25f2bb3a991d 100644 > > --- a/tools/include/linux/err.h > > +++ b/tools/include/linux/err.h > > @@ -20,7 +20,7 @@ > > * Userspace note: > > * The same principle works for userspace, because 'error' pointers > > * fall down to the unused hole far from user space, as described > > - * in Documentation/x86/x86_64/mm.txt for x86_64 arch: > > + * in Documentation/x86/x86_64/mm.rst for x86_64 arch: > > * > > * 0000000000000000 - 00007fffffffffff (=47 bits) user space, different per > > mm hole caused by [48:63] sign extension * ffffffffffe00000 - > > ffffffffffffffff (=2 MB) unused hole > > diff --git a/tools/objtool/Documentation/stack-validation.txt > > b/tools/objtool/Documentation/stack-validation.txt index > > 4dd11a554b9b..de094670050b 100644 > > --- a/tools/objtool/Documentation/stack-validation.txt > > +++ b/tools/objtool/Documentation/stack-validation.txt > > @@ -21,7 +21,7 @@ instructions). Similarly, it knows how to follow switch > > statements, for which gcc sometimes uses jump tables. > > > > (Objtool also has an 'orc generate' subcommand which generates debuginfo > > -for the ORC unwinder. See Documentation/x86/orc-unwinder.txt in the > > +for the ORC unwinder. See Documentation/x86/orc-unwinder.rst in the > > kernel tree for more details.) > > > > > > @@ -101,7 +101,7 @@ b) ORC (Oops Rewind Capability) unwind table generation > > band. So it doesn't affect runtime performance and it can be > > reliable even when interrupts or exceptions are involved. > > > > - For more details, see Documentation/x86/orc-unwinder.txt. > > + For more details, see Documentation/x86/orc-unwinder.rst. > > > > c) Higher live patching compatibility rate > > > > diff --git a/tools/testing/selftests/x86/protection_keys.c > > b/tools/testing/selftests/x86/protection_keys.c index > > 5d546dcdbc80..798a5ddeee55 100644 > > --- a/tools/testing/selftests/x86/protection_keys.c > > +++ b/tools/testing/selftests/x86/protection_keys.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0 > > /* > > - * Tests x86 Memory Protection Keys (see > > Documentation/x86/protection-keys.txt) + * Tests x86 Memory Protection Keys > > (see Documentation/x86/protection-keys.rst) * > > * There are examples in here of: > > * * how to set protection keys on memory > > >

5 years, 11 months

1
0
0 0

[PATCH net-next v3 0/1] Allow TX timestamp with UDP GSO

by Fred Klassen

Fixes an issue where TX Timestamps are not arriving on the error queue when UDP_SEGMENT CMSG type is combined with CMSG type SO_TIMESTAMPING. Fred Klassen (1): net/udp_gso: Allow TX timestamp with UDP GSO net/ipv4/udp_offload.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.11.0

5 years, 11 months

2
4
0 0

[PATCH v5 0/3] Fix vDSO clock_getres()

by Vincenzo Frascino

clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. A possible fix is to change the vdso implementation of clock_getres, keeping a copy of hrtimer_resolution in vdso data and using that directly [1]. This patchset implements the proposed fix for arm64, powerpc, s390, nds32 and adds a test to verify that the syscall and the vdso library implementation of clock_getres return the same values. Even if these patches are unified by the same topic, there is no dependency between them, hence they can be merged singularly by each arch maintainer. Note: arm64 and nds32 respective fixes have been merged in 5.2-rc1, hence they have been removed from this series. [1] https://marc.info/?l=linux-arm-kernel&m=155110381930196&w=2 Changes: -------- v5: - Rebased on 5.2-rc2 - Fixed a bug in kselftest. v4: - Address review comments. v3: - Rebased on 5.2-rc1. - Address review comments. v2: - Rebased on 5.1-rc5. - Addressed review comments. Cc: Christophe Leroy <christophe.leroy(a)c-s.fr> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Martin Schwidefsky <schwidefsky(a)de.ibm.com> Cc: Heiko Carstens <heiko.carstens(a)de.ibm.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Vincenzo Frascino <vincenzo.frascino(a)arm.com> Vincenzo Frascino (3): powerpc: Fix vDSO clock_getres() s390: Fix vDSO clock_getres() kselftest: Extend vDSO selftest to clock_getres arch/powerpc/include/asm/vdso_datapage.h | 2 + arch/powerpc/kernel/asm-offsets.c | 2 +- arch/powerpc/kernel/time.c | 1 + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +- arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +- arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso32/clock_getres.S | 12 +- arch/s390/kernel/vdso64/clock_getres.S | 10 +- tools/testing/selftests/vDSO/Makefile | 2 + .../selftests/vDSO/vdso_clock_getres.c | 124 ++++++++++++++++++ 12 files changed, 155 insertions(+), 16 deletions(-) create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c -- 2.21.0

5 years, 11 months

2
5
0 0

[PATCH 00/22] Some documentation fixes

by Mauro Carvalho Chehab

Fix several warnings and broken links. This series was generated against linux-next, but was rebased to be applied at docs-next. It should apply cleanly on either tree. There's a git tree with all of them applied on the top of docs/docs-next at: https://git.linuxtv.org/mchehab/experimental.git/log/?h=fix_doc_links_v2 Mauro Carvalho Chehab (21): ABI: sysfs-devices-system-cpu: point to the right docs isdn: mISDN: remove a bogus reference to a non-existing doc dt: fix broken references to nand.txt docs: zh_CN: get rid of basic_profiling.txt doc: it_IT: fix reference to magic-number.rst docs: mm: numaperf.rst: get rid of a build warning docs: bpf: get rid of two warnings docs: mark orphan documents as such docs: amd-memory-encryption.rst get rid of warnings gpu: amdgpu: fix broken amdgpu_dma_buf.c references gpu: i915.rst: Fix references to renamed files docs: zh_CN: avoid duplicate citation references docs: vm: hmm.rst: fix some warnings docs: it: license-rules.rst: get rid of warnings docs: gpio: driver.rst: fix a bad tag docs: soundwire: locking: fix tags for a code-block docs: security: trusted-encrypted.rst: fix code-block tag docs: security: core.rst: Fix several warnings docs: net: dpio-driver.rst: fix two codeblock warnings docs: net: sja1105.rst: fix table format docs: fix broken documentation links Otto Sabart (1): mfd: madera: Fix bad reference to pinctrl.txt file .../ABI/testing/sysfs-devices-system-cpu | 3 +- Documentation/accelerators/ocxl.rst | 2 + Documentation/acpi/dsd/leds.txt | 2 +- .../admin-guide/kernel-parameters.rst | 6 +- .../admin-guide/kernel-parameters.txt | 16 ++--- Documentation/admin-guide/mm/numaperf.rst | 5 +- Documentation/admin-guide/ras.rst | 2 +- Documentation/arm/stm32/overview.rst | 2 + .../arm/stm32/stm32f429-overview.rst | 2 + .../arm/stm32/stm32f746-overview.rst | 2 + .../arm/stm32/stm32f769-overview.rst | 2 + .../arm/stm32/stm32h743-overview.rst | 2 + .../arm/stm32/stm32mp157-overview.rst | 2 + Documentation/bpf/btf.rst | 2 + .../bindings/mtd/amlogic,meson-nand.txt | 2 +- .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- .../devicetree/bindings/mtd/marvell-nand.txt | 2 +- .../devicetree/bindings/mtd/tango-nand.txt | 2 +- .../devicetree/bindings/net/fsl-enetc.txt | 7 +- .../bindings/pci/amlogic,meson-pcie.txt | 2 +- .../regulator/qcom,rpmh-regulator.txt | 2 +- .../devicetree/booting-without-of.txt | 2 +- Documentation/driver-api/gpio/board.rst | 2 +- Documentation/driver-api/gpio/consumer.rst | 2 +- Documentation/driver-api/gpio/driver.rst | 2 +- .../driver-api/soundwire/locking.rst | 4 +- .../firmware-guide/acpi/enumeration.rst | 2 +- .../firmware-guide/acpi/method-tracing.rst | 2 +- Documentation/gpu/amdgpu.rst | 4 +- Documentation/gpu/i915.rst | 6 +- Documentation/gpu/msm-crash-dump.rst | 2 + Documentation/i2c/instantiating-devices | 2 +- Documentation/interconnect/interconnect.rst | 2 + Documentation/laptops/lg-laptop.rst | 2 + .../freescale/dpaa2/dpio-driver.rst | 4 +- Documentation/networking/dsa/sja1105.rst | 6 +- Documentation/powerpc/isa-versions.rst | 2 + Documentation/security/keys/core.rst | 16 +++-- .../security/keys/trusted-encrypted.rst | 4 +- Documentation/sysctl/kernel.txt | 4 +- .../translations/it_IT/process/howto.rst | 2 +- .../it_IT/process/license-rules.rst | 28 ++++---- .../it_IT/process/magic-number.rst | 2 +- .../it_IT/process/stable-kernel-rules.rst | 4 +- .../translations/zh_CN/basic_profiling.txt | 71 ------------------- .../translations/zh_CN/process/4.Coding.rst | 2 +- .../zh_CN/process/management-style.rst | 4 +- .../zh_CN/process/programming-language.rst | 28 ++++---- .../virtual/kvm/amd-memory-encryption.rst | 5 ++ Documentation/virtual/kvm/vcpu-requests.rst | 2 + Documentation/vm/hmm.rst | 9 ++- Documentation/x86/x86_64/5level-paging.rst | 2 +- Documentation/x86/x86_64/boot-options.rst | 4 +- .../x86/x86_64/fake-numa-for-cpusets.rst | 2 +- MAINTAINERS | 6 +- arch/arm/Kconfig | 2 +- arch/arm64/kernel/kexec_image.c | 2 +- arch/powerpc/Kconfig | 2 +- arch/x86/Kconfig | 16 ++--- arch/x86/Kconfig.debug | 2 +- arch/x86/boot/header.S | 2 +- arch/x86/entry/entry_64.S | 2 +- arch/x86/include/asm/bootparam_utils.h | 2 +- arch/x86/include/asm/page_64_types.h | 2 +- arch/x86/include/asm/pgtable_64_types.h | 2 +- arch/x86/kernel/cpu/microcode/amd.c | 2 +- arch/x86/kernel/kexec-bzimage64.c | 2 +- arch/x86/kernel/pci-dma.c | 2 +- arch/x86/mm/tlb.c | 2 +- arch/x86/platform/pvh/enlighten.c | 2 +- drivers/acpi/Kconfig | 10 +-- drivers/isdn/mISDN/dsp_core.c | 2 - drivers/net/ethernet/faraday/ftgmac100.c | 2 +- .../fieldbus/Documentation/fieldbus_dev.txt | 4 +- drivers/vhost/vhost.c | 2 +- include/acpi/acpi_drivers.h | 2 +- include/linux/fs_context.h | 2 +- include/linux/lsm_hooks.h | 2 +- include/linux/mfd/madera/pdata.h | 3 +- mm/Kconfig | 2 +- security/Kconfig | 2 +- tools/include/linux/err.h | 2 +- .../Documentation/stack-validation.txt | 4 +- tools/testing/selftests/x86/protection_keys.c | 2 +- 84 files changed, 183 insertions(+), 212 deletions(-) delete mode 100644 Documentation/translations/zh_CN/basic_profiling.txt -- 2.21.0

5 years, 11 months

1
0
0 0

[GIT PULL] Kselftest fixes update for Linux 5.2-rc3

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 5.2-rc3. This Kselftest update for Linux 5.2-rc3 consists of - Alexandre Belloni's fixes to rtc regressions introduced in kselftest Makefile test run output refactoring work from Kees Cook. - ftrace test checkbashisms fixes from Masami Hiramatsu As a note, it is an usual and expected outcome to see a few regressions when Kselftest run-time scripts are enhanced. No surprises there. I am glad we are finding these problems early on in the rc cycle. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit a188339ca5a396acc588e5851ed7e19f66b0ebd9: Linux 5.2-rc1 (2019-05-19 15:47:09 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.2-rc3 for you to fetch changes up to eff82a263b5cfa3427fd9dbfedd96da94fdc9f19: selftests: rtc: rtctest: specify timeouts (2019-05-24 13:39:58 -0600) ---------------------------------------------------------------- linux-kselftest-5.2-rc3 This Kselftest update for Linux 5.2-rc3 consists of - Alexandre Belloni's fixes to rtc regressions introduced in kselftest Makefile test run output refactoring work from Kees Cook. - ftrace test checkbashisms fixes from Masami Hiramatsu ---------------------------------------------------------------- Alexandre Belloni (2): selftests/harness: Allow test to configure timeout selftests: rtc: rtctest: specify timeouts Masami Hiramatsu (2): selftests/ftrace: Make a script checkbashisms clean selftests/ftrace: Add checkbashisms meta-testcase tools/testing/selftests/ftrace/ftracetest | 1 + .../selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 2 +- .../selftests/ftrace/test.d/selftest/bashisms.tc | 21 +++++++++++++++++++++ tools/testing/selftests/kselftest_harness.h | 17 ++++++++++++----- tools/testing/selftests/rtc/rtctest.c | 6 +++--- 5 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/selftest/bashisms.tc ----------------------------------------------------------------

5 years, 11 months

2
1
0 0

[PATCH RFC v8 00/10] namei: resolveat(2) path resolution restrictions

by Aleksa Sarai

Patch changelog: v8: * Default to O_CLOEXEC to match other new fd-creation syscalls (users can always disable O_CLOEXEC afterwards). [Christian] * Implement magic-link restrictions based on their mode. This is done through a series of masks and is designed to avoid breaking users -- most users don't have chained O_PATH fd re-opens. * Add O_EMPTYPATH which allows for fd re-opening without needing procfs. This would help some users of fd re-opening, and with the changes to magic-link permissions we now have the right semantics for such a flag. * Add selftests for resolveat(2), O_EMPTYPATH, and the magic-link mode semantics. v7: * Remove execveat(2) support for these flags since it might result in some pretty hairy security issues with setuid binaries. There are other avenues we can go down to solve the issues with CVE-2019-5736. [Jann] * Reserve an additional bit in resolveat(2) for the eXecute access mode if we end up implementing it. v6: * Drop O_* flags API to the new LOOKUP_ path scoping bits and instead introduce resolveat(2) as an alternative method of obtaining an O_PATH. The justification for this is included in patch 6 (though switching back to O_* flags is trivial). v5: * In response to CVE-2019-5736 (one of the vectors showed that open(2)+fexec(3) cannot be used to scope binfmt_script's implicit open_exec()), AT_* flags have been re-added and are now piped through to binfmt_script (and other binfmt_* that use open_exec) but are only supported for execveat(2) for now. v4: * Remove AT_* flag reservations, as they require more discussion. * Switch to path_is_under() over __d_path() for breakout checking. * Make O_XDEV no longer block openat("/tmp", "/", O_XDEV) -- dirfd is now ignored for absolute paths to match other flags. * Improve the dirfd_path_init() refactor and move it to a separate commit. * Remove reference to Linux-capsicum. * Switch "proclink" name to magic-link. v3: [resend] v2: * Made ".." resolution with AT_THIS_ROOT and AT_BENEATH safe(r) with some semi-aggressive __d_path checking (see patch 3). * Disallowed "proclinks" with AT_THIS_ROOT and AT_BENEATH, in the hopes they can be re-enabled once safe. * Removed the selftests as they will be reimplemented as xfstests. * Removed stat(2) support, since you can already get it through O_PATH and fstatat(2). 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,2] patchset (which was a variant of David Drysdale's O_BENEATH patchset[3] which was a spin-off of the Capsicum project[4]) with a few additions and changes made based on the previous discussion within [5] as well as others I felt were useful. In line with the conclusions of the original discussion of AT_NO_JUMPS, the flag has been split up into separate flags. However, instead of being an openat(2) flag it is provided through a new syscall resolveat(2) which provides an alternative way to get an O_PATH file descriptor (the reasoning for doing this is included in patch 6). The following new LOOKUP_ flags are added: * LOOKUP_XDEV blocks all mountpoint crossings (upwards, downwards, or through absolute links). Absolute pathnames alone in openat(2) do not trigger this. * LOOKUP_NO_MAGICLINKS blocks resolution through /proc/$pid/fd-style links. This is done by blocking the usage of nd_jump_link() during resolution in a filesystem. The term "magic-links" is used to match with the only reference to these links in Documentation/, but I'm happy to change the name. It should be noted that this is different to the scope of ~LOOKUP_FOLLOW in that it applies to all path components. However, you can do resolveat(NO_FOLLOW|NO_MAGICLINKS) on a magic-link and it will *not* fail (assuming that no parent component was a magic-link), and you will have an fd for the magic-link. * LOOKUP_BENEATH disallows escapes to outside the starting dirfd's tree, using techniques such as ".." or absolute links. Absolute paths in openat(2) are also disallowed. Conceptually this flag is to ensure you "stay below" a certain point in the filesystem tree -- but this requires some additional to protect against various races that would allow escape using ".." (see patch 4 for more detail). Currently LOOKUP_BENEATH implies LOOKUP_NO_MAGICLINKS, because it can trivially beam you around the filesystem (breaking the protection). In future, there might be similar safety checks as in patch 4, but that requires more discussion. In addition, two new flags are added that expand on the above ideas: * LOOKUP_NO_SYMLINKS does what it says on the tin. No symlink resolution is allowed at all, including magic-links. Just as with LOOKUP_NO_MAGICLINKS this can still be used with NOFOLLOW to open an fd for the symlink as long as no parent path had a symlink component. * LOOKUP_IN_ROOT is an extension of LOOKUP_BENEATH that, rather than blocking attempts to move past the root, forces all such movements to be scoped to the starting point. This provides chroot(2)-like protection but without the cost of a chroot(2) for each filesystem operation, as well as being safe against race attacks that chroot(2) is not. If a race is detected (as with LOOKUP_BENEATH) then an error is generated, and similar to LOOKUP_BENEATH it is not permitted to cross magic-links with LOOKUP_IN_ROOT. The primary need for this is from container runtimes, which currently need to do symlink scoping in userspace[6] when opening paths in a potentially malicious container. There is a long list of CVEs that could have bene mitigated by having O_THISROOT (such as CVE-2017-1002101, CVE-2017-1002102, CVE-2018-15664, and CVE-2019-5736, just to name a few). And further, several semantics of file descriptor "re-opening" are now changed to prevent attacks like CVE-2019-5736 by restricting how magic-links can be resolved (based on their mode). This required some other changes to the semantics of the modes of O_PATH file descriptor's associated /proc/self/fd magic-links. resolveat(2) has the ability to further restrict re-opening of its own O_PATH fds, so that users can make even better use of this feature. Finally, O_EMPTYPATH was added so that users can do /proc/self/fd-style re-opening without depending on procfs. The new restricted semantics for magic-links are applied here too. Cc: Al Viro <viro(a)zeniv.linux.org.uk> Cc: Eric Biederman <ebiederm(a)xmission.com> Cc: Andy Lutomirski <luto(a)kernel.org> Cc: David Howells <dhowells(a)redhat.com> Cc: Jann Horn <jannh(a)google.com> Cc: Christian Brauner <christian(a)brauner.io> Cc: David Drysdale <drysdale(a)google.com> Cc: Tycho Andersen <tycho(a)tycho.ws> Cc: Kees Cook <keescook(a)chromium.org> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: <containers(a)lists.linux-foundation.org> Cc: <linux-fsdevel(a)vger.kernel.org> Cc: <linux-api(a)vger.kernel.org> [1]: https://lwn.net/Articles/721443/ [2]: https://lore.kernel.org/patchwork/patch/784221/ [3]: https://lwn.net/Articles/619151/ [4]: https://lwn.net/Articles/603929/ [5]: https://lwn.net/Articles/723057/ [6]: https://github.com/cyphar/filepath-securejoin Aleksa Sarai (10): namei: obey trailing magic-link DAC permissions procfs: switch magic-link modes to be more sane open: O_EMPTYPATH: procfs-less file descriptor re-opening namei: split out nd->dfd handling to dirfd_path_init namei: O_BENEATH-style path resolution flags namei: LOOKUP_IN_ROOT: chroot-like path resolution namei: aggressively check for nd->root escape on ".." resolution namei: resolveat(2) syscall kselftest: save-and-restore errno to allow for %m formatting selftests: add resolveat(2) selftests arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 3 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + fs/fcntl.c | 2 +- fs/internal.h | 1 + fs/namei.c | 397 ++++++++++++++--- fs/open.c | 10 +- fs/proc/base.c | 20 +- fs/proc/fd.c | 16 +- fs/proc/namespaces.c | 2 +- include/linux/fcntl.h | 10 +- include/linux/fs.h | 4 + include/linux/namei.h | 8 + include/linux/types.h | 2 +- include/uapi/asm-generic/fcntl.h | 5 + include/uapi/asm-generic/unistd.h | 5 +- include/uapi/linux/fcntl.h | 10 + tools/testing/selftests/Makefile | 1 + tools/testing/selftests/kselftest.h | 15 + tools/testing/selftests/resolveat/.gitignore | 1 + tools/testing/selftests/resolveat/Makefile | 6 + tools/testing/selftests/resolveat/helpers.h | 195 +++++++++ .../selftests/resolveat/linkmode_test.c | 306 ++++++++++++++ .../selftests/resolveat/resolveat_test.c | 400 ++++++++++++++++++ 39 files changed, 1350 insertions(+), 87 deletions(-) create mode 100644 tools/testing/selftests/resolveat/.gitignore create mode 100644 tools/testing/selftests/resolveat/Makefile create mode 100644 tools/testing/selftests/resolveat/helpers.h create mode 100644 tools/testing/selftests/resolveat/linkmode_test.c create mode 100644 tools/testing/selftests/resolveat/resolveat_test.c -- 2.21.0

5 years, 11 months

3
14
0 0

[PATCH bpf v2] selftests: bpf: fix compiler warning

by Alakesh Haloi

Add missing header file following compiler warning prog_tests/flow_dissector.c: In function ‘tx_tap’: prog_tests/flow_dissector.c:175:9: warning: implicit declaration of function ‘writev’; did you mean ‘write’? [-Wimplicit-function-declaration] return writev(fd, iov, ARRAY_SIZE(iov)); ^~~~~~ write Fixes: 0905beec9f52 ("selftests/bpf: run flow dissector tests in skb-less mode") Signed-off-by: Alakesh Haloi <alakesh.haloi(a)gmail.com> --- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c index fbd1d88a6095..c938283ac232 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -3,6 +3,7 @@ #include <error.h> #include <linux/if.h> #include <linux/if_tun.h> +#include <sys/uio.h> #define CHECK_FLOW_KEYS(desc, got, expected) \ CHECK_ATTR(memcmp(&got, &expected, sizeof(got)) != 0, \ -- 2.17.1

5 years, 11 months

3
2
0 0

[PATCH] selftests: bpf: fix compiler warning

by Alakesh Haloi

Add missing header file following compiler warning prog_tests/flow_dissector.c: In function ‘tx_tap’: prog_tests/flow_dissector.c:175:9: warning: implicit declaration of function ‘writev’; did you mean ‘write’? [-Wimplicit-function-declaration] return writev(fd, iov, ARRAY_SIZE(iov)); ^~~~~~ write Signed-off-by: Alakesh Haloi <alakesh.haloi(a)gmail.com> --- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c index fbd1d88a6095..c938283ac232 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -3,6 +3,7 @@ #include <error.h> #include <linux/if.h> #include <linux/if_tun.h> +#include <sys/uio.h> #define CHECK_FLOW_KEYS(desc, got, expected) \ CHECK_ATTR(memcmp(&got, &expected, sizeof(got)) != 0, \ -- 2.17.1

5 years, 11 months

2
2
0 0

[PATCH] selftests: vm: install test_vmalloc.sh for run_vmtests

by Naresh Kamboju

Add test_vmalloc.sh to TEST_FILES to make sure it gets installed for run_vmtests. Fixed below error: ./run_vmtests: line 217: ./test_vmalloc.sh: No such file or directory Tested with: make TARGETS=vm install INSTALL_PATH=$PWD/x Signed-off-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> --- tools/testing/selftests/vm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index e13eb6cc8901..05306c58ff9f 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,6 +25,8 @@ TEST_GEN_FILES += virtual_address_range TEST_PROGS := run_vmtests +TEST_FILES := test_vmalloc.sh + KSFT_KHDR_INSTALL := 1 include ../lib.mk -- 2.17.1

5 years, 11 months

2
1
0 0

[PATCH net 0/4] Allow TX timestamp with UDP GSO

by Fred Klassen

Fixes an issue where TX Timestamps are not arriving on the error queue when UDP_SEGMENT CMSG type is combined with CMSG type SO_TIMESTAMPING. Also this updates the UDP GSO selftests to optionally stress test this condition, and report the reliability and performance of both TX Timestamping and ZEROCOPY messages. Fred Klassen (4): net/udp_gso: Allow TX timestamp with UDP GSO net/udpgso_bench_tx: options to exercise TX CMSG net/udpgso_bench_tx: fix sendmmsg on unconnected socket net/udpgso_bench_tx: audit error queue net/ipv4/udp_offload.c | 4 + tools/testing/selftests/net/udpgso_bench_tx.c | 376 ++++++++++++++++++++++++-- 2 files changed, 358 insertions(+), 22 deletions(-) -- 2.11.0

5 years, 11 months

2
33
0 0

[PATCH v2 0/2] close_range()

by Christian Brauner

Hey, This is v2 of this patchset. In accordance with some comments There's a cond_resched() added to the close loop similar to what is done for close_files(). A common helper pick_file() for __close_fd() and __close_range() has been split out. This allows to only make a cond_resched() call when filp_close() has been called similar to what is done in close_files(). Maybe that's not worth it. Jann mentioned that cond_resched() looks rather cheap. So it maybe that we could simply do: while (fd <= max_fd) { __close(files, fd++); cond_resched(); } I also added a missing test for close_range(fd, fd, 0). Thanks! Christian Christian Brauner (2): open: add close_range() tests: add close_range() tests arch/alpha/kernel/syscalls/syscall.tbl | 1 + arch/arm/tools/syscall.tbl | 1 + arch/arm64/include/asm/unistd32.h | 2 + arch/ia64/kernel/syscalls/syscall.tbl | 1 + arch/m68k/kernel/syscalls/syscall.tbl | 1 + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + arch/parisc/kernel/syscalls/syscall.tbl | 1 + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + arch/s390/kernel/syscalls/syscall.tbl | 1 + arch/sh/kernel/syscalls/syscall.tbl | 1 + arch/sparc/kernel/syscalls/syscall.tbl | 1 + arch/x86/entry/syscalls/syscall_32.tbl | 1 + arch/x86/entry/syscalls/syscall_64.tbl | 1 + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + fs/file.c | 62 +++++++- fs/open.c | 20 +++ include/linux/fdtable.h | 2 + include/linux/syscalls.h | 2 + include/uapi/asm-generic/unistd.h | 4 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/core/.gitignore | 1 + tools/testing/selftests/core/Makefile | 6 + .../testing/selftests/core/close_range_test.c | 142 ++++++++++++++++++ 26 files changed, 249 insertions(+), 9 deletions(-) create mode 100644 tools/testing/selftests/core/.gitignore create mode 100644 tools/testing/selftests/core/Makefile create mode 100644 tools/testing/selftests/core/close_range_test.c -- 2.21.0

5 years, 11 months

4
7
0 0

[PATCH] userfaultfd: selftest: fix compiler warning

by Alakesh Haloi

Fixes following compiler warning userfaultfd.c: In function ‘usage’: userfaultfd.c:126:2: warning: format not a string literal and no format arguments [-Wformat-security] fprintf(stderr, examples); Signed-off-by: Alakesh Haloi <alakesh.haloi(a)gmail.com> --- tools/testing/selftests/vm/userfaultfd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 5d1db824f73a..b3e6497b080c 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -123,7 +123,7 @@ static void usage(void) fprintf(stderr, "Supported <test type>: anon, hugetlb, " "hugetlb_shared, shmem\n\n"); fprintf(stderr, "Examples:\n\n"); - fprintf(stderr, examples); + fprintf(stderr, "%s", examples); exit(1); } -- 2.17.1

5 years, 11 months

3
2
0 0

[PATCH v3 3/3] tests: add close_range() tests

by Christian Brauner

This adds basic tests for the new close_range() syscall. - test that no invalid flags can be passed - test that a range of file descriptors is correctly closed - test that a range of file descriptors is correctly closed if there there are already closed file descriptors in the range - test that max_fd is correctly capped to the current fdtable maximum Signed-off-by: Christian Brauner <christian(a)brauner.io> Cc: Arnd Bergmann <arnd(a)arndb.de> Cc: Jann Horn <jannh(a)google.com> Cc: David Howells <dhowells(a)redhat.com> Cc: Dmitry V. Levin <ldv(a)altlinux.org> Cc: Oleg Nesterov <oleg(a)redhat.com> Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Florian Weimer <fweimer(a)redhat.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: linux-api(a)vger.kernel.org Cc: linux-kselftest(a)vger.kernel.org --- v1: unchanged v2: - Christian Brauner <christian(a)brauner.io>: - verify that close_range() correctly closes a single file descriptor v3: - Christian Brauner <christian(a)brauner.io>: - add missing Cc for Shuah - add missing Cc for linux-kselftest --- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/core/.gitignore | 1 + tools/testing/selftests/core/Makefile | 6 + .../testing/selftests/core/close_range_test.c | 142 ++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 tools/testing/selftests/core/.gitignore create mode 100644 tools/testing/selftests/core/Makefile create mode 100644 tools/testing/selftests/core/close_range_test.c diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 9781ca79794a..06e57fabbff9 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -4,6 +4,7 @@ TARGETS += bpf TARGETS += breakpoints TARGETS += capabilities TARGETS += cgroup +TARGETS += core TARGETS += cpufreq TARGETS += cpu-hotplug TARGETS += drivers/dma-buf diff --git a/tools/testing/selftests/core/.gitignore b/tools/testing/selftests/core/.gitignore new file mode 100644 index 000000000000..6e6712ce5817 --- /dev/null +++ b/tools/testing/selftests/core/.gitignore @@ -0,0 +1 @@ +close_range_test diff --git a/tools/testing/selftests/core/Makefile b/tools/testing/selftests/core/Makefile new file mode 100644 index 000000000000..de3ae68aa345 --- /dev/null +++ b/tools/testing/selftests/core/Makefile @@ -0,0 +1,6 @@ +CFLAGS += -g -I../../../../usr/include/ -I../../../../include + +TEST_GEN_PROGS := close_range_test + +include ../lib.mk + diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c new file mode 100644 index 000000000000..d6e6079d3d53 --- /dev/null +++ b/tools/testing/selftests/core/close_range_test.c @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0 + +#define _GNU_SOURCE +#include <errno.h> +#include <fcntl.h> +#include <linux/kernel.h> +#include <limits.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <syscall.h> +#include <unistd.h> + +#include "../kselftest.h" + +static inline int sys_close_range(unsigned int fd, unsigned int max_fd, + unsigned int flags) +{ + return syscall(__NR_close_range, fd, max_fd, flags); +} + +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif + +int main(int argc, char **argv) +{ + const char *test_name = "close_range"; + int i, ret; + int open_fds[101]; + int fd_max, fd_mid, fd_min; + + ksft_set_plan(9); + + for (i = 0; i < ARRAY_SIZE(open_fds); i++) { + int fd; + + fd = open("/dev/null", O_RDONLY | O_CLOEXEC); + if (fd < 0) { + if (errno == ENOENT) + ksft_exit_skip( + "%s test: skipping test since /dev/null does not exist\n", + test_name); + + ksft_exit_fail_msg( + "%s test: %s - failed to open /dev/null\n", + strerror(errno), test_name); + } + + open_fds[i] = fd; + } + + fd_min = open_fds[0]; + fd_max = open_fds[99]; + + ret = sys_close_range(fd_min, fd_max, 1); + if (!ret) + ksft_exit_fail_msg( + "%s test: managed to pass invalid flag value\n", + test_name); + ksft_test_result_pass("do not allow invalid flag values for close_range()\n"); + + fd_mid = open_fds[50]; + ret = sys_close_range(fd_min, fd_mid, 0); + if (ret < 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from %d to %d\n", + test_name, fd_min, fd_mid); + ksft_test_result_pass("close_range() from %d to %d\n", fd_min, fd_mid); + + for (i = 0; i <= 50; i++) { + ret = fcntl(open_fds[i], F_GETFL); + if (ret >= 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from %d to %d\n", + test_name, fd_min, fd_mid); + } + ksft_test_result_pass("fcntl() verify closed range from %d to %d\n", fd_min, fd_mid); + + /* create a couple of gaps */ + close(57); + close(78); + close(81); + close(82); + close(84); + close(90); + + fd_mid = open_fds[51]; + /* Choose slightly lower limit and leave some fds for a later test */ + fd_max = open_fds[92]; + ret = sys_close_range(fd_mid, fd_max, 0); + if (ret < 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from 51 to 100\n", + test_name); + ksft_test_result_pass("close_range() from %d to %d\n", fd_mid, fd_max); + + for (i = 51; i <= 92; i++) { + ret = fcntl(open_fds[i], F_GETFL); + if (ret >= 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from 51 to 100\n", + test_name); + } + ksft_test_result_pass("fcntl() verify closed range from %d to %d\n", fd_mid, fd_max); + + fd_mid = open_fds[93]; + fd_max = open_fds[99]; + /* test that the kernel caps and still closes all fds */ + ret = sys_close_range(fd_mid, UINT_MAX, 0); + if (ret < 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from 51 to 100\n", + test_name); + ksft_test_result_pass("close_range() from %d to %d\n", fd_mid, fd_max); + + for (i = 93; i < 100; i++) { + ret = fcntl(open_fds[i], F_GETFL); + if (ret >= 0) + ksft_exit_fail_msg( + "%s test: Failed to close range of file descriptors from 51 to 100\n", + test_name); + } + ksft_test_result_pass("fcntl() verify closed range from %d to %d\n", fd_mid, fd_max); + + ret = sys_close_range(open_fds[100], open_fds[100], 0); + if (ret < 0) + ksft_exit_fail_msg( + "%s test: Failed to close single file descriptor\n", + test_name); + ksft_test_result_pass("close_range() closed single file descriptor\n"); + + ret = fcntl(open_fds[100], F_GETFL); + if (ret >= 0) + ksft_exit_fail_msg( + "%s test: Failed to close single file descriptor\n", + test_name); + ksft_test_result_pass("fcntl() verify closed single file descriptor\n"); + + return ksft_exit_pass(); +} -- 2.21.0

5 years, 11 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror