From patchwork Mon Feb 12 04:53:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 35119 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 221E91B32A; Mon, 12 Feb 2018 05:53:26 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 2AABF1B314 for ; Mon, 12 Feb 2018 05:53:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2018 20:53:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,500,1511856000"; d="scan'208";a="30009471" Received: from dpdk51.sh.intel.com ([10.67.110.184]) by fmsmga001.fm.intel.com with ESMTP; 11 Feb 2018 20:53:21 -0800 From: Qi Zhang To: thomas@monjalon.net Cc: dev@dpdk.org, jingjing.wu@intel.com, beilei.xing@intel.com, arybchenko@solarflare.com, konstantin.ananyev@intel.com, Qi Zhang Date: Mon, 12 Feb 2018 12:53:11 +0800 Message-Id: <20180212045314.171616-2-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180212045314.171616-1-qi.z.zhang@intel.com> References: <20180212045314.171616-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH 1/4] ether: support deferred queue setup 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" The patch let etherdev driver expose the capability flag through rte_eth_dev_info_get when it support deferred queue configuraiton, then base on the flag rte_eth_[rx|tx]_queue_setup could decide continue to setup the queue or just return fail when device already started. Signed-off-by: Qi Zhang --- doc/guides/nics/features.rst | 8 ++++++++ lib/librte_ether/rte_ethdev.c | 30 ++++++++++++++++++------------ lib/librte_ether/rte_ethdev.h | 8 ++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 1b4fb979f..36ad21a1f 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -892,7 +892,15 @@ Documentation describes performance values. See ``dpdk.org/doc/perf/*``. +.. _nic_features_queue_deferred_setup_capabilities: +Queue deferred setup capabilities +--------------------------------- + +Supports queue setup / release after device started. + +* **[provides] rte_eth_dev_info**: ``deferred_queue_config_capa:DEV_DEFERRED_RX_QUEUE_SETUP,DEV_DEFERRED_TX_QUEUE_SETUP,DEV_DEFERRED_RX_QUEUE_RELEASE,DEV_DEFERRED_TX_QUEUE_RELEASE``. +* **[related] API**: ``rte_eth_dev_info_get()``. .. _nic_features_other: diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index a6ce2a5ba..6c906c4df 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1425,12 +1425,6 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } - if (dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be stopped to allow configuration\n", port_id); - return -EBUSY; - } - RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_setup, -ENOTSUP); @@ -1474,10 +1468,19 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } + if (dev->data->dev_started && + !(dev_info.deferred_queue_config_capa & + DEV_DEFERRED_RX_QUEUE_SETUP)) + return -EINVAL; + rxq = dev->data->rx_queues; if (rxq[rx_queue_id]) { RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rx_queue_release, -ENOTSUP); + if (dev->data->dev_started && + !(dev_info.deferred_queue_config_capa & + DEV_DEFERRED_RX_QUEUE_RELEASE)) + return -EINVAL; (*dev->dev_ops->rx_queue_release)(rxq[rx_queue_id]); rxq[rx_queue_id] = NULL; } @@ -1573,12 +1576,6 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } - if (dev->data->dev_started) { - RTE_PMD_DEBUG_TRACE( - "port %d must be stopped to allow configuration\n", port_id); - return -EBUSY; - } - RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_setup, -ENOTSUP); @@ -1596,10 +1593,19 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } + if (dev->data->dev_started && + !(dev_info.deferred_queue_config_capa & + DEV_DEFERRED_TX_QUEUE_SETUP)) + return -EINVAL; + txq = dev->data->tx_queues; if (txq[tx_queue_id]) { RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tx_queue_release, -ENOTSUP); + if (dev->data->dev_started && + !(dev_info.deferred_queue_config_capa & + DEV_DEFERRED_TX_QUEUE_RELEASE)) + return -EINVAL; (*dev->dev_ops->tx_queue_release)(txq[tx_queue_id]); txq[tx_queue_id] = NULL; } diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 036153306..6fc960c34 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -981,6 +981,12 @@ struct rte_eth_conf { */ #define DEV_TX_OFFLOAD_SECURITY 0x00020000 +/** < Deferred queue setup / release capability */ +#define DEV_DEFERRED_RX_QUEUE_SETUP 0x00000001 +#define DEV_DEFERRED_TX_QUEUE_SETUP 0x00000002 +#define DEV_DEFERRED_RX_QUEUE_RELEASE 0x00000004 +#define DEV_DEFERRED_TX_QUEUE_RELEASE 0x00000008 + /* * If new Tx offload capabilities are defined, they also must be * mentioned in rte_tx_offload_names in rte_ethdev.c file. @@ -1029,6 +1035,8 @@ struct rte_eth_dev_info { /** Configured number of rx/tx queues */ uint16_t nb_rx_queues; /**< Number of RX queues. */ uint16_t nb_tx_queues; /**< Number of TX queues. */ + uint64_t deferred_queue_config_capa; + /**< a queue can be setup/release after dev_start */ }; /**