diff options
| author | Jesper Dangaard Brouer <brouer@redhat.com> | 2020-01-16 16:14:46 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2020-01-17 05:03:34 +0100 |
| commit | 58aa94f922c1b44e0919d1814d2eab5b9e8bf945 (patch) | |
| tree | 7de417a5b4a09f9982d8d29e5f3da95299b501bb /kernel/bpf/devmap.c | |
| parent | xdp: Use bulking for non-map XDP_REDIRECT and consolidate code paths (diff) | |
| download | linux-58aa94f922c1b44e0919d1814d2eab5b9e8bf945.tar.xz linux-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 'kernel/bpf/devmap.c')
| -rw-r--r-- | kernel/bpf/devmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index d5311009953f..de630f980282 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -340,7 +340,7 @@ static int bq_xmit_all(struct xdp_dev_bulk_queue *bq, u32 flags) out: bq->count = 0; - trace_xdp_devmap_xmit(NULL, 0, sent, drops, bq->dev_rx, dev, err); + trace_xdp_devmap_xmit(bq->dev_rx, dev, sent, drops, err); bq->dev_rx = NULL; __list_del_clearprev(&bq->flush_node); return 0; |