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 DE8F44301E for ; Thu, 10 Aug 2023 01:54:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D814040DD8; Thu, 10 Aug 2023 01:54:57 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2045.outbound.protection.outlook.com [40.107.223.45]) by mails.dpdk.org (Postfix) with ESMTP id 5DFAD406B6 for ; Thu, 10 Aug 2023 01:54:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ldyNkd+5y8hxaQqap4tHlkTxMQWUlCqPTFoL+GdR6hWDWEaJYVovLhvxYv0RahsfGZ+96pADYRrNox/KS0Sgk9pz4k9mGLMsGdQ9vBHhPzLbUTNi4Uk/WzAJ6LrvJ81N8D2nEIH2iCBM+l65iZG+oMy8xoA9+oNvM4xhLizrkVeo0iOMgREAEt2B6ZiLwquR+tbiZvlFAcaF+FJJFhVpvX/b1UXJvtuLfebx3QZGYshMD8G4g5kvcInTH/c2SCO5FPmECHijg4UO6tup6xh7Y7C7tkaTrDD+lInrUYbQpq/JRoqQbaqdYmC7OMXPaDBfqXyY5o5SHU38U64eDq70yQ== 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=NVhtAgMNzfW2YwffT46eitNp2wRiAZA7J1Sdsdr82Ks=; b=N7NXRz8u1alJ4mLZzFfeXAwlGPB48miOfd0juN9DqONRblaixXkFLK34xaFRt3fXopCwcJeCdQtBVBWwOpxSQ7mLahaeF7GUQCby9RNLjXvIPt72z04ZCyqOJql3ChPWjF/oriZWCXxoTTFaE+I+Y2ZsoWn9wM9mT8euNH8EIdTc2+d9ort2+9DqpD1v90PUigGSh57nlZdi3xS+Zd5y4zfeBnptOl8bHmmZi4UBYumgOO8xkAlAM1cn8OGTsavKRR2r8jek42C6obqHjxwHS5axZsMxq1CVENFhspmUwCZEoKQwhNTQs68V+Z0Cy8L6Av34r3HHmNVP/CNkCiK00A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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 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=NVhtAgMNzfW2YwffT46eitNp2wRiAZA7J1Sdsdr82Ks=; b=GX9xH3Sd/gkcWuWCwzrkKwBOwqZznR4gSG0yvpE6QyTDZrqDSQIiY75WeUUMFKLJXMggzne4T1ZJZfiJqM3uwjqzHCNQHeiDldRpwA1rtg2KzuzWI/ik9iggjZn0/ZZT5guB57rnhT8uOUhjiO+XIJKBL3UJlvxMD1u4nCyKOeedHHMoVtzAij7k6m7UHiESgGRsRnyx+6lCG3/9/xqOANufofO4HhvHwGu1VGU4T2KDhHRNVBer7+IhxpDR8jlhCvXu/Y8k4MTgVH3aWEpepoBXJlmOzX9nHSjpGmxCiZI4KIXkAa9WdIjldpD/zGSAJlYKWGrj17FRKn7P5Pj2hw== Received: from CYZPR14CA0021.namprd14.prod.outlook.com (2603:10b6:930:8f::22) by MN0PR12MB6248.namprd12.prod.outlook.com (2603:10b6:208:3c0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:54:54 +0000 Received: from CY4PEPF0000E9DB.namprd05.prod.outlook.com (2603:10b6:930:8f:cafe::d) by CYZPR14CA0021.outlook.office365.com (2603:10b6:930:8f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30 via Frontend Transport; Wed, 9 Aug 2023 23:54:54 +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 CY4PEPF0000E9DB.mail.protection.outlook.com (10.167.241.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:54:53 +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.986.5; Wed, 9 Aug 2023 16:54:42 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Wed, 9 Aug 2023 16:54:40 -0700 From: Xueming Li To: Satheesh Paul CC: Kiran Kumar K , dpdk stable Subject: patch 'net/cnxk: fix flow queue index validation' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:12 +0800 Message-ID: <20230809234930.32424-51-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DB:EE_|MN0PR12MB6248:EE_ X-MS-Office365-Filtering-Correlation-Id: 60ba39e0-345b-400b-77eb-08db9934072a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T3yeh4mnSvDez+P1QirKjQTZ9eJiSENJol6OpuU/SZHBs4cdxrvenWdWg8q382JXuYZ2YmCSlGJLqJOUCkt6hwRkvSphcLmIGjUAX0ya/mBzvxSLAplbrHOKLy3WBfe5bWkDppMz3P6yL5bCMsgNncNEbVzOx3y4u1vM5PkHyhyRUzpcYVzQ7+PBXmIREMNlp0ypp4SXjlR3qVNPnlyfrjAlPACiYhKN+Z2ck/OdXdBZJRfw5kinEb0IHLkIKS7K5n0ZSz+tJIoDuxu+w7+gtNE5A6tjwuLzXtsqjImB7n2uBPPGGvJBQTMbuBZ8lQ/2Gbnhgnc5odTRpc8hkDPb4UcqcpnxtW8ciZsrS1I7El4qqn4aKXtNa48cmoFsPZeWr8ucgSfb67ChwxAEzlO6sXsumSAZl/j8+udgP+Q1/0mI19jkBSrS2mhiT235UJwZxh0lfkcT2r34d8/O2jU03PfExe3OkgMn06RnCYt43cpavPTcHWorZzhlAWUjwrSw+r42BYumpKQQ8zVRxIa8hBNdFj3xQf9IUErdgOZjPp/an+Nk4Cx91GSG4YP77jXweWd3jvpVqDLeGwI4j7zHXUzA36cM3xVfZsz8lSVAcLfubbNZ8gbhd6qIUnvWGr9HkPiVHX9CjGo3o6gUc/DXoc5fOYK93YJBzTyFSbcdxP7fAOqdvSfObl4BU76j/g2RS8kAzT708I0tzKUFZg4FKRw66zxacuwx7c1gDs66Hdr35HFzWaLDVDscXVp3jjsVTkhIluDD5K57UpKqFkADIQ== 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:(13230028)(4636009)(136003)(376002)(39860400002)(346002)(396003)(451199021)(82310400008)(1800799006)(186006)(40470700004)(46966006)(36840700001)(40460700003)(478600001)(54906003)(7636003)(426003)(2616005)(83380400001)(47076005)(1076003)(26005)(86362001)(53546011)(16526019)(6286002)(336012)(36860700001)(356005)(82740400003)(40480700001)(55016003)(2906002)(966005)(6666004)(36756003)(7696005)(41300700001)(316002)(8936002)(8676002)(70206006)(5660300002)(4326008)(6916009)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:54:53.9536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60ba39e0-345b-400b-77eb-08db9934072a 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: CY4PEPF0000E9DB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6248 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 22.11.3 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/11/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=a60ddd695499c9d7383d8f5980b1c71fffccba28 Thanks. Xueming Li --- >From a60ddd695499c9d7383d8f5980b1c71fffccba28 Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 20 Jun 2023 16:31:37 +0530 Subject: [PATCH] net/cnxk: fix flow queue index validation Cc: Xueming Li [ upstream commit 47f4051664c3235586c08095a2b328d5c86b87e2 ] When creating a flow rule directing traffic from PF to VF, current validation is incorrectly checking the RQ index in flow action with the PF's maximum configured RQs. This validation is applicable only when action target is an RQ of the PF. The validation has been modified accordingly. Fixes: 8c009b4505e9 ("net/cnxk: support flow API") Signed-off-by: Satheesh Paul Reviewed-by: Kiran Kumar K --- drivers/net/cnxk/cnxk_flow.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c index 6d155d924c..422c5d74df 100644 --- a/drivers/net/cnxk/cnxk_flow.c +++ b/drivers/net/cnxk/cnxk_flow.c @@ -115,14 +115,15 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, struct roc_npc_action in_actions[], uint32_t *flowkey_cfg) { struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); + const struct rte_flow_action_queue *act_q = NULL; const struct rte_flow_action_ethdev *act_ethdev; const struct rte_flow_action_port_id *port_act; - const struct rte_flow_action_queue *act_q; struct roc_npc *roc_npc_src = &dev->npc; struct rte_eth_dev *portid_eth_dev; char if_name[RTE_ETH_NAME_MAX_LEN]; struct cnxk_eth_dev *hw_dst; struct roc_npc *roc_npc_dst; + bool is_vf_action = false; int i = 0, rc = 0; int rq; @@ -156,6 +157,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, case RTE_FLOW_ACTION_TYPE_VF: in_actions[i].type = ROC_NPC_ACTION_TYPE_VF; in_actions[i].conf = actions->conf; + is_vf_action = true; break; case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: @@ -193,13 +195,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, break; case RTE_FLOW_ACTION_TYPE_QUEUE: - act_q = (const struct rte_flow_action_queue *) - actions->conf; - rq = act_q->index; - if (rq >= eth_dev->data->nb_rx_queues) { - plt_npc_dbg("Invalid queue index"); - goto err_exit; - } + act_q = (const struct rte_flow_action_queue *)actions->conf; in_actions[i].type = ROC_NPC_ACTION_TYPE_QUEUE; in_actions[i].conf = actions->conf; break; @@ -245,6 +241,14 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, } i++; } + + if (!is_vf_action && act_q) { + rq = act_q->index; + if (rq >= eth_dev->data->nb_rx_queues) { + plt_npc_dbg("Invalid queue index"); + goto err_exit; + } + } in_actions[i].type = ROC_NPC_ACTION_TYPE_END; return 0; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.503097200 +0800 +++ 0050-net-cnxk-fix-flow-queue-index-validation.patch 2023-08-09 21:51:18.194352000 +0800 @@ -1 +1 @@ -From 47f4051664c3235586c08095a2b328d5c86b87e2 Mon Sep 17 00:00:00 2001 +From a60ddd695499c9d7383d8f5980b1c71fffccba28 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 47f4051664c3235586c08095a2b328d5c86b87e2 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 1b88542dcb..3b8348ae9c 100644 +index 6d155d924c..422c5d74df 100644 @@ -26,2 +28,2 @@ -@@ -117,13 +117,14 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, - uint32_t *flowkey_cfg, uint16_t *dst_pf_func) +@@ -115,14 +115,15 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, + struct roc_npc_action in_actions[], uint32_t *flowkey_cfg) @@ -33,0 +36 @@ + struct roc_npc *roc_npc_src = &dev->npc; @@ -42 +45 @@ -@@ -157,6 +158,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -156,6 +157,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, @@ -50 +53 @@ -@@ -189,13 +191,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -193,13 +195,7 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, @@ -65 +68 @@ -@@ -241,6 +237,14 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr, +@@ -245,6 +241,14 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,