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 3/9] igc: Refactor igc_clean_rx_ring()
Date: Fri, 9 Apr 2021 09:43:45 -0700 [thread overview]
Message-ID: <20210409164351.188953-4-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_clean_rx_ring() helper, preparing the code for AF_XDP
zero-copy support which is added by upcoming patches.
The refactor consists of encapsulating page-shared specific code into
its own helper, leaving common code that will be shared by both
page-shared and xsk pool in igc_clean_rx_ring().
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 | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 86ec04972a64..f715b69805fa 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -346,11 +346,7 @@ static int igc_setup_all_tx_resources(struct igc_adapter *adapter)
return err;
}
-/**
- * igc_clean_rx_ring - Free Rx Buffers per Queue
- * @rx_ring: ring to free buffers from
- */
-static void igc_clean_rx_ring(struct igc_ring *rx_ring)
+static void igc_clean_rx_ring_page_shared(struct igc_ring *rx_ring)
{
u16 i = rx_ring->next_to_clean;
@@ -383,12 +379,21 @@ static void igc_clean_rx_ring(struct igc_ring *rx_ring)
if (i == rx_ring->count)
i = 0;
}
+}
+
+/**
+ * igc_clean_rx_ring - Free Rx Buffers per Queue
+ * @ring: ring to free buffers from
+ */
+static void igc_clean_rx_ring(struct igc_ring *ring)
+{
+ igc_clean_rx_ring_page_shared(ring);
- clear_ring_uses_large_buffer(rx_ring);
+ clear_ring_uses_large_buffer(ring);
- rx_ring->next_to_alloc = 0;
- rx_ring->next_to_clean = 0;
- rx_ring->next_to_use = 0;
+ ring->next_to_alloc = 0;
+ ring->next_to_clean = 0;
+ ring->next_to_use = 0;
}
/**
--
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 ` [PATCH net-next 2/9] igc: Refactor __igc_xdp_run_prog() Tony Nguyen
2021-04-09 16:43 ` Tony Nguyen [this message]
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-4-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).