Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

samples/bpf: xdpsock, minor fixes

Browse Source 
- 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>
This commit is contained in:
Prashant Bhole 2018-08-31 10:00:49 +09:00 committed by Daniel Borkmann
parent a29c8bb640
commit 11c3f51136
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/bpf/xdpsock_kern.c
View File

@ -16,7 +16,7 @@ struct bpf_map_def SEC("maps") xsks_map = {
.type = BPF_MAP_TYPE_XSKMAP, .type = BPF_MAP_TYPE_XSKMAP,
.key_size = sizeof(int), .key_size = sizeof(int),
.value_size = sizeof(int), .value_size = sizeof(int),
.max_entries = 4, .max_entries = MAX_SOCKS,
}; };
struct bpf_map_def SEC("maps") rr_map = { struct bpf_map_def SEC("maps") rr_map = {

3
samples/bpf/xdpsock_user.c
View File

@ -118,7 +118,6 @@ struct xdpsock {
unsigned long prev_tx_npkts; unsigned long prev_tx_npkts;
}; };
#define MAX_SOCKS 4
static int num_socks; static int num_socks;
struct xdpsock *xsks[MAX_SOCKS]; struct xdpsock *xsks[MAX_SOCKS];
@ -596,7 +595,7 @@ static void dump_stats(void)
prev_time = now; 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"; char *fmt = "%-15s %'-11.0f %'-11lu\n";
double rx_pps, tx_pps; double rx_pps, tx_pps;