net/iavf: fix resource leak on probing failure

[dpdk.git] / drivers / net / iavf / iavf_ethdev.c

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 41382c6..c131461 100644 (file)
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -259,7 +259,7 @@ iavf_set_mc_addr_list(struct rte_eth_dev *dev,
        return err;
 }
 
-static int
+static void
 iavf_config_rss_hf(struct iavf_adapter *adapter, uint64_t rss_hf)
 {
        static const uint64_t map_hena_rss[] = {
@@ -319,8 +319,16 @@ iavf_config_rss_hf(struct iavf_adapter *adapter, uint64_t rss_hf)
        int ret;
 
        ret = iavf_get_hena_caps(adapter, &caps);
-       if (ret)
-               return ret;
+       if (ret) {
+               /**
+                * RSS offload type configuration is not a necessary feature
+                * for VF, so here just print a warning and return.
+                */
+               PMD_DRV_LOG(WARNING,
+                           "fail to get RSS offload type caps, ret: %d", ret);
+               return;
+       }
+
        /**
         * ETH_RSS_IPV4 and ETH_RSS_IPV6 can be considered as 2
         * generalizations of all other IPv4 and IPv6 RSS types.
@@ -343,8 +351,15 @@ iavf_config_rss_hf(struct iavf_adapter *adapter, uint64_t rss_hf)
        }
 
        ret = iavf_set_hena(adapter, hena);
-       if (ret)
-               return ret;
+       if (ret) {
+               /**
+                * RSS offload type configuration is not a necessary feature
+                * for VF, so here just print a warning and return.
+                */
+               PMD_DRV_LOG(WARNING,
+                           "fail to set RSS offload types, ret: %d", ret);
+               return;
+       }
 
        if (valid_rss_hf & ipv4_rss)
                valid_rss_hf |= rss_hf & ETH_RSS_IPV4;
@@ -357,7 +372,6 @@ iavf_config_rss_hf(struct iavf_adapter *adapter, uint64_t rss_hf)
                            rss_hf & ~valid_rss_hf);
 
        vf->rss_hf = valid_rss_hf;
-       return 0;
 }
 
 static int
@@ -409,9 +423,7 @@ iavf_init_rss(struct iavf_adapter *adapter)
                        return ret;
                }
        } else {
-               ret = iavf_config_rss_hf(adapter, rss_conf->rss_hf);
-               if (ret != -ENOTSUP)
-                       return ret;
+               iavf_config_rss_hf(adapter, rss_conf->rss_hf);
        }
 
        return 0;
@@ -562,13 +574,14 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
 {
        struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
        struct rte_eth_dev_data *dev_data = dev->data;
-       uint16_t buf_size, max_pkt_len, len;
+       uint16_t buf_size, max_pkt_len;
 
        buf_size = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM;
 
        /* Calculate the maximum packet length allowed */
-       len = rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS;
-       max_pkt_len = RTE_MIN(len, dev->data->dev_conf.rxmode.max_rx_pkt_len);
+       max_pkt_len = RTE_MIN((uint32_t)
+                       rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS,
+                       dev->data->dev_conf.rxmode.max_rx_pkt_len);
 
        /* Check if the jumbo frame and maximum packet length are set
         * correctly.
@@ -1400,9 +1413,7 @@ iavf_dev_rss_hash_update(struct rte_eth_dev *dev,
                        return ret;
                }
        } else {
-               ret = iavf_config_rss_hf(adapter, rss_conf->rss_hf);
-               if (ret != -ENOTSUP)
-                       return ret;
+               iavf_config_rss_hf(adapter, rss_conf->rss_hf);
        }
 
        return 0;
@@ -1475,24 +1486,14 @@ iavf_dev_set_default_mac_addr(struct rte_eth_dev *dev,
        ret = iavf_add_del_eth_addr(adapter, old_addr, false, VIRTCHNL_ETHER_ADDR_PRIMARY);
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to delete old MAC:"
-                           " %02X:%02X:%02X:%02X:%02X:%02X",
-                           old_addr->addr_bytes[0],
-                           old_addr->addr_bytes[1],
-                           old_addr->addr_bytes[2],
-                           old_addr->addr_bytes[3],
-                           old_addr->addr_bytes[4],
-                           old_addr->addr_bytes[5]);
+                           RTE_ETHER_ADDR_PRT_FMT,
+                               RTE_ETHER_ADDR_BYTES(old_addr));
 
        ret = iavf_add_del_eth_addr(adapter, mac_addr, true, VIRTCHNL_ETHER_ADDR_PRIMARY);
        if (ret)
                PMD_DRV_LOG(ERR, "Fail to add new MAC:"
-                           " %02X:%02X:%02X:%02X:%02X:%02X",
-                           mac_addr->addr_bytes[0],
-                           mac_addr->addr_bytes[1],
-                           mac_addr->addr_bytes[2],
-                           mac_addr->addr_bytes[3],
-                           mac_addr->addr_bytes[4],
-                           mac_addr->addr_bytes[5]);
+                           RTE_ETHER_ADDR_PRT_FMT,
+                               RTE_ETHER_ADDR_BYTES(mac_addr));
 
        if (ret)
                return -EIO;
@@ -2175,6 +2176,30 @@ err:
        return -1;
 }
 
+static void
+iavf_uninit_vf(struct rte_eth_dev *dev)
+{
+       struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+
+       iavf_shutdown_adminq(hw);
+
+       rte_free(vf->vf_res);
+       vf->vsi_res = NULL;
+       vf->vf_res = NULL;
+
+       rte_free(vf->aq_resp);
+       vf->aq_resp = NULL;
+
+       rte_free(vf->qos_cap);
+       vf->qos_cap = NULL;
+
+       rte_free(vf->rss_lut);
+       vf->rss_lut = NULL;
+       rte_free(vf->rss_key);
+       vf->rss_key = NULL;
+}
+
 /* Enable default admin queue interrupt setting */
 static inline void
 iavf_enable_irq0(struct iavf_hw *hw)
@@ -2303,7 +2328,8 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
                PMD_INIT_LOG(ERR, "Failed to allocate %d bytes needed to"
                             " store MAC addresses",
                             RTE_ETHER_ADDR_LEN * IAVF_NUM_MACADDR_MAX);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto init_vf_err;
        }
        /* If the MAC address is not configured by host,
         * generate a random one.
@@ -2328,12 +2354,21 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
        ret = iavf_flow_init(adapter);
        if (ret) {
                PMD_INIT_LOG(ERR, "Failed to initialize flow");
-               return ret;
+               goto flow_init_err;
        }
 
        iavf_default_rss_disable(adapter);
 
        return 0;
+
+flow_init_err:
+       rte_free(eth_dev->data->mac_addrs);
+       eth_dev->data->mac_addrs = NULL;
+
+init_vf_err:
+       iavf_uninit_vf(eth_dev);
+
+       return ret;
 }
 
 static int