bpf: change bq_enqueue() return type from int to void
Subsystems (4)
PATCH 1/1 bpf: change bq_enqueue() return type from int to void
From: Björn Töpel <[email protected]>
The bq_enqueue() functions for {DEV, CPU}MAP always return zero. Changing the return type from int to void makes the code easier to follow.
--- kernel/bpf/cpumap.c | 4 +--- kernel/bpf/devmap.c | 9 ++++----- 2 files changed, 5 insertions(+), 8 deletions(-)
kernel/bpf/cpumap.c +1 -3
@@ -708,7 +708,7 @@ static int bq_flush_to_queue(struct xdp_bulk_queue *bq)/* Runs under RCU-read-side, plus in softirq under NAPI protection. * Thus, safe percpu variable access. */ -static int bq_enqueue (struct bpf_cpu_map_entry *rcpu,struct xdp_frame *xdpf) +static void bq_enqueue (struct bpf_cpu_map_entry *rcpu,struct xdp_frame *xdpf) {struct list_head *flush_list =this_cpu_ptr (&cpu_map_flush_list);struct xdp_bulk_queue *bq =this_cpu_ptr (rcpu->bulkq);
@@ -729,8 +729,6 @@ static int bq_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_frame *xdpf)if (!bq->flush_node.prev)list_add (&bq->flush_node, flush_list); - -return 0 ; } int cpu_map_enqueue(struct bpf_cpu_map_entry *rcpu, struct xdp_buff *xdp,
kernel/bpf/devmap.c +4 -5
@@ -421,8 +421,8 @@ struct bpf_dtab_netdev *__dev_map_lookup_elem(struct bpf_map *map, u32 key)/* Runs under RCU-read-side, plus in softirq under NAPI protection. * Thus, safe percpu variable access. */ -static int bq_enqueue (struct net_device *dev,struct xdp_frame *xdpf, -struct net_device *dev_rx) +static void bq_enqueue (struct net_device *dev,struct xdp_frame *xdpf, +struct net_device *dev_rx) {struct list_head *flush_list =this_cpu_ptr (&dev_flush_list);struct xdp_dev_bulk_queue *bq =this_cpu_ptr (dev->xdp_bulkq);
@@ -441,8 +441,6 @@ static int bq_enqueue(struct net_device *dev, struct xdp_frame *xdpf,if (!bq->flush_node.prev)list_add (&bq->flush_node, flush_list); - -return 0 ; } static inline int __xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,
@@ -462,7 +460,8 @@ static inline int __xdp_enqueue(struct net_device *dev, struct xdp_buff *xdp,if (unlikely (!xdpf))return -EOVERFLOW ; -return bq_enqueue (dev, xdpf, dev_rx); +bq_enqueue (dev, xdpf, dev_rx); +return 0 ; } static struct xdp_buff *dev_map_run_prog(struct net_device *dev,
Signature · 1 line
2.25.1
Quoted 6 lines · Björn Töpel
From: Björn Töpel <[email protected]>
The
bq_enqueue()functions for {DEV, CPU}MAP always return zero. Changing the return type from int to void makes the code easier to follow.
You can expand that to a few other calls in this code path - both bq_flush_to_queue and bq_xmit_all always return 0 as well.
Quoted 11 lines · David Ahern
Quoted 6 lines · Björn Töpel
From: Björn Töpel <[email protected]>
The
bq_enqueue()functions for {DEV, CPU}MAP always return zero. Changing the return type from int to void makes the code easier to follow.You can expand that to a few other calls in this code path - both
bq_flush_to_queueandbq_xmit_allalways return 0 as well.
Indeed! I'll spin a new rev!