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 95807A0548 for ; Sun, 28 Nov 2021 16:01:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F9E540E5A; Sun, 28 Nov 2021 16:01:21 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2058.outbound.protection.outlook.com [40.107.243.58]) by mails.dpdk.org (Postfix) with ESMTP id ED0264111B for ; Sun, 28 Nov 2021 16:01:19 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c7dosKHej/dCIlFqir0m1qv7GsU9K0XHBKH+2rN/2uXUc8bdrveV50Fzojxb9wD98lnqEzpF8CazHoGDbKsbT6tAJjMAlXinWGdnYt3a31BgT6GnSM6Z6ntvRgTwzqJznHQr4UBKuuEN/LeEZ+K2eBbimt63mS81tPYNY/s5KPNVR3/O6N2QqRtR7uMagpjVSJuyjqMTsmLCLZvY4n7QBUaTVLc2ixSp+S8K4t1cqKdU6p5cBmXFqHRW9+2pNsL690tXRM3mJ8U+uq+HFjFW/wCHM4DzDMkm4xyfQfBx8H+0DajKLUDmgN80L/GBlRvAtnZELVujqTFoZ6UjTuP1qg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=9m724sDJD4+3wv4Ih2iKNq3xp07TZDb1dh/4JgdT/6w=; b=Cb1GnBbDsZmRo6wD+Y6Pl22r9guLzxD9omLACUkE3Ygfanne3N1te5svVC1/mL/i0pgeZUaZG9Xt8X8T6Iqb6xL0q5qsY6vq3WSnhDHljW2FqiN3WlqlEhqF5MiGOl2/5GWrZfsAkUfuIZ5XYDqZFXP7YvfjmRjnHlIkKMtjGjwtCBpUZ2qa5Kq2UcqMGkhrzebDXu0UNYsuHfGyKEY6wx3FAEblr8cv1UVBaEhqnHbP+FNf7lXxYhDtE3taIzr29uzN2Ns09q/y4QiDz89QffGThIKhNDAUEdqWMUC/PLbGsgNs+aFH6o5dDoG5oOZs7QIQc4szoHpX0ERLVXI0yg== 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=quarantine sp=quarantine 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=9m724sDJD4+3wv4Ih2iKNq3xp07TZDb1dh/4JgdT/6w=; b=G4i7QhSL0r2Smszgw195dQ3xfxdXAHy1Q/Hmv53FhEoAhv2afWiWNbmR4UNzl1UmJKDjQZTQdEYHjI0QuissNx3Ga3fiFjw0hC3LDB4tJcRgN5je/OKlZvxczOJ9R71LShAxDcBg7u+t1mJWz7ZhrIcr0Ihc3HcXVkgFu1N3CBlGenLjt3x8JocHCW0o6RhTv1Wnh91e25IT6hvkWhFL9EeTPapizOidxcAVd/3TmHNLuoDmDGqCaB1Slca9QUUYRMVVbBJX3IyWvKYG6Ry5DE9ZlLwpfnCoXsxodpk3Q3FLmI35ZrWB4vFzjkwRbBY82xZkdgHm+4L7/yisFMXwTQ== Received: from BN9PR03CA0649.namprd03.prod.outlook.com (2603:10b6:408:13b::24) by BY5PR12MB5511.namprd12.prod.outlook.com (2603:10b6:a03:1d8::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sun, 28 Nov 2021 15:01:17 +0000 Received: from BN8NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13b:cafe::ed) by BN9PR03CA0649.outlook.office365.com (2603:10b6:408:13b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:01:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 BN8NAM11FT012.mail.protection.outlook.com (10.13.177.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:01:17 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 28 Nov 2021 15:00:34 +0000 From: Xueming Li To: Gregory Etelson CC: Luca Boccassi , Viacheslav Ovsiienko , Aman Singh , dpdk stable Subject: patch 'app/testpmd: fix tunnel offload validation' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:53:57 +0800 Message-ID: <20211128145423.3974892-54-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74f8b8d1-4fda-4731-036c-08d9b27fee36 X-MS-TrafficTypeDiagnostic: BY5PR12MB5511: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8j6BdVwUYmAcOc6oBvjfTjhNdNwqDKpbAWqsy3T/p43DjmDMAWQxzJHisHKYoDsPb7vf3YTo58dWp5g4YUeP4wCdPWK7/zxm+uhVwsI1bzlwVyEsN8Y0Rioeo63FoTz1riHNG4V9QR0skZ7TBaTytQ4HeWC7XsW0Ey0TGw4e8MdeADZz+cpzonqF5iGhCTuOv1jEG+50O1wXYYzc2LKV3HQ9/BOekWYkmeL/ahr40DmmBDp7ulHsg2OGZBvPUyec6BpIA1Jxqmz+6jymJY2G/rGqQEl0ZInimVWL6bhcC/s/FP0V0Q+a2pvaOqbf+Xa+i2X5IMdNqpkiKk8Y8Bcu7g4LGcFe4DR6DPB+44cyVH4Ij7ftC0YKeQDidf3orhPWklb4CXthT1nzJmAIahDN8NO2E0GwqbYmfG3ikMZCa839djSY6jOXGuW18EwEeW3wxO0zGFmIfFcyLBm8K0Osnu7h5GWATTWwvWOAdW9jP7PspkJjLSdLijc90iSmV/Wbe8lSz1OGoM6OK0mw6Qxp4StxxcuDG4zCb7O8So/7xka9TwbUozcg5d4mF7OMatL7HgssdNlZucaJHOoFsrWOGUAEJN27G953Cr6aWtPpGu3bIM+Aol6rsMdrjVmPDN1JSuYjMwAlkclzIMH5bsdDmkZ9p9wmPleY6DWyekYIwZ2qFEsreCl7CdoxjwvKkcCg40uSH6EYYbjgW3o+rfkCn/VM70H2Vd5FwxDAZm0IL/ER03bfZcB3SNZCXLy7gQMFpO6fhe2AfK/2QLRd2MJNwRdIHaRZL66UN8vKkh4+0S+nBMgwrU9UaCtH6ZZ0E+EWMm8khAvt7NryoCjSD6U1Zg== 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)(46966006)(36840700001)(54906003)(6286002)(6666004)(2906002)(37006003)(316002)(83380400001)(1076003)(82310400004)(70586007)(55016003)(53546011)(508600001)(966005)(6862004)(7696005)(47076005)(70206006)(8936002)(5660300002)(336012)(86362001)(26005)(36756003)(6636002)(36860700001)(356005)(7636003)(16526019)(4326008)(186003)(8676002)(426003)(2616005)(4001150100001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:01:17.5154 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74f8b8d1-4fda-4731-036c-08d9b27fee36 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: BN8NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB5511 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.4 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/30/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/6d5aa03a7788612dfd64a827a5beb7d1f3d371c2 Thanks. Xueming Li --- >From 6d5aa03a7788612dfd64a827a5beb7d1f3d371c2 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Tue, 2 Nov 2021 14:24:21 +0200 Subject: [PATCH] app/testpmd: fix tunnel offload validation Cc: Xueming Li [ upstream commit 849e6ddc6a431a021d6ab2125f1ebbba545cf05a ] Tunnel offload API allows application to restore packet to its original form if chain of flows missed after DECAP action. The main idea of the tunnel offload API was to query port PMD to provide flow elements - actions or items. Flow elements supplied by PMD are merged with original flow rule elements provided by testpmd operator to create a new flow rule, optimal for PMD, to implement the tunnel offload API. That flow rule transformation is hidden form testpmd operator and uses internal testpmd resources. Current testpmd did not release tunnel offload resources if flow rule validation failed. The patch always releases tunnel offload resources after flow rule validation returns. Fixes: 1b9f274623b8 ("app/testpmd: add commands for tunnel offload") Signed-off-by: Gregory Etelson Reviewed-by: Viacheslav Ovsiienko Acked-by: Aman Singh --- app/test-pmd/config.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 22da15e51d..8e37602f6b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2047,6 +2047,7 @@ port_flow_validate(portid_t port_id, { struct rte_flow_error error; struct port_flow_tunnel *pft = NULL; + int ret; /* Poisoning to make sure PMDs update it in case of error. */ memset(&error, 0x11, sizeof(error)); @@ -2060,10 +2061,11 @@ port_flow_validate(portid_t port_id, if (pft->actions) actions = pft->actions; } - if (rte_flow_validate(port_id, attr, pattern, actions, &error)) - return port_flow_complain(&error); + ret = rte_flow_validate(port_id, attr, pattern, actions, &error); if (tunnel_ops->enabled) port_flow_tunnel_offload_cmd_release(port_id, tunnel_ops, pft); + if (ret) + return port_flow_complain(&error); printf("Flow rule validated\n"); return 0; } -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.033761875 +0800 +++ 0053-app-testpmd-fix-tunnel-offload-validation.patch 2021-11-28 22:41:03.376873288 +0800 @@ -1 +1 @@ -From 849e6ddc6a431a021d6ab2125f1ebbba545cf05a Mon Sep 17 00:00:00 2001 +From 6d5aa03a7788612dfd64a827a5beb7d1f3d371c2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 849e6ddc6a431a021d6ab2125f1ebbba545cf05a ] @@ -23 +25,0 @@ -Cc: stable@dpdk.org @@ -33 +35 @@ -index f87d9d5b82..1722d6c8f8 100644 +index 22da15e51d..8e37602f6b 100644 @@ -36 +38 @@ -@@ -1971,6 +1971,7 @@ port_flow_validate(portid_t port_id, +@@ -2047,6 +2047,7 @@ port_flow_validate(portid_t port_id, @@ -44 +46 @@ -@@ -1984,10 +1985,11 @@ port_flow_validate(portid_t port_id, +@@ -2060,10 +2061,11 @@ port_flow_validate(portid_t port_id,