From patchwork Mon Feb 5 10:36:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zhang X-Patchwork-Id: 34954 X-Patchwork-Delegate: thomas@monjalon.net 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 0FF341B2BF; Mon, 5 Feb 2018 11:36:22 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 15B3A1B2BA for ; Mon, 5 Feb 2018 11:36:20 +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 fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Feb 2018 02:36:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,464,1511856000"; d="scan'208";a="28119158" Received: from dpdk51.sh.intel.com ([10.67.110.184]) by fmsmga001.fm.intel.com with ESMTP; 05 Feb 2018 02:36:18 -0800 From: Qi Zhang To: thomas@monjalon.net Cc: dev@dpdk.org, jingjing.wu@intel.com, konstantin.ananyev@intel.com, arybchenko@solarflare.com, Qi Zhang Date: Mon, 5 Feb 2018 18:36:10 +0800 Message-Id: <20180205103610.228721-1-qi.z.zhang@intel.com> X-Mailer: git-send-email 2.13.6 Subject: [dpdk-dev] [RFC v2] 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" According to exist implementation, rte_eth_[rx|tx]_queue_setup will always return fail if device is already started(rte_eth_dev_start). This can't satisfied the usage when application want to deferred setup part of the queues while keep traffic running on those queues already be setup. example: rte_eth_dev_config(nb_rxq = 2, nb_txq =2) rte_eth_rx_queue_setup(idx = 0 ...) rte_eth_rx_queue_setup(idx = 0 ...) rte_eth_dev_start(...) /* [rx|tx]_burst is ready to start on queue 0 */ rte_eth_rx_queue_setup(idx=1 ...) /* fail*/ Basically this is not a general hardware limitation, because for NIC like i40e, ixgbe, it is not necessary to stop the whole device before configure a fresh queue or reconfigure an exist queue with no traffic on it. The patch add new device capability bit into dev_info, so rte_eth_[rx|tx]_queue_setup will able to started. Signed-off-by: Qi Zhang --- lib/librte_ether/rte_ethdev.c | 40 ++++++++++++++++++++++++++++------------ lib/librte_ether/rte_ethdev.h | 7 +++++++ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 78bed1a16..58bde40bb 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,25 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } + if (dev->data->dev_started && + !(dev_info.ext_capa & DEV_DEFERRED_RX_QUEUE_SETUP)) { + RTE_PMD_DEBUG_TRACE( + "port %d must be stopped to allow rx queue setup\n", + port_id); + return -EBUSY; + } + 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.ext_capa & DEV_DEFERRED_RX_QUEUE_RELEASE)) { + RTE_PMD_DEBUG_TRACE( + "port %d must be stopped to allow rx queue release\n", + port_id); + return -EBUSY; + } (*dev->dev_ops->rx_queue_release)(rxq[rx_queue_id]); rxq[rx_queue_id] = NULL; } @@ -1573,12 +1582,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 +1599,23 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, return -EINVAL; } + if (dev->data->dev_started && + !(dev_info.ext_capa & DEV_DEFERRED_TX_QUEUE_SETUP)) { + RTE_PMD_DEBUG_TRACE( + "port %d must be stopped to allow tx queue setup\n", + return -EBUSY; + } + 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.ext_capa & DEV_DEFERRED_TX_QUEUE_RELEASE)) { + RTE_PMD_DEBUG_TRACE( + "port %d must be stopped to allow tx queue release\n", + return -EBUSY; + } (*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..75a85859d 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,7 @@ 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 ext_capa; /**< extended capability */ }; /**