From patchwork Fri Jun 30 06:39:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 129137 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 3460E42D73; Fri, 30 Jun 2023 08:40:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 22EA941133; Fri, 30 Jun 2023 08:40:25 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2075.outbound.protection.outlook.com [40.107.96.75]) by mails.dpdk.org (Postfix) with ESMTP id 8C913406B5 for ; Fri, 30 Jun 2023 08:40:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k95+h6igt0tvllBFM9/xtsSkpP7CIMkbqkUdhChDtq9oS5CpTiCk56TVpbXAfBFsx4oUI7HBgntIE04ECfZb1uLP01dc7yZBhqd4IwxqL/O0dinilKL1xKkm55rMJMBdAWw3fa3W/TdjuGvY2RU7VWuW0N3tQjuFhgkxbj5CQtbgKVlJo7m9ukBOaotBvtZFpFW2CBRqh18OH3hmJld/9lZWkZd1R3fmDzL7rZZeUUHHI/Intege8l3t8xdX3fvQ1yV0OHcjExAcQv5qcM7LKXGC73raGt/Uirlwm3LCayYOHSRWgCXn9c5prY5E3QUT9lKwS9BnjGSU9xcwGj0lIg== 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=7NZpJgbXKq/CpFiTFS6hvCUJvPh5vMTmbcoPaNznyMs=; b=WTf9kiwsYcK2Ub8GcyWqjH1qmHSk2H2n5OdO6WnJKyR/agE3S+otPRyC7041CFp9llNqOCmhduP0C+GY0qk1+Gm0ypAhVI8fsGRUAhyHdXeVnKDWfBnd+IkbVjxYaUrjOyd6LCzpBYWu6sbxn8KiL5yXSOgwVVJTIw6LwNzYMOweU4Jk6YAUbJfRoCju6hAYgoc8+gOsOTpQZDP8OfdlRm0Pe+mpk5N9EtEQ7CXKuT1myOttuH84NriJAGfVdokKRPhpnIhOCitR0iqhP5Suz/1spJ8MXHx11mPsKlbh4PbJH6rfG6wuvUPFzTvWSzj6YUKSOLoly9yIWXuEiBwjZQ== 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=7NZpJgbXKq/CpFiTFS6hvCUJvPh5vMTmbcoPaNznyMs=; b=oHEHDrJdhEf0tmbMHPHBCCcaB7W/Tiz7oGhvKBhIwMKzMmXUje55xFhyQiwvh/60Lmlt2lAb+4lhWRzWK9CbeJfPaL3WiqypeWS56O/1EygQPGmnbS4rXkbDUG73bHahWPo6+H5Vb04SxiMVNS9RFZsDTSjxyH+uuEjviTzudD6Hixrw8AbReFApHKgHO4g3jrwdng9CKUIrGbEXKMVZ4gLoQE0K+VvkR5QiHrotFUNQs6hMRYbCo3fj4uwFsmzCRFJ77oYCinjEFDGICwFjq6nM+CgkgGrWojB64peYfckWpu1/CcGzTh33gH+ph9vIfMzi3o35RA35lWJ9578Yeg== Received: from MW4P220CA0023.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::28) by MW6PR12MB7069.namprd12.prod.outlook.com (2603:10b6:303:238::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 06:40:21 +0000 Received: from CO1NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:303:115:cafe::3c) by MW4P220CA0023.outlook.office365.com (2603:10b6:303:115::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.22 via Frontend Transport; Fri, 30 Jun 2023 06:40:21 +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 CO1NAM11FT032.mail.protection.outlook.com (10.13.174.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.43 via Frontend Transport; Fri, 30 Jun 2023 06:40:19 +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.5; Thu, 29 Jun 2023 23:40:06 -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.37; Thu, 29 Jun 2023 23:40:04 -0700 From: Bing Zhao To: , , , , CC: , Subject: [PATCH 7/7] net/mlx5: fix the error in VLAN actions creation Date: Fri, 30 Jun 2023 09:39:50 +0300 Message-ID: <20230630063950.432641-1-bingz@nvidia.com> X-Mailer: git-send-email 2.34.1 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: CO1NAM11FT032:EE_|MW6PR12MB7069:EE_ X-MS-Office365-Filtering-Correlation-Id: 8588115b-9794-407e-b551-08db7934df3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pyRG4PrlXTYnIZHwM99WzBBhbqQE8612QTBZs1smNJBdWIW2gCo0M5biTk+AOdJHXnjyCii6uwS1ITrFsR3X9tdoNrRl7qA30jzeYzPig98abdASuv9E2WzNgU8PL+L0PIZ8WheOxxeIccitRgXQkrmxJr66YBrEWdoKPkqrovvd7NppRKKF2Le5PvacZ9yxPymI76gamKiwD/92itjtuXqNiu4Jg+woa4CxdXfM9v7RIgoPWnQjEljAf8Erc7PDDIGNSmYKaE/8ASJvy8yHs7qsX/107pyIn3yaoqM2W/gv3khl16BOuiRgdzLk6HFf2Vb9Uzowug+QPT1O5X+UNjNvoNg4FoF02OgRgg1NxyKQTU5yQDPwxWDp54PdXuOboEmtTh0IKZXqVVFP+yuXoU0TGGYiC5kndKxSYtqR5+jJP1tOD6gy7jJdLwq9RYvCUVBogIzwwFieoCO2to9WKK8tgCcAMrBgXtfyUsIKVQCYYFJnqBAGeTmNdEo5xSQ8FlVJAAR/biIBIiio+GJ4fYV12P7odp5L85a7Mn9NebjKSErSAz6+YpqLzjAdt6GXPuha81EeLCuGUZjtCSK50ETuwR5n6+rl/pfBO0oHW8deGrPpEhv+WbppReISpTISVDnSeygIZD55ZRnluu293OeyIJLGldt+Ip18P7nkIxythvuATfRdlWrEZqJhS7GNL9reLtSW91ZLB4RbYyZlz8GNRgndwdrANenTn1v4jbkGJDpSo/PYYBsch6Re+INQ 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:(13230028)(4636009)(396003)(39860400002)(376002)(346002)(136003)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(41300700001)(316002)(83380400001)(82310400005)(426003)(36860700001)(86362001)(336012)(16526019)(6286002)(186003)(1076003)(26005)(2616005)(2906002)(82740400003)(7636003)(356005)(40480700001)(55016003)(47076005)(5660300002)(36756003)(8676002)(8936002)(107886003)(478600001)(110136005)(54906003)(70206006)(70586007)(6636002)(4326008)(6666004)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 06:40:19.1987 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8588115b-9794-407e-b551-08db7934df3b 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: CO1NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB7069 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 When a failure occurs during the VLAN actions creating, the value of "rte_errno" is already set by the mlx5dr_action_create*. The value can be returned directly to reflect the actual reason. In the meanwhile, the "rte_flow_error" structure should also be set with explict message. Fixes: 773ca0e91ba1 ("net/mlx5: support VLAN push/pop/modify with HWS") Cc: getelson@nvidia.com Signed-off-by: Bing Zhao Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_hw.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c index 20941b4fc7..36a7f0989c 100644 --- a/drivers/net/mlx5/mlx5_flow_hw.c +++ b/drivers/net/mlx5/mlx5_flow_hw.c @@ -7125,27 +7125,28 @@ flow_hw_create_vlan(struct rte_eth_dev *dev) MLX5DR_ACTION_FLAG_HWS_FDB }; + /* rte_errno is set in the mlx5dr_action* functions. */ for (i = MLX5DR_TABLE_TYPE_NIC_RX; i <= MLX5DR_TABLE_TYPE_NIC_TX; i++) { priv->hw_pop_vlan[i] = mlx5dr_action_create_pop_vlan(priv->dr_ctx, flags[i]); if (!priv->hw_pop_vlan[i]) - return -ENOENT; + return -rte_errno; priv->hw_push_vlan[i] = mlx5dr_action_create_push_vlan(priv->dr_ctx, flags[i]); if (!priv->hw_pop_vlan[i]) - return -ENOENT; + return -rte_errno; } if (priv->sh->config.dv_esw_en && priv->master) { priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB] = mlx5dr_action_create_pop_vlan (priv->dr_ctx, MLX5DR_ACTION_FLAG_HWS_FDB); if (!priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB]) - return -ENOENT; + return -rte_errno; priv->hw_push_vlan[MLX5DR_TABLE_TYPE_FDB] = mlx5dr_action_create_push_vlan (priv->dr_ctx, MLX5DR_ACTION_FLAG_HWS_FDB); if (!priv->hw_pop_vlan[MLX5DR_TABLE_TYPE_FDB]) - return -ENOENT; + return -rte_errno; } return 0; } @@ -7920,8 +7921,11 @@ flow_hw_configure(struct rte_eth_dev *dev, } } ret = flow_hw_create_vlan(dev); - if (ret) + if (ret) { + rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, + NULL, "Failed to VLAN actions."); goto err; + } if (_queue_attr) mlx5_free(_queue_attr); if (port_attr->flags & RTE_FLOW_PORT_FLAG_STRICT_QUEUE)