From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1C4F41C7EE for ; Mon, 14 May 2018 14:20:22 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 May 2018 05:20:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,399,1520924400"; d="scan'208";a="55007923" Received: from dpdk6.bj.intel.com ([172.16.182.201]) by fmsmga001.fm.intel.com with ESMTP; 14 May 2018 05:20:20 -0700 From: Wei Dai To: thomas@monjalon.net, ferruh.yigit@intel.com Cc: dev@dpdk.org, Wei Dai , Qi Zhang Date: Mon, 14 May 2018 20:00:35 +0800 Message-Id: <1526299235-54090-1-git-send-email-wei.dai@intel.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1525953415-14156-1-git-send-email-wei.dai@intel.com> References: <1525953415-14156-1-git-send-email-wei.dai@intel.com> Subject: [dpdk-dev] [PATCH v13] ethdev: new Rx/Tx offloads API 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: , X-List-Received-Date: Mon, 14 May 2018 12:20:23 -0000 This patch check if a input requested offloading is valid or not. Any reuqested offloading must be supported in the device capabilities. Any offloading is disabled by default if it is not set in the parameter dev_conf->[rt]xmode.offloads to rte_eth_dev_configure() and [rt]x_conf->offloads to rte_eth_[rt]x_queue_setup(). If any offloading is enabled in rte_eth_dev_configure() by application, it is enabled on all queues no matter whether it is per-queue or per-port type and no matter whether it is set or cleared in [rt]x_conf->offloads to rte_eth_[rt]x_queue_setup(). If a per-queue offloading hasn't be enabled in rte_eth_dev_configure(), it can be enabled or disabled for individual queue in ret_eth_[rt]x_queue_setup(). A new added offloading is the one which hasn't been enabled in rte_eth_dev_configure() and is reuqested to be enabled in rte_eth_[rt]x_queue_setup(), it must be per-queue type, otherwise trigger an error log. The underlying PMD must be aware that the requested offloadings to PMD specific queue_setup() function only carries those new added offloadings of per-queue type. This patch can make above such checking in a common way in rte_ethdev layer to avoid same checking in underlying PMD. This patch assumes that all PMDs in 18.05-rc2 have already converted to offload API defined in 17.11 . It also assumes that all PMDs can return correct offloading capabilities in rte_eth_dev_infos_get(). In the beginning of [rt]x_queue_setup() of underlying PMD, add offloads = [rt]xconf->offloads | dev->data->dev_conf.[rt]xmode.offloads; to keep same as offload API defined in 17.11 to avoid upper application broken due to offload API change. PMD can use the info that input [rt]xconf->offloads only carry the new added per-queue offloads to do some optimization or some code change on base of this patch. Signed-off-by: Wei Dai Signed-off-by: Ferruh Yigit Signed-off-by: Qi Zhang --- v13: only rework on v12 according to feedback. This version is based on commit dc33238da4be ("app/testpmd: check if CRC strip offload supported") in the repo dpdk-next-net. v12: fix coding style warning v11: This patch set is based on 18.05-rc2 . document update according to feedback revise rte_ethdev.h for doxygen v10: sorry, miss the code change, fix the buidling error v9: replace RTE_PMD_DEBUG_TRACE with ethdev_log(ERR, in ethdev to avoid failure of application which hasn't been completely converted to new offload API. v8: Revise PMD codes to comply with offload API in v7 update document v7: Give the maximum freedom for upper application, only minimal checking is performed in ethdev layer. Only requested specific pure per-queue offloadings are input to underlying PMD. v6: No need enable an offload in queue_setup( ) if it has already been enabled in dev_configure( ) v5: keep offload settings sent to PMD same as those from application v4: fix a wrong description in git log message. v3: rework according to dicision of offloading API in community v2: add offloads checking in rte_eth_dev_configure( ). check if a requested offloading is supported. --- doc/guides/prog_guide/poll_mode_drv.rst | 6 +++--- lib/librte_ethdev/rte_ethdev.c | 22 ++++++++++++---------- lib/librte_ethdev/rte_ethdev.h | 17 ++++++++++------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/doc/guides/prog_guide/poll_mode_drv.rst b/doc/guides/prog_guide/poll_mode_drv.rst index f4e0bcd..daa858d 100644 --- a/doc/guides/prog_guide/poll_mode_drv.rst +++ b/doc/guides/prog_guide/poll_mode_drv.rst @@ -303,12 +303,12 @@ In the DPDK offload API, offloads are divided into per-port and per-queue offloa * A pure per-port offloading can't be enabled on a queue and disabled on another queue at the same time. * A pure per-port offloading must be enabled or disabled on all queues at the same time. * Any offloading is per-queue or pure per-port type, but can't be both types at same devices. -* A per-port offloading can be enabled or disabled on all queues at the same time. -* It is certain that both per-queue and pure per-port offloading are per-port type. +* Port capabilities = pre-queue capabilities + pure per-port capabilities. +* Any supported offloading can be enabled on all queues. The different offloads capabilities can be queried using ``rte_eth_dev_info_get()``. The ``dev_info->[rt]x_queue_offload_capa`` returned from ``rte_eth_dev_info_get()`` includes all per-queue offloading capabilities. -The ``dev_info->[rt]x_offload_capa`` returned from ``rte_eth_dev_info_get()`` includes all per-port and per-queue offloading capabilities. +The ``dev_info->[rt]x_offload_capa`` returned from ``rte_eth_dev_info_get()`` includes all pure per-port and per-queue offloading capabilities. Supported offloads can be either per-port or per-queue. Offloads are enabled using the existing ``DEV_TX_OFFLOAD_*`` or ``DEV_RX_OFFLOAD_*`` flags. diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index 3528ba1..b3ed821 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1166,21 +1166,23 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, local_conf.rxmode.offloads) { ethdev_log(ERR, "ethdev port_id=%d requested Rx offloads " "0x%" PRIx64 " doesn't match Rx offloads " - "capabilities 0x%" PRIx64 " in %s( )\n", + "capabilities 0x%" PRIx64 " in %s()\n", port_id, local_conf.rxmode.offloads, dev_info.rx_offload_capa, __func__); + /* Will return -EINVAL in the next release */ } if ((local_conf.txmode.offloads & dev_info.tx_offload_capa) != local_conf.txmode.offloads) { ethdev_log(ERR, "ethdev port_id=%d requested Tx offloads " "0x%" PRIx64 " doesn't match Tx offloads " - "capabilities 0x%" PRIx64 " in %s( )\n", + "capabilities 0x%" PRIx64 " in %s()\n", port_id, local_conf.txmode.offloads, dev_info.tx_offload_capa, __func__); + /* Will return -EINVAL in the next release */ } /* Check that device supports requested rss hash functions. */ @@ -1556,29 +1558,29 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, * The local_conf.offloads input to underlying PMD only carries * those offloadings which are only enabled on this queue and * not enabled on all queues. - * The underlying PMD must be aware of this point. */ local_conf.offloads &= ~dev->data->dev_conf.rxmode.offloads; /* * New added offloadings for this queue are those not enabled in - * rte_eth_dev_configure( ) and they must be per-queue type. + * rte_eth_dev_configure() and they must be per-queue type. * A pure per-port offloading can't be enabled on a queue while * disabled on another queue. A pure per-port offloading can't * be enabled for any queue as new added one if it hasn't been - * enabled in rte_eth_dev_configure( ). + * enabled in rte_eth_dev_configure(). */ if ((local_conf.offloads & dev_info.rx_queue_offload_capa) != local_conf.offloads) { ethdev_log(ERR, "Ethdev port_id=%d rx_queue_id=%d, new " "added offloads 0x%" PRIx64 " must be " "within pre-queue offload capabilities 0x%" - PRIx64 " in %s( )\n", + PRIx64 " in %s()\n", port_id, rx_queue_id, local_conf.offloads, dev_info.rx_queue_offload_capa, __func__); + /* Will return -EINVAL in the next release */ } ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc, @@ -1721,29 +1723,29 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id, * The local_conf.offloads input to underlying PMD only carries * those offloadings which are only enabled on this queue and * not enabled on all queues. - * The underlying PMD must be aware of this point. */ local_conf.offloads &= ~dev->data->dev_conf.txmode.offloads; /* * New added offloadings for this queue are those not enabled in - * rte_eth_dev_configure( ) and they must be per-queue type. + * rte_eth_dev_configure() and they must be per-queue type. * A pure per-port offloading can't be enabled on a queue while * disabled on another queue. A pure per-port offloading can't * be enabled for any queue as new added one if it hasn't been - * enabled in rte_eth_dev_configure( ). + * enabled in rte_eth_dev_configure(). */ if ((local_conf.offloads & dev_info.tx_queue_offload_capa) != local_conf.offloads) { ethdev_log(ERR, "Ethdev port_id=%d tx_queue_id=%d, new " "added offloads 0x%" PRIx64 " must be " "within pre-queue offload capabilities 0x%" - PRIx64 " in %s( )\n", + PRIx64 " in %s()\n", port_id, tx_queue_id, local_conf.offloads, dev_info.tx_queue_offload_capa, __func__); + /* Will return -EINVAL in the next release */ } return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev, diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index 78e12bf..3a7428e 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -1067,13 +1067,18 @@ struct rte_eth_dev_info { uint16_t max_vfs; /**< Maximum number of VFs. */ uint16_t max_vmdq_pools; /**< Maximum number of VMDq pools. */ uint64_t rx_offload_capa; - /**< All RX offload capabilities including all per queue ones */ + /**< + * All RX offload capabilities including all per-queue ones. + * Any flag in [rt]x_offload_capa and [rt]x_queue_offload_capa + * of this structure needn't be repeated in rte_eth_[rt]x_queue_setup(). + * A flag enabled at port level can't be disabled at queue level. + */ uint64_t tx_offload_capa; - /**< All TX offload capabilities.including all per-queue ones */ + /**< All TX offload capabilities including all per-queue ones */ uint64_t rx_queue_offload_capa; - /**< Device per queue RX offload capabilities. */ + /**< Device per-queue RX offload capabilities. */ uint64_t tx_queue_offload_capa; - /**< Device per queue TX offload capabilities. */ + /**< Device per-queue TX offload capabilities. */ uint16_t reta_size; /**< Device redirection table size, the total number of entries. */ uint8_t hash_key_size; /**< Hash key size in bytes */ @@ -1554,9 +1559,7 @@ const char * __rte_experimental rte_eth_dev_tx_offload_name(uint64_t offload); * the [rt]x_offload_capa returned from rte_eth_dev_infos_get(). * Any type of device supported offloading set in the input argument * eth_conf->[rt]xmode.offloads to rte_eth_dev_configure() is enabled - * on all [RT]x queues and it can't be disabled no matter whether - * it is cleared or set in the input argument [rt]x_conf->offloads - * to rte_eth_[rt]x_queue_setup(). + * on all queues and it can't be disabled in rte_eth_[rt]x_queue_setup(). * - the Receive Side Scaling (RSS) configuration when using multiple RX * queues per port. * -- 2.7.5