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

[PATCH AUTOSEL 6.9 26/44] selftests/openat2: Fix build warnings on ppc64

by Sasha Levin

From: Michael Ellerman <mpe(a)ellerman.id.au> [ Upstream commit 84b6df4c49a1cc2854a16937acd5fd3e6315d083 ] Fix warnings like: openat2_test.c: In function ‘test_openat2_flags’: openat2_test.c:303:73: warning: format ‘%llX’ expects argument of type ‘long long unsigned int’, but argument 5 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] By switching to unsigned long long for u64 for ppc64 builds. Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> Reviewed-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/openat2/openat2_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/openat2/openat2_test.c b/tools/testing/selftests/openat2/openat2_test.c index 9024754530b23..5790ab446527f 100644 --- a/tools/testing/selftests/openat2/openat2_test.c +++ b/tools/testing/selftests/openat2/openat2_test.c @@ -5,6 +5,7 @@ */ #define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__ // Use ll64 #include <fcntl.h> #include <sched.h> #include <sys/stat.h> -- 2.43.0

1 year, 6 months

1
0
0 0

[PATCH AUTOSEL 6.9 25/44] selftests: cachestat: Fix build warnings on ppc64

by Sasha Levin

From: Michael Ellerman <mpe(a)ellerman.id.au> [ Upstream commit bc4d5f5d2debf8bb65fba188313481549ead8576 ] Fix warnings like: test_cachestat.c: In function ‘print_cachestat’: test_cachestat.c:30:38: warning: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 2 has type ‘__u64’ {aka ‘long unsigned int’} [-Wformat=] By switching to unsigned long long for u64 for ppc64 builds. Signed-off-by: Michael Ellerman <mpe(a)ellerman.id.au> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cachestat/test_cachestat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c index b171fd53b004e..632ab44737ec3 100644 --- a/tools/testing/selftests/cachestat/test_cachestat.c +++ b/tools/testing/selftests/cachestat/test_cachestat.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #define _GNU_SOURCE +#define __SANE_USERSPACE_TYPES__ // Use ll64 #include <stdio.h> #include <stdbool.h> -- 2.43.0

1 year, 6 months

1
0
0 0

[RFC PATCH v1 0/2] KVM: arm64: Making BT Field in ID_AA64PFR1_EL1 writable

by Shaoqin Huang

Hi guys, I'm trying to enable migration from MtCollins(Ampere Altra, ARMv8.2+) to AmpereOne(AmpereOne, ARMv8.6+), the migration always fails when migration from MtCollins to AmpereOne due to some register fields differing between the two machines. In this patch series, we try to make more register fields writable like ID_AA64PFR1_EL1.BT. This is first step towards making the migration possible. Some other hurdles need to be overcome. This is not sufficient to make the migration successful from MtCollins to AmpereOne. Shaoqin Huang (2): KVM: arm64: Allow BT field in ID_AA64PFR1_EL1 writable KVM: selftests: aarch64: Add writable test for ID_AA64PFR1_EL1 arch/arm64/kvm/sys_regs.c | 2 +- tools/testing/selftests/kvm/aarch64/set_id_regs.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.40.1

1 year, 6 months

3
8
0 0

[PATCH mptcp-next v3 0/6] use network helpers, part 7

by Geliang Tang

From: Geliang Tang <tanggeliang(a)kylinos.cn> v3: - rename start_client to client_socket - Use connect_to_addr in connect_to_fd_opt v2: - update patch 2, extract a new helper start_client. - drop patch 3, keep must_fail in network_helper_opts. Drop type and noconnect from network_helper_opts. And use start_server_str in mptcp and test_tcp_check_syncookie_user. Patches 1-4 address Martin's comments in the previous series. Geliang Tang (6): selftests/bpf: Drop type from network_helper_opts selftests/bpf: Use connect_to_addr in connect_to_fd_opt selftests/bpf: Add client_socket helper selftests/bpf: Drop noconnect from network_helper_opts selftests/bpf: Use start_server_str in mptcp selftests/bpf: Use start_server_str in test_tcp_check_syncookie_user tools/testing/selftests/bpf/network_helpers.c | 100 ++++++++---------- tools/testing/selftests/bpf/network_helpers.h | 6 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- .../bpf/prog_tests/ip_check_defrag.c | 10 +- .../testing/selftests/bpf/prog_tests/mptcp.c | 7 +- .../bpf/test_tcp_check_syncookie_user.c | 29 +---- 7 files changed, 56 insertions(+), 102 deletions(-) -- 2.43.0

1 year, 6 months

1
7
0 0

[PATCH] selftests/mm:fix test_prctl_fork_exec return failure

by aigourensheng

after calling fork() in the test_prctl_fork_exec() function, the global variable ksm_full_scans_fd is initialized to 0 in the child process upon entering the main function of ./ksm_functional_tests. In the function call chain test_child_ksm() -> __mmap_and_merge_range -> ksm_merge-> ksm_get_full_scans, start_scans = ksm_get_full_scans() will return an error. Therefore, the value of ksm_full_scans_fd needs to be initialized before calling test_child_ksm in the child process. Signed-off-by: aigourensheng <shechenglong001(a)gmail.com> --- .../selftests/mm/ksm_functional_tests.c | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/mm/ksm_functional_tests.c b/tools/testing/selftests/mm/ksm_functional_tests.c index 37de82da9be7..b61803e36d1c 100644 --- a/tools/testing/selftests/mm/ksm_functional_tests.c +++ b/tools/testing/selftests/mm/ksm_functional_tests.c @@ -656,12 +656,33 @@ static void test_prot_none(void) munmap(map, size); } +static void init_global_file_handles(void) +{ + mem_fd = open("/proc/self/mem", O_RDWR); + if (mem_fd < 0) + ksft_exit_fail_msg("opening /proc/self/mem failed\n"); + ksm_fd = open("/sys/kernel/mm/ksm/run", O_RDWR); + if (ksm_fd < 0) + ksft_exit_skip("open(\"/sys/kernel/mm/ksm/run\") failed\n"); + ksm_full_scans_fd = open("/sys/kernel/mm/ksm/full_scans", O_RDONLY); + if (ksm_full_scans_fd < 0) + ksft_exit_skip("open(\"/sys/kernel/mm/ksm/full_scans\") failed\n"); + pagemap_fd = open("/proc/self/pagemap", O_RDONLY); + if (pagemap_fd < 0) + ksft_exit_skip("open(\"/proc/self/pagemap\") failed\n"); + proc_self_ksm_stat_fd = open("/proc/self/ksm_stat", O_RDONLY); + proc_self_ksm_merging_pages_fd = open("/proc/self/ksm_merging_pages", + O_RDONLY); + ksm_use_zero_pages_fd = open("/sys/kernel/mm/ksm/use_zero_pages", O_RDWR); +} + int main(int argc, char **argv) { unsigned int tests = 8; int err; if (argc > 1 && !strcmp(argv[1], FORK_EXEC_CHILD_PRG_NAME)) { + init_global_file_handles(); exit(test_child_ksm()); } @@ -674,22 +695,7 @@ int main(int argc, char **argv) pagesize = getpagesize(); - mem_fd = open("/proc/self/mem", O_RDWR); - if (mem_fd < 0) - ksft_exit_fail_msg("opening /proc/self/mem failed\n"); - ksm_fd = open("/sys/kernel/mm/ksm/run", O_RDWR); - if (ksm_fd < 0) - ksft_exit_skip("open(\"/sys/kernel/mm/ksm/run\") failed\n"); - ksm_full_scans_fd = open("/sys/kernel/mm/ksm/full_scans", O_RDONLY); - if (ksm_full_scans_fd < 0) - ksft_exit_skip("open(\"/sys/kernel/mm/ksm/full_scans\") failed\n"); - pagemap_fd = open("/proc/self/pagemap", O_RDONLY); - if (pagemap_fd < 0) - ksft_exit_skip("open(\"/proc/self/pagemap\") failed\n"); - proc_self_ksm_stat_fd = open("/proc/self/ksm_stat", O_RDONLY); - proc_self_ksm_merging_pages_fd = open("/proc/self/ksm_merging_pages", - O_RDONLY); - ksm_use_zero_pages_fd = open("/sys/kernel/mm/ksm/use_zero_pages", O_RDWR); + init_global_file_handles(); test_unmerge(); test_unmerge_zero_pages(); -- 2.17.1

1 year, 6 months

2
1
0 0

[PATCH v3 0/6] ALSA: some driver fixes for control input validations

by Takashi Iwai

Hi, this is a v3 patch set as a follow up of the thread about the errors reported by kselftest mixer-test. It changes HD-audio and vmaster control behavior to return -EINVAL for invalid input values. There is a change in kselftest itself to skip the verification after write tests for volatile controls, too. It's for the channel map controls that can't hold the stable values. v2->v3: * Replace with Mark's patch for kselftest * Apply the validation for user controls in put callback instead v1->v2: * Skip only verification after write in kselftest * Add sanity check to HDMI chmap write, too v2: https://lore.kernel.org/r/20240614153717.30143-1-tiwai@suse.de v1: https://lore.kernel.org/r/20240614124728.27901-1-tiwai@suse.de Takashi === Mark Brown (1): kselftest/alsa: Fix validation of writes to volatile controls Takashi Iwai (5): ALSA: vmaster: Return error for invalid input values ALSA: hda: Return -EINVAL for invalid volume/switch inputs ALSA: control: Apply sanity check of input values for user elements ALSA: chmap: Mark Channel Map controls as volatile ALSA: hda: Add input value sanity checks to HDMI channel map controls sound/core/control.c | 6 ++- sound/core/pcm_lib.c | 1 + sound/core/vmaster.c | 8 ++++ sound/hda/hdmi_chmap.c | 18 +++++++++ sound/pci/hda/hda_codec.c | 23 +++++++++--- tools/testing/selftests/alsa/mixer-test.c | 45 +++++++++++++++-------- 6 files changed, 79 insertions(+), 22 deletions(-) -- 2.43.0

1 year, 6 months

1
6
0 0

[PATCH] kselftest/alsa: Fix validation of writes to volatile controls

by Mark Brown

When validating writes to controls we check that whatever value we wrote actually appears in the control. For volatile controls we cannot assume that this will be the case, the value may be changed at any time including between our write and read. Handle this by moving the check for volatile controls that we currently do for events to a separate block and just verifying that whatever value we read is valid for the control. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/mixer-test.c | 45 ++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 1c04e5f638a0..dd74f8cc7ece 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -625,6 +625,21 @@ static int write_and_verify(struct ctl_data *ctl, return err; } + /* + * We can't verify any specific value for volatile controls + * but we should still check that whatever we read is a valid + * vale for the control. + */ + if (snd_ctl_elem_info_is_volatile(ctl->info)) { + if (!ctl_value_valid(ctl, read_val)) { + ksft_print_msg("Volatile control %s has invalid value\n", + ctl->name); + return -EINVAL; + } + + return 0; + } + /* * Check for an event if the value changed, or confirm that * there was none if it didn't. We rely on the kernel @@ -632,22 +647,20 @@ static int write_and_verify(struct ctl_data *ctl, * write, this is currently true, should that ever change this * will most likely break and need updating. */ - if (!snd_ctl_elem_info_is_volatile(ctl->info)) { - err = wait_for_event(ctl, 0); - if (snd_ctl_elem_value_compare(initial_val, read_val)) { - if (err < 1) { - ksft_print_msg("No event generated for %s\n", - ctl->name); - show_values(ctl, initial_val, read_val); - ctl->event_missing++; - } - } else { - if (err != 0) { - ksft_print_msg("Spurious event generated for %s\n", - ctl->name); - show_values(ctl, initial_val, read_val); - ctl->event_spurious++; - } + err = wait_for_event(ctl, 0); + if (snd_ctl_elem_value_compare(initial_val, read_val)) { + if (err < 1) { + ksft_print_msg("No event generated for %s\n", + ctl->name); + show_values(ctl, initial_val, read_val); + ctl->event_missing++; + } + } else { + if (err != 0) { + ksft_print_msg("Spurious event generated for %s\n", + ctl->name); + show_values(ctl, initial_val, read_val); + ctl->event_spurious++; } } --- base-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 change-id: 20240614-alsa-selftest-volatile-d6f3e8e28c08 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 6 months

2
1
0 0

[PATCH v2 0/6] ALSA: some driver fixes for control input validations

by Takashi Iwai

Hi, this is a revised patch set as a follow up of the thread about the errors reported by kselftest mixer-test. It changes HD-audio and vmaster control behavior to return -EINVAL for invalid input values. There is a change in kselftest itself to skip the verification after write tests for volatile controls, too. It's for the channel map controls that can't hold the stable values. v1->v2: * Skip only verification after write in kselftest * Add sanity check to HDMI chmap write, too Takashi === Takashi Iwai (6): ALSA: vmaster: Return error for invalid input values ALSA: hda: Return -EINVAL for invalid volume/switch inputs ALSA: control: Apply sanity check of input values for user elements kselftest/alsa: mixer-test: Skip write verification for volatile controls ALSA: chmap: Mark Channel Map controls as volatile ALSA: hda: Add input value sanity checks to HDMI channel map controls sound/core/control.c | 3 ++- sound/core/pcm_lib.c | 1 + sound/core/vmaster.c | 8 ++++++++ sound/hda/hdmi_chmap.c | 18 ++++++++++++++++++ sound/pci/hda/hda_codec.c | 23 ++++++++++++++++++----- tools/testing/selftests/alsa/mixer-test.c | 4 ++++ 6 files changed, 51 insertions(+), 6 deletions(-) -- 2.43.0

1 year, 6 months

4
17
0 0

[PATCH 1/2] selftests: kvm: remove print_skip()

by Muhammad Usama Anjum

Replace print_skip() with ksft_exit_skip() to simplify the code and directly use the skip API provided by kselftest.h. Signed-off-by: Muhammad Usama Anjum <usama.anjum(a)collabora.com> --- .../testing/selftests/kvm/aarch64/vgic_init.c | 4 ++-- .../testing/selftests/kvm/demand_paging_test.c | 3 +-- tools/testing/selftests/kvm/dirty_log_test.c | 8 +++----- .../testing/selftests/kvm/include/test_util.h | 1 - tools/testing/selftests/kvm/lib/assert.c | 6 ++---- tools/testing/selftests/kvm/lib/test_util.c | 11 ----------- tools/testing/selftests/kvm/s390x/memop.c | 18 ++++++------------ .../selftests/kvm/x86_64/hyperv_cpuid.c | 13 +++++-------- .../kvm/x86_64/hyperv_extended_hypercalls.c | 6 ++---- .../selftests/kvm/x86_64/ucna_injection_test.c | 6 ++---- 10 files changed, 23 insertions(+), 53 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index b3b5fb0ff0a9a..556c3230eb093 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -757,8 +757,8 @@ int main(int ac, char **av) } if (!cnt_impl) { - print_skip("No GICv2 nor GICv3 support"); - exit(KSFT_SKIP); + ksft_exit_skip("No GICv2 nor GICv3 support\n"); } + return 0; } diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c index 0202b78f8680a..ae60b3a5fb9e5 100644 --- a/tools/testing/selftests/kvm/demand_paging_test.c +++ b/tools/testing/selftests/kvm/demand_paging_test.c @@ -353,8 +353,7 @@ int main(int argc, char *argv[]) int main(void) { - print_skip("__NR_userfaultfd must be present for userfaultfd test"); - return KSFT_SKIP; + ksft_exit_skip("__NR_userfaultfd must be present for userfaultfd test\n"); } #endif /* __NR_userfaultfd */ diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index aacf80f574391..e5d3b01ec9508 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -692,11 +692,9 @@ static void run_test(enum vm_guest_mode mode, void *arg) uint32_t ring_buf_idx = 0; int sem_val; - if (!log_mode_supported()) { - print_skip("Log mode '%s' not supported", - log_modes[host_log_mode].name); - return; - } + if (!log_mode_supported()) + ksft_exit_skip("Log mode '%s' not supported\n", + log_modes[host_log_mode].name); /* * We reserve page table for 2 times of extra dirty mem which diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h index 3e473058849ff..472fce41737e0 100644 --- a/tools/testing/selftests/kvm/include/test_util.h +++ b/tools/testing/selftests/kvm/include/test_util.h @@ -35,7 +35,6 @@ static inline int _no_printf(const char *format, ...) { return 0; } #define pr_info(...) _no_printf(__VA_ARGS__) #endif -void __printf(1, 2) print_skip(const char *fmt, ...); #define __TEST_REQUIRE(f, fmt, ...) \ do { \ if (!(f)) \ diff --git a/tools/testing/selftests/kvm/lib/assert.c b/tools/testing/selftests/kvm/lib/assert.c index b49690658c606..33651f5b3a7fd 100644 --- a/tools/testing/selftests/kvm/lib/assert.c +++ b/tools/testing/selftests/kvm/lib/assert.c @@ -85,10 +85,8 @@ test_assert(bool exp, const char *exp_str, } va_end(ap); - if (errno == EACCES) { - print_skip("Access denied - Exiting"); - exit(KSFT_SKIP); - } + if (errno == EACCES) + ksft_exit_skip("Access denied - Exiting\n"); exit(254); } diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c index 8ed0b74ae8373..6e8ac25403bb3 100644 --- a/tools/testing/selftests/kvm/lib/test_util.c +++ b/tools/testing/selftests/kvm/lib/test_util.c @@ -121,17 +121,6 @@ struct timespec timespec_div(struct timespec ts, int divisor) return timespec_add_ns((struct timespec){0}, ns); } -void print_skip(const char *fmt, ...) -{ - va_list ap; - - assert(fmt); - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); - puts(", skipping test"); -} - bool thp_configured(void) { int ret; diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c index f2df7416be847..d7cd4b4eb6228 100644 --- a/tools/testing/selftests/kvm/s390x/memop.c +++ b/tools/testing/selftests/kvm/s390x/memop.c @@ -884,10 +884,8 @@ static void test_copy_key_fetch_prot_override(void) guest_0_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, 0); guest_last_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, last_page_addr); - if (guest_0_page != 0 || guest_last_page != last_page_addr) { - print_skip("did not allocate guest pages at required positions"); - goto out; - } + if (guest_0_page != 0 || guest_last_page != last_page_addr) + ksft_exit_skip("did not allocate guest pages at required positions\n"); HOST_SYNC(t.vcpu, STAGE_INITED); t.run->s.regs.crs[0] |= CR0_FETCH_PROTECTION_OVERRIDE; @@ -923,10 +921,8 @@ static void test_errors_key_fetch_prot_override_not_enabled(void) guest_0_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, 0); guest_last_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, last_page_addr); - if (guest_0_page != 0 || guest_last_page != last_page_addr) { - print_skip("did not allocate guest pages at required positions"); - goto out; - } + if (guest_0_page != 0 || guest_last_page != last_page_addr) + ksft_exit_skip("did not allocate guest pages at required positions\n"); HOST_SYNC(t.vcpu, STAGE_INITED); HOST_SYNC(t.vcpu, STAGE_SKEYS_SET); @@ -944,10 +940,8 @@ static void test_errors_key_fetch_prot_override_enabled(void) guest_0_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, 0); guest_last_page = vm_vaddr_alloc(t.kvm_vm, PAGE_SIZE, last_page_addr); - if (guest_0_page != 0 || guest_last_page != last_page_addr) { - print_skip("did not allocate guest pages at required positions"); - goto out; - } + if (guest_0_page != 0 || guest_last_page != last_page_addr) + ksft_exit_skip("did not allocate guest pages at required positions"); HOST_SYNC(t.vcpu, STAGE_INITED); t.run->s.regs.crs[0] |= CR0_FETCH_PROTECTION_OVERRIDE; t.run->kvm_dirty_regs = KVM_SYNC_CRS; diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c index 4f5881d4ef66d..695c45635d257 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c @@ -144,10 +144,9 @@ int main(int argc, char *argv[]) free((void *)hv_cpuid_entries); if (!kvm_cpu_has(X86_FEATURE_VMX) || - !kvm_has_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) { - print_skip("Enlightened VMCS is unsupported"); - goto do_sys; - } + !kvm_has_cap(KVM_CAP_HYPERV_ENLIGHTENED_VMCS)) + ksft_exit_skip("Enlightened VMCS is unsupported\n"); + vcpu_enable_evmcs(vcpu); hv_cpuid_entries = vcpu_get_supported_hv_cpuid(vcpu); test_hv_cpuid(hv_cpuid_entries, true); @@ -155,10 +154,8 @@ int main(int argc, char *argv[]) do_sys: /* Test system ioctl version */ - if (!kvm_has_cap(KVM_CAP_SYS_HYPERV_CPUID)) { - print_skip("KVM_CAP_SYS_HYPERV_CPUID not supported"); - goto out; - } + if (!kvm_has_cap(KVM_CAP_SYS_HYPERV_CPUID)) + ksft_exit_skip("KVM_CAP_SYS_HYPERV_CPUID not supported\n"); test_hv_cpuid_e2big(vm, NULL); diff --git a/tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c b/tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c index 949e08e98f315..d37212a27990b 100644 --- a/tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c +++ b/tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c @@ -47,10 +47,8 @@ int main(void) /* Verify if extended hypercalls are supported */ if (!kvm_cpuid_has(kvm_get_supported_hv_cpuid(), - HV_ENABLE_EXTENDED_HYPERCALLS)) { - print_skip("Extended calls not supported by the kernel"); - exit(KSFT_SKIP); - } + HV_ENABLE_EXTENDED_HYPERCALLS)) + ksft_exit_skip("Extended calls not supported by the kernel\n"); vm = vm_create_with_one_vcpu(&vcpu, guest_code); run = vcpu->run; diff --git a/tools/testing/selftests/kvm/x86_64/ucna_injection_test.c b/tools/testing/selftests/kvm/x86_64/ucna_injection_test.c index 57f157c06b393..1dcb37a1f0be9 100644 --- a/tools/testing/selftests/kvm/x86_64/ucna_injection_test.c +++ b/tools/testing/selftests/kvm/x86_64/ucna_injection_test.c @@ -273,10 +273,8 @@ int main(int argc, char *argv[]) kvm_ioctl(vm->kvm_fd, KVM_X86_GET_MCE_CAP_SUPPORTED, &supported_mcg_caps); - if (!(supported_mcg_caps & MCG_CMCI_P)) { - print_skip("MCG_CMCI_P is not supported"); - exit(KSFT_SKIP); - } + if (!(supported_mcg_caps & MCG_CMCI_P)) + ksft_exit_skip("MCG_CMCI_P is not supported\n"); ucna_vcpu = create_vcpu_with_mce_cap(vm, 0, true, ucna_injection_guest_code); cmcidis_vcpu = create_vcpu_with_mce_cap(vm, 1, false, cmci_disabled_guest_code); -- 2.39.2

1 year, 6 months

4
7
0 0

[PATCH net-next 0/6] selftests: mptcp: use net/lib.sh to manage netns

by Matthieu Baerts (NGI0)

The goal of this series is to use helpers from net/lib.sh with MPTCP selftests. - Patches 1 to 4 are some clean-ups and preparation in net/lib.sh: - Patch 1 simplifies the code handling errexit by ignoring possible errors instead of disabling errexit temporary. - Patch 2 removes the netns from the list after having cleaned it, not to try to clean it twice. - Patch 3 removes the 'readonly' attribute for the netns variable, to allow using the same name in local variables. - Patch 4 removes the local 'ns' var, not to conflict with the global one it needs to setup. - Patch 5 uses helpers from net/lib.sh to create and delete netns in MPTCP selftests. - Patch 6 uses wait_local_port_listen helper from net/net_helper.sh. Signed-off-by: Matthieu Baerts (NGI0) <matttbe(a)kernel.org> --- Geliang Tang (3): selftests: net: lib: remove 'ns' var in setup_ns selftests: mptcp: lib: use setup/cleanup_ns helpers selftests: mptcp: lib: use wait_local_port_listen helper Matthieu Baerts (NGI0) (3): selftests: net: lib: ignore possible errors selftests: net: lib: remove ns from list after clean-up selftests: net: lib: do not set ns var as readonly tools/testing/selftests/net/lib.sh | 55 +++++++++++++++----------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 33 +++++----------- 2 files changed, 42 insertions(+), 46 deletions(-) --- base-commit: a999973236543f0b8f6daeaa7ecba7488c3a593b change-id: 20240607-upstream-net-next-20240607-selftests-mptcp-net-lib-365e43e2e1ca Best regards, -- Matthieu Baerts (NGI0) <matttbe(a)kernel.org>

1 year, 6 months

4
10
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror