From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net
Cc: "Björn Töpel" <bjorn.topel@intel.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
jeffrey.t.kirsher@intel.com, anthony.l.nguyen@intel.com,
"Andrew Bowers" <andrewx.bowers@intel.com>
Subject: [net-next 3/6] i40e, xsk: remove HW descriptor prefetch in AF_XDP path
Date: Tue, 28 Jul 2020 12:08:39 -0700 [thread overview]
Message-ID: <20200728190842.1284145-4-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20200728190842.1284145-1-anthony.l.nguyen@intel.com>
From: Björn Töpel <bjorn.topel@intel.com>
The software prefetching of HW descriptors has a negative impact on
the performance. Therefore, it is now removed.
Performance for the rx_drop benchmark increased with 2%.
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 13 +++++++++++++
drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 13 -------------
drivers/net/ethernet/intel/i40e/i40e_xsk.c | 12 ++++++++++++
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 5d408fe26063..31dc1a011b2a 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2301,6 +2301,19 @@ void i40e_finalize_xdp_rx(struct i40e_ring *rx_ring, unsigned int xdp_res)
}
}
+/**
+ * i40e_inc_ntc: Advance the next_to_clean index
+ * @rx_ring: Rx ring
+ **/
+static void i40e_inc_ntc(struct i40e_ring *rx_ring)
+{
+ u32 ntc = rx_ring->next_to_clean + 1;
+
+ ntc = (ntc < rx_ring->count) ? ntc : 0;
+ rx_ring->next_to_clean = ntc;
+ prefetch(I40E_RX_DESC(rx_ring, ntc));
+}
+
/**
* i40e_clean_rx_irq - Clean completed descriptors from Rx ring - bounce buf
* @rx_ring: rx descriptor ring to transact packets on
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h
index 667c4dc4b39f..1397dd3c1c57 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h
@@ -99,19 +99,6 @@ static inline bool i40e_rx_is_programming_status(u64 qword1)
return qword1 & I40E_RXD_QW1_LENGTH_SPH_MASK;
}
-/**
- * i40e_inc_ntc: Advance the next_to_clean index
- * @rx_ring: Rx ring
- **/
-static inline void i40e_inc_ntc(struct i40e_ring *rx_ring)
-{
- u32 ntc = rx_ring->next_to_clean + 1;
-
- ntc = (ntc < rx_ring->count) ? ntc : 0;
- rx_ring->next_to_clean = ntc;
- prefetch(I40E_RX_DESC(rx_ring, ntc));
-}
-
void i40e_xsk_clean_rx_ring(struct i40e_ring *rx_ring);
void i40e_xsk_clean_tx_ring(struct i40e_ring *tx_ring);
bool i40e_xsk_any_rx_ring_enabled(struct i40e_vsi *vsi);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
index 8ce57b507a21..1f2dd591dbf1 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
@@ -253,6 +253,18 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring,
return skb;
}
+/**
+ * i40e_inc_ntc: Advance the next_to_clean index
+ * @rx_ring: Rx ring
+ **/
+static void i40e_inc_ntc(struct i40e_ring *rx_ring)
+{
+ u32 ntc = rx_ring->next_to_clean + 1;
+
+ ntc = (ntc < rx_ring->count) ? ntc : 0;
+ rx_ring->next_to_clean = ntc;
+}
+
/**
* i40e_clean_rx_irq_zc - Consumes Rx packets from the hardware ring
* @rx_ring: Rx ring
--
2.26.2
next prev parent reply other threads:[~2020-07-28 19:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 19:08 [net-next 0/6][pull request] 40GbE Intel Wired LAN Driver Updates 2020-07-28 Tony Nguyen
2020-07-28 19:08 ` [net-next 1/6] i40e: not compute affinity_mask for IRQ Tony Nguyen
2020-07-28 19:08 ` [net-next 2/6] i40e: prefetch struct page of Rx buffer conditionally Tony Nguyen
2020-07-28 20:14 ` Jakub Kicinski
2020-07-29 6:20 ` 答复: " Li,Rongqing
2020-07-29 21:20 ` Jakub Kicinski
2020-07-30 1:15 ` 答复: " Li,Rongqing
2020-07-28 19:08 ` Tony Nguyen [this message]
2020-07-28 19:08 ` [net-next 4/6] i40e: use 16B HW descriptors instead of 32B Tony Nguyen
2020-07-28 19:08 ` [net-next 5/6] i40e, xsk: increase budget for AF_XDP path Tony Nguyen
2020-07-28 20:15 ` Jakub Kicinski
2020-07-29 10:43 ` Björn Töpel
2020-07-29 21:22 ` Jakub Kicinski
2020-07-28 19:08 ` [net-next 6/6] i40e, xsk: move buffer allocation out of the Rx processing loop Tony Nguyen
2020-07-28 20:16 ` [net-next 0/6][pull request] 40GbE Intel Wired LAN Driver Updates 2020-07-28 Jakub Kicinski
2020-08-10 11:47 ` Björn Töpel
2020-08-10 11:51 ` Björn Töpel
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=20200728190842.1284145-4-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=andrewx.bowers@intel.com \
--cc=bjorn.topel@intel.com \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@intel.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.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).