From nobody Fri Oct 3 07:42:47 2025 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC08B1DC9B3; Thu, 4 Sep 2025 02:10:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951829; cv=none; b=FkaYJcGGTd0aEBXBO00FJKGb+1cny/meW9C7XhhIPLALc2DeQKKZ0gutVV1NYuvniNv7zWdYSd3moAVd3EaeiZgUhSdPSotwBhXhKODYo/AnIVSQJUG9MGZlDIK05biDMgZVcCTdb7NUKTbGhPs3BsE6qrqQv7iKANK5UwWk3d4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951829; c=relaxed/simple; bh=pAODhT+ecJC9cibKZmRv6cU8nfIomZaYnIh6M4jNvQk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p5AGcAuC5/8CWmFHS+IJMT9M6lmdMBcMBJF83by8/iH584T52/3r+FvN9kPwlPNgB6PpZuMQ2feFRKV5pXdnnMemeyvRjcEhDRBMJWA8N/mi5+TxEwpomDErjV/p0jecMmNYy/8WuCnFX+Klp8e8I8/68lVFl2D0HTjEdpMjxNQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Tg1Iy90o; arc=none smtp.client-ip=209.85.216.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Tg1Iy90o" Received: by mail-pj1-f65.google.com with SMTP id 98e67ed59e1d1-32b8919e7c7so579809a91.2; Wed, 03 Sep 2025 19:10:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756951827; x=1757556627; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hOykknP1D54GaW0E6s7VCBa0oHwJ3M5XoPoV84Se0Gc=; b=Tg1Iy90oBqDQEeV0olgmNgd3Q+lOtRBeBYiKLdsDqs3eAyfIYaLwS2AE8RUsx4B3wB BGWZxc+MM51IYn3jVTIeLg0sCVNz1W17RF3u0GZkh1YzvSchCU7YATdHc8klg0EgRHcs Jsd/Ga7gbXn8cRc0LruxLIDBguq8fiDhE7ZncRAd90iq01HxLOSjz/5O+QkxkHM1JBbF WL+jQmGCDXA/hAqWEXn5o0jJeAZxrsqu641yhO3hy/NtV7WEj5BtdawVOFGo5kWoGZjd fE88X786eg5yz+nrU7KHJuzgQalgzv7FNZoyvHOS868u3jZ7TS5SajN5zmRFlP14Sb59 Wr5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756951827; x=1757556627; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hOykknP1D54GaW0E6s7VCBa0oHwJ3M5XoPoV84Se0Gc=; b=EWNUQDLVDCgTwre6dd98QscQNP1Xf14oCogTpJRga716Z0MaH3c07/AubGhyHh4tcn Z5xeSinXXgMvJY5VPBxEtW6MC427rN9x/G3yfDyODNVaTu+TPHfLhFJt5k00loBJGyRy Ocf26jkGJdPVhzaHngFdQFNlgUtJAoUIG90sCZ2bnVFTDbdAycuQ68EtQmLBIAgSsSnR NrCVPhWW5P3Aojx5iQJNt9ntdIopiq8t+TatEwDHE2D6XJO8YRU+Ew/L89oLeefORZXp X2BatuVbAJAe8XAR4j8fLTgywjwFE/jSzsH95XHHWo/6YmiA6BrgKttOm8hx+E6e0dPh fyMw== X-Forwarded-Encrypted: i=1; AJvYcCUACQKxBi5vT/b2hMbTtLp0PpVtjOR2EtvyY5k33LqADTRlMl0kXJe5quueS4OJlawcwJU=@vger.kernel.org, AJvYcCX6Z8d+rhR6n7k6HEmQ0JHdo3FjgZajc+xX7AunOwU8qHylS2kj3NbhHSdvJaoT57cvHLpSciVzRHaL9jc8QF7q@vger.kernel.org, AJvYcCXJSP0xe/XtgHp34+lTxDr0UOpbdgYu1B2TSja+/DcPe3WQBojBFdbHdMQdhEm1wZNWl+Tf802NRgq1/tG1@vger.kernel.org X-Gm-Message-State: AOJu0YxgHVVKEHl5EKg60NKSZDjtIS99mik6W4XGytUVrs0nELX9LgLi LDQaRyaaodl1JSXFN0T7kGt9/xh8RSMBCSKRzi6lNQll4UT/2/M9CdTk X-Gm-Gg: ASbGncsoFvM5x9GtLInY/PZZFzbLFAgnuOw/j0WFsbLPMNUy5XToKyHtwpXwDfa+Mlq IASMsR/cpgdvcNJ+M2kz81YgiNuOf2mGPimHFrAUST/SeUZ+ENbPxtV6S5CtxnR1++MWUf2MPeF sB5PdKLZvlOi83xdFaVvzlDaMY8StCFTDqqtP/MOssYMEpmsiZDbB1f0bG02IFzsZiwExlfEdfY wymFeq7I4XUO3bdPQZwM6DlI8wYZXn/jyqRdWHA48cqwGup955YFQLsBMycEME0s8jHDyud9kSd P919Pjol/WpvjbIqhsTn2DRM8iyQ+fkEq/yJPEk3S8ii9StFaWNzwBBe/hzBiVco7A9i2MF9S87 7hWysd+zzex2vE9uvEBZOt2GIbFwdUaGr3w== X-Google-Smtp-Source: AGHT+IHRwae27gUkEvOvxN2/yIb4/zL498F4KnHSNIKpE5gAsKH7y93ACRjPwlEPzVunzfquCruBRg== X-Received: by 2002:a17:90b:384d:b0:327:50b2:8007 with SMTP id 98e67ed59e1d1-328156f75f6mr21540280a91.32.1756951826660; Wed, 03 Sep 2025 19:10:26 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7727822817asm5143014b3a.98.2025.09.03.19.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 19:10:26 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: andrii@kernel.org, olsajiri@gmail.com Cc: eddyz87@gmail.com, mykolal@fb.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, yikai.lin@vivo.com, memxor@gmail.com, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND bpf-next v3 1/3] selftests/bpf: move get_ksyms and get_addrs to trace_helpers.c Date: Thu, 4 Sep 2025 10:10:09 +0800 Message-ID: <20250904021011.14069-2-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904021011.14069-1-dongml2@chinatelecom.cn> References: <20250904021011.14069-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We need to get all the kernel function that can be traced sometimes, so we move the get_syms() and get_addrs() in kprobe_multi_test.c to trace_helpers.c and rename it to bpf_get_ksyms() and bpf_get_addrs(). Signed-off-by: Menglong Dong --- .../bpf/prog_tests/kprobe_multi_test.c | 220 +----------------- tools/testing/selftests/bpf/trace_helpers.c | 214 +++++++++++++++++ tools/testing/selftests/bpf/trace_helpers.h | 3 + 3 files changed, 220 insertions(+), 217 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index f377bea0b82d..171706e78da8 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -422,220 +422,6 @@ static void test_unique_match(void) kprobe_multi__destroy(skel); } =20 -static size_t symbol_hash(long key, void *ctx __maybe_unused) -{ - return str_hash((const char *) key); -} - -static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused) -{ - return strcmp((const char *) key1, (const char *) key2) =3D=3D 0; -} - -static bool is_invalid_entry(char *buf, bool kernel) -{ - if (kernel && strchr(buf, '[')) - return true; - if (!kernel && !strchr(buf, '[')) - return true; - return false; -} - -static bool skip_entry(char *name) -{ - /* - * We attach to almost all kernel functions and some of them - * will cause 'suspicious RCU usage' when fprobe is attached - * to them. Filter out the current culprits - arch_cpu_idle - * default_idle and rcu_* functions. - */ - if (!strcmp(name, "arch_cpu_idle")) - return true; - if (!strcmp(name, "default_idle")) - return true; - if (!strncmp(name, "rcu_", 4)) - return true; - if (!strcmp(name, "bpf_dispatcher_xdp_func")) - return true; - if (!strncmp(name, "__ftrace_invalid_address__", - sizeof("__ftrace_invalid_address__") - 1)) - return true; - return false; -} - -/* Do comparison by ignoring '.llvm.' suffixes. */ -static int compare_name(const char *name1, const char *name2) -{ - const char *res1, *res2; - int len1, len2; - - res1 =3D strstr(name1, ".llvm."); - res2 =3D strstr(name2, ".llvm."); - len1 =3D res1 ? res1 - name1 : strlen(name1); - len2 =3D res2 ? res2 - name2 : strlen(name2); - - if (len1 =3D=3D len2) - return strncmp(name1, name2, len1); - if (len1 < len2) - return strncmp(name1, name2, len1) <=3D 0 ? -1 : 1; - return strncmp(name1, name2, len2) >=3D 0 ? 1 : -1; -} - -static int load_kallsyms_compare(const void *p1, const void *p2) -{ - return compare_name(((const struct ksym *)p1)->name, ((const struct ksym = *)p2)->name); -} - -static int search_kallsyms_compare(const void *p1, const struct ksym *p2) -{ - return compare_name(p1, p2->name); -} - -static int get_syms(char ***symsp, size_t *cntp, bool kernel) -{ - size_t cap =3D 0, cnt =3D 0; - char *name =3D NULL, *ksym_name, **syms =3D NULL; - struct hashmap *map; - struct ksyms *ksyms; - struct ksym *ks; - char buf[256]; - FILE *f; - int err =3D 0; - - ksyms =3D load_kallsyms_custom_local(load_kallsyms_compare); - if (!ASSERT_OK_PTR(ksyms, "load_kallsyms_custom_local")) - return -EINVAL; - - /* - * The available_filter_functions contains many duplicates, - * but other than that all symbols are usable in kprobe multi - * interface. - * Filtering out duplicates by using hashmap__add, which won't - * add existing entry. - */ - - if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) - f =3D fopen("/sys/kernel/tracing/available_filter_functions", "r"); - else - f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); - - if (!f) - return -EINVAL; - - map =3D hashmap__new(symbol_hash, symbol_equal, NULL); - if (IS_ERR(map)) { - err =3D libbpf_get_error(map); - goto error; - } - - while (fgets(buf, sizeof(buf), f)) { - if (is_invalid_entry(buf, kernel)) - continue; - - free(name); - if (sscanf(buf, "%ms$*[^\n]\n", &name) !=3D 1) - continue; - if (skip_entry(name)) - continue; - - ks =3D search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare= ); - if (!ks) { - err =3D -EINVAL; - goto error; - } - - ksym_name =3D ks->name; - err =3D hashmap__add(map, ksym_name, 0); - if (err =3D=3D -EEXIST) { - err =3D 0; - continue; - } - if (err) - goto error; - - err =3D libbpf_ensure_mem((void **) &syms, &cap, - sizeof(*syms), cnt + 1); - if (err) - goto error; - - syms[cnt++] =3D ksym_name; - } - - *symsp =3D syms; - *cntp =3D cnt; - -error: - free(name); - fclose(f); - hashmap__free(map); - if (err) - free(syms); - return err; -} - -static int get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel) -{ - unsigned long *addr, *addrs, *tmp_addrs; - int err =3D 0, max_cnt, inc_cnt; - char *name =3D NULL; - size_t cnt =3D 0; - char buf[256]; - FILE *f; - - if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) - f =3D fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r"); - else - f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs"= , "r"); - - if (!f) - return -ENOENT; - - /* In my local setup, the number of entries is 50k+ so Let us initially - * allocate space to hold 64k entries. If 64k is not enough, incrementally - * increase 1k each time. - */ - max_cnt =3D 65536; - inc_cnt =3D 1024; - addrs =3D malloc(max_cnt * sizeof(long)); - if (addrs =3D=3D NULL) { - err =3D -ENOMEM; - goto error; - } - - while (fgets(buf, sizeof(buf), f)) { - if (is_invalid_entry(buf, kernel)) - continue; - - free(name); - if (sscanf(buf, "%p %ms$*[^\n]\n", &addr, &name) !=3D 2) - continue; - if (skip_entry(name)) - continue; - - if (cnt =3D=3D max_cnt) { - max_cnt +=3D inc_cnt; - tmp_addrs =3D realloc(addrs, max_cnt); - if (!tmp_addrs) { - err =3D -ENOMEM; - goto error; - } - addrs =3D tmp_addrs; - } - - addrs[cnt++] =3D (unsigned long)addr; - } - - *addrsp =3D addrs; - *cntp =3D cnt; - -error: - free(name); - fclose(f); - if (err) - free(addrs); - return err; -} - static void do_bench_test(struct kprobe_multi_empty *skel, struct bpf_kpro= be_multi_opts *opts) { long attach_start_ns, attach_end_ns; @@ -670,7 +456,7 @@ static void test_kprobe_multi_bench_attach(bool kernel) char **syms =3D NULL; size_t cnt =3D 0; =20 - if (!ASSERT_OK(get_syms(&syms, &cnt, kernel), "get_syms")) + if (!ASSERT_OK(bpf_get_ksyms(&syms, &cnt, kernel), "bpf_get_ksyms")) return; =20 skel =3D kprobe_multi_empty__open_and_load(); @@ -696,13 +482,13 @@ static void test_kprobe_multi_bench_attach_addr(bool = kernel) size_t cnt =3D 0; int err; =20 - err =3D get_addrs(&addrs, &cnt, kernel); + err =3D bpf_get_addrs(&addrs, &cnt, kernel); if (err =3D=3D -ENOENT) { test__skip(); return; } =20 - if (!ASSERT_OK(err, "get_addrs")) + if (!ASSERT_OK(err, "bpf_get_addrs")) return; =20 skel =3D kprobe_multi_empty__open_and_load(); diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index 81943c6254e6..d24baf244d1f 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -17,6 +17,7 @@ #include #include #include +#include "bpf/hashmap.h" #include "bpf/libbpf_internal.h" =20 #define TRACEFS_PIPE "/sys/kernel/tracing/trace_pipe" @@ -519,3 +520,216 @@ void read_trace_pipe(void) { read_trace_pipe_iter(trace_pipe_cb, NULL, 0); } + +static size_t symbol_hash(long key, void *ctx __maybe_unused) +{ + return str_hash((const char *) key); +} + +static bool symbol_equal(long key1, long key2, void *ctx __maybe_unused) +{ + return strcmp((const char *) key1, (const char *) key2) =3D=3D 0; +} + +static bool is_invalid_entry(char *buf, bool kernel) +{ + if (kernel && strchr(buf, '[')) + return true; + if (!kernel && !strchr(buf, '[')) + return true; + return false; +} + +static bool skip_entry(char *name) +{ + /* + * We attach to almost all kernel functions and some of them + * will cause 'suspicious RCU usage' when fprobe is attached + * to them. Filter out the current culprits - arch_cpu_idle + * default_idle and rcu_* functions. + */ + if (!strcmp(name, "arch_cpu_idle")) + return true; + if (!strcmp(name, "default_idle")) + return true; + if (!strncmp(name, "rcu_", 4)) + return true; + if (!strcmp(name, "bpf_dispatcher_xdp_func")) + return true; + if (!strncmp(name, "__ftrace_invalid_address__", + sizeof("__ftrace_invalid_address__") - 1)) + return true; + return false; +} + +/* Do comparison by ignoring '.llvm.' suffixes. */ +static int compare_name(const char *name1, const char *name2) +{ + const char *res1, *res2; + int len1, len2; + + res1 =3D strstr(name1, ".llvm."); + res2 =3D strstr(name2, ".llvm."); + len1 =3D res1 ? res1 - name1 : strlen(name1); + len2 =3D res2 ? res2 - name2 : strlen(name2); + + if (len1 =3D=3D len2) + return strncmp(name1, name2, len1); + if (len1 < len2) + return strncmp(name1, name2, len1) <=3D 0 ? -1 : 1; + return strncmp(name1, name2, len2) >=3D 0 ? 1 : -1; +} + +static int load_kallsyms_compare(const void *p1, const void *p2) +{ + return compare_name(((const struct ksym *)p1)->name, ((const struct ksym = *)p2)->name); +} + +static int search_kallsyms_compare(const void *p1, const struct ksym *p2) +{ + return compare_name(p1, p2->name); +} + +int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel) +{ + size_t cap =3D 0, cnt =3D 0; + char *name =3D NULL, *ksym_name, **syms =3D NULL; + struct hashmap *map; + struct ksyms *ksyms; + struct ksym *ks; + char buf[256]; + FILE *f; + int err =3D 0; + + ksyms =3D load_kallsyms_custom_local(load_kallsyms_compare); + if (!ksyms) + return -EINVAL; + + /* + * The available_filter_functions contains many duplicates, + * but other than that all symbols are usable to trace. + * Filtering out duplicates by using hashmap__add, which won't + * add existing entry. + */ + + if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) + f =3D fopen("/sys/kernel/tracing/available_filter_functions", "r"); + else + f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions", "r"); + + if (!f) + return -EINVAL; + + map =3D hashmap__new(symbol_hash, symbol_equal, NULL); + if (IS_ERR(map)) { + err =3D libbpf_get_error(map); + goto error; + } + + while (fgets(buf, sizeof(buf), f)) { + if (is_invalid_entry(buf, kernel)) + continue; + + free(name); + if (sscanf(buf, "%ms$*[^\n]\n", &name) !=3D 1) + continue; + if (skip_entry(name)) + continue; + + ks =3D search_kallsyms_custom_local(ksyms, name, search_kallsyms_compare= ); + if (!ks) { + err =3D -EINVAL; + goto error; + } + + ksym_name =3D ks->name; + err =3D hashmap__add(map, ksym_name, 0); + if (err =3D=3D -EEXIST) { + err =3D 0; + continue; + } + if (err) + goto error; + + err =3D libbpf_ensure_mem((void **) &syms, &cap, + sizeof(*syms), cnt + 1); + if (err) + goto error; + + syms[cnt++] =3D ksym_name; + } + + *symsp =3D syms; + *cntp =3D cnt; + +error: + free(name); + fclose(f); + hashmap__free(map); + if (err) + free(syms); + return err; +} + +int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel) +{ + unsigned long *addr, *addrs, *tmp_addrs; + int err =3D 0, max_cnt, inc_cnt; + char *name =3D NULL; + size_t cnt =3D 0; + char buf[256]; + FILE *f; + + if (access("/sys/kernel/tracing/trace", F_OK) =3D=3D 0) + f =3D fopen("/sys/kernel/tracing/available_filter_functions_addrs", "r"); + else + f =3D fopen("/sys/kernel/debug/tracing/available_filter_functions_addrs"= , "r"); + + if (!f) + return -ENOENT; + + /* In my local setup, the number of entries is 50k+ so Let us initially + * allocate space to hold 64k entries. If 64k is not enough, incrementally + * increase 1k each time. + */ + max_cnt =3D 65536; + inc_cnt =3D 1024; + addrs =3D malloc(max_cnt * sizeof(long)); + if (addrs =3D=3D NULL) { + err =3D -ENOMEM; + goto error; + } + + while (fgets(buf, sizeof(buf), f)) { + if (is_invalid_entry(buf, kernel)) + continue; + + free(name); + if (sscanf(buf, "%p %ms$*[^\n]\n", &addr, &name) !=3D 2) + continue; + if (skip_entry(name)) + continue; + + if (cnt =3D=3D max_cnt) { + max_cnt +=3D inc_cnt; + tmp_addrs =3D realloc(addrs, max_cnt); + if (!tmp_addrs) { + err =3D -ENOMEM; + goto error; + } + addrs =3D tmp_addrs; + } + + addrs[cnt++] =3D (unsigned long)addr; + } + + *addrsp =3D addrs; + *cntp =3D cnt; + +error: + free(name); + fclose(f); + if (err) + free(addrs); + return err; +} diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/se= lftests/bpf/trace_helpers.h index 2ce873c9f9aa..9437bdd4afa5 100644 --- a/tools/testing/selftests/bpf/trace_helpers.h +++ b/tools/testing/selftests/bpf/trace_helpers.h @@ -41,4 +41,7 @@ ssize_t get_rel_offset(uintptr_t addr); =20 int read_build_id(const char *path, char *build_id, size_t size); =20 +int bpf_get_ksyms(char ***symsp, size_t *cntp, bool kernel); +int bpf_get_addrs(unsigned long **addrsp, size_t *cntp, bool kernel); + #endif --=20 2.51.0 From nobody Fri Oct 3 07:42:47 2025 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3456E1FBEB0; Thu, 4 Sep 2025 02:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951835; cv=none; b=EF8lwyj1T5vqu9tz9ziMfMT4IAj0WBdqeFGX+OFLj6ztNWzGbvORpIifEAk5E63eSsL2SXPKk2UqvJ0i0l9zqlQKgMaK4dv2ZEAOUussEXMXZDrz3bqPQFaJPkaGYzEC6wi0SspMB1ygX/ImeHotAusmDrfqLCVPCNzrrcpAMDw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951835; c=relaxed/simple; bh=i7gSkUCwk/JiIR9BgJ4ibHddNjQt0Axni5e4z5GFIIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U7mbe6zddj6ipWGs0bXFWOBOhrtxFI67o4sLA4RCfzO5gokJq7MXTjGyxjDIw7xOGT5Nj6ZDgfBb3nieO00hYAdNJaugyVWbp4wyRCpDBWCsacxjn+Ajo2ufFZv1MBvq3Mno6de660vIE4ojsZaPPaR1Dys+RcWXY8+C+9c4HPk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a+jnR7lp; arc=none smtp.client-ip=209.85.210.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a+jnR7lp" Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-772679eb358so520871b3a.1; Wed, 03 Sep 2025 19:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756951832; x=1757556632; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lC+CeEUwLUwzxr+JN3oMfmOzLQazHlM77TzgOzfoiik=; b=a+jnR7lpvJpN82Xh2MCy+GjwNpZs5MbbgWVT3nBefw9Imk0kb/Usn5soXKpcfzD4QZ LKdKCV/AfSSiSjLjuTbAJ1o34zeG6DEyyjztAYiGUuObNmQ8oNtE1lZ8htLiIBBGbYfY RCVoAXoqdZWk/BApW2OggWXtYWTs/zBD2KyzG3niLxbqUb5iKYH6eRzDs4eDqQAglgdy uWZYLpjVT+jIUvQW+zhxiSvMrDfbZi/gYQ6NpMu79mfakSBp/TXwEiL4fnfMSzcqqhw3 ejVpe+vYUo1ewz1NW/o7L+41+KPo7ngdP6JXQ/rUKgDpwDCCnfsrY2kJ/JWVLQ/ft+RQ b/gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756951832; x=1757556632; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lC+CeEUwLUwzxr+JN3oMfmOzLQazHlM77TzgOzfoiik=; b=FNWvhH5VeCW5VLEcvJ8CxpjCDyXZuhp8vwabA+27b/9uXuRfDPoKbrrUp2yJKvn2kb MUPz4Aqkd9AJ1Yuv5favjyyu7iXcgDTaZX06eg0MH4qigDnebzBedTkYpnj1T/Xo64Oy Qw3yoIUerYQsl8MQ1AfzXU1aP+axThu4l8BWz/3KQRHf0T4czKdWVOHFc0AUTHIMGVN3 UFhPo5LsJ+KQfCgt6n48Nl2KAyVC8vT5M9gBbtImOU/L/aZ6U3Go/yKkSDEbftYzDgHP 3Syubk318WAxhx+WQTImeHF0jR1Y16lc0zHFznCmjnXQr2yjrpBk0XGJA4UVC2K+b+U4 KW0g== X-Forwarded-Encrypted: i=1; AJvYcCU9T9wyF22I2PjVLUu1W6ulwzXsOltB02teQcQUu2eG0RIpNxet2L6uENVfc1L7bk8kX6U=@vger.kernel.org, AJvYcCUWV6MELlLjRQAx4qEvc8j+UsZoMg7OjmKM7rvutXTgsprDpRgC3BM252yBG3/E1SeWHsepyUsVG/AjUw6VKm2A@vger.kernel.org, AJvYcCVQD1kGCtj9CnYoxpFmkc2Ipei9lK2li1kv1On223qRKRc5eLi2y6xzIMT4wY3bnmWJegV3wkjryKr6fIz+@vger.kernel.org X-Gm-Message-State: AOJu0Yx/rP5/NzSfYajmwqMmHtagoG1fG1G6s4N/qnLXVq1eXMr9zTTZ 922m/qZCSfcEZ0CCB/dqjKy208Bx+vafHnDZreCFYS9JzSLCygZjYP4/ X-Gm-Gg: ASbGnctFRsMzWIf+uJ/39iNsOOFtoKKSqwWP+UP0AeH4/1OC6v4Fo2R3lfoUqVSSmJU 2S4c1hf1kqHa8LMMwafxyYO/iuweBNLw30j/2jxBA2ea6kOv9mskVAIfB62iRmfKiaFwNqeTh3F hwvQd19vvKCtxqJM0PPzpdWm5qFK1jBPY6EmYT38jq/U++rWc3hVh3A65wbnUlL3i/jvhlBKhQU MzA5IGv7bhR0tj//P+/uEivv4151Mk9fAgFmnav1/Qta8CKysQkPdu8gTPisHtKHkTwIGPUnkof 0Ivap6+H7wKUSGiL3p2R6dxkUeYGsOsarldle1O4si8TbVGomQ7VHMJdPeuvUm6EL/5Wso7CObY cs0DdR7toDf4zE4pwsqEBPZ8= X-Google-Smtp-Source: AGHT+IF3ScfQbgDCiAv09yjVDPwtLzoepZSQLLNcHdW+Ob8ALMBcNMdFHHoCFUYQeXhdVgf7MwXmlQ== X-Received: by 2002:a05:6a20:3c8e:b0:23f:f712:411c with SMTP id adf61e73a8af0-243d6f02f4cmr26926525637.36.1756951832353; Wed, 03 Sep 2025 19:10:32 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7727822817asm5143014b3a.98.2025.09.03.19.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 19:10:32 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: andrii@kernel.org, olsajiri@gmail.com Cc: eddyz87@gmail.com, mykolal@fb.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, yikai.lin@vivo.com, memxor@gmail.com, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND bpf-next v3 2/3] selftests/bpf: skip recursive functions for kprobe_multi Date: Thu, 4 Sep 2025 10:10:10 +0800 Message-ID: <20250904021011.14069-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904021011.14069-1-dongml2@chinatelecom.cn> References: <20250904021011.14069-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some functions is recursive for the kprobe_multi and impact the benchmark results. So just skip them. Signed-off-by: Menglong Dong --- v2: - introduce trace_blacklist instead of copy-pasting strcmp --- tools/testing/selftests/bpf/trace_helpers.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index d24baf244d1f..9577979bd84d 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -19,6 +19,7 @@ #include #include "bpf/hashmap.h" #include "bpf/libbpf_internal.h" +#include "bpf_util.h" =20 #define TRACEFS_PIPE "/sys/kernel/tracing/trace_pipe" #define DEBUGFS_PIPE "/sys/kernel/debug/tracing/trace_pipe" @@ -540,8 +541,20 @@ static bool is_invalid_entry(char *buf, bool kernel) return false; } =20 +static const char * const trace_blacklist[] =3D { + "migrate_disable", + "migrate_enable", + "rcu_read_unlock_strict", + "preempt_count_add", + "preempt_count_sub", + "__rcu_read_lock", + "__rcu_read_unlock", +}; + static bool skip_entry(char *name) { + int i; + /* * We attach to almost all kernel functions and some of them * will cause 'suspicious RCU usage' when fprobe is attached @@ -559,6 +572,12 @@ static bool skip_entry(char *name) if (!strncmp(name, "__ftrace_invalid_address__", sizeof("__ftrace_invalid_address__") - 1)) return true; + + for (i =3D 0; i < ARRAY_SIZE(trace_blacklist); i++) { + if (!strcmp(name, trace_blacklist[i])) + return true; + } + return false; } =20 --=20 2.51.0 From nobody Fri Oct 3 07:42:47 2025 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDC7324728B; Thu, 4 Sep 2025 02:10:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.68 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951840; cv=none; b=p3US38S3Hlxr8v+vJE3f+JCqZFgUeIvXhV1SHxBMTqxFz20D//c10UgAREHsmG6G6OWVuTu5PjuEibyuB/2h3YpJTaBb5Lq562NkHfBSdz85OOiWkrgwhRz27u8z8VcwRfntug7WLkl7Okg0SyQgqcq+rmFKuJG7T634QaIDc9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756951840; c=relaxed/simple; bh=JtnLU1lOlEO7kOGweXbOv45YArumQDIRPeP+yy1NpFk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TgOe5mZRrNJvzF5BNquvNgwc6myZXvQ1npHVEYroRqIix9q1w/1azhWjkms+tpJBoqNq4qBxMpOvXy+YRp5tzytjh0Yej6dx1BrpU5w0hYtNF3SnCSQA9fNAJMDoQMiEkQCiQfHgRHl6AJqcYJ8e1DFn4ornCs36SKWBQFEagpQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IXay5f9X; arc=none smtp.client-ip=209.85.216.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IXay5f9X" Received: by mail-pj1-f68.google.com with SMTP id 98e67ed59e1d1-32b8919e7c7so579940a91.2; Wed, 03 Sep 2025 19:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756951838; x=1757556638; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S3dvQ7K9NTYyh1ugFrnxU2Kn4PBNqUnkJfMhvkxOxik=; b=IXay5f9XK/J9qnhTv3Fm4zmHqyW4P3kEWyrBZeur8d2AojawypcAHftIMpkmF3SZKQ Kuj+nPxf8iw6SUsq7T9udlm6C8tstfnqwPrNKcFqwX79svEReUpyUsnhoqd9roz48hp9 UZeuV75301MUOutvc4rGUPgnlSnCxW9NOTIwqlQhxjcVrMwvN+3m4jbiyFT5WGKnNDKm SibO/q8nzt4N6z9lr7KVzFEbD24DSioJw1HlmVQ5iYarDiY4UCMfY0qrA4AQ4WW01vO6 F9N3uw7wpMV0UTlN9iQQ2Iyd1RuW6V0D8fd/acDgVGWgHpBfkBbgCuZxpyt90MWwJv4U C/9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756951838; x=1757556638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S3dvQ7K9NTYyh1ugFrnxU2Kn4PBNqUnkJfMhvkxOxik=; b=QSth7Qrh7rz7QEZm1cZVrb9jPN+WCLffonvDDjYKsbQxN3ELeANzzgzWHUZ32I4Z7O 9kX+/Kvp09M/bJdWS2GGcSmlVALrhWhcQF3eX0M1ig2fqKkwQHpCiZNGpaH4w0AflygE +iZmZfwAvA0SzuIwcShYTPKY+tjpcDWhpkc1otJkZ5a41BTwpFe7tD+pylILQN/0pX64 IdEroIRbH/zopFBAEV+1HD4ts4CmJG1MnULsqjsblGoY/R5kdNeK2OPxYvMP891Rdr+y wOiiv+HggoZpdgKdgI8OZvR4Vbf/T4QFGxhgvX7a9FH6sI4bRpiGlUMyGuVH0T1PtL09 2HCg== X-Forwarded-Encrypted: i=1; AJvYcCU9TLSETLEUfYkXS2oxQYrlg3cetGoqamI7hVsafnAeUTLNoW9NGxi9br8fdSiE2dvNTdA7BEuQhI82FFB5@vger.kernel.org, AJvYcCVLJsrNBuSbXNiE0bmUoCiZpOAE0M9P10ALkSPVqmMKerOmrSAb3O11mbjd2+BRhigQX9mzTGFJOgVo4FCQ6nQD@vger.kernel.org, AJvYcCXCKJgLUH+cAfMTDhkG01DwBOTW/quh8dJy4dGdbYXadgoC5Vms6MvxxOP1nQtdJZEhMD4=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7Hxd/0rbl8bukAmArj/qv+z6rkT2yvp3+QfjVe7EL7U9NqFck 9Q0j2k98I0Nptr4r3RuKXg2vvMmojnFAXDj49Dxqe82xCgpNkt5qOFKp X-Gm-Gg: ASbGncvGQJPGI1T1IC/XP7fkK2fFEyofvYN+brj9ejvfc1LvbR7iX4P1D1iswYn2VYf kVAw2DPounppp9x6Ejw7DDH1d9cT9yl1v/CyZKZmGJTLwVFqJgFFrj+ZZKlG/wUUYgrdClOUcQQ A1xMS+EP2lOivisR5Ak90ggAVJZhy5CBLowKwAjutXuMmgF871MfzNz15XpvfQ+BKzvFywqrc0Z WVYBtD1Y3S5k03qOuU3etZ8u/G4Rx+jUK7eFWa+FAkiNYVAMKY28g02PfB4h9e9Bw7cSEF/JjSE CXaAR0KZCHCoQHl0sFtdrRQL4Ba3uHUZTWRTVJ2uG0/yEg1/xgbZywcMoeq0YowZOS9Ep929PIi B7FvKC/8NNgNkIyRMBumhmgg= X-Google-Smtp-Source: AGHT+IHv871LldnjZ5vEAPGq0te4x2Jr9f9NB0EUSvNM4YX4zjwy7/kqLXCaYBRlZmQyPu22EPqVww== X-Received: by 2002:a17:90b:384d:b0:327:50b2:8007 with SMTP id 98e67ed59e1d1-328156f75f6mr21540854a91.32.1756951838152; Wed, 03 Sep 2025 19:10:38 -0700 (PDT) Received: from 7940hx ([43.129.244.20]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7727822817asm5143014b3a.98.2025.09.03.19.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Sep 2025 19:10:37 -0700 (PDT) From: Menglong Dong X-Google-Original-From: Menglong Dong To: andrii@kernel.org, olsajiri@gmail.com Cc: eddyz87@gmail.com, mykolal@fb.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, yikai.lin@vivo.com, memxor@gmail.com, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND bpf-next v3 3/3] selftests/bpf: add benchmark testing for kprobe-multi-all Date: Thu, 4 Sep 2025 10:10:11 +0800 Message-ID: <20250904021011.14069-4-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250904021011.14069-1-dongml2@chinatelecom.cn> References: <20250904021011.14069-1-dongml2@chinatelecom.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For now, the benchmark for kprobe-multi is single, which means there is only 1 function is hooked during testing. Add the testing "kprobe-multi-all", which will hook all the kernel functions during the benchmark. And the "kretprobe-multi-all" is added too. Signed-off-by: Menglong Dong --- v3: - add some comment to attach_ksyms_all, which note that don't run the testing on a debug kernel v2: - use fprintf() instead of printf() --- tools/testing/selftests/bpf/bench.c | 4 ++ .../selftests/bpf/benchs/bench_trigger.c | 61 +++++++++++++++++++ .../selftests/bpf/benchs/run_bench_trigger.sh | 4 +- .../selftests/bpf/progs/trigger_bench.c | 12 ++++ tools/testing/selftests/bpf/trace_helpers.c | 1 + 5 files changed, 80 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/= bpf/bench.c index df4489ac14a0..bd29bb2e6cb5 100644 --- a/tools/testing/selftests/bpf/bench.c +++ b/tools/testing/selftests/bpf/bench.c @@ -512,6 +512,8 @@ extern const struct bench bench_trig_kretprobe; extern const struct bench bench_trig_kprobe_multi; extern const struct bench bench_trig_kretprobe_multi; extern const struct bench bench_trig_fentry; +extern const struct bench bench_trig_kprobe_multi_all; +extern const struct bench bench_trig_kretprobe_multi_all; extern const struct bench bench_trig_fexit; extern const struct bench bench_trig_fmodret; extern const struct bench bench_trig_tp; @@ -587,6 +589,8 @@ static const struct bench *benchs[] =3D { &bench_trig_kprobe_multi, &bench_trig_kretprobe_multi, &bench_trig_fentry, + &bench_trig_kprobe_multi_all, + &bench_trig_kretprobe_multi_all, &bench_trig_fexit, &bench_trig_fmodret, &bench_trig_tp, diff --git a/tools/testing/selftests/bpf/benchs/bench_trigger.c b/tools/tes= ting/selftests/bpf/benchs/bench_trigger.c index 82327657846e..1e2aff007c2a 100644 --- a/tools/testing/selftests/bpf/benchs/bench_trigger.c +++ b/tools/testing/selftests/bpf/benchs/bench_trigger.c @@ -226,6 +226,65 @@ static void trigger_fentry_setup(void) attach_bpf(ctx.skel->progs.bench_trigger_fentry); } =20 +static void attach_ksyms_all(struct bpf_program *empty, bool kretprobe) +{ + LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + char **syms =3D NULL; + size_t cnt =3D 0; + + /* Some recursive functions will be skipped in + * bpf_get_ksyms -> skip_entry, as they can introduce sufficient + * overhead. However, it's difficut to skip all the recursive + * functions for a debug kernel. + * + * So, don't run the kprobe-multi-all and kretprobe-multi-all on + * a debug kernel. + */ + if (bpf_get_ksyms(&syms, &cnt, true)) { + fprintf(stderr, "failed to get ksyms\n"); + exit(1); + } + + opts.syms =3D (const char **) syms; + opts.cnt =3D cnt; + opts.retprobe =3D kretprobe; + /* attach empty to all the kernel functions except bpf_get_numa_node_id. = */ + if (!bpf_program__attach_kprobe_multi_opts(empty, NULL, &opts)) { + fprintf(stderr, "failed to attach bpf_program__attach_kprobe_multi_opts = to all\n"); + exit(1); + } +} + +static void trigger_kprobe_multi_all_setup(void) +{ + struct bpf_program *prog, *empty; + + setup_ctx(); + empty =3D ctx.skel->progs.bench_kprobe_multi_empty; + prog =3D ctx.skel->progs.bench_trigger_kprobe_multi; + bpf_program__set_autoload(empty, true); + bpf_program__set_autoload(prog, true); + load_ctx(); + + attach_ksyms_all(empty, false); + attach_bpf(prog); +} + +static void trigger_kretprobe_multi_all_setup(void) +{ + struct bpf_program *prog, *empty; + + setup_ctx(); + empty =3D ctx.skel->progs.bench_kretprobe_multi_empty; + prog =3D ctx.skel->progs.bench_trigger_kretprobe_multi; + bpf_program__set_autoload(empty, true); + bpf_program__set_autoload(prog, true); + load_ctx(); + + attach_ksyms_all(empty, true); + attach_bpf(prog); +} + static void trigger_fexit_setup(void) { setup_ctx(); @@ -512,6 +571,8 @@ BENCH_TRIG_KERNEL(kretprobe, "kretprobe"); BENCH_TRIG_KERNEL(kprobe_multi, "kprobe-multi"); BENCH_TRIG_KERNEL(kretprobe_multi, "kretprobe-multi"); BENCH_TRIG_KERNEL(fentry, "fentry"); +BENCH_TRIG_KERNEL(kprobe_multi_all, "kprobe-multi-all"); +BENCH_TRIG_KERNEL(kretprobe_multi_all, "kretprobe-multi-all"); BENCH_TRIG_KERNEL(fexit, "fexit"); BENCH_TRIG_KERNEL(fmodret, "fmodret"); BENCH_TRIG_KERNEL(tp, "tp"); diff --git a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh b/tool= s/testing/selftests/bpf/benchs/run_bench_trigger.sh index a690f5a68b6b..f7573708a0c3 100755 --- a/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh +++ b/tools/testing/selftests/bpf/benchs/run_bench_trigger.sh @@ -6,8 +6,8 @@ def_tests=3D( \ usermode-count kernel-count syscall-count \ fentry fexit fmodret \ rawtp tp \ - kprobe kprobe-multi \ - kretprobe kretprobe-multi \ + kprobe kprobe-multi kprobe-multi-all \ + kretprobe kretprobe-multi kretprobe-multi-all \ ) =20 tests=3D("$@") diff --git a/tools/testing/selftests/bpf/progs/trigger_bench.c b/tools/test= ing/selftests/bpf/progs/trigger_bench.c index 044a6d78923e..3d5f30c29ae3 100644 --- a/tools/testing/selftests/bpf/progs/trigger_bench.c +++ b/tools/testing/selftests/bpf/progs/trigger_bench.c @@ -97,6 +97,12 @@ int bench_trigger_kprobe_multi(void *ctx) return 0; } =20 +SEC("?kprobe.multi/bpf_get_numa_node_id") +int bench_kprobe_multi_empty(void *ctx) +{ + return 0; +} + SEC("?kretprobe.multi/bpf_get_numa_node_id") int bench_trigger_kretprobe_multi(void *ctx) { @@ -104,6 +110,12 @@ int bench_trigger_kretprobe_multi(void *ctx) return 0; } =20 +SEC("?kretprobe.multi/bpf_get_numa_node_id") +int bench_kretprobe_multi_empty(void *ctx) +{ + return 0; +} + SEC("?fentry/bpf_get_numa_node_id") int bench_trigger_fentry(void *ctx) { diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/se= lftests/bpf/trace_helpers.c index 9577979bd84d..171987627f3a 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -549,6 +549,7 @@ static const char * const trace_blacklist[] =3D { "preempt_count_sub", "__rcu_read_lock", "__rcu_read_unlock", + "bpf_get_numa_node_id", }; =20 static bool skip_entry(char *name) --=20 2.51.0