xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice: simplify ice_run_xdp

Browse Source 
[ Upstream commit 59c97d1b51b119eace6b1e61a6f820701f5a8299 ]

There's no need for 'result' variable, we can directly return the
internal status based on action returned by xdp prog.

Reviewed-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Maciej Fijalkowski
2021-01-18 16:13:11 +01:00
committed by Greg Kroah-Hartman
parent 274d6eeaaf
commit 7bd82b73d5
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/ethernet/intel/ice/ice_txrx.c
View File

@@ -537,22 +537,20 @@ static int
ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,
struct bpf_prog *xdp_prog) struct bpf_prog *xdp_prog)
{ {
int err, result = ICE_XDP_PASS;
struct ice_ring *xdp_ring; struct ice_ring *xdp_ring;
int err;
u32 act; u32 act;
act = bpf_prog_run_xdp(xdp_prog, xdp); act = bpf_prog_run_xdp(xdp_prog, xdp);
switch (act) { switch (act) {
case XDP_PASS: case XDP_PASS:
break; return ICE_XDP_PASS;
case XDP_TX: case XDP_TX:
xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()]; xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];
result = ice_xmit_xdp_buff(xdp, xdp_ring); return ice_xmit_xdp_buff(xdp, xdp_ring);
break;
case XDP_REDIRECT: case XDP_REDIRECT:
err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog); err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED; return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
break;
default: default:
bpf_warn_invalid_xdp_action(act); bpf_warn_invalid_xdp_action(act);
fallthrough; fallthrough;
@@ -560,11 +558,8 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,
trace_xdp_exception(rx_ring->netdev, xdp_prog, act); trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
fallthrough; fallthrough;
case XDP_DROP: case XDP_DROP:
result = ICE_XDP_CONSUMED; return ICE_XDP_CONSUMED;
break;
} }
return result;
} }
/** /**