diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2020-01-16 16:14:46 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-01-16 20:03:34 -0800 |
| commit | 58aa94f922c1b44e0919d1814d2eab5b9e8bf945 (patch) | |
| tree | 7de417a5b4a09f9982d8d29e5f3da95299b501bb /samples/bpf | |
| parent | 1d233886dd904edbf239eeffe435c3308ae97625 (diff) | |
| download | linux-riscv-58aa94f922c1b44e0919d1814d2eab5b9e8bf945.tar.gz linux-riscv-58aa94f922c1b44e0919d1814d2eab5b9e8bf945.tar.bz2 linux-riscv-58aa94f922c1b44e0919d1814d2eab5b9e8bf945.zip | |
devmap: Adjust tracepoint for map-less queue flush
Now that we don't have a reference to a devmap when flushing the device
bulk queue, let's change the the devmap_xmit tracepoint to remote the
map_id and map_index fields entirely. Rearrange the fields so 'drops' and
'sent' stay in the same position in the tracepoint struct, to make it
possible for the xdp_monitor utility to read both the old and the new
format.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/157918768613.1458396.9165902403373826572.stgit@toke.dk
Diffstat (limited to 'samples/bpf')
| -rw-r--r-- | samples/bpf/xdp_monitor_kern.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/samples/bpf/xdp_monitor_kern.c b/samples/bpf/xdp_monitor_kern.c index ad10fe700d7d..39458a44472e 100644 --- a/samples/bpf/xdp_monitor_kern.c +++ b/samples/bpf/xdp_monitor_kern.c @@ -222,14 +222,12 @@ struct bpf_map_def SEC("maps") devmap_xmit_cnt = { */ struct devmap_xmit_ctx { u64 __pad; // First 8 bytes are not accessible by bpf code - int map_id; // offset:8; size:4; signed:1; + int from_ifindex; // offset:8; size:4; signed:1; u32 act; // offset:12; size:4; signed:0; - u32 map_index; // offset:16; size:4; signed:0; + int to_ifindex; // offset:16; size:4; signed:1; int drops; // offset:20; size:4; signed:1; int sent; // offset:24; size:4; signed:1; - int from_ifindex; // offset:28; size:4; signed:1; - int to_ifindex; // offset:32; size:4; signed:1; - int err; // offset:36; size:4; signed:1; + int err; // offset:28; size:4; signed:1; }; SEC("tracepoint/xdp/xdp_devmap_xmit") |