diff mbox series

[v2] net/ice: fix the judgment order of buffer split

Message ID 20221017170459.775039-1-yuanx.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/ice: fix the judgment order of buffer split |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/github-robot: build success github build: passed
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS

Commit Message

Wang, YuanX Oct. 17, 2022, 5:04 p.m. UTC 
  proto_hdr defines a bit mask of the protocol sequence as RTE_PTYPE_*,
The last RTE_PTYPE* in the mask indicates the split position.

To get the split position from proto_hdr, the order of judgement should
be from inner to outer layer, so for tunneling packets the tunnel header
should be placed at the end of the judgement condition.

Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx")

Signed-off-by: Yuan Wang <yuanx.wang@intel.com>

---
v2: fix typo

---
 drivers/net/ice/ice_rxtx.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Yaqi Tang Oct. 17, 2022, 9:34 a.m. UTC | #1 
> -----Original Message-----
> From: Wang, YuanX <yuanx.wang@intel.com>
> Sent: Tuesday, October 18, 2022 1:05 AM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Ding, Xuan <xuan.ding@intel.com>; Tang, Yaqi
> <yaqi.tang@intel.com>; Wang, YuanX <yuanx.wang@intel.com>
> Subject: [PATCH v2] net/ice: fix the judgment order of buffer split
> 
> proto_hdr defines a bit mask of the protocol sequence as RTE_PTYPE_*, The
> last RTE_PTYPE* in the mask indicates the split position.
> 
> To get the split position from proto_hdr, the order of judgement should be
> from inner to outer layer, so for tunneling packets the tunnel header should
> be placed at the end of the judgement condition.
> 
> Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx")
> 
> Signed-off-by: Yuan Wang <yuanx.wang@intel.com>
> 
> ---
> v2: fix typo
> 
> ---

Tested-by: Yaqi Tang <yaqi.tang@intel.com>
Qi Zhang Oct. 18, 2022, 7:01 a.m. UTC | #2 
> -----Original Message-----
> From: Wang, YuanX <yuanx.wang@intel.com>
> Sent: Tuesday, October 18, 2022 1:05 AM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Ding, Xuan <xuan.ding@intel.com>; Tang, Yaqi
> <yaqi.tang@intel.com>; Wang, YuanX <yuanx.wang@intel.com>
> Subject: [PATCH v2] net/ice: fix the judgment order of buffer split
> 
> proto_hdr defines a bit mask of the protocol sequence as RTE_PTYPE_*, The
> last RTE_PTYPE* in the mask indicates the split position.
> 
> To get the split position from proto_hdr, the order of judgement should be
> from inner to outer layer, so for tunneling packets the tunnel header should
> be placed at the end of the judgement condition.
> 
> Fixes: 629dad3ef325 ("net/ice: support buffer split in scalar Rx")
> 
> Signed-off-by: Yuan Wang <yuanx.wang@intel.com>

Acked-by: Qi Zhang <qi.z.zhang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
diff mbox series

Patch

diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 953ff217df..7a2d5829c0 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -324,13 +324,6 @@  ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
 			goto set_hsplit_finish;
 		}
 
-		switch (proto_hdr & RTE_PTYPE_TUNNEL_MASK) {
-		case RTE_PTYPE_TUNNEL_GRENAT:
-			rx_ctx.dtype = ICE_RX_DTYPE_HEADER_SPLIT;
-			rx_ctx.hsplit_1 = ICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS;
-			goto set_hsplit_finish;
-		}
-
 		switch (proto_hdr & RTE_PTYPE_INNER_L4_MASK) {
 		case RTE_PTYPE_INNER_L4_TCP:
 		case RTE_PTYPE_INNER_L4_UDP:
@@ -358,6 +351,13 @@  ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
 			goto set_hsplit_finish;
 		}
 
+		switch (proto_hdr & RTE_PTYPE_TUNNEL_MASK) {
+		case RTE_PTYPE_TUNNEL_GRENAT:
+			rx_ctx.dtype = ICE_RX_DTYPE_HEADER_SPLIT;
+			rx_ctx.hsplit_1 = ICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS;
+			goto set_hsplit_finish;
+		}
+
 		PMD_DRV_LOG(ERR, "Buffer split protocol is not supported");
 		return -EINVAL;