diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2022-05-25 14:38:33 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-05-25 15:36:05 +0000 |
| commit | 5c8226991a9f7851a4ecde3ebb23b4d0397713f8 (patch) | |
| tree | 31d0adbc6f660b89a45776b32d38d7a17b26e688 | |
| parent | 020f86515ade5df0ec86f88169ee85a85590ad26 (diff) | |
| download | strace-5c8226991a9f7851a4ecde3ebb23b4d0397713f8.tar.gz | |
xlat: add BPF_TRACE_KPROBE_MULTI to bpf_attach_type
* src/xlat/bpf_attach_type.in (BPF_TRACE_KPROBE_MULTI): New constant,
introduced by Linux commit v5.18-rc1~136^2~11^2~28^2~10.
* tests/bpf.c (BPF_PROG_QUERY_checks): Update expected output.
* NEWS: Mention this.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | src/xlat/bpf_attach_type.in | 1 | ||||
| -rw-r--r-- | tests/bpf.c | 8 |
3 files changed, 7 insertions, 6 deletions
@@ -6,8 +6,8 @@ Noteworthy changes in release ?.?? (????-??-??) * Added --tips option to print strace tips, tricks, and tweaks at the end of the tracing session. * Enhanced decoding of io_uring_register syscall. - * Updated lists of BR_*, BTRFS_*, IFA_*, IFLA_*, IORING_*, KEY_*, KVM_*, - MADV_*, and UFFD_* constants. + * Updated lists of BPF_*, BR_*, BTRFS_*, IFA_*, IFLA_*, IORING_*, KEY_*, + KVM_*, MADV_*, and UFFD_* constants. * Updated lists of ioctl commands from Linux 5.18. * Bug fixes diff --git a/src/xlat/bpf_attach_type.in b/src/xlat/bpf_attach_type.in index 412068698..70b6648e8 100644 --- a/src/xlat/bpf_attach_type.in +++ b/src/xlat/bpf_attach_type.in @@ -41,3 +41,4 @@ BPF_SK_SKB_VERDICT 38 BPF_SK_REUSEPORT_SELECT 39 BPF_SK_REUSEPORT_SELECT_OR_MIGRATE 40 BPF_PERF_EVENT 41 +BPF_TRACE_KPROBE_MULTI 42 diff --git a/tests/bpf.c b/tests/bpf.c index 6a2c468da..dfceeb541 100644 --- a/tests/bpf.c +++ b/tests/bpf.c @@ -1210,13 +1210,13 @@ static struct bpf_attr_check BPF_PROG_QUERY_checks[] = { { /* 1 */ .data = { .BPF_PROG_QUERY_data = { .target_fd = 3141592653U, - .attach_type = 40, + .attach_type = 42, .query_flags = 1, .attach_flags = 3, } }, .size = offsetofend(struct BPF_PROG_QUERY_struct, attach_flags), .str = "query={target_fd=-1153374643" - ", attach_type=BPF_SK_REUSEPORT_SELECT_OR_MIGRATE" + ", attach_type=BPF_TRACE_KPROBE_MULTI" ", query_flags=BPF_F_QUERY_EFFECTIVE" ", attach_flags=BPF_F_ALLOW_OVERRIDE|BPF_F_ALLOW_MULTI" ", prog_ids=NULL, prog_cnt=0}", @@ -1224,7 +1224,7 @@ static struct bpf_attr_check BPF_PROG_QUERY_checks[] = { { /* 2 */ .data = { .BPF_PROG_QUERY_data = { .target_fd = 3141592653U, - .attach_type = 42, + .attach_type = 43, .query_flags = 0xfffffffe, .attach_flags = 0xfffffff8, .prog_ids = 0xffffffffffffffffULL, @@ -1232,7 +1232,7 @@ static struct bpf_attr_check BPF_PROG_QUERY_checks[] = { } }, .size = offsetofend(struct BPF_PROG_QUERY_struct, prog_cnt), .str = "query={target_fd=-1153374643" - ", attach_type=0x2a /* BPF_??? */" + ", attach_type=0x2b /* BPF_??? */" ", query_flags=0xfffffffe /* BPF_F_QUERY_??? */" ", attach_flags=0xfffffff8 /* BPF_F_??? */" ", prog_ids=" |