From patchwork Wed Dec 23 08:49:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jijiang Liu X-Patchwork-Id: 9642 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 346E38DB4; Wed, 23 Dec 2015 09:50:12 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 43755593A for ; Wed, 23 Dec 2015 09:50:10 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 23 Dec 2015 00:50:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,468,1444719600"; d="scan'208";a="846987237" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga001.jf.intel.com with ESMTP; 23 Dec 2015 00:50:05 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id tBN8o3j2022393; Wed, 23 Dec 2015 16:50:03 +0800 Received: from shecgisg004.sh.intel.com (localhost [127.0.0.1]) by shecgisg004.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id tBN8o1GB012729; Wed, 23 Dec 2015 16:50:03 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id tBN8o1ft012725; Wed, 23 Dec 2015 16:50:01 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Wed, 23 Dec 2015 16:49:49 +0800 Message-Id: <1450860592-12673-4-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1450860592-12673-1-git-send-email-jijiang.liu@intel.com> References: <1450860592-12673-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [RFC PATCH 3/6] rte_ether: implement tunnel config API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Jijiang Liu --- 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) {