From patchwork Mon Oct 16 18:42:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132650 X-Patchwork-Delegate: rasland@nvidia.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 3EDC043181; Mon, 16 Oct 2023 20:44:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3265410FB; Mon, 16 Oct 2023 20:43:52 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id C4189410F9 for ; Mon, 16 Oct 2023 20:43:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bTmOd7vbgSzzDg9VcirBdhLv80dDxgYD5pnPFADqrdyIxhd1wmfhRBAs9ulRoLDlHvNY+bHAxbz/3nEe7Y71ptsmGZ4EMiV4Az5dcTFwzyw+33eMBu1GmdO200GW4r930hvRq/HLD13arHMWP5GHLVYSBVsUCQ5fQAlgVgFnaoKWoIOUby1WfiCzFpfRCjTgsUts114a2h+TnfhbALgvGzmztxpD/TZF7dZr22QlRK1Au/lyDLAkOy01fwRDQfepVup7OmIrRFUN1q8CFbdXyeNUSeEBi7JlVlW/ZmpON99UyBVQin+W+3lI3PCCQZrxyewNDKGozZH0sZ05CfGAKw== 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=om3Q9RB4gopy4UaCB2VRbPro4IJhjJ3fodZlDW2Po+c=; b=Qn5xtvzPMVFG6nwMmalNFcr+NW2FQUq4rPvUzkPZsZq9SYIW6py8fVafNICh1Z9VUxrPVm6/V5esMD8kd9hi32FZedfwDYMgQqi808xafqAfNW2CLnz7TCQ9IES3BMY0wJJPdAHGCrTZ6cVk7D7NSUg11vcSNiBZYvB8uma+W+ZPm/6pizN/WXLCIR+zQtx7U9CIP9Yb6A0aKoxP/zYX0JJUnst08NjpsBHSuoS207GcujQPoLWeFxBF3kPSbF+t0Wv7MtYD2bMuA9QpCNX8GwbWktSPWf5/fzCJS/4fQGPYt0NeU5F/bJKpRmC5AW+d5KOv+01M4hm4TUu72tpnPQ== 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 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=om3Q9RB4gopy4UaCB2VRbPro4IJhjJ3fodZlDW2Po+c=; b=GaH7JUdX/OJKLmCXNXGoZhkaqz0o71JQNBH0B20r6kFRIqT0xO1PSogejabyOkuRAiXbx6z6XC844ArRz4H9dtIIKdzBCU/gbLhquzWOMxoyNUFhATzRACC+pVpNMwmFMdvYxo9nyDUaVnn12HKGay+mAh6qYZ4qS7y0iHidrIgyEecxwrLPamGDdV1rJbZ07FP/Uk9f4PgyxREuwlzn2INjt2ozMOQI7hIJICqziPXZjqLUXYsaqJ1dC3SFG4jEG5OCKm9BUw0bz3RMsjYBeTfBFiG//kbVqvm0XJwSNUl4xiqyAy3ITTCdpld2/S2mVBVNEM5WFgISScILKBp9zw== Received: from SA1P222CA0154.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c3::27) by SN7PR12MB6885.namprd12.prod.outlook.com (2603:10b6:806:263::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Mon, 16 Oct 2023 18:43:48 +0000 Received: from SN1PEPF0002636B.namprd02.prod.outlook.com (2603:10b6:806:3c3:cafe::46) by SA1P222CA0154.outlook.office365.com (2603:10b6:806:3c3::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Mon, 16 Oct 2023 18:43:48 +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 SN1PEPF0002636B.mail.protection.outlook.com (10.167.241.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Mon, 16 Oct 2023 18:43:48 +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; Mon, 16 Oct 2023 11:43:34 -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.986.41; Mon, 16 Oct 2023 11:43:31 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , =?utf-8?q?=C2=A0_=2E_=2E_/patches/upstream-pmd-indirect-actions-list/v2/v2-?= =?utf-8?q?0000-cover-letter_=2E_patch?= , Matan Azrad , Viacheslav Ovsiienko , Ori Kam , Suanming Mou Subject: [PATCH v2 14/16] net/mlx5: fix mirror redirect action Date: Mon, 16 Oct 2023 21:42:33 +0300 Message-ID: <20231016184235.200427-14-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231016184235.200427-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231016184235.200427-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] 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: SN1PEPF0002636B:EE_|SN7PR12MB6885:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c5a0d33-3f44-44ca-4a1a-08dbce77d58f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XXucei12rS5amqaCiMmT5QZZ4alyQFlXRAWR7qLyGTWhlNPg/0hJ8sgIKR7zYT8/UaRsNUG2tRQxvszTS9LL8SOJp3ZnenmhIwzxiwjiqbeepxhmvBOq9DMx3Uk5KvXrokgYh2yu4W3lfC5Kg3zZP5MjPzsm+XlC7fybwkjPDQXTxbYGIasGSVCrEk5z3NmXCaGo8CSqsXPWP2nWLHuiej1ZZVMgMd+q0I5jaZZReRAgx9BAnokdx60IcGroMJYdpUSbGMPkAE4p9Qgbn3Gw0Aa/DLX8UWZdquBjlnHMfe8EbHQxdlJ0fWcBNnrj8ZpDw21Q8xJhps6zaqojfsAZit6ptOLmwlQamyrik6FvEr/+q1vii0m48Z643Cu9DYH/WVd2tK/aosJvTWSvyOZnXGAh8qAyQeLIuZeu6Mcl1GyhpHhgkPr8j5zT2zBdTuLCzTZuIe88GZCPU/Kfpa7ypclFw05CAzVQ7e6jiNxM+jzNko8f+yUsCC7artDUjHjWf8p6Ol+Mj06WG+vYK4++OEaTax6zmD7bjIZRIOgZ5MDEBFr8sWDNLszo9otw5dKBITNpG+NhhoYP+Ys5XIodULvLUgTIMBDcH0Lvea37IW1V0gNdgUdUnUHkG0FP6UHH2N1a07JqugtlG3tLt7fIkZcDxA+6xZCNPDiKtL4g1kKkBdeY2V9XgMWLXvL7uDkI9vwnNb7GluAVJzdYp9BAjrLnpI7Prh6NafBgGOE8QPnNantG/Z0B0uYWmMyx5f0o 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)(4636009)(396003)(136003)(39860400002)(376002)(346002)(230922051799003)(186009)(451199024)(1800799009)(82310400011)(64100799003)(46966006)(36840700001)(40470700004)(40480700001)(55016003)(82740400003)(6286002)(336012)(26005)(426003)(16526019)(40460700003)(107886003)(2616005)(356005)(7636003)(478600001)(5660300002)(8936002)(4326008)(86362001)(2906002)(54906003)(6916009)(70206006)(36756003)(1076003)(41300700001)(316002)(70586007)(8676002)(7696005)(47076005)(36860700001)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:48.0862 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9c5a0d33-3f44-44ca-4a1a-08dbce77d58f 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: SN1PEPF0002636B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6885 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 PMD used a buffer located on expired stack to store mirror reformat data. The patch moves reformat buffer to the same context as the mirror action creation. Fixes: 0284c9b82ee8 ("net/mlx5: support HWS mirror action") Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 213b0d5ae8..ae017d2815 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -9690,11 +9690,11 @@ mirror_format_port(struct rte_eth_dev *dev, static int hw_mirror_clone_reformat(const struct rte_flow_action *actions, - struct mlx5dr_action_dest_attr *dest_attr, - enum mlx5dr_action_type *action_type, bool decap) + struct mlx5dr_action_dest_attr *dest_attr, + enum mlx5dr_action_type *action_type, + uint8_t *reformat_buf, bool decap) { int ret; - uint8_t encap_buf[MLX5_ENCAP_MAX_LEN]; const struct rte_flow_item *encap_item = NULL; const struct rte_flow_action_raw_encap *encap_conf = NULL; typeof(dest_attr->reformat) *reformat = &dest_attr->reformat; @@ -9718,11 +9718,11 @@ hw_mirror_clone_reformat(const struct rte_flow_action *actions, MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L3 : MLX5DR_ACTION_TYP_REFORMAT_L2_TO_TNL_L2; if (encap_item) { - ret = flow_dv_convert_encap_data(encap_item, encap_buf, + ret = flow_dv_convert_encap_data(encap_item, reformat_buf, &reformat->reformat_data_sz, NULL); if (ret) return -EINVAL; - reformat->reformat_data = (void *)(uintptr_t)encap_buf; + reformat->reformat_data = reformat_buf; } else { reformat->reformat_data = (void *)(uintptr_t)encap_conf->data; reformat->reformat_data_sz = encap_conf->size; @@ -9736,7 +9736,7 @@ hw_mirror_format_clone(struct rte_eth_dev *dev, const struct mlx5_flow_template_table_cfg *table_cfg, const struct rte_flow_action *actions, struct mlx5dr_action_dest_attr *dest_attr, - struct rte_flow_error *error) + uint8_t *reformat_buf, struct rte_flow_error *error) { int ret; uint32_t i; @@ -9772,7 +9772,7 @@ hw_mirror_format_clone(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: ret = hw_mirror_clone_reformat(&actions[i], dest_attr, &dest_attr->action_type[i], - decap_seen); + reformat_buf, decap_seen); if (ret < 0) return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, @@ -9802,6 +9802,7 @@ mlx5_hw_mirror_handle_create(struct rte_eth_dev *dev, enum mlx5dr_table_type table_type; struct mlx5_priv *priv = dev->data->dev_private; const struct rte_flow_attr *flow_attr = &table_cfg->attr.flow_attr; + uint8_t reformat_buf[MLX5_MIRROR_MAX_CLONES_NUM][MLX5_ENCAP_MAX_LEN]; struct mlx5dr_action_dest_attr mirror_attr[MLX5_MIRROR_MAX_CLONES_NUM + 1]; enum mlx5dr_action_type array_action_types[MLX5_MIRROR_MAX_CLONES_NUM + 1] [MLX5_MIRROR_MAX_SAMPLE_ACTIONS_LEN + 1]; @@ -9839,7 +9840,7 @@ mlx5_hw_mirror_handle_create(struct rte_eth_dev *dev, } ret = hw_mirror_format_clone(dev, &mirror->clone[i], table_cfg, clone_actions, &mirror_attr[i], - error); + reformat_buf[i], error); if (ret) goto error;