From patchwork Tue Oct 17 08:09:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132734 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 8999D4318A; Tue, 17 Oct 2023 10:11:51 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BC7A42DDE; Tue, 17 Oct 2023 10:10:48 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) by mails.dpdk.org (Postfix) with ESMTP id 5EF8A42DCE for ; Tue, 17 Oct 2023 10:10:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QPX5lyIEhI4uB/s6Grr2kQpyQleNGSxVANUU42OvpWUHxoPyDJNQ73lhc4+HEekEBehucS6jw7yF7Fz2Rw4RU4uDePL98iwoZ+RAsxM63xfmv2kwS8VP8z+OlPaId83rqBgDOFblRSISOS0hNlnY2+iroIsa9I2ti8eugMNmxk43ymP94Mr2iDSNFa0nZMTn8FoetktLx/59G6Dd+0R5jjWntu2M18ba6CJ4bz7dfkB6a6hBveEhLy6gBfe0/47CZ8lLS1y7f5mnxVMxlRSLi/9llMASF6gxZfvb8Knff7sgDVJ71KxUw54uGCxzRDqzOqe6zm8C24hzmmyJmTnJ9g== 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=nBICAx2ZKoE2CR4A1HU4an1RbPzP7MU5v3CQ6tOSMYQ=; b=kxXL9qVgW5vhmogNHcIsqTlB71pmFUDtmh0NsmJR0IsJjtJYCjZF/TzJT3TUB+todkg8xur4Weou3m8yoAhaT8jGfLbLbrXCZcwZN6BXJiOVN2zkajtG+kUA5qPRhzRGYG+cHnkFOM/MC+p6Cer97iR1UpPCPTppa1S2uHHfWIHsC7glDV1xI5+OHoWml5KcbED7n3WDwzoX/JNbDHkF6IOzz037R3OOwXtGS2hRYic6C/k4tIbeMBixIZslBLXlzgmcsPo8ewfZtEtqUYPm3ZxdteQaTB2pmlJ952sAhLefxa+JmcmxWarhkAgAv4JAsG8oKNZf7xHHqR3NRLja4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=nBICAx2ZKoE2CR4A1HU4an1RbPzP7MU5v3CQ6tOSMYQ=; b=VPRTWvd117sarlKNiDr7pIeIKXFvoIr1SXA/j7+BtogcPqIHpewYhYcfBkoF3ozweH4EiQehVFaBmX6yW4ez4pKzszz3brWEju59ZpxYa7WMLFmd1lMLoVDXa2lfLN5ebVPPh20IJc6TACEe4Nl6hpYLC5wEd92mnn4gh89T8EHtQ4sv+uo/VU9XiKp4JzX9gLP38vuW1Ksj/qmxM2qxiLLJggZZfJzLqzm8aLdnrgauxWKkBOv7CveWl65b08ZkjH6cD9mFfOQTBCqSo1vcxz0kv4RueTlav70MjH3mtI3efH6OBly4vlu/T2eqSJUARZpNv5iAvHz8XDBCgVA1CA== Received: from CY5PR15CA0173.namprd15.prod.outlook.com (2603:10b6:930:81::18) by SJ0PR12MB6829.namprd12.prod.outlook.com (2603:10b6:a03:47b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.34; Tue, 17 Oct 2023 08:10:43 +0000 Received: from CY4PEPF0000E9D9.namprd05.prod.outlook.com (2603:10b6:930:81:cafe::d2) by CY5PR15CA0173.outlook.office365.com (2603:10b6:930:81::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Tue, 17 Oct 2023 08:10:43 +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 CY4PEPF0000E9D9.mail.protection.outlook.com (10.167.241.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22 via Frontend Transport; Tue, 17 Oct 2023 08:10:43 +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.41; Tue, 17 Oct 2023 01:10:32 -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; Tue, 17 Oct 2023 01:10:29 -0700 From: Gregory Etelson To: CC: , =?utf-8?b?wqA=?= , , Suanming Mou , Matan Azrad , Viacheslav Ovsiienko , Ori Kam Subject: [PATCH v3 14/16] net/mlx5: fix mirror redirect action Date: Tue, 17 Oct 2023 11:09:26 +0300 Message-ID: <20231017080928.30454-15-getelson@nvidia.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231017080928.30454-1-getelson@nvidia.com> References: <20230927191046.405282-1-getelson@nvidia.com> <20231017080928.30454-1-getelson@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9D9:EE_|SJ0PR12MB6829:EE_ X-MS-Office365-Filtering-Correlation-Id: 26cc5f96-c0ca-447d-78c4-08dbcee88f55 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PKhBsxNNGtO+oKN+ovsrhrcaYbOwS/YI49p6CbXp4l2aH9VBCQWg0QcyQyjtC+1SVUuWFXXshHp5CHIEEFkUx02fu6XhTnmDGuHVxPonm2RwHcUev16AoCBtXnLBwtoKP/pDpsq2PxVJB3fT0nTVpC473XRONyyvfno7yYTeyOhHpUkq2dVKsG+IoyCRuZJqXV9y4lWWADJSgZ0RbOVyjXBOwG0KjNIW2Ggt0I7CjKEkZZT9t/wO7Zy+OgOsZdfWC7POsOW4KdakfpQDZyw6e+T6CgeaRtkU6ui+nXoCkNkA2RubthifNiwGOgG0/0T/sAQxJI6aezEc7f7Pr519I48OlxyNhGSAQ1m2BQvvn+EmGRUZQmLnowlgP4L94ZQNQ0oSYnzYUrrl8vfpACkcp234cvS+xA6YXt5SIOEVrMSkAhcoK7Fs8pMiek5bvsWGjoNJC19xXf/yEtHnpDzuGsvjYASu4a3NNIMPvoxeOtCk68aC8pGqKwnLiAzob7Ch6Xg1BpjfrHV7uSJ3SpQeFURcBhljVkvzjuNdPDP1rN1Z0ZnSlTqfN9zkd/nJBQZbWHe5DKZyNGxruNpKBXPReilOOHu446MxyYlWqrG6LnwFzkNnZ/6GOJX9kNThDgfFkGVTIbKFDOEdZ0cbJzSIbBwCQVHyOcWcl2pCDi/EqxVEpVtHIgfJVihrgYElZwTwBM0qLa1XYi8TmBqUNg3xalY4sAxcQmDn4rbBeN+/VtnBI/QGevk44FXVCDlvqwLg 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:(13230031)(4636009)(136003)(346002)(396003)(376002)(39860400002)(230922051799003)(451199024)(1800799009)(64100799003)(82310400011)(186009)(46966006)(40470700004)(36840700001)(41300700001)(70206006)(316002)(54906003)(6916009)(55016003)(36860700001)(40480700001)(40460700003)(2906002)(36756003)(70586007)(86362001)(356005)(82740400003)(7636003)(4326008)(8936002)(5660300002)(8676002)(6666004)(7696005)(336012)(2616005)(107886003)(426003)(6286002)(1076003)(26005)(83380400001)(16526019)(47076005)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2023 08:10:43.4285 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26cc5f96-c0ca-447d-78c4-08dbcee88f55 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: CY4PEPF0000E9D9.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6829 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 Acked-by: Suanming Mou --- 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;