From patchwork Thu Oct 15 06:38:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matan Azrad X-Patchwork-Id: 80836 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA773A04DB; Thu, 15 Oct 2020 08:39:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 571D41DCAA; Thu, 15 Oct 2020 08:38:35 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 3781C1DC88 for ; Thu, 15 Oct 2020 08:38:30 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from matan@nvidia.com) with SMTP; 15 Oct 2020 09:38:23 +0300 Received: from nvidia.com (pegasus25.mtr.labs.mlnx [10.210.16.10]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09F6cNVv014993; Thu, 15 Oct 2020 09:38:23 +0300 From: Matan Azrad To: dev@dpdk.org Cc: Viacheslav Ovsiienko Date: Thu, 15 Oct 2020 06:38:13 +0000 Message-Id: <1602743893-345348-4-git-send-email-matan@nvidia.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1602743893-345348-1-git-send-email-matan@nvidia.com> References: <1602743893-345348-1-git-send-email-matan@nvidia.com> Subject: [dpdk-dev] [PATCH 4/4] net/mlx5/linux: fix Tx queue operations decision X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" One of the conditions to create Tx queue object by DevX is to be sure that the DPDK mlx5 driver is not going to be the E-Switch manager of the device. The issue is with the default FDB flows managed by the kernel driver, which are not created by the kernel when the Tx queues are created by DevX. The current decision is to create the Tx queues by Verbs when E-Switch is enabled while the current behavior uses an opposite condition to create them by DevX. Create the Tx queues by Verbs when E-Switch is enabled. Fixes: 86d259cec852 ("net/mlx5: separate Tx queue object creations") Signed-off-by: Matan Azrad Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/linux/mlx5_os.c | 53 +++++++++++++--------------------------- 1 file changed, 17 insertions(+), 36 deletions(-) diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c index 09d0944..d177b4f 100644 --- a/drivers/net/mlx5/linux/mlx5_os.c +++ b/drivers/net/mlx5/linux/mlx5_os.c @@ -526,26 +526,16 @@ mlx5_os_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx) { struct mlx5_priv *priv = dev->data->dev_private; - struct mlx5_dev_config *config = &priv->config; struct mlx5_txq_data *txq_data = (*priv->txqs)[idx]; struct mlx5_txq_ctrl *txq_ctrl = container_of(txq_data, struct mlx5_txq_ctrl, txq); - /* - * When DevX is supported and DV flow is enable, and dest tir is enable, - * hairpin functions use DevX API. - * When, in addition, DV E-Switch is enable and DevX uar offset is - * supported, all Tx functions also use DevX API. - * Otherwise, all Tx functions use Verbs API. - */ - if (config->devx && config->dv_flow_en && config->dest_tir) { - if (txq_ctrl->type == MLX5_TXQ_TYPE_HAIRPIN) - return mlx5_txq_devx_obj_new(dev, idx); + if (txq_ctrl->type == MLX5_TXQ_TYPE_HAIRPIN) + return mlx5_txq_devx_obj_new(dev, idx); #ifdef HAVE_MLX5DV_DEVX_UAR_OFFSET - if (config->dv_esw_en) - return mlx5_txq_devx_obj_new(dev, idx); + if (!priv->config.dv_esw_en) + return mlx5_txq_devx_obj_new(dev, idx); #endif - } return mlx5_txq_ibv_obj_new(dev, idx); } @@ -558,20 +548,16 @@ static void mlx5_os_txq_obj_release(struct mlx5_txq_obj *txq_obj) { - struct mlx5_dev_config *config = &txq_obj->txq_ctrl->priv->config; - - if (config->devx && config->dv_flow_en && config->dest_tir) { + if (txq_obj->txq_ctrl->type == MLX5_TXQ_TYPE_HAIRPIN) { + mlx5_txq_devx_obj_release(txq_obj); + return; + } #ifdef HAVE_MLX5DV_DEVX_UAR_OFFSET - if (config->dv_esw_en) { - mlx5_txq_devx_obj_release(txq_obj); - return; - } -#endif - if (txq_obj->txq_ctrl->type == MLX5_TXQ_TYPE_HAIRPIN) { - mlx5_txq_devx_obj_release(txq_obj); - return; - } + if (!txq_obj->txq_ctrl->priv->config.dv_esw_en) { + mlx5_txq_devx_obj_release(txq_obj); + return; } +#endif mlx5_txq_ibv_obj_release(txq_obj); } @@ -1377,12 +1363,6 @@ goto error; } } - /* - * Initialize the dev_ops structure with DevX/Verbs function pointers. - * When DevX is supported and both DV flow and dest tir are enabled, all - * Rx functions use DevX API (except for drop that has not yet been - * implemented in DevX). - */ if (config->devx && config->dv_flow_en && config->dest_tir) { priv->obj_ops = devx_obj_ops; priv->obj_ops.drop_action_create = @@ -1392,16 +1372,17 @@ #ifndef HAVE_MLX5DV_DEVX_UAR_OFFSET priv->obj_ops.txq_obj_modify = ibv_obj_ops.txq_obj_modify; #else - if (!config->dv_esw_en) + if (config->dv_esw_en) priv->obj_ops.txq_obj_modify = ibv_obj_ops.txq_obj_modify; #endif + /* Use specific wrappers for Tx object. */ + priv->obj_ops.txq_obj_new = mlx5_os_txq_obj_new; + priv->obj_ops.txq_obj_release = mlx5_os_txq_obj_release; + } else { priv->obj_ops = ibv_obj_ops; } - /* The Tx objects are managed by a specific linux wrapper functions. */ - priv->obj_ops.txq_obj_new = mlx5_os_txq_obj_new; - priv->obj_ops.txq_obj_release = mlx5_os_txq_obj_release; /* Supported Verbs flow priority number detection. */ err = mlx5_flow_discover_priorities(eth_dev); if (err < 0) {