idpf: Fix RSS LUT configuration on down interfaces

[ Upstream commit 445b49d13787da2fe8d51891ee196e5077feef44 ]

RSS LUT provisioning and queries on a down interface currently return
silently without effect. Users should be able to configure RSS settings
even when the interface is down.

Fix by maintaining RSS configuration changes in the driver's soft copy and
deferring HW programming until the interface comes up.

Fixes: 02cbfba1add5 ("idpf: add ethtool callbacks")
Signed-off-by: Sreedevi Joshi <sreedevi.joshi@intel.com>
Reviewed-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Reviewed-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Reviewed-by: Emil Tantilov <emil.s.tantilov@intel.com>
Tested-by: Samuel Salin <Samuel.salin@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
index 8e9a93125b4aa66c218a67b3f6b27f70542b5f35..3e191cf528b690d2632b89f0a33b483cd308a62e 100644 (file)
--- a/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_ethtool.c
@@ -395,7 +395,10 @@ static u32 idpf_get_rxfh_indir_size(struct net_device *netdev)
  * @netdev: network interface device structure
  * @rxfh: pointer to param struct (indir, key, hfunc)
  *
- * Reads the indirection table directly from the hardware. Always returns 0.
+ * RSS LUT and Key information are read from driver's cached
+ * copy. When rxhash is off, rss lut will be displayed as zeros.
+ *
+ * Return: 0 on success, -errno otherwise.
  */
 static int idpf_get_rxfh(struct net_device *netdev,
                         struct ethtool_rxfh_param *rxfh)
@@ -403,10 +406,13 @@ static int idpf_get_rxfh(struct net_device *netdev,
        struct idpf_netdev_priv *np = netdev_priv(netdev);
        struct idpf_rss_data *rss_data;
        struct idpf_adapter *adapter;
+       struct idpf_vport *vport;
+       bool rxhash_ena;
        int err = 0;
        u16 i;
 
        idpf_vport_ctrl_lock(netdev);
+       vport = idpf_netdev_to_vport(netdev);
 
        adapter = np->adapter;
 
@@ -416,9 +422,8 @@ static int idpf_get_rxfh(struct net_device *netdev,
        }
 
        rss_data = &adapter->vport_config[np->vport_idx]->user_config.rss_data;
-       if (!test_bit(IDPF_VPORT_UP, np->state))
-               goto unlock_mutex;
 
+       rxhash_ena = idpf_is_feature_ena(vport, NETIF_F_RXHASH);
        rxfh->hfunc = ETH_RSS_HASH_TOP;
 
        if (rxfh->key)
@@ -426,7 +431,7 @@ static int idpf_get_rxfh(struct net_device *netdev,
 
        if (rxfh->indir) {
                for (i = 0; i < rss_data->rss_lut_size; i++)
-                       rxfh->indir[i] = rss_data->rss_lut[i];
+                       rxfh->indir[i] = rxhash_ena ? rss_data->rss_lut[i] : 0;
        }
 
 unlock_mutex:
@@ -466,8 +471,6 @@ static int idpf_set_rxfh(struct net_device *netdev,
        }
 
        rss_data = &adapter->vport_config[vport->idx]->user_config.rss_data;
-       if (!test_bit(IDPF_VPORT_UP, np->state))
-               goto unlock_mutex;
 
        if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE &&
            rxfh->hfunc != ETH_RSS_HASH_TOP) {
@@ -483,7 +486,8 @@ static int idpf_set_rxfh(struct net_device *netdev,
                        rss_data->rss_lut[lut] = rxfh->indir[lut];
        }
 
-       err = idpf_config_rss(vport);
+       if (test_bit(IDPF_VPORT_UP, np->state))
+               err = idpf_config_rss(vport);
 
 unlock_mutex:
        idpf_vport_ctrl_unlock(netdev);