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 59F0EA0544 for ; Fri, 11 Nov 2022 12:40:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 55A81427EB; Fri, 11 Nov 2022 12:40:43 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id F270040141 for ; Fri, 11 Nov 2022 12:40:41 +0100 (CET) Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CE2C5423E3 for ; Fri, 11 Nov 2022 11:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166841; bh=YxtkmJufWQRGM1VjxO/15Bg79/MVm6Rc1EvOhtEEIq8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kZ1Wa2ImAJMmlGV4Nl01ioBHvCdNFgkKx0jgYcHLDP2lOonf8vGncA4cVbZON0FMo pTX9lrl1NkkWuWJOpGhmVr6BRK18Mev+vjDpemkqepjhyZge0Nu2yiCGVlXgVFqQ4p SP+HDgdCb2Xc1tdcoxkLXGSeHI6W8+IrUwaa1iZ9oin92Ronq+K34Y8tf52LXoCY/y 2ajAZZ8V/XkEDXeHmTHWKhwTr0nq4YPZIIokm5ygNz1fXctVra7cqC6EBTa6v7xfr3 y7S8ZA4c22D6n6cC2kfomAagCQfKbgjik2X5OOfTwjcEqNILydUyJcWWN+pw0LE7ul AEG50OM7t9jMA== Received: by mail-ej1-f72.google.com with SMTP id hs34-20020a1709073ea200b007ad86f91d39so2922102ejc.10 for ; Fri, 11 Nov 2022 03:40:41 -0800 (PST) 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=YxtkmJufWQRGM1VjxO/15Bg79/MVm6Rc1EvOhtEEIq8=; b=SL0OMXMvPzTtqsLRnfDONYQmlQ/aC/8CwPemkUTA7PSsLpxwKKTNp1lCkNqFpOtDNf PhNH0F5g82YN5r1y02YsdPr9srHTucXdl0jxdZ9MI1PwVH57mtdHtc7aIg8XIvcXJZTN NBweMK2qV9qoRdI/I/HKFhy7keZsjvy+PxVo65WPI8ppV9yi4PV/8is4YB0BKWeB+4EZ wWaZpNGTbiwE9mXW+dKUiJdeANnO8WCMfup6YAQh+Jtz7MWRmlX6mjNCoeOLWWzk2kGC wmtxi+i8BkJPJbyC9NuwgD8uU3YtYAHDDMtL9zOYI82U5FOtko37ZjTczodI2cnwCj5A 6DzQ== X-Gm-Message-State: ANoB5pk+Fkf1XSsihP+QvuyfcIxsk+nOmPoTtOq4oaTNF/Hmi1j7Q+CX svh0n6nqYEGguAKPvl4L1PEYLy+xIXsL5bmJm6ph8Z2mf8IvlHQfZENfdcvjgb+Ko2wraQxkddH EssWChmlxt/PPyNFiSJJHKUol X-Received: by 2002:a17:906:580b:b0:7ad:c0e7:7a99 with SMTP id m11-20020a170906580b00b007adc0e77a99mr1426970ejq.689.1668166841499; Fri, 11 Nov 2022 03:40:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf70Apj+186qTz0TOVSJKQichHZmaOyImHlJBLMf/bXt7sRUXThm7/GxG/wPzrV+9wiBTeZZJQ== X-Received: by 2002:a17:906:580b:b0:7ad:c0e7:7a99 with SMTP id m11-20020a170906580b00b007adc0e77a99mr1426959ejq.689.1668166841213; Fri, 11 Nov 2022 03:40:41 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id r19-20020a170906a21300b007ad96726c42sm803553ejy.91.2022.11.11.03.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:40:40 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.14 Date: Fri, 11 Nov 2022 12:38:45 +0100 Message-Id: <20221111113904.1549618-28-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.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 19.11.14 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/18/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/3f705a2a4a38f6566c232664a4660fdd35e3cead Thanks. Christian Ehrhardt --- >From 3f705a2a4a38f6566c232664a4660fdd35e3cead 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.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:05.783295786 +0100 +++ 0028-gro-fix-chain-index-for-more-than-2-packets.patch 2022-11-11 12:35:04.773192062 +0100 @@ -1 +1 @@ -From bc4a7f7ee0281d96b8d93ac2771135a670b4a00f Mon Sep 17 00:00:00 2001 +From 3f705a2a4a38f6566c232664a4660fdd35e3cead 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,