diff options
| author | Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp> | 2018-08-31 10:00:49 +0900 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-09-01 01:36:08 +0200 |
| commit | 11c3f5113600c40cc8789f9a7023e02b73cb0ca7 (patch) | |
| tree | db25a98797cdf9ed1175c8dc435c6d90632ce1b0 /samples | |
| parent | a29c8bb640ca13f5731510ceaf65a6e1fe6055c8 (diff) | |
| download | linux-11c3f5113600c40cc8789f9a7023e02b73cb0ca7.tar.bz2 | |
samples/bpf: xdpsock, minor fixes
- xsks_map size was fixed to 4, changed it MAX_SOCKS
- Remove redundant definition of MAX_SOCKS in xdpsock_user.c
- In dump_stats(), add NULL check for xsks[i]
Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Acked-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/xdpsock_kern.c | 2 | ||||
| -rw-r--r-- | samples/bpf/xdpsock_user.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/samples/bpf/xdpsock_kern.c b/samples/bpf/xdpsock_kern.c index d8806c41362e..b8ccd0802b3f 100644 --- a/samples/bpf/xdpsock_kern.c +++ b/samples/bpf/xdpsock_kern.c @@ -16,7 +16,7 @@ struct bpf_map_def SEC("maps") xsks_map = { .type = BPF_MAP_TYPE_XSKMAP, .key_size = sizeof(int), .value_size = sizeof(int), - .max_entries = 4, + .max_entries = MAX_SOCKS, }; struct bpf_map_def SEC("maps") rr_map = { diff --git a/samples/bpf/xdpsock_user.c b/samples/bpf/xdpsock_user.c index b3906111bedb..57ecadc58403 100644 --- a/samples/bpf/xdpsock_user.c +++ b/samples/bpf/xdpsock_user.c @@ -118,7 +118,6 @@ struct xdpsock { unsigned long prev_tx_npkts; }; -#define MAX_SOCKS 4 static int num_socks; struct xdpsock *xsks[MAX_SOCKS]; @@ -596,7 +595,7 @@ static void dump_stats(void) prev_time = now; - for (i = 0; i < num_socks; i++) { + for (i = 0; i < num_socks && xsks[i]; i++) { char *fmt = "%-15s %'-11.0f %'-11lu\n"; double rx_pps, tx_pps; |