[PATCH net] net: libwx: Fix the wrong Rx descriptor field

[PATCH net] net: libwx: Fix the wrong Rx descriptor field

[Jiawen Wu]

WX_RXD_IPV6EX was incorrectly defined in Rx ring descriptor. In fact, this
field stores the 802.1ad ID from which the packet was received. The wrong
definition caused the statistics rx_csum_offload_errors to fail to grow
when receiving the 802.1ad packet with incorrect checksum.

Fixes: ef4f3c19f912 ("net: wangxun: libwx add rx offload functions")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ethernet/wangxun/libwx/wx_lib.c  | 3 ++-
 drivers/net/ethernet/wangxun/libwx/wx_type.h | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
index 00b0b318df27..6ebefa31ece1 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
+++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
@@ -546,7 +546,8 @@ static void wx_rx_checksum(struct wx_ring *ring,
 		return;
 
 	/* Hardware can't guarantee csum if IPv6 Dest Header found */
-	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP && WX_RXD_IPV6EX(rx_desc))
+	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP &&
+	    wx_test_staterr(rx_desc, WX_RXD_STAT_IPV6EX))
 		return;
 
 	/* if L4 checksum error */
diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index 5b230ecbbabb..4c545b2aa997 100644
--- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
@@ -513,6 +513,7 @@ enum WX_MSCA_CMD_value {
 #define WX_RXD_STAT_L4CS             BIT(7) /* L4 xsum calculated */
 #define WX_RXD_STAT_IPCS             BIT(8) /* IP xsum calculated */
 #define WX_RXD_STAT_OUTERIPCS        BIT(10) /* Cloud IP xsum calculated*/
+#define WX_RXD_STAT_IPV6EX           BIT(12) /* IPv6 Dest Header */
 #define WX_RXD_STAT_TS               BIT(14) /* IEEE1588 Time Stamp */
 
 #define WX_RXD_ERR_OUTERIPER         BIT(26) /* CRC IP Header error */
@@ -589,8 +590,6 @@ enum wx_l2_ptypes {
 
 #define WX_RXD_PKTTYPE(_rxd) \
 	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 9) & 0xFF)
-#define WX_RXD_IPV6EX(_rxd) \
-	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 6) & 0x1)
 /*********************** Transmit Descriptor Config Masks ****************/
 #define WX_TXD_STAT_DD               BIT(0)  /* Descriptor Done */
 #define WX_TXD_DTYP_DATA             0       /* Adv Data Descriptor */
-- 
2.27.0

Re: [PATCH net] net: libwx: Fix the wrong Rx descriptor field

[Michal Kubiak]

On Mon, Apr 07, 2025 at 06:33:22PM +0800, Jiawen Wu wrote:
> WX_RXD_IPV6EX was incorrectly defined in Rx ring descriptor. In fact, this
> field stores the 802.1ad ID from which the packet was received. The wrong
> definition caused the statistics rx_csum_offload_errors to fail to grow
> when receiving the 802.1ad packet with incorrect checksum.
> 
> Fixes: ef4f3c19f912 ("net: wangxun: libwx add rx offload functions")
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  drivers/net/ethernet/wangxun/libwx/wx_lib.c  | 3 ++-
>  drivers/net/ethernet/wangxun/libwx/wx_type.h | 3 +--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> index 00b0b318df27..6ebefa31ece1 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> @@ -546,7 +546,8 @@ static void wx_rx_checksum(struct wx_ring *ring,
>  		return;
>  
>  	/* Hardware can't guarantee csum if IPv6 Dest Header found */
> -	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP && WX_RXD_IPV6EX(rx_desc))
> +	if (dptype.prot != WX_DEC_PTYPE_PROT_SCTP &&
> +	    wx_test_staterr(rx_desc, WX_RXD_STAT_IPV6EX))
>  		return;
>  
>  	/* if L4 checksum error */
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_type.h b/drivers/net/ethernet/wangxun/libwx/wx_type.h
> index 5b230ecbbabb..4c545b2aa997 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_type.h
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_type.h
> @@ -513,6 +513,7 @@ enum WX_MSCA_CMD_value {
>  #define WX_RXD_STAT_L4CS             BIT(7) /* L4 xsum calculated */
>  #define WX_RXD_STAT_IPCS             BIT(8) /* IP xsum calculated */
>  #define WX_RXD_STAT_OUTERIPCS        BIT(10) /* Cloud IP xsum calculated*/
> +#define WX_RXD_STAT_IPV6EX           BIT(12) /* IPv6 Dest Header */
>  #define WX_RXD_STAT_TS               BIT(14) /* IEEE1588 Time Stamp */
>  
>  #define WX_RXD_ERR_OUTERIPER         BIT(26) /* CRC IP Header error */
> @@ -589,8 +590,6 @@ enum wx_l2_ptypes {
>  
>  #define WX_RXD_PKTTYPE(_rxd) \
>  	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 9) & 0xFF)
> -#define WX_RXD_IPV6EX(_rxd) \
> -	((le32_to_cpu((_rxd)->wb.lower.lo_dword.data) >> 6) & 0x1)
>  /*********************** Transmit Descriptor Config Masks ****************/
>  #define WX_TXD_STAT_DD               BIT(0)  /* Descriptor Done */
>  #define WX_TXD_DTYP_DATA             0       /* Adv Data Descriptor */
> -- 
> 2.27.0
> 
> 

I don't know the HW design details of the Rx descriptor in this driver,
but the logic change and its description look OK.

Thanks,
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>

Re: [PATCH net] net: libwx: Fix the wrong Rx descriptor field

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <pabeni@redhat.com>:

On Mon,  7 Apr 2025 18:33:22 +0800 you wrote:
> WX_RXD_IPV6EX was incorrectly defined in Rx ring descriptor. In fact, this
> field stores the 802.1ad ID from which the packet was received. The wrong
> definition caused the statistics rx_csum_offload_errors to fail to grow
> when receiving the 802.1ad packet with incorrect checksum.
> 
> Fixes: ef4f3c19f912 ("net: wangxun: libwx add rx offload functions")
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> 
> [...]

Here is the summary with links:
  - [net] net: libwx: Fix the wrong Rx descriptor field
    https://git.kernel.org/netdev/net/c/13e7d7240a43

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html