January 2023 - Linux-kselftest-mirror

[PATCH 0/4] Add extra checkings to amx_test

by Mingwei Zhang

AMX architecture involves several entities such as xstate, XCR0, IA32_XFD. This series add several missing checks on top of the existing amx_test. In particular, the 1st commit just fixes a typo in comment. The 2nd and 4th commit focus on the properties of IA32_XFD/IA32_XFD_ERR when interating with xsavec and #NM, while the 3rd commit adds the checking of xcomp_bv in xstate. Mingwei Zhang (4): KVM: selftests: x86: Fix an error in comment of amx_test KVM: selftests: x86: Add check of IA32_XFD in amx_test KVM: selftests: x86: Enable checking on xcomp_bv in amx_test KVM: selftests: x86: Repeat the checking of xheader when IA32_XFD[18] is set in amx_test tools/testing/selftests/kvm/x86_64/amx_test.c | 43 +++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-) -- 2.39.0.314.g84b9a713c41-goog

1 year, 5 months

2
9
0 0

[PATCH v1 0/3] kunit: fix bugs in debugfs logs

by Rae Moar

Currently, the KUnit debugfs logs have a few issues: 1. The results of parameterized tests don’t show up 2. The order of the lines in the logs is sometimes incorrect 3. There are extra new lines in the logs This patch series aims to fix these issues. This is an example of a debugfs log prior to these fixes: KTAP version 1 # Subtest: kunit_status 1..2 # kunit_status: pass:2 fail:0 skip:0 total:2 # Totals: pass:2 fail:0 skip:0 total:2 ok 1 kunit_status_set_failure_test ok 2 kunit_status_mark_skipped_test ok 1 kunit_status Note there is an extra line and a few of the lines are out of order. This is the same debugfs log after the fixes: KTAP version 1 # Subtest: kunit_status 1..2 ok 1 kunit_status_set_failure_test ok 2 kunit_status_mark_skipped_test # kunit_status: pass:2 fail:0 skip:0 total:2 # Totals: pass:2 fail:0 skip:0 total:2 ok 4 kunit_status This is now equivalent to the regular KTAP output for the kunit_status test. Thanks! -Rae Rae Moar (3): kunit: fix bug in debugfs logs of parameterized tests kunit: fix bug in the order of lines in debugfs logs kunit: fix bug of extra newline characters in debugfs logs include/kunit/test.h | 2 +- lib/kunit/debugfs.c | 13 ++++++++----- lib/kunit/kunit-test.c | 36 ++++++++++++++++++++++++------------ lib/kunit/test.c | 36 ++++++++++++++++++++++-------------- 4 files changed, 55 insertions(+), 32 deletions(-) base-commit: 766f4f2514d2d18bcbd60a058188fb502dea5ddf -- 2.39.1.456.gfc5497dd1b-goog

1 year, 5 months

3
11
0 0

[PATCH] KVM: selftests: Added eBPF program and selftest to collect vmx exit stat

by Kevin Cheng

Introduce a new selftest that loads an eBPF program that stores the number of vmx exit counts per vcpu per vm. A process is created per vm_create to load a separate eBPF program to collect its own stats unique to the pid. This test aims to serve as a proof-of-concept and example for using eBPF to collect stats that are not provided by the other stats interfaces such as kvm_binary_stats. Since there will be no further stats being added to kvm_binary_stats, developers can use this selftest as a reference for writing their own eBPF program + selftest to collect whatever stat they may need for debugging/monitoring. Signed-off-by: Kevin Cheng <chengkev(a)google.com> --- tools/testing/selftests/kvm/Makefile | 4 +- tools/testing/selftests/kvm/build_ebpf.sh | 5 + .../testing/selftests/kvm/kvm_vmx_exit_ebpf.c | 128 ++++++++++++++++++ .../selftests/kvm/kvm_vmx_exit_ebpf_kern.c | 74 ++++++++++ 4 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/kvm/build_ebpf.sh create mode 100644 tools/testing/selftests/kvm/kvm_vmx_exit_ebpf.c create mode 100644 tools/testing/selftests/kvm/kvm_vmx_exit_ebpf_kern.c diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 1750f91dd936..d9f56ccbc7bb 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -129,6 +129,7 @@ TEST_GEN_PROGS_x86_64 += set_memory_region_test TEST_GEN_PROGS_x86_64 += steal_time TEST_GEN_PROGS_x86_64 += kvm_binary_stats_test TEST_GEN_PROGS_x86_64 += system_counter_offset_test +TEST_GEN_PROGS_x86_64 += kvm_vmx_exit_ebpf # Compiled outputs used by test targets TEST_GEN_PROGS_EXTENDED_x86_64 += x86_64/nx_huge_pages_test @@ -176,6 +177,7 @@ TEST_GEN_PROGS_riscv += set_memory_region_test TEST_GEN_PROGS_riscv += kvm_binary_stats_test TEST_PROGS += $(TEST_PROGS_$(ARCH_DIR)) +TEST_PROGS := build_ebpf.sh TEST_GEN_PROGS += $(TEST_GEN_PROGS_$(ARCH_DIR)) TEST_GEN_PROGS_EXTENDED += $(TEST_GEN_PROGS_EXTENDED_$(ARCH_DIR)) LIBKVM += $(LIBKVM_$(ARCH_DIR)) @@ -208,7 +210,7 @@ no-pie-option := $(call try-run, echo 'int main(void) { return 0; }' | \ pgste-option = $(call try-run, echo 'int main(void) { return 0; }' | \ $(CC) -Werror -Wl$(comma)--s390-pgste -x c - -o "$$TMP",-Wl$(comma)--s390-pgste) -LDLIBS += -ldl +LDLIBS += -ldl -L$(top_srcdir)/tools/lib/bpf -lbpf -lelf -lz LDFLAGS += -pthread $(no-pie-option) $(pgste-option) LIBKVM_C := $(filter %.c,$(LIBKVM)) diff --git a/tools/testing/selftests/kvm/build_ebpf.sh b/tools/testing/selftests/kvm/build_ebpf.sh new file mode 100644 index 000000000000..b8038b0a0da5 --- /dev/null +++ b/tools/testing/selftests/kvm/build_ebpf.sh @@ -0,0 +1,5 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +clang -g -O2 -target bpf -D__TARGET_ARCH_x86_64 -I . -c kvm_vmx_exit_ebpf_kern.c + -o kvm_vmx_exit_ebpf_kern.o +make -C ../../../lib/bpf || exit diff --git a/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf.c b/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf.c new file mode 100644 index 000000000000..a4bd2c549207 --- /dev/null +++ b/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf.c @@ -0,0 +1,128 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <stdio.h> +#include <stdlib.h> +#include <signal.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> +#include <bpf/bpf.h> +#include <../bpf/libbpf.h> +#include <linux/btf.h> + +#include "test_util.h" + +#include "kvm_util.h" +#include "linux/kvm.h" + +#define VCPU_ID 0 + +struct stats_map_key { + __u32 pid; + __u32 vcpu_id; + __u32 exit_reason; +}; + +static void guest_code(void) +{ + __asm__ __volatile__("cpuid"); +} + +int main(int argc, char **argv) +{ + if (argc < 2) { + fprintf(stderr, "Expected arguments: <number_of_vms>\n"); + return EXIT_FAILURE; + } + int n = atoi(argv[1]); + + for (int i = 0; i < n; i++) { + if (fork() == 0) { + struct kvm_vm *vm; + struct kvm_vcpu *vcpu; + + vm = vm_create_with_one_vcpu(&vcpu, guest_code); + + // BPF userspace code + struct bpf_object *obj; + struct bpf_program *prog; + struct bpf_map *map_obj; + struct bpf_link *link = NULL; + + obj = bpf_object__open_file("kvm_vmx_exit_ebpf_kern.o", NULL); + if (libbpf_get_error(obj)) { + fprintf(stderr, "ERROR: opening BPF object file failed\n"); + return 0; + } + + map_obj = bpf_object__find_map_by_name(obj, "vmx_exit_map"); + if (!map_obj) { + fprintf(stderr, "ERROR: loading of vmx BPF map failed\n"); + goto cleanup; + } + + struct bpf_map *pid_map = bpf_object__find_map_by_name(obj, "pid_map"); + + if (!pid_map) { + fprintf(stderr, "ERROR: loading of pid BPF map failed\n"); + goto cleanup; + } + + /* load BPF program */ + if (bpf_object__load(obj)) { + fprintf(stderr, "ERROR: loading BPF object file failed\n"); + goto cleanup; + } + + __u32 userspace_pid = (__u32)getpid(); + __u32 val = (__u32)getpid(); + + bpf_map_update_elem(bpf_map__fd(pid_map), &userspace_pid, &val, 0); + + prog = bpf_object__find_program_by_name(obj, "bpf_exit_prog"); + if (libbpf_get_error(prog)) { + fprintf(stderr, "ERROR: finding a prog in obj file failed\n"); + goto cleanup; + } + + link = bpf_program__attach(prog); + if (libbpf_get_error(link)) { + fprintf(stderr, "ERROR: bpf_program__attach failed\n"); + link = NULL; + goto cleanup; + } + + for (int j = 0; j < 10000; j++) + vcpu_run(vcpu); + + struct stats_map_key key = { + .pid = 0, + .vcpu_id = 0, + .exit_reason = 18, + }; + + + struct stats_map_key next_key, lookup_key; + + lookup_key = key; + while (bpf_map_get_next_key(bpf_map__fd(map_obj), &lookup_key, &next_key) + == 0) { + int count; + + bpf_map_lookup_elem(bpf_map__fd(map_obj), &next_key, &count); + fprintf(stdout, "exit reason: '%d'\ncount: %d\npid: %d\n", + next_key.exit_reason, count, next_key.pid); + lookup_key = next_key; + } + +cleanup: + bpf_link__destroy(link); + bpf_object__close(obj); + kvm_vm_free(vm); + } + } + + for (int i = 0; i < n; i++) + wait(NULL); + return 0; +} diff --git a/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf_kern.c b/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf_kern.c new file mode 100644 index 000000000000..b9c076f93171 --- /dev/null +++ b/tools/testing/selftests/kvm/kvm_vmx_exit_ebpf_kern.c @@ -0,0 +1,73 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include <linux/bpf.h> +#include <stdint.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_core_read.h> + +struct kvm_vcpu { + int vcpu_id; +}; + +struct vmx_args { + __u64 pad; + unsigned int exit_reason; + __u32 isa; + struct kvm_vcpu *vcpu; +}; + +struct stats_map_key { + __u32 pid; + __u32 vcpu_id; + __u32 exit_reason; +}; + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(max_entries, 1024); + __type(key, struct stats_map_key); + __type(value, int); +} vmx_exit_map SEC(".maps"); + +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, __u32); +} pid_map SEC(".maps"); + + +SEC("tracepoint/kvm/kvm_exit") +int bpf_exit_prog(struct vmx_args *ctx) +{ + __u32 curr_pid = (bpf_get_current_pid_tgid() >> 32); + + __u32 *userspace_pid = bpf_map_lookup_elem(&pid_map, &curr_pid); + + if (!userspace_pid || *userspace_pid != curr_pid) + return 0; + + struct kvm_vcpu *vcpu = ctx->vcpu; + int _vcpu_id = BPF_CORE_READ(vcpu, vcpu_id); + + struct stats_map_key key = { + .pid = (bpf_get_current_pid_tgid() >> 32), + .vcpu_id = _vcpu_id, + .exit_reason = ctx->exit_reason, + }; + + int *value = bpf_map_lookup_elem(&vmx_exit_map, &key); + + if (value) { + *value = *value + 1; + bpf_map_update_elem(&vmx_exit_map, &key, value, BPF_ANY); + } else { + int temp = 1; + + bpf_map_update_elem(&vmx_exit_map, &key, &temp, BPF_ANY); + } + + return 0; +} + +char _license[] SEC("license") = "GPL"; -- 2.39.1.456.gfc5497dd1b-goog

1 year, 5 months

3
3
0 0

[PATCH v6 0/5] Some improvements of resctrl selftest

by Shaopeng Tan

Hello, The aim of this patch series is to improve the resctrl selftest. Without these fixes, some unnecessary processing will be executed and test results will be confusing. There is no behavior change in test themselves. [patch 1] Make write_schemata() run to set up shemata with 100% allocation on first run in MBM test. [patch 2] The MBA test result message is always output as "ok", make output message to be "not ok" if MBA check result is failed. [patch 3] When a child process is created by fork(), the buffer of the parent process is also copied. Flush the buffer before executing fork(). [patch 4] Add a signal handler to cleanup properly before exiting the parent process if there is an error occurs after creating a child process with fork() in the CAT test, and unregister signal handler when each test finished. [patch 5] Before exiting each test CMT/CAT/MBM/MBA, clear test result files function cat/cmt/mbm/mba_test_cleanup() are called twice. Delete once. This patch series is based on Linux v6.2-rc6. Difference from v5: [patch 4] - If an error occurs in signal_handler_register() return -1, and if an error occurs in signal_handler_unregister() does not return any value. - If signal_handler_register() fails, stop the running parents&child process. - Ignore the result of signal_handler_unregister() so as not to overwrite earlier value of ret. - Fix change log. Shaopeng Tan (5): selftests/resctrl: Fix set up schemata with 100% allocation on first run in MBM test selftests/resctrl: Return MBA check result and make it to output message selftests/resctrl: Flush stdout file buffer before executing fork() selftests/resctrl: Cleanup properly when an error occurs in CAT test selftests/resctrl: Remove duplicate codes that clear each test result file tools/testing/selftests/resctrl/cat_test.c | 29 ++++---- tools/testing/selftests/resctrl/cmt_test.c | 7 +- tools/testing/selftests/resctrl/fill_buf.c | 14 ---- tools/testing/selftests/resctrl/mba_test.c | 23 +++--- tools/testing/selftests/resctrl/mbm_test.c | 20 +++--- tools/testing/selftests/resctrl/resctrl.h | 2 + .../testing/selftests/resctrl/resctrl_tests.c | 4 -- tools/testing/selftests/resctrl/resctrl_val.c | 71 +++++++++++++------ tools/testing/selftests/resctrl/resctrlfs.c | 5 +- 9 files changed, 98 insertions(+), 77 deletions(-) -- 2.27.0

1 year, 5 months

4
13
0 0

[PATCH v4 00/21] arm64/sme: Support SME 2 and SME 2.1

by Mark Brown

Arm have recently released versions 2 and 2.1 of the SME extension. Among the features introduced by SME 2 is some new architectural state, the ZT0 register. This series adds support for this and all the other features of the new SME versions. Since the architecture has been designed with the possibility of adding further ZTn registers in mind the interfaces added for ZT0 are done with this possibility in mind. As ZT0 is a simple fixed size register these interfaces are all fairly simple, the main complication is that ZT0 is only accessible when PSTATE.ZA is enabled. The memory allocation that we already do for PSTATE.ZA is extended to include space for ZT0. Due to textual collisions especially around the addition of hwcaps this is based on the recently merged series "arm64: Support for 2022 data processing instructions" but there is no meaningful interaction. There will be collisions with "arm64/signal: Signal handling cleanups" if that is applied but again not super substantial. v4: - Rebase onto v6.2-rc3. - Add SME2 value to ID_AA64PFR1_EL1.SME and move cpufeature to key off it. - Fix cut'n'paste errors and missing capability in hwcap table. - Fix bitrot in za-test program. - Typo and cut'n'paste fixes. v3: - Rebase onto merged series for the 2022 architectur extensions. - Clarifications and typo fixes in the ABI documentation. v2: - Add missing initialisation of user->zt in signal context parsing. - Change the magic for ZT signal frames to 0x5a544e01 (ZTN0). To: Catalin Marinas <catalin.marinas(a)arm.com> To: Will Deacon <will(a)kernel.org> To: Oleg Nesterov <oleg(a)redhat.com> To: Marc Zyngier <maz(a)kernel.org> To: James Morse <james.morse(a)arm.com> To: Alexandru Elisei <alexandru.elisei(a)arm.com> To: Suzuki K Poulose <suzuki.poulose(a)arm.com> To: Oliver Upton <oliver.upton(a)linux.dev> Cc: Alan Hayward <alan.hayward(a)arm.com> Cc: Luis Machado <luis.machado(a)arm.com>, Cc: Szabolcs Nagy <szabolcs.nagy(a)arm.com> Cc: linux-arm-kernel(a)lists.infradead.org Cc: linux-kernel(a)vger.kernel.org Cc: kvmarm(a)lists.linux.dev To: Shuah Khan <shuah(a)kernel.org> Cc: linux-kselftest(a)vger.kernel.org --- Mark Brown (21): arm64/sme: Rename za_state to sme_state arm64: Document boot requirements for SME 2 arm64/sysreg: Update system registers for SME 2 and 2.1 arm64/sme: Document SME 2 and SME 2.1 ABI arm64/esr: Document ISS for ZT0 being disabled arm64/sme: Manually encode ZT0 load and store instructions arm64/sme: Enable host kernel to access ZT0 arm64/sme: Add basic enumeration for SME2 arm64/sme: Provide storage for ZT0 arm64/sme: Implement context switching for ZT0 arm64/sme: Implement signal handling for ZT arm64/sme: Implement ZT0 ptrace support arm64/sme: Add hwcaps for SME 2 and 2.1 features kselftest/arm64: Add a stress test program for ZT0 kselftest/arm64: Cover ZT in the FP stress test kselftest/arm64: Enumerate SME2 in the signal test utility code kselftest/arm64: Teach the generic signal context validation about ZT kselftest/arm64: Add test coverage for ZT register signal frames kselftest/arm64: Add SME2 coverage to syscall-abi kselftest/arm64: Add coverage of the ZT ptrace regset kselftest/arm64: Add coverage of SME 2 and 2.1 hwcaps Documentation/arm64/booting.rst | 10 + Documentation/arm64/elf_hwcaps.rst | 18 + Documentation/arm64/sme.rst | 52 ++- arch/arm64/include/asm/cpufeature.h | 6 + arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/fpsimd.h | 30 +- arch/arm64/include/asm/fpsimdmacros.h | 22 ++ arch/arm64/include/asm/hwcap.h | 6 + arch/arm64/include/asm/processor.h | 2 +- arch/arm64/include/uapi/asm/hwcap.h | 6 + arch/arm64/include/uapi/asm/sigcontext.h | 19 ++ arch/arm64/kernel/cpufeature.c | 28 ++ arch/arm64/kernel/cpuinfo.c | 6 + arch/arm64/kernel/entry-fpsimd.S | 30 +- arch/arm64/kernel/fpsimd.c | 47 ++- arch/arm64/kernel/hyp-stub.S | 6 + arch/arm64/kernel/idreg-override.c | 1 + arch/arm64/kernel/process.c | 21 +- arch/arm64/kernel/ptrace.c | 60 +++- arch/arm64/kernel/signal.c | 113 ++++++- arch/arm64/kvm/fpsimd.c | 2 +- arch/arm64/tools/cpucaps | 1 + arch/arm64/tools/sysreg | 27 +- include/uapi/linux/elf.h | 1 + tools/testing/selftests/arm64/abi/hwcap.c | 115 +++++++ .../testing/selftests/arm64/abi/syscall-abi-asm.S | 43 ++- tools/testing/selftests/arm64/abi/syscall-abi.c | 40 ++- tools/testing/selftests/arm64/fp/.gitignore | 2 + tools/testing/selftests/arm64/fp/Makefile | 5 + tools/testing/selftests/arm64/fp/fp-stress.c | 29 +- tools/testing/selftests/arm64/fp/sme-inst.h | 20 ++ tools/testing/selftests/arm64/fp/zt-ptrace.c | 365 +++++++++++++++++++++ tools/testing/selftests/arm64/fp/zt-test.S | 317 ++++++++++++++++++ tools/testing/selftests/arm64/signal/.gitignore | 1 + .../testing/selftests/arm64/signal/test_signals.h | 2 + .../selftests/arm64/signal/test_signals_utils.c | 3 + .../selftests/arm64/signal/testcases/testcases.c | 36 ++ .../selftests/arm64/signal/testcases/testcases.h | 1 + .../selftests/arm64/signal/testcases/zt_no_regs.c | 51 +++ .../selftests/arm64/signal/testcases/zt_regs.c | 85 +++++ 40 files changed, 1558 insertions(+), 72 deletions(-) --- base-commit: b7bfaa761d760e72a969d116517eaa12e404c262 change-id: 20221208-arm64-sme2-363c27227a32 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 5 months

3
25
0 0

[PATCH] selftests: fix LLVM build for i386 and x86_64

by Guillaume Tucker

Add missing cases for the i386 and x86_64 architectures when determining the LLVM target for building kselftest. Fixes: 795285ef2425 ("selftests: Fix clang cross compilation") Signed-off-by: Guillaume Tucker <guillaume.tucker(a)collabora.com> --- tools/testing/selftests/lib.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index b1c62914366b..cc4c443d5b14 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -10,12 +10,14 @@ endif CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu CLANG_TARGET_FLAGS_hexagon := hexagon-linux-musl +CLANG_TARGET_FLAGS_i386 := i386-linux-gnu CLANG_TARGET_FLAGS_m68k := m68k-linux-gnu CLANG_TARGET_FLAGS_mips := mipsel-linux-gnu CLANG_TARGET_FLAGS_powerpc := powerpc64le-linux-gnu CLANG_TARGET_FLAGS_riscv := riscv64-linux-gnu CLANG_TARGET_FLAGS_s390 := s390x-linux-gnu CLANG_TARGET_FLAGS_x86 := x86_64-linux-gnu +CLANG_TARGET_FLAGS_x86_64 := x86_64-linux-gnu CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) ifeq ($(CROSS_COMPILE),) -- 2.30.2

1 year, 5 months

2
2
0 0

[PATCH] selftests/ftrace: Fix bash specific "==" operator

by Masami Hiramatsu (Google)

From: Masami Hiramatsu (Google) <mhiramat(a)kernel.org> Since commit a1d6cd88c897 ("selftests/ftrace: event_triggers: wait longer for test_event_enable") introduced bash specific "==" comparation operator, that test will fail when we run it on a posix-shell. `checkbashisms` warned it as below. possible bashism in ftrace/func_event_triggers.tc line 45 (should be 'b = a'): if [ "$e" == $val ]; then This replaces it with "=". Fixes: a1d6cd88c897 ("selftests/ftrace: event_triggers: wait longer for test_event_enable") Signed-off-by: Masami Hiramatsu (Google) <mhiramat(a)kernel.org> --- .../ftrace/test.d/ftrace/func_event_triggers.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc index 3eea2abf68f9..2ad7d4b501cc 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc @@ -42,7 +42,7 @@ test_event_enabled() { while [ $check_times -ne 0 ]; do e=`cat $EVENT_ENABLE` - if [ "$e" == $val ]; then + if [ "$e" = $val ]; then return 0 fi sleep $SLEEP_TIME

1 year, 5 months

3
2
0 0

[PATCH v2] selftests: amd-pstate: Don't delete source files via Makefile

by Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean". Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") Reported-by: Sedat Dilek <sedat.dilek(a)gmail.com> Tested-by: Sedat Dilek <sedat.dilek(a)gmail.com> Reviewed-by: Sedat Dilek <sedat.dilek(a)gmail.com> Acked-by: Huang Rui <ray.huang(a)amd.com> Signed-off-by: Doug Smythies <dsmythies(a)telus.net> --- v2: fix address list. --- tools/testing/selftests/amd-pstate/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile index 5f195ee756d6..5fd1424db37d 100644 --- a/tools/testing/selftests/amd-pstate/Makefile +++ b/tools/testing/selftests/amd-pstate/Makefile @@ -7,11 +7,6 @@ all: uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -ifeq (x86,$(ARCH)) -TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py -TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py -endif - TEST_PROGS := run.sh TEST_FILES := basic.sh tbench.sh gitsource.sh -- 2.25.1

1 year, 5 months

4
5
0 0

[PATCH] selftests: add missing ')' in lib.mk

by Guillaume Tucker

Add missing closing ')' in lib.mk in a call to $error(). This only affects LLVM / Clang builds. Fixes: 795285ef2425 ("selftests: Fix clang cross compilation") Signed-off-by: Guillaume Tucker <guillaume.tucker(a)collabora.com> --- tools/testing/selftests/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 947fc72413e9..a87f60873e5b 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -20,7 +20,7 @@ CLANG_TARGET_FLAGS := $(CLANG_TARGET_FLAGS_$(ARCH)) ifeq ($(CROSS_COMPILE),) ifeq ($(CLANG_TARGET_FLAGS),) -$(error Specify CROSS_COMPILE or add '--target=' option to lib.mk +$(error Specify CROSS_COMPILE or add '--target=' option to lib.mk) else CLANG_FLAGS += --target=$(CLANG_TARGET_FLAGS) endif # CLANG_TARGET_FLAGS -- 2.30.2

1 year, 5 months

3
3
0 0

[PATCH v6 00/14] KVM: s390: Extend MEM_OP ioctl by storage key checked cmpxchg

by Janis Schoetterl-Glausch

User space can use the MEM_OP ioctl to make storage key checked reads and writes to the guest, however, it has no way of performing atomic, key checked, accesses to the guest. Extend the MEM_OP ioctl in order to allow for this, by adding a cmpxchg operation. For now, support this operation for absolute accesses only. This operation can be use, for example, to set the device-state-change indicator and the adapter-local-summary indicator atomically. Also contains some fixes/changes for the memop selftest independent of the cmpxchg changes. v5 -> v6 * move memop selftest fixes/refactoring to front of series so they can be picked independently from the rest * use op instead of flag to indicate cmpxchg * no longer indicate success of cmpxchg to user space, which can infer it by observing a change in the old value instead * refactor functions implementing the ioctl * adjust documentation (drop R-b) * adjust selftest * rebase v4 -> v5 * refuse cmpxchg if not write (thanks Thomas) * minor doc changes (thanks Claudio) * picked up R-b's (thanks Thomas & Claudio) * memop selftest fixes * rebased v3 -> v4 * no functional change intended * rework documentation a bit * name extension cap cmpxchg bit * picked up R-b (thanks Thomas) * various changes (rename variable, comments, ...) see range-diff below v2 -> v3 * rebase onto the wip/cmpxchg_user_key branch in the s390 kernel repo * use __uint128_t instead of unsigned __int128 * put moving of testlist into main into separate patch * pick up R-b's (thanks Nico) v1 -> v2 * get rid of xrk instruction for cmpxchg byte and short implementation * pass old parameter via pointer instead of in mem_op struct * indicate failure of cmpxchg due to wrong old value by special return code * picked up R-b's (thanks Thomas) Janis Schoetterl-Glausch (14): KVM: s390: selftest: memop: Pass mop_desc via pointer KVM: s390: selftest: memop: Replace macros by functions KVM: s390: selftest: memop: Move testlist into main KVM: s390: selftest: memop: Add bad address test KVM: s390: selftest: memop: Fix typo KVM: s390: selftest: memop: Fix wrong address being used in test KVM: s390: selftest: memop: Fix integer literal KVM: s390: Move common code of mem_op functions into functions KVM: s390: Dispatch to implementing function at top level of vm mem_op KVM: s390: Refactor absolute vm mem_op function KVM: s390: Refactor absolute vcpu mem_op function KVM: s390: Extend MEM_OP ioctl by storage key checked cmpxchg Documentation: KVM: s390: Describe KVM_S390_MEMOP_F_CMPXCHG KVM: s390: selftest: memop: Add cmpxchg tests Documentation/virt/kvm/api.rst | 29 +- include/uapi/linux/kvm.h | 8 + arch/s390/kvm/gaccess.h | 3 + arch/s390/kvm/gaccess.c | 103 ++++ arch/s390/kvm/kvm-s390.c | 249 ++++---- tools/testing/selftests/kvm/s390x/memop.c | 675 +++++++++++++++++----- 6 files changed, 819 insertions(+), 248 deletions(-) Range-diff against v5: 3: 94c1165ae24a = 1: 512e1a3e0ae5 KVM: s390: selftest: memop: Pass mop_desc via pointer 4: 027c87eee0ac = 2: 47328ea64f80 KVM: s390: selftest: memop: Replace macros by functions 5: 16ac410ecc0f = 3: 224fe37eeec7 KVM: s390: selftest: memop: Move testlist into main 7: 2d6776733e64 = 4: f622d3413cf0 KVM: s390: selftest: memop: Add bad address test 8: 8c49eafd2881 = 5: 431f191a8a57 KVM: s390: selftest: memop: Fix typo 9: 0af907110b34 = 6: 3122187435fb KVM: s390: selftest: memop: Fix wrong address being used in test 10: 886c80b2bdce = 7: 401f51f3ef55 KVM: s390: selftest: memop: Fix integer literal -: ------------ > 8: df09794e0794 KVM: s390: Move common code of mem_op functions into functions -: ------------ > 9: 5cbae63357ed KVM: s390: Dispatch to implementing function at top level of vm mem_op -: ------------ > 10: 76ba77b63a26 KVM: s390: Refactor absolute vm mem_op function -: ------------ > 11: c848e772e22a KVM: s390: Refactor absolute vcpu mem_op function 1: 6adc166ee141 ! 12: 6ccb200ad85c KVM: s390: Extend MEM_OP ioctl by storage key checked cmpxchg @@ Commit message and writes to the guest, however, it has no way of performing atomic, key checked, accesses to the guest. Extend the MEM_OP ioctl in order to allow for this, by adding a cmpxchg - mode. For now, support this mode for absolute accesses only. + op. For now, support this op for absolute accesses only. - This mode can be use, for example, to set the device-state-change + This op can be use, for example, to set the device-state-change indicator and the adapter-local-summary indicator atomically. Signed-off-by: Janis Schoetterl-Glausch <scgl(a)linux.ibm.com> @@ include/uapi/linux/kvm.h: struct kvm_s390_mem_op { __u8 ar; /* the access register number */ __u8 key; /* access key, ignored if flag unset */ + __u8 pad1[6]; /* ignored */ -+ __u64 old_addr; /* ignored if flag unset */ ++ __u64 old_addr; /* ignored if cmpxchg flag unset */ }; __u32 sida_offset; /* offset into the sida */ __u8 reserved[32]; /* ignored */ @@ include/uapi/linux/kvm.h: struct kvm_s390_mem_op { + #define KVM_S390_MEMOP_SIDA_WRITE 3 + #define KVM_S390_MEMOP_ABSOLUTE_READ 4 + #define KVM_S390_MEMOP_ABSOLUTE_WRITE 5 ++#define KVM_S390_MEMOP_ABSOLUTE_CMPXCHG 6 ++ + /* flags for kvm_s390_mem_op->flags */ #define KVM_S390_MEMOP_F_CHECK_ONLY (1ULL << 0) #define KVM_S390_MEMOP_F_INJECT_EXCEPTION (1ULL << 1) #define KVM_S390_MEMOP_F_SKEY_PROTECTION (1ULL << 2) -+#define KVM_S390_MEMOP_F_CMPXCHG (1ULL << 3) -+/* flags specifying extension support */ -+#define KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG 0x2 -+/* Non program exception return codes (pgm codes are 16 bit) */ -+#define KVM_S390_MEMOP_R_NO_XCHG (1 << 16) ++/* flags specifying extension support via KVM_CAP_S390_MEM_OP_EXTENSION */ ++#define KVM_S390_MEMOP_EXTENSION_CAP_BASE (1 << 0) ++#define KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG (1 << 1) ++ /* for KVM_INTERRUPT */ struct kvm_interrupt { + /* in */ ## arch/s390/kvm/gaccess.h ## @@ arch/s390/kvm/gaccess.h: int access_guest_with_key(struct kvm_vcpu *vcpu, unsigned long ga, u8 ar, int access_guest_real(struct kvm_vcpu *vcpu, unsigned long gra, void *data, unsigned long len, enum gacc_mode mode); -+int cmpxchg_guest_abs_with_key(struct kvm *kvm, gpa_t gpa, int len, -+ __uint128_t *old, __uint128_t new, u8 access_key); ++int cmpxchg_guest_abs_with_key(struct kvm *kvm, gpa_t gpa, int len, __uint128_t *old, ++ __uint128_t new, u8 access_key, bool *success); + /** * write_guest_with_key - copy data from kernel space to guest space @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + * @gpa: Absolute guest address of the location to be changed. + * @len: Operand length of the cmpxchg, required: 1 <= len <= 16. Providing a + * non power of two will result in failure. -+ * @old_addr: Pointer to old value. If the location at @gpa contains this value, the -+ * exchange will succeed. After calling cmpxchg_guest_abs_with_key() *@old -+ * contains the value at @gpa before the attempt to exchange the value. ++ * @old_addr: Pointer to old value. If the location at @gpa contains this value, ++ * the exchange will succeed. After calling cmpxchg_guest_abs_with_key() ++ * *@old_addr contains the value at @gpa before the attempt to ++ * exchange the value. + * @new: The value to place at @gpa. + * @access_key: The access key to use for the guest access. ++ * @success: output value indicating if an exchange occurred. + * + * Atomically exchange the value at @gpa by @new, if it contains *@old. + * Honors storage keys. + * + * Return: * 0: successful exchange -+ * * 1: exchange unsuccessful + * * a program interruption code indicating the reason cmpxchg could + * not be attempted + * * -EINVAL: address misaligned or len not power of two @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + */ +int cmpxchg_guest_abs_with_key(struct kvm *kvm, gpa_t gpa, int len, + __uint128_t *old_addr, __uint128_t new, -+ u8 access_key) ++ u8 access_key, bool *success) +{ + gfn_t gfn = gpa >> PAGE_SHIFT; + struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn); @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + u8 old; + + ret = cmpxchg_user_key((u8 *)hva, &old, *old_addr, new, access_key); -+ ret = ret < 0 ? ret : old != *old_addr; ++ *success = !ret && old == *old_addr; + *old_addr = old; + break; + } @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + u16 old; + + ret = cmpxchg_user_key((u16 *)hva, &old, *old_addr, new, access_key); -+ ret = ret < 0 ? ret : old != *old_addr; ++ *success = !ret && old == *old_addr; + *old_addr = old; + break; + } @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + u32 old; + + ret = cmpxchg_user_key((u32 *)hva, &old, *old_addr, new, access_key); -+ ret = ret < 0 ? ret : old != *old_addr; ++ *success = !ret && old == *old_addr; + *old_addr = old; + break; + } @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + u64 old; + + ret = cmpxchg_user_key((u64 *)hva, &old, *old_addr, new, access_key); -+ ret = ret < 0 ? ret : old != *old_addr; ++ *success = !ret && old == *old_addr; + *old_addr = old; + break; + } @@ arch/s390/kvm/gaccess.c: int access_guest_real(struct kvm_vcpu *vcpu, unsigned l + __uint128_t old; + + ret = cmpxchg_user_key((__uint128_t *)hva, &old, *old_addr, new, access_key); -+ ret = ret < 0 ? ret : old != *old_addr; ++ *success = !ret && old == *old_addr; + *old_addr = old; + break; + } @@ arch/s390/kvm/kvm-s390.c: int kvm_vm_ioctl_check_extension(struct kvm *kvm, long + case KVM_CAP_S390_MEM_OP_EXTENSION: + /* + * Flag bits indicating which extensions are supported. -+ * The first extension doesn't use a flag, but pretend it does, -+ * this way that can be changed in the future. ++ * If r > 0, the base extension must also be supported/indicated, ++ * in order to maintain backwards compatibility. + */ -+ r = KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG | 1; ++ r = KVM_S390_MEMOP_EXTENSION_CAP_BASE | ++ KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG; + break; case KVM_CAP_NR_VCPUS: case KVM_CAP_MAX_VCPUS: case KVM_CAP_MAX_VCPU_ID: -@@ arch/s390/kvm/kvm-s390.c: static bool access_key_invalid(u8 access_key) - static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop) - { - void __user *uaddr = (void __user *)mop->buf; +@@ arch/s390/kvm/kvm-s390.c: static int kvm_s390_vm_mem_op_abs(struct kvm *kvm, struct kvm_s390_mem_op *mop) + return r; + } + ++static int kvm_s390_vm_mem_op_cmpxchg(struct kvm *kvm, struct kvm_s390_mem_op *mop) ++{ ++ void __user *uaddr = (void __user *)mop->buf; + void __user *old_addr = (void __user *)mop->old_addr; + union { + __uint128_t quad; + char raw[sizeof(__uint128_t)]; + } old = { .quad = 0}, new = { .quad = 0 }; + unsigned int off_in_quad = sizeof(new) - mop->size; - u64 supported_flags; - void *tmpbuf = NULL; - int r, srcu_idx; - - supported_flags = KVM_S390_MEMOP_F_SKEY_PROTECTION -- | KVM_S390_MEMOP_F_CHECK_ONLY; -+ | KVM_S390_MEMOP_F_CHECK_ONLY -+ | KVM_S390_MEMOP_F_CMPXCHG; - if (mop->flags & ~supported_flags || !mop->size) - return -EINVAL; - if (mop->size > MEM_OP_MAX_SIZE) -@@ arch/s390/kvm/kvm-s390.c: static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop) - } else { - mop->key = 0; - } -+ if (mop->flags & KVM_S390_MEMOP_F_CMPXCHG) { -+ /* -+ * This validates off_in_quad. Checking that size is a power -+ * of two is not necessary, as cmpxchg_guest_abs_with_key -+ * takes care of that -+ */ -+ if (mop->size > sizeof(new)) -+ return -EINVAL; -+ if (mop->op != KVM_S390_MEMOP_ABSOLUTE_WRITE) -+ return -EINVAL; -+ if (copy_from_user(&new.raw[off_in_quad], uaddr, mop->size)) -+ return -EFAULT; -+ if (copy_from_user(&old.raw[off_in_quad], old_addr, mop->size)) -+ return -EFAULT; ++ int r, srcu_idx; ++ bool success; ++ ++ r = mem_op_validate_common(mop, KVM_S390_MEMOP_F_SKEY_PROTECTION); ++ if (r) ++ return r; ++ /* ++ * This validates off_in_quad. Checking that size is a power ++ * of two is not necessary, as cmpxchg_guest_abs_with_key ++ * takes care of that ++ */ ++ if (mop->size > sizeof(new)) ++ return -EINVAL; ++ if (copy_from_user(&new.raw[off_in_quad], uaddr, mop->size)) ++ return -EFAULT; ++ if (copy_from_user(&old.raw[off_in_quad], old_addr, mop->size)) ++ return -EFAULT; ++ ++ srcu_idx = srcu_read_lock(&kvm->srcu); ++ ++ if (kvm_is_error_gpa(kvm, mop->gaddr)) { ++ r = PGM_ADDRESSING; ++ goto out_unlock; + } - if (!(mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY)) { - tmpbuf = vmalloc(mop->size); - if (!tmpbuf) ++ ++ r = cmpxchg_guest_abs_with_key(kvm, mop->gaddr, mop->size, &old.quad, ++ new.quad, mop->key, &success); ++ if (!success && copy_to_user(old_addr, &old.raw[off_in_quad], mop->size)) ++ r = -EFAULT; ++ ++out_unlock: ++ srcu_read_unlock(&kvm->srcu, srcu_idx); ++ return r; ++} ++ + static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop) + { + /* @@ arch/s390/kvm/kvm-s390.c: static int kvm_s390_vm_mem_op(struct kvm *kvm, struct kvm_s390_mem_op *mop) - case KVM_S390_MEMOP_ABSOLUTE_WRITE: { - if (mop->flags & KVM_S390_MEMOP_F_CHECK_ONLY) { - r = check_gpa_range(kvm, mop->gaddr, mop->size, GACC_STORE, mop->key); -+ } else if (mop->flags & KVM_S390_MEMOP_F_CMPXCHG) { -+ r = cmpxchg_guest_abs_with_key(kvm, mop->gaddr, mop->size, -+ &old.quad, new.quad, mop->key); -+ if (r == 1) { -+ r = KVM_S390_MEMOP_R_NO_XCHG; -+ if (copy_to_user(old_addr, &old.raw[off_in_quad], mop->size)) -+ r = -EFAULT; -+ } - } else { - if (copy_from_user(tmpbuf, uaddr, mop->size)) { - r = -EFAULT; + case KVM_S390_MEMOP_ABSOLUTE_READ: + case KVM_S390_MEMOP_ABSOLUTE_WRITE: + return kvm_s390_vm_mem_op_abs(kvm, mop); ++ case KVM_S390_MEMOP_ABSOLUTE_CMPXCHG: ++ return kvm_s390_vm_mem_op_cmpxchg(kvm, mop); + default: + return -EINVAL; + } 2: fce9a063ab70 ! 13: 4d983d179903 Documentation: KVM: s390: Describe KVM_S390_MEMOP_F_CMPXCHG @@ Commit message checked) cmpxchg operations on guest memory. Signed-off-by: Janis Schoetterl-Glausch <scgl(a)linux.ibm.com> - Reviewed-by: Claudio Imbrenda <imbrenda(a)linux.ibm.com> ## Documentation/virt/kvm/api.rst ## @@ Documentation/virt/kvm/api.rst: The fields in each entry are defined as follows: @@ Documentation/virt/kvm/api.rst: Parameters are specified via the following struc }; __u32 sida_offset; /* offset into the sida */ __u8 reserved[32]; /* ignored */ -@@ Documentation/virt/kvm/api.rst: Absolute accesses are permitted for non-protected guests only. - Supported flags: +@@ Documentation/virt/kvm/api.rst: Possible operations are: + * ``KVM_S390_MEMOP_ABSOLUTE_WRITE`` + * ``KVM_S390_MEMOP_SIDA_READ`` + * ``KVM_S390_MEMOP_SIDA_WRITE`` ++ * ``KVM_S390_MEMOP_ABSOLUTE_CMPXCHG`` + + Logical read/write: + ^^^^^^^^^^^^^^^^^^^ +@@ Documentation/virt/kvm/api.rst: the checks required for storage key protection as one operation (as opposed to + user space getting the storage keys, performing the checks, and accessing + memory thereafter, which could lead to a delay between check and access). + Absolute accesses are permitted for the VM ioctl if KVM_CAP_S390_MEM_OP_EXTENSION +-is > 0. ++has the KVM_S390_MEMOP_EXTENSION_CAP_BASE bit set. + Currently absolute accesses are not permitted for VCPU ioctls. + Absolute accesses are permitted for non-protected guests only. + +@@ Documentation/virt/kvm/api.rst: Supported flags: * ``KVM_S390_MEMOP_F_CHECK_ONLY`` * ``KVM_S390_MEMOP_F_SKEY_PROTECTION`` -+ * ``KVM_S390_MEMOP_F_CMPXCHG`` -+ + +-The semantics of the flags are as for logical accesses. +The semantics of the flags common with logical accesses are as for logical +accesses. + -+For write accesses, the KVM_S390_MEMOP_F_CMPXCHG flag is supported if -+KVM_CAP_S390_MEM_OP_EXTENSION has flag KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG set. -+In this case, instead of doing an unconditional write, the access occurs -+only if the target location contains the value pointed to by "old_addr". ++Absolute cmpxchg: ++^^^^^^^^^^^^^^^^^ ++ ++Perform cmpxchg on absolute guest memory. Intended for use with the ++KVM_S390_MEMOP_F_SKEY_PROTECTION flag. ++Instead of doing an unconditional write, the access occurs only if the target ++location contains the value pointed to by "old_addr". +This is performed as an atomic cmpxchg with the length specified by the "size" +parameter. "size" must be a power of two up to and including 16. +If the exchange did not take place because the target value doesn't match the -+old value, KVM_S390_MEMOP_R_NO_XCHG is returned. -+In this case the value "old_addr" points to is replaced by the target value. - --The semantics of the flags are as for logical accesses. ++old value, the value "old_addr" points to is replaced by the target value. ++User space can tell if an exchange took place by checking if this replacement ++occurred. The cmpxchg op is permitted for the VM ioctl if ++KVM_CAP_S390_MEM_OP_EXTENSION has flag KVM_S390_MEMOP_EXTENSION_CAP_CMPXCHG set. ++ ++Supported flags: ++ * ``KVM_S390_MEMOP_F_SKEY_PROTECTION`` SIDA read/write: ^^^^^^^^^^^^^^^^ 6: 214281b6eb96 ! 14: 5250be3dd58b KVM: s390: selftest: memop: Add cmpxchg tests @@ tools/testing/selftests/kvm/s390x/memop.c #include <linux/bits.h> +@@ tools/testing/selftests/kvm/s390x/memop.c: enum mop_target { + enum mop_access_mode { + READ, + WRITE, ++ CMPXCHG, + }; + + struct mop_desc { @@ tools/testing/selftests/kvm/s390x/memop.c: struct mop_desc { enum mop_access_mode mode; void *buf; uint32_t sida_offset; + void *old; ++ uint8_t old_value[16]; + bool *cmpxchg_success; uint8_t ar; uint8_t key; }; + + const uint8_t NO_KEY = 0xff; + +-static struct kvm_s390_mem_op ksmo_from_desc(const struct mop_desc *desc) ++static struct kvm_s390_mem_op ksmo_from_desc(struct mop_desc *desc) + { + struct kvm_s390_mem_op ksmo = { + .gaddr = (uintptr_t)desc->gaddr, @@ tools/testing/selftests/kvm/s390x/memop.c: static struct kvm_s390_mem_op ksmo_from_desc(const struct mop_desc *desc) - ksmo.flags |= KVM_S390_MEMOP_F_SKEY_PROTECTION; - ksmo.key = desc->key; - } -+ if (desc->old) { -+ ksmo.flags |= KVM_S390_MEMOP_F_CMPXCHG; -+ ksmo.old_addr = (uint64_t)desc->old; -+ } - if (desc->_ar) - ksmo.ar = desc->ar; - else + ksmo.op = KVM_S390_MEMOP_ABSOLUTE_READ; + if (desc->mode == WRITE) + ksmo.op = KVM_S390_MEMOP_ABSOLUTE_WRITE; ++ if (desc->mode == CMPXCHG) { ++ ksmo.op = KVM_S390_MEMOP_ABSOLUTE_CMPXCHG; ++ ksmo.old_addr = (uint64_t)desc->old; ++ memcpy(desc->old_value, desc->old, desc->size); ++ } + break; + case INVALID: + ksmo.op = -1; @@ tools/testing/selftests/kvm/s390x/memop.c: static void print_memop(struct kvm_vcpu *vcpu, const struct kvm_s390_mem_op *ksm + case KVM_S390_MEMOP_ABSOLUTE_WRITE: printf("ABSOLUTE, WRITE, "); break; ++ case KVM_S390_MEMOP_ABSOLUTE_CMPXCHG: ++ printf("ABSOLUTE, CMPXCHG, "); ++ break; } - printf("gaddr=%llu, size=%u, buf=%llu, ar=%u, key=%u", - ksmo->gaddr, ksmo->size, ksmo->buf, ksmo->ar, ksmo->key); @@ tools/testing/selftests/kvm/s390x/memop.c: static void print_memop(struct kvm_vc if (ksmo->flags & KVM_S390_MEMOP_F_CHECK_ONLY) printf(", CHECK_ONLY"); if (ksmo->flags & KVM_S390_MEMOP_F_INJECT_EXCEPTION) - printf(", INJECT_EXCEPTION"); - if (ksmo->flags & KVM_S390_MEMOP_F_SKEY_PROTECTION) - printf(", SKEY_PROTECTION"); -+ if (ksmo->flags & KVM_S390_MEMOP_F_CMPXCHG) -+ printf(", CMPXCHG"); +@@ tools/testing/selftests/kvm/s390x/memop.c: static void print_memop(struct kvm_vcpu *vcpu, const struct kvm_s390_mem_op *ksm puts(")"); } @@ tools/testing/selftests/kvm/s390x/memop.c: static void print_memop(struct kvm_vc + int r; + + r = err_memop_ioctl(info, ksmo, desc); -+ if (ksmo->flags & KVM_S390_MEMOP_F_CMPXCHG) { -+ if (desc->cmpxchg_success) -+ *desc->cmpxchg_success = !r; -+ if (r == KVM_S390_MEMOP_R_NO_XCHG) -+ r = 0; ++ if (ksmo->op == KVM_S390_MEMOP_ABSOLUTE_CMPXCHG) { ++ if (desc->cmpxchg_success) { ++ int diff = memcmp(desc->old_value, desc->old, desc->size); ++ *desc->cmpxchg_success = !diff; ++ } + } + TEST_ASSERT(!r, __KVM_IOCTL_ERROR("KVM_S390_MEM_OP", r)); @@ tools/testing/selftests/kvm/s390x/memop.c: static void default_read(struct test_ + default_write_read(test->vcpu, test->vcpu, LOGICAL, 16, NO_KEY); + + memcpy(&old, mem1, 16); -+ CHECK_N_DO(MOP, test->vm, ABSOLUTE, WRITE, new + offset, -+ size, GADDR_V(mem1 + offset), -+ CMPXCHG_OLD(old + offset), -+ CMPXCHG_SUCCESS(&succ), KEY(key)); ++ MOP(test->vm, ABSOLUTE, CMPXCHG, new + offset, ++ size, GADDR_V(mem1 + offset), ++ CMPXCHG_OLD(old + offset), ++ CMPXCHG_SUCCESS(&succ), KEY(key)); + HOST_SYNC(test->vcpu, STAGE_COPIED); + MOP(test->vm, ABSOLUTE, READ, mem2, 16, GADDR_V(mem2)); + TEST_ASSERT(succ, "exchange of values should succeed"); @@ tools/testing/selftests/kvm/s390x/memop.c: static void default_read(struct test_ + memcpy(&old, mem1, 16); + new[offset]++; + old[offset]++; -+ CHECK_N_DO(MOP, test->vm, ABSOLUTE, WRITE, new + offset, -+ size, GADDR_V(mem1 + offset), -+ CMPXCHG_OLD(old + offset), -+ CMPXCHG_SUCCESS(&succ), KEY(key)); ++ MOP(test->vm, ABSOLUTE, CMPXCHG, new + offset, ++ size, GADDR_V(mem1 + offset), ++ CMPXCHG_OLD(old + offset), ++ CMPXCHG_SUCCESS(&succ), KEY(key)); + HOST_SYNC(test->vcpu, STAGE_COPIED); + MOP(test->vm, ABSOLUTE, READ, mem2, 16, GADDR_V(mem2)); + TEST_ASSERT(!succ, "exchange of values should not succeed"); @@ tools/testing/selftests/kvm/s390x/memop.c: static void test_copy_key(void) + do { + old = 0; + new = 1; -+ MOP(t.vm, ABSOLUTE, WRITE, &new, ++ MOP(t.vm, ABSOLUTE, CMPXCHG, &new, + sizeof(new), GADDR_V(mem1), + CMPXCHG_OLD(&old), + CMPXCHG_SUCCESS(&success), KEY(1)); @@ tools/testing/selftests/kvm/s390x/memop.c: static void test_copy_key(void) + choose_block(false, i + j, &size, &offset); + do { + new = permutate_bits(false, i + j, size, old); -+ MOP(t.vm, ABSOLUTE, WRITE, quad_to_char(&new, size), ++ MOP(t.vm, ABSOLUTE, CMPXCHG, quad_to_char(&new, size), + size, GADDR_V(mem2 + offset), + CMPXCHG_OLD(quad_to_char(&old, size)), + CMPXCHG_SUCCESS(&success), KEY(1)); @@ tools/testing/selftests/kvm/s390x/memop.c: static void test_errors_key(void) + for (i = 1; i <= 16; i *= 2) { + __uint128_t old = 0; + -+ CHECK_N_DO(ERR_PROT_MOP, t.vm, ABSOLUTE, WRITE, mem2, i, GADDR_V(mem2), -+ CMPXCHG_OLD(&old), KEY(2)); ++ ERR_PROT_MOP(t.vm, ABSOLUTE, CMPXCHG, mem2, i, GADDR_V(mem2), ++ CMPXCHG_OLD(&old), KEY(2)); + } + + kvm_vm_free(t.kvm_vm); @@ tools/testing/selftests/kvm/s390x/memop.c: static void test_errors(void) + power *= 2; + continue; + } -+ rv = ERR_MOP(t.vm, ABSOLUTE, WRITE, mem1, i, GADDR_V(mem1), ++ rv = ERR_MOP(t.vm, ABSOLUTE, CMPXCHG, mem1, i, GADDR_V(mem1), + CMPXCHG_OLD(&old)); + TEST_ASSERT(rv == -1 && errno == EINVAL, + "ioctl allows bad size for cmpxchg"); + } + for (i = 1; i <= 16; i *= 2) { -+ rv = ERR_MOP(t.vm, ABSOLUTE, WRITE, mem1, i, GADDR((void *)~0xfffUL), ++ rv = ERR_MOP(t.vm, ABSOLUTE, CMPXCHG, mem1, i, GADDR((void *)~0xfffUL), + CMPXCHG_OLD(&old)); + TEST_ASSERT(rv > 0, "ioctl allows bad guest address for cmpxchg"); -+ rv = ERR_MOP(t.vm, ABSOLUTE, READ, mem1, i, GADDR_V(mem1), -+ CMPXCHG_OLD(&old)); -+ TEST_ASSERT(rv == -1 && errno == EINVAL, -+ "ioctl allows read cmpxchg call"); + } + for (i = 2; i <= 16; i *= 2) { -+ rv = ERR_MOP(t.vm, ABSOLUTE, WRITE, mem1, i, GADDR_V(mem1 + 1), ++ rv = ERR_MOP(t.vm, ABSOLUTE, CMPXCHG, mem1, i, GADDR_V(mem1 + 1), + CMPXCHG_OLD(&old)); + TEST_ASSERT(rv == -1 && errno == EINVAL, + "ioctl allows bad alignment for cmpxchg"); -- 2.34.1

1 year, 5 months

5
34
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror January 2023