i40e: Fix incorrect netdev's real number of RX/TX queues

There was a wrong queues representation in sysfs during
driver's reinitialization in case of online cpus number is
less than combined queues. It was caused by stopped
NetworkManager, which is responsible for calling vsi_open
function during driver's initialization.
In specific situation (ex. 12 cpus online) there were 16 queues
in /sys/class/net/<iface>/queues. In case of modifying queues with
value higher, than number of online cpus, then it caused write
errors and other errors.
Add updating of sysfs's queues representation during driver
initialization.

Fixes: 79a154c5e3e8 ("i40e: main driver core")
Signed-off-by: Lukasz Cieplicki <lukaszx.cieplicki@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 17c3f6d697401bdbbfb420998a8ae8b985e0a1ab..61afc220fc6cd1a39578eb203d4c0d39ad99db84 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8740,6 +8740,27 @@ int i40e_open(struct net_device *netdev)
        return 0;
 }
 
+/**
+ * i40e_netif_set_realnum_tx_rx_queues - Update number of tx/rx queues
+ * @vsi: vsi structure
+ *
+ * This updates netdev's number of tx/rx queues
+ *
+ * Returns status of setting tx/rx queues
+ **/
+static int i40e_netif_set_realnum_tx_rx_queues(struct i40e_vsi *vsi)
+{
+       int ret;
+
+       ret = netif_set_real_num_rx_queues(vsi->netdev,
+                                          vsi->num_queue_pairs);
+       if (ret)
+               return ret;
+
+       return netif_set_real_num_tx_queues(vsi->netdev,
+                                           vsi->num_queue_pairs);
+}
+
 /**
  * i40e_vsi_open -
  * @vsi: the VSI to open
@@ -8776,13 +8797,7 @@ int i40e_vsi_open(struct i40e_vsi *vsi)
                        goto err_setup_rx;
 
                /* Notify the stack of the actual queue counts. */
-               err = netif_set_real_num_tx_queues(vsi->netdev,
-                                                  vsi->num_queue_pairs);
-               if (err)
-                       goto err_set_queues;
-
-               err = netif_set_real_num_rx_queues(vsi->netdev,
-                                                  vsi->num_queue_pairs);
+               err = i40e_netif_set_realnum_tx_rx_queues(vsi);
                if (err)
                        goto err_set_queues;
 
@@ -14173,6 +14188,9 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,
        case I40E_VSI_MAIN:
        case I40E_VSI_VMDQ2:
                ret = i40e_config_netdev(vsi);
+               if (ret)
+                       goto err_netdev;
+               ret = i40e_netif_set_realnum_tx_rx_queues(vsi);
                if (ret)
                        goto err_netdev;
                ret = register_netdev(vsi->netdev);