From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org,
anthony.l.nguyen@intel.com, kuba@kernel.org,
bjorn.topel@intel.com, magnus.karlsson@intel.com,
Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Subject: [PATCH v3 net-next 04/11] ice: simplify ice_run_xdp
Date: Mon, 18 Jan 2021 16:13:11 +0100 [thread overview]
Message-ID: <20210118151318.12324-5-maciej.fijalkowski@intel.com> (raw)
In-Reply-To: <20210118151318.12324-1-maciej.fijalkowski@intel.com>
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>
---
drivers/net/ethernet/intel/ice/ice_txrx.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 422f53997c02..dc1ad45eac8d 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -537,22 +537,20 @@ static int
ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,
struct bpf_prog *xdp_prog)
{
- int err, result = ICE_XDP_PASS;
struct ice_ring *xdp_ring;
+ int err;
u32 act;
act = bpf_prog_run_xdp(xdp_prog, xdp);
switch (act) {
case XDP_PASS:
- break;
+ return ICE_XDP_PASS;
case XDP_TX:
xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];
- result = ice_xmit_xdp_buff(xdp, xdp_ring);
- break;
+ return ice_xmit_xdp_buff(xdp, xdp_ring);
case XDP_REDIRECT:
err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
- result = !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
- break;
+ return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
default:
bpf_warn_invalid_xdp_action(act);
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);
fallthrough;
case XDP_DROP:
- result = ICE_XDP_CONSUMED;
- break;
+ return ICE_XDP_CONSUMED;
}
-
- return result;
}
/**
--
2.20.1
next prev parent reply other threads:[~2021-01-18 15:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 15:13 [PATCH v3 net-next 00/11] intel driver cleanups Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 01/11] i40e: drop redundant check when setting xdp prog Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 02/11] i40e: drop misleading function comments Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 03/11] i40e: adjust i40e_is_non_eop Maciej Fijalkowski
2021-01-18 15:13 ` Maciej Fijalkowski [this message]
2021-01-18 15:13 ` [PATCH v3 net-next 05/11] ice: move skb pointer from rx_buf to rx_ring Maciej Fijalkowski
2021-01-23 1:13 ` [Intel-wired-lan] " Brelinski, TonyX
2021-01-18 15:13 ` [PATCH v3 net-next 06/11] ice: remove redundant checks in ice_change_mtu Maciej Fijalkowski
2021-01-23 0:24 ` [Intel-wired-lan] " Brelinski, TonyX
2021-01-18 15:13 ` [PATCH v3 net-next 07/11] ice: skip NULL check against XDP prog in ZC path Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 08/11] i40e, xsk: Simplify the do-while allocation loop Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 09/11] i40e: store the result of i40e_rx_offset() onto i40e_ring Maciej Fijalkowski
2021-01-18 15:13 ` [PATCH v3 net-next 10/11] ice: store the result of ice_rx_offset() onto ice_ring Maciej Fijalkowski
2021-01-23 1:16 ` [Intel-wired-lan] " Brelinski, TonyX
2021-01-18 15:13 ` [PATCH v3 net-next 11/11] ixgbe: store the result of ixgbe_rx_offset() onto ixgbe_ring Maciej Fijalkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210118151318.12324-5-maciej.fijalkowski@intel.com \
--to=maciej.fijalkowski@intel.com \
--cc=anthony.l.nguyen@intel.com \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=kuba@kernel.org \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).