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 A816A457A1 for ; Mon, 12 Aug 2024 14:57:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3D4B402C3; Mon, 12 Aug 2024 14:57:02 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2081.outbound.protection.outlook.com [40.107.223.81]) by mails.dpdk.org (Postfix) with ESMTP id 2DED14029C for ; Mon, 12 Aug 2024 14:57:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yId5al0g+XSt3BDEkMaivHGrjhIrO/R/qJo0fAlyrAWaUC8gqEhhOaZCXhib6SUAXiwIPYthkgn7uFXlYXXK1lyI8P+zSqFlHl97nrslPoBb4i2dJSwMl/fazLZqZ4nfJbteSTF1QDY9xAPTdWLS1ONdoOgS77jt+5fTRyfnnDxH1rnXZDTR71bqGjerUG1UMALzkkUQ785YTvw7L0vn1Cz6/PzKj8DUPy8Lpmd46T4+pLXMhB+EiJKnu3NA9QRANMkXszxiV2S+KQtxKGFmO+pBqRtME+LYtoNmCibDvtSIFfYDF83D9d0ppDG2kSJsi9ivJvQmAQVhqAbNzBLKtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Crtruoa3qBMPUBadVjm+o87keKYuJ5sEdGrhl1WrLkE=; b=kX8EbFReXsJsteZ+D/qtd07UnTEoxPsS/NHWJ3ix2Z7u7Nwb2MwK6jTJcvNUxN681LYZeJsbikBCKVgivaEqK7ohjZxo0o9AjlaNOK+EcpqfQGgNtrx7iQ9+TmcW/68Z43e5+P7okKB1ZqZVMU4sm7zBH14SO+1c8PpA3XBrdrEbZQAXBMmiAdiboWgBc/NgX31JSMOodY5sjO1WiO9lb0o6gtgOSPVTtV6m3RPu3+6E3hbgPGbm01eo87MpRHpnkTxbvcqmMIl/PtzNlrqPBM0WuXdjbtPGXMX8eHZs2RLlPmcjdjM8UpSYspm3NttdBfLPnFqnxklt5HjnTmR+Eg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com 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=Crtruoa3qBMPUBadVjm+o87keKYuJ5sEdGrhl1WrLkE=; b=o1Q7WX8mIn6hmWf2G+gUlcS5b2UzrrveHpfMZtLFJh3DJQHsUg1drVNyIhauDv5lsmOoeK80Nn/UGrhq/bgs7LTxxd9bw57UB0IsRUVexLab4UI8uB57VRpyPeGt2Ndmzv3E5SJQiN9qin/zGyJSnieJvnvXAt/eKioes2+pq7O0m88BlGXzcpsXiaEAsHg25sNEFRT89S3NH5Zsjz3WyYGJ0X4QFHWr4A5hSzHxutOMn45isoGiIreHVqPgEH9G2LXwJ//0x5NMVrsFIaFxFm6cy37w8otjEvuoRHZagiJg6uGftnDzFi9jcrXqYcYYBjIYGEvWcbHmNDkmOGLEPw== Received: from DM6PR14CA0051.namprd14.prod.outlook.com (2603:10b6:5:18f::28) by LV8PR12MB9208.namprd12.prod.outlook.com (2603:10b6:408:182::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:56:58 +0000 Received: from DS1PEPF0001708F.namprd03.prod.outlook.com (2603:10b6:5:18f:cafe::34) by DM6PR14CA0051.outlook.office365.com (2603:10b6:5:18f::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:56:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF0001708F.mail.protection.outlook.com (10.167.17.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:56:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:56:47 -0700 Received: from nvidia.com (10.126.231.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.1544.4; Mon, 12 Aug 2024 05:56:45 -0700 From: Xueming Li To: Soumyadeep Hore CC: , Bruce Richardson , "dpdk stable" Subject: patch 'net/cpfl: add checks on control queue messages' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:01 +0800 Message-ID: <20240812125035.389667-65-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.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: DS1PEPF0001708F:EE_|LV8PR12MB9208:EE_ X-MS-Office365-Filtering-Correlation-Id: 14f98ec8-b887-4f85-6f2d-08dcbace4044 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NOJEu6bhyWkWN3mINMRx36V/wuRS0kD3yC2ZMKEOz/5EKv88/9Q4Zp3mtsIA?= =?us-ascii?Q?I0yvalSfzLykg26g50UKJhbvOtTyVDXYY0MXWH/8s5AHT3BQ9jE9B40PMrgm?= =?us-ascii?Q?1RRx/+WHYkMYDjiIfdECEps6CARGKw41jqgWvcIGWHdg4jTV6KBB5SS4s2Ux?= =?us-ascii?Q?7k6ylaJIjqtxDQhha8QwVc83vgWwwhfFYslUFrvUox23BYBgGx9bvmbgYK/U?= =?us-ascii?Q?Dw1pXGTBkY8QRApPHsKQW9mLGCMaQXNidT8IMU6atAiyjGmr5vi4J6L2kBYy?= =?us-ascii?Q?jH6oilLOWxWiNSwUBoWNky/ZoIjHg2x02qR6Kpxjn8ZtgcMLOiZoZ3pEnLPg?= =?us-ascii?Q?R2GkQ+4tvDPxY695PNalOVryEF8NJ5ZgKbtdtVJ45T6Ty5Q9gCo015BNCeUY?= =?us-ascii?Q?EhPoBamQBQelIgRkOYcEQ7IShBKA8CM8mNdCUGLMuhITY1mCD0tb+5ECGBYT?= =?us-ascii?Q?YtoT3h6f56bazoytCrY26ucnerUUKKFjJnaF+qptIEKwz3xDONDnpMmcNNQA?= =?us-ascii?Q?fzyYdbh/nxaB4xVTOltYjn4Bavv2cFOGNkdmoOY9di4Ter9b8DKv/BJbxNvh?= =?us-ascii?Q?NCXkm6SbcUQKRghSLpXc+XfUxCxXo98ngx08pQu1cLoJOdlo27xTb+wRuesr?= =?us-ascii?Q?8ujcsGwkqBtMlUp87vKXTfME3GZCzumyfNf+WI0Mlosq4HImVG74GJPV0BJP?= =?us-ascii?Q?keDYbKL6bCHi8d+qNWgNooofMdK2ZVY1ZjeS22sZx3zb7VarnVaiCwAemTuo?= =?us-ascii?Q?E220GE7fqvdHFARbHeh+bdxZjz/YNVonO+5M9NMWR9bO4olIj7uxScqzcbVb?= =?us-ascii?Q?0j8Qi4y5TgwYEDrU/oijX+BvXPmNKfUvlaVuP6PJHatogbprgbW8T59meYIx?= =?us-ascii?Q?a5I25l3vR+H1WyhgtGuwt2h9wzdUbOPdv2r5HrGiasULww1zTuWazP9IhyXe?= =?us-ascii?Q?pO+pNVPF4Na6dgQ6t5ae78GGgCvlyL7KgBtzH/o+ig2phrdNoYoc4nDwZflf?= =?us-ascii?Q?Jlc+WilHZ03wWLJaMAdHIrEAViTVWssnN2oZ52nVCJF0CcljLhNd0Y9eyxTr?= =?us-ascii?Q?EjFsf+MVyLTYAn0acBEjIcts1nys+TaSyaJlbQOfaVNKGd45hs02sg49cIpP?= =?us-ascii?Q?XleKIWVGI9W+wjtsneknjrOS993AFz/y/eM2lBcAIsoCmUJYV6Cqe9uLQS3g?= =?us-ascii?Q?M+GD7lNX1woNgLEZLL8/kZz5QHjLK2DaCz0tlhfAvW2x5DH11zH2wE3vOoR9?= =?us-ascii?Q?efRZAmf33fHKSK7YCCUsmxqrF29FJhjhZS+XjoyK7y6YLI9A6NWT1Dg/pQmh?= =?us-ascii?Q?MGawSdMS0vbvUOAM+cYm3/4RMpXjRO3wuf5vT0i84WZp1jO0YpInjvBCNFCo?= =?us-ascii?Q?WLHIsGKDN61XAhK/yaGJpSKYOY/NmqTVI9LzlffuyIycDyTPmpnXDBtNgdWS?= =?us-ascii?Q?y3ur2PRrOepBzDdKPGhD+cv7cgVWpDl5?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:56:58.2617 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14f98ec8-b887-4f85-6f2d-08dcbace4044 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001708F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9208 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.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 08/14/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=ec9de9db2d45cd8aef7bd3287e56755ebf2704da Thanks. Xueming Li --- >From ec9de9db2d45cd8aef7bd3287e56755ebf2704da Mon Sep 17 00:00:00 2001 From: Soumyadeep Hore Date: Fri, 5 Jul 2024 13:05:14 +0000 Subject: [PATCH] net/cpfl: add checks on control queue messages Cc: Xueming Li [ upstream commit 632b57048bb86bb88eb31ef118a0715218d528f0 ] Include checks for error status returned for specific opcodes and display error messages accordingly, returning the error status back to the caller. Update caller to handle these new positive error values as well as the negative ones. Fixes: db042ef09d26 ("net/cpfl: implement FXP rule creation and destroying") Signed-off-by: Soumyadeep Hore Acked-by: Bruce Richardson --- drivers/net/cpfl/cpfl_flow_engine_fxp.c | 2 +- drivers/net/cpfl/cpfl_fxp_rule.c | 8 ++++++++ drivers/net/cpfl/cpfl_rules.h | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/cpfl/cpfl_flow_engine_fxp.c index 8a4e1419b4..f6bd1f7599 100644 --- a/drivers/net/cpfl/cpfl_flow_engine_fxp.c +++ b/drivers/net/cpfl/cpfl_flow_engine_fxp.c @@ -95,7 +95,7 @@ cpfl_fxp_create(struct rte_eth_dev *dev, ret = cpfl_rule_process(itf, ad->ctlqp[cpq_id], ad->ctlqp[cpq_id + 1], rim->rules, rim->rule_num, true); - if (ret < 0) { + if (ret != 0) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, NULL, "cpfl filter create flow fail"); rte_free(rim); diff --git a/drivers/net/cpfl/cpfl_fxp_rule.c b/drivers/net/cpfl/cpfl_fxp_rule.c index 0e710a007b..be34da9fa2 100644 --- a/drivers/net/cpfl/cpfl_fxp_rule.c +++ b/drivers/net/cpfl/cpfl_fxp_rule.c @@ -92,6 +92,14 @@ cpfl_receive_ctlq_msg(struct idpf_hw *hw, struct idpf_ctlq_info *cq, u16 num_q_m /* TODO - process rx controlq message */ for (i = 0; i < num_q_msg; i++) { + ret = q_msg[i].status; + if (ret != CPFL_CFG_PKT_ERR_OK && + q_msg[i].opcode != cpfl_ctlq_sem_query_del_rule_hash_addr) { + PMD_INIT_LOG(ERR, "Failed to process rx_ctrlq msg: %s", + cpfl_cfg_pkt_errormsg[ret]); + return ret; + } + if (q_msg[i].data_len > 0) dma = q_msg[i].ctx.indirect.payload; else diff --git a/drivers/net/cpfl/cpfl_rules.h b/drivers/net/cpfl/cpfl_rules.h index d23eae8e91..10569b1fdc 100644 --- a/drivers/net/cpfl/cpfl_rules.h +++ b/drivers/net/cpfl/cpfl_rules.h @@ -62,6 +62,17 @@ enum cpfl_cfg_pkt_error_code { CPFL_CFG_PKT_ERR_EMAXCOL = 9 /* Max Hash Collision */ }; +static const char * const cpfl_cfg_pkt_errormsg[] = { + [CPFL_CFG_PKT_ERR_ESRCH] = "Bad opcode", + [CPFL_CFG_PKT_ERR_EEXIST] = "The rule conflicts with already existed one", + [CPFL_CFG_PKT_ERR_ENOSPC] = "No space left in the table", + [CPFL_CFG_PKT_ERR_ERANGE] = "Parameter out of range", + [CPFL_CFG_PKT_ERR_ESBCOMP] = "Completion error", + [CPFL_CFG_PKT_ERR_ENOPIN] = "Entry cannot be pinned in cache", + [CPFL_CFG_PKT_ERR_ENOTFND] = "Entry does not exist", + [CPFL_CFG_PKT_ERR_EMAXCOL] = "Maximum Hash Collisions reached", +}; + /* macros for creating context for rule descriptor */ #define MEV_RULE_VSI_ID_S 0 #define MEV_RULE_VSI_ID_M \ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.662185528 +0800 +++ 0064-net-cpfl-add-checks-on-control-queue-messages.patch 2024-08-12 20:44:02.145069304 +0800 @@ -1 +1 @@ -From 632b57048bb86bb88eb31ef118a0715218d528f0 Mon Sep 17 00:00:00 2001 +From ec9de9db2d45cd8aef7bd3287e56755ebf2704da Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 632b57048bb86bb88eb31ef118a0715218d528f0 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 39a281fa61..b9e825ef57 100644 +index 8a4e1419b4..f6bd1f7599 100644