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 B042143E57 for ; Sat, 13 Apr 2024 14:57:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA3E7402CB; Sat, 13 Apr 2024 14:57:38 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2062.outbound.protection.outlook.com [40.107.92.62]) by mails.dpdk.org (Postfix) with ESMTP id C53AD400D6 for ; Sat, 13 Apr 2024 14:57:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFkIYW24Ub9abdCOfAaV48BmmmOqaNAm5uoKnWtT/W+D6B/hE62X6Ar8hFbjlj85rSpbieFJxtUzbmgFgwK/CrWlIulp6cvpf8ssRErc5v11YTwjoQJ88QiJ3QV4sK1WjLnCgSo4SL2VnFdR1I2SDPINlgCN9Jr496rBpeFZaE9JQb5EAFRbYEnOqms4G4D0gio60rBUF1J1B13KXb/S9bJ4h3fsi65nxZx3x7flIeZpJDToUe3LuKqpKofOk43pdS8QjKR0ViNMNEb9X3bXGKM2dH7JtyrW0zo+3GGLBc00osyXmLwda78IzgNm1loSrH/tBEVRJeIur6bmLR26jg== 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=9lUCfHPyAs5+ztTDaecSyqP615FT7W9ZqQWnx32HkVA=; b=Cd0VKAYQSgzI+XSNiPzrOS8ixBdHkawAhiM7TlQFqD2elKfWHrpSJLxwitqsnFftFpioF+P2+HEuBSzlVarI0qe5ua1KnPg2XOiSUWOMFbLsobJLtCkrRn7MYhEghs4np7AGirB17YVs/Aaeli7ukuJmFFaL1pYA23F7DzIi/S9IidXe3r1zGO3XdirqlfK1amfruKewACRRoL7SBsu/n0ieLWzrolJF1JBh8rUtHy3U/QH6JUs8VSl8KjLkRn9zlRK4aSqJOc+bZaugRLAWrslJfeSOh3tKICL+mXeQg3PzHWTY1nINrIhs52MMJJGc3otDXnI/URTz6ZWEJx9Jow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=9lUCfHPyAs5+ztTDaecSyqP615FT7W9ZqQWnx32HkVA=; b=jkRfU2XMc8w7e3Th+tm8S9Jp6cx2JXaoCoglm/V6uQ63WYjE6FGHpqNf2sT//cPyOimCRn9uoExDdQasp+214SukHhG9XSsvamh9HdTo0V8J2e4KMfxxDCC4JJarJKZKmTt3TPW2cu/M6o4Ob0otOshZh/ta7No+3wesDz8G9BDgTtRzR0SE9QyclvmvgK0ttJLNeEUBEl9GQipySUZirI8KP6KJI0UxpYLypPGumbhFwFIeKygNkiU9cbgspg8Q5kHXd30dBY2emJXnGzIFknHRJoBMmY1r3jEZhnvz8kcDE139AsGTVVzh/CKfSuCcn/ax59yJ4/eHsntAVaEhdQ== Received: from CH0P221CA0011.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::28) by CY5PR12MB6527.namprd12.prod.outlook.com (2603:10b6:930:30::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Sat, 13 Apr 2024 12:57:34 +0000 Received: from DS3PEPF0000C380.namprd04.prod.outlook.com (2603:10b6:610:11c:cafe::38) by CH0P221CA0011.outlook.office365.com (2603:10b6:610:11c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 12:57:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF0000C380.mail.protection.outlook.com (10.167.23.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:57:33 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:57:12 -0700 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:57:10 -0700 From: Xueming Li To: Gregory Etelson CC: Dariusz Sosnowski , dpdk stable Subject: patch 'app/testpmd: fix async indirect action list creation' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:19 +0800 Message-ID: <20240413125005.725659-79-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C380:EE_|CY5PR12MB6527:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a47b793-3770-4d26-1634-08dc5bb94964 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C+f9l5ZOMWMZbNdYdN8K8NIcOi/+ETjx8wxFcKD2Ijg+CGa2ghzfHCRsOaI21CfUNjyOfsi6xOKGZnX8geMDwDCRzJnjdtkAbHWGeXk9OFJZHkYGij9nlrhlyenQb2fmkYWfc2PLfOYmPuQIRt+JL8jIa9ir31i7PewvhEGowV/PP07meEOJoNrigODpV+WJFpwPDXsfFZT3tGboTDxBh/XEyPpExDjtq7JlV0GCI+zg86rO5pXd2CjbUNUSr7EGl8AeOq+I9dJ+U5VubGCCeS2IYzrZ/Y5X5ipE/7nneVpSvMiNxlQMAAFNx0hXczS7CW4rgIdXaOLf3WrQPbKmvNGvpSpBpL7rxjzPw84jeQlP5fXtMmujf+0b3QBwPeMPvhV4TfIgO1EQ9M4h6rY5jxSLHnQvGosBbNlWzQQt9mBU88byYgv/wYtEGJ1hW5scMIIWnMKSuwWhgG5ITXLhuV06ZDGZlqIT3gk1Mxk1LQSci/tMHKUmXOK3kXYt/XYCFcc3NN24sfQIF7nQ8wXoDyQbTM/fkf/VlKJnP2u0UX5RlFWqiwoDLDwam/jhKFfGi73/X+B6ux9ZsjKwPXJKADgdeYUa1B3EvZWlbA7hDe+lvRCFSqlJQQgteRbdeNygTEryzCXGZ0w4xZNH6+0YjLFn4sWEvBweP2e3/iT25HSGTOcNcyxV95YDkZjrp2/zOfidYXjUiVTN2YcgqSehdFN5FjTiNPASV14pvntDJ6lLk2iWtYiTI7k3wRPFGk6I X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:57:33.6578 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a47b793-3770-4d26-1634-08dc5bb94964 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C380.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6527 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=15952c71eb673ca8ce6acd754bd39ef367896423 Thanks. Xueming Li --- >From 15952c71eb673ca8ce6acd754bd39ef367896423 Mon Sep 17 00:00:00 2001 From: Gregory Etelson Date: Thu, 7 Mar 2024 12:27:11 +0200 Subject: [PATCH] app/testpmd: fix async indirect action list creation Cc: Xueming Li [ upstream commit c1496cb606875e7fda120a41435731fccff8f664 ] Testpmd calls the same function to create legacy indirect action and indirect list action. The function did not identify required action correctly. The patch adds the `indirect_list` boolean function parameter that is derived from the action type. Fixes: 72a3dec7126f ("ethdev: add indirect flow list action") Signed-off-by: Gregory Etelson Acked-by: Dariusz Sosnowski --- app/test-pmd/cmdline_flow.c | 1 + app/test-pmd/config.c | 5 ++--- app/test-pmd/testpmd.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 5647add29a..b19b3205f0 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -12609,6 +12609,7 @@ cmd_flow_parsed(const struct buffer *in) port_queue_action_handle_create( in->port, in->queue, in->postpone, in->args.vc.attr.group, + in->command == QUEUE_INDIRECT_ACTION_LIST_CREATE, &((const struct rte_flow_indir_action_conf) { .ingress = in->args.vc.attr.ingress, .egress = in->args.vc.attr.egress, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 7c24e401ec..6d605556ff 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2996,6 +2996,7 @@ port_queue_flow_update(portid_t port_id, queueid_t queue_id, int port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, bool postpone, uint32_t id, + bool indirect_list, const struct rte_flow_indir_action_conf *conf, const struct rte_flow_action *action) { @@ -3005,8 +3006,6 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, int ret; struct rte_flow_error error; struct queue_job *job; - bool is_indirect_list = action[1].type != RTE_FLOW_ACTION_TYPE_END; - ret = action_alloc(port_id, id, &pia); if (ret) @@ -3028,7 +3027,7 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, /* Poisoning to make sure PMDs update it in case of error. */ memset(&error, 0x88, sizeof(error)); - if (is_indirect_list) + if (indirect_list) queue_action_list_handle_create(port_id, queue_id, pia, job, &attr, conf, action, &error); else diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9b10a9ea1c..5bb1a79330 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -996,6 +996,7 @@ int port_queue_flow_update(portid_t port_id, queueid_t queue_id, const struct rte_flow_action *actions); int port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, bool postpone, uint32_t id, + bool indirect_list, const struct rte_flow_indir_action_conf *conf, const struct rte_flow_action *action); int port_queue_action_handle_destroy(portid_t port_id, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.414113375 +0800 +++ 0079-app-testpmd-fix-async-indirect-action-list-creation.patch 2024-04-13 20:43:05.037753879 +0800 @@ -1 +1 @@ -From c1496cb606875e7fda120a41435731fccff8f664 Mon Sep 17 00:00:00 2001 +From 15952c71eb673ca8ce6acd754bd39ef367896423 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c1496cb606875e7fda120a41435731fccff8f664 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 5f761903c1..fd6c51f72d 100644 +index 5647add29a..b19b3205f0 100644 @@ -28 +30 @@ -@@ -13237,6 +13237,7 @@ cmd_flow_parsed(const struct buffer *in) +@@ -12609,6 +12609,7 @@ cmd_flow_parsed(const struct buffer *in) @@ -37 +39 @@ -index 968d2164ab..ba1007ace6 100644 +index 7c24e401ec..6d605556ff 100644 @@ -40 +42 @@ -@@ -3099,6 +3099,7 @@ port_queue_flow_update(portid_t port_id, queueid_t queue_id, +@@ -2996,6 +2996,7 @@ port_queue_flow_update(portid_t port_id, queueid_t queue_id, @@ -48 +50 @@ -@@ -3108,8 +3109,6 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, +@@ -3005,8 +3006,6 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, @@ -57 +59 @@ -@@ -3131,7 +3130,7 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, +@@ -3028,7 +3027,7 @@ port_queue_action_handle_create(portid_t port_id, uint32_t queue_id, @@ -67 +69 @@ -index 55df12033a..0afae7d771 100644 +index 9b10a9ea1c..5bb1a79330 100644 @@ -70 +72 @@ -@@ -1002,6 +1002,7 @@ int port_queue_flow_update(portid_t port_id, queueid_t queue_id, +@@ -996,6 +996,7 @@ int port_queue_flow_update(portid_t port_id, queueid_t queue_id,