.. | .. |
---|
8 | 8 | #include <linux/netdevice.h> |
---|
9 | 9 | #include <linux/version.h> |
---|
10 | 10 | #include <uapi/linux/bpf.h> |
---|
11 | | -#include "bpf_helpers.h" |
---|
| 11 | +#include <bpf/bpf_helpers.h> |
---|
| 12 | +#include <bpf/bpf_tracing.h> |
---|
12 | 13 | |
---|
13 | | -struct bpf_map_def SEC("maps") my_map = { |
---|
14 | | - .type = BPF_MAP_TYPE_HASH, |
---|
15 | | - .key_size = sizeof(long), |
---|
16 | | - .value_size = sizeof(u64), |
---|
17 | | - .max_entries = 4096, |
---|
18 | | -}; |
---|
| 14 | +struct { |
---|
| 15 | + __uint(type, BPF_MAP_TYPE_HASH); |
---|
| 16 | + __type(key, long); |
---|
| 17 | + __type(value, u64); |
---|
| 18 | + __uint(max_entries, 4096); |
---|
| 19 | +} my_map SEC(".maps"); |
---|
19 | 20 | |
---|
20 | 21 | /* kprobe is NOT a stable ABI. If kernel internals change this bpf+kprobe |
---|
21 | 22 | * example will no longer be meaningful |
---|
22 | 23 | */ |
---|
23 | | -SEC("kprobe/blk_start_request") |
---|
| 24 | +SEC("kprobe/blk_mq_start_request") |
---|
24 | 25 | int bpf_prog1(struct pt_regs *ctx) |
---|
25 | 26 | { |
---|
26 | 27 | long rq = PT_REGS_PARM1(ctx); |
---|
.. | .. |
---|
41 | 42 | |
---|
42 | 43 | #define SLOTS 100 |
---|
43 | 44 | |
---|
44 | | -struct bpf_map_def SEC("maps") lat_map = { |
---|
45 | | - .type = BPF_MAP_TYPE_PERCPU_ARRAY, |
---|
46 | | - .key_size = sizeof(u32), |
---|
47 | | - .value_size = sizeof(u64), |
---|
48 | | - .max_entries = SLOTS, |
---|
49 | | -}; |
---|
| 45 | +struct { |
---|
| 46 | + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); |
---|
| 47 | + __uint(key_size, sizeof(u32)); |
---|
| 48 | + __uint(value_size, sizeof(u64)); |
---|
| 49 | + __uint(max_entries, SLOTS); |
---|
| 50 | +} lat_map SEC(".maps"); |
---|
50 | 51 | |
---|
51 | | -SEC("kprobe/blk_account_io_completion") |
---|
| 52 | +SEC("kprobe/blk_account_io_done") |
---|
52 | 53 | int bpf_prog2(struct pt_regs *ctx) |
---|
53 | 54 | { |
---|
54 | 55 | long rq = PT_REGS_PARM1(ctx); |
---|