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 3D077A0C3F
	for <public@inbox.dpdk.org>; Sat, 12 Jun 2021 01:17:03 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 373DE4003F;
	Sat, 12 Jun 2021 01:17:03 +0200 (CEST)
Received: from NAM10-MW2-obe.outbound.protection.outlook.com
 (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43])
 by mails.dpdk.org (Postfix) with ESMTP id 089EF406A2
 for <stable@dpdk.org>; Sat, 12 Jun 2021 01:17:02 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
 b=VdeYbup5xjMbldjn+aBeC01n2py5fnRWwO8Htf3XIq0AzctrDH8/BRZZqMA8FnDHkxV9mSR2pTsO1Fk7vg8mHfRF8//YUqQnxBh2e3pqD0zWjEIgNAOmQb8BQFmw1stWt9YYhfZ1PEv9vwa06F4VaeFgK8Qf5kIYebf7CbM9yAKfb70C6wBa+8HCDZl1HT0ptOITYcmXvIBe9MmHbwLn1s95/lkN0n3MmHGDBRBbQuVnQDgG0FRt0Dr0OphiaLexxRqeQXli/vEcIIEmWMmDtbbEf7mTA0CRKrjQcKy5nxOtUqVlpgHvzL8Zsb/zgi6NO8JP8t9or3H9Qz2EsQ8IsA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; 
 s=arcselector9901;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=1dCfdAsTuUznBzgKx2T46tdf3fUGjdbT0WhLPhZIXD8=;
 b=IklCmugAuLDkKnxQd7FCeBLRgw1xfoUzOGyRhcG0UqxXRx1oPipKNKUWhWGcoA8e4bJjL6SKIEEV2lwrGPyIL5bnB4WyO1BwNTWp4d8pedDI4br1OwNnHiwnmpj62Edi9j/TOLr1kjxM56mnq2WsRQMbhLYGDJ2DrSXNyvEtJ/TG66sODMh3mUSVyg5rnycQKylOWdxqZop6nZwo695C34uhQuxi3RxFrIYN7PdXOHYl4t3LpqDLqQmS1P36YqLYB5/57ItkZpggfa2jgLnG+otfK4HNAXL4hLCKGqUTRRBeHqBogp5OmDLwDyD4ScqHAgHBO2nTDV6uliOUODQZ7A==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;
 dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;
 dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
 s=selector2;
 h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
 bh=1dCfdAsTuUznBzgKx2T46tdf3fUGjdbT0WhLPhZIXD8=;
 b=MfOm5o4F13+yPPr7fadvrXmD7GaSFOlvBOMYUZJjHYdJMOfsJqcCZgyY/q4FzDk/rP91sZKCSige7uvaOdDCR2WjWeelOV47XdGHyErrBCm176Y1OjyYdABJck48aoKY3vAwwEmVOtUJnUvNI6MQt1fpLDQ4KrezfJBKnLCIgUVYEa3Kr91uA5onsLNqb909a0sodDhm+t1gPJPoDsbY4GtLmyx/A6NKgYz2uSwmudnsPj3vsf5Xw4CbDbjtg4TcXdumok2Huv8gTv94+WTJclmcABOJwSxitZyXmC1hezmpCCMRP51dTxI0ZqwWnlIWAZQifE9mYo6ZlCIHU4gkBQ==
Received: from BN9PR03CA0071.namprd03.prod.outlook.com (2603:10b6:408:fc::16)
 by MWHPR12MB1693.namprd12.prod.outlook.com (2603:10b6:301:10::8) with
 Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.25; Fri, 11 Jun
 2021 23:17:00 +0000
Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com
 (2603:10b6:408:fc:cafe::11) by BN9PR03CA0071.outlook.office365.com
 (2603:10b6:408:fc::16) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend
 Transport; Fri, 11 Jun 2021 23:17:00 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
 smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)
 header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.34 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
 BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) with Microsoft SMTP
 Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:17:00 +0000
Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun
 2021 23:16:58 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Gregory Etelson <getelson@nvidia.com>
CC: Luca Boccassi <bluca@debian.org>, Viacheslav Ovsiienko
 <viacheslavo@nvidia.com>, dpdk stable <stable@dpdk.org>
Date: Sat, 12 Jun 2021 07:03:43 +0800
Message-ID: <20210611230433.8208-129-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com>
References: <20210510160258.30982-229-xuemingl@nvidia.com>
 <20210611230433.8208-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.5]
X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To
 HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: fcdce8c2-c029-4684-98a4-08d92d2f0401
X-MS-TrafficTypeDiagnostic: MWHPR12MB1693:
X-Microsoft-Antispam-PRVS: <MWHPR12MB16935EB09CD1D02FFF0DADC3A1349@MWHPR12MB1693.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:10000;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 7CLmu7RQQhoDeEBtK/ayPHvaAkCrouk3vE//ZmUq1k1NscEvt3nImvxjNhJPv3lbnK9ADHRUvpKg2o9RPE276F1+cmCSO0LO7o7UydLjqBbql5ebEBJvtx3HBGmKOZRLpxGjHYODIAUGVSs6kqRH+w/KBKNZ7WSpBYlai6ta4kbf6nG4ly4zPJZvKxM18RRJH2eduB4rKbSn8BYitlmHbXP3OauQPa4SRB8IE+BOkkF6uyF7tyyhXT8ovIcft+t6zDO3w103BDN/YuGLXNq3/pFPz3mRWujW7bsWI18aODo5PxAPiM321uwKy4StEKtAtXzL5XI+oJ+IPaNWGf35CHkh/AufJCd+fptyvfVKQfn8+RoPdX0TPQTG9X0ewggNP5TCLhOTGTYgBNwah86uqETvbkxBERShJi+pikzgwHQqzR/dCezAvOLOdMqbBNgwdM6VYp3XM8O1dFM6PaFYIc3o+28sxIMkfgxqpjHppjhVi/NIzRTptJxYheTFB5s94yU8N0Wc+RUd/PnIvlnTDy811eX6BwdQz8ZtDsv0h0vV26DaWnQAFDU27qtofRlDxMJ+pnE+/Nl0FQRE0seo+0N+t3DHoEzzzpIi+eZwY5J5Eey473HJd4IfjPAcUX2D95SDUauC7NDpkmXuc4qzLK7i3Rp3rgcMH6Uu+2fSZFItotm+JTd01DVuVtxwU/2JDXq2+011jCcPonlwCRqblvj5agGFZrK95wEnJt/AO6bdRD0CXFlO0vp0Guk+wUyQU/RYT5xQfLGcgqHE10re884qEfRg5FhlHpWS/9aFL0/lXft/PRSkcYZTQOXoae2b
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
 IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
 SFS:(4636009)(39860400002)(136003)(376002)(346002)(396003)(36840700001)(46966006)(1076003)(7696005)(356005)(7636003)(6862004)(426003)(336012)(2616005)(4326008)(966005)(36860700001)(82310400003)(86362001)(36756003)(53546011)(6286002)(82740400003)(316002)(54906003)(8936002)(5660300002)(2906002)(6666004)(186003)(36906005)(16526019)(8676002)(70586007)(47076005)(37006003)(55016002)(70206006)(26005)(6636002)(478600001)(83380400001);
 DIR:OUT; SFP:1101; 
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:17:00.1713 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: fcdce8c2-c029-4684-98a4-08d92d2f0401
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
 Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1693
Subject: [dpdk-stable] patch 'app/testpmd: fix tunnel offload flows cleanup'
 has been queued to stable release 20.11.2
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
Sender: "stable" <stable-bounces@dpdk.org>

Hi,

FYI, your patch has been queued to stable release 20.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 06/14/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/18151dfdcb4ed88b44d7c21244442dad671b8d36

Thanks.

Xueming Li <xuemingl@nvidia.com>

---
>From 18151dfdcb4ed88b44d7c21244442dad671b8d36 Mon Sep 17 00:00:00 2001
From: Gregory Etelson <getelson@nvidia.com>
Date: Tue, 11 May 2021 11:03:31 +0300
Subject: [PATCH] app/testpmd: fix tunnel offload flows cleanup
Cc: Luca Boccassi <bluca@debian.org>

[ upstream commit 99fc79b37af5652f30ab3c9725fd6a98494d14dc ]

Tunnel offload model requires application to obtain PMD related flow
items or actions to construct a flow rule. These elements acquire
internal PMD flow resources that must be explicitly released.

The patch destroys tunnel offload PMD resources after flow creation
failure.

Fixes: 1b9f274623b8 ("app/testpmd: add commands for tunnel offload")

Signed-off-by: Gregory Etelson <getelson@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
---
 app/test-pmd/config.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 25c2340d74..937a90f3cd 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2115,6 +2115,9 @@ port_flow_create(portid_t port_id,
 	memset(&error, 0x22, sizeof(error));
 	flow = rte_flow_create(port_id, attr, pattern, actions, &error);
 	if (!flow) {
+		if (tunnel_ops->enabled)
+			port_flow_tunnel_offload_cmd_release(port_id,
+							     tunnel_ops, pft);
 		free(pf);
 		return port_flow_complain(&error);
 	}
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:59.884103700 +0800
+++ 0129-app-testpmd-fix-tunnel-offload-flows-cleanup.patch	2021-06-12 06:53:56.540000000 +0800
@@ -1 +1 @@
-From 99fc79b37af5652f30ab3c9725fd6a98494d14dc Mon Sep 17 00:00:00 2001
+From 18151dfdcb4ed88b44d7c21244442dad671b8d36 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca@debian.org>
+
+[ upstream commit 99fc79b37af5652f30ab3c9725fd6a98494d14dc ]
@@ -14 +16,0 @@
-Cc: stable@dpdk.org
@@ -23 +25 @@
-index 01a541cdd6..43c79b5021 100644
+index 25c2340d74..937a90f3cd 100644
@@ -26 +28 @@
-@@ -1940,6 +1940,9 @@ port_flow_create(portid_t port_id,
+@@ -2115,6 +2115,9 @@ port_flow_create(portid_t port_id,