From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 9270B6787 for ; Thu, 31 Dec 2015 14:53:36 +0100 (CET) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP; 31 Dec 2015 05:53:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,503,1444719600"; d="scan'208";a="21744894" Received: from dpdk06.sh.intel.com ([10.239.128.225]) by fmsmga004.fm.intel.com with ESMTP; 31 Dec 2015 05:53:33 -0800 From: Jianfeng Tan To: dev@dpdk.org Date: Thu, 31 Dec 2015 14:53:08 +0800 Message-Id: <1451544799-70776-2-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451544799-70776-1-git-send-email-jianfeng.tan@intel.com> References: <1451544799-70776-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH 01/12] ethdev: add API to query what/if packet type is set 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: Thu, 31 Dec 2015 13:53:39 -0000 Add a new API rte_eth_dev_get_ptype_info to query what/if packet type will be set by current rx burst function. Signed-off-by: Jianfeng Tan --- lib/librte_ether/rte_ethdev.c | 12 ++++++++++++ lib/librte_ether/rte_ethdev.h | 22 ++++++++++++++++++++++ lib/librte_mbuf/rte_mbuf.h | 13 +++++++++++++ 3 files changed, 47 insertions(+) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index ed971b4..1885374 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1614,6 +1614,18 @@ rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info) dev_info->driver_name = dev->data->drv_name; } +int +rte_eth_dev_get_ptype_info(uint8_t port_id, uint32_t ptype_mask, + uint32_t ptypes[]) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_ptype_info_get, -ENOTSUP); + return (*dev->dev_ops->dev_ptype_info_get)(dev, ptype_mask, ptypes); +} + void rte_eth_macaddr_get(uint8_t port_id, struct ether_addr *mac_addr) { diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h index bada8ad..e97b632 100644 --- a/lib/librte_ether/rte_ethdev.h +++ b/lib/librte_ether/rte_ethdev.h @@ -1021,6 +1021,10 @@ typedef void (*eth_dev_infos_get_t)(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info); /**< @internal Get specific informations of an Ethernet device. */ +typedef int (*eth_dev_ptype_info_get_t)(struct rte_eth_dev *dev, + uint32_t ptype_mask, uint32_t ptypes[]); +/**< @internal Get ptype info of eth_rx_burst_t. */ + typedef int (*eth_queue_start_t)(struct rte_eth_dev *dev, uint16_t queue_id); /**< @internal Start rx and tx of a queue of an Ethernet device. */ @@ -1347,6 +1351,7 @@ struct eth_dev_ops { eth_queue_stats_mapping_set_t queue_stats_mapping_set; /**< Configure per queue stat counter mapping. */ eth_dev_infos_get_t dev_infos_get; /**< Get device info. */ + eth_dev_ptype_info_get_t dev_ptype_info_get; /** Get ptype info */ mtu_set_t mtu_set; /**< Set MTU. */ vlan_filter_set_t vlan_filter_set; /**< Filter VLAN Setup. */ vlan_tpid_set_t vlan_tpid_set; /**< Outer VLAN TPID Setup. */ @@ -2273,6 +2278,23 @@ extern void rte_eth_dev_info_get(uint8_t port_id, struct rte_eth_dev_info *dev_info); /** + * Retrieve the contextual information of an Ethernet device. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param ptype_mask + * A hint of what kind of packet type which the caller is interested in + * @param ptypes + * An array of packet types to be filled with + * @return + * - (>=0) if successful. Indicate number of valid values in ptypes array. + * - (-ENOTSUP) if hardware-assisted VLAN stripping not configured. + * - (-ENODEV) if *port_id* invalid. + */ +extern int rte_eth_dev_get_ptype_info(uint8_t port_id, + uint32_t ptype_mask, uint32_t ptypes[]); + +/** * Retrieve the MTU of an Ethernet device. * * @param port_id diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h index f234ac9..21d4aa2 100644 --- a/lib/librte_mbuf/rte_mbuf.h +++ b/lib/librte_mbuf/rte_mbuf.h @@ -282,6 +282,8 @@ extern "C" { * It is used for outer packet for tunneling cases. */ #define RTE_PTYPE_L2_MASK 0x0000000f + +#define RTE_PTYPE_L2_MAX_NUM 4 /** * IP (Internet Protocol) version 4 packet type. * It is used for outer packet for tunneling cases, and does not contain any @@ -349,6 +351,8 @@ extern "C" { * It is used for outer packet for tunneling cases. */ #define RTE_PTYPE_L3_MASK 0x000000f0 + +#define RTE_PTYPE_L3_MAX_NUM 6 /** * TCP (Transmission Control Protocol) packet type. * It is used for outer packet for tunneling cases. @@ -435,6 +439,8 @@ extern "C" { * It is used for outer packet for tunneling cases. */ #define RTE_PTYPE_L4_MASK 0x00000f00 + +#define RTE_PTYPE_L4_MAX_NUM 6 /** * IP (Internet Protocol) in IP (Internet Protocol) tunneling packet type. * @@ -508,6 +514,8 @@ extern "C" { * Mask of tunneling packet types. */ #define RTE_PTYPE_TUNNEL_MASK 0x0000f000 + +#define RTE_PTYPE_TUNNEL_MAX_NUM 6 /** * Ethernet packet type. * It is used for inner packet type only. @@ -527,6 +535,8 @@ extern "C" { * Mask of inner layer 2 packet types. */ #define RTE_PTYPE_INNER_L2_MASK 0x000f0000 + +#define RTE_PTYPE_INNER_L2_MAX_NUM 2 /** * IP (Internet Protocol) version 4 packet type. * It is used for inner packet only, and does not contain any header option. @@ -588,6 +598,8 @@ extern "C" { * Mask of inner layer 3 packet types. */ #define RTE_PTYPE_INNER_L3_MASK 0x00f00000 + +#define RTE_PTYPE_INNER_L3_MAX_NUM 6 /** * TCP (Transmission Control Protocol) packet type. * It is used for inner packet only. @@ -666,6 +678,7 @@ extern "C" { */ #define RTE_PTYPE_INNER_L4_MASK 0x0f000000 +#define RTE_PTYPE_INNER_L4_MAX_NUM 6 /** * Check if the (outer) L3 header is IPv4. To avoid comparing IPv4 types one by * one, bit 4 is selected to be used for IPv4 only. Then checking bit 4 can -- 2.1.4