net/ice/base: fix null pointer dereferences for parser

[dpdk.git] / drivers / net / bnx2x / bnx2x_ethdev.c

diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c
index 07168e9..8b08060 100644 (file)
--- a/drivers/net/bnx2x/bnx2x_ethdev.c
+++ b/drivers/net/bnx2x/bnx2x_ethdev.c
@@ -10,16 +10,14 @@
 
 #include <rte_string_fns.h>
 #include <rte_dev.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_pci.h>
 #include <rte_alarm.h>
 
-int bnx2x_logtype_init;
-int bnx2x_logtype_driver;
-
 /*
  * The set of PCI devices this driver supports
  */
 #define BROADCOM_PCI_VENDOR_ID 0x14E4
+#define QLOGIC_PCI_VENDOR_ID 0x1077
 static const struct rte_pci_id pci_id_bnx2x_map[] = {
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57800) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57711) },
@@ -27,11 +25,13 @@ static const struct rte_pci_id pci_id_bnx2x_map[] = {
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_OBS) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) },
+       { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_4_10) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_2_20) },
 #ifdef RTE_LIBRTE_BNX2X_MF_SUPPORT
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_MF) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_MF) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_MF) },
+       { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_MF) },
 #endif
        { .vendor_id = 0, }
 };
@@ -41,6 +41,7 @@ static const struct rte_pci_id pci_id_bnx2xvf_map[] = {
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57810_VF) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57811_VF) },
        { RTE_PCI_DEVICE(BROADCOM_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },
+       { RTE_PCI_DEVICE(QLOGIC_PCI_VENDOR_ID, CHIP_NUM_57840_VF) },
        { .vendor_id = 0, }
 };
 
@@ -240,6 +241,9 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
                        PMD_DRV_LOG(ERR, sc, "rte_intr_enable failed");
        }
 
+       /* Configure the previously stored Multicast address list */
+       if (IS_VF(sc))
+               bnx2x_vfpf_set_mcast(sc, sc->mc_addrs, sc->mc_addrs_num);
        bnx2x_dev_rxtx_init(dev);
 
        bnx2x_print_device_info(sc);
@@ -247,7 +251,7 @@ bnx2x_dev_start(struct rte_eth_dev *dev)
        return ret;
 }
 
-static void
+static int
 bnx2x_dev_stop(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
@@ -265,23 +269,32 @@ bnx2x_dev_stop(struct rte_eth_dev *dev)
                /* stop the periodic callout */
                bnx2x_periodic_stop(dev);
        }
-
+       /* Remove the configured Multicast list
+        * Sending NULL for the list of address and the
+        * Number is set to 0 denoting DEL_CMD
+        */
+       if (IS_VF(sc))
+               bnx2x_vfpf_set_mcast(sc, NULL, 0);
        ret = bnx2x_nic_unload(sc, UNLOAD_NORMAL, FALSE);
        if (ret) {
                PMD_DRV_LOG(DEBUG, sc, "bnx2x_nic_unload failed (%d)", ret);
-               return;
+               return ret;
        }
 
-       return;
+       return 0;
 }
 
-static void
+static int
 bnx2x_dev_close(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
 
        PMD_INIT_FUNC_TRACE(sc);
 
+       /* only close in case of the primary process */
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
        if (IS_VF(sc))
                bnx2x_vf_close(sc);
 
@@ -290,6 +303,11 @@ bnx2x_dev_close(struct rte_eth_dev *dev)
 
        /* free ilt */
        bnx2x_free_ilt_mem(sc);
+
+       /* mac_addrs must not be freed alone because part of dev_private */
+       dev->data->mac_addrs = NULL;
+
+       return 0;
 }
 
 static int
@@ -320,7 +338,7 @@ bnx2x_promisc_disable(struct rte_eth_dev *dev)
        return 0;
 }
 
-static void
+static int
 bnx2x_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
@@ -330,9 +348,11 @@ bnx2x_dev_allmulticast_enable(struct rte_eth_dev *dev)
        if (rte_eth_promiscuous_get(dev->data->port_id) == 1)
                sc->rx_mode = BNX2X_RX_MODE_ALLMULTI_PROMISC;
        bnx2x_set_rx_mode(sc);
+
+       return 0;
 }
 
-static void
+static int
 bnx2x_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
        struct bnx2x_softc *sc = dev->data->dev_private;
@@ -342,6 +362,32 @@ bnx2x_dev_allmulticast_disable(struct rte_eth_dev *dev)
        if (rte_eth_promiscuous_get(dev->data->port_id) == 1)
                sc->rx_mode = BNX2X_RX_MODE_PROMISC;
        bnx2x_set_rx_mode(sc);
+
+       return 0;
+}
+
+static int
+bnx2x_dev_set_mc_addr_list(struct rte_eth_dev *dev,
+               struct rte_ether_addr *mc_addrs, uint32_t mc_addrs_num)
+{
+       struct bnx2x_softc *sc = dev->data->dev_private;
+       int err;
+       PMD_INIT_FUNC_TRACE(sc);
+       /* flush previous addresses */
+       err = bnx2x_vfpf_set_mcast(sc, NULL, 0);
+       if (err)
+               return err;
+       sc->mc_addrs_num = 0;
+
+       /* Add new ones */
+       err = bnx2x_vfpf_set_mcast(sc, mc_addrs, mc_addrs_num);
+       if (err)
+               return err;
+
+       sc->mc_addrs_num = mc_addrs_num;
+       memcpy(sc->mc_addrs, mc_addrs, mc_addrs_num * sizeof(*mc_addrs));
+
+       return 0;
 }
 
 static int
@@ -497,6 +543,7 @@ bnx2x_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
 
        dev_info->rx_desc_lim.nb_max = MAX_RX_AVAIL;
        dev_info->rx_desc_lim.nb_min = MIN_RX_SIZE_NONTPA;
+       dev_info->rx_desc_lim.nb_mtu_seg_max = 1;
        dev_info->tx_desc_lim.nb_max = MAX_TX_AVAIL;
 
        return 0;
@@ -558,6 +605,7 @@ static const struct eth_dev_ops bnx2xvf_eth_dev_ops = {
        .promiscuous_disable          = bnx2x_promisc_disable,
        .allmulticast_enable          = bnx2x_dev_allmulticast_enable,
        .allmulticast_disable         = bnx2x_dev_allmulticast_disable,
+       .set_mc_addr_list             = bnx2x_dev_set_mc_addr_list,
        .link_update                  = bnx2xvf_dev_link_update,
        .stats_get                    = bnx2x_dev_stats_get,
        .xstats_get                   = bnx2x_dev_xstats_get,
@@ -594,6 +642,11 @@ bnx2x_common_dev_init(struct rte_eth_dev *eth_dev, int is_vf)
 
        eth_dev->dev_ops = is_vf ? &bnx2xvf_eth_dev_ops : &bnx2x_eth_dev_ops;
 
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+               PMD_DRV_LOG(ERR, sc, "Skipping device init from secondary process");
+               return 0;
+       }
+
        rte_eth_copy_pci_info(eth_dev, pci_dev);
 
        sc->pcie_bus    = pci_dev->addr.bus;
@@ -713,8 +766,9 @@ eth_bnx2xvf_dev_init(struct rte_eth_dev *eth_dev)
 
 static int eth_bnx2x_dev_uninit(struct rte_eth_dev *eth_dev)
 {
-       /* mac_addrs must not be freed alone because part of dev_private */
-       eth_dev->data->mac_addrs = NULL;
+       struct bnx2x_softc *sc = eth_dev->data->dev_private;
+       PMD_INIT_FUNC_TRACE(sc);
+       bnx2x_dev_close(eth_dev);
        return 0;
 }
 
@@ -762,13 +816,5 @@ RTE_PMD_REGISTER_KMOD_DEP(net_bnx2x, "* igb_uio | uio_pci_generic | vfio-pci");
 RTE_PMD_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_bnx2xvf, "* igb_uio | vfio-pci");
-
-RTE_INIT(bnx2x_init_log)
-{
-       bnx2x_logtype_init = rte_log_register("pmd.net.bnx2x.init");
-       if (bnx2x_logtype_init >= 0)
-               rte_log_set_level(bnx2x_logtype_init, RTE_LOG_NOTICE);
-       bnx2x_logtype_driver = rte_log_register("pmd.net.bnx2x.driver");
-       if (bnx2x_logtype_driver >= 0)
-               rte_log_set_level(bnx2x_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER_SUFFIX(bnx2x_logtype_init, init, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(bnx2x_logtype_driver, driver, NOTICE);