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 A27F0A00C2 for ; Thu, 3 Nov 2022 10:31:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E9CD42684; Thu, 3 Nov 2022 10:31:37 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id 166CC40693 for ; Thu, 3 Nov 2022 10:31:37 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id bk15so1675749wrb.13 for ; Thu, 03 Nov 2022 02:31:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nCWmGE25lHKSA2zCyUVgeY5/VRfVGOQ+i7JpBHbxZCw=; b=LzPtKi/BGu1r+YY/NU29IGKSz1rt409LIhQPJk3ZzIB/bpA0phey/geBXy9pY3NMQW Tzife90rnUy95zuTJIifQDapvyHRvhqbkQnTlMlkJZ9FK30i3xA78G7PtH20AEqgz+CN GwAnbaMCL0hFKcMPbFZJyYPKj1+z3kci9tspmyVCZUBy/B2J5ABzTKJAe41lG1nfpW/l RCBy/cdL7ng1VlbKN3zIju4ccKwWxDgwBKYQkC9SXrPJ8WP2e7FdbLnj8QKQlht4OYDN P2Id+N4W18x6DPUt82oYmLqazO9cpatq6Vnnw6cry1wk8p0NBWn2VqI46dwUI6IE9QG2 BQVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nCWmGE25lHKSA2zCyUVgeY5/VRfVGOQ+i7JpBHbxZCw=; b=RvnnbLA2CHhpkzqNiHLmpqotGGkHbdjrRFRDS0F3CknReuBORlWUmUzr23ONEJ6gO7 gHEM90PNlch2wjlxsqP9MWyce9y3LLSVNKljLHiPE/aXkEK5ncY/ISocGduLPRuOoxwm m6+HFRuCpkJbp0xy4uiJYjoHw8JDUe6dhdoYpx9KM52h6brPyVHvE9Q+EMWllWgtd/KI qBm96Dk0u8V5jntVZtlERGvyrnEypCBj6y6hFVZrONu6Rq9Fi4OsL1ugRqbiz1XcpQMT 2QXR+l7LWIb1xe2IZyzvkq9B4n+eDMpbvvunhngl9/DhvBHgonEsWONG9ADGspr3Tgdn KB8Q== X-Gm-Message-State: ACrzQf1Qu+v9Za9lraHThyg8sfJK9tgZoiqg9IQ7TAy9q0TdBHh0QTm7 bQQ+YsvG9/vMuFI4uxrZGOusokXOGNTXF8Zm X-Google-Smtp-Source: AMsMyM7B81+jbvpBtysOP2VMgHQQtlsPvxVQdmmwv+/aZBkJQkQ5dGxXOeIQ0L6jcr5wrYryAweP+A== X-Received: by 2002:adf:dd4d:0:b0:236:6e72:be17 with SMTP id u13-20020adfdd4d000000b002366e72be17mr17157522wrm.460.1667467896795; Thu, 03 Nov 2022 02:31:36 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id y16-20020adff6d0000000b0023647841c5bsm339601wrp.60.2022.11.03.02.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Kumara Parameshwaran Cc: Jiayu Hu , dpdk stable Subject: patch 'gro: fix chain index for more than 2 packets' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:22 +0000 Message-Id: <20221103092758.1099402-64-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-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 20.11.7 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/05/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/035126419d2ea15a9f548f68a58cb104c706459c Thanks. Luca Boccassi --- >From 035126419d2ea15a9f548f68a58cb104c706459c Mon Sep 17 00:00:00 2001 From: Kumara Parameshwaran Date: Wed, 7 Sep 2022 15:02:05 +0530 Subject: [PATCH] gro: fix chain index for more than 2 packets [ upstream commit bc4a7f7ee0281d96b8d93ac2771135a670b4a00f ] When more than two packets are merged in a flow, and if we receive a 3rd packet which is matching the sequence of the 2nd packet the prev_idx will be 1 and not 2, hence resulting in packet re-ordering Signed-off-by: Kumara Parameshwaran Acked-by: Jiayu Hu --- lib/librte_gro/gro_tcp4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c index feb5855144..5f3b3a82ce 100644 --- a/lib/librte_gro/gro_tcp4.c +++ b/lib/librte_gro/gro_tcp4.c @@ -306,7 +306,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt, * length is greater than the max value. Store * the packet into the flow. */ - if (insert_new_item(tbl, pkt, start_time, prev_idx, + if (insert_new_item(tbl, pkt, start_time, cur_idx, sent_seq, ip_id, is_atomic) == INVALID_ARRAY_INDEX) return -1; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:29.252487859 +0000 +++ 0064-gro-fix-chain-index-for-more-than-2-packets.patch 2022-11-03 09:27:25.485424608 +0000 @@ -1 +1 @@ -From bc4a7f7ee0281d96b8d93ac2771135a670b4a00f Mon Sep 17 00:00:00 2001 +From 035126419d2ea15a9f548f68a58cb104c706459c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc4a7f7ee0281d96b8d93ac2771135a670b4a00f ] + @@ -13 +15 @@ - lib/gro/gro_tcp4.c | 2 +- + lib/librte_gro/gro_tcp4.c | 2 +- @@ -16,5 +18,5 @@ -diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c -index 7498c66141..9758e28fd5 100644 ---- a/lib/gro/gro_tcp4.c -+++ b/lib/gro/gro_tcp4.c -@@ -305,7 +305,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt, +diff --git a/lib/librte_gro/gro_tcp4.c b/lib/librte_gro/gro_tcp4.c +index feb5855144..5f3b3a82ce 100644 +--- a/lib/librte_gro/gro_tcp4.c ++++ b/lib/librte_gro/gro_tcp4.c +@@ -306,7 +306,7 @@ gro_tcp4_reassemble(struct rte_mbuf *pkt,