Patchwork [net-next,4/4] net: aquantia: add support of RSS configuration

login
register
mail settings
Submitter Igor Russkikh
Date Dec. 6, 2018, 3:02 p.m.
Message ID <89a6c51cb17ee2865a99a0cd7ff627095fb6b472.1544106687.git.igor.russkikh@aquantia.com>
Download mbox | patch
Permalink /patch/674211/
State New
Headers show

Comments

Igor Russkikh - Dec. 6, 2018, 3:02 p.m.
From: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>

Add support of configuration of RSS hash key and RSS indirection table.

Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
---
 .../ethernet/aquantia/atlantic/aq_ethtool.c   | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
Jakub Kicinski - Dec. 6, 2018, 7:32 p.m.
On Thu, 6 Dec 2018 15:02:52 +0000, Igor Russkikh wrote:
> From: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
> 
> Add support of configuration of RSS hash key and RSS indirection table.
> 
> Signed-off-by: Dmitry Bogdanov <dmitry.bogdanov@aquantia.com>
> Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
> ---
>  .../ethernet/aquantia/atlantic/aq_ethtool.c   | 42 +++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
> index a5fd71692c8b..2f2e12c2b632 100644
> --- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
> +++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
> @@ -202,6 +202,47 @@ static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key,
>  	return 0;
>  }
>  
> +static int aq_ethtool_set_rss(struct net_device *netdev, const u32 *indir,
> +			      const u8 *key, const u8 hfunc)
> +{
> +	struct aq_nic_s *aq_nic = netdev_priv(netdev);
> +	struct aq_nic_cfg_s *cfg;
> +	unsigned int i = 0U;
> +	u32 rss_entries;
> +	int err = 0;
> +
> +	cfg = aq_nic_get_cfg(aq_nic);
> +	rss_entries = cfg->aq_rss.indirection_table_size;
> +
> +	/* We do not allow change in unsupported parameters */
> +	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
> +		return -EOPNOTSUPP;
> +	/* Fill out the redirection table */
> +	if (indir) {
> +		/* Verify user input. */
> +		for (i = 0; i < rss_entries; i++)
> +			if (indir[i] >= cfg->num_rss_queues)
> +				return -EINVAL;

nit: you shouldn't have to do this, see ethtool_copy_validate_indir().

> +		for (i = 0; i < rss_entries; i++)
> +			cfg->aq_rss.indirection_table[i] = indir[i];
> +	}
> +
> +	/* Fill out the rss hash key */
> +	if (key) {
> +		memcpy(cfg->aq_rss.hash_secret_key, key,
> +		       sizeof(cfg->aq_rss.hash_secret_key));
> +		err = aq_nic->aq_hw_ops->hw_rss_hash_set(aq_nic->aq_hw,
> +			&cfg->aq_rss);
> +		if (err)
> +			return err;
> +	}
> +
> +	err = aq_nic->aq_hw_ops->hw_rss_set(aq_nic->aq_hw, &cfg->aq_rss);
> +
> +	return err;
> +}
Igor Russkikh - Dec. 7, 2018, 11:48 a.m.
>> +	/* Fill out the redirection table */

>> +	if (indir) {

>> +		/* Verify user input. */

>> +		for (i = 0; i < rss_entries; i++)

>> +			if (indir[i] >= cfg->num_rss_queues)

>> +				return -EINVAL;

> 

> nit: you shouldn't have to do this, see ethtool_copy_validate_indir().

> 


Thanks, Jakub, indeed. Will resubmit.

Regards,
  Igor

Patch

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
index a5fd71692c8b..2f2e12c2b632 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
@@ -202,6 +202,47 @@  static int aq_ethtool_get_rss(struct net_device *ndev, u32 *indir, u8 *key,
 	return 0;
 }
 
+static int aq_ethtool_set_rss(struct net_device *netdev, const u32 *indir,
+			      const u8 *key, const u8 hfunc)
+{
+	struct aq_nic_s *aq_nic = netdev_priv(netdev);
+	struct aq_nic_cfg_s *cfg;
+	unsigned int i = 0U;
+	u32 rss_entries;
+	int err = 0;
+
+	cfg = aq_nic_get_cfg(aq_nic);
+	rss_entries = cfg->aq_rss.indirection_table_size;
+
+	/* We do not allow change in unsupported parameters */
+	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
+		return -EOPNOTSUPP;
+	/* Fill out the redirection table */
+	if (indir) {
+		/* Verify user input. */
+		for (i = 0; i < rss_entries; i++)
+			if (indir[i] >= cfg->num_rss_queues)
+				return -EINVAL;
+
+		for (i = 0; i < rss_entries; i++)
+			cfg->aq_rss.indirection_table[i] = indir[i];
+	}
+
+	/* Fill out the rss hash key */
+	if (key) {
+		memcpy(cfg->aq_rss.hash_secret_key, key,
+		       sizeof(cfg->aq_rss.hash_secret_key));
+		err = aq_nic->aq_hw_ops->hw_rss_hash_set(aq_nic->aq_hw,
+			&cfg->aq_rss);
+		if (err)
+			return err;
+	}
+
+	err = aq_nic->aq_hw_ops->hw_rss_set(aq_nic->aq_hw, &cfg->aq_rss);
+
+	return err;
+}
+
 static int aq_ethtool_get_rxnfc(struct net_device *ndev,
 				struct ethtool_rxnfc *cmd,
 				u32 *rule_locs)
@@ -549,6 +590,7 @@  const struct ethtool_ops aq_ethtool_ops = {
 	.set_pauseparam      = aq_ethtool_set_pauseparam,
 	.get_rxfh_key_size   = aq_ethtool_get_rss_key_size,
 	.get_rxfh            = aq_ethtool_get_rss,
+	.set_rxfh            = aq_ethtool_set_rss,
 	.get_rxnfc           = aq_ethtool_get_rxnfc,
 	.set_rxnfc           = aq_ethtool_set_rxnfc,
 	.get_sset_count      = aq_ethtool_get_sset_count,