From patchwork Sun Feb 15 04:07:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingjing Wu X-Patchwork-Id: 3354 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 3C1E8B553; Sun, 15 Feb 2015 05:07:53 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D44BAB52C for ; Sun, 15 Feb 2015 05:07:51 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 14 Feb 2015 20:07:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,579,1418112000"; d="scan'208";a="527723524" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by orsmga003.jf.intel.com with ESMTP; 14 Feb 2015 19:59:26 -0800 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id t1F47kRl031347; Sun, 15 Feb 2015 12:07:46 +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 t1F47icf000667; Sun, 15 Feb 2015 12:07:46 +0800 Received: (from wujingji@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id t1F47i42000663; Sun, 15 Feb 2015 12:07:44 +0800 From: Jingjing Wu To: dev@dpdk.org Date: Sun, 15 Feb 2015 12:07:33 +0800 Message-Id: <1423973254-605-5-git-send-email-jingjing.wu@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1423973254-605-1-git-send-email-jingjing.wu@intel.com> References: <1422593303-15308-1-git-send-email-zhida.zang@intel.com> <1423973254-605-1-git-send-email-jingjing.wu@intel.com> Subject: [dpdk-dev] [PATCH v2 4/5] ethdev: remove old APIs and structures of flex filter 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" Structure rte_flex_filter is removed. Following APIs are removed: - rte_eth_dev_add_flex_filter - rte_eth_dev_remove_flex_filter - rte_eth_dev_get_flex_filter Signed-off-by: Jingjing Wu --- lib/librte_ether/rte_ethdev.c | 51 ------------------------- lib/librte_ether/rte_ethdev.h | 89 ------------------------------------------- 2 files changed, 140 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index ea3a1fb..f8b1e8a 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -3172,57 +3172,6 @@ rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, } int -rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t rx_queue) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->add_flex_filter, -ENOTSUP); - return (*dev->dev_ops->add_flex_filter)(dev, index, filter, rx_queue); -} - -int -rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index) -{ - struct rte_eth_dev *dev; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->remove_flex_filter, -ENOTSUP); - return (*dev->dev_ops->remove_flex_filter)(dev, index); -} - -int -rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t *rx_queue) -{ - struct rte_eth_dev *dev; - - if (filter == NULL || rx_queue == NULL) - return -EINVAL; - - if (port_id >= nb_ports) { - PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); - return -ENODEV; - } - - dev = &rte_eth_devices[port_id]; - FUNC_PTR_OR_ERR_RET(*dev->dev_ops->get_flex_filter, -ENOTSUP); - return (*dev->dev_ops->get_flex_filter)(dev, index, filter, - rx_queue); -} - -int rte_eth_dev_filter_supported(uint8_t port_id, enum rte_filter_type filter_type) { struct rte_eth_dev *dev; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index 1200c1c..7d455b5 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -992,17 +992,6 @@ struct rte_2tuple_filter { }; /** - * A structure used to define a flex filter. - */ -struct rte_flex_filter { - uint16_t len; - uint32_t dwords[32]; /**< flex bytes in big endian. */ - uint8_t mask[16]; /**< if mask bit is 1b, do not compare - corresponding byte in dwords. */ - uint8_t priority; -}; - -/** * A structure used to define a 5tuple filter. */ struct rte_5tuple_filter { @@ -1391,20 +1380,6 @@ typedef int (*eth_get_5tuple_filter_t)(struct rte_eth_dev *dev, uint16_t *rx_queue); /**< @internal Get a 5tuple filter rule on an Ethernet device */ -typedef int (*eth_add_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index, struct rte_flex_filter *filter, - uint16_t rx_queue); -/**< @internal Setup a new flex filter rule on an Ethernet device */ - -typedef int (*eth_remove_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index); -/**< @internal Remove a flex filter rule on an Ethernet device */ - -typedef int (*eth_get_flex_filter_t)(struct rte_eth_dev *dev, - uint16_t index, struct rte_flex_filter *filter, - uint16_t *rx_queue); -/**< @internal Get a flex filter rule on an Ethernet device */ - typedef int (*eth_filter_ctrl_t)(struct rte_eth_dev *dev, enum rte_filter_type filter_type, enum rte_filter_op filter_op, @@ -1515,9 +1490,6 @@ struct eth_dev_ops { eth_add_5tuple_filter_t add_5tuple_filter; /**< add 5tuple filter. */ eth_remove_5tuple_filter_t remove_5tuple_filter; /**< remove 5tuple filter. */ eth_get_5tuple_filter_t get_5tuple_filter; /**< get 5tuple filter. */ - eth_add_flex_filter_t add_flex_filter; /**< add flex filter. */ - eth_remove_flex_filter_t remove_flex_filter; /**< remove flex filter. */ - eth_get_flex_filter_t get_flex_filter; /**< get flex filter. */ eth_filter_ctrl_t filter_ctrl; /**< common filter control*/ }; @@ -3568,67 +3540,6 @@ int rte_eth_dev_get_5tuple_filter(uint8_t port_id, uint16_t index, struct rte_5tuple_filter *filter, uint16_t *rx_queue); /** - * Add a new flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @param filter - * The pointer to the structure describing the flex filter rule. - * The *rte_flex_filter* structure includes the values of the different fields - * to match: the dwords (first len bytes of packet ) and relative masks. - * @param rx_queue - * The index of the RX queue where to store RX packets matching the added - * flex filter. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - * - (-ENOENT) if no enabled filter in this index. - */ -int rte_eth_dev_add_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t rx_queue); - -/** - * remove a flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - */ -int rte_eth_dev_remove_flex_filter(uint8_t port_id, uint16_t index); - -/** - * Get an flex filter rule on an Ethernet device. - * - * @param port_id - * The port identifier of the Ethernet device. - * @param index - * The identifier of flex filter. - * @param filter - * A pointer to a structure of type *rte_flex_filter* to be filled with - * the information of the flex filter. - * @param rx_queue - * A pointer to get the queue index. - * @return - * - (0) if successful. - * - (-ENOTSUP) if hardware doesn't support flex filter. - * - (-ENODEV) if *port_id* invalid. - * - (-EINVAL) if the filter information is not correct. - * - (-ENOENT) if no enabled filter in this index. - */ -int rte_eth_dev_get_flex_filter(uint8_t port_id, uint16_t index, - struct rte_flex_filter *filter, uint16_t *rx_queue); - -/** * Check whether the filter type is supported on an Ethernet device. * All the supported filter types are defined in 'rte_eth_ctrl.h'. *