[v2] net/ice: support show RSS hash configuration
diff mbox series

Message ID 20201029051129.784-1-taox.zhu@intel.com
State Superseded, archived
Delegated to: Qi Zhang
Headers show
Series
  • [v2] net/ice: support show RSS hash configuration
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/travis-robot success Travis build: passed
ci/checkpatch success coding style OK

Commit Message

Zhu, TaoX Oct. 29, 2020, 5:11 a.m. UTC
From: Zhu Tao <taox.zhu@intel.com>

Implement interface 'ice_rss_hash_conf_get' to support show RSS
hash configuration.

Note:
    Not support the same time setting RSS with RTE and classify API.

Signed-off-by: Zhu Tao <taox.zhu@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 15 +++++++++++++--
 drivers/net/ice/ice_ethdev.h |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

v2 changes:
    Committed log.

Comments

Zhang, Qi Z Oct. 29, 2020, 5:53 a.m. UTC | #1
> -----Original Message-----
> From: taox.zhu@intel.com <taox.zhu@intel.com>
> Sent: Thursday, October 29, 2020 1:11 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Zhu, TaoX <taox.zhu@intel.com>
> Subject: [PATCH v2] net/ice: support show RSS hash configuration
> 
> From: Zhu Tao <taox.zhu@intel.com>
> 
> Implement interface 'ice_rss_hash_conf_get' to support show RSS hash
> configuration.
> 
> Note:
>     Not support the same time setting RSS with RTE and classify API.


Only return rss_hf from latest dev_configure or dev_rss_hash_update. 
All configures from rte_flow are ignored.

And better to add above notes in ice_rss_hash_conf_get also.

Otherwise

Acked-by: Qi Zhang <qi.z.ahang@intel.com>


> 
> Signed-off-by: Zhu Tao <taox.zhu@intel.com>
> ---
>  drivers/net/ice/ice_ethdev.c | 15 +++++++++++++--
> drivers/net/ice/ice_ethdev.h |  1 +
>  2 files changed, 14 insertions(+), 2 deletions(-)
> 
> v2 changes:
>     Committed log.
> 
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index
> d51f3faba..ff8106317 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2923,6 +2923,16 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
>  	struct ice_vsi *vsi = pf->main_vsi;
>  	int ret;
> 
> +#define ICE_RSS_HF_ALL ( \
> +	ETH_RSS_IPV4 | \
> +	ETH_RSS_IPV6 | \
> +	ETH_RSS_NONFRAG_IPV4_UDP | \
> +	ETH_RSS_NONFRAG_IPV6_UDP | \
> +	ETH_RSS_NONFRAG_IPV4_TCP | \
> +	ETH_RSS_NONFRAG_IPV6_TCP | \
> +	ETH_RSS_NONFRAG_IPV4_SCTP | \
> +	ETH_RSS_NONFRAG_IPV6_SCTP)
> +
>  	/* Configure RSS for IPv4 with src/dst addr as input set */
>  	if (rss_hf & ETH_RSS_IPV4) {
>  		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, ICE_FLOW_HASH_IPV4, @@
> -3216,6 +3226,8 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
>  			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_SCTP rss flow fail %d",
>  				    __func__, ret);
>  	}
> +
> +	pf->rss_hf = rss_hf & ICE_RSS_HF_ALL;
>  }
> 
>  static int ice_init_rss(struct ice_pf *pf) @@ -4439,8 +4451,7 @@
> ice_rss_hash_conf_get(struct rte_eth_dev *dev,
>  	ice_get_rss_key(vsi, rss_conf->rss_key,
>  			&rss_conf->rss_key_len);
> 
> -	/* TODO: default set to 0 as hf config is not supported now */
> -	rss_conf->rss_hf = 0;
> +	rss_conf->rss_hf = pf->rss_hf;
>  	return 0;
>  }
> 
> diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> 05218af05..452fd9050 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -457,6 +457,7 @@ struct ice_pf {
>  	uint64_t old_rx_bytes;
>  	uint64_t old_tx_bytes;
>  	uint64_t supported_rxdid; /* bitmap for supported RXDID */
> +	uint64_t rss_hf;
>  };
> 
>  #define ICE_MAX_QUEUE_NUM  2048
> --
> 2.18.4
Zhu, TaoX Oct. 29, 2020, 6:47 a.m. UTC | #2
Thanks, Qi

I'll send v3 patch according to your comments.

BRs,
Zhu Tao

-----Original Message-----
From: Zhang, Qi Z <qi.z.zhang@intel.com> 
Sent: Thursday, October 29, 2020 1:53 PM
To: Zhu, TaoX <taox.zhu@intel.com>; Yang, Qiming <qiming.yang@intel.com>
Cc: dev@dpdk.org; Zhu, TaoX <taox.zhu@intel.com>
Subject: RE: [PATCH v2] net/ice: support show RSS hash configuration



> -----Original Message-----
> From: taox.zhu@intel.com <taox.zhu@intel.com>
> Sent: Thursday, October 29, 2020 1:11 PM
> To: Yang, Qiming <qiming.yang@intel.com>; Zhang, Qi Z 
> <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Zhu, TaoX <taox.zhu@intel.com>
> Subject: [PATCH v2] net/ice: support show RSS hash configuration
> 
> From: Zhu Tao <taox.zhu@intel.com>
> 
> Implement interface 'ice_rss_hash_conf_get' to support show RSS hash 
> configuration.
> 
> Note:
>     Not support the same time setting RSS with RTE and classify API.


Only return rss_hf from latest dev_configure or dev_rss_hash_update. 
All configures from rte_flow are ignored.

And better to add above notes in ice_rss_hash_conf_get also.

Otherwise

Acked-by: Qi Zhang <qi.z.ahang@intel.com>


> 
> Signed-off-by: Zhu Tao <taox.zhu@intel.com>
> ---
>  drivers/net/ice/ice_ethdev.c | 15 +++++++++++++-- 
> drivers/net/ice/ice_ethdev.h |  1 +
>  2 files changed, 14 insertions(+), 2 deletions(-)
> 
> v2 changes:
>     Committed log.
> 
> diff --git a/drivers/net/ice/ice_ethdev.c 
> b/drivers/net/ice/ice_ethdev.c index
> d51f3faba..ff8106317 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2923,6 +2923,16 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t 
> rss_hf)  struct ice_vsi *vsi = pf->main_vsi;  int ret;
> 
> +#define ICE_RSS_HF_ALL ( \
> +ETH_RSS_IPV4 | \
> +ETH_RSS_IPV6 | \
> +ETH_RSS_NONFRAG_IPV4_UDP | \
> +ETH_RSS_NONFRAG_IPV6_UDP | \
> +ETH_RSS_NONFRAG_IPV4_TCP | \
> +ETH_RSS_NONFRAG_IPV6_TCP | \
> +ETH_RSS_NONFRAG_IPV4_SCTP | \
> +ETH_RSS_NONFRAG_IPV6_SCTP)
> +
>  /* Configure RSS for IPv4 with src/dst addr as input set */  if 
> (rss_hf & ETH_RSS_IPV4) {  ret = ice_add_rss_cfg_wrap(pf, vsi->idx, 
> ICE_FLOW_HASH_IPV4, @@
> -3216,6 +3226,8 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t 
> rss_hf)  PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_SCTP rss flow fail %d",
>      __func__, ret);
>  }
> +
> +pf->rss_hf = rss_hf & ICE_RSS_HF_ALL;
>  }
> 
>  static int ice_init_rss(struct ice_pf *pf) @@ -4439,8 +4451,7 @@ 
> ice_rss_hash_conf_get(struct rte_eth_dev *dev,  ice_get_rss_key(vsi, 
> rss_conf->rss_key,  &rss_conf->rss_key_len);
> 
> -/* TODO: default set to 0 as hf config is not supported now */ 
> -rss_conf->rss_hf = 0;
> +rss_conf->rss_hf = pf->rss_hf;
>  return 0;
>  }
> 
> diff --git a/drivers/net/ice/ice_ethdev.h 
> b/drivers/net/ice/ice_ethdev.h index
> 05218af05..452fd9050 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -457,6 +457,7 @@ struct ice_pf {
>  uint64_t old_rx_bytes;
>  uint64_t old_tx_bytes;
>  uint64_t supported_rxdid; /* bitmap for supported RXDID */
> +uint64_t rss_hf;
>  };
> 
>  #define ICE_MAX_QUEUE_NUM  2048
> --
> 2.18.4

Patch
diff mbox series

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index d51f3faba..ff8106317 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2923,6 +2923,16 @@  ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 	struct ice_vsi *vsi = pf->main_vsi;
 	int ret;
 
+#define ICE_RSS_HF_ALL ( \
+	ETH_RSS_IPV4 | \
+	ETH_RSS_IPV6 | \
+	ETH_RSS_NONFRAG_IPV4_UDP | \
+	ETH_RSS_NONFRAG_IPV6_UDP | \
+	ETH_RSS_NONFRAG_IPV4_TCP | \
+	ETH_RSS_NONFRAG_IPV6_TCP | \
+	ETH_RSS_NONFRAG_IPV4_SCTP | \
+	ETH_RSS_NONFRAG_IPV6_SCTP)
+
 	/* Configure RSS for IPv4 with src/dst addr as input set */
 	if (rss_hf & ETH_RSS_IPV4) {
 		ret = ice_add_rss_cfg_wrap(pf, vsi->idx, ICE_FLOW_HASH_IPV4,
@@ -3216,6 +3226,8 @@  ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
 			PMD_DRV_LOG(ERR, "%s GTPU_EH_IPV6_SCTP rss flow fail %d",
 				    __func__, ret);
 	}
+
+	pf->rss_hf = rss_hf & ICE_RSS_HF_ALL;
 }
 
 static int ice_init_rss(struct ice_pf *pf)
@@ -4439,8 +4451,7 @@  ice_rss_hash_conf_get(struct rte_eth_dev *dev,
 	ice_get_rss_key(vsi, rss_conf->rss_key,
 			&rss_conf->rss_key_len);
 
-	/* TODO: default set to 0 as hf config is not supported now */
-	rss_conf->rss_hf = 0;
+	rss_conf->rss_hf = pf->rss_hf;
 	return 0;
 }
 
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 05218af05..452fd9050 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -457,6 +457,7 @@  struct ice_pf {
 	uint64_t old_rx_bytes;
 	uint64_t old_tx_bytes;
 	uint64_t supported_rxdid; /* bitmap for supported RXDID */
+	uint64_t rss_hf;
 };
 
 #define ICE_MAX_QUEUE_NUM  2048