net/i40e: fix crash in AVX512

[dpdk.git] / drivers / net / enic / enic_rxtx_vec_avx2.c

diff --git a/drivers/net/enic/enic_rxtx_vec_avx2.c b/drivers/net/enic/enic_rxtx_vec_avx2.c
index 517d409..1848f52 100644 (file)
--- a/drivers/net/enic/enic_rxtx_vec_avx2.c
+++ b/drivers/net/enic/enic_rxtx_vec_avx2.c
@@ -4,7 +4,8 @@
  */
 
 #include <rte_mbuf.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
+#include <rte_vect.h>
 
 #include "enic_compat.h"
 #include "rq_enet_desc.h"
@@ -806,25 +807,21 @@ enic_noscatter_vec_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
 }
 
 bool
-enic_use_vector_rx_handler(struct enic *enic)
+enic_use_vector_rx_handler(struct rte_eth_dev *eth_dev)
 {
-       struct rte_eth_dev *eth_dev;
-       struct rte_fdir_conf *fconf;
+       struct enic *enic = pmd_priv(eth_dev);
 
-       eth_dev = enic->rte_dev;
        /* User needs to request for the avx2 handler */
        if (!enic->enable_avx2_rx)
                return false;
        /* Do not support scatter Rx */
        if (!(enic->rq_count > 0 && enic->rq[0].data_queue_enable == 0))
                return false;
-       /* Do not support fdir/flow */
-       fconf = &eth_dev->data->dev_conf.fdir_conf;
-       if (fconf->mode != RTE_FDIR_MODE_NONE)
-               return false;
-       if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) {
+       if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) &&
+                       rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256) {
                ENICPMD_LOG(DEBUG, " use the non-scatter avx2 Rx handler");
                eth_dev->rx_pkt_burst = &enic_noscatter_vec_recv_pkts;
+               enic->use_noscatter_vec_rx_handler = 1;
                return true;
        }
        return false;