From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 712A4454E9
for <public@inbox.dpdk.org>; Tue, 25 Jun 2024 02:02:21 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 6CEDE40EDD;
Tue, 25 Jun 2024 02:02:21 +0200 (CEST)
Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com
[209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id 1CD6D410DC
for <stable@dpdk.org>; Tue, 25 Jun 2024 02:02:20 +0200 (CEST)
Received: by mail-wr1-f46.google.com with SMTP id
ffacd0b85a97d-3650f2e540dso3276715f8f.0
for <stable@dpdk.org>; Mon, 24 Jun 2024 17:02:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1719273740; x=1719878540; darn=dpdk.org;
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=Oj3y0XKdU+KYa/fBsKKiBJ7GtvLTqQx4NhAZ7mtcn3g=;
b=cox6HIuw+FqCkS1ktqNoECGcdkXsmpDfy+QgFPpscd6+q6ioBXwtAnnbvSCkNjrlJ+
GLzrrtZP6k9tMGRGMaIvHEbNLEssimtwJGfmQf7kPBkvVhAFiUlAswJwwbyv2y7AdQUG
ckul+t0VW/wGkqFGqWS5RFWCj7nFpJkDcMTasFqD2WMskZ8PnsGUG9+SmFS9tM9Un7G5
tsNvbRSwiD/GBdXTeYdali+iTmG5ToJMaeYVS7E08lwXvLxHyoFoDn9yKGc09GDauRPL
/pgzAojySL8/e9bUh0doAHs5kiKPfXNhPlQhPcwSauM4jxN1ecPscXUoz3I9A7lvyNi8
INcQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1719273740; x=1719878540;
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=Oj3y0XKdU+KYa/fBsKKiBJ7GtvLTqQx4NhAZ7mtcn3g=;
b=J2Wig3+xdooeV8MCTlRO36+SBq7iLKWYMicDrQ1yAY+2WOGlykE6z8b7TldWGQMVUh
BU+dRVX/76knL9Di1P+u/40V6GdsYVtXUwvofXvxra7dwMPMxhYVbaaBqkjj6XVJ/TDW
x/VfNu0Kl5N4Rb05hEu6yc0AzBaJ/n9vouhz3VxEgHmafsTy4GX/n2exMR8OOriMjKni
H2YVtdgruIJ3ryOQhcBT2NINLMrR19dVBvqQC7He5Vnu74ZZTw18tqMSEo6sbZ1JV8XZ
eOVgCsJpXT71oM+0U58ZFByGW8XP4KGhgScgoYv7Ibo5iMKA1y0ysrHWN3UtiPspUEW2
mL3w==
X-Gm-Message-State: AOJu0Yx/J5v4nzdLjXl30P7dOjCMIubaiZbhQV0mPpjw1KBA5LtjdkWx
+KVGH3nVvg5YWaTTpgT5bhPpNJF+zpkXQ9LDdJcPii90NwM7Nj4/wxxfXody
X-Google-Smtp-Source: AGHT+IEtcehhp5yDkt4UQZI5vPouz6n6iC0c5KUvX4BrmwefftEgojkbPuCJjmQ7UyatP9BF55dHOA==
X-Received: by 2002:adf:e806:0:b0:35f:1161:e1a3 with SMTP id
ffacd0b85a97d-366e94db399mr3804442f8f.5.1719273739657;
Mon, 24 Jun 2024 17:02:19 -0700 (PDT)
Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546])
by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-366bd575f6asm10710280f8f.6.2024.06.24.17.02.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 24 Jun 2024 17:02:19 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Nithin Dabilpuram <ndabilpuram@marvell.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: patch 'net/cnxk: fix outbound security with higher packet burst' has
been queued to stable release 22.11.6
Date: Tue, 25 Jun 2024 00:58:45 +0100
Message-Id: <20240624235907.885628-59-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com>
References: <20240624235907.885628-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 22.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 06/27/24. 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/d9d6771ebabe8fef3a5263a89ef81e44ff3806ca
Thanks.
Luca Boccassi
---
>From d9d6771ebabe8fef3a5263a89ef81e44ff3806ca Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
Date: Tue, 28 May 2024 12:35:19 +0530
Subject: [PATCH] net/cnxk: fix outbound security with higher packet burst
[ upstream commit 062f6f652445a283a186dc6c62c692ba7c91cc3c ]
Fix issue with outbound security path while handling mixed traffic i.e
both plain and inline outbound packets being present as part of burst
and burst size is > 32. The loop needs to be broken when
we don't have space for 4 packets in LMT lines for CPT considering
both the full LMT lines and partial LMT lines used.
Fixes: 55bfac717c72 ("net/cnxk: support Tx security offload on cn10k")
Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
drivers/net/cnxk/cn10k_tx.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h
index 254ddf0536..e96030621b 100644
--- a/drivers/net/cnxk/cn10k_tx.h
+++ b/drivers/net/cnxk/cn10k_tx.h
@@ -1843,7 +1843,8 @@ again:
}
for (i = 0; i < burst; i += NIX_DESCS_PER_LOOP) {
- if (flags & NIX_TX_OFFLOAD_SECURITY_F && c_lnum + 2 > 16) {
+ if (flags & NIX_TX_OFFLOAD_SECURITY_F &&
+ (((int)((16 - c_lnum) << 1) - c_loff) < 4)) {
burst = i;
break;
}
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-06-25 00:22:16.807683374 +0100
+++ 0059-net-cnxk-fix-outbound-security-with-higher-packet-bu.patch 2024-06-25 00:22:13.213186220 +0100
@@ -1 +1 @@
-From 062f6f652445a283a186dc6c62c692ba7c91cc3c Mon Sep 17 00:00:00 2001
+From d9d6771ebabe8fef3a5263a89ef81e44ff3806ca Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 062f6f652445a283a186dc6c62c692ba7c91cc3c ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 5c4b9e559e..9ce41fe80f 100644
+index 254ddf0536..e96030621b 100644
@@ -24 +25 @@
-@@ -2272,7 +2272,8 @@ again:
+@@ -1843,7 +1843,8 @@ again: