libbpf: Make optimized uprobes backward compatible
Subsystems (4)
Jiri Olsa
reviewerv3 cover libbpf: Make optimized uprobes backward compatible
hi,
we can currently optimize uprobes on top of nop5 instructions, so application can define USDT_NOP to nop5 and use USDT macro to define optimized usdt probes.
This works fine on new kernels, but could have performance penalty on older kernels, that do not have the support to optimize and to emulate nop5 instruction.
This patchset adds support to workaround the performance penalty on older kernels that do not support uprobe optimization, please see detailed description in patch 2.
v1: https://lore.kernel.org/bpf/[email protected]/
v2: https://lore.kernel.org/bpf/[email protected]/
v3 changes:
- fix __x86_64 define and other typos [CI]
- add missing '?' to usdt trigger program [CI]
v2 changes:
- after more investigation we realized there are some versions of bpftrace and stap that does not work with solution suggested in version 1, so we decided to switch to following solution:
- change USDT macro [1] emits nop,nop5 instructions combo by default
- libbpf detects nop,nop5 instructions combo for USDT probe, if there is and if uprobe syscall is detected libbpf installs usdt probe on top of nop5 instruction to get it optimized
- added usdt trigger benchmarks [Andrii]
- several small fixes on uprobe syscall detection, tests and other places [Andrii]
- true usdt.h source [1] updated [Andrii]
- compile usdt_* objects unconditionally [Andrii]
thanks,
jirka
[1] https://github.com/libbpf/usdt
---
Jiri Olsa (5):
selftests/bpf: Emit nop,no5 instructions combo for x86_64 arch
libbpf: Add uprobe syscall feature detection
libbpf: Add support to detect nop,nop5 instructions combo for usdt probe selftests/bpf: Add test for checking correct nop of optimized usdt selftests/bpf: Add usdt trigger bench
tools/lib/bpf/features.c | 24 ++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 2 ++ tools/lib/bpf/usdt.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- tools/testing/selftests/bpf/.gitignore | 2 ++ tools/testing/selftests/bpf/Makefile | 5 ++++- tools/testing/selftests/bpf/bench.c | 4 ++++ tools/testing/selftests/bpf/benchs/bench_trigger.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- tools/testing/selftests/bpf/prog_tests/usdt.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/testing/selftests/bpf/progs/test_usdt.c | 9 +++++++++ tools/testing/selftests/bpf/progs/trigger_bench.c | 10 +++++++++- tools/testing/selftests/bpf/usdt.h | 2 ++ tools/testing/selftests/bpf/usdt_1.c | 18 ++++++++++++++++++ tools/testing/selftests/bpf/usdt_2.c | 16 ++++++++++++++++ 14 files changed, 287 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/bpf/usdt_1.c create mode 100644 tools/testing/selftests/bpf/usdt_2.c
Jiri Olsa
reviewerPATCH v3 1/5 selftests/bpf: Emit nop,nop5 instructions combo for x86_64 arch
Syncing latest usdt.h change [1].
Now that we have nop5 optimization support in kernel, let's emit nop,nop5 for usdt probe. We leave it up to the library to use desirable nop instruction.
[1] https://github.com/libbpf/usdt/commit/c9865d158984fb2b73e3cbbdcdfb4f583ad36a73
--- tools/testing/selftests/bpf/usdt.h | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/usdt.h +2 -0
@@ -312,6 +312,8 @@ struct usdt_sema { volatile unsigned short active; };#ifndef USDT_NOP #if defined(__ia64__) || defined(__s390__) || defined(__s390x__)#define USDT_NOP nop 0 +#elif defined(__x86_64__) +#define USDT_NOP .byte 0x90, 0x0f, 0x1f, 0x44, 0x00, 0x0/* nop, nop5 */ #else #define USDT_NOP nop#endif
Signature · 1 line
2.53.0
Jiri Olsa
reviewerPATCH v3 2/5 libbpf: Add uprobe syscall feature detection
In reply to Jiri OlsaAdding uprobe syscall feature detection that will be used in following changes.
--- tools/lib/bpf/features.c | 24 ++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 2 ++ 2 files changed, 26 insertions(+)
tools/lib/bpf/features.c +24 -0
@@ -506,6 +506,27 @@ static int probe_kern_arg_ctx_tag(int token_fd)return probe_fd (prog_fd); } +#ifdef __x86_64__ + +#ifndef __NR_uprobe +#define __NR_uprobe 336 +#endif + +static int probe_uprobe_syscall (int token_fd) +{ +/* +* If kernel supports uprobe() syscall, it will return -ENXIO when called +* from the outside of a kernel-generated uprobe trampoline. +*/ +return syscall (__NR_uprobe) <0 && errno ==ENXIO ; +} +#else +static int probe_uprobe_syscall (int token_fd) +{ +return 0 ; +} +#endif +typedef int (*feature_probe_fn )(int /* token_fd */ );static struct kern_feature_cache feature_cache;
@@ -581,6 +602,9 @@ static struct kern_feature_desc { [FEAT_BTF_QMARK_DATASEC ] = {"BTF DATASEC names starting from '?'" , probe_kern_btf_qmark_datasec, }, + [FEAT_UPROBE_SYSCALL ] = { +"Kernel supports uprobe syscall" , probe_uprobe_syscall, + }, };bool feat_supported (struct kern_feature_cache *cache,enum kern_feature_id feat_id)
tools/lib/bpf/libbpf_internal.h +2 -0
@@ -392,6 +392,8 @@ enum kern_feature_id {FEAT_ARG_CTX_TAG ,/* Kernel supports '?' at the front of datasec names */ FEAT_BTF_QMARK_DATASEC , +/* Kernel supports uprobe syscall */ +FEAT_UPROBE_SYSCALL , __FEAT_CNT, };
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 2/5] libbpf: Add uprobe syscall feature detection
Quoted 43 lines · Jiri Olsa
Adding uprobe syscall feature detection that will be used in following changes.
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/features.c | 24 ++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 2 ++ 2 files changed, 26 insertions(+)tools/lib/bpf/features.c +21
-0@@ -506,6 +506,27 @@ static int probe_kern_arg_ctx_tag(int token_fd)return probe_fd (prog_fd); } +#ifdef __x86_64__ + +#ifndef __NR_uprobe +#define __NR_uprobe 336 +#endif + +static int probe_uprobe_syscall (int token_fd) +{ +/* +* If kernel supports uprobe() syscall, it will return -ENXIO when called +* from the outside of a kernel-generated uprobe trampoline. +*/ +return syscall (__NR_uprobe) <0 && errno ==ENXIO ; +} +#else +static int probe_uprobe_syscall (int token_fd) +{ +return 0 ; +} +#endif +typedef int (*feature_probe_fn )(int /* token_fd */ );static struct kern_feature_cache feature_cache;
tools/lib/bpf/features.c static struct kern_feature_desc { · line 606
Quoted 5 lines
tools/lib/bpf/features.c +2
-0@@ -581,6 +602,9 @@ static struct kern_feature_desc { [FEAT_BTF_QMARK_DATASEC] = { "BTF DATASEC names starting from '?'", probe_kern_btf_qmark_datasec, }, + [FEAT_UPROBE_SYSCALL] = { + "Kernel supports uprobe syscall", probe_uprobe_syscall,
this will conflict with libbpf arena relocation fix landed into bpf, so let's wait until trees merge.
But also, this description is going into the middle of a sentence, start it with lower case
pw-bot: cr
Quoted 20 lines
tools/lib/bpf/features.c +1
-0+ }, };bool feat_supported (struct kern_feature_cache *cache,enum kern_feature_id feat_id)tools/lib/bpf/libbpf_internal.h +2
-1@@ -392,6 +392,8 @@ enum kern_feature_id {FEAT_ARG_CTX_TAG ,/* Kernel supports '?' at the front of datasec names */ FEAT_BTF_QMARK_DATASEC , +/* Kernel supports uprobe syscall */ +FEAT_UPROBE_SYSCALL , __FEAT_CNT, }; --2.53.0
Re: [PATCHv3 bpf-next 2/5] libbpf: Add uprobe syscall feature detection
Quoted 53 lines · Andrii Nakryiko
Quoted 43 lines · Jiri Olsa
Adding uprobe syscall feature detection that will be used in following changes.
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/features.c | 24 ++++++++++++++++++++++++ tools/lib/bpf/libbpf_internal.h | 2 ++ 2 files changed, 26 insertions(+)tools/lib/bpf/features.c +21
-0@@ -506,6 +506,27 @@ static int probe_kern_arg_ctx_tag(int token_fd)return probe_fd (prog_fd); } +#ifdef __x86_64__ + +#ifndef __NR_uprobe +#define __NR_uprobe 336 +#endif + +static int probe_uprobe_syscall (int token_fd) +{ +/* +* If kernel supports uprobe() syscall, it will return -ENXIO when called +* from the outside of a kernel-generated uprobe trampoline. +*/ +return syscall (__NR_uprobe) <0 && errno ==ENXIO ; +} +#else +static int probe_uprobe_syscall (int token_fd) +{ +return 0 ; +} +#endif +typedef int (*feature_probe_fn )(int /* token_fd */ );static struct kern_feature_cache feature_cache;tools/lib/bpf/features.c static struct kern_feature_desc { · line 606
Quoted 5 lines
tools/lib/bpf/features.c +2
-0@@ -581,6 +602,9 @@ static struct kern_feature_desc { [FEAT_BTF_QMARK_DATASEC] = { "BTF DATASEC names starting from '?'", probe_kern_btf_qmark_datasec, }, + [FEAT_UPROBE_SYSCALL] = { + "Kernel supports uprobe syscall", probe_uprobe_syscall,this will conflict with libbpf arena relocation fix landed into bpf, so let's wait until trees merge.
Quoted 2 lines
But also, this description is going into the middle of a sentence, start it with lower case
ok, will change
jirka
Jiri Olsa
reviewerPATCH v3 3/5 libbpf: Add support to detect nop,nop5 instructions combo for usdt probe
In reply to Jiri OlsaAdding support to detect nop,nop5 instructions combo for usdt probe by checking on probe's following nop5 instruction.
When the nop,nop5 combo is detected together with uprobe syscall, we can place the probe on top of nop5 and get it optimized.
[1] https://github.com/libbpf/usdt
--- tools/lib/bpf/usdt.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-)
tools/lib/bpf/usdt.c +51 -4
@@ -262,6 +262,7 @@ struct usdt_manager {bool has_bpf_cookie;bool has_sema_refcnt;bool has_uprobe_multi; +bool has_uprobe_syscall; };struct usdt_manager *usdt_manager_new (struct bpf_object *obj)
@@ -301,6 +302,13 @@ struct usdt_manager *usdt_manager_new(struct bpf_object *obj)* usdt probes. */ man->has_uprobe_multi =kernel_supports (obj,FEAT_UPROBE_MULTI_LINK ); + +/* +* Detect kernel support for uprobe() syscall, it's presence means we can +* take advantage of faster nop5 uprobe handling. +* Added in: 56101b69c919 ("uprobes/x86: Add uprobe syscall to speed up uprobe") +*/ + man->has_uprobe_syscall =kernel_supports (obj,FEAT_UPROBE_SYSCALL );return man; }
@@ -585,13 +593,42 @@ static int parse_usdt_note(GElf_Nhdr *nhdr, const char *data, size_t name_off,static int parse_usdt_spec (struct usdt_spec *spec,const struct usdt_note *note,__u64 usdt_cookie); -static int collect_usdt_targets (struct usdt_manager *man,Elf *elf,const char *path,pid_t pid, -const char *usdt_provider,const char *usdt_name,__u64 usdt_cookie, -struct usdt_target **out_targets,size_t *out_target_cnt) +#if defined(__x86_64__) +static bool has_nop_combo (int fd,long off) +{ +static unsigned char nop_combo[6 ] = { +0x90 ,0x0f ,0x1f ,0x44 ,0x00 ,0x00 /* nop,nop5 */ + }; +unsigned char buf[6 ] = {}; + +/* +* We are using file descriptor that backs Elf object, +* let's dup it to be on the safe side. +*/ + fd =dup (fd); +if (fd <0 ) +return false; +if (lseek (fd, off,SEEK_SET ) == off) +read (fd, buf,6 ); +close (fd); +return memcmp (buf, nop_combo,6 ) ==0 ; +} +#else +static bool has_nop_combo (int fd,long off) +{ +return false; +} +#endif + +static int collect_usdt_targets (struct usdt_manager *man,struct elf_fd *elf_fd,const char *path, +pid_t pid,const char *usdt_provider,const char *usdt_name, +__u64 usdt_cookie,struct usdt_target **out_targets, +size_t *out_target_cnt) {size_t off, name_off, desc_off, seg_cnt =0 , vma_seg_cnt =0 , target_cnt =0 ;struct elf_seg *segs =NULL , *vma_segs =NULL ;struct usdt_target *targets =NULL , *target; +Elf *elf = elf_fd->elf;long base_addr =0 ;Elf_Scn *notes_scn, *base_scn;GElf_Shdr base_shdr, notes_shdr;
@@ -784,6 +821,16 @@ static int collect_usdt_targets(struct usdt_manager *man, Elf *elf, const char * target = &targets[target_cnt];memset (target,0 ,sizeof (*target)); +/* +* We have uprobe syscall and usdt with nop,nop5 instructions combo, +* so we can place the uprobe directly on nop5 (+1) and get this probe +* optimized. +*/ +if (man->has_uprobe_syscall &&has_nop_combo (elf_fd->fd, usdt_rel_ip)) { + usdt_abs_ip++; + usdt_rel_ip++; + } + target->abs_ip = usdt_abs_ip; target->rel_ip = usdt_rel_ip; target->sema_off = usdt_sema_off;
@@ -998,7 +1045,7 @@ struct bpf_link *usdt_manager_attach_usdt(struct usdt_manager *man, const struct/* discover USDT in given binary, optionally limiting * activations to a given PID, if pid > 0 */ - err =collect_usdt_targets (man, elf_fd.elf, path, pid, usdt_provider, usdt_name, + err =collect_usdt_targets (man, &elf_fd, path, pid, usdt_provider, usdt_name, usdt_cookie, &targets, &target_cnt);if (err <=0 ) { err = (err ==0 ) ? -ENOENT : err;
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 3/5] libbpf: Add support to detect nop,nop5 instructions combo for usdt probe
Quoted 54 lines · Jiri Olsa
Adding support to detect nop,nop5 instructions combo for usdt probe by checking on probe's following nop5 instruction.
When the nop,nop5 combo is detected together with uprobe syscall, we can place the probe on top of nop5 and get it optimized.
[1] https://github.com/libbpf/usdt
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/usdt.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-)tools/lib/bpf/usdt.c +16
-3@@ -262,6 +262,7 @@ struct usdt_manager {bool has_bpf_cookie;bool has_sema_refcnt;bool has_uprobe_multi; +bool has_uprobe_syscall; };struct usdt_manager *usdt_manager_new (struct bpf_object *obj)@@ -301,6 +302,13 @@ struct usdt_manager *usdt_manager_new(struct bpf_object *obj)* usdt probes. */ man->has_uprobe_multi =kernel_supports (obj,FEAT_UPROBE_MULTI_LINK ); + +/* +* Detect kernel support for uprobe() syscall, it's presence means we can +* take advantage of faster nop5 uprobe handling. +* Added in: 56101b69c919 ("uprobes/x86: Add uprobe syscall to speed up uprobe") +*/ + man->has_uprobe_syscall =kernel_supports (obj,FEAT_UPROBE_SYSCALL );return man; }@@ -585,13 +593,42 @@ static int parse_usdt_note(GElf_Nhdr *nhdr, const char *data, size_t name_off,static int parse_usdt_spec (struct usdt_spec *spec,const struct usdt_note *note,__u64 usdt_cookie); -static int collect_usdt_targets (struct usdt_manager *man,Elf *elf,const char *path,pid_t pid, -const char *usdt_provider,const char *usdt_name,__u64 usdt_cookie, -struct usdt_target **out_targets,size_t *out_target_cnt) +#if defined(__x86_64__) +static bool has_nop_combo (int fd,long off) +{ +static unsigned char nop_combo[6 ] = { +0x90 ,0x0f ,0x1f ,0x44 ,0x00 ,0x00 /* nop,nop5 */ + }; +unsigned char buf[6 ] = {}; +
tools/lib/bpf/usdt.c static int parse_usdt_note(GElf_Nhdr *nhdr, const char *data, size_t name_off, · line 613
Quoted 10 lines
tools/lib/bpf/usdt.c +10
-0+/* +* We are using file descriptor that backs Elf object, +* let's dup it to be on the safe side. +*/ + fd =dup (fd); +if (fd <0 ) +return false; +if (lseek (fd, off,SEEK_SET ) == off) +read (fd, buf,6 ); +close (fd);
ugh, use pread() instead of all this ? I wouldn't bother with short read handling, if we didn't get 6 bytes, so be it, no nop5.
Quoted 9 lines
tools/lib/bpf/usdt.c +9
-0+ return memcmp(buf, nop_combo, 6) == 0; +} +#else +static bool has_nop_combo (int fd,long off) +{ +return false; +} +#endif +
[...]
Re: [PATCHv3 bpf-next 3/5] libbpf: Add support to detect nop,nop5 instructions combo for usdt probe
Quoted 60 lines · Andrii Nakryiko
Quoted 59 lines · Jiri Olsa
Adding support to detect nop,nop5 instructions combo for usdt probe by checking on probe's following nop5 instruction.
When the nop,nop5 combo is detected together with uprobe syscall, we can place the probe on top of nop5 and get it optimized.
[1] https://github.com/libbpf/usdt
Signed-off-by Jiri Olsa <[email protected]>--- tools/lib/bpf/usdt.c | 55 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-)tools/lib/bpf/usdt.c +21
-3@@ -262,6 +262,7 @@ struct usdt_manager {bool has_bpf_cookie;bool has_sema_refcnt;bool has_uprobe_multi; +bool has_uprobe_syscall; };struct usdt_manager *usdt_manager_new (struct bpf_object *obj)@@ -301,6 +302,13 @@ struct usdt_manager *usdt_manager_new(struct bpf_object *obj)* usdt probes. */ man->has_uprobe_multi =kernel_supports (obj,FEAT_UPROBE_MULTI_LINK ); + +/* +* Detect kernel support for uprobe() syscall, it's presence means we can +* take advantage of faster nop5 uprobe handling. +* Added in: 56101b69c919 ("uprobes/x86: Add uprobe syscall to speed up uprobe") +*/ + man->has_uprobe_syscall =kernel_supports (obj,FEAT_UPROBE_SYSCALL );return man; }@@ -585,13 +593,42 @@ static int parse_usdt_note(GElf_Nhdr *nhdr, const char *data, size_t name_off,static int parse_usdt_spec (struct usdt_spec *spec,const struct usdt_note *note,__u64 usdt_cookie); -static int collect_usdt_targets (struct usdt_manager *man,Elf *elf,const char *path,pid_t pid, -const char *usdt_provider,const char *usdt_name,__u64 usdt_cookie, -struct usdt_target **out_targets,size_t *out_target_cnt) +#if defined(__x86_64__) +static bool has_nop_combo (int fd,long off) +{ +static unsigned char nop_combo[6 ] = { +0x90 ,0x0f ,0x1f ,0x44 ,0x00 ,0x00 /* nop,nop5 */ + }; +unsigned char buf[6 ] = {}; + +/* +* We are using file descriptor that backs Elf object, +* let's dup it to be on the safe side. +*/ + fd =dup (fd);
Quoted 8 lines
tools/lib/bpf/usdt.c static int parse_usdt_note(GElf_Nhdr *nhdr, const char *data, size_t name_off, · line 613
Quoted 5 lines
tools/lib/bpf/usdt.c +5
-0+if (fd <0 ) +return false; +if (lseek (fd, off,SEEK_SET ) == off) +read (fd, buf,6 ); +close (fd);ugh, use
pread()instead of all this ? I wouldn't bother with short read handling, if we didn't get 6 bytes, so be it, no nop5.
ok, that's simpler, will change
thanks,
jirka
Quoted 12 lines
Quoted 10 lines
tools/lib/bpf/usdt.c +9
-0+ return memcmp(buf, nop_combo, 6) == 0; +} +#else +static bool has_nop_combo (int fd,long off) +{ +return false; +} +#endif +[...]
Jiri Olsa
reviewerPATCH v3 4/5 selftests/bpf: Add test for checking correct nop of optimized usdt
In reply to Jiri OlsaAdding test that attaches bpf program on usdt probe in 2 scenarios;
- attach program on top of usdt_1, which is single nop instruction, so the probe stays on nop instruction and is not optimized.
- attach program on top of usdt_2 which is probe defined on top of nop,nop5 combo, so the probe is placed on top of nop5 and is optimized.
--- tools/testing/selftests/bpf/.gitignore | 2 + tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/prog_tests/usdt.c | 85 +++++++++++++++++++ tools/testing/selftests/bpf/progs/test_usdt.c | 9 ++ tools/testing/selftests/bpf/usdt_1.c | 18 ++++ tools/testing/selftests/bpf/usdt_2.c | 16 ++++ 6 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/usdt_1.c create mode 100644 tools/testing/selftests/bpf/usdt_2.c
tools/testing/selftests/bpf/.gitignore +2 -0
@@ -47,3 +47,5 @@ verification_cert.h *.BTF *.BTF_ids *.BTF.base +usdt_1 +usdt_2
tools/testing/selftests/bpf/Makefile +2 -1
@@ -749,7 +749,8 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ $(VERIFY_SIG_HDR) \ flow_dissector_load.h \ ip_check_defrag_frags.h \ - bpftool_helpers.c + bpftool_helpers.c \ + usdt_1.c usdt_2.c TRUNNER_LIB_SOURCES := find_bit.c TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read \ $(OUTPUT)/liburandom_read.so \
tools/testing/selftests/bpf/prog_tests/usdt.c +85 -0
97 lines not on this page · raw message
tools/testing/selftests/bpf/progs/test_usdt.c +9 -0
@@ -138,4 +138,13 @@ int usdt_sib(struct pt_regs *ctx)return 0 ; } +int executed; + +SEC("usdt") +int usdt_executed (struct pt_regs *ctx) +{ + executed++; +return 0 ; +} + char _license[] SEC("license") = "GPL";
tools/testing/selftests/bpf/usdt_1.c new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 + +#if defined(__x86_64__) + +/* +* Include usdt.h with defined USDT_NOP macro to use single +* nop instruction. +*/ +#define USDT_NOP .byte 0x90 +#include "usdt.h" + +__attribute__((aligned (16 ))) +void usdt_1 (void ) +{ +USDT (optimized_attach, usdt_1); +} + +#endif
tools/testing/selftests/bpf/usdt_2.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 + +#if defined(__x86_64__) + +/* +* Include usdt.h with default nop,nop5 instructions combo. +*/ +#include "usdt.h" + +__attribute__((aligned (16 ))) +void usdt_2 (void ) +{ +USDT (optimized_attach, usdt_2); +} + +#endif
Signature · 1 line
2.53.0
[email protected]
AI reviewRe: [PATCHv3 bpf-next 4/5] selftests/bpf: Add test for checking correct nop of optimized usdt
This comment says "usdt_1" but the code operates on "usdt_2". Should this say "usdt_2 USDT probe has nop,nop5 instructions combo" to match the code?
Quoted 3 lines
tools/testing/selftests/bpf/prog_tests/usdt.c +0
-0
[ ... ]
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/usdt.c +6
-0+static void subtest_optimized_attach (void ) +{ +struct test_usdt *skel; +__u8 *addr_1, *addr_2; + +/* usdt_1 USDT probe has single nop instruction */
tools/testing/selftests/bpf/prog_tests/usdt.c static void subtest_basic_usdt(bool optimized) · line 284
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/usdt.c +10
-0+ addr_1 =find_instr (usdt_1, nop1_nop5_combo,6 ); +if (!ASSERT_NULL (addr_1,"usdt_1_find_nop1_nop5_combo" )) +return ; + + addr_1 =find_instr (usdt_1, nop1,1 ); +if (!ASSERT_OK_PTR (addr_1,"usdt_1_find_nop1" )) +return ; + +/* usdt_1 USDT probe has nop,nop5 instructions combo */ + addr_2 =find_instr (usdt_2, nop1_nop5_combo,6 );
This comment says "usdt_1" but the code operates on "usdt_2". Should this say "usdt_2 USDT probe has nop,nop5 instructions combo" to match the code?
---
AI reviewed your patch. Please fix the bug or email reply why it's not a bug.
See: https://github.com/kernel-patches/vmtest/blob/master/ci/claude/README.md
CI run summary: https://github.com/kernel-patches/bpf/actions/runs/21898612624
AI-authorship-score: low
AI-authorship-explanation: The code follows standard kernel selftest patterns with natural commit message style, and the copy-paste comment error is a characteristically human mistake.
issues-found: 1
issue-severity-score: low
issue-severity-explanation: Comment/code mismatch in test file where comment says usdt_1 but code operates on usdt_2; does not affect test functionality.
Re: [PATCHv3 bpf-next 4/5] selftests/bpf: Add test for checking correct nop of optimized usdt
In reply to Jiri OlsaQuoted 154 lines · Jiri Olsa
Adding test that attaches bpf program on usdt probe in 2 scenarios;
- attach program on top of
usdt_1, which is single nop instruction, so the probe stays on nop instruction and is not optimized.- attach program on top of
usdt_2which is probe defined on top of nop,nop5 combo, so the probe is placed on top of nop5 and is optimized.Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/.gitignore | 2 + tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/prog_tests/usdt.c | 85 +++++++++++++++++++ tools/testing/selftests/bpf/progs/test_usdt.c | 9 ++ tools/testing/selftests/bpf/usdt_1.c | 18 ++++ tools/testing/selftests/bpf/usdt_2.c | 16 ++++ 6 files changed, 132 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/usdt_1.c create mode 100644 tools/testing/selftests/bpf/usdt_2.ctools/testing/selftests/bpf/.gitignore +2
-0@@ -47,3 +47,5 @@ verification_cert.h *.BTF *.BTF_ids *.BTF.base +usdt_1 +usdt_2tools/testing/selftests/bpf/Makefile +2
-1@@ -749,7 +749,8 @@ TRUNNER_EXTRA_SOURCES := test_progs.c \ $(VERIFY_SIG_HDR) \ flow_dissector_load.h \ ip_check_defrag_frags.h \ - bpftool_helpers.c + bpftool_helpers.c \ + usdt_1.c usdt_2.c TRUNNER_LIB_SOURCES := find_bit.c TRUNNER_EXTRA_FILES := $(OUTPUT)/urandom_read \ $(OUTPUT)/liburandom_read.so \tools/testing/selftests/bpf/prog_tests/usdt.c +85
-0@@ -247,6 +247,89 @@ static void subtest_basic_usdt(bool optimized)#undef TRIGGER } +#ifdef __x86_64__ +extern void usdt_1 (void ); +extern void usdt_2 (void ); + +/* nop, nop5 */ +static unsigned char nop1_nop5_combo[6 ] = {0x90 ,0x0f ,0x1f ,0x44 ,0x00 ,0x00 }; +static unsigned char nop1[6 ] = {0x90 }; + +static void *find_instr (void *fn,unsigned char *instr,size_t cnt) +{ +int i; + +for (i =0 ; i <10 ; i++) { +if (!memcmp (instr, fn + i, cnt)) +return fn + i; + } +return NULL ; +} + +static void subtest_optimized_attach (void ) +{ +struct test_usdt *skel; +__u8 *addr_1, *addr_2; + +/* usdt_1 USDT probe has single nop instruction */ + addr_1 =find_instr (usdt_1, nop1_nop5_combo,6 ); +if (!ASSERT_NULL (addr_1,"usdt_1_find_nop1_nop5_combo" )) +return ; + + addr_1 =find_instr (usdt_1, nop1,1 ); +if (!ASSERT_OK_PTR (addr_1,"usdt_1_find_nop1" )) +return ; + +/* usdt_1 USDT probe has nop,nop5 instructions combo */ + addr_2 =find_instr (usdt_2, nop1_nop5_combo,6 ); +if (!ASSERT_OK_PTR (addr_2,"usdt_2_find_nop1_nop5_combo" )) +return ; + + skel =test_usdt__open_and_load (); +if (!ASSERT_OK_PTR (skel,"test_usdt__open_and_load" )) +return ; + +/* +* Attach program on top of usdt_1 which is single nop probe, +* so the probe won't get optimized. +*/ + skel->links.usdt_executed =bpf_program__attach_usdt (skel->progs.usdt_executed, +0 /*self*/ ,"/proc/self/exe" , +"optimized_attach" ,"usdt_1" ,NULL ); +if (!ASSERT_OK_PTR (skel->links.usdt_executed,"bpf_program__attach_usdt" )) + goto cleanup; + +usdt_1 (); +usdt_1 (); + +/* nop is on addr_1 address */ +ASSERT_EQ (*addr_1,0xcc ,"int3" ); +ASSERT_EQ (skel->bss->executed,2 ,"executed" ); + +bpf_link__destroy (skel->links.usdt_executed); + +/* +* Attach program on top of usdt_2 which is probe defined on top +* of nop1,nop5 combo, so the probe gets optimized on top of nop5. +*/ + skel->links.usdt_executed =bpf_program__attach_usdt (skel->progs.usdt_executed, +0 /*self*/ ,"/proc/self/exe" , +"optimized_attach" ,"usdt_2" ,NULL ); +if (!ASSERT_OK_PTR (skel->links.usdt_executed,"bpf_program__attach_usdt" )) + goto cleanup; + +usdt_2 (); +usdt_2 (); + +/* nop5 is on addr_2 + 1 address */ +ASSERT_EQ (*(addr_2 +1 ),0xe8 ,"call" ); +ASSERT_EQ (skel->bss->executed,4 ,"executed" ); + +cleanup: +test_usdt__destroy (skel); +} +#endif + unsigned short test_usdt_100_semaphore SEC(".probes"); unsigned short test_usdt_300_semaphore SEC(".probes"); unsigned short test_usdt_400_semaphore SEC(".probes");@@ -516,6 +599,8 @@ void test_usdt(void)#ifdef __x86_64__if (test__start_subtest ("basic_optimized" ))subtest_basic_usdt (true); +if (test__start_subtest ("optimized_attach" )) +subtest_optimized_attach ();#endif if (test__start_subtest ("multispec" ))subtest_multispec_usdt ();tools/testing/selftests/bpf/progs/test_usdt.c +0
-0
tools/testing/selftests/bpf/progs/test_usdt.c int usdt_sib(struct pt_regs *ctx) · line 146
Quoted 9 lines
tools/testing/selftests/bpf/progs/test_usdt.c +6
-0@@ -138,4 +138,13 @@ int usdt_sib(struct pt_regs *ctx)return 0 ; } +int executed; + +SEC("usdt") +int usdt_executed (struct pt_regs *ctx) +{ + executed++;
did you try capturing pt_reg's ip value and validating it?
Quoted 53 lines
tools/testing/selftests/bpf/progs/test_usdt.c +3
-0+return 0 ; +} + char _license[] SEC("license") = "GPL";tools/testing/selftests/bpf/usdt_1.c new file +18
-0@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 + +#if defined(__x86_64__) + +/* +* Include usdt.h with defined USDT_NOP macro to use single +* nop instruction. +*/ +#define USDT_NOP .byte 0x90 +#include "usdt.h" + +__attribute__((aligned (16 ))) +void usdt_1 (void ) +{ +USDT (optimized_attach, usdt_1); +} + +#endif tools/testing/selftests/bpf/usdt_2.c new file +16
-1@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 + +#if defined(__x86_64__) + +/* +* Include usdt.h with default nop,nop5 instructions combo. +*/ +#include "usdt.h" + +__attribute__((aligned (16 ))) +void usdt_2 (void ) +{ +USDT (optimized_attach, usdt_2); +} + +#endif --2.53.0
Re: [PATCHv3 bpf-next 4/5] selftests/bpf: Add test for checking correct nop of optimized usdt
On Wed, Feb 11, 2026 at 01:45:24PM -0800, Andrii Nakryiko wrote:
SNIP
Quoted 8 lines
Quoted 8 lines
tools/testing/selftests/bpf/progs/test_usdt.c +0
-0@@ -138,4 +138,13 @@ int usdt_sib(struct pt_regs *ctx)return 0 ; }
Quoted 8 lines
tools/testing/selftests/bpf/progs/test_usdt.c int usdt_sib(struct pt_regs *ctx) · line 146
Quoted 6 lines
tools/testing/selftests/bpf/progs/test_usdt.c +6
-0+int executed; + +SEC("usdt") +int usdt_executed (struct pt_regs *ctx) +{ + executed++;did you try capturing pt_reg's ip value and validating it?
ok, it's easy to add that check
jirka
Jiri Olsa
reviewerPATCH v3 5/5 selftests/bpf: Add usdt trigger bench
In reply to Jiri OlsaAdding usdt trigger bench for usdt:
trig-usdt_nop - usdt on top of nop1 instruction trig-usdt_nop_combo - usdt on top of nop1/nop5 combo
Adding it to benchs/run_bench_uprobes.sh script.
Example run on x86_64 kernel with uprobe syscall:
# ./benchs/run_bench_uprobes.sh usermode-count : 152.507 ± 0.098M/s syscall-count : 14.309 ± 0.093M/s uprobe-nop : 3.190 ± 0.012M/s uprobe-push : 3.057 ± 0.004M/s uprobe-ret : 1.095 ± 0.009M/s uprobe-nop5 : 7.305 ± 0.034M/s uretprobe-nop : 2.175 ± 0.005M/s uretprobe-push : 2.109 ± 0.003M/s uretprobe-ret : 0.945 ± 0.002M/s uretprobe-nop5 : 3.530 ± 0.006M/s usdt_nop : 3.235 ± 0.008M/s <-- added usdt_nop_combo : 7.511 ± 0.045M/s <-- added
--- tools/testing/selftests/bpf/Makefile | 2 + tools/testing/selftests/bpf/bench.c | 4 ++ .../selftests/bpf/benchs/bench_trigger.c | 60 +++++++++++++++++++ .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- .../selftests/bpf/progs/trigger_bench.c | 10 +++- 5 files changed, 76 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -0
@@ -874,6 +874,8 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o \ $(OUTPUT)/bench_bpf_crypto.o \ $(OUTPUT)/bench_sockmap.o \ $(OUTPUT)/bench_lpm_trie_map.o \ + $(OUTPUT)/usdt_1.o \ + $(OUTPUT)/usdt_2.o \ # $(call msg,BINARY,,$@) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(filter %.a %.o,$^) $(LDLIBS) -o $@
tools/testing/selftests/bpf/bench.c +4 -0
@@ -541,6 +541,8 @@ extern const struct bench bench_trig_uprobe_nop5;extern const struct bench bench_trig_uretprobe_nop5;extern const struct bench bench_trig_uprobe_multi_nop5;extern const struct bench bench_trig_uretprobe_multi_nop5; +extern const struct bench bench_trig_usdt_nop; +extern const struct bench bench_trig_usdt_nop_combo;#endif extern const struct bench bench_rb_libbpf;
@@ -617,6 +619,8 @@ static const struct bench *benchs[] = { &bench_trig_uretprobe_nop5, &bench_trig_uprobe_multi_nop5, &bench_trig_uretprobe_multi_nop5, + &bench_trig_usdt_nop, + &bench_trig_usdt_nop_combo, #endif/* ringbuf/perfbuf benchmarks */ &bench_rb_libbpf,
tools/testing/selftests/bpf/benchs/bench_trigger.c +60 -0
76 lines not on this page · raw message
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +1 -1
@@ -2,7 +2,7 @@ set -eufo pipefail -for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} +for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} usdt_nop usdt_nop_combo do summary=$(sudo ./bench -w2 -d5 -a trig-$i | tail -n1 | cut -d'(' -f1 | cut -d' ' -f3-) printf "%-15s: %s\n" $i "$summary"
tools/testing/selftests/bpf/progs/trigger_bench.c +9 -1
@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020 Facebook -#include <linux/bpf.h> +#include "vmlinux.h" #include <asm/unistd.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include "bpf_misc.h" +#include "bpf/usdt.bpf.h" char _license[] SEC("license") = "GPL";
@@ -180,3 +181,10 @@ int bench_trigger_rawtp(void *ctx)handle (ctx);return 0 ; } + +SEC("?usdt") +int bench_trigger_usdt (void *ctx) +{ +inc_counter (); +return 0 ; +}
Signature · 1 line
2.53.0
Re: [PATCHv3 bpf-next 5/5] selftests/bpf: Add usdt trigger bench
Quoted 9 lines · Jiri Olsa
Adding usdt trigger bench for usdt:
trig-usdt_nop - usdt on top of nop1 instruction trig-usdt_nop_combo - usdt on top of nop1/nop5 comboAdding it to
benchs/run_bench_uprobes.shscript.Example run on
x86_64kernel with uprobe syscall:
Quoted 13 lines
# ./benchs/run_bench_uprobes.sh usermode-count : 152.507 ± 0.098M/s syscall-count : 14.309 ± 0.093M/s uprobe-nop : 3.190 ± 0.012M/s uprobe-push : 3.057 ± 0.004M/s uprobe-ret : 1.095 ± 0.009M/s uprobe-nop5 : 7.305 ± 0.034M/s uretprobe-nop : 2.175 ± 0.005M/s uretprobe-push : 2.109 ± 0.003M/s uretprobe-ret : 0.945 ± 0.002M/s uretprobe-nop5 : 3.530 ± 0.006M/s usdt_nop : 3.235 ± 0.008M/s <-- added usdt_nop_combo : 7.511 ± 0.045M/s <-- added
consistency, usdt-nop. And for nop_combo I'd use usdt-nop5, that combo doesn't matter for performance beyond the fact that we have nop5 there
Quoted 133 lines
Signed-off-by Jiri Olsa <[email protected]>--- tools/testing/selftests/bpf/Makefile | 2 + tools/testing/selftests/bpf/bench.c | 4 ++ .../selftests/bpf/benchs/bench_trigger.c | 60 +++++++++++++++++++ .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- .../selftests/bpf/progs/trigger_bench.c | 10 +++- 5 files changed, 76 insertions(+), 2 deletions(-)tools/testing/selftests/bpf/Makefile +2
-0@@ -874,6 +874,8 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o \ $(OUTPUT)/bench_bpf_crypto.o \ $(OUTPUT)/bench_sockmap.o \ $(OUTPUT)/bench_lpm_trie_map.o \ + $(OUTPUT)/usdt_1.o \ + $(OUTPUT)/usdt_2.o \ # $(call msg,BINARY,,$@) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(filter %.a %.o,$^) $(LDLIBS) -o $@tools/testing/selftests/bpf/bench.c +4
-0@@ -541,6 +541,8 @@ extern const struct bench bench_trig_uprobe_nop5;extern const struct bench bench_trig_uretprobe_nop5;extern const struct bench bench_trig_uprobe_multi_nop5;extern const struct bench bench_trig_uretprobe_multi_nop5; +extern const struct bench bench_trig_usdt_nop; +extern const struct bench bench_trig_usdt_nop_combo;#endif extern const struct bench bench_rb_libbpf;@@ -617,6 +619,8 @@ static const struct bench *benchs[] = { &bench_trig_uretprobe_nop5, &bench_trig_uprobe_multi_nop5, &bench_trig_uretprobe_multi_nop5, + &bench_trig_usdt_nop, + &bench_trig_usdt_nop_combo, #endif/* ringbuf/perfbuf benchmarks */ &bench_rb_libbpf,tools/testing/selftests/bpf/benchs/bench_trigger.c +60
-0@@ -405,6 +405,23 @@ static void *uprobe_producer_nop5(void *input)uprobe_target_nop5 (); return NULL; } + +void usdt_1 (void ); +void usdt_2 (void ); + +static void *uprobe_producer_usdt_nop (void *input) +{ +while (true) +usdt_1 (); +return NULL ; +} + +static void *uprobe_producer_usdt_nop_combo (void *input) +{ +while (true) +usdt_2 (); +return NULL ; +}#endif static void usetup (bool use_retprobe,bool use_multi,void *target_addr)@@ -542,6 +559,47 @@ static void uretprobe_multi_nop5_setup(void) {usetup (true, true/* use_multi */ , &uprobe_target_nop5); } + +static void usdt_setup (const char *name) +{ +struct bpf_link *link; +int err; + +setup_libbpf (); + + ctx.skel =trigger_bench__open (); +if (!ctx.skel) { +fprintf (stderr,"failed to open skeleton\n" ); +exit (1 ); + } + +bpf_program__set_autoload (ctx.skel->progs.bench_trigger_usdt, true); + + err =trigger_bench__load (ctx.skel); +if (err) { +fprintf (stderr,"failed to load skeleton\n" ); +exit (1 ); + } + + link =bpf_program__attach_usdt (ctx.skel->progs.bench_trigger_usdt, +0 /*self*/ ,"/proc/self/exe" , +"optimized_attach" , name,NULL ); +if (libbpf_get_error (link)) { +fprintf (stderr,"failed to attach optimized_attach:%s usdt probe\n" , name); +exit (1 ); + } + ctx.skel->links.bench_trigger_usdt = link; +} + +static void usdt_nop_setup (void ) +{ +usdt_setup ("usdt_1" ); +} + +static void usdt_nop_combo_setup (void ) +{ +usdt_setup ("usdt_2" ); +}#endif const struct bench bench_trig_syscall_count = {@@ -609,4 +667,6 @@ BENCH_TRIG_USERMODE(uprobe_nop5, nop5, "uprobe-nop5");BENCH_TRIG_USERMODE (uretprobe_nop5, nop5,"uretprobe-nop5" );BENCH_TRIG_USERMODE (uprobe_multi_nop5, nop5,"uprobe-multi-nop5" );BENCH_TRIG_USERMODE (uretprobe_multi_nop5, nop5,"uretprobe-multi-nop5" ); +BENCH_TRIG_USERMODE (usdt_nop, usdt_nop,"usdt_nop" ); +BENCH_TRIG_USERMODE (usdt_nop_combo, usdt_nop_combo,"usdt_nop_combo" );#endif tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +0
-0
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh line 5
Quoted 5 lines
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +1
-1@@ -2,7 +2,7 @@ set -eufo pipefail -for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} +for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} usdt_nop usdt_nop_combo
usdt_{nop,nop5}, consistency ;)
Quoted 34 lines
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +0
-0do summary=$(sudo ./bench -w2 -d5 -a trig-$i | tail -n1 | cut -d'(' -f1 | cut -d' ' -f3-) printf "%-15s: %s\n" $i "$summary"tools/testing/selftests/bpf/progs/trigger_bench.c +9
-2@@ -1,10 +1,11 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2020 Facebook -#include <linux/bpf.h> +#include "vmlinux.h" #include <asm/unistd.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> #include "bpf_misc.h" +#include "bpf/usdt.bpf.h" char _license[] SEC("license") = "GPL";@@ -180,3 +181,10 @@ int bench_trigger_rawtp(void *ctx)handle (ctx);return 0 ; } + +SEC("?usdt") +int bench_trigger_usdt (void *ctx) +{ +inc_counter (); +return 0 ; +} --2.53.0
Re: [PATCHv3 bpf-next 5/5] selftests/bpf: Add usdt trigger bench
Quoted 24 lines · Andrii Nakryiko
Quoted 9 lines · Jiri Olsa
Adding usdt trigger bench for usdt:
trig-usdt_nop - usdt on top of nop1 instruction trig-usdt_nop_combo - usdt on top of nop1/nop5 comboAdding it to
benchs/run_bench_uprobes.shscript.Example run on
x86_64kernel with uprobe syscall:Quoted 13 lines
# ./benchs/run_bench_uprobes.sh usermode-count : 152.507 ± 0.098M/s syscall-count : 14.309 ± 0.093M/s uprobe-nop : 3.190 ± 0.012M/s uprobe-push : 3.057 ± 0.004M/s uprobe-ret : 1.095 ± 0.009M/s uprobe-nop5 : 7.305 ± 0.034M/s uretprobe-nop : 2.175 ± 0.005M/s uretprobe-push : 2.109 ± 0.003M/s uretprobe-ret : 0.945 ± 0.002M/s uretprobe-nop5 : 3.530 ± 0.006M/s usdt_nop : 3.235 ± 0.008M/s <-- added usdt_nop_combo : 7.511 ± 0.045M/s <-- added
Quoted 2 lines
consistency, usdt-nop. And for
nop_comboI'd use usdt-nop5, that combo doesn't matter for performance beyond the fact that we have nop5 there
ok
SNIP
Quoted 56 lines
Quoted 56 lines
tools/testing/selftests/bpf/benchs/bench_trigger.c +42
-0+static void usdt_setup (const char *name) +{ +struct bpf_link *link; +int err; + +setup_libbpf (); + + ctx.skel =trigger_bench__open (); +if (!ctx.skel) { +fprintf (stderr,"failed to open skeleton\n" ); +exit (1 ); + } + +bpf_program__set_autoload (ctx.skel->progs.bench_trigger_usdt, true); + + err =trigger_bench__load (ctx.skel); +if (err) { +fprintf (stderr,"failed to load skeleton\n" ); +exit (1 ); + } + + link =bpf_program__attach_usdt (ctx.skel->progs.bench_trigger_usdt, +0 /*self*/ ,"/proc/self/exe" , +"optimized_attach" , name,NULL ); +if (libbpf_get_error (link)) { +fprintf (stderr,"failed to attach optimized_attach:%s usdt probe\n" , name); +exit (1 ); + } + ctx.skel->links.bench_trigger_usdt = link; +} + +static void usdt_nop_setup (void ) +{ +usdt_setup ("usdt_1" ); +} + +static void usdt_nop_combo_setup (void ) +{ +usdt_setup ("usdt_2" ); +}#endif const struct bench bench_trig_syscall_count = {@@ -609,4 +667,6 @@ BENCH_TRIG_USERMODE(uprobe_nop5, nop5, "uprobe-nop5");BENCH_TRIG_USERMODE (uretprobe_nop5, nop5,"uretprobe-nop5" );BENCH_TRIG_USERMODE (uprobe_multi_nop5, nop5,"uprobe-multi-nop5" );BENCH_TRIG_USERMODE (uretprobe_multi_nop5, nop5,"uretprobe-multi-nop5" ); +BENCH_TRIG_USERMODE (usdt_nop, usdt_nop,"usdt_nop" ); +BENCH_TRIG_USERMODE (usdt_nop_combo, usdt_nop_combo,"usdt_nop_combo" );#endif tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +0
-0@@ -2,7 +2,7 @@
Quoted 6 lines
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh line 5
Quoted 4 lines
tools/testing/selftests/bpf/benchs/run_bench_uprobes.sh +1
-1set -eufo pipefail -for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} +for i in usermode-count syscall-count {uprobe,uretprobe}-{nop,push,ret,nop5} usdt_nop usdt_nop_combousdt_{nop,nop5}, consistency ;)
ook, will change
thanks,
jirka