From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E03D81FE for ; Tue, 26 Aug 2014 09:27:51 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 26 Aug 2014 00:31:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,402,1406617200"; d="scan'208";a="589889185" Received: from shvmail01.sh.intel.com ([10.239.29.42]) by fmsmga002.fm.intel.com with ESMTP; 26 Aug 2014 00:31:48 -0700 Received: from shecgisg004.sh.intel.com (shecgisg004.sh.intel.com [10.239.29.89]) by shvmail01.sh.intel.com with ESMTP id s7Q7VkmO027264; Tue, 26 Aug 2014 15:31: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 s7Q7Vhqk021827; Tue, 26 Aug 2014 15:31:45 +0800 Received: (from jijiangl@localhost) by shecgisg004.sh.intel.com (8.13.6/8.13.6/Submit) id s7Q7VhaZ021822; Tue, 26 Aug 2014 15:31:43 +0800 From: Jijiang Liu To: dev@dpdk.org Date: Tue, 26 Aug 2014 15:31:30 +0800 Message-Id: <1409038294-21693-4-git-send-email-jijiang.liu@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1409038294-21693-1-git-send-email-jijiang.liu@intel.com> References: <1409038294-21693-1-git-send-email-jijiang.liu@intel.com> Subject: [dpdk-dev] [PATCH v2 3/7]rte_ether:add API of VxLAN packet filter in librte_ether 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: , X-List-Received-Date: Tue, 26 Aug 2014 07:27:52 -0000 VxLAN packet filters, which use MAC and VLAN to point to a queue. The filter types supported are listed below: 1. Inner MAC and Inner VLAN ID 2. Inner MAC address, inner VLAN ID and tenant ID. 3. Inner MAC and tenant ID 4. Inner MAC address 5. Outer MAC address, tenant ID and inner MAC Signed-off-by: jijiangl Acked-by: Helin Zhang Acked-by: Jingjing Wu Acked-by: Jing Chen --- lib/librte_ether/rte_ethdev.c | 50 ++++++++++++++++++++++++++++ lib/librte_ether/rte_ethdev.h | 72 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index 325edb1..d941d86 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1955,6 +1955,56 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id, } int +rte_eth_dev_tunnel_filter_set(uint8_t port_id, + struct rte_eth_tunnel_filter_conf *tunnel_filter, + uint8_t filter_count, uint8_t add) +{ + uint8_t i; + struct rte_eth_dev *dev; + struct rte_eth_tunnel_filter_conf *pfilter; + + if (port_id >= nb_ports) { + PMD_DEBUG_TRACE("Invalid port_id=%d\n", port_id); + return -ENODEV; + } + + if (tunnel_filter == NULL) { + PMD_DEBUG_TRACE("Invalid oud_filter parameter\n"); + return -EINVAL; + } + pfilter = tunnel_filter; + + dev = &rte_eth_devices[port_id]; + for (i = 0; i < filter_count; i++, pfilter++) { + if (pfilter->queue_id >= dev->data->nb_rx_queues) { + PMD_DEBUG_TRACE("Invalid queue number\n"); + return -EINVAL; + } + + if (pfilter->inner_vlan > ETHER_MAX_VLAN_ID) { + PMD_DEBUG_TRACE("Invalid inner VLAN ID\n"); + return -EINVAL; + } + + if (is_zero_ether_addr(pfilter->outer_mac)) { + PMD_DEBUG_TRACE("port %d: Cannot add NULL outer MAC address\n", + port_id); + return -EINVAL; + } + + if (is_zero_ether_addr(pfilter->inner_mac)) { + PMD_DEBUG_TRACE("port %d: Cannot add NULL inner MAC address\n", + port_id); + return -EINVAL; + } + } + + FUNC_PTR_OR_ERR_RET(*dev->dev_ops->tunnel_filter_set, -ENOTSUP); + return (*dev->dev_ops->tunnel_filter_set)(dev, tunnel_filter, + filter_count, add); +} + +int rte_eth_led_on(uint8_t port_id) { struct rte_eth_dev *dev; diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index d24907f..47d50da 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -707,6 +707,28 @@ struct rte_fdir_conf { uint8_t drop_queue; }; +enum rte_tunnel_filter_type { + RTE_TUNNEL_FILTER_TYPE_NONE = 0, + RTE_TUNNEL_FILTER_IMAC_IVLAN, /**< Filter by inner MAC and VLAN ID. */ + RTE_TUNNEL_FILTER_IMAC_IVLAN_TENID, + /**< Filter by inner MAC address and VLAN ID, tenned ID. */ + RTE_TUNNEL_FILTER_IMAC_TENID, /**< Filter by inner MAC and tenant ID. */ + RTE_TUNNEL_FILTER_IMAC, /**< Filter by inner MAC address */ + RTE_TUNNEL_FILTER_OMAC_TENID_IMAC, + /**< Filter by outer MAC address, tenant ID and Inner MAC */ + RTE_TUNNEL_FILTER_TYPE_MAX, +}; + +#define RTE_TUNNEL_FLAGS_TO_QUEUE 1 + +/** + * Select IPv4 or IPv6 tunnel filters. + */ +enum rte_tunnel_iptype { + RTE_TUNNEL_IPTYPE_IPV4 = 0, /**< IPv4. */ + RTE_TUNNEL_IPTYPE_IPV6, /**< IPv6. */ +}; + /** * Tunneled type. */ @@ -720,6 +742,26 @@ enum rte_eth_tunnel_type { }; /** + * Tunnel Packet filter configuration. + */ +struct rte_eth_tunnel_filter_conf { + struct ether_addr *outer_mac; /**< Outer MAC address fiter. */ + struct ether_addr *inner_mac; /**< Inner MAC address fiter. */ + uint16_t inner_vlan; /**< Inner VLAN fiter. */ + enum rte_tunnel_iptype ip_type; /**< IP address type. */ + union { + uint32_t ipv4_addr; /**< IPv4 source address to match. */ + uint32_t ipv6_addr[4]; /**< IPv6 source address to match. */ + } ip_addr; /**< IPv4/IPv6 source address to match (union of above). */ + + uint8_t filter_type; /**< Filter type. */ + uint8_t to_queue; /**< Use MAC and VLAN to point to a queue. */ + enum rte_eth_tunnel_type tunnel_type; /**< Tunnel Type. */ + uint32_t tenant_id; /** < Tenant number. */ + uint16_t queue_id; /** < queue number. */ +}; + +/** * UDP tunneling configuration. */ struct rte_eth_udp_tunnel { @@ -1251,6 +1293,11 @@ typedef int (*eth_set_vf_rate_limit_t)(struct rte_eth_dev *dev, uint64_t q_msk); /**< @internal Set VF TX rate */ +typedef int (*eth_tunnel_filter_set_t)(struct rte_eth_dev *dev, + struct rte_eth_tunnel_filter_conf *tunnel_filter, + uint8_t filter_count, uint8_t add); +/**< @internal Set tunnel filter */ + typedef int (*eth_mirror_rule_set_t)(struct rte_eth_dev *dev, struct rte_eth_vmdq_mirror_conf *mirror_conf, uint8_t rule_id, @@ -1446,6 +1493,7 @@ struct eth_dev_ops { eth_set_vf_vlan_filter_t set_vf_vlan_filter; /**< Set VF VLAN filter */ eth_udp_tunnel_add_t udp_tunnel_add; eth_udp_tunnel_del_t udp_tunnel_del; + eth_tunnel_filter_set_t tunnel_filter_set; eth_set_queue_rate_limit_t set_queue_rate_limit; /**< Set queue rate limit */ eth_set_vf_rate_limit_t set_vf_rate_limit; /**< Set VF rate limit */ @@ -3344,6 +3392,30 @@ rte_eth_dev_udp_tunnel_delete(uint8_t port_id, struct rte_eth_udp_tunnel *tunnel_udp, uint8_t count); + /** + * Add tunnel filter configuration of Ethernet device + * + * @param port_id + * The port identifier of the Ethernet device. + * @param tunnel_filter + * Where to store the current Tunneling UDP configuration + * of the Ethernet device. + * @param filter_count + * How many filters are going to added. + * @param add + * 0: remove tunnel filter + * 1: add tunnel filter + * + * @return + * - (0) if successful. + * - (-ENODEV) if port identifier is invalid. + * - (-EINVAL) if bad parameter. + * - (-ENOTSUP) if hardware doesn't support tunnel type. + */ +int +rte_eth_dev_tunnel_filter_set(uint8_t port_id, + struct rte_eth_tunnel_filter_conf *tunnel_filter, + uint8_t filter_count, uint8_t add); /** * add syn filter * -- 1.7.7.6