diff mbox series

net/netvsc: fix the calculation of checksums based on mbuf flag

Message ID 1648009687-19957-1-git-send-email-longli@linuxonhyperv.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series net/netvsc: fix the calculation of checksums based on mbuf flag |

Checks

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

Commit Message

Long Li March 23, 2022, 4:28 a.m. UTC 
  From: Long Li <longli@microsoft.com>

The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the value to decide
the correct way to calculate checksums.

Signed-off-by: Long Li <longli@microsoft.com>
---
 drivers/net/netvsc/hn_rxtx.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Comments

David Marchand March 23, 2022, 8:39 a.m. UTC | #1 
On Wed, Mar 23, 2022 at 5:28 AM <longli@linuxonhyperv.com> wrote:
>
> From: Long Li <longli@microsoft.com>
>
> The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the value to decide
> the correct way to calculate checksums.

It's better to describe what the impact for an application is.
Do I understand correctly that UDP checksum offloading was broken?


I guess you want this backported.
Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
Cc: stable@dpdk.org


>
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
>  drivers/net/netvsc/hn_rxtx.c | 13 +++++++++----
>  1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
> index 028f176c7e..34f40be5b8 100644
> --- a/drivers/net/netvsc/hn_rxtx.c
> +++ b/drivers/net/netvsc/hn_rxtx.c
> @@ -1348,8 +1348,11 @@ static void hn_encap(struct rndis_packet_msg *pkt,
>                         *pi_data = NDIS_LSO2_INFO_MAKEIPV4(hlen,
>                                                            m->tso_segsz);
>                 }
> -       } else if (m->ol_flags &
> -                  (RTE_MBUF_F_TX_TCP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM | RTE_MBUF_F_TX_IP_CKSUM)) {
> +       } else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> +                       RTE_MBUF_F_TX_TCP_CKSUM ||
> +                  (m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> +                       RTE_MBUF_F_TX_UDP_CKSUM ||
> +                  (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM)) {
>                 pi_data = hn_rndis_pktinfo_append(pkt, NDIS_TXCSUM_INFO_SIZE,
>                                                   NDIS_PKTINFO_TYPE_CSUM);
>                 *pi_data = 0;
> @@ -1363,9 +1366,11 @@ static void hn_encap(struct rndis_packet_msg *pkt,
>                                 *pi_data |= NDIS_TXCSUM_INFO_IPCS;
>                 }
>
> -               if (m->ol_flags & RTE_MBUF_F_TX_TCP_CKSUM)
> +               if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> +                               RTE_MBUF_F_TX_TCP_CKSUM)
>                         *pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(hlen);
> -               else if (m->ol_flags & RTE_MBUF_F_TX_UDP_CKSUM)
> +               else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> +                               RTE_MBUF_F_TX_UDP_CKSUM)
>                         *pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(hlen);
>         }
>
> --
> 2.32.0
>
Stephen Hemminger March 23, 2022, 2:57 p.m. UTC | #2 
On Tue, 22 Mar 2022 21:28:07 -0700
longli@linuxonhyperv.com wrote:

> From: Long Li <longli@microsoft.com>
> 
> The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the value to decide
> the correct way to calculate checksums.
> 
> Signed-off-by: Long Li <longli@microsoft.com>


Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Long Li March 23, 2022, 9:31 p.m. UTC | #3 
> Subject: Re: [PATCH] net/netvsc: fix the calculation of checksums based on
> mbuf flag
> 
> On Wed, Mar 23, 2022 at 5:28 AM <longli@linuxonhyperv.com> wrote:
> >
> > From: Long Li <longli@microsoft.com>
> >
> > The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the value to
> > decide the correct way to calculate checksums.
> 
> It's better to describe what the impact for an application is.
> Do I understand correctly that UDP checksum offloading was broken?
> 
> 
> I guess you want this backported.
> Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
> Cc: stable@dpdk.org

I'm sending V2 with the Fixes tag. 

Thanks,
Long

> 
> 
> >
> > Signed-off-by: Long Li <longli@microsoft.com>
> > ---
> >  drivers/net/netvsc/hn_rxtx.c | 13 +++++++++----
> >  1 file changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/netvsc/hn_rxtx.c
> > b/drivers/net/netvsc/hn_rxtx.c index 028f176c7e..34f40be5b8 100644
> > --- a/drivers/net/netvsc/hn_rxtx.c
> > +++ b/drivers/net/netvsc/hn_rxtx.c
> > @@ -1348,8 +1348,11 @@ static void hn_encap(struct rndis_packet_msg
> *pkt,
> >                         *pi_data = NDIS_LSO2_INFO_MAKEIPV4(hlen,
> >                                                            m->tso_segsz);
> >                 }
> > -       } else if (m->ol_flags &
> > -                  (RTE_MBUF_F_TX_TCP_CKSUM |
> RTE_MBUF_F_TX_UDP_CKSUM | RTE_MBUF_F_TX_IP_CKSUM)) {
> > +       } else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> > +                       RTE_MBUF_F_TX_TCP_CKSUM ||
> > +                  (m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> > +                       RTE_MBUF_F_TX_UDP_CKSUM ||
> > +                  (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM)) {
> >                 pi_data = hn_rndis_pktinfo_append(pkt,
> NDIS_TXCSUM_INFO_SIZE,
> >                                                   NDIS_PKTINFO_TYPE_CSUM);
> >                 *pi_data = 0;
> > @@ -1363,9 +1366,11 @@ static void hn_encap(struct rndis_packet_msg
> *pkt,
> >                                 *pi_data |= NDIS_TXCSUM_INFO_IPCS;
> >                 }
> >
> > -               if (m->ol_flags & RTE_MBUF_F_TX_TCP_CKSUM)
> > +               if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> > +                               RTE_MBUF_F_TX_TCP_CKSUM)
> >                         *pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(hlen);
> > -               else if (m->ol_flags & RTE_MBUF_F_TX_UDP_CKSUM)
> > +               else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
> > +                               RTE_MBUF_F_TX_UDP_CKSUM)
> >                         *pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(hlen);
> >         }
> >
> > --
> > 2.32.0
> >
> 
> 
> --
> David Marchand
diff mbox series

Patch

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index 028f176c7e..34f40be5b8 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -1348,8 +1348,11 @@  static void hn_encap(struct rndis_packet_msg *pkt,
 			*pi_data = NDIS_LSO2_INFO_MAKEIPV4(hlen,
 							   m->tso_segsz);
 		}
-	} else if (m->ol_flags &
-		   (RTE_MBUF_F_TX_TCP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM | RTE_MBUF_F_TX_IP_CKSUM)) {
+	} else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
+			RTE_MBUF_F_TX_TCP_CKSUM ||
+		   (m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
+			RTE_MBUF_F_TX_UDP_CKSUM ||
+		   (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM)) {
 		pi_data = hn_rndis_pktinfo_append(pkt, NDIS_TXCSUM_INFO_SIZE,
 						  NDIS_PKTINFO_TYPE_CSUM);
 		*pi_data = 0;
@@ -1363,9 +1366,11 @@  static void hn_encap(struct rndis_packet_msg *pkt,
 				*pi_data |= NDIS_TXCSUM_INFO_IPCS;
 		}
 
-		if (m->ol_flags & RTE_MBUF_F_TX_TCP_CKSUM)
+		if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
+				RTE_MBUF_F_TX_TCP_CKSUM)
 			*pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(hlen);
-		else if (m->ol_flags & RTE_MBUF_F_TX_UDP_CKSUM)
+		else if ((m->ol_flags & RTE_MBUF_F_TX_L4_MASK) ==
+				RTE_MBUF_F_TX_UDP_CKSUM)
 			*pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(hlen);
 	}