From patchwork Tue Mar 12 08:02:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138205 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D325543C8E; Tue, 12 Mar 2024 09:04:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82FF5410E6; Tue, 12 Mar 2024 09:04:08 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2129.outbound.protection.outlook.com [40.107.94.129]) by mails.dpdk.org (Postfix) with ESMTP id 2BFF940F16; Tue, 12 Mar 2024 09:04:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V4xenhH4DjtxVxWACGDT3tBYNB1p2m+trI/Hbib2mU2nN+lcD9fzbgsawh9Hslq6zrZaMhbD1B0ID/w+Gi6pPT3yiDMdKR8VYEDi14991C3B5w6X599+JbrqVEB+qpaZuletRM2oZ07WUTFhX/tEee3ufMF2lz8MkAQaBOssxDzo0hyRsuZKuX9ACVBfxfM2AhckfpvxN3gIdBsrB34I2YVxTMMRs01HHa2OViGTzW+1uxpuiFPsFOlrhDwclpG0LdbGOilkWJIbsw4rRIaJU/j1YUg2t/J26ZX92a9JgWYjiVPEvnRta9V6/YBS6bwYlzC25gEYrx9+pFEmatiaVQ== 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=QyZ3zXClykfsMSXau0Jw9TfmgW+y3X+Alu3XxuH/yVM=; b=iKEYu1TDv41KniSGEnQYS9Nv6exEkXN9i38PCSD9VvoRR32r8TgRws718e70JQZIcWvtK/GvZV94g+mfIgWwHRK8UF7eH843kLmkMhFsJUQlDo6wfKJLX9hyi667J3XQ3jT+uyhHAqfXcCTIwJDAExUrwBFbAzL7FEnrmpaYezz6M4b+wjoTcgg+zlnfbFi3jQj2WwPBV1NuTOqX5/RPOZXEJdzdIg6e1Qd5N5V46JMSNR4khtlfogbB5V2v3vasrxKSJnPndTCJcypW5zcPGqnwbJj7K+3cV7pXq102uv0LDnpGDbVzZUCydm6x72cQiBfvfYj9vtnFpk+cNKL4Bw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QyZ3zXClykfsMSXau0Jw9TfmgW+y3X+Alu3XxuH/yVM=; b=K2ljrhb3OMVAhjm/NjGF8ZShjOV2Fet22AV2uqinxDw1tekA/0vGNE9lti3X8UiNrMBXkdZeQevFGRREQ72yPJBXdIbIUUVmmfUoSfLwn1GXowGiaIZwiPNFVP2pTFGi2nXtpYc4N2MFlDBe4G5LKUDzr3fT8/o/AGTAuW5p/VU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB4987.namprd13.prod.outlook.com (2603:10b6:510:75::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Tue, 12 Mar 2024 08:04:04 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Tue, 12 Mar 2024 08:04:04 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He , stable@dpdk.org Subject: [PATCH 1/2] net/nfp: fix IP flow rule failed Date: Tue, 12 Mar 2024 16:02:44 +0800 Message-Id: <20240312080245.2783410-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240312080245.2783410-1-chaoyong.he@corigine.com> References: <20240312080245.2783410-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR07CA0099.namprd07.prod.outlook.com (2603:10b6:a03:12b::40) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB4987:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a630de6-d62c-4198-18a2-08dc426afbd8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3Txqs+Ynv6mKQS9gIZWXb69YoOYozFplAYvberNNo9PbacWWjaJ7D/uSxP021bRStQrzlv3kSnKlL/S+OtJVvF3Vy23OEKNN1Bg9Efc/5pJZKOQifbr45TcKqOdKfaOf0ZYe3UtpQSak5acRdD97QLjhu1ToMWfPZ6WDV2tb1+95mD6VWz7Fhj2fm5yxzaOPuuDI44PlJ2Hz0FbHLop96fF6bMPxQb9HinhHsIfUOm/Qeavibi6w5I1wQ2f0BPWIInDsnR3apJxWpXIfZJMmuLctj53qvoaUt6unlaGduRsIAzCFm3VTFWmm0pRSt55QbIzOI5DWQx7a/DOkAFAQM9/+/AS7RCdN67SznT8bJQSO71NctrCWXdfA/QeKSEY5ESwx9KPFLQ8kthjAHXrHQwTjw59I1BVDukTgemJH+JqTnQJW35TaLxixrclNODGonzUwQVm78cljSakdSlNcfTZxfXKnjnJLo5unHem7wx90qCzr4OUhwlfpKq3jvaDRpj3WuTqGOtDwBWt8aQRVeZkS45+YzBwU4zY2pndfVEoehCLJPvpb9yrC/KnCkUwqN2MUQGdNaGuBm042CcDilHI3N2drtu2mk5X3XsCVh5jPH1z87rDooMAQHQsRmFzEmqxoceyZsFLASjpg7ccrMx44HxMP/6u6QmD1DCFqEqFgy2MX2RsuKA7+Erd9KYnyeCkhsqE0kJ+nwG0ieQAR9orYyxBQcv2PxqtBmpuEu2U= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(52116005)(1800799015)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /apCMSmXKHBtC/PRROIPTvGvdddHe3a7UAzEu2T3Nvnv7yTO6Pi4J21lnoLF3mrExpR28z+t47grU0fYHe0jZ0fP4C8Q9xbkPeOzjinrW26rxg8JJnpk1mI5RdNkyHGhpSlaRbhNwF9yamCeB9GJy0zf3niOLwykVVcFQ9ivfLq7ULOK6HZIU9p3RPVxVCSlFB4cx9/YfSao+3L3w7G0PvGFnd1YKUdCuyINofk5uIks7RSusKWJl4vHEIfQBwhW4a2BSsDpk4fU7INxUPV8czhWjthKeKRXkO414Ed4TeoDOme2cg9YLjFb7WiGEneI7x0oJ1+dQIs+cSoLLMnlnH8k6nhX3hfM/QCxX+SPNfF54XXB0oklS7oWQUYp087C65l5yMEYUlr3dNCCAxaSiApopFQYAvmc0MRJ03Tzy6kI3DTsU92ldaf9Zg5Y/EG6lwbo41pzvPDFOShC+B4D4eA8j+1XB/Wp/gSgzsXNIe3ZLP34BcZ+bAFEtn+H5BjX0reN0dX4tjkiu48+ll/FJo44yuoTY0XFBcx0VUJ6Fvt2/gy3y8na1IQzaFw6LmBuaTg6FPov+XQz1ZGAH23iFhxPUoCuy3hVZp9pJwcruoNErQhHDxNGiq0/MjWTfgW5FhD+6z6QWiVB1a/PZB0GgVFSuNrmmIVcKbs8woKxms2me7TnrwmnQoGn2qk0/gXT34dohtkXzP50SNgv1ZCWcbXskSyAtNkAke5HSAiNKBcb0jj858d9K/H3AwMTyUX3gFB/ed63hmT66wchdYoXkfHZgIygqV4Wm3qxu7C09r8mkyK8BiLOycuEz2V4JCFQ9NDwmocOKPviI/AWZZ6Runx/FhyoVkpNELvypv2E7OXi+nn+N/Da4uVL9cBCAmSSzYAufrrnwKOZ+oG2FFNqpMel4LfQ/BfJRSrNEuJgNDIhPk8e6tEwdMuI8CYKncEkUsINdek5TGYBPgnNfADhVSMjjbK10Jt1vRUQdq7uqhk+npyHUodhQlxZZjQg3pig+xn3HNN3Qoeoh7C/IRNXW2QgjgUdaIpxpGdwp073IKQ85fLsOrxvJ3nOQsreOOIGH+lYi43cJUYsyJvRwWD351a59nl0sZ2oDi2mXNgU/jQc1ZFPDHX0TJlJHeQIkVFzGDbjajxWkqm/lNcDzt0vDJ/LYxQ2vsOr4ClN4/Yi4FBEDO8Mwcm4H4e7m8NTLe67mfrXM0nEYu8sgwZDxoau0mrqRY5Xzc6UmuD0GZUiOOMtJ9LbbAEAlLFAzGgWGuy6xJuLOl7HHZGSbAv4EtCCPoM7nP05NDJC96ZQRlSuHASSdkDvefU907SRLAgvSpjKFgDUz7IvOq8d4NBLOf/G8B83s1sqn9xV1MaI8VEdf6n84l+v84I5rvr/qSzMv9mnzzw/+FloZR8H5rrUcnIxwBlnu30mtQsrjxRDGHbQLF24lDv7Tj/x3e5TxB7JbzxsTPW9dftGlxLhhLJvqEFsrk3jtCIUY7BmSpVp87dtpos9zgBsLXp0v6YL14AGcAI2IiMBOO5cjGwXqjiHHZ1qImGB/Q82mMiLRoPFyzObaBRIXOV4uv12g/qNo/bQugv5qL6CEOA8yD3flaPIcU1H+g== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a630de6-d62c-4198-18a2-08dc426afbd8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 08:04:04.1722 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: akElfNUxsFxJFOFyiTtR7Br2yX3T4rHt8SQ3t0goX/fGhXaYmJYtjS+btTsW5U53o6Bsjui5FxkHCafMSKZK7XTphOcv2RvJgib42iKtDWw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB4987 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Long Wu If the flow rule dose not have 'spec' in IP layer, NFP will set all IP flow control message type to 0. Move up the IP flow control message setting code to fix it. Fixes: 42eabda06b0f ("net/nfp: support IPv4 flow item") Fixes: 9f27cb889246 ("net/nfp: support IPv6 flow item") Cc: Chaoyong He Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_net_flow.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index 3b33f3b6e9..bd983aaf6a 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -237,6 +237,8 @@ nfp_net_flow_merge_ipv4(struct rte_flow *nfp_flow, const struct rte_flow_item_ipv4 *mask; const struct rte_flow_item_ipv4 *spec; + nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V4; + spec = item->spec; if (spec == NULL) { PMD_DRV_LOG(DEBUG, "NFP flow merge ipv4: no item->spec!"); @@ -245,7 +247,6 @@ nfp_net_flow_merge_ipv4(struct rte_flow *nfp_flow, mask = (item->mask != NULL) ? item->mask : proc->mask_default; - nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V4; ipv4 = (struct nfp_net_cmsg_match_v4 *)nfp_flow->payload.match_data; ipv4->l4_protocol_mask = mask->hdr.next_proto_id; @@ -269,6 +270,8 @@ nfp_net_flow_merge_ipv6(struct rte_flow *nfp_flow, const struct rte_flow_item_ipv6 *mask; const struct rte_flow_item_ipv6 *spec; + nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V6; + spec = item->spec; if (spec == NULL) { PMD_DRV_LOG(DEBUG, "NFP flow merge ipv6: no item->spec!"); @@ -277,7 +280,6 @@ nfp_net_flow_merge_ipv6(struct rte_flow *nfp_flow, mask = (item->mask != NULL) ? item->mask : proc->mask_default; - nfp_flow->payload.cmsg_type = NFP_NET_CFG_MBOX_CMD_FS_ADD_V6; ipv6 = (struct nfp_net_cmsg_match_v6 *)nfp_flow->payload.match_data; ipv6->l4_protocol_mask = mask->hdr.proto; From patchwork Tue Mar 12 08:02:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 138206 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 48F7143C8E; Tue, 12 Mar 2024 09:04:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 551DF41157; Tue, 12 Mar 2024 09:04:10 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2110.outbound.protection.outlook.com [40.107.94.110]) by mails.dpdk.org (Postfix) with ESMTP id 8AEB3410D0; Tue, 12 Mar 2024 09:04:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UOeRNgVj3hioywvD3mXJDaCz9lMfxD1IQJd4nsCwVksOZVN3U5tfmeVD2JBe47jcOwpmeC4M81mdK9ydCBcErEPRjOPPJi1atwT77grApTLEUS2zkylLUMDFERwzXs+T97J5rZAU4wHc7Bx14Tw53qz6Zrcv0zcSoMAstGAWHqCvdwVOBtD0UuAIlvEBYR1bt/NiLQkqOeE1N4e6A5ATG6L+1ATg9bK4AjooolVgeHO4RaihrcjqBxHrnqt0GmRSMRvmA4Aicrjxn3TjxUSOpxpQ0Rr5OGZ9ng++FwuPc99kRchSSH7jpIhp9ZGP52FRkHFHil3+S1Kct1A8khefCg== 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=mRKvj3slw7Uwr7nCtUJ+loPD4eBzfq7w67C8KcDg6uI=; b=BfQQdAnpW2iVBcYWF+ER0t443kAEJm0RpYxU3t9rwpVwtczTTcVL753jA5MTyDv93b1JdFKEvzcFC+IbQAkCe6+6XUtFu1ChiVQuBxwDzBuFjO7XNTM0gfNFurptQPYSqlCxmoyFb3+vB3+0CuFA5pabN4sWF+dYPGKVdxTvYmytqU0ewHBbaCS0lQs8go4Yz5+Wf7ruuIkynp7rCjSVQ5g2gw0F7ZXzV/WqhcMIIKwaS72GRgzRvK408Gw/Vx3GIXc/SXz5fP8KwD0lemwlBO0FeWHIdK5ToqqP//L24U9APTmpRr+IeTDU0ncajdwYGHcEu8m4TWzlslbRlODq8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mRKvj3slw7Uwr7nCtUJ+loPD4eBzfq7w67C8KcDg6uI=; b=IL0Z8Cw4r2pBbpDeh6yNnAEO80wbxWIPhextcIrqawsI71PNsoquJo+7z7P6SEMSMPO3NwSnhvW9aGByXniItIOxxRa7579lNSTfBvoYAHa0TZv4stp/mgSe3IVDbC7gb4ZAl8ZajalDOkGWsCTdejjH0jaSUhcuwGQuKSXYy3Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB4987.namprd13.prod.outlook.com (2603:10b6:510:75::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Tue, 12 Mar 2024 08:04:06 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7362.035; Tue, 12 Mar 2024 08:04:06 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , Chaoyong He , stable@dpdk.org Subject: [PATCH 2/2] net/nfp: fix incorrect queue index Date: Tue, 12 Mar 2024 16:02:45 +0800 Message-Id: <20240312080245.2783410-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240312080245.2783410-1-chaoyong.he@corigine.com> References: <20240312080245.2783410-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BYAPR07CA0099.namprd07.prod.outlook.com (2603:10b6:a03:12b::40) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB4987:EE_ X-MS-Office365-Filtering-Correlation-Id: 98c93aea-17a3-4f3e-c54f-08dc426afd03 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yl5h42pbtpgnVT/NH40rYkmcAACHQdP26imciGlvjeEZDHcZ8S18LI6fioGlhGrw9qqTz3qNo8CIT2bok7qhGw2QNNR4903nq3RRqJzwAyJTyV1K7YpKCXDqfC45x4wXGPdXmDoYCzj0S6YIJI489LFOCJKbTxItUKankzG1S2etwo2z8U3u4puf3slcM4VstglSvcIa7+X3vcEpAG00HkcAwH19My/TcEQjrGwcOttd4cCdoV3HY79++jvr5WGzRGMcnQ3lxmNfeDaRagCESQRw1dwEcK5LHFwXAHrKDBLA9Wy8TByNh8XBOlyyqVpAD1dtHDVN85sDl6uLrpodtFT5/KLj32iO6mBOyJthBXjsMBEc+K5RQJemaZreMWyaF1KLzGyp4y+wCxaCfo154mk/woNuH5iOp+P0495MoIZX66FXZFBYE/rtP1rbGWw8bnTNu1nn1WDdqszHIg625jT4QhEF4hXHyThwzxmpvUphkv1nojZm/kKomDwWqOWtENyRBX1/NakkVADKPkG3ITYaPOvCxZTf2cUMGzzIJ30XDq/qACoHKvxGlB9c6brP5wGtmzBMLl/2ZoOqQwEVKL810QkTe5E1th/LMkjM8B0Go1JC6YGLlP9eRFDRxfRne2HulXG3J1kUHT6byK973x6gNEA/tuH2DRRMvd/wLs1Cda58xFfTuEiA/3HSNIEbGTFixsdaPJai0DeaOR3OVYexMAKlIWDg3ByJh7Wtyig= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(52116005)(1800799015)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EnXoifhlrlmNZr309lNCuVuPGnx8qDfuqtX0l7YXEQ6aLzZYNGJ2sBeyrr+e0Id+44k4p7mtq3U1pCxa72uujZruKjltk4XKPJugZjqtW3kC1oy6EgZ6Mi4ufWhaSJfLTys9CT6XTVQv7LBEAKU5ifwVJIm/UAbKPw3QYhn4nwwqB/S9/SuEUP3b0z/OMXZbk2Rrm6NmXDy43YWPG5G1mM+p9Z2wWMCFToMtGCaPa7mGMhZiW9M3+52qSgPFZVHgq2AwSkjw0ekQVBj3dDUoHilRS6TgY8EGn5asF3KCtYG+HSbQKV01z96eEq3qOqHBJGzjkuY/XHy1J5OBRnsotxR4lUWNjBv8Izj512Fb69nDyFLdSqcaCJkt4F2y4QUDr4vEVIR7GY4hqCJgmh0OMiL6kFRyQXr+xiGXNw4QwPIMXABvPoKskTUvbtPDtiOhanbKMV5IbtWPlksWnBFNtQCX85g91MEsOXwpEYFEBTIjGT2nZqCd7YiTpcrMa7D07m8+9OJVDZUQqQ8O6uFHOA0oesfGeXgkcgrBpwVOPM+xOPvIFvPGdlJciqES+r5YhdsjNRKsNWEaArXafbAoK/bpZt1qM77GpuUb/JTbccvvnJOcAaTml7oynutoSOF50F6F4H7XMD51n1/+ODr2AZKAqgADciyfjdz5ISxY1v/1xeL7K7lesnmp/rCmkHRbQKL7zS7ypOcl8T7e81GhBSpW2JspJwou4+fN7jmrWMDmq0fJuvNkaMi5P6H+czlJE1bZncxRwgH91YxA6dYEpa8hOB9OinXH3zoyOu17Kxkcu6JGCOG6PI69iC/7bHFo1FYZtmiG1RbrfEXwbYf0K/Vlcp/Q/uQ0Ca/CRtVvbAr61BN1+MCOaO9WpUL/3z+XftxpT30N57NHefC9pREL3xHUuL5iQqRYYj7rOsvOTmKuikVrCO8uLcYh4r637VesWeJ8cnn4FEL255wl/kuBgCnNeLvvC9PSBWp3Ipm9BXtriArUkiEr9I6BmGUVngVPMht7wF8oFDhd+DLw43AvCAXBrtzB84DnaOYePoIaotywryhZ86wSw0KyT0VGl31ztzxxikGT0zEVnKOadqV9GEav99kRly58iCEJLekFChG7WBEHdfu9LTRv0km0mNN8SdkEfBClIW/vcA4t8U5R8qtBKvO3jTnUbtDfPityMbTeU34TJkci8EUb7K8V0JqEEv2WpHRkBrd6IIM2VH0DnSa2Dm8i60LaEa+K9CpjtF6inc7XMUFVug+L7rpJfN3sLgpIOf+uKgyvKtoHoKFYj35h6mT7ygXMmETqTgUikqhZgYngJeKQZ1plMbqWfpgQZAzCQQAcYMMyfibcy7apR60SPhkY0UIndVD3dtlrXel1YUhD7ghnxVb67O1YNLbZTcBdkPidykDDquSQCPizN2YYSEzSbeLSq22cdVsWSHtvvy35PqbX4Q/STPkfAd1qzLukbElLGtcaTFMlSLEAQ2tM81WHF2YY8gR8CG3cMUMwmpYi4YINecKCOBQn1kymIeTZr1fzqCSMZOzSH3CfivdkNT56CQoB6bDiQnI2Pas0Jm0joHzoIEGPDyoyF+MVt5mSIveVNeEyqoHqRlA+IQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98c93aea-17a3-4f3e-c54f-08dc426afd03 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 08:04:06.1346 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lbjWib6zfVl+V4lwsKhJRWmwnHOFTWCgnzsqzIDKW+s1Apcsf1EF4gaWQNK/qBhjwlkhf0SysrxjVAqJCemsoWtPWVkBnTiZI2dd+dP9LmQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB4987 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Long Wu When user adds a queue flow rule with incorrect queue index, the rule can be added successfully but the packets are not directed to the queue. The reason is that queue action does not check validity of queue index in driver. Add code to check queue index in queue action. Fixes: 7493f8a527cc ("net/nfp: support queue flow action") Cc: Chaoyong He Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_net_flow.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_net_flow.c b/drivers/net/nfp/nfp_net_flow.c index bd983aaf6a..ff6ce3ee45 100644 --- a/drivers/net/nfp/nfp_net_flow.c +++ b/drivers/net/nfp/nfp_net_flow.c @@ -564,8 +564,9 @@ nfp_net_flow_action_mark(struct rte_flow *nfp_flow, action_data->mark_id = mark->id; } -static void -nfp_net_flow_action_queue(struct rte_flow *nfp_flow, +static int +nfp_net_flow_action_queue(struct rte_eth_dev *dev, + struct rte_flow *nfp_flow, const struct rte_flow_action *action) { struct nfp_net_cmsg_action *action_data; @@ -573,15 +574,24 @@ nfp_net_flow_action_queue(struct rte_flow *nfp_flow, action_data = (struct nfp_net_cmsg_action *)nfp_flow->payload.action_data; queue = action->conf; + if (queue->index >= dev->data->nb_rx_queues || + dev->data->rx_queues[queue->index] == NULL) { + PMD_DRV_LOG(ERR, "Queue index is illegal"); + return -EINVAL; + } action_data->action |= NFP_NET_CMSG_ACTION_QUEUE; action_data->queue = queue->index; + + return 0; } static int -nfp_net_flow_compile_actions(const struct rte_flow_action actions[], +nfp_net_flow_compile_actions(struct rte_eth_dev *dev, + const struct rte_flow_action actions[], struct rte_flow *nfp_flow) { + int ret = 0; const struct rte_flow_action *action; for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { @@ -596,7 +606,7 @@ nfp_net_flow_compile_actions(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_QUEUE: PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_QUEUE"); - nfp_net_flow_action_queue(nfp_flow, action); + ret = nfp_net_flow_action_queue(dev, nfp_flow, action); break; default: PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); @@ -604,7 +614,7 @@ nfp_net_flow_compile_actions(const struct rte_flow_action actions[], } } - return 0; + return ret; } static void @@ -670,7 +680,7 @@ nfp_net_flow_setup(struct rte_eth_dev *dev, goto free_flow; } - ret = nfp_net_flow_compile_actions(actions, nfp_flow); + ret = nfp_net_flow_compile_actions(dev, actions, nfp_flow); if (ret != 0) { PMD_DRV_LOG(ERR, "NFP flow action process failed."); goto free_flow;