From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <wei.dai@intel.com>
Received: from mga06.intel.com (mga06.intel.com [134.134.136.31])
by dpdk.org (Postfix) with ESMTP id D36941041
for <dev@dpdk.org>; Wed, 28 Mar 2018 10:57:43 +0200 (CEST)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga006.jf.intel.com ([10.7.209.51])
by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
28 Mar 2018 01:57:42 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.48,370,1517904000"; d="scan'208";a="29540442"
Received: from dw2.bj.intel.com ([172.16.117.113])
by orsmga006.jf.intel.com with ESMTP; 28 Mar 2018 01:57:41 -0700
From: Wei Dai <wei.dai@intel.com>
To: thomas@monjalon.net
Cc: dev@dpdk.org,
Wei Dai <wei.dai@intel.com>
Date: Wed, 28 Mar 2018 16:57:09 +0800
Message-Id: <20180328085709.28310-1-wei.dai@intel.com>
X-Mailer: git-send-email 2.9.5
In-Reply-To: <1517493186-6687-1-git-send-email-wei.dai@intel.com>
References: <1517493186-6687-1-git-send-email-wei.dai@intel.com>
Subject: [dpdk-dev] [PATCH v2] ethdev: check Rx/Tx offloads
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Mar 2018 08:57:44 -0000
This patch check if a requested offloading
is supported in the device capability.
A per port offloading feature should be enabled or
disabled at same time in both rte_eth_dev_configure( )
and rte_eth_rx_queue_setup( )/rte_eth_tx_queue_setup( ).
This patch check if a per port offloading flag has
same configuration in rte_eth_dev_configure( ) and
rte_eth_rx_queue_setup( )/rte_eth_tx_queue_setup( ).
This patch can make such checking in a common way in
rte_ethdev layer to avoid same checking in underlying PMD.
Signed-off-by: Wei Dai <wei.dai@intel.com>
---
v2: add offlaods checking in rte_eth_dev_configure( ).
check if a requested offloading is supported
---
lib/librte_ether/rte_ethdev.c | 100 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 0590f0c..a04a705 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1152,6 +1152,27 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
ETHER_MAX_LEN;
}
+ if ((local_conf.rxmode.offloads & dev_info.rx_offload_capa) !=
+ local_conf.rxmode.offloads) {
+ RTE_PMD_DEBUG_TRACE("ethdev port_id=%d requested Rx offloads "
+ "0x%" PRIx64 " doesn't match Rx offloads "
+ "capability 0x%" PRIx64 "\n",
+ port_id,
+ local_conf.rxmode.offloads,
+ dev_info.rx_offload_capa);
+ return -EINVAL;
+ }
+ if ((local_conf.txmode.offloads & dev_info.tx_offload_capa) !=
+ local_conf.txmode.offloads) {
+ RTE_PMD_DEBUG_TRACE("ethdev port_id=%d requested Tx offloads "
+ "0x%" PRIx64 " doesn't match Tx offloads "
+ "capability 0x%" PRIx64 "\n",
+ port_id,
+ local_conf.txmode.offloads,
+ dev_info.tx_offload_capa);
+ return -EINVAL;
+ }
+
/*
* Setup new number of RX/TX queues and reconfigure device.
*/
@@ -1404,6 +1425,50 @@ rte_eth_dev_is_removed(uint16_t port_id)
return ret;
}
+/**
+* Check if the Rx/Tx queue offloading settings is valid
+* @param queue_offloads
+* offloads input to rte_eth_rx_queue_setup( ) or rte_eth_tx_queue_setup( )
+* @param port_offloads
+* Rx or Tx offloads input to rte_eth_dev_configure( )
+* @param queue_offload_capa
+* rx_queue_offload_capa or tx_queue_offload_capa in struct rte_eth_dev_ifnfo
+* got from rte_eth_dev_info_get( )
+* @param all_offload_capa
+* rx_offload_capa or tx_offload_capa in struct rte_eth_dev_info
+* got from rte_eth_dev_info_get( )
+*
+* @return
+* Nonzero when per-queue offloading setting is valid
+*/
+static int
+rte_eth_check_queue_offloads(uint64_t queue_offloads,
+ uint64_t port_offloads,
+ uint64_t queue_offload_capa,
+ uint64_t all_offload_capa)
+{
+ uint64_t pure_port_capa = all_offload_capa ^ queue_offload_capa;
+
+ if ((queue_offloads & all_offload_capa) != queue_offloads)
+ return 0;
+
+ if ((port_offloads ^ queue_offloads) & pure_port_capa)
+ return 0;
+
+ return 1;
+}
+
+static int
+rte_eth_check_rx_queue_offloads(uint64_t rx_queue_offloads,
+ const struct rte_eth_rxmode *rxmode,
+ const struct rte_eth_dev_info *dev_info)
+{
+ return rte_eth_check_queue_offloads(rx_queue_offloads,
+ rxmode->offloads,
+ dev_info->rx_queue_offload_capa,
+ dev_info->rx_offload_capa);
+}
+
int
rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
uint16_t nb_rx_desc, unsigned int socket_id,
@@ -1495,6 +1560,18 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
&local_conf.offloads);
}
+ if (!rte_eth_check_rx_queue_offloads(local_conf.offloads,
+ &dev->data->dev_conf.rxmode, &dev_info)) {
+ RTE_PMD_DEBUG_TRACE("Ethdev port %d : Rx queue offloads ox%"
+ PRIx64 " don't match port offloads 0x%" PRIx64
+ " or supported offloads 0x%" PRIx64 "\n",
+ port_id,
+ local_conf.offloads,
+ dev->data->dev_conf.rxmode.offloads,
+ dev_info.rx_offload_capa);
+ return -ENOTSUP;
+ }
+
ret = (*dev->dev_ops->rx_queue_setup)(dev, rx_queue_id, nb_rx_desc,
socket_id, &local_conf, mp);
if (!ret) {
@@ -1555,6 +1632,17 @@ rte_eth_convert_txq_offloads(const uint64_t tx_offloads, uint32_t *txq_flags)
*txq_flags = flags;
}
+static int
+rte_eth_check_tx_queue_offloads(uint64_t tx_queue_offloads,
+ const struct rte_eth_txmode *txmode,
+ const struct rte_eth_dev_info *dev_info)
+{
+ return rte_eth_check_queue_offloads(tx_queue_offloads,
+ txmode->offloads,
+ dev_info->tx_queue_offload_capa,
+ dev_info->tx_offload_capa);
+}
+
int
rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
uint16_t nb_tx_desc, unsigned int socket_id,
@@ -1622,6 +1710,18 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
&local_conf.offloads);
}
+ if (!rte_eth_check_tx_queue_offloads(local_conf.offloads,
+ &dev->data->dev_conf.txmode, &dev_info)) {
+ RTE_PMD_DEBUG_TRACE("Ethdev port %d : Tx queue offloads ox%"
+ PRIx64 " don't match port offloads 0x%" PRIx64
+ " or supported offloads 0x%" PRIx64 "\n",
+ port_id,
+ local_conf.offloads,
+ dev->data->dev_conf.txmode.offloads,
+ dev_info.tx_offload_capa);
+ return -ENOTSUP;
+ }
+
return eth_err(port_id, (*dev->dev_ops->tx_queue_setup)(dev,
tx_queue_id, nb_tx_desc, socket_id, &local_conf));
}
--
2.9.5