From patchwork Mon Oct 16 18:42:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Etelson X-Patchwork-Id: 132645 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 4B8DB43181; Mon, 16 Oct 2023 20:44:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABE5240EAB; Mon, 16 Oct 2023 20:43:37 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2052.outbound.protection.outlook.com [40.107.220.52]) by mails.dpdk.org (Postfix) with ESMTP id AC70240EAB for ; Mon, 16 Oct 2023 20:43:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CjFFyJdLmAEBUyFEFXfW5R0ZAHqdI0M1rt4gYjnUxHBB4AZsR+eY9ZgQ8Y+bg3jMwm5mEY5/9++p3k7z33P5IRNZeh+LplkNRwcrtQeDudJcLVNWxLzvnAXftZZEhojrN4EDuGQ6bVFDvzJ4Td2g5RVEXtD8bR5uB0TbIqurdXDBan4mkE8JPYjK42pQSkhxaNlcN652bEWq60zWkB6qkMFmQX2qHTM0n8Mh9y0b88N6p+EOxxUXh1KipBna3j63VCS8p4ILLNJMMNSTCmXzjO4KutOEBaItTwgeFpQHW59yjKrLDUIfuFufCu6q9yJoBQ9SXWcMSZ5Vfg5wya6V6w== 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=PTgGA/zS1dmeUbE7KABENf71moMoTLDQCgRX+hgtBdw=; b=eL+pw33KJpzSWHDJU+CzqxF4iuOXKhyguLEYgQ6y+67Znb7jD7pOrBZiTU2SRvTK9jtcXAlvQtss4az7EL2HOtYkgicf3v3sNiDSl2hOSR4dIBwm3/cqax4EF5WhN/vnxRnkzVr4gPzotPAZu+cIiJX1lbmGWjJGbBsIyoXbCvNUeR8iOCozjjnFwrioaCKM7kt2YKYXCUJWbW4YQF/pxs81uKhZdVj8qjoO6IBHNq3AiY9LBnQXq0UJvxXU+VlPD8COB7PfVHL/oyRIrdZqnEjkTkvZ3x9BQZQmjooPDl+knzn7c8fi838gp+oEtHFrxRrtuGd9p70JkXccIyYJxg== 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=PTgGA/zS1dmeUbE7KABENf71moMoTLDQCgRX+hgtBdw=; b=nTTpmcRZoICsb0UTQCIvEB29WuQdjyaDFL283+d9lOPEdwmSkXnF18d4QBQYsl3jcE5BySgcucoFRggjQUp3udFhOhw4WBJImqUus5HKxV8er1bFxttK+UTXF+oywdEOVIcNQNAWn0RHCbSqUPl7V7gNNUDhJXhARiYXa+95poK0x/ZDtkDN5yJhkBFWo94JTWnDPaSeQwS5zy/K9N5FQ4rTSXdUV3o1nDTII7aq9TQ2AJeOn7X5BEnzRbzPcGdcPntwfxny86PkLXqt7AT9fcwIDVofTU6w0wlyolyTMCF4rsS9Zovz3yTsfwqy8towa166jyV+70/518v+dfL8Rw== Received: from MW4PR04CA0358.namprd04.prod.outlook.com (2603:10b6:303:8a::33) by DS7PR12MB5863.namprd12.prod.outlook.com (2603:10b6:8:7a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Mon, 16 Oct 2023 18:43:33 +0000 Received: from MWH0EPF000989E7.namprd02.prod.outlook.com (2603:10b6:303:8a:cafe::ab) by MW4PR04CA0358.outlook.office365.com (2603:10b6:303:8a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.35 via Frontend Transport; Mon, 16 Oct 2023 18:43:33 +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 MWH0EPF000989E7.mail.protection.outlook.com (10.167.241.134) 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:33 +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; Mon, 16 Oct 2023 11:43:19 -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:16 -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 09/16] net/mlx5: fix mirror action validation Date: Mon, 16 Oct 2023 21:42:28 +0300 Message-ID: <20231016184235.200427-9-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: MWH0EPF000989E7:EE_|DS7PR12MB5863:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f35737c-9c31-4ce1-4eda-08dbce77cca5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j1bRmioBO40NVa0BX48BuX4majRVtOrgmsDx147FBIFPvwBtnGo6/ei/vAMFXXfJGjT6bSOpmiPkgLjU4EyM/YUwXgiFrkRjUb9gNQGHLfDqDRweR+QE8wjYdvD7vn1j+yaFo/OS+DFAq+NaegwOHQ8SJ5GXkMRmxJNOQv6Y2ihz1cGtvPvSzj/fcFIH5+FArrIIfbCkglB655XxXltf6g6rtIJgAeJD/pDGS0YkaHp3bi8hj0RJKsEBimrzB+cxe0z3JZdrumIalZAFsoQfdwYxj01/ztBOdxKPyZ6g718IfePUezT9ht4H/jNBUR9fPfV2YSJ5EqR/nCesYH1cBpxXYvA/J4q1dv4+EpsCtRHilossuiVHXi+RLuiF+JR+L1SjON6vrC3yl/GSI8vwqZg9CINYgKEMVvFh2UPyY9mVG4ehq0LU9WFDIje9QyRmi6NVAeGqR3kgqWSRdQTzhFtnsS4Jiqqz8rpD1GxH8r4fKInkx5zmdUN+1K7VgJRsoBOxOQkbcYKPnWsfeT+OAZTujD23cUWkdL1Tr0JeX1/Yit/B7n7lfiQ0sGTV9o3OSamjWerHa8Z3kHLg2/tApfpjaKLVWy5ridEtPxGutovgfOa7CBxXxD132dHWMmXj4vNwWvmGVfWJrIk2/ip78bo21wEPwFlHTgEFDmf56Ld8c6Bj0L0SDTzQhH0dJr5V15DpEP0HF0EJNv2CQ/IzWbY1wXC6YlRUsyoy/T2jwIo= 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)(39860400002)(376002)(396003)(230922051799003)(64100799003)(186009)(451199024)(1800799009)(82310400011)(40470700004)(46966006)(36840700001)(82740400003)(426003)(336012)(47076005)(1076003)(83380400001)(26005)(6286002)(16526019)(2616005)(86362001)(36860700001)(7636003)(356005)(107886003)(36756003)(7696005)(2906002)(6666004)(55016003)(40480700001)(5660300002)(41300700001)(54906003)(6916009)(316002)(70586007)(70206006)(8676002)(478600001)(4326008)(40460700003)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 18:43:33.1310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f35737c-9c31-4ce1-4eda-08dbce77cca5 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: MWH0EPF000989E7.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5863 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 HWS mirror flow action validation rejected flows in NIC domain, if PMD FDB mode was active. The patch allows NIC mirror action in FDB mode. Fixes: 0284c9b82ee8 ("net/mlx5: support HWS mirror action") Signed-off-by: Gregory Etelson --- drivers/net/mlx5/mlx5_flow_hw.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 44ed23b1fd..910d42a5f5 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -9547,14 +9547,15 @@ mlx5_mirror_terminal_action(const struct rte_flow_action *action) static bool mlx5_mirror_validate_sample_action(struct rte_eth_dev *dev, - const struct rte_flow_action *action) + const struct rte_flow_attr *flow_attr, + const struct rte_flow_action *action) { struct mlx5_priv *priv = dev->data->dev_private; switch(action->type) { case RTE_FLOW_ACTION_TYPE_QUEUE: case RTE_FLOW_ACTION_TYPE_RSS: - if (priv->sh->esw_mode) + if (flow_attr->transfer) return false; break; case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: @@ -9562,7 +9563,7 @@ mlx5_mirror_validate_sample_action(struct rte_eth_dev *dev, case RTE_FLOW_ACTION_TYPE_RAW_DECAP: case RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP: case RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP: - if (!priv->sh->esw_mode) + if (!priv->sh->esw_mode && !flow_attr->transfer) return false; if (action[0].type == RTE_FLOW_ACTION_TYPE_RAW_DECAP && action[1].type != RTE_FLOW_ACTION_TYPE_RAW_ENCAP) @@ -9584,19 +9585,22 @@ mlx5_mirror_validate_sample_action(struct rte_eth_dev *dev, */ static int mlx5_hw_mirror_actions_list_validate(struct rte_eth_dev *dev, + const struct rte_flow_attr *flow_attr, const struct rte_flow_action *actions) { if (actions[0].type == RTE_FLOW_ACTION_TYPE_SAMPLE) { int i = 1; bool valid; const struct rte_flow_action_sample *sample = actions[0].conf; - valid = mlx5_mirror_validate_sample_action(dev, sample->actions); + valid = mlx5_mirror_validate_sample_action(dev, flow_attr, + sample->actions); if (!valid) return -EINVAL; if (actions[1].type == RTE_FLOW_ACTION_TYPE_SAMPLE) { i = 2; sample = actions[1].conf; - valid = mlx5_mirror_validate_sample_action(dev, sample->actions); + valid = mlx5_mirror_validate_sample_action(dev, flow_attr, + sample->actions); if (!valid) return -EINVAL; } @@ -9780,15 +9784,17 @@ mlx5_hw_mirror_handle_create(struct rte_eth_dev *dev, struct mlx5_mirror *mirror; 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; 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]; memset(mirror_attr, 0, sizeof(mirror_attr)); memset(array_action_types, 0, sizeof(array_action_types)); - table_type = get_mlx5dr_table_type(&table_cfg->attr.flow_attr); + table_type = get_mlx5dr_table_type(flow_attr); hws_flags = mlx5_hw_act_flag[MLX5_HW_ACTION_FLAG_NONE_ROOT][table_type]; - clones_num = mlx5_hw_mirror_actions_list_validate(dev, actions); + clones_num = mlx5_hw_mirror_actions_list_validate(dev, flow_attr, + actions); if (clones_num < 0) { rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, actions, "Invalid mirror list format");