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

[PATCH] selftests: alsa: Better error messages

by Siddh Raman Pant

This allows for potentially better machine-parsing due to an expected / fixed format. Also because of eyecandy reasons. Whenever possible, errors will start with the name of the offending card/control, separated by the error with colons. Whenever there is a description of an error given, the generated error string from snd_strerror will be (mostly) enclosed in parentheses at the end. Clarity of error messages have been (hopefully) improved. Signed-off-by: Siddh Raman Pant <siddhpant.gh(a)gmail.com> --- tools/testing/selftests/alsa/mixer-test.c | 94 +++++++++++------------ 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index a38b89c28..4719b12a5 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -114,7 +114,7 @@ static void find_controls(void) err = snd_config_load_string(&config, alsa_config, strlen(alsa_config)); if (err < 0) { - ksft_print_msg("Unable to parse custom alsa-lib configuration: %s\n", + ksft_print_msg("Unable to parse custom alsa-lib configuration (%s)\n", snd_strerror(err)); ksft_exit_fail(); } @@ -128,7 +128,7 @@ static void find_controls(void) err = snd_ctl_open_lconf(&card_data->handle, name, 0, config); if (err < 0) { - ksft_print_msg("Failed to get hctl for card %d: %s\n", + ksft_print_msg("Card %d: Failed to get hctl (%s)\n", card, snd_strerror(err)); goto next_card; } @@ -177,9 +177,8 @@ static void find_controls(void) err = snd_ctl_elem_info(card_data->handle, ctl_data->info); if (err < 0) { - ksft_print_msg("%s getting info for %d\n", - snd_strerror(err), - ctl_data->name); + ksft_print_msg("%s : %s while getting info\n", + ctl_data->name, snd_strerror(err)); } snd_ctl_elem_value_set_id(ctl_data->def_val, @@ -192,20 +191,20 @@ static void find_controls(void) /* Set up for events */ err = snd_ctl_subscribe_events(card_data->handle, true); if (err < 0) { - ksft_exit_fail_msg("snd_ctl_subscribe_events() failed for card %d: %d\n", + ksft_exit_fail_msg("Card %d : snd_ctl_subscribe_events() failed (%d)\n", card, err); } err = snd_ctl_poll_descriptors_count(card_data->handle); if (err != 1) { - ksft_exit_fail_msg("Unexpected descriptor count %d for card %d\n", - err, card); + ksft_exit_fail_msg("Card %d : Unexpected descriptor count %d\n", + card, err); } err = snd_ctl_poll_descriptors(card_data->handle, &card_data->pollfd, 1); if (err != 1) { - ksft_exit_fail_msg("snd_ctl_poll_descriptors() failed for %d\n", + ksft_exit_fail_msg("Card %d : snd_ctl_poll_descriptors() failed (%d)\n", card, err); } @@ -236,8 +235,8 @@ static int wait_for_event(struct ctl_data *ctl, int timeout) do { err = poll(&(ctl->card->pollfd), 1, timeout); if (err < 0) { - ksft_print_msg("poll() failed for %s: %s (%d)\n", - ctl->name, strerror(errno), errno); + ksft_print_msg("%s : poll() failed (%d - %s)\n", + ctl->name, errno, strerror(errno)); return -1; } /* Timeout */ @@ -248,12 +247,12 @@ static int wait_for_event(struct ctl_data *ctl, int timeout) &(ctl->card->pollfd), 1, &revents); if (err < 0) { - ksft_print_msg("snd_ctl_poll_descriptors_revents() failed for %s: %d\n", + ksft_print_msg("%s : snd_ctl_poll_descriptors_revents() failed (%d)\n", ctl->name, err); return err; } if (revents & POLLERR) { - ksft_print_msg("snd_ctl_poll_descriptors_revents() reported POLLERR for %s\n", + ksft_print_msg("%s : snd_ctl_poll_descriptors_revents() reported POLLERR\n", ctl->name); return -1; } @@ -265,7 +264,7 @@ static int wait_for_event(struct ctl_data *ctl, int timeout) err = snd_ctl_read(ctl->card->handle, event); if (err < 0) { - ksft_print_msg("snd_ctl_read() failed for %s: %d\n", + ksft_print_msg("%s : snd_ctl_read() failed (%d)\n", ctl->name, err); return err; } @@ -283,7 +282,7 @@ static int wait_for_event(struct ctl_data *ctl, int timeout) } if ((mask & SND_CTL_EVENT_MASK_REMOVE) == SND_CTL_EVENT_MASK_REMOVE) { - ksft_print_msg("Removal event for %s\n", + ksft_print_msg("%s : Removal event\n", ctl->name); return -1; } @@ -301,7 +300,7 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, switch (snd_ctl_elem_info_get_type(ctl->info)) { case SND_CTL_ELEM_TYPE_NONE: - ksft_print_msg("%s.%d Invalid control type NONE\n", + ksft_print_msg("%s.%d : Invalid control type NONE\n", ctl->name, index); return false; @@ -312,7 +311,7 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, case 1: break; default: - ksft_print_msg("%s.%d Invalid boolean value %ld\n", + ksft_print_msg("%s.%d : Invalid boolean value %ld\n", ctl->name, index, int_val); return false; } @@ -322,14 +321,14 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, int_val = snd_ctl_elem_value_get_integer(val, index); if (int_val < snd_ctl_elem_info_get_min(ctl->info)) { - ksft_print_msg("%s.%d value %ld less than minimum %ld\n", + ksft_print_msg("%s.%d : Value %ld is less than the minimum (%ld)\n", ctl->name, index, int_val, snd_ctl_elem_info_get_min(ctl->info)); return false; } if (int_val > snd_ctl_elem_info_get_max(ctl->info)) { - ksft_print_msg("%s.%d value %ld more than maximum %ld\n", + ksft_print_msg("%s.%d : Value %ld is more than the maximum (%ld)\n", ctl->name, index, int_val, snd_ctl_elem_info_get_max(ctl->info)); return false; @@ -339,7 +338,7 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, if (snd_ctl_elem_info_get_step(ctl->info) && (int_val - snd_ctl_elem_info_get_min(ctl->info) % snd_ctl_elem_info_get_step(ctl->info))) { - ksft_print_msg("%s.%d value %ld invalid for step %ld minimum %ld\n", + ksft_print_msg("%s.%d : Value %ld is invalid for step %ld, minimum %ld\n", ctl->name, index, int_val, snd_ctl_elem_info_get_step(ctl->info), snd_ctl_elem_info_get_min(ctl->info)); @@ -351,14 +350,14 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, int64_val = snd_ctl_elem_value_get_integer64(val, index); if (int64_val < snd_ctl_elem_info_get_min64(ctl->info)) { - ksft_print_msg("%s.%d value %lld less than minimum %lld\n", + ksft_print_msg("%s.%d : Value %lld is less than the minimum (%lld)\n", ctl->name, index, int64_val, snd_ctl_elem_info_get_min64(ctl->info)); return false; } if (int64_val > snd_ctl_elem_info_get_max64(ctl->info)) { - ksft_print_msg("%s.%d value %lld more than maximum %lld\n", + ksft_print_msg("%s.%d : Value %lld is more than the maximum (%lld)\n", ctl->name, index, int64_val, snd_ctl_elem_info_get_max(ctl->info)); return false; @@ -368,7 +367,7 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, if (snd_ctl_elem_info_get_step64(ctl->info) && (int64_val - snd_ctl_elem_info_get_min64(ctl->info)) % snd_ctl_elem_info_get_step64(ctl->info)) { - ksft_print_msg("%s.%d value %lld invalid for step %lld minimum %lld\n", + ksft_print_msg("%s.%d : Value %lld is invalid for step %lld, minimum %lld\n", ctl->name, index, int64_val, snd_ctl_elem_info_get_step64(ctl->info), snd_ctl_elem_info_get_min64(ctl->info)); @@ -380,13 +379,13 @@ static bool ctl_value_index_valid(struct ctl_data *ctl, int_val = snd_ctl_elem_value_get_enumerated(val, index); if (int_val < 0) { - ksft_print_msg("%s.%d negative value %ld for enumeration\n", + ksft_print_msg("%s.%d : Negative value %ld for enumeration\n", ctl->name, index, int_val); return false; } if (int_val >= snd_ctl_elem_info_get_items(ctl->info)) { - ksft_print_msg("%s.%d value %ld more than item count %ld\n", + ksft_print_msg("%s.%d : Value %ld is more than item count (%ld)\n", ctl->name, index, int_val, snd_ctl_elem_info_get_items(ctl->info)); return false; @@ -427,7 +426,7 @@ static void test_ctl_get_value(struct ctl_data *ctl) /* If the control is turned off let's be polite */ if (snd_ctl_elem_info_is_inactive(ctl->info)) { - ksft_print_msg("%s is inactive\n", ctl->name); + ksft_print_msg("%s : Inactive\n", ctl->name); ksft_test_result_skip("get_value.%d.%d\n", ctl->card->card, ctl->elem); return; @@ -435,7 +434,7 @@ static void test_ctl_get_value(struct ctl_data *ctl) /* Can't test reading on an unreadable control */ if (!snd_ctl_elem_info_is_readable(ctl->info)) { - ksft_print_msg("%s is not readable\n", ctl->name); + ksft_print_msg("%s : Not readable\n", ctl->name); ksft_test_result_skip("get_value.%d.%d\n", ctl->card->card, ctl->elem); return; @@ -443,7 +442,7 @@ static void test_ctl_get_value(struct ctl_data *ctl) err = snd_ctl_elem_read(ctl->card->handle, ctl->def_val); if (err < 0) { - ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + ksft_print_msg("snd_ctl_elem_read() failed (%s)\n", snd_strerror(err)); goto out; } @@ -474,7 +473,7 @@ static void test_ctl_name(struct ctl_data *ctl) /* Only boolean controls should end in Switch */ if (strend(ctl->name, " Switch")) { if (snd_ctl_elem_info_get_type(ctl->info) != SND_CTL_ELEM_TYPE_BOOLEAN) { - ksft_print_msg("%d.%d %s ends in Switch but is not boolean\n", + ksft_print_msg("%d.%d %s : Not a boolean, but name ends in Switch\n", ctl->card->card, ctl->elem, ctl->name); name_ok = false; } @@ -484,7 +483,7 @@ static void test_ctl_name(struct ctl_data *ctl) if (snd_ctl_elem_info_get_type(ctl->info) == SND_CTL_ELEM_TYPE_BOOLEAN && snd_ctl_elem_info_is_writable(ctl->info)) { if (!strend(ctl->name, " Switch")) { - ksft_print_msg("%d.%d %s is a writeable boolean but not a Switch\n", + ksft_print_msg("%d.%d %s : Not a Switch despite being a writeable boolean\n", ctl->card->card, ctl->elem, ctl->name); name_ok = false; } @@ -542,11 +541,12 @@ static bool show_mismatch(struct ctl_data *ctl, int index, /* * NOTE: The volatile attribute means that the hardware * can voluntarily change the state of control element - * independent of any operation by software. + * independent of any operation by software. */ bool is_volatile = snd_ctl_elem_info_is_volatile(ctl->info); - ksft_print_msg("%s.%d expected %lld but read %lld, is_volatile %d\n", - ctl->name, index, expected_int, read_int, is_volatile); + ksft_print_msg("%s.%d : Expected %lld, but read %lld (%s)\n", + ctl->name, index, expected_int, read_int, + (is_volatile ? "Volatile" : "Non-volatile")); return !is_volatile; } else { return false; @@ -590,7 +590,7 @@ static int write_and_verify(struct ctl_data *ctl, err = snd_ctl_elem_read(ctl->card->handle, initial_val); if (err < 0) { - ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + ksft_print_msg("snd_ctl_elem_read() failed (%s)\n", snd_strerror(err)); return err; } @@ -602,7 +602,7 @@ static int write_and_verify(struct ctl_data *ctl, */ err = snd_ctl_elem_write(ctl->card->handle, w_val); if (err < 0 && !error_expected) { - ksft_print_msg("snd_ctl_elem_write() failed: %s\n", + ksft_print_msg("snd_ctl_elem_write() failed (%s)\n", snd_strerror(err)); return err; } @@ -615,7 +615,7 @@ static int write_and_verify(struct ctl_data *ctl, err = snd_ctl_elem_read(ctl->card->handle, read_val); if (err < 0) { - ksft_print_msg("snd_ctl_elem_read() failed: %s\n", + ksft_print_msg("snd_ctl_elem_read() failed (%s)\n", snd_strerror(err)); return err; } @@ -631,13 +631,13 @@ static int write_and_verify(struct ctl_data *ctl, 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", + ksft_print_msg("%s : No event generated\n", ctl->name); ctl->event_missing++; } } else { if (err != 0) { - ksft_print_msg("Spurious event generated for %s\n", + ksft_print_msg("%s : Spurious event generated\n", ctl->name); ctl->event_spurious++; } @@ -658,7 +658,7 @@ static int write_and_verify(struct ctl_data *ctl, mismatch_shown = true; if (!mismatch_shown) - ksft_print_msg("%s read and written values differ\n", + ksft_print_msg("%s : Read and written values differ\n", ctl->name); return -1; @@ -674,14 +674,14 @@ static void test_ctl_write_default(struct ctl_data *ctl) /* If the control is turned off let's be polite */ if (snd_ctl_elem_info_is_inactive(ctl->info)) { - ksft_print_msg("%s is inactive\n", ctl->name); + ksft_print_msg("%s : Inactive\n", ctl->name); ksft_test_result_skip("write_default.%d.%d\n", ctl->card->card, ctl->elem); return; } if (!snd_ctl_elem_info_is_writable(ctl->info)) { - ksft_print_msg("%s is not writeable\n", ctl->name); + ksft_print_msg("%s : Not writeable\n", ctl->name); ksft_test_result_skip("write_default.%d.%d\n", ctl->card->card, ctl->elem); return; @@ -689,7 +689,7 @@ static void test_ctl_write_default(struct ctl_data *ctl) /* No idea what the default was for unreadable controls */ if (!snd_ctl_elem_info_is_readable(ctl->info)) { - ksft_print_msg("%s couldn't read default\n", ctl->name); + ksft_print_msg("%s : Couldn't read default\n", ctl->name); ksft_test_result_skip("write_default.%d.%d\n", ctl->card->card, ctl->elem); return; @@ -808,14 +808,14 @@ static void test_ctl_write_valid(struct ctl_data *ctl) /* If the control is turned off let's be polite */ if (snd_ctl_elem_info_is_inactive(ctl->info)) { - ksft_print_msg("%s is inactive\n", ctl->name); + ksft_print_msg("%s : Inactive\n", ctl->name); ksft_test_result_skip("write_valid.%d.%d\n", ctl->card->card, ctl->elem); return; } if (!snd_ctl_elem_info_is_writable(ctl->info)) { - ksft_print_msg("%s is not writeable\n", ctl->name); + ksft_print_msg("%s : Not writeable\n", ctl->name); ksft_test_result_skip("write_valid.%d.%d\n", ctl->card->card, ctl->elem); return; @@ -868,7 +868,7 @@ static bool test_ctl_write_invalid_value(struct ctl_data *ctl, /* ...but some devices will clamp to an in range value */ err = snd_ctl_elem_read(ctl->card->handle, val); if (err < 0) { - ksft_print_msg("%s failed to read: %s\n", + ksft_print_msg("%s : Failed to read (%s)\n", ctl->name, snd_strerror(err)); return true; } @@ -1026,14 +1026,14 @@ static void test_ctl_write_invalid(struct ctl_data *ctl) /* If the control is turned off let's be polite */ if (snd_ctl_elem_info_is_inactive(ctl->info)) { - ksft_print_msg("%s is inactive\n", ctl->name); + ksft_print_msg("%s : Inactive\n", ctl->name); ksft_test_result_skip("write_invalid.%d.%d\n", ctl->card->card, ctl->elem); return; } if (!snd_ctl_elem_info_is_writable(ctl->info)) { - ksft_print_msg("%s is not writeable\n", ctl->name); + ksft_print_msg("%s : Not writeable\n", ctl->name); ksft_test_result_skip("write_invalid.%d.%d\n", ctl->card->card, ctl->elem); return; -- 2.35.1

3 years, 1 month

3
4
0 0

[PATCH v2] kselftest/arm64: Explicitly build no BTI tests with BTI disabled

by Mark Brown

In case a distribution enables branch protection by default do as we do for the main kernel and explicitly disable branch protection when building the test case for having BTI disabled to ensure it doesn't get turned on by the toolchain defaults. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- v2: - Rebase on -next tools/testing/selftests/arm64/bti/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile index 73e013c082a6..25c66e622b86 100644 --- a/tools/testing/selftests/arm64/bti/Makefile +++ b/tools/testing/selftests/arm64/bti/Makefile @@ -10,7 +10,7 @@ PROGS := $(patsubst %,gen/%,$(TEST_GEN_PROGS)) # cases for statically linked and dynamically lined binaries are # slightly different. -CFLAGS_NOBTI = -DBTI=0 +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 CFLAGS_COMMON = -ffreestanding -Wall -Wextra $(CFLAGS) -- 2.30.2

3 years, 1 month

2
1
0 0

[PATCH] kselftest/arm64: bti: force static linking

by Andre Przywara

The "bti" selftests are built with -nostdlib, which apparently automatically creates a statically linked binary, which is what we want and need for BTI (to avoid interactions with the dynamic linker). However this is not true when building a PIE binary, which some toolchains (Ubuntu) configure as the default. When compiling btitest with such a toolchain, it will create a dynamically linked binary, which will probably fail some tests, as the dynamic linker might not support BTI: =================== TAP version 13 1..18 not ok 1 nohint_func/call_using_br_x0 not ok 2 nohint_func/call_using_br_x16 not ok 3 nohint_func/call_using_blr .... =================== To make sure we create static binaries, add an explicit -static on the linker command line. This forces static linking even if the toolchain defaults to PIE builds, and fixes btitest runs on BTI enabled machines. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- tools/testing/selftests/arm64/bti/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile index 73e013c082a65..dafa1c2aa5c47 100644 --- a/tools/testing/selftests/arm64/bti/Makefile +++ b/tools/testing/selftests/arm64/bti/Makefile @@ -39,7 +39,7 @@ BTI_OBJS = \ teststubs-bti.o \ trampoline-bti.o gen/btitest: $(BTI_OBJS) - $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -o $@ $^ + $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^ NOBTI_OBJS = \ test-nobti.o \ @@ -50,7 +50,7 @@ NOBTI_OBJS = \ teststubs-nobti.o \ trampoline-nobti.o gen/nobtitest: $(NOBTI_OBJS) - $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -o $@ $^ + $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^ # Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list # to account for any OUTPUT target-dirs optionally provided by -- 2.25.1

3 years, 1 month

3
5
0 0

[PATCH bpf 4/4] bpf_trace: pass array of u64 values in kprobe_multi.addrs

by Eugene Syromiatnikov

With the interface as defined, it is impossible to pass 64-bit kernel addresses from a 32-bit userspace process in BPF_LINK_TYPE_KPROBE_MULTI, which severly limits the useability of the interface, change the ABI to accept an array of u64 values instead of (kernel? user?) longs. Interestingly, the rest of the libbpf infrastructure uses 64-bit values for kallsyms addresses already, so this patch also eliminates the sym_addr cast in tools/lib/bpf/libbpf.c:resolve_kprobe_multi_cb(). Fixes: 0dcac272540613d4 ("bpf: Add multi kprobe link") Fixes: 5117c26e877352bc ("libbpf: Add bpf_link_create support for multi kprobes") Fixes: ddc6b04989eb0993 ("libbpf: Add bpf_program__attach_kprobe_multi_opts function") Fixes: f7a11eeccb111854 ("selftests/bpf: Add kprobe_multi attach test") Fixes: 9271a0c7ae7a9147 ("selftests/bpf: Add attach test for bpf_program__attach_kprobe_multi_opts") Fixes: 2c6401c966ae1fbe ("selftests/bpf: Add kprobe_multi bpf_cookie test") Signed-off-by: Eugene Syromiatnikov <esyr(a)redhat.com> --- kernel/trace/bpf_trace.c | 25 ++++++++++++++++++---- tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 8 +++---- tools/lib/bpf/libbpf.h | 2 +- .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- .../selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 5b0cf54..86a5544 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2414,7 +2414,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr void __user *ucookies; unsigned long *addrs; u32 flags, cnt, size, cookies_size; - void __user *uaddrs; + u64 __user *uaddrs; u64 *cookies = NULL; void __user *usyms; int err; @@ -2447,9 +2447,26 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr return -ENOMEM; if (uaddrs) { - if (copy_from_user(addrs, uaddrs, size)) { - err = -EFAULT; - goto error; + if (sizeof(*addrs) == sizeof(*uaddrs)) { + if (copy_from_user(addrs, uaddrs, size)) { + err = -EFAULT; + goto error; + } + } else { + u32 i; + u64 addr; + + for (i = 0; i < cnt; i++) { + if (get_user(addr, uaddrs + i)) { + err = -EFAULT; + goto error; + } + if (addr > ULONG_MAX) { + err = -EINVAL; + goto error; + } + addrs[i] = addr; + } } } else { err = kprobe_multi_resolve_syms(usyms, cnt, addrs); diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index f4b4afb..f677602 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -417,7 +417,7 @@ struct bpf_link_create_opts { __u32 flags; __u32 cnt; const char **syms; - const unsigned long *addrs; + const __u64 *addrs; const __u64 *cookies; } kprobe_multi; }; diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 809fe20..03a14a6 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -10279,7 +10279,7 @@ static bool glob_match(const char *str, const char *pat) struct kprobe_multi_resolve { const char *pattern; - unsigned long *addrs; + __u64 *addrs; size_t cap; size_t cnt; }; @@ -10294,12 +10294,12 @@ resolve_kprobe_multi_cb(unsigned long long sym_addr, char sym_type, if (!glob_match(sym_name, res->pattern)) return 0; - err = libbpf_ensure_mem((void **) &res->addrs, &res->cap, sizeof(unsigned long), + err = libbpf_ensure_mem((void **) &res->addrs, &res->cap, sizeof(__u64), res->cnt + 1); if (err) return err; - res->addrs[res->cnt++] = (unsigned long) sym_addr; + res->addrs[res->cnt++] = sym_addr; return 0; } @@ -10314,7 +10314,7 @@ bpf_program__attach_kprobe_multi_opts(const struct bpf_program *prog, }; struct bpf_link *link = NULL; char errmsg[STRERR_BUFSIZE]; - const unsigned long *addrs; + const __u64 *addrs; int err, link_fd, prog_fd; const __u64 *cookies; const char **syms; diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 05dde85..ec1cb61 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -431,7 +431,7 @@ struct bpf_kprobe_multi_opts { /* array of function symbols to attach */ const char **syms; /* array of function addresses to attach */ - const unsigned long *addrs; + const __u64 *addrs; /* array of user-provided values fetchable through bpf_get_attach_cookie */ const __u64 *cookies; /* number of elements in syms/addrs/cookies arrays */ diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c index 923a613..5aa482a 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c @@ -137,7 +137,7 @@ static void kprobe_multi_link_api_subtest(void) cookies[6] = 7; cookies[7] = 8; - opts.kprobe_multi.addrs = (const unsigned long *) &addrs; + opts.kprobe_multi.addrs = (const __u64 *) &addrs; opts.kprobe_multi.cnt = ARRAY_SIZE(addrs); opts.kprobe_multi.cookies = (const __u64 *) &cookies; prog_fd = bpf_program__fd(skel->progs.test_kprobe); diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index b9876b5..b58e2b0 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -105,7 +105,7 @@ static void test_link_api_addrs(void) GET_ADDR("bpf_fentry_test7", addrs[6]); GET_ADDR("bpf_fentry_test8", addrs[7]); - opts.kprobe_multi.addrs = (const unsigned long*) addrs; + opts.kprobe_multi.addrs = (const __u64 *) addrs; opts.kprobe_multi.cnt = ARRAY_SIZE(addrs); test_link_api(&opts); } -- 2.1.4

3 years, 1 month

1
0
0 0

[PATCH bpf 3/4] bpf_trace: handle compat in kprobe_multi_resolve_syms

by Eugene Syromiatnikov

For compat processes, userspace pointer size is different. Since the copied array is iterated anyway, the simplest fix seems to be copy the user-supplied array as-is and the iterate as an array of native or compat pointers, depending on the in_compat_syscall() value. Fixes: 0dcac272540613d4 ("bpf: Add multi kprobe link") Signed-off-by: Eugene Syromiatnikov <esyr(a)redhat.com> --- kernel/trace/bpf_trace.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d228440..5b0cf54 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2352,16 +2352,21 @@ static int kprobe_multi_resolve_syms(const void __user *usyms, u32 cnt, unsigned long *addrs) { - unsigned long addr, size; + unsigned long addr; + size_t sym_size; + u32 size, elem_size; const char __user **syms; + compat_uptr_t __user *compat_syms; int err = -ENOMEM; unsigned int i; char *func; - if (check_mul_overflow(cnt, sizeof(*syms), &size)) + elem_size = in_compat_syscall() ? sizeof(*compat_syms) : sizeof(*syms); + if (check_mul_overflow(cnt, elem_size, &size)) return -EOVERFLOW; - size = cnt * sizeof(*syms); + size = cnt * elem_size; syms = kvzalloc(size, GFP_KERNEL); + compat_syms = (void *)syms; if (!syms) return -ENOMEM; @@ -2375,7 +2380,10 @@ kprobe_multi_resolve_syms(const void __user *usyms, u32 cnt, } for (i = 0; i < cnt; i++) { - err = strncpy_from_user(func, syms[i], KSYM_NAME_LEN); + const char __user *ufunc = in_compat_syscall() + ? (char __user *)(uintptr_t)compat_syms[i] + : syms[i]; + err = strncpy_from_user(func, ufunc, KSYM_NAME_LEN); if (err == KSYM_NAME_LEN) err = -E2BIG; if (err < 0) @@ -2384,9 +2392,9 @@ kprobe_multi_resolve_syms(const void __user *usyms, u32 cnt, addr = kallsyms_lookup_name(func); if (!addr) goto error; - if (!kallsyms_lookup_size_offset(addr, &size, NULL)) + if (!kallsyms_lookup_size_offset(addr, &sym_size, NULL)) goto error; - addr = ftrace_location_range(addr, addr + size - 1); + addr = ftrace_location_range(addr, addr + sym_size - 1); if (!addr) goto error; addrs[i] = addr; -- 2.1.4

3 years, 1 month

1
0
0 0

[PATCH bpf 2/4] bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attach

by Eugene Syromiatnikov

It seems that there is no reason not to support 32-bit architectures; doing so requires a bit of rework with respect to cookies handling, however, as the current code implicitly assumes that sizeof(long) == sizeof(u64). Signed-off-by: Eugene Syromiatnikov <esyr(a)redhat.com> --- kernel/trace/bpf_trace.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index e90c4ce7..d228440 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2405,16 +2405,12 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr struct bpf_link_primer link_primer; void __user *ucookies; unsigned long *addrs; - u32 flags, cnt, size; + u32 flags, cnt, size, cookies_size; void __user *uaddrs; u64 *cookies = NULL; void __user *usyms; int err; - /* no support for 32bit archs yet */ - if (sizeof(u64) != sizeof(void *)) - return -EOPNOTSUPP; - if (prog->expected_attach_type != BPF_TRACE_KPROBE_MULTI) return -EINVAL; @@ -2424,6 +2420,7 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr uaddrs = u64_to_user_ptr(attr->link_create.kprobe_multi.addrs); usyms = u64_to_user_ptr(attr->link_create.kprobe_multi.syms); + ucookies = u64_to_user_ptr(attr->link_create.kprobe_multi.cookies); if (!!uaddrs == !!usyms) return -EINVAL; @@ -2431,8 +2428,11 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr if (!cnt) return -EINVAL; - if (check_mul_overflow(cnt, (u32)sizeof(*addrs), &size)) + if (check_mul_overflow(cnt, (u32)sizeof(*addrs), &size) || + (ucookies && + check_mul_overflow(cnt, (u32)sizeof(*cookies), &cookies_size))) { return -EOVERFLOW; + } size = cnt * sizeof(*addrs); addrs = kvmalloc(size, GFP_KERNEL); if (!addrs) @@ -2449,14 +2449,14 @@ int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *pr goto error; } - ucookies = u64_to_user_ptr(attr->link_create.kprobe_multi.cookies); if (ucookies) { - cookies = kvmalloc(size, GFP_KERNEL); + cookies_size = cnt * sizeof(*cookies); + cookies = kvmalloc(cookies_size, GFP_KERNEL); if (!cookies) { err = -ENOMEM; goto error; } - if (copy_from_user(cookies, ucookies, size)) { + if (copy_from_user(cookies, ucookies, cookies_size)) { err = -EFAULT; goto error; } -- 2.1.4

3 years, 1 month

1
0
0 0

[PATCH bpf 0/4] Fix 32-bit arch and compat support for the kprobe_multi attach type

by Eugene Syromiatnikov

As suggested in [1], the kprobe_multi interface is to be fixed for 32-bit architectures and compat, rather then disabled. As it turned out, there are a couple of additional problems that are to be addressed: - the absence of size overflow checks, leading to possible out-of-bounds writes (addressed by the first patch); - the assumption that long has the same size as u64, which would make cookies arrays size calculation incorrect on 32-bit architectures (addressed by the second patch); - the addrs array passing API, that is incompatible with compat and has to be changed (addressed in the fourth patch): those are kernel addresses and not user ones (as was incorrectly stated in [2]); this change is only semantical for 64-bit user/kernelspace, so it shouldn't impact ABI there, at least. [1] https://lore.kernel.org/lkml/CAADnVQ+2gwhcMht4PuDnDOFKY68Wsq8QFz4Y69NBX_TLa… [2] https://lore.kernel.org/lkml/20220510184155.GA8295@asgard.redhat.com/ Eugene Syromiatnikov (4): bpf_trace: check size for overflow in bpf_kprobe_multi_link_attach bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attach bpf_trace: handle compat in kprobe_multi_resolve_syms bpf_trace: pass array of u64 values in kprobe_multi.addrs kernel/trace/bpf_trace.c | 63 ++++++++++++++++------ tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 8 +-- tools/lib/bpf/libbpf.h | 2 +- .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- .../selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +- 6 files changed, 54 insertions(+), 25 deletions(-) -- 2.1.4

3 years, 1 month

1
0
0 0

[PATCH bpf 0/4] Fix 32-bit arch and compat support for the kprobe_multi attach type

by Eugene Syromiatnikov

As suggested in [1], the kprobe_multi interface is to be fixed for 32-bit architectures and compat, rather then disabled. As it turned out, there are a couple of additional problems that are to be addressed: - the absence of size overflow checks, leading to possible out-of-bounds writes (addressed by the first patch); - the assumption that long has the same size as u64, which would make cookies arrays size calculation incorrect on 32-bit architectures (addressed by the second patch); - the addrs array passing API, that is incompatible with compat and has to be changed (addressed in the fourth patch): those are kernel addresses and not user ones (as was incorrectly stated in [2]); this change is only semantical for 64-bit user/kernelspace, so it shouldn't impact ABI there, at least. [1] https://lore.kernel.org/lkml/CAADnVQ+2gwhcMht4PuDnDOFKY68Wsq8QFz4Y69NBX_TLa… [2] https://lore.kernel.org/lkml/20220510184155.GA8295@asgard.redhat.com/ Eugene Syromiatnikov (4): bpf_trace: check size for overflow in bpf_kprobe_multi_link_attach bpf_trace: support 32-bit kernels in bpf_kprobe_multi_link_attach bpf_trace: handle compat in kprobe_multi_resolve_syms bpf_trace: pass array of u64 values in kprobe_multi.addrs kernel/trace/bpf_trace.c | 63 ++++++++++++++++------ tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/libbpf.c | 8 +-- tools/lib/bpf/libbpf.h | 2 +- .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- .../selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +- 6 files changed, 54 insertions(+), 25 deletions(-) -- 2.1.4

3 years, 1 month

1
0
0 0

[PATCH] kselftest/arm64: Explicitly build no BTI tests with BTI disabled

by Mark Brown

In case a distribution enables branch protection by default do as we do for the main kernel and explicitly disable branch protection when building the test case for having BTI disabled to ensure it doesn't get turned on by the toolchain defaults. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/arm64/bti/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile index 10a12c5e05e6..a3e59d7910b3 100644 --- a/tools/testing/selftests/arm64/bti/Makefile +++ b/tools/testing/selftests/arm64/bti/Makefile @@ -14,7 +14,7 @@ CFLAGS += -I../../../../../usr/include/ CFLAGS_STATIC = -ffreestanding -CFLAGS_NOBTI = -DBTI=0 +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 CFLAGS_COMMON = -Wall -Wextra $(CFLAGS) -- 2.30.2

3 years, 1 month

2
2
0 0

[PATCH] kselftest: alsa: handle cross compilation

by Antonio Terceiro

Calling just `pkg-config` is adequate for native builds, but finding the foreign libraries with pkg-config needs pkg-config to be called via its architecture-specific wrapper. This works in Debian, where there is a corresponding *-pkg-config wrapper script for each enabled foreign architecture, just like there are *-gcc, *-ld. Signed-off-by: Antonio Terceiro <antonio.terceiro(a)linaro.org> --- tools/testing/selftests/alsa/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/alsa/Makefile b/tools/testing/selftests/alsa/Makefile index f64d9090426d..f5675b3c929d 100644 --- a/tools/testing/selftests/alsa/Makefile +++ b/tools/testing/selftests/alsa/Makefile @@ -1,8 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # -CFLAGS += $(shell pkg-config --cflags alsa) -LDLIBS += $(shell pkg-config --libs alsa) +PKG_CONFIG ?= $(CROSS_COMPILE)pkg-config + +CFLAGS += $(shell $(PKG_CONFIG) --cflags alsa) +LDLIBS += $(shell $(PKG_CONFIG) --libs alsa) TEST_GEN_PROGS := mixer-test -- 2.35.1

3 years, 1 month

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror