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 20BF1A0A0E for ; Mon, 10 May 2021 18:19:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1ACAC4003E; Mon, 10 May 2021 18:19:30 +0200 (CEST) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-eopbgr760052.outbound.protection.outlook.com [40.107.76.52]) by mails.dpdk.org (Postfix) with ESMTP id 6C1044014E for ; Mon, 10 May 2021 18:19:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QtA2K+bIn4da+MpsynVs8/XZSv8yM0qIN/Q6cOhd4ZAg+w3r7oUHL4mBqG632lTKt7C7iiQo1ThJhgpFd/gZn1sUFJ2G9kiKclkyu1fOVWr6sHFOmwg5Lj2QrmBi35KzwAoy5fJxx6c11dI/lICZMl9KASs17fwvrxcfhFDkHM5K8o0WlEqHbeAR3hUElv1+fVkuK6O6LQdYgA2g1/OIXw0VD8wB/eJfM3FmTPJO5iClvy7EHbh8tNeYoXnYdSuO/SGRf9X6V7YAS+NDoAiG0YV7Wb3zkoM7qyvdrfQ7/p/OmmcOEiHlM/dHP9MCA8Ik5pFNkbLUjFAHZAP9HMt99g== 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=gxDUJVGU1RNhKc774YOWkq6Tjn+csfRZePW+NeRJQFo=; b=oUrvz6aXryv1/czIkXHDZ9IettJg2AUceGNMxyd4FbBLZ+v+kXHrZ1H0pM1A+P9dzyGnN6bS6hBeB8xElnfQDKkgxbjFbvYvjQwp8JL70lpOAkN4AvtJ80TpTDT3zI0reVzyWxXU3uwwJYyi4/jVIsz/2E/Ze9Wam7h3WidKMmcu4oSlG5y4Zm17866XIYZmVe9+yCC98d27Em9rc4O40acr5iSf/p0pS5XYJA61l0SpE3Z9NkhHQg9ABFp4rl5aUXFABQ3QsVJECzdIpp3LNbKUsbRZ7tUXWCvw9FVoDsZ/fJmdl68hP+xQpXK0eLfhfT2z3R3SthUx/WA6qwzDMQ== 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=gxDUJVGU1RNhKc774YOWkq6Tjn+csfRZePW+NeRJQFo=; b=r+96KgPKSLL6FC27ROpFznheeUDwyrUi0KBOzkNyWBNtoHLUgZiVu0lBq7XJfjyNGP/jj0FTyEq7yi1pHHo535o66sgziaIxIBoxTnevcN1sSqPDc44y6x6Th1CyDciGyx8xzvdJqCt0oRBBRE0lhKfyyKRGQNhyi1uN8np3D5uyp+nIdDOdHDx+bmKy2wnJU4aDYlkqQ2jj5qq/mRgOs0XyzbLuH7h8lyKVv0LcLq6583XHBB/7pgMAe4glZOa40EQeB/5cRZEy+BuDyeNJ/dFBurwNOWtLkW3iGyTP+1NN4Rmq4eMIuIoejS2CkVLaW1JPqfi01u/bD0l0au3fXA== Received: from DM5PR13CA0069.namprd13.prod.outlook.com (2603:10b6:3:117::31) by MN2PR12MB3165.namprd12.prod.outlook.com (2603:10b6:208:ac::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.29; Mon, 10 May 2021 16:19:26 +0000 Received: from DM6NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:3:117:cafe::88) by DM5PR13CA0069.outlook.office365.com (2603:10b6:3:117::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.11 via Frontend Transport; Mon, 10 May 2021 16:19:26 +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 DM6NAM11FT028.mail.protection.outlook.com (10.13.173.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:19:26 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:19:24 +0000 From: Xueming Li To: Wisam Jaddo CC: Luca Boccassi , Alexander Kozyrev , dpdk stable Date: Tue, 11 May 2021 00:01:52 +0800 Message-ID: <20210510160258.30982-163-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a26f938-1111-4c34-588c-08d913cf616e X-MS-TrafficTypeDiagnostic: MN2PR12MB3165: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zpEZHHaYW6GTcWQy+EqH0J/DlbQAJ1DbxMWCqHhmcevn47B75rTtpAJjM0Gb/7Uo2gE35fEVlow459gXUjAasDCgZxTLndHt+p0crGY3MNdEwVAxitlBRpm+9bE9LcgHmKGhc1E+8BGwNe/5YV2rYiBmixbdEgntlEE/+aS7N6qHbDeLnmcPHWNYRd6lITB7GqsS3WzUMsvS5nJgPEDwZ2DJZp83F3Qa+hGZiSIDaHf4CFGynr5su3MkIVpt7OznpqcqoAYdCln5hEW8M3JKH/bRv6XagEg1lXPnLQIy6goRPtgIKKY0TK/IBHMFK3LhTwpQGVKHxzIdrN5WMi5gwCoIuXaxdfr2vjZ6CgvXZiGr1i0k8mB+5et4aavqKawEwtd93U7nBOrVEEJaocW+7ikH7xvqtniAc6kKKV7m1abK9zQrTF019eCeJpZ04YtZd2uHrg4hCkGYd5I4Yu0tH2GcQ5mVyiQPpWajT481LA652NyHg2LKcsnOPB72IN/V0x/Q1CcgJJM3YOfadVt/hdJukNAmNAk3q0L7RGWHCpcOeF//a0MsUlke9pcv3X2/YRlqxnim+lvj9Ib75A+XM2ZtBi7dEonbyOgIaQkdSunNYJd3NrWvvcgPQo3kL38BwPVgIznfRtzitJfg13UleBsPaAv5UDeujeNCMfqAh2cOn0mb5H0P84ZIgd4C3aVpSApQQsAEknCKMS5+z5sngA3PpgWDVm8/JiLobTexg90= 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)(136003)(39860400002)(396003)(376002)(346002)(46966006)(36840700001)(7696005)(86362001)(4326008)(53546011)(6636002)(36756003)(2616005)(2906002)(8676002)(82740400003)(6862004)(82310400003)(966005)(37006003)(55016002)(1076003)(36860700001)(7636003)(54906003)(26005)(316002)(6286002)(426003)(47076005)(70586007)(356005)(70206006)(336012)(16526019)(8936002)(83380400001)(186003)(6666004)(5660300002)(36906005)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:19:26.2356 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a26f938-1111-4c34-588c-08d913cf616e 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: DM6NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3165 Subject: [dpdk-stable] patch 'app/flow-perf: fix encap/decap actions' 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 05/12/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/2e83b42a993ff104f49282c3943847a876afc598 Thanks. Xueming Li --- >From 2e83b42a993ff104f49282c3943847a876afc598 Mon Sep 17 00:00:00 2001 From: Wisam Jaddo Date: Sun, 14 Mar 2021 11:54:27 +0200 Subject: [PATCH] app/flow-perf: fix encap/decap actions Cc: Luca Boccassi [ upstream commit 83f9be10f237890587fb7639484ea757c20fdad8 ] When using decap actions it's been set to the data to decap into the encap_data instead of decap_data, as a results we end up with bad encap and decap data in many cases. Fixes: 0c8f1f4ab90e ("app/flow-perf: support raw encap/decap actions") Signed-off-by: Wisam Jaddo Acked-by: Alexander Kozyrev --- app/test-flow-perf/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c index e2fc5b7f65..d25778fd44 100644 --- a/app/test-flow-perf/main.c +++ b/app/test-flow-perf/main.c @@ -693,7 +693,7 @@ args_parse(int argc, char **argv) for (i = 0; i < RTE_DIM(flow_options); i++) { if (strcmp(flow_options[i].str, token) == 0) { printf("%s,", token); - encap_data |= flow_options[i].mask; + decap_data |= flow_options[i].mask; break; } /* Reached last item with no match */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.835537700 +0800 +++ 0164-app-flow-perf-fix-encap-decap-actions.patch 2021-05-10 23:59:26.610000000 +0800 @@ -1 +1 @@ -From 83f9be10f237890587fb7639484ea757c20fdad8 Mon Sep 17 00:00:00 2001 +From 2e83b42a993ff104f49282c3943847a876afc598 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 83f9be10f237890587fb7639484ea757c20fdad8 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index e37a8b7f7a..8e229679df 100644 +index e2fc5b7f65..d25778fd44 100644 @@ -23 +25 @@ -@@ -728,7 +728,7 @@ args_parse(int argc, char **argv) +@@ -693,7 +693,7 @@ args_parse(int argc, char **argv)