net/ice: add flow mark hint

[dpdk.git] / drivers / net / ice / ice_fdir_filter.c

diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c
index dd0e1b0..9e251ce 100644 (file)
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -1,3 +1,7 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019 Intel Corporation
+ */
+
 #include <stdio.h>
 #include <rte_flow.h>
 #include <rte_hash.h>
@@ -487,6 +491,11 @@ ice_fdir_setup(struct ice_pf *pf)
                goto fail_mem;
        }
 
+       /* Enable FDIR MSIX interrupt */
+       vsi->nb_used_qps = 1;
+       ice_vsi_queues_bind_intr(vsi);
+       ice_vsi_enable_queues_intr(vsi);
+
        /* reserve memory for the fdir programming packet */
        snprintf(z_name, sizeof(z_name), "ICE_%s_%d",
                 ICE_FDIR_MZ_NAME,
@@ -611,6 +620,8 @@ ice_fdir_teardown(struct ice_pf *pf)
        if (!vsi)
                return;
 
+       ice_vsi_disable_queues_intr(vsi);
+
        err = ice_fdir_tx_queue_stop(eth_dev, pf->fdir.txq->queue_id);
        if (err)
                PMD_DRV_LOG(ERR, "Failed to stop TX queue.");
@@ -1555,6 +1566,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                        tcp_spec = item->spec;
                        tcp_mask = item->mask;
 
+                       if (l3 == RTE_FLOW_ITEM_TYPE_IPV4)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV4_TCP;
+                       else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV6_TCP;
+
                        if (tcp_spec && tcp_mask) {
                                /* Check TCP mask and update input set */
                                if (tcp_mask->hdr.sent_seq ||
@@ -1586,15 +1602,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                                                tcp_spec->hdr.src_port;
                                        filter->input.ip.v4.src_port =
                                                tcp_spec->hdr.dst_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV4_TCP;
                                } else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) {
                                        filter->input.ip.v6.dst_port =
                                                tcp_spec->hdr.src_port;
                                        filter->input.ip.v6.src_port =
                                                tcp_spec->hdr.dst_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV6_TCP;
                                }
                        }
                        break;
@@ -1602,6 +1614,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                        udp_spec = item->spec;
                        udp_mask = item->mask;
 
+                       if (l3 == RTE_FLOW_ITEM_TYPE_IPV4)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV4_UDP;
+                       else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV6_UDP;
+
                        if (udp_spec && udp_mask) {
                                /* Check UDP mask and update input set*/
                                if (udp_mask->hdr.dgram_len ||
@@ -1628,15 +1645,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                                                udp_spec->hdr.src_port;
                                        filter->input.ip.v4.src_port =
                                                udp_spec->hdr.dst_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV4_UDP;
                                } else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) {
                                        filter->input.ip.v6.src_port =
                                                udp_spec->hdr.dst_port;
                                        filter->input.ip.v6.dst_port =
                                                udp_spec->hdr.src_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV6_UDP;
                                }
                        }
                        break;
@@ -1644,6 +1657,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                        sctp_spec = item->spec;
                        sctp_mask = item->mask;
 
+                       if (l3 == RTE_FLOW_ITEM_TYPE_IPV4)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV4_SCTP;
+                       else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6)
+                               flow_type = ICE_FLTR_PTYPE_NONF_IPV6_SCTP;
+
                        if (sctp_spec && sctp_mask) {
                                /* Check SCTP mask and update input set */
                                if (sctp_mask->hdr.cksum) {
@@ -1669,15 +1687,11 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad,
                                                sctp_spec->hdr.src_port;
                                        filter->input.ip.v4.src_port =
                                                sctp_spec->hdr.dst_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV4_SCTP;
                                } else if (l3 == RTE_FLOW_ITEM_TYPE_IPV6) {
                                        filter->input.ip.v6.dst_port =
                                                sctp_spec->hdr.src_port;
                                        filter->input.ip.v6.src_port =
                                                sctp_spec->hdr.dst_port;
-                                       flow_type =
-                                               ICE_FLTR_PTYPE_NONF_IPV6_SCTP;
                                }
                        }
                        break;