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 A328FA0540 for ; Wed, 6 Jul 2022 22:36:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9B3E540A7F; Wed, 6 Jul 2022 22:36:20 +0200 (CEST) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 3E6FE40691 for ; Wed, 6 Jul 2022 22:36:19 +0200 (CEST) Received: by mail-wr1-f41.google.com with SMTP id o4so23615758wrh.3 for ; Wed, 06 Jul 2022 13:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=75/Aw+xgQGYoaqTjUrXHv9dIzCOeDKF1SPqG1NaF1vI=; b=Ct86BJPlgi+fZfwK96U2hQATxw/4ICK0YFU/207oLNnDrQv+xXlWPsFQ5OmMJfSZcI 9pgI8XRqf6UB1qmwpFQVBuW6z0FR7aGm8WKmVvE2J+ARALRpa6sfam93E8YjHCjcbWWn AOua1WlqOtoNk+HM+5vAypVVUWalaoIoQulo/hLTaTNz7JlEqRUKdhp2GQuI0jKov2SH YAgJfrliG9V7emJXfUIiphPXHRqlitl6dst0AENHnsvwBIeo1ZU6qd7Gg1W3GHCyt5r2 Q1+Ap6XiAhv/Zn8fIjU9PY4XMhSvWrbhvF2H4YFg7SI0jQRmbV6WDHWvlpua0oTYcN7U Ieqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=75/Aw+xgQGYoaqTjUrXHv9dIzCOeDKF1SPqG1NaF1vI=; b=03YijY+kc7w1wpUNLqNkKjnMh2kleDD8PXd+w6X4leNl8fohr4/JY4k75otRhPnnuD Vyp8xaC+AvAmj9BDPIbHB608xslkQnLCfAilGluLxlQBdIoFgtU8lrrff0zAh7u/x5y7 jZJkpcBShT1+0S/YpJO/MAJtFtiAQo61Nh3ncBBK4q1UhVzn9IsaW0iDctdwIEzRoCjJ SmuhVgS1YF57qPmuyPd1+rhHWBHvHrgWoxRCfczn72AC9zCIBkhAywFNI0XZSV4JCFof rcBzC217ZPG0WG7TLJvvaY7J/dTrdECROHu751/kto15JKJFQydM/0s9o053rFmSmQTQ p4JQ== X-Gm-Message-State: AJIora/8sYFumoE/A5hMbN9+lreRXVjfG02caRhySvs4IDHhZn7FXKsE YWV3yvriquJ5XcqxCj3MiJg= X-Google-Smtp-Source: AGRyM1tpz8vNM5T0o+rezyvla6oLeKPZJedVAKIgfIHnKH23RiutqX8KYpOHSTBSItGkEqRYCrhdDg== X-Received: by 2002:a05:6000:381:b0:21b:9a20:6543 with SMTP id u1-20020a056000038100b0021b9a206543mr37368044wrf.127.1657139778907; Wed, 06 Jul 2022 13:36:18 -0700 (PDT) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id g34-20020a05600c4ca200b0039c7dbafa7asm21052589wmp.19.2022.07.06.13.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Kumara Parameshwaran Cc: Jiayu Hu , dpdk stable Subject: patch 'gro: fix identifying fragmented packets' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:57 +0100 Message-Id: <20220706203506.3422496-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/08/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/8fb51606a70960df7da40bc996b59871b7a8a040 Thanks. Luca Boccassi --- >From 8fb51606a70960df7da40bc996b59871b7a8a040 Mon Sep 17 00:00:00 2001 From: Kumara Parameshwaran Date: Mon, 27 Jun 2022 16:01:14 +0530 Subject: [PATCH] gro: fix identifying fragmented packets [ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ] A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP (0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the IP header should be parsed to recognize the appropriate IP type and invoke the respective gro handler. Fixes: 1ca5e6740852 ("gro: support UDP/IPv4") Signed-off-by: Kumara Parameshwaran Reviewed-by: Jiayu Hu --- lib/gro/rte_gro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index 8ca4da67e9..7a788523ad 100644 --- a/lib/gro/rte_gro.c +++ b/lib/gro/rte_gro.c @@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { #define IS_IPV4_TCP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_TCP) == RTE_PTYPE_L4_TCP) && \ + ((ptype & RTE_PTYPE_L4_FRAG) != RTE_PTYPE_L4_FRAG) && \ (RTE_ETH_IS_TUNNEL_PKT(ptype) == 0)) #define IS_IPV4_UDP_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ @@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \ ((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \ + ((ptype & RTE_PTYPE_L4_FRAG) != RTE_PTYPE_L4_FRAG) && \ ((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \ RTE_PTYPE_TUNNEL_VXLAN) && \ ((ptype & RTE_PTYPE_INNER_L4_TCP) == \ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.314534885 +0100 +++ 0022-gro-fix-identifying-fragmented-packets.patch 2022-07-06 21:07:53.555518938 +0100 @@ -1 +1 @@ -From bdf2f895a66044bc643e98a7262d70c245252927 Mon Sep 17 00:00:00 2001 +From 8fb51606a70960df7da40bc996b59871b7a8a040 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bdf2f895a66044bc643e98a7262d70c245252927 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 6f7dd4d709..e35399fd42 100644 +index 8ca4da67e9..7a788523ad 100644 @@ -27 +28 @@ -@@ -32,6 +32,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { +@@ -33,6 +33,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { @@ -35 +36 @@ -@@ -40,6 +41,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = { +@@ -41,6 +42,7 @@ static gro_tbl_pkt_count_fn tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {