From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4FC4CA0032 for ; Thu, 14 Jul 2022 23:16:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2595640042; Thu, 14 Jul 2022 23:16:22 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 9C2FA4003C for ; Thu, 14 Jul 2022 23:16:20 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1004) id 9655320FD08E; Thu, 14 Jul 2022 14:16:19 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9655320FD08E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxonhyperv.com; s=default; t=1657833379; bh=W85I3o4WQ5241zmybXGbtsZwb9gMoqm/wDuFx//MaZs=; h=From:To:Cc:Subject:Date:Reply-To:From; b=N5qR02RDR1lHjtni3CUeoBwFH4eSOc6KAM8CLePGBDjWMZwi7hyVp+ktQ0SGWk1hk zAqEyKdO5T+R5aENz8B9zzp4AQukvI7S6tbZwTfK5IyZN7S888aHvnpiqXYJ+5DQg3 LmucD17EBlH/6uzUr1e5HuA9i4BEuEiTSu2qEu/I= From: longli@linuxonhyperv.com To: stable@dpdk.org Cc: christian.ehrhardt@canonical.com, Long Li Subject: [PATCH 19.11] net/netvsc: fix calculation of checksums based on mbuf flag Date: Thu, 14 Jul 2022 14:16:07 -0700 Message-Id: <1657833368-8212-1-git-send-email-longli@linuxonhyperv.com> X-Mailer: git-send-email 1.8.3.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: longli@microsoft.com Errors-To: stable-bounces@dpdk.org From: Long Li [ upstream commit 559a1f2eeaaddccc83e1668a8ee375c34699e48b ] The netvsc should use RTE_MBUF_F_TX_L4_MASK and check the masked value to decide the correct way to calculate checksums. Not checking for RTE_MBUF_F_TX_L4_MASK results in incorrect RNDIS packets sent to VSP and incorrect checksums calculated by the VSP. Fixes: 4e9c73e96e ("net/netvsc: add Hyper-V network device") Cc: stable@dpdk.org Signed-off-by: Long Li Acked-by: Stephen Hemminger Reviewed-by: Ferruh Yigit --- 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 af702dafe6..ece242f84b 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1262,8 +1262,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 & - (PKT_TX_TCP_CKSUM | PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM)) { + } else if ((m->ol_flags & PKT_TX_L4_MASK) == + PKT_TX_TCP_CKSUM || + (m->ol_flags & PKT_TX_L4_MASK) == + PKT_TX_UDP_CKSUM || + (m->ol_flags & PKT_TX_IP_CKSUM)) { pi_data = hn_rndis_pktinfo_append(pkt, NDIS_TXCSUM_INFO_SIZE, NDIS_PKTINFO_TYPE_CSUM); *pi_data = 0; @@ -1277,9 +1280,11 @@ static void hn_encap(struct rndis_packet_msg *pkt, *pi_data |= NDIS_TXCSUM_INFO_IPCS; } - if (m->ol_flags & PKT_TX_TCP_CKSUM) + if ((m->ol_flags & PKT_TX_L4_MASK) == + PKT_TX_TCP_CKSUM) *pi_data |= NDIS_TXCSUM_INFO_MKTCPCS(hlen); - else if (m->ol_flags & PKT_TX_UDP_CKSUM) + else if ((m->ol_flags & PKT_TX_L4_MASK) == + PKT_TX_UDP_CKSUM) *pi_data |= NDIS_TXCSUM_INFO_MKUDPCS(hlen); } -- 2.17.1