[v2] net/i40e: fix avx2 driver check for rx rearm

Message ID 1532972059-191978-1-git-send-email-harry.van.haaren@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/i40e: fix avx2 driver check for rx rearm |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Van Haaren, Harry July 30, 2018, 5:34 p.m. UTC
  This commit fixes an infinite loop bug that could occur
if the i40e AVX2 driver is used, and high traffic rates
cause the mempool from which the rxq pulls mbufs to become
empty.

The result would be an infinite loop of checking if we
should perform an rx rearm, calling the function and an
error return due the the mempool being emtpy.

The fix is to align the code in the AVX2 driver with the
SSE driver, where an if() is used instead of a while(),
allowing the thread to return from i40e rx function even
if the mempool is empty.

Fixes: dafadd73762e ("net/i40e: add AVX2 Rx function")
Cc: bruce.richardson@intel.com
Cc: stable@dpdk.org

Reported-by: David Coyle <david.coyle@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>

---

v2:
- Fix typo, sorry for email flood :)

Cc: thomas@monjalon.net
@Thomas, please consider this fix for inclusion in 18.08-rc3
assuming it gets verified as a good fix and Acked.

Reporter please verify:
Cc: david.coyle@intel.com

i40e maintainers, please Review/Ack:
Cc: beilei.xing@intel.com
Cc: qi.z.zhang@intel.com
---
 drivers/net/i40e/i40e_rxtx_vec_avx2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Coyle, David July 31, 2018, 2:24 p.m. UTC | #1
-----Original Message-----
From: Van Haaren, Harry 
Sent: Monday, July 30, 2018 6:34 PM
To: dev@dpdk.org
Cc: Van Haaren, Harry <harry.van.haaren@intel.com>; Richardson, Bruce <bruce.richardson@intel.com>; stable@dpdk.org; thomas@monjalon.net; Coyle, David <david.coyle@intel.com>; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
Subject: [PATCH v2] net/i40e: fix avx2 driver check for rx rearm

This commit fixes an infinite loop bug that could occur if the i40e AVX2 driver is used, and high traffic rates cause the mempool from which the rxq pulls mbufs to become empty.

The result would be an infinite loop of checking if we should perform an rx rearm, calling the function and an error return due the the mempool being emtpy.

The fix is to align the code in the AVX2 driver with the SSE driver, where an if() is used instead of a while(), allowing the thread to return from i40e rx function even if the mempool is empty.

Fixes: dafadd73762e ("net/i40e: add AVX2 Rx function")
Cc: bruce.richardson@intel.com
Cc: stable@dpdk.org

Reported-by: David Coyle <david.coyle@intel.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
Acked-by: Brendan Ryan <brendan.ryan@intel.com>
Tested-by: David Coyle <david.coyle@intel.com>
--------------------------------------------------------------
Intel Research and Development Ireland Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263


This e-mail and any attachments may contain confidential material for the sole
use of the intended recipient(s). Any review or distribution by others is
strictly prohibited. If you are not the intended recipient, please contact the
sender and delete all copies.
  
Qi Zhang Aug. 1, 2018, 12:42 a.m. UTC | #2
> -----Original Message-----
> From: Coyle, David
> Sent: Tuesday, July 31, 2018 10:25 PM
> To: Van Haaren, Harry <harry.van.haaren@intel.com>; dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; stable@dpdk.org;
> thomas@monjalon.net; Xing, Beilei <beilei.xing@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Subject: RE: [PATCH v2] net/i40e: fix avx2 driver check for rx rearm
> 
> 
> 
> -----Original Message-----
> From: Van Haaren, Harry
> Sent: Monday, July 30, 2018 6:34 PM
> To: dev@dpdk.org
> Cc: Van Haaren, Harry <harry.van.haaren@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; stable@dpdk.org; thomas@monjalon.net;
> Coyle, David <david.coyle@intel.com>; Xing, Beilei <beilei.xing@intel.com>;
> Zhang, Qi Z <qi.z.zhang@intel.com>
> Subject: [PATCH v2] net/i40e: fix avx2 driver check for rx rearm
> 
> This commit fixes an infinite loop bug that could occur if the i40e AVX2 driver
> is used, and high traffic rates cause the mempool from which the rxq pulls
> mbufs to become empty.
> 
> The result would be an infinite loop of checking if we should perform an rx
> rearm, calling the function and an error return due the the mempool being
> emtpy.
> 
> The fix is to align the code in the AVX2 driver with the SSE driver, where an if()
> is used instead of a while(), allowing the thread to return from i40e rx
> function even if the mempool is empty.
> 
> Fixes: dafadd73762e ("net/i40e: add AVX2 Rx function")
> Cc: bruce.richardson@intel.com
> Cc: stable@dpdk.org
> 
> Reported-by: David Coyle <david.coyle@intel.com>
> Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
> Acked-by: Brendan Ryan <brendan.ryan@intel.com>
> Tested-by: David Coyle <david.coyle@intel.com>

Applied to dpdk-next-net-intel.

Thanks!
Qi
  

Patch

diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx2.c b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
index dbcb61f..23179b3 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_avx2.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_avx2.c
@@ -188,7 +188,7 @@  _recv_raw_pkts_vec_avx2(struct i40e_rx_queue *rxq, struct rte_mbuf **rx_pkts,
 	/* See if we need to rearm the RX queue - gives the prefetch a bit
 	 * of time to act
 	 */
-	while (rxq->rxrearm_nb > RTE_I40E_RXQ_REARM_THRESH)
+	if (rxq->rxrearm_nb > RTE_I40E_RXQ_REARM_THRESH)
 		i40e_rxq_rearm(rxq);
 
 	/* Before we start moving massive data around, check to see if