Changes to our files to make dpdk1702 work

Signed-off-by: Ido Barnea <ibarnea@cisco.com>

2 files changed, 47 insertions, 1 deletions

diff --git a/src/dpdk/drivers/net/enic/enic_clsf.c b/src/dpdk/drivers/net/enic/enic_clsf.c
index bcf479ac..6129d709 100644
--- a/src/dpdk/drivers/net/enic/enic_clsf.c
+++ b/src/dpdk/drivers/net/enic/enic_clsf.c
@@ -132,6 +132,28 @@ copy_fltr_v1(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
 	fltr->u.ipv4.flags = FILTER_FIELDS_IPV4_5TUPLE;
 }
 
+#define TREX_PATCH
+#ifdef TREX_PATCH
+void
+copy_fltr_recv_all(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
+             struct rte_eth_fdir_masks *masks) {
+	struct filter_generic_1 *gp = &fltr->u.generic_1;
+	memset(gp, 0, sizeof(*gp));
+
+    struct ether_hdr eth_mask, eth_val;
+    memset(&eth_mask, 0, sizeof(eth_mask));
+    memset(&eth_val, 0, sizeof(eth_val));
+
+    eth_val.ether_type = 0xdead;
+    eth_mask.ether_type = 0;
+
+    gp->position = 0;
+    enic_set_layer(gp, 0, FILTER_GENERIC_1_L2,
+			       &eth_mask, &eth_val, sizeof(struct ether_hdr));
+
+}
+#endif
+
 /* Copy Flow Director filter to a VIC generic filter (requires advanced
  * filter support.
  */
@@ -144,6 +166,11 @@ copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
 
 	fltr->type = FILTER_DPDK_1;
 	memset(gp, 0, sizeof(*gp));
+#ifdef TREX_PATCH
+    // important for this to be below 2.
+    // If added with position 2, IPv6 UDP and ICMP seems to be caught by some other rule
+    gp->position = 1;
+#endif
 
 	if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_UDP) {
 		struct udp_hdr udp_mask, udp_val;
@@ -338,7 +365,11 @@ int enic_fdir_del_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
 	case -EINVAL:
 	case -ENOENT:
 		enic->fdir.stats.f_remove++;
+#ifdef TREX_PATCH
+		return pos;
+#else
 		return -EINVAL;
+#endif
 	default:
 		/* The entry is present in the table */
 		key = enic->fdir.nodes[pos];
@@ -449,8 +480,19 @@ int enic_fdir_add_fltr(struct enic *enic, struct rte_eth_fdir_filter *params)
 	key->filter = *params;
 	key->rq_index = queue;
 
+#ifdef TREX_PATCH
+    switch (params->soft_id) {
+    case 100:
+        copy_fltr_recv_all(&fltr, &params->input, &enic->rte_dev->data->dev_conf.fdir_conf.mask);
+        break;
+    default:
+#endif
+
 	enic->fdir.copy_fltr_fn(&fltr, &params->input,
 				&enic->rte_dev->data->dev_conf.fdir_conf.mask);
+#ifdef TREX_PATCH
+    }
+#endif
 
 	if (!vnic_dev_classifier(enic->vdev, CLSF_ADD, &queue, &fltr)) {
 		key->fltr_id = queue;
diff --git a/src/dpdk/drivers/net/enic/enic_main.c b/src/dpdk/drivers/net/enic/enic_main.c
index aece2f05..54a3a896 100644
--- a/src/dpdk/drivers/net/enic/enic_main.c
+++ b/src/dpdk/drivers/net/enic/enic_main.c
@@ -175,11 +175,15 @@ void enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats)
 	 */
 	rx_packet_errors = rte_atomic64_read(&soft_stats->rx_packet_errors);
 	rx_truncated = rx_packet_errors - stats->rx.rx_errors;
+#define TREX_PATCH
+#ifdef TREX_PATCH
+    // This used to be in older DPDK version, and seems to be needed. Was removed for some reason in dpdk1702.
+		rx_truncated -= stats->rx.rx_no_bufs;
+#endif
 
 	r_stats->ipackets = stats->rx.rx_frames_ok - rx_truncated;
 	r_stats->opackets = stats->tx.tx_frames_ok;
 
-#define TREX_PATCH
 #ifdef TREX_PATCH
     r_stats->ibytes = stats->rx.rx_unicast_bytes_ok+stats->rx.rx_multicast_bytes_ok+stats->rx.rx_broadcast_bytes_ok;
 #else