From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net, kuba@kernel.org
Cc: Andre Guedes <andre.guedes@intel.com>,
netdev@vger.kernel.org, sassmann@redhat.com,
anthony.l.nguyen@intel.com, bjorn.topel@intel.com,
magnus.karlsson@intel.com, maciej.fijalkowski@intel.com,
sasha.neftin@intel.com, vitaly.lifshits@intel.com,
Vedang Patel <vedang.patel@intel.com>,
Jithu Joseph <jithu.joseph@intel.com>,
Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Subject: [PATCH net-next 2/9] igc: Refactor __igc_xdp_run_prog()
Date: Fri, 9 Apr 2021 09:43:44 -0700 [thread overview]
Message-ID: <20210409164351.188953-3-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20210409164351.188953-1-anthony.l.nguyen@intel.com>
From: Andre Guedes <andre.guedes@intel.com>
Refactor __igc_xdp_run_prog() helper from igc_xdp_run_prog(),
preparing the code for AF_XDP zero-copy support which is added
by upcoming patches.
The existing igc_xdp_run_prog() caters to regular XDP rx path
which has to verify if bpf_prog is not NULL. Zero-copy
path assumes that bpf_prog is not NULL and hence this check is
not required. Therefore it makes sense to refactor the common
code into a helper function, to avoid code duplication.
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 56 +++++++++++------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index eef2e195dd37..86ec04972a64 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2020,38 +2020,22 @@ static int igc_xdp_xmit_back(struct igc_adapter *adapter, struct xdp_buff *xdp)
return res;
}
-static struct sk_buff *igc_xdp_run_prog(struct igc_adapter *adapter,
- struct xdp_buff *xdp)
+/* This function assumes rcu_read_lock() is held by the caller. */
+static int __igc_xdp_run_prog(struct igc_adapter *adapter,
+ struct bpf_prog *prog,
+ struct xdp_buff *xdp)
{
- struct bpf_prog *prog;
- int res;
- u32 act;
-
- rcu_read_lock();
-
- prog = READ_ONCE(adapter->xdp_prog);
- if (!prog) {
- res = IGC_XDP_PASS;
- goto unlock;
- }
+ u32 act = bpf_prog_run_xdp(prog, xdp);
- act = bpf_prog_run_xdp(prog, xdp);
switch (act) {
case XDP_PASS:
- res = IGC_XDP_PASS;
- break;
+ return IGC_XDP_PASS;
case XDP_TX:
- if (igc_xdp_xmit_back(adapter, xdp) < 0)
- res = IGC_XDP_CONSUMED;
- else
- res = IGC_XDP_TX;
- break;
+ return igc_xdp_xmit_back(adapter, xdp) < 0 ?
+ IGC_XDP_CONSUMED : IGC_XDP_TX;
case XDP_REDIRECT:
- if (xdp_do_redirect(adapter->netdev, xdp, prog) < 0)
- res = IGC_XDP_CONSUMED;
- else
- res = IGC_XDP_REDIRECT;
- break;
+ return xdp_do_redirect(adapter->netdev, xdp, prog) < 0 ?
+ IGC_XDP_CONSUMED : IGC_XDP_REDIRECT;
default:
bpf_warn_invalid_xdp_action(act);
fallthrough;
@@ -2059,9 +2043,25 @@ static struct sk_buff *igc_xdp_run_prog(struct igc_adapter *adapter,
trace_xdp_exception(adapter->netdev, prog, act);
fallthrough;
case XDP_DROP:
- res = IGC_XDP_CONSUMED;
- break;
+ return IGC_XDP_CONSUMED;
}
+}
+
+static struct sk_buff *igc_xdp_run_prog(struct igc_adapter *adapter,
+ struct xdp_buff *xdp)
+{
+ struct bpf_prog *prog;
+ int res;
+
+ rcu_read_lock();
+
+ prog = READ_ONCE(adapter->xdp_prog);
+ if (!prog) {
+ res = IGC_XDP_PASS;
+ goto unlock;
+ }
+
+ res = __igc_xdp_run_prog(adapter, prog, xdp);
unlock:
rcu_read_unlock();
--
2.26.2
next prev parent reply other threads:[~2021-04-09 16:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 16:43 [PATCH net-next 0/9][pull request] 1GbE Intel Wired LAN Driver Updates 2021-04-09 Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 1/9] igc: Move igc_xdp_is_enabled() Tony Nguyen
2021-04-09 16:43 ` Tony Nguyen [this message]
2021-04-09 16:43 ` [PATCH net-next 3/9] igc: Refactor igc_clean_rx_ring() Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 4/9] igc: Refactor XDP rxq info registration Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 5/9] igc: Introduce TX/RX stats helpers Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 6/9] igc: Introduce igc_unmap_tx_buffer() helper Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 7/9] igc: Replace IGC_TX_FLAGS_XDP flag by an enum Tony Nguyen
2021-04-09 16:43 ` [PATCH net-next 8/9] igc: Enable RX via AF_XDP zero-copy Tony Nguyen
2021-04-10 0:36 ` Jakub Kicinski
2021-04-14 23:14 ` Joseph, Jithu
2021-04-14 23:25 ` Jakub Kicinski
2021-04-14 23:59 ` Joseph, Jithu
2021-04-15 0:31 ` Jakub Kicinski
2021-04-09 16:43 ` [PATCH net-next 9/9] igc: Enable TX " Tony Nguyen
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=20210409164351.188953-3-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=andre.guedes@intel.com \
--cc=bjorn.topel@intel.com \
--cc=davem@davemloft.net \
--cc=dvorax.fuxbrumer@linux.intel.com \
--cc=jithu.joseph@intel.com \
--cc=kuba@kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=magnus.karlsson@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sasha.neftin@intel.com \
--cc=sassmann@redhat.com \
--cc=vedang.patel@intel.com \
--cc=vitaly.lifshits@intel.com \
/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).