From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07A6DA0527 for ; Mon, 9 Nov 2020 19:45:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F1B1469A4; Mon, 9 Nov 2020 19:45:11 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by dpdk.org (Postfix) with ESMTP id DC81E6A6F for ; Mon, 9 Nov 2020 19:45:10 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id p1so9863749wrf.12 for ; Mon, 09 Nov 2020 10:45:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3JhpXs/KyAZtNkADAnkaPLxqY07t3lOoHg2WaHiPCVo=; b=QG+YCDUhFWkbaiRW5/HG32fdt7enZPMfi//WiYFpRndXAsYqIac36n8vtpvrUkONMO 4XG43S/ZEjvymtiOyi5T1ePxUclSo3/5nhuuRdk67FFVKJbUOyfzwqIamxGUou0CpQSJ PednC6LZNk1c0rzLPK6Q/BY4Rdurt8wuXHq+NTnyHFg9rbWkM3AlR1YwP8iZN89Utw+C QEyyBgMJK8ljIeIOVco4eoz0wyCSc2oy4rWL1dnrubxrxxW3LH0qIKyTWf4qgUCSmZE1 qQJ7Gy7D2AaQnC9nMjSGxKOA1lw5IsiOce+p465cGMigjKa1ZDDKlr1LhyOXqnXUQ+hl QV6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3JhpXs/KyAZtNkADAnkaPLxqY07t3lOoHg2WaHiPCVo=; b=GYfKlNpmRoyPDfflmJlj+uSaLNxQEKQEmPLHt3A8Vo1CsDAh93k7/VgSYTraHzYfQ+ R+z2VPkKW7kXbvUB747oXqAuztBbsKSAeHsNvxfS6SX5Oq/XRjr3x4+XbzE2moNP/JsE 2vYu9Q2QuGc7C9BXfxAuG36hzuvAq3b9lBS3W2Av7MyNBFcMj7op8TyohRhK6ITSYbzU kfczWNtzDHe4UzmvefzuJOpS2eP/udq5G/+me83qn+awUD4MkQwgkAuDsCdSyXmMmOk0 6C0HhIoaHpbAyIP9Z+TtBSx50aUpAM8UoT3nTmKEld6yJ6OdHJEePTOrOnUskN5zkLZT dyAw== X-Gm-Message-State: AOAM533grsdtpqKTe232UskZ7xH70Q3Mon/tN8e58QYGSZWlVIyvuNVC UHDLF3JoHWyI9Vmhi0+ufg8= X-Google-Smtp-Source: ABdhPJx/ZaT9Et7riFmBAD51mwz9qQ0sbUanSde/gynrJTb3lZqA57oOTmo84dw5ic08HOIhexRsdA== X-Received: by 2002:a5d:5689:: with SMTP id f9mr8550521wrv.181.1604947509680; Mon, 09 Nov 2020 10:45:09 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v6sm16429797wrb.53.2020.11.09.10.45.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:45:08 -0800 (PST) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , dpdk stable Date: Mon, 9 Nov 2020 18:40:56 +0000 Message-Id: <20201109184111.3463090-68-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ena: fix setting Rx checksum flags in mbuf' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/45a2d11025b58827dbc209465067f6b283383ba3 Thanks. Luca Boccassi --- >From 45a2d11025b58827dbc209465067f6b283383ba3 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Fri, 30 Oct 2020 12:31:17 +0100 Subject: [PATCH] net/ena: fix setting Rx checksum flags in mbuf [ upstream commit 856edce2b3dbc901905cd4c43920575f750f9d53 ] The driver was never setting PKT_RX_*_CKSUM_GOOD flags, so the only way of checking if the checksum was checked was by testing for the PKT_RX_*_CKSUM_BAD. In that situation, the application couldn't detect if the checksum was valid or unknown, as unknown flag is equal to 0. Moreover, the l3_csum_err value is only valid if the l3_proto is indicating IPv4, so it shouldn't be checked for other protocols. Fixes: 1173fca25af9 ("ena: add polling-mode driver") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik --- drivers/net/ena/ena_ethdev.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index a90d17ccc4..2c19f6459f 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -267,21 +267,23 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf, else if (ena_rx_ctx->l4_proto == ENA_ETH_IO_L4_PROTO_UDP) packet_type |= RTE_PTYPE_L4_UDP; - if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) + if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) { packet_type |= RTE_PTYPE_L3_IPV4; - else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6) + if (unlikely(ena_rx_ctx->l3_csum_err)) + ol_flags |= PKT_RX_IP_CKSUM_BAD; + else + ol_flags |= PKT_RX_IP_CKSUM_GOOD; + } else if (ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV6) { packet_type |= RTE_PTYPE_L3_IPV6; + } - if (!ena_rx_ctx->l4_csum_checked) + if (!ena_rx_ctx->l4_csum_checked || ena_rx_ctx->frag) ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN; else - if (unlikely(ena_rx_ctx->l4_csum_err) && !ena_rx_ctx->frag) + if (unlikely(ena_rx_ctx->l4_csum_err)) ol_flags |= PKT_RX_L4_CKSUM_BAD; else - ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN; - - if (unlikely(ena_rx_ctx->l3_csum_err)) - ol_flags |= PKT_RX_IP_CKSUM_BAD; + ol_flags |= PKT_RX_L4_CKSUM_GOOD; mbuf->ol_flags = ol_flags; mbuf->packet_type = packet_type; -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.732754568 +0000 +++ 0068-net-ena-fix-setting-Rx-checksum-flags-in-mbuf.patch 2020-11-09 18:40:11.207312465 +0000 @@ -1 +1 @@ -From 856edce2b3dbc901905cd4c43920575f750f9d53 Mon Sep 17 00:00:00 2001 +From 45a2d11025b58827dbc209465067f6b283383ba3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 856edce2b3dbc901905cd4c43920575f750f9d53 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 7ab9b93ba9..ad593c882c 100644 +index a90d17ccc4..2c19f6459f 100644 @@ -28 +29 @@ -@@ -296,21 +296,23 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf, +@@ -267,21 +267,23 @@ static inline void ena_rx_mbuf_prepare(struct rte_mbuf *mbuf,