[dpdk-dev] [RFC PATCH 3/6] rte_ether: implement tunnel config API

Jijiang Liu jijiang.liu at intel.com
Wed Dec 23 09:49:49 CET 2015


Signed-off-by: Jijiang Liu <jijiang.liu at intel.com>
---
 lib/librte_ether/rte_ethdev.c |   60 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index c3eed49..6725398 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -1004,6 +1004,66 @@ rte_eth_dev_configure(uint8_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
 	return 0;
 }
 
+int
+rte_eth_dev_tunnel_configure(uint8_t port_id,
+			     struct rte_eth_tunnel_conf *tunnel_conf)
+{
+	struct rte_eth_dev *dev;
+	struct rte_eth_dev_info dev_info;
+	int diag;
+
+	/* This function is only safe when called from the primary process
+ 	* * in a multi-process setup*/
+	RTE_PROC_PRIMARY_OR_ERR_RET(-E_RTE_SECONDARY);
+
+	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);
+	
+	dev = &rte_eth_devices[port_id];
+
+	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
+
+	/*
+ 	 * * Check that the numbers of RX and TX queues are not greater
+ 	 * * than the configured number of RX and TX queues supported by the
+ 	 * * configured device.
+ 	 * */
+	(*dev->dev_ops->dev_infos_get)(dev, &dev_info);
+	if (tunnel_conf->rx_queue > dev->data->nb_rx_queues - 1) {
+		RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_rx_queues=%d > %d\n",
+				port_id, nb_rx_q, dev_info.max_rx_queues);
+		return -EINVAL;
+	}
+
+	if (tunnel_conf->tx_queue > dev->data->nb_rx_queues -1 ) {
+		RTE_PMD_DEBUG_TRACE("ethdev port_id=%d nb_tx_queues=%d > %d\n",
+				port_id, nb_tx_q, dev_info.max_tx_queues);
+		return -EINVAL;
+	}
+
+	tunnel_conf->tunnel_flow = rte_zmalloc(NULL,
+				sizeof(struct rte_eth_tunnel_flow)
+				* tunnel_conf->nb_flow, 0);
+	
+	/* Copy the dev_conf parameter into the dev structure */
+	memcpy(dev->data->dev_conf.tunnel_conf[tunnel_conf->rx_queue],
+			tunnel_conf, sizeof(struct rte_eth_tunnel_conf));
+
+	rte_eth_add_rx_callback(port_id, tunnel_conf->rx_queue,
+				rte_eth_tunnel_decap, (void *)tunnel_conf);
+
+	rte_eth_add_tx_callback(port_id, tunnel_conf->tx_queue,
+				rte_eth_tunnel_encap, (void *)tunnel_conf)
+
+	diag = (*dev->dev_ops->tunnel_configure)(dev);
+	if (diag != 0) {
+		RTE_PMD_DEBUG_TRACE("port%d dev_tunnel_configure = %d\n",
+				port_id, diag);
+		return diag;
+	}
+
+	return 0;
+}
+
 static void
 rte_eth_dev_config_restore(uint8_t port_id)
 {
-- 
1.7.7.6



More information about the dev mailing list