iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

samples/bpf: Stop using bpf_map__def() API

Browse Source 
libbpf bpf_map__def() API is being deprecated, replace samples/bpf's
usage with the appropriate getters and setters.

Signed-off-by: Christy Lee <christylee@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220108004218.355761-2-christylee@fb.com
This commit is contained in:
Christy Lee 2022-01-07 16:42:14 -08:00 committed by Andrii Nakryiko
parent 0991f6a38f
commit 76acfce664
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
samples/bpf/xdp_rxq_info_user.c
View File

@ -209,7 +209,7 @@ static struct datarec *alloc_record_per_cpu(void)
static struct record *alloc_record_per_rxq(void) static struct record *alloc_record_per_rxq(void)
{ {
unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; unsigned int nr_rxqs = bpf_map__max_entries(rx_queue_index_map);
struct record *array; struct record *array;
array = calloc(nr_rxqs, sizeof(struct record)); array = calloc(nr_rxqs, sizeof(struct record));
@ -222,7 +222,7 @@ static struct record *alloc_record_per_rxq(void)
static struct stats_record *alloc_stats_record(void) static struct stats_record *alloc_stats_record(void)
{ {
unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; unsigned int nr_rxqs = bpf_map__max_entries(rx_queue_index_map);
struct stats_record *rec; struct stats_record *rec;
int i; int i;
@ -241,7 +241,7 @@ static struct stats_record *alloc_stats_record(void)
static void free_stats_record(struct stats_record *r) static void free_stats_record(struct stats_record *r)
{ {
unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; unsigned int nr_rxqs = bpf_map__max_entries(rx_queue_index_map);
int i; int i;
for (i = 0; i < nr_rxqs; i++) for (i = 0; i < nr_rxqs; i++)
@ -289,7 +289,7 @@ static void stats_collect(struct stats_record *rec)
map_collect_percpu(fd, 0, &rec->stats); map_collect_percpu(fd, 0, &rec->stats);
fd = bpf_map__fd(rx_queue_index_map); fd = bpf_map__fd(rx_queue_index_map);
max_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; max_rxqs = bpf_map__max_entries(rx_queue_index_map);
for (i = 0; i < max_rxqs; i++) for (i = 0; i < max_rxqs; i++)
map_collect_percpu(fd, i, &rec->rxq[i]); map_collect_percpu(fd, i, &rec->rxq[i]);
} }
@ -335,7 +335,7 @@ static void stats_print(struct stats_record *stats_rec,
struct stats_record *stats_prev, struct stats_record *stats_prev,
int action, __u32 cfg_opt) int action, __u32 cfg_opt)
{ {
unsigned int nr_rxqs = bpf_map__def(rx_queue_index_map)->max_entries; unsigned int nr_rxqs = bpf_map__max_entries(rx_queue_index_map);
unsigned int nr_cpus = bpf_num_possible_cpus(); unsigned int nr_cpus = bpf_num_possible_cpus();
double pps = 0, err = 0; double pps = 0, err = 0;
struct record *rec, *prev; struct record *rec, *prev;