May 2019 - Linux-kselftest-mirror

[PATCH AUTOSEL 5.0 26/99] selftests: fib_tests: Fix 'Command line is not complete' errors

by Sasha Levin

From: David Ahern <dsahern(a)gmail.com> [ Upstream commit a5f622984a623df9a84cf43f6b098d8dd76fbe05 ] A couple of tests are verifying a route has been removed. The helper expects the prefix as the first part of the expected output. When checking that a route has been deleted the prefix is empty leading to an invalid ip command: $ ip ro ls match Command line is not complete. Try option "help" Fix by moving the comparison of expected output and output to a new function that is used by both check_route and check_route6. Use the new helper for the 2 checks on route removal. Also, remove the reset of 'set -x' in route_setup which overrides the user managed setting. Fixes: d69faad76584c ("selftests: fib_tests: Add prefix route tests with metric") Signed-off-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_tests.sh | 94 ++++++++++-------------- 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh index 1080ff55a788..0d2a5f4f1e63 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh @@ -605,6 +605,39 @@ run_cmd() return $rc } +check_expected() +{ + local out="$1" + local expected="$2" + local rc=0 + + [ "${out}" = "${expected}" ] && return 0 + + if [ -z "${out}" ]; then + if [ "$VERBOSE" = "1" ]; then + printf "\nNo route entry found\n" + printf "Expected:\n" + printf " ${expected}\n" + fi + return 1 + fi + + # tricky way to convert output to 1-line without ip's + # messy '\'; this drops all extra white space + out=$(echo ${out}) + if [ "${out}" != "${expected}" ]; then + rc=1 + if [ "${VERBOSE}" = "1" ]; then + printf " Unexpected route entry. Have:\n" + printf " ${out}\n" + printf " Expected:\n" + printf " ${expected}\n\n" + fi + fi + + return $rc +} + # add route for a prefix, flushing any existing routes first # expected to be the first step of a test add_route6() @@ -652,31 +685,7 @@ check_route6() pfx=$1 out=$($IP -6 ro ls match ${pfx} | sed -e 's/ pref medium//') - [ "${out}" = "${expected}" ] && return 0 - - if [ -z "${out}" ]; then - if [ "$VERBOSE" = "1" ]; then - printf "\nNo route entry found\n" - printf "Expected:\n" - printf " ${expected}\n" - fi - return 1 - fi - - # tricky way to convert output to 1-line without ip's - # messy '\'; this drops all extra white space - out=$(echo ${out}) - if [ "${out}" != "${expected}" ]; then - rc=1 - if [ "${VERBOSE}" = "1" ]; then - printf " Unexpected route entry. Have:\n" - printf " ${out}\n" - printf " Expected:\n" - printf " ${expected}\n\n" - fi - fi - - return $rc + check_expected "${out}" "${expected}" } route_cleanup() @@ -725,7 +734,7 @@ route_setup() ip -netns ns2 addr add 172.16.103.2/24 dev veth4 ip -netns ns2 addr add 172.16.104.1/24 dev dummy1 - set +ex + set +e } # assumption is that basic add of a single path route works @@ -960,7 +969,8 @@ ipv6_addr_metric_test() run_cmd "$IP li set dev dummy2 down" rc=$? if [ $rc -eq 0 ]; then - check_route6 "" + out=$($IP -6 ro ls match 2001:db8:104::/64) + check_expected "${out}" "" rc=$? fi log_test $rc 0 "Prefix route removed on link down" @@ -1091,38 +1101,13 @@ check_route() local pfx local expected="$1" local out - local rc=0 set -- $expected pfx=$1 [ "${pfx}" = "unreachable" ] && pfx=$2 out=$($IP ro ls match ${pfx}) - [ "${out}" = "${expected}" ] && return 0 - - if [ -z "${out}" ]; then - if [ "$VERBOSE" = "1" ]; then - printf "\nNo route entry found\n" - printf "Expected:\n" - printf " ${expected}\n" - fi - return 1 - fi - - # tricky way to convert output to 1-line without ip's - # messy '\'; this drops all extra white space - out=$(echo ${out}) - if [ "${out}" != "${expected}" ]; then - rc=1 - if [ "${VERBOSE}" = "1" ]; then - printf " Unexpected route entry. Have:\n" - printf " ${out}\n" - printf " Expected:\n" - printf " ${expected}\n\n" - fi - fi - - return $rc + check_expected "${out}" "${expected}" } # assumption is that basic add of a single path route works @@ -1387,7 +1372,8 @@ ipv4_addr_metric_test() run_cmd "$IP li set dev dummy2 down" rc=$? if [ $rc -eq 0 ]; then - check_route "" + out=$($IP ro ls match 172.16.104.0/24) + check_expected "${out}" "" rc=$? fi log_test $rc 0 "Prefix route removed on link down" -- 2.20.1

5 years, 7 months

1
0
0 0

[GIT PULL] Kselftest update for Linux 5.2-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 5.2-rc1 This Kselftest update for Linux 5.2-rc1 consists of - fixes to seccomp test, and kselftest framework - cleanups to remove duplicate header defines - fixes to efivarfs "make clean" target - cgroup cleanup path - Moving the IMA kexec_load selftest to selftests/kexec work from Mimi Johar and Petr Vorel - A framework to kselftest for writing kernel test modules addition from Tobin C. Harding diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 15ade5d2e7775667cf191cf2f94327a4889f8b9d: Linux 5.1-rc4 (2019-04-07 14:09:59 -1000) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.2-rc1 for you to fetch changes up to d917fb876f6eaeeea8a2b620d2a266ce26372f4d: selftests: build and run gpio when output directory is the src dir (2019-04-22 17:02:26 -0600) ---------------------------------------------------------------- linux-kselftest-5.2-rc1 This Kselftest update for Linux 5.2-rc1 consists of - fixes to seccomp test, and kselftest framework - cleanups to remove duplicate header defines - fixes to efivarfs "make clean" target - cgroup cleanup path - Moving the IMA kexec_load selftest to selftests/kexec work from Mimi Johar and Petr Vorel - A framework to kselftest for writing kernel test modules addition from Tobin C. Harding ---------------------------------------------------------------- Kees Cook (3): selftests/seccomp: Handle namespace failures gracefully selftests/harness: Add 30 second timeout per test selftests/ipc: Fix msgque compiler warnings Mathieu Desnoyers (1): rseq/selftests: Adapt number of threads to the number of detected cpus Mimi Zohar (9): selftests/kexec: move the IMA kexec_load selftest to selftests/kexec selftests/kexec: cleanup the kexec selftest selftests/kexec: define a set of common functions selftests/kexec: define common logging functions selftests/kexec: define "require_root_privileges" selftests/kexec: kexec_file_load syscall test selftests/kexec: check kexec_load and kexec_file_load are enabled selftests/kexec: make kexec_load test independent of IMA being enabled selftests/kexec: update get_secureboot_mode Petr Vorel (1): selftests/kexec: Add missing '=y' to config options Po-Hsu Lin (1): selftests/efivarfs: clean up test files from test_create*() Roman Gushchin (1): selftests: cgroup: fix cleanup path in test_memcg_subtree_control() Sabyasachi Gupta (4): selftest/x86/mpx-dig.c: Remove duplicate header selftest/timers: Remove duplicate header selftest/rseq: Remove duplicate header selftest/gpio: Remove duplicate header Shuah Khan (2): selftests: fix headers_install circular dependency selftests: build and run gpio when output directory is the src dir Tobin C. Harding (6): lib/test_printf: Add empty module_exit function kselftest: Add test runner creation script kselftest: Add test module framework header lib: Use new kselftest header lib/string: Add strscpy_pad() function lib: Add test module for strscpy_pad ZhangXiaoxu (1): selftests: efivarfs: remove the test_create_read file if it was exist Documentation/dev-tools/kselftest.rst | 94 ++++++++- include/linux/string.h | 4 + lib/Kconfig.debug | 3 + lib/Makefile | 1 + lib/string.c | 47 ++++- lib/test_bitmap.c | 20 +- lib/test_printf.c | 17 +- lib/test_strscpy.c | 150 ++++++++++++++ tools/testing/selftests/Makefile | 63 +++++- tools/testing/selftests/cgroup/test_memcontrol.c | 38 ++-- tools/testing/selftests/efivarfs/efivarfs.sh | 28 ++- tools/testing/selftests/gpio/gpio-mockup-chardev.c | 1 - tools/testing/selftests/ima/config | 4 - tools/testing/selftests/ima/test_kexec_load.sh | 54 ----- tools/testing/selftests/ipc/msgque.c | 11 +- tools/testing/selftests/{ima => kexec}/Makefile | 5 +- tools/testing/selftests/kexec/config | 3 + tools/testing/selftests/kexec/kexec_common_lib.sh | 220 +++++++++++++++++++++ .../selftests/kexec/test_kexec_file_load.sh | 208 +++++++++++++++++++ tools/testing/selftests/kexec/test_kexec_load.sh | 47 +++++ tools/testing/selftests/kselftest_harness.h | 2 + tools/testing/selftests/kselftest_module.h | 48 +++++ tools/testing/selftests/kselftest_module.sh | 84 ++++++++ tools/testing/selftests/lib.mk | 38 +++- tools/testing/selftests/lib/Makefile | 2 +- tools/testing/selftests/lib/bitmap.sh | 18 +- tools/testing/selftests/lib/config | 1 + tools/testing/selftests/lib/prime_numbers.sh | 17 +- tools/testing/selftests/lib/printf.sh | 19 +- tools/testing/selftests/lib/strscpy.sh | 3 + tools/testing/selftests/rseq/rseq.h | 1 - tools/testing/selftests/rseq/run_param_test.sh | 7 +- tools/testing/selftests/seccomp/seccomp_bpf.c | 43 ++-- tools/testing/selftests/timers/skew_consistency.c | 1 - tools/testing/selftests/x86/mpx-dig.c | 2 - 35 files changed, 1081 insertions(+), 223 deletions(-) create mode 100644 lib/test_strscpy.c delete mode 100644 tools/testing/selftests/ima/config delete mode 100755 tools/testing/selftests/ima/test_kexec_load.sh rename tools/testing/selftests/{ima => kexec}/Makefile (59%) create mode 100644 tools/testing/selftests/kexec/config create mode 100755 tools/testing/selftests/kexec/kexec_common_lib.sh create mode 100755 tools/testing/selftests/kexec/test_kexec_file_load.sh create mode 100755 tools/testing/selftests/kexec/test_kexec_load.sh create mode 100644 tools/testing/selftests/kselftest_module.h create mode 100755 tools/testing/selftests/kselftest_module.sh create mode 100755 tools/testing/selftests/lib/strscpy.sh ----------------------------------------------------------------

5 years, 7 months

2
1
0 0

[PATCH v14 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 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 IB/mlx4, arm64: untag user pointers in mlx4_get_umem_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/amd/amdgpu/amdgpu_ttm.c | 2 +- drivers/gpu/drm/radeon/radeon_gem.c | 2 + drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/infiniband/hw/mlx4/mr.c | 7 +- 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 | 5 + 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 +++ 33 files changed, 431 insertions(+), 159 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.593.g511ec345e18-goog

5 years, 7 months

3
26
0 0

[PATCH] selftests: add sleep between detach and usbip list -l

by Shuah Khan

Add a sleep between detach and check for exportable devices to avoid the following segfault from libc-2.27.so [ 6268.136108] usbip[5565]: segfault at 0 ip 00007f2a947bddfd sp 00007ffd1a8705e8 error 4 in libc-2.27.so[7f2a94703000+1e7000] Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> --- tools/testing/selftests/drivers/usb/usbip/usbip_test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh index 128f0ab24307..beacf24a8df7 100755 --- a/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh +++ b/tools/testing/selftests/drivers/usb/usbip/usbip_test.sh @@ -171,10 +171,14 @@ echo "Detach invalid port tests - expect invalid port error message"; src/usbip detach -p 100; echo "==============================================================" +# let detach complete. Avoid segfaults from libc-2.27.so +sleep 3; + echo "Expect to see export-able devices"; src/usbip list -l; echo "==============================================================" + echo "Remove usbip_host module"; rmmod usbip_host; -- 2.17.1

5 years, 7 months

2
4
0 0

Re: [RFC][PATCH 1/2] x86: Allow breakpoints to emulate call functions

by Linus Torvalds

On Fri, May 3, 2019 at 10:08 PM Linus Torvalds <torvalds(a)linux-foundation.org> wrote: > > I'll look at it tomorrow, but I think this actually makes unnecessary changes. > > In particular, I think we could keep the existing entry code almost unchanged with this whole approach. So here's what I *think* should work. Note that I also removed your test-case code, because it really didn't have a chance in hell of working. Doing that int3_emulate_call(regs, (unsigned long)&int3_magic); inside of int3_exception_notify() could not possibly be valid, since int3_emulate_call() returns the new pt_regs that need to be used, and throwing it away is clearly wrong. So you can't use a register_die_notifier() to try to intercept the 'int3' error and then do it manually, it needs to be done by the ftrace_int3_handler() code that actually returns the new regs, and where do_kernel_int3() will then return it to the low-level handler. End result: I haven't actually tested this code, but I've looked through the patch something like ten times without finding any new errors. I've also tried *very* hard to make the patch minimal, with the exception of the comments, which I tried to make extensive for any of the subtle cases. But without testing, it's probably still buggy. I have to say, I finally like the end result here. Maybe it's because I got to make my mark and pee in the snow, but I will say that (a) the actual entry code modifications really are minimal now (b) the instruction emulation really is very simple and straightforward (c) yes, we play some stack tricks (and yes, we play them differently on x86-64 and x86-32), but the tricks are again at least straightforward, and we never really change the layout of any stack. So on the whole, I think this is about as good as it gets. Did I get all the details actually right, and it _works_? I guess we'll see. Linus

5 years, 7 months

2
3
0 0

[PATCH] kheaders: Move from proc to sysfs

by Joel Fernandes (Google)

The kheaders archive consisting of the kernel headers used for compiling bpf programs is in /proc. However there is concern that moving it here will make it permanent. Let us move it to /sys/kernel as discussed [1]. [1] https://lore.kernel.org/patchwork/patch/1067310/#1265969 Suggested-by: Steven Rostedt <rostedt(a)goodmis.org> Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- This patch applies on top of the previous patch that was applied to the driver tree: https://lore.kernel.org/patchwork/patch/1067310/ kernel/kheaders.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/kernel/kheaders.c b/kernel/kheaders.c index 70ae6052920d..6a16f8f6898d 100644 --- a/kernel/kheaders.c +++ b/kernel/kheaders.c @@ -8,9 +8,8 @@ #include <linux/kernel.h> #include <linux/module.h> -#include <linux/proc_fs.h> +#include <linux/kobject.h> #include <linux/init.h> -#include <linux/uaccess.h> /* * Define kernel_headers_data and kernel_headers_data_end, within which the @@ -31,39 +30,32 @@ extern char kernel_headers_data; extern char kernel_headers_data_end; static ssize_t -ikheaders_read_current(struct file *file, char __user *buf, - size_t len, loff_t *offset) +ikheaders_read(struct file *file, struct kobject *kobj, + struct bin_attribute *bin_attr, + char *buf, loff_t off, size_t len) { - return simple_read_from_buffer(buf, len, offset, - &kernel_headers_data, - &kernel_headers_data_end - - &kernel_headers_data); + memcpy(buf, &kernel_headers_data + off, len); + return len; } -static const struct file_operations ikheaders_file_ops = { - .read = ikheaders_read_current, - .llseek = default_llseek, +static struct bin_attribute kheaders_attr __ro_after_init = { + .attr = { + .name = "kheaders.tar.xz", + .mode = S_IRUGO, + }, + .read = &ikheaders_read, }; static int __init ikheaders_init(void) { - struct proc_dir_entry *entry; - - /* create the current headers file */ - entry = proc_create("kheaders.tar.xz", S_IRUGO, NULL, - &ikheaders_file_ops); - if (!entry) - return -ENOMEM; - - proc_set_size(entry, - &kernel_headers_data_end - - &kernel_headers_data); - return 0; + kheaders_attr.size = (&kernel_headers_data_end - + &kernel_headers_data); + return sysfs_create_bin_file(kernel_kobj, &kheaders_attr); } static void __exit ikheaders_cleanup(void) { - remove_proc_entry("kheaders.tar.xz", NULL); + sysfs_remove_bin_file(kernel_kobj, &kheaders_attr); } module_init(ikheaders_init); -- 2.21.0.1020.gf2820cf01a-goog

5 years, 8 months

5
5
0 0

[RFC][PATCH 1.5/2] x86: Add int3_emulate_call() selftest

by Peter Zijlstra

Given that the entry_*.S changes for this functionality are somewhat tricky, make sure the paths are tested every boot, instead of on the rare occasion when we trip an INT3 while rewriting text. Getting the INT3 frame setup even slightly wrong will make this come unstuck something spectacular. Requested-by: Andy Lutomirski <luto(a)kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz(a)infradead.org> --- arch/x86/kernel/alternative.c | 81 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c index 4db9c0d29bc1..2b853c2ab894 100644 --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -613,11 +613,83 @@ extern struct paravirt_patch_site __start_parainstructions[], __stop_parainstructions[]; #endif /* CONFIG_PARAVIRT */ +/* + * Self-test for the INT3 based CALL emulation code. + * + * This exercises int3_emulate_call() to make sure INT3 pt_regs are set up + * properly and that there is a stack gap between the INT3 frame and the + * previous context. Without this gap doing a virtual PUSH on the interrupted + * stack would corrupt the INT3 IRET frame. + * + * See entry_{32,64}.S for more details. + */ +static void __init int3_magic(unsigned int *ptr) +{ + *ptr = 1; +} + +extern __initdata unsigned long int3_selftest_ip; /* defined in asm below */ + +static int __init +int3_exception_notify(struct notifier_block *self, unsigned long val, void *data) +{ + struct die_args *args = data; + struct pt_regs *regs = args->regs; + + if (!regs || user_mode(regs)) + return NOTIFY_DONE; + + if (val != DIE_INT3) + return NOTIFY_DONE; + + if (regs->ip - INT3_INSN_SIZE != int3_selftest_ip) + return NOTIFY_DONE; + + int3_emulate_call(regs, (unsigned long)&int3_magic); + return NOTIFY_STOP; +} + +static void __init int3_selftest(void) +{ + static __initdata struct notifier_block int3_exception_nb = { + .notifier_call = int3_exception_notify, + .priority = INT_MAX-1, /* last */ + }; + unsigned int val = 0; + + BUG_ON(register_die_notifier(&int3_exception_nb)); + + /* + * Basically: int3_magic(&val); but really complicated :-) + * + * Stick the address of the INT3 instruction into int3_selftest_ip, + * then trigger the INT3, padded with NOPs to match a CALL instruction + * length. + */ + asm volatile ("1: int3; nop; nop; nop; nop\n\t" + ".pushsection .init.data,\"aw\"\n\t" + ".align " __ASM_SEL(4, 8) "\n\t" + ".type int3_selftest_ip, @object\n\t" + ".size int3_selftest_ip, " __ASM_SEL(4, 8) "\n\t" + "int3_selftest_ip:\n\t" + __ASM_SEL(.long, .quad) " 1b\n\t" + ".popsection\n\t" + : : __ASM_SEL_RAW(a, D) (&val) : "memory"); + + BUG_ON(val != 1); + + unregister_die_notifier(&int3_exception_nb); +} + void __init alternative_instructions(void) { - /* The patching is not fully atomic, so try to avoid local interruptions - that might execute the to be patched code. - Other CPUs are not running. */ + int3_selftest(); + + /* + * The patching is not fully atomic, so try to avoid local + * interruptions that might execute the to be patched code. + * Other CPUs are not running. + */ stop_nmi(); /* @@ -642,10 +714,11 @@ void __init alternative_instructions(void) _text, _etext); } - if (!uniproc_patched || num_possible_cpus() == 1) + if (!uniproc_patched || num_possible_cpus() == 1) { free_init_pages("SMP alternatives", (unsigned long)__smp_locks, (unsigned long)__smp_locks_end); + } #endif apply_paravirt(__parainstructions, __parainstructions_end);

5 years, 8 months

2
1
0 0

[PATCH v7 resend 1/2] Provide in-kernel headers to make extending kernel easier

by Joel Fernandes (Google)

Introduce in-kernel headers which are made available as an archive through proc (/proc/kheaders.tar.xz file). This archive makes it possible to run eBPF and other tracing programs that need to extend the kernel for tracing purposes without any dependency on the file system having headers. A github PR is sent for the corresponding BCC patch at: https://github.com/iovisor/bcc/pull/2312 On Android and embedded systems, it is common to switch kernels but not have kernel headers available on the file system. Further once a different kernel is booted, any headers stored on the file system will no longer be useful. This is an issue even well known to distros. By storing the headers as a compressed archive within the kernel, we can avoid these issues that have been a hindrance for a long time. The best way to use this feature is by building it in. Several users have a need for this, when they switch debug kernels, they do not want to update the filesystem or worry about it where to store the headers on it. However, the feature is also buildable as a module in case the user desires it not being part of the kernel image. This makes it possible to load and unload the headers from memory on demand. A tracing program can load the module, do its operations, and then unload the module to save kernel memory. The total memory needed is 3.3MB. By having the archive available at a fixed location independent of filesystem dependencies and conventions, all debugging tools can directly refer to the fixed location for the archive, without concerning with where the headers on a typical filesystem which significantly simplifies tooling that needs kernel headers. The code to read the headers is based on /proc/config.gz code and uses the same technique to embed the headers. Other approaches were discussed such as having an in-memory mountable filesystem, but that has drawbacks such as requiring an in-kernel xz decompressor which we don't have today, and requiring usage of 42 MB of kernel memory to host the decompressed headers at anytime. Also this approach is simpler than such approaches. Reviewed-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- (Just a resend with Masahiro's Reviewed-by tag added) v6 -> v7: - Minor nits from Masahiro Yamada are addressed. v5 -> v6: (Masahiro Yamada suggestions mostly) - Dropped support for module building. - Rebuild archive if script changes. - Move archive file list to script. - Move build script to kernel directory. v4 -> v5: (v4 was Tested-by the following folks) Tested-by: qais.yousef(a)arm.com Tested-by: dietmar.eggemann(a)arm.com Tested-by: linux(a)manojrajarao.com (Thanks to Masahiro Yamada for several excellent suggestions) - used incbin instead of bin2c (Masahiro did similar idea) - added module.lds if ia64 otherwise ia64 may fail to build. - added clean-files rule to Makefile - removed strip-comments script and doing it inline - added set -e to header generated to die on errorsr - fixed a minor issue where find command was noisy. - removed unneeded tar.xz rule from kernel/.gitignore - added Tested-by tags from ARM folks. Changes since v3: - Blank tar was being generated because of a one line I forgot to push. It is updated now. - Added module.lds since arm64 needs it to build modules. Changes since v2: (Thanks to Masahiro Yamada for several excellent suggestions) - Added support for out of tree builds. - Added incremental build support bringing down build time of incremental builds from 50 seconds to 5 seconds. - Fixed various small nits / cleanups. - clean ups to kheaders.c pointed by Alexey Dobriyan. - Fixed MODULE_LICENSE in test module and kheaders.c - Dropped Module.symvers from archive due to circular dependency. Changes since v1: - removed IKH_EXTRA variable, not needed (Masahiro Yamada) - small fix ups to selftest - added target to main Makefile etc - added MODULE_LICENSE to test module - made selftest more quiet Changes since RFC: Both changes bring size down to 3.8MB: - use xz for compression - strip comments except SPDX lines - Call out the module name in Kconfig - Also added selftests in second patch to ensure headers are always working. Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> init/Kconfig | 10 +++++ kernel/.gitignore | 1 + kernel/Makefile | 10 +++++ kernel/gen_ikh_data.sh | 89 ++++++++++++++++++++++++++++++++++++++++++ kernel/kheaders.c | 74 +++++++++++++++++++++++++++++++++++ 5 files changed, 184 insertions(+) create mode 100755 kernel/gen_ikh_data.sh create mode 100644 kernel/kheaders.c diff --git a/init/Kconfig b/init/Kconfig index 4592bf7997c0..47c0db6e63a5 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -580,6 +580,16 @@ config IKCONFIG_PROC This option enables access to the kernel configuration file through /proc/config.gz. +config IKHEADERS_PROC + tristate "Enable kernel header artifacts through /proc/kheaders.tar.xz" + depends on PROC_FS + help + This option enables access to the kernel header and other artifacts that + are generated during the build process. These can be used to build eBPF + tracing programs, or similar programs. If you build the headers as a + module, a module called kheaders.ko is built which can be loaded on-demand + to get access to the headers. + config LOG_BUF_SHIFT int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" range 12 25 diff --git a/kernel/.gitignore b/kernel/.gitignore index 6e699100872f..34d1e77ee9df 100644 --- a/kernel/.gitignore +++ b/kernel/.gitignore @@ -1,5 +1,6 @@ # # Generated files # +kheaders.md5 timeconst.h hz.bc diff --git a/kernel/Makefile b/kernel/Makefile index 6c57e78817da..12399614c350 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -70,6 +70,7 @@ obj-$(CONFIG_UTS_NS) += utsname.o obj-$(CONFIG_USER_NS) += user_namespace.o obj-$(CONFIG_PID_NS) += pid_namespace.o obj-$(CONFIG_IKCONFIG) += configs.o +obj-$(CONFIG_IKHEADERS_PROC) += kheaders.o obj-$(CONFIG_SMP) += stop_machine.o obj-$(CONFIG_KPROBES_SANITY_TEST) += test_kprobes.o obj-$(CONFIG_AUDIT) += audit.o auditfilter.o @@ -121,3 +122,12 @@ $(obj)/configs.o: $(obj)/config_data.gz targets += config_data.gz $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE $(call if_changed,gzip) + +$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz + +quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz +cmd_genikh = $(srctree)/kernel/gen_ikh_data.sh $@ +$(obj)/kheaders_data.tar.xz: FORCE + $(call cmd,genikh) + +clean-files := kheaders_data.tar.xz kheaders.md5 diff --git a/kernel/gen_ikh_data.sh b/kernel/gen_ikh_data.sh new file mode 100755 index 000000000000..591a94f7b387 --- /dev/null +++ b/kernel/gen_ikh_data.sh @@ -0,0 +1,89 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +# This script generates an archive consisting of kernel headers +# for CONFIG_IKHEADERS_PROC. +set -e +spath="$(dirname "$(readlink -f "$0")")" +kroot="$spath/.." +outdir="$(pwd)" +tarfile=$1 +cpio_dir=$outdir/$tarfile.tmp + +# Script filename relative to the kernel source root +# We add it to the archive because it is small and any changes +# to this script will also cause a rebuild of the archive. +sfile="$(realpath --relative-to $kroot "$(readlink -f "$0")")" + +src_file_list=" +include/ +arch/$SRCARCH/include/ +$sfile +" + +obj_file_list=" +include/ +arch/$SRCARCH/include/ +" + +# Support incremental builds by skipping archive generation +# if timestamps of files being archived are not changed. + +# This block is useful for debugging the incremental builds. +# Uncomment it for debugging. +# iter=1 +# if [ ! -f /tmp/iter ]; then echo 1 > /tmp/iter; +# else; iter=$(($(cat /tmp/iter) + 1)); fi +# find $src_file_list -type f | xargs ls -lR > /tmp/src-ls-$iter +# find $obj_file_list -type f | xargs ls -lR > /tmp/obj-ls-$iter + +# include/generated/compile.h is ignored because it is touched even when none +# of the source files changed. This causes pointless regeneration, so let us +# ignore them for md5 calculation. +pushd $kroot > /dev/null +src_files_md5="$(find $src_file_list -type f | + grep -v "include/generated/compile.h" | + xargs ls -lR | md5sum | cut -d ' ' -f1)" +popd > /dev/null +obj_files_md5="$(find $obj_file_list -type f | + grep -v "include/generated/compile.h" | + xargs ls -lR | md5sum | cut -d ' ' -f1)" + +if [ -f $tarfile ]; then tarfile_md5="$(md5sum $tarfile | cut -d ' ' -f1)"; fi +if [ -f kernel/kheaders.md5 ] && + [ "$(cat kernel/kheaders.md5|head -1)" == "$src_files_md5" ] && + [ "$(cat kernel/kheaders.md5|head -2|tail -1)" == "$obj_files_md5" ] && + [ "$(cat kernel/kheaders.md5|tail -1)" == "$tarfile_md5" ]; then + exit +fi + +if [ "${quiet}" != "silent_" ]; then + echo " GEN $tarfile" +fi + +rm -rf $cpio_dir +mkdir $cpio_dir + +pushd $kroot > /dev/null +for f in $src_file_list; + do find "$f" ! -name "*.cmd" ! -name ".*"; +done | cpio --quiet -pd $cpio_dir +popd > /dev/null + +# The second CPIO can complain if files already exist which can +# happen with out of tree builds. Just silence CPIO for now. +for f in $obj_file_list; + do find "$f" ! -name "*.cmd" ! -name ".*"; +done | cpio --quiet -pd $cpio_dir >/dev/null 2>&1 + +# Remove comments except SDPX lines +find $cpio_dir -type f -print0 | + xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;' + +tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null + +echo "$src_files_md5" > kernel/kheaders.md5 +echo "$obj_files_md5" >> kernel/kheaders.md5 +echo "$(md5sum $tarfile | cut -d ' ' -f1)" >> kernel/kheaders.md5 + +rm -rf $cpio_dir diff --git a/kernel/kheaders.c b/kernel/kheaders.c new file mode 100644 index 000000000000..70ae6052920d --- /dev/null +++ b/kernel/kheaders.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Provide kernel headers useful to build tracing programs + * such as for running eBPF tracing tools. + * + * (Borrowed code from kernel/configs.c) + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/proc_fs.h> +#include <linux/init.h> +#include <linux/uaccess.h> + +/* + * Define kernel_headers_data and kernel_headers_data_end, within which the + * compressed kernel headers are stored. The file is first compressed with xz. + */ + +asm ( +" .pushsection .rodata, \"a\" \n" +" .global kernel_headers_data \n" +"kernel_headers_data: \n" +" .incbin \"kernel/kheaders_data.tar.xz\" \n" +" .global kernel_headers_data_end \n" +"kernel_headers_data_end: \n" +" .popsection \n" +); + +extern char kernel_headers_data; +extern char kernel_headers_data_end; + +static ssize_t +ikheaders_read_current(struct file *file, char __user *buf, + size_t len, loff_t *offset) +{ + return simple_read_from_buffer(buf, len, offset, + &kernel_headers_data, + &kernel_headers_data_end - + &kernel_headers_data); +} + +static const struct file_operations ikheaders_file_ops = { + .read = ikheaders_read_current, + .llseek = default_llseek, +}; + +static int __init ikheaders_init(void) +{ + struct proc_dir_entry *entry; + + /* create the current headers file */ + entry = proc_create("kheaders.tar.xz", S_IRUGO, NULL, + &ikheaders_file_ops); + if (!entry) + return -ENOMEM; + + proc_set_size(entry, + &kernel_headers_data_end - + &kernel_headers_data); + return 0; +} + +static void __exit ikheaders_cleanup(void) +{ + remove_proc_entry("kheaders.tar.xz", NULL); +} + +module_init(ikheaders_init); +module_exit(ikheaders_cleanup); + +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Joel Fernandes"); +MODULE_DESCRIPTION("Echo the kernel header artifacts used to build the kernel"); -- 2.21.0.593.g511ec345e18-goog

5 years, 8 months

6
11
0 0

next-20190503 kselftest results

by ci_notify＠linaro.org

Summary ------------------------------------------------------------------------ kernel: 5.1.0-rc7 git repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git branch: master git commit: 76a893bbbf753c93fa6f68b9ee9b538ea4a9a7cb git describe: next-20190503 Test details: https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20190503 Regressions (compared to build next-20190502) ------------------------------------------------------------------------ x15 - arm: kselftest: * bpf_test_sock_addr.sh x86_64: kselftest-vsyscall-mode-none: * bpf_test_sock_addr.sh * net_fib-onlink-tests.sh Fixes (compared to build next-20190502) ------------------------------------------------------------------------ qemu_i386: kselftest: * bpf_test_maps * bpf_test_tcpbpf_user x15 - arm: kselftest: * bpf_test_maps In total: ------------------------------------------------------------------------ Ran 1588 total tests in the following environments and test suites. pass 929 fail 532 xfail 0 skip 127 Environments -------------- - dragonboard-410c - arm64 - hi6220-hikey - arm64 - i386 - juno-r2 - arm64 - qemu_arm - qemu_arm64 - qemu_i386 - qemu_x86_64 - x15 - arm - x86_64 Test Suites ----------- * boot-lkft-kselftests-master-513 * kselftest * boot-lkft-kselftests-vsyscall-mode-native-master-513 * boot-lkft-kselftests-vsyscall-mode-none-master-513 * kselftest-vsyscall-mode-native * kselftest-vsyscall-mode-none Failures ------------------------------------------------------------------------ qemu_arm64: * kselftest/binderfs_binderfs_test * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_verifier * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/pidfd_pidfd_test * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests qemu_i386: * kselftest/bpf_test_progs juno-r2: * kselftest/binderfs_binderfs_test * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_verifier * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/pidfd_pidfd_test * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh i386: * kselftest/bpf_test_maps * kselftest/bpf_test_progs qemu_x86_64: * kselftest/binderfs_binderfs_test * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_sock_fields * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/net_xfrm_policy.sh * kselftest/pidfd_pidfd_test * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rseq_run_param_test.sh * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests * kselftest/x86_fsgsbase_64 x15: * kselftest/binderfs_binderfs_test * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_sock_fields * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_verifier * kselftest/cgroup_test_core * kselftest/cgroup_test_freezer * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_reuseport_bpf_numa * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/pidfd_pidfd_test * kselftest/proc_proc-self-map-files-002 * kselftest/proc_proc-self-syscall * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh qemu_arm: * kselftest/binderfs_binderfs_test * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_sysctl * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_verifier * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_reuseport_bpf_numa * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/pidfd_pidfd_test * kselftest/proc_proc-self-map-files-002 * kselftest/proc_proc-self-syscall * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests hi6220-hikey: * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_progs * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_verifier * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/pidfd_pidfd_test * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rtc_rtctest * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh dragonboard-410c: * boot-lkft-kselftests-master-513/dragonboard-410c x86: * kselftest-vsyscall-mode-none/binderfs_binderfs_test * kselftest-vsyscall-mode-none/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-none/bpf_test_lirc_mode2_user * kselftest-vsyscall-mode-none/bpf_test_lwt_ip_encap.sh * kselftest-vsyscall-mode-none/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-none/bpf_test_netcnt * kselftest-vsyscall-mode-none/bpf_test_progs * kselftest-vsyscall-mode-none/bpf_test_sock_addr.sh * kselftest-vsyscall-mode-none/bpf_test_sock_fields * kselftest-vsyscall-mode-none/bpf_test_sockmap * kselftest-vsyscall-mode-none/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-none/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-none/cgroup_test_core * kselftest-vsyscall-mode-none/dma-buf_udmabuf * kselftest-vsyscall-mode-none/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-none/kvm_clear_dirty_log_test * kselftest-vsyscall-mode-none/kvm_cr4_cpuid_sync_test * kselftest-vsyscall-mode-none/kvm_dirty_log_test * kselftest-vsyscall-mode-none/kvm_evmcs_test * kselftest-vsyscall-mode-none/kvm_hyperv_cpuid * kselftest-vsyscall-mode-none/kvm_platform_info_test * kselftest-vsyscall-mode-none/kvm_set_sregs_test * kselftest-vsyscall-mode-none/kvm_smm_test * kselftest-vsyscall-mode-none/kvm_state_test * kselftest-vsyscall-mode-none/kvm_sync_regs_test * kselftest-vsyscall-mode-none/kvm_vmx_close_while_nested_test * kselftest-vsyscall-mode-none/kvm_vmx_tsc_adjust_test * kselftest-vsyscall-mode-none/lib_bitmap.sh * kselftest-vsyscall-mode-none/lib_prime_numbers.sh * kselftest-vsyscall-mode-none/lib_strscpy.sh * kselftest-vsyscall-mode-none/livepatch_test-callbacks.sh * kselftest-vsyscall-mode-none/livepatch_test-livepatch.sh * kselftest-vsyscall-mode-none/livepatch_test-shadow-vars.sh * kselftest-vsyscall-mode-none/membarrier_membarrier_test * kselftest-vsyscall-mode-none/net_fib-onlink-tests.sh * kselftest-vsyscall-mode-none/net_fib_rule_tests.sh * kselftest-vsyscall-mode-none/net_ip_defrag.sh * kselftest-vsyscall-mode-none/net_msg_zerocopy.sh * kselftest-vsyscall-mode-none/net_pmtu.sh * kselftest-vsyscall-mode-none/net_psock_snd.sh * kselftest-vsyscall-mode-none/net_run_netsocktests * kselftest-vsyscall-mode-none/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-none/net_tls * kselftest-vsyscall-mode-none/net_xfrm_policy.sh * kselftest-vsyscall-mode-none/pidfd_pidfd_test * kselftest-vsyscall-mode-none/pstore_pstore_tests * kselftest-vsyscall-mode-none/rseq_basic_percpu_ops_test * kselftest-vsyscall-mode-none/rseq_basic_test * kselftest-vsyscall-mode-none/rseq_param_test * kselftest-vsyscall-mode-none/rseq_param_test_benchmark * kselftest-vsyscall-mode-none/rseq_param_test_compare_twice * kselftest-vsyscall-mode-none/rseq_run_param_test.sh * kselftest-vsyscall-mode-none/rtc_rtctest * kselftest-vsyscall-mode-none/seccomp_seccomp_bpf * kselftest-vsyscall-mode-none/timestamping_txtimestamp.sh * kselftest-vsyscall-mode-none/tpm2_test_smoke.sh * kselftest-vsyscall-mode-none/tpm2_test_space.sh * kselftest-vsyscall-mode-none/vm_run_vmtests * kselftest-vsyscall-mode-none/x86_mpx-mini-test_64 * kselftest-vsyscall-mode-native/binderfs_binderfs_test * kselftest-vsyscall-mode-native/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-native/bpf_test_lirc_mode2_user * kselftest-vsyscall-mode-native/bpf_test_lwt_ip_encap.sh * kselftest-vsyscall-mode-native/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-native/bpf_test_netcnt * kselftest-vsyscall-mode-native/bpf_test_progs * kselftest-vsyscall-mode-native/bpf_test_sock_fields * kselftest-vsyscall-mode-native/bpf_test_sockmap * kselftest-vsyscall-mode-native/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-native/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-native/cgroup_test_core * kselftest-vsyscall-mode-native/dma-buf_udmabuf * kselftest-vsyscall-mode-native/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-native/kvm_clear_dirty_log_test * kselftest-vsyscall-mode-native/kvm_cr4_cpuid_sync_test * kselftest-vsyscall-mode-native/kvm_dirty_log_test * kselftest-vsyscall-mode-native/kvm_evmcs_test * kselftest-vsyscall-mode-native/kvm_hyperv_cpuid * kselftest-vsyscall-mode-native/kvm_platform_info_test * kselftest-vsyscall-mode-native/kvm_set_sregs_test * kselftest-vsyscall-mode-native/kvm_smm_test * kselftest-vsyscall-mode-native/kvm_state_test * kselftest-vsyscall-mode-native/kvm_sync_regs_test * kselftest-vsyscall-mode-native/kvm_vmx_close_while_nested_test * kselftest-vsyscall-mode-native/kvm_vmx_tsc_adjust_test * kselftest-vsyscall-mode-native/lib_bitmap.sh * kselftest-vsyscall-mode-native/lib_prime_numbers.sh * kselftest-vsyscall-mode-native/lib_printf.sh * kselftest-vsyscall-mode-native/lib_strscpy.sh * kselftest-vsyscall-mode-native/livepatch_test-callbacks.sh * kselftest-vsyscall-mode-native/livepatch_test-livepatch.sh * kselftest-vsyscall-mode-native/livepatch_test-shadow-vars.sh * kselftest-vsyscall-mode-native/membarrier_membarrier_test * kselftest-vsyscall-mode-native/net_fib-onlink-tests.sh * kselftest-vsyscall-mode-native/net_fib_rule_tests.sh * kselftest-vsyscall-mode-native/net_ip_defrag.sh * kselftest-vsyscall-mode-native/net_msg_zerocopy.sh * kselftest-vsyscall-mode-native/net_pmtu.sh * kselftest-vsyscall-mode-native/net_psock_snd.sh * kselftest-vsyscall-mode-native/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-native/net_xfrm_policy.sh * kselftest-vsyscall-mode-native/pidfd_pidfd_test * kselftest-vsyscall-mode-native/pstore_pstore_tests * kselftest-vsyscall-mode-native/rseq_basic_percpu_ops_test * kselftest-vsyscall-mode-native/rseq_basic_test * kselftest-vsyscall-mode-native/rseq_param_test * kselftest-vsyscall-mode-native/rseq_param_test_benchmark * kselftest-vsyscall-mode-native/rseq_param_test_compare_twice * kselftest-vsyscall-mode-native/rseq_run_param_test.sh * kselftest-vsyscall-mode-native/rtc_rtctest * kselftest-vsyscall-mode-native/seccomp_seccomp_bpf * kselftest-vsyscall-mode-native/timestamping_txtimestamp.sh * kselftest-vsyscall-mode-native/tpm2_test_smoke.sh * kselftest-vsyscall-mode-native/tpm2_test_space.sh * kselftest-vsyscall-mode-native/vm_run_vmtests * kselftest-vsyscall-mode-native/x86_fsgsbase_64 * kselftest-vsyscall-mode-native/x86_mpx-mini-test_64 * kselftest/binderfs_binderfs_test * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_set_sregs_test * kselftest/kvm_smm_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/livepatch_test-callbacks.sh * kselftest/livepatch_test-livepatch.sh * kselftest/livepatch_test-shadow-vars.sh * kselftest/membarrier_membarrier_test * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_rule_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_run_netsocktests * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_tls * kselftest/net_xfrm_policy.sh * kselftest/pidfd_pidfd_test * kselftest/pstore_pstore_tests * kselftest/rseq_basic_percpu_ops_test * kselftest/rseq_basic_test * kselftest/rseq_param_test * kselftest/rseq_param_test_benchmark * kselftest/rseq_param_test_compare_twice * kselftest/rseq_run_param_test.sh * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests * kselftest/x86_mpx-mini-test_64 Skips ------------------------------------------------------------------------ No skips -- Linaro LKFT https://lkft.linaro.org

5 years, 8 months

1
0
0 0

[PATCH] rcutorture: Tweak kvm options

by Sebastian Andrzej Siewior

In one of my rcutorture tests the TSC clocksource got marked unstable due to a large difference in the TSC value. I'm not sure if the guest run for a long time with disabled interrupts or if the host was very busy and didn't schedule the guest for some time. I took a look on the qemu/KVM options and decided to update the options: - Use kvm{32|64} as CPU. We could probably use `host' (like ARM does) for maximum available features but since we don't run any userland I'm not sure if it makes any difference. - Drop the "noapic" option, enable TSC deadline timer. There is no history why the APIC was disabled, I see no reason for it. The deadline timer is probably "nicer". - Additional config options. It ensures that the kernel knowns that it runs as a kvm guest and can use virt devices like the kvm-clock as clocksource. The kvm-clock was the main motivation here. - I didn't add a random HW device. It would make the random device ready earlier (not it doesn't complete the initialisation at all) but I doubt that there is any need for this. Signed-off-by: Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> --- tools/testing/selftests/rcutorture/bin/functions.sh | 13 ++++++++++++- .../selftests/rcutorture/configs/rcu/CFcommon | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh index 6bcb8b5b2ff22..be3c5c73d7e79 100644 --- a/tools/testing/selftests/rcutorture/bin/functions.sh +++ b/tools/testing/selftests/rcutorture/bin/functions.sh @@ -172,7 +172,7 @@ identify_qemu_append () { local console=ttyS0 case "$1" in qemu-system-x86_64|qemu-system-i386) - echo noapic selinux=0 initcall_debug debug + echo selinux=0 initcall_debug debug ;; qemu-system-aarch64) console=ttyAMA0 @@ -191,8 +191,19 @@ identify_qemu_append () { # Output arguments for qemu arguments based on the TORTURE_QEMU_MAC # and TORTURE_QEMU_INTERACTIVE environment variables. identify_qemu_args () { + local KVM_CPU="" + case "$1" in + qemu-system-x86_64) + KVM_CPU=kvm64 + ;; + qemu-system-i386) + KVM_CPU=kvm32 + ;; + esac case "$1" in qemu-system-x86_64|qemu-system-i386) + echo -machine q35,accel=kvm + echo -cpu ${KVM_CPU},x2apic=on,tsc-deadline=on,hypervisor=on,tsc_adjust=on ;; qemu-system-aarch64) echo -machine virt,gic-version=host -cpu host diff --git a/tools/testing/selftests/rcutorture/configs/rcu/CFcommon b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon index d2d2a86139db1..322d5d40443cd 100644 --- a/tools/testing/selftests/rcutorture/configs/rcu/CFcommon +++ b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon @@ -1,2 +1,6 @@ CONFIG_RCU_TORTURE_TEST=y CONFIG_PRINTK_TIME=y +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_PARAVIRT_SPINLOCKS=y +CONFIG_KVM_GUEST=y -- 2.20.1

5 years, 8 months

3
12
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror May 2019