net/ice: fix the judgment order of buffer split
Checks
Commit Message
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 hdr_proto, 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>
---
drivers/net/ice/ice_rxtx.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Comments
Hi Yuan,
> -----Original Message-----
> From: Wang, YuanX <yuanx.wang@intel.com>
> Sent: Tuesday, October 18, 2022 12:00 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] 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 hdr_proto, the order of judgement should be
The hdr_proto here should be proto_hdr?
Thanks,
Xuan
> 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>
> ---
> drivers/net/ice/ice_rxtx.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> 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;
>
> --
> 2.25.1
Hi Xuan,
> -----Original Message-----
> From: Ding, Xuan <xuan.ding@intel.com>
> Sent: Monday, October 17, 2022 4:40 PM
> To: Wang, YuanX <yuanx.wang@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Tang, Yaqi <yaqi.tang@intel.com>
> Subject: RE: [PATCH] net/ice: fix the judgment order of buffer split
>
> Hi Yuan,
>
> > -----Original Message-----
> > From: Wang, YuanX <yuanx.wang@intel.com>
> > Sent: Tuesday, October 18, 2022 12:00 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] 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 hdr_proto, the order of judgement
> > should be
>
> The hdr_proto here should be proto_hdr?
Yes, it's proto_hdr. Thanks for the correction.
Will fix in new version.
Thanks,
Yuan.
[...]
@@ -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;