* [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x
@ 2019-05-14 13:19 Haiyue Wang
2019-05-14 13:19 ` Haiyue Wang
2019-05-16 11:35 ` Maxime Coquelin
0 siblings, 2 replies; 4+ messages in thread
From: Haiyue Wang @ 2019-05-14 13:19 UTC (permalink / raw)
To: qi.z.zhang, dev; +Cc: Haiyue Wang
Since ice can support 128, 512, 2K three RSS RETA size, and if set 2K
by default, this will make it not compatible with ETH_RSS_RETA_SIZE_x
value definition, limit it to 512 if the cap.rss_table_size exceeds the
max value 512.
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
drivers/net/ice/ice_ethdev.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index bbaa7cf..e9b606f 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1134,6 +1134,18 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
uint16_t max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };
uint8_t tc_bitmap = 0x1;
+ /* Be compatible with ETH_RSS_RETA_SIZE_x definition */
+ pf->hash_lut_size = hw->func_caps.common_cap.rss_table_size >
+ ETH_RSS_RETA_SIZE_512 ? ETH_RSS_RETA_SIZE_512 :
+ hw->func_caps.common_cap.rss_table_size;
+ if (pf->hash_lut_size != ETH_RSS_RETA_SIZE_128 &&
+ pf->hash_lut_size != ETH_RSS_RETA_SIZE_512) {
+ PMD_INIT_LOG(ERR,
+ "unsupported RSS hash LUT size %u",
+ pf->hash_lut_size);
+ return NULL;
+ }
+
/* hw->num_lports = 1 in NIC mode */
vsi = rte_zmalloc(NULL, sizeof(struct ice_vsi), 0);
if (!vsi)
@@ -1627,7 +1639,7 @@ static int ice_init_rss(struct ice_pf *pf)
rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
nb_q = dev->data->nb_rx_queues;
vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;
- vsi->rss_lut_size = hw->func_caps.common_cap.rss_table_size;
+ vsi->rss_lut_size = pf->hash_lut_size;
if (is_safe_mode) {
PMD_DRV_LOG(WARNING, "RSS is not supported in safe mode\n");
@@ -2033,7 +2045,7 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->rx_queue_offload_capa = 0;
dev_info->tx_queue_offload_capa = 0;
- dev_info->reta_size = hw->func_caps.common_cap.rss_table_size;
+ dev_info->reta_size = pf->hash_lut_size;
dev_info->hash_key_size = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
dev_info->default_rxconf = (struct rte_eth_rxconf) {
@@ -2605,8 +2617,7 @@ ice_rss_reta_update(struct rte_eth_dev *dev,
uint16_t reta_size)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+ uint16_t i, lut_size = pf->hash_lut_size;
uint16_t idx, shift;
uint8_t *lut;
int ret;
@@ -2650,8 +2661,7 @@ ice_rss_reta_query(struct rte_eth_dev *dev,
uint16_t reta_size)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+ uint16_t i, lut_size = pf->hash_lut_size;
uint16_t idx, shift;
uint8_t *lut;
int ret;
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x
2019-05-14 13:19 [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x Haiyue Wang
@ 2019-05-14 13:19 ` Haiyue Wang
2019-05-16 11:35 ` Maxime Coquelin
1 sibling, 0 replies; 4+ messages in thread
From: Haiyue Wang @ 2019-05-14 13:19 UTC (permalink / raw)
To: qi.z.zhang, dev; +Cc: Haiyue Wang
Since ice can support 128, 512, 2K three RSS RETA size, and if set 2K
by default, this will make it not compatible with ETH_RSS_RETA_SIZE_x
value definition, limit it to 512 if the cap.rss_table_size exceeds the
max value 512.
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
---
drivers/net/ice/ice_ethdev.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index bbaa7cf..e9b606f 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1134,6 +1134,18 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
uint16_t max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };
uint8_t tc_bitmap = 0x1;
+ /* Be compatible with ETH_RSS_RETA_SIZE_x definition */
+ pf->hash_lut_size = hw->func_caps.common_cap.rss_table_size >
+ ETH_RSS_RETA_SIZE_512 ? ETH_RSS_RETA_SIZE_512 :
+ hw->func_caps.common_cap.rss_table_size;
+ if (pf->hash_lut_size != ETH_RSS_RETA_SIZE_128 &&
+ pf->hash_lut_size != ETH_RSS_RETA_SIZE_512) {
+ PMD_INIT_LOG(ERR,
+ "unsupported RSS hash LUT size %u",
+ pf->hash_lut_size);
+ return NULL;
+ }
+
/* hw->num_lports = 1 in NIC mode */
vsi = rte_zmalloc(NULL, sizeof(struct ice_vsi), 0);
if (!vsi)
@@ -1627,7 +1639,7 @@ static int ice_init_rss(struct ice_pf *pf)
rss_conf = &dev->data->dev_conf.rx_adv_conf.rss_conf;
nb_q = dev->data->nb_rx_queues;
vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;
- vsi->rss_lut_size = hw->func_caps.common_cap.rss_table_size;
+ vsi->rss_lut_size = pf->hash_lut_size;
if (is_safe_mode) {
PMD_DRV_LOG(WARNING, "RSS is not supported in safe mode\n");
@@ -2033,7 +2045,7 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->rx_queue_offload_capa = 0;
dev_info->tx_queue_offload_capa = 0;
- dev_info->reta_size = hw->func_caps.common_cap.rss_table_size;
+ dev_info->reta_size = pf->hash_lut_size;
dev_info->hash_key_size = (VSIQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t);
dev_info->default_rxconf = (struct rte_eth_rxconf) {
@@ -2605,8 +2617,7 @@ ice_rss_reta_update(struct rte_eth_dev *dev,
uint16_t reta_size)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+ uint16_t i, lut_size = pf->hash_lut_size;
uint16_t idx, shift;
uint8_t *lut;
int ret;
@@ -2650,8 +2661,7 @@ ice_rss_reta_query(struct rte_eth_dev *dev,
uint16_t reta_size)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- uint16_t i, lut_size = hw->func_caps.common_cap.rss_table_size;
+ uint16_t i, lut_size = pf->hash_lut_size;
uint16_t idx, shift;
uint8_t *lut;
int ret;
--
2.7.4
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x
2019-05-14 13:19 [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x Haiyue Wang
2019-05-14 13:19 ` Haiyue Wang
@ 2019-05-16 11:35 ` Maxime Coquelin
2019-05-16 16:29 ` Wang, Haiyue
1 sibling, 1 reply; 4+ messages in thread
From: Maxime Coquelin @ 2019-05-16 11:35 UTC (permalink / raw)
To: Haiyue Wang, qi.z.zhang, dev
On 5/14/19 3:19 PM, Haiyue Wang wrote:
> Since ice can support 128, 512, 2K three RSS RETA size, and if set 2K
> by default, this will make it not compatible with ETH_RSS_RETA_SIZE_x
> value definition, limit it to 512 if the cap.rss_table_size exceeds the
> max value 512.
It looks like a fix, so "Fixes:" tag would we welcome.
> Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
> ---
> drivers/net/ice/ice_ethdev.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x
2019-05-16 11:35 ` Maxime Coquelin
@ 2019-05-16 16:29 ` Wang, Haiyue
0 siblings, 0 replies; 4+ messages in thread
From: Wang, Haiyue @ 2019-05-16 16:29 UTC (permalink / raw)
To: Maxime Coquelin, Zhang, Qi Z, dev
> -----Original Message-----
> From: Maxime Coquelin [mailto:maxime.coquelin@redhat.com]
> Sent: Thursday, May 16, 2019 19:36
> To: Wang, Haiyue <haiyue.wang@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with
> ETH_RSS_RETA_SIZE_x
>
>
>
> On 5/14/19 3:19 PM, Haiyue Wang wrote:
> > Since ice can support 128, 512, 2K three RSS RETA size, and if set 2K
> > by default, this will make it not compatible with ETH_RSS_RETA_SIZE_x
> > value definition, limit it to 512 if the cap.rss_table_size exceeds
> > the max value 512.
>
> It looks like a fix, so "Fixes:" tag would we welcome.
>
Will add it in patch v2.
> > Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
> > ---
> > drivers/net/ice/ice_ethdev.c | 22 ++++++++++++++++------
> > 1 file changed, 16 insertions(+), 6 deletions(-)
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-16 16:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14 13:19 [dpdk-dev] [PATCH v1] net/ice: change RSS RETA size to meet with ETH_RSS_RETA_SIZE_x Haiyue Wang
2019-05-14 13:19 ` Haiyue Wang
2019-05-16 11:35 ` Maxime Coquelin
2019-05-16 16:29 ` Wang, Haiyue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).