Skip to contentSkip to conversation

net/igc: decouple dependency from superseded structures

RFC New Chenxu Di 1 participant 3 messages Sep 29, 2020 Network drivers

lore
Share & tools
lore

Chenxu Di

author
#0 lore raw

RFC 2/5 net/igc: decouple dependency from superseded structures

From: Junyu Jiang <[email protected]>

The legacy filter API will be removed, the associated rte_eth_ctrl.h will also be removed. This patch replaces these superseded structures by the PMD internal structures.

---
 drivers/net/igc/igc_filter.c | 2 +-
 drivers/net/igc/igc_filter.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/net/igc/igc_filter.c +1 -1
index 836621d4c..7b6f52a4c 100644
@@ -216,7 +216,7 @@ igc_enable_tuple_filter(struct rte_eth_dev *dev,
 		ttqf &= ~IGC_TTQF_MASK_ENABLE;
 
 	/* TCP flags bits setting. */
-	if (info->tcp_flags & RTE_NTUPLE_TCP_FLAGS_MASK) {
+	if (info->tcp_flags & IGC_NTUPLE_TCP_FLAGS_MASK) {
 		if (info->tcp_flags & RTE_TCP_URG_FLAG)
 			imir_ext |= IGC_IMIREXT_CTRL_URG;
 		if (info->tcp_flags & RTE_TCP_ACK_FLAG)
drivers/net/igc/igc_filter.h +2 -0
index 79951504f..34bc0a7e3 100644
@@ -16,6 +16,8 @@
 extern "C" {
 #endif
 
+#define IGC_NTUPLE_TCP_FLAGS_MASK 0x3F /**< TCP flags filter can match. */
+
 int igc_add_ethertype_filter(struct rte_eth_dev *dev,
 		const struct igc_ethertype_filter *filter);
 int igc_del_ethertype_filter(struct rte_eth_dev *dev,
Signature · 1 line
2.17.1
author
#1 lore raw

RFC 3/5 net/e1000: decouple dependency from superseded structures

The legacy filter API will be removed, the associated rte_eth_ctrl.h will also be removed. This patch replaces these superseded structures by the PMD internal structures. The macros RTE_ETH_FILTER_GENERIC and RTE_ETH_FILTER_GET are not replaced, they are needed to follow librte to change.

---
 drivers/net/e1000/e1000_ethdev.h | 113 ++++++++++++++++--
 drivers/net/e1000/igb_ethdev.c   |  80 ++++++-------
 drivers/net/e1000/igb_flow.c     | 199 ++++++++++++++++---------------
 3 files changed, 245 insertions(+), 147 deletions(-)
drivers/net/e1000/e1000_ethdev.h +104 -9
index 1e41ae9de..3c30b9ebe 100644
@@ -237,6 +237,88 @@ struct e1000_2tuple_filter {
 	uint16_t queue;       /* rx queue assigned to */
 };
 
+/* Define all structures for ntuple Filter type. */
+
+#define IGB_NTUPLE_FLAGS_DST_IP   0x0001 /* If set, dst_ip is part of ntuple */
+#define IGB_NTUPLE_FLAGS_SRC_IP   0x0002 /* If set, src_ip is part of ntuple */
+#define IGB_NTUPLE_FLAGS_DST_PORT 0x0004 /* If set, dstport is part of ntuple */
+#define IGB_NTUPLE_FLAGS_SRC_PORT 0x0008 /* If set, srcport is part of ntuple */
+#define IGB_NTUPLE_FLAGS_PROTO    0x0010 /* If set, proto is part of ntuple */
+#define IGB_NTUPLE_FLAGS_TCP_FLAG 0x0020 /* If set, tcp flag is involved */
+
+#define IGB_5TUPLE_FLAGS ( \
+		IGB_NTUPLE_FLAGS_DST_IP | \
+		IGB_NTUPLE_FLAGS_SRC_IP | \
+		IGB_NTUPLE_FLAGS_DST_PORT | \
+		IGB_NTUPLE_FLAGS_SRC_PORT | \
+		IGB_NTUPLE_FLAGS_PROTO)
+
+#define IGB_2TUPLE_FLAGS ( \
+		IGB_NTUPLE_FLAGS_DST_PORT | \
+		IGB_NTUPLE_FLAGS_PROTO)
+
+#define IGB_NTUPLE_TCP_FLAGS_MASK 0x3F /* TCP flags filter can match. */
+
+struct igb_flow_ntuple_filter {
+	uint16_t flags;          /* Flags from IGB_NTUPLE_FLAGS_* */
+	uint32_t dst_ip;         /* Destination IP address in big endian. */
+	uint32_t dst_ip_mask;    /* Mask of destination IP address. */
+	uint32_t src_ip;         /* Source IP address in big endian. */
+	uint32_t src_ip_mask;    /* Mask of destination IP address. */
+	uint16_t dst_port;       /* Destination port in big endian. */
+	uint16_t dst_port_mask;  /* Mask of destination port. */
+	uint16_t src_port;       /* Source Port in big endian. */
+	uint16_t src_port_mask;  /* Mask of source port. */
+	uint8_t proto;           /* L4 protocol. */
+	uint8_t proto_mask;      /* Mask of L4 protocol. */
+	/* tcp_flags only meaningful when the proto is TCP.
+	 * The packet matched above ntuple fields and contain
+	 * any set bit in tcp_flags will hit this filter.
+	 */
+	uint8_t tcp_flags;
+	/* seven levels (001b-111b), 111b is highest,
+	 * used when more than one filter matches.
+	 */
+	uint16_t priority;
+	uint16_t queue;          /* Queue assigned to when match*/
+};
+
+/* bytes to use in flex filter. */
+#define IGB_FLEX_FILTER_MAXLEN	128
+/* mask bytes in flex filter. */
+#define IGB_FLEX_FILTER_MASK_SIZE	\
+	(RTE_ALIGN(IGB_FLEX_FILTER_MAXLEN, CHAR_BIT) / CHAR_BIT)
+
+struct igb_flow_flex_filter {
+	uint16_t len;
+	uint8_t bytes[IGB_FLEX_FILTER_MAXLEN];  /* flex bytes in big endian.*/
+	/* if mask bit is 1b, do not compare corresponding byte. */
+	uint8_t mask[IGB_FLEX_FILTER_MASK_SIZE];
+	uint8_t priority;
+	uint16_t queue;		/* Queue assigned to when match. */
+};
+
+struct igb_flow_syn_filter {
+	/* 1 - higher priority than other filters, 0 - lower priority. */
+	uint8_t hig_pri;
+	/* Queue assigned to when match */
+	uint16_t queue;
+};
+
+/**
+ * Define all structures for Ethertype Filter type.
+ */
+
+#define IGB_ETHTYPE_FLAGS_MAC    0x0001 /* If set, compare mac */
+#define IGB_ETHTYPE_FLAGS_DROP   0x0002 /* If set, drop packet when match */
+
+struct igb_flow_ethertype_filter {
+	struct rte_ether_addr mac_addr;   /* Mac address to match. */
+	uint16_t ether_type;          /* Ether type to match */
+	uint16_t flags;               /* Flags from IGB_ETHTYPE_FLAGS_* */
+	uint16_t queue;               /* Queue assigned to when match */
+};
+
 /* ethertype filter structure */
 struct igb_ethertype_filter {
 	uint16_t ethertype;
@@ -308,33 +390,46 @@ struct e1000_adapter {
 #define E1000_DEV_PRIVATE_TO_FILTER_INFO(adapter) \
 	(&((struct e1000_adapter *)adapter)->filter)
 
+/**
+ * Feature filter types
+ */
+enum igb_filter_type {
+	IGB_FILTER_NONE = 0,
+	IGB_FILTER_ETHERTYPE,
+	IGB_FILTER_FLEXIBLE,
+	IGB_FILTER_SYN,
+	IGB_FILTER_NTUPLE,
+	IGB_FILTER_HASH,
+	IGB_FILTER_MAX
+};
+
 struct rte_flow {
-	enum rte_filter_type filter_type;
+	enum igb_filter_type filter_type;
 	void *rule;
 };
 
 /* ntuple filter list structure */
 struct igb_ntuple_filter_ele {
 	TAILQ_ENTRY(igb_ntuple_filter_ele) entries;
-	struct rte_eth_ntuple_filter filter_info;
+	struct igb_flow_ntuple_filter filter_info;
 };
 
 /* ethertype filter list structure */
 struct igb_ethertype_filter_ele {
 	TAILQ_ENTRY(igb_ethertype_filter_ele) entries;
-	struct rte_eth_ethertype_filter filter_info;
+	struct igb_flow_ethertype_filter filter_info;
 };
 
 /* syn filter list structure */
 struct igb_eth_syn_filter_ele {
 	TAILQ_ENTRY(igb_eth_syn_filter_ele) entries;
-	struct rte_eth_syn_filter filter_info;
+	struct igb_flow_syn_filter filter_info;
 };
 
 /* flex filter list structure */
 struct igb_flex_filter_ele {
 	TAILQ_ENTRY(igb_flex_filter_ele) entries;
-	struct rte_eth_flex_filter filter_info;
+	struct igb_flow_flex_filter filter_info;
 };
 
 /* rss filter  list structure */
@@ -507,15 +602,15 @@ void igb_remove_flex_filter(struct rte_eth_dev *dev,
 int igb_ethertype_filter_remove(struct e1000_filter_info *filter_info,
 	uint8_t idx);
 int igb_add_del_ntuple_filter(struct rte_eth_dev *dev,
-		struct rte_eth_ntuple_filter *ntuple_filter, bool add);
+		struct igb_flow_ntuple_filter *ntuple_filter, bool add);
 int igb_add_del_ethertype_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ethertype_filter *filter,
+			struct igb_flow_ethertype_filter *filter,
 			bool add);
 int eth_igb_syn_filter_set(struct rte_eth_dev *dev,
-			struct rte_eth_syn_filter *filter,
+			struct igb_flow_syn_filter *filter,
 			bool add);
 int eth_igb_add_del_flex_filter(struct rte_eth_dev *dev,
-			struct rte_eth_flex_filter *filter,
+			struct igb_flow_flex_filter *filter,
 			bool add);
 int igb_rss_conf_init(struct rte_eth_dev *dev,
 		      struct igb_rte_flow_rss_conf *out,
drivers/net/e1000/igb_ethdev.c +40 -40

275 lines not on this page · raw message

drivers/net/e1000/igb_flow.c +101 -98

693 lines not on this page · raw message

Signature · 1 line
2.17.1
author
#2 lore raw

RFC 4/5 net/ixgbe: decouple dependency from superseded structures

In reply to Chenxu Di

The legacy filter API will be removed, the associated rte_eth_ctrl.h will also be removed. This patch replaces these superseded structures by the PMD internal structures. The macros RTE_ETH_FILTER_GENERIC and RTE_ETH_FILTER_GET are not replaced, they are needed to follow librte to change. The "rte_eth_conf.fdir_conf" field will also be removed, but IXGBE generic flow still needs to depend on these configurations. So this patch also defines a private API to passthrough user's configurations.

---
 drivers/net/ixgbe/ixgbe_ethdev.c            |  79 +++----
 drivers/net/ixgbe/ixgbe_ethdev.h            | 217 +++++++++++++++++-
 drivers/net/ixgbe/ixgbe_fdir.c              | 143 ++++++------
 drivers/net/ixgbe/ixgbe_flow.c              | 235 ++++++++++----------
 drivers/net/ixgbe/ixgbe_rxtx_vec_common.h   |   4 +-
 drivers/net/ixgbe/rte_pmd_ixgbe.c           |  72 ++++++
 drivers/net/ixgbe/rte_pmd_ixgbe.h           | 172 ++++++++++++++
 drivers/net/ixgbe/rte_pmd_ixgbe_version.map |   1 +
 8 files changed, 692 insertions(+), 231 deletions(-)
drivers/net/ixgbe/ixgbe_ethdev.c +41 -38
index 0f065bbc0..977900c8f 100644
@@ -301,7 +301,7 @@ static void ixgbevf_remove_mac_addr(struct rte_eth_dev *dev, uint32_t index);
 static int ixgbevf_set_default_mac_addr(struct rte_eth_dev *dev,
 					     struct rte_ether_addr *mac_addr);
 static int ixgbe_syn_filter_get(struct rte_eth_dev *dev,
-			struct rte_eth_syn_filter *filter);
+			struct ixgbe_syn_filter *filter);
 static int ixgbe_syn_filter_handle(struct rte_eth_dev *dev,
 			enum rte_filter_op filter_op,
 			void *arg);
@@ -313,12 +313,12 @@ static int ixgbe_ntuple_filter_handle(struct rte_eth_dev *dev,
 				enum rte_filter_op filter_op,
 				void *arg);
 static int ixgbe_get_ntuple_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ntuple_filter *filter);
+			struct ixgbe_ntuple_filter *filter);
 static int ixgbe_ethertype_filter_handle(struct rte_eth_dev *dev,
 				enum rte_filter_op filter_op,
 				void *arg);
 static int ixgbe_get_ethertype_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ethertype_filter *filter);
+			struct ixgbe_flow_ethertype_filter *filter);
 static int ixgbe_dev_filter_ctrl(struct rte_eth_dev *dev,
 		     enum rte_filter_type filter_type,
 		     enum rte_filter_op filter_op,
@@ -2571,6 +2571,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 		*IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 	struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
+	struct ixgbe_adapter *adapter = dev->data->dev_private;
 	uint32_t intr_vector = 0;
 	int err;
 	bool link_up = false, negotiate = 0;
@@ -2665,7 +2666,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 	/* Configure DCB hw */
 	ixgbe_configure_dcb(dev);
 
-	if (dev->data->dev_conf.fdir_conf.mode != RTE_FDIR_MODE_NONE) {
+	if (adapter->fdir_conf.mode != IXGBE_FDIR_MODE_NONE) {
 		err = ixgbe_fdir_configure(dev);
 		if (err)
 			goto error;
@@ -6368,7 +6369,7 @@ ixgbevf_set_default_mac_addr(struct rte_eth_dev *dev,
 
 int
 ixgbe_syn_filter_set(struct rte_eth_dev *dev,
-			struct rte_eth_syn_filter *filter,
+			struct ixgbe_syn_filter *filter,
 			bool add)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -6407,7 +6408,7 @@ ixgbe_syn_filter_set(struct rte_eth_dev *dev,
 
 static int
 ixgbe_syn_filter_get(struct rte_eth_dev *dev,
-			struct rte_eth_syn_filter *filter)
+			struct ixgbe_syn_filter *filter)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	uint32_t synqf = IXGBE_READ_REG(hw, IXGBE_SYNQF);
@@ -6442,17 +6443,17 @@ ixgbe_syn_filter_handle(struct rte_eth_dev *dev,
 	switch (filter_op) {
 	case RTE_ETH_FILTER_ADD:
 		ret = ixgbe_syn_filter_set(dev,
-				(struct rte_eth_syn_filter *)arg,
+				(struct ixgbe_syn_filter *)arg,
 				TRUE);
 		break;
 	case RTE_ETH_FILTER_DELETE:
 		ret = ixgbe_syn_filter_set(dev,
-				(struct rte_eth_syn_filter *)arg,
+				(struct ixgbe_syn_filter *)arg,
 				FALSE);
 		break;
 	case RTE_ETH_FILTER_GET:
 		ret = ixgbe_syn_filter_get(dev,
-				(struct rte_eth_syn_filter *)arg);
+				(struct ixgbe_syn_filter *)arg);
 		break;
 	default:
 		PMD_DRV_LOG(ERR, "unsupported operation %u", filter_op);
@@ -6652,9 +6653,11 @@ ixgbe_5tuple_filter_lookup(struct ixgbe_5tuple_filter_list *filter_list,
 	return NULL;
 }
 
-/* translate elements in struct rte_eth_ntuple_filter to struct ixgbe_5tuple_filter_info*/
+/* translate elements in struct ixgbe_ntuple_filter to
+ * struct ixgbe_5tuple_filter_info
+ */
 static inline int
-ntuple_filter_to_5tuple(struct rte_eth_ntuple_filter *filter,
+ntuple_filter_to_5tuple(struct ixgbe_ntuple_filter *filter,
 			struct ixgbe_5tuple_filter_info *filter_info)
 {
 	if (filter->queue >= IXGBE_MAX_RX_QUEUE_NUM ||
@@ -6737,7 +6740,7 @@ ntuple_filter_to_5tuple(struct rte_eth_ntuple_filter *filter,
  *
  * @param
  * dev: Pointer to struct rte_eth_dev.
- * ntuple_filter: Pointer to struct rte_eth_ntuple_filter
+ * ntuple_filter: Pointer to struct ixgbe_ntuple_filter
  * add: if true, add filter, if false, remove filter
  *
  * @return
@@ -6746,7 +6749,7 @@ ntuple_filter_to_5tuple(struct rte_eth_ntuple_filter *filter,
  */
 int
 ixgbe_add_del_ntuple_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ntuple_filter *ntuple_filter,
+			struct ixgbe_ntuple_filter *ntuple_filter,
 			bool add)
 {
 	struct ixgbe_filter_info *filter_info =
@@ -6755,7 +6758,7 @@ ixgbe_add_del_ntuple_filter(struct rte_eth_dev *dev,
 	struct ixgbe_5tuple_filter *filter;
 	int ret;
 
-	if (ntuple_filter->flags != RTE_5TUPLE_FLAGS) {
+	if (ntuple_filter->flags != IXGBE_5TUPLE_FLAGS) {
 		PMD_DRV_LOG(ERR, "only 5tuple is supported.");
 		return -EINVAL;
 	}
@@ -6809,7 +6812,7 @@ ixgbe_add_del_ntuple_filter(struct rte_eth_dev *dev,
  */
 static int
 ixgbe_get_ntuple_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ntuple_filter *ntuple_filter)
+			struct ixgbe_ntuple_filter *ntuple_filter)
 {
 	struct ixgbe_filter_info *filter_info =
 		IXGBE_DEV_PRIVATE_TO_FILTER_INFO(dev->data->dev_private);
@@ -6869,17 +6872,17 @@ ixgbe_ntuple_filter_handle(struct rte_eth_dev *dev,
 	switch (filter_op) {
 	case RTE_ETH_FILTER_ADD:
 		ret = ixgbe_add_del_ntuple_filter(dev,
-			(struct rte_eth_ntuple_filter *)arg,
+			(struct ixgbe_ntuple_filter *)arg,
 			TRUE);
 		break;
 	case RTE_ETH_FILTER_DELETE:
 		ret = ixgbe_add_del_ntuple_filter(dev,
-			(struct rte_eth_ntuple_filter *)arg,
+			(struct ixgbe_ntuple_filter *)arg,
 			FALSE);
 		break;
 	case RTE_ETH_FILTER_GET:
 		ret = ixgbe_get_ntuple_filter(dev,
-			(struct rte_eth_ntuple_filter *)arg);
+			(struct ixgbe_ntuple_filter *)arg);
 		break;
 	default:
 		PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
@@ -6891,7 +6894,7 @@ ixgbe_ntuple_filter_handle(struct rte_eth_dev *dev,
 
 int
 ixgbe_add_del_ethertype_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ethertype_filter *filter,
+			struct ixgbe_flow_ethertype_filter *filter,
 			bool add)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -6912,11 +6915,11 @@ ixgbe_add_del_ethertype_filter(struct rte_eth_dev *dev,
 		return -EINVAL;
 	}
 
-	if (filter->flags & RTE_ETHTYPE_FLAGS_MAC) {
+	if (filter->flags & IXGBE_ETHTYPE_FLAGS_MAC) {
 		PMD_DRV_LOG(ERR, "mac compare is unsupported.");
 		return -EINVAL;
 	}
-	if (filter->flags & RTE_ETHTYPE_FLAGS_DROP) {
+	if (filter->flags & IXGBE_ETHTYPE_FLAGS_DROP) {
 		PMD_DRV_LOG(ERR, "drop option is unsupported.");
 		return -EINVAL;
 	}
@@ -6965,7 +6968,7 @@ ixgbe_add_del_ethertype_filter(struct rte_eth_dev *dev,
 
 static int
 ixgbe_get_ethertype_filter(struct rte_eth_dev *dev,
-			struct rte_eth_ethertype_filter *filter)
+			struct ixgbe_flow_ethertype_filter *filter)
 {
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct ixgbe_filter_info *filter_info =
@@ -7020,17 +7023,17 @@ ixgbe_ethertype_filter_handle(struct rte_eth_dev *dev,
 	switch (filter_op) {
 	case RTE_ETH_FILTER_ADD:
 		ret = ixgbe_add_del_ethertype_filter(dev,
-			(struct rte_eth_ethertype_filter *)arg,
+			(struct ixgbe_flow_ethertype_filter *)arg,
 			TRUE);
 		break;
 	case RTE_ETH_FILTER_DELETE:
 		ret = ixgbe_add_del_ethertype_filter(dev,
-			(struct rte_eth_ethertype_filter *)arg,
+			(struct ixgbe_flow_ethertype_filter *)arg,
 			FALSE);
 		break;
 	case RTE_ETH_FILTER_GET:
 		ret = ixgbe_get_ethertype_filter(dev,
-			(struct rte_eth_ethertype_filter *)arg);
+			(struct ixgbe_flow_ethertype_filter *)arg);
 		break;
 	default:
 		PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
@@ -7912,7 +7915,7 @@ ixgbe_dev_l2_tunnel_disable(struct rte_eth_dev *dev,
 
 static int
 ixgbe_e_tag_filter_del(struct rte_eth_dev *dev,
-		       struct rte_eth_l2_tunnel_conf *l2_tunnel)
+		       struct ixgbe_l2_tunnel_cfg *l2_tunnel)
 {
 	int ret = 0;
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -7948,7 +7951,7 @@ ixgbe_e_tag_filter_del(struct rte_eth_dev *dev,
 
 static int
 ixgbe_e_tag_filter_add(struct rte_eth_dev *dev,
-		       struct rte_eth_l2_tunnel_conf *l2_tunnel)
+		       struct ixgbe_l2_tunnel_cfg *l2_tunnel)
 {
 	int ret = 0;
 	struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -8052,7 +8055,7 @@ ixgbe_remove_l2_tn_filter(struct ixgbe_l2_tn_info *l2_tn_info,
 /* Add l2 tunnel filter */
 int
 ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
-			       struct rte_eth_l2_tunnel_conf *l2_tunnel,
+			       struct ixgbe_l2_tunnel_cfg *l2_tunnel,
 			       bool restore)
 {
 	int ret;
@@ -8109,7 +8112,7 @@ ixgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
 /* Delete l2 tunnel filter */
 int
 ixgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,
-			       struct rte_eth_l2_tunnel_conf *l2_tunnel)
+			       struct ixgbe_l2_tunnel_cfg *l2_tunnel)
 {
 	int ret;
 	struct ixgbe_l2_tn_info *l2_tn_info =
@@ -8161,13 +8164,13 @@ ixgbe_dev_l2_tunnel_filter_handle(struct rte_eth_dev *dev,
 	case RTE_ETH_FILTER_ADD:
 		ret = ixgbe_dev_l2_tunnel_filter_add
 			(dev,
-			 (struct rte_eth_l2_tunnel_conf *)arg,
+			 (struct ixgbe_l2_tunnel_cfg *)arg,
 			 FALSE);
 		break;
 	case RTE_ETH_FILTER_DELETE:
 		ret = ixgbe_dev_l2_tunnel_filter_del
 			(dev,
-			 (struct rte_eth_l2_tunnel_conf *)arg);
+			 (struct ixgbe_l2_tunnel_cfg *)arg);
 		break;
 	default:
 		PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
@@ -8249,7 +8252,7 @@ ixgbe_dev_l2_tunnel_forwarding_disable
 
 static int
 ixgbe_e_tag_insertion_en_dis(struct rte_eth_dev *dev,
-			     struct rte_eth_l2_tunnel_conf *l2_tunnel,
+			     struct ixgbe_l2_tunnel_cfg *l2_tunnel,
 			     bool en)
 {
 	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
@@ -8290,7 +8293,7 @@ ixgbe_e_tag_insertion_en_dis(struct rte_eth_dev *dev,
 /* Enable l2 tunnel tag insertion */
 static int
 ixgbe_dev_l2_tunnel_insertion_enable(struct rte_eth_dev *dev,
-				     struct rte_eth_l2_tunnel_conf *l2_tunnel)
+				     struct ixgbe_l2_tunnel_cfg *l2_tunnel)
 {
 	int ret = 0;
 
@@ -8311,7 +8314,7 @@ ixgbe_dev_l2_tunnel_insertion_enable(struct rte_eth_dev *dev,
 static int
 ixgbe_dev_l2_tunnel_insertion_disable
 	(struct rte_eth_dev *dev,
-	 struct rte_eth_l2_tunnel_conf *l2_tunnel)
+	 struct ixgbe_l2_tunnel_cfg *l2_tunnel)
 {
 	int ret = 0;
 
@@ -8425,11 +8428,11 @@ ixgbe_dev_l2_tunnel_offload_set
 		if (en)
 			ret = ixgbe_dev_l2_tunnel_insertion_enable(
 				dev,
-				l2_tunnel);
+				(struct ixgbe_l2_tunnel_cfg *)l2_tunnel);
 		else
 			ret = ixgbe_dev_l2_tunnel_insertion_disable(
 				dev,
-				l2_tunnel);
+				(struct ixgbe_l2_tunnel_cfg *)l2_tunnel);
 	}
 
 	if (mask & ETH_L2_TUNNEL_STRIPPING_MASK) {
@@ -8831,7 +8834,7 @@ ixgbe_l2_tn_filter_restore(struct rte_eth_dev *dev)
 	struct ixgbe_l2_tn_info *l2_tn_info =
 		IXGBE_DEV_PRIVATE_TO_L2_TN_INFO(dev->data->dev_private);
 	struct ixgbe_l2_tn_filter *node;
-	struct rte_eth_l2_tunnel_conf l2_tn_conf;
+	struct ixgbe_l2_tunnel_cfg l2_tn_conf;
 
 	TAILQ_FOREACH(node, &l2_tn_info->l2_tn_list, entries) {
 		l2_tn_conf.l2_tunnel_type = node->key.l2_tn_type;
@@ -8938,7 +8941,7 @@ ixgbe_clear_all_l2_tn_filter(struct rte_eth_dev *dev)
 	struct ixgbe_l2_tn_info *l2_tn_info =
 		IXGBE_DEV_PRIVATE_TO_L2_TN_INFO(dev->data->dev_private);
 	struct ixgbe_l2_tn_filter *l2_tn_filter;
-	struct rte_eth_l2_tunnel_conf l2_tn_conf;
+	struct ixgbe_l2_tunnel_cfg l2_tn_conf;
 	int ret = 0;
 
 	while ((l2_tn_filter = TAILQ_FIRST(&l2_tn_info->l2_tn_list))) {
drivers/net/ixgbe/ixgbe_ethdev.h +210 -7

258 lines not on this page · raw message

drivers/net/ixgbe/ixgbe_fdir.c +75 -68

414 lines not on this page · raw message

drivers/net/ixgbe/ixgbe_flow.c +119 -116

796 lines not on this page · raw message

drivers/net/ixgbe/ixgbe_rxtx_vec_common.h +2 -2
index a97c27189..e6713a728 100644
@@ -278,10 +278,10 @@ static inline int
 ixgbe_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev)
 {
 #ifndef RTE_LIBRTE_IEEE1588
-	struct rte_fdir_conf *fconf = &dev->data->dev_conf.fdir_conf;
+	struct ixgbe_adapter *adapter = dev->data->dev_private;
 
 	/* no fdir support */
-	if (fconf->mode != RTE_FDIR_MODE_NONE)
+	if (adapter->fdir_conf.mode != IXGBE_FDIR_MODE_NONE)
 		return -1;
 
 	return 0;
drivers/net/ixgbe/rte_pmd_ixgbe.c +72 -0

75 lines not on this page · raw message

drivers/net/ixgbe/rte_pmd_ixgbe.h +172 -0

182 lines not on this page · raw message

drivers/net/ixgbe/rte_pmd_ixgbe_version.map +1 -0
index 9402802b0..80bd47121 100644
@@ -45,4 +45,5 @@ EXPERIMENTAL {
 	rte_pmd_ixgbe_mdio_unlocked_read;
 	rte_pmd_ixgbe_mdio_unlocked_write;
 	rte_pmd_ixgbe_upd_fctrl_sbp;
+	rte_pmd_ixgbe_update_fdir_conf;
 };
Signature · 1 line
2.17.1