Introduce a flag that determines whether the RSS configuration stored in priv is the latest from the device or not.
This functionality is contingent on query support. If RSS queries are supported, then when sending a control plane message to configure RSS, the cache will be invalidated. Upon storing the latest configuration in priv, the cache will be considered clean and ready to be read. If RSS queries are not supported, as is the case for the current admin queue implementation, the RSS cache is not cleared when sending a configuration update to avoid causing the cache to become permanently stale. The RSS configuration should never be read if the cache is dirty. Signed-off-by: Joshua Washington <[email protected]> --- v3: - Avoid clearing the RSS cache, as the driver is the source of truth. v2: - Remove -ENODATA return for Freebsd compatibility. --- drivers/net/gve/gve_ethdev.c | 81 +++++++++++++++++++++++++++++------- drivers/net/gve/gve_ethdev.h | 1 + drivers/net/gve/gve_rss.c | 2 + 3 files changed, 69 insertions(+), 15 deletions(-) diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index d117b28dd0..31698bc38a 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -217,6 +217,32 @@ gve_teardown_queue_page_list(struct gve_priv *priv, return 0; } +static int +gve_rss_update_cache(struct gve_priv *priv) +{ + struct gve_process_private *process_priv; + + process_priv = rte_eth_devices[priv->port_id].process_private; + + if (priv->rss_cache_dirty) { + int err; + + if (process_priv->ctrl_ops->query_rss == NULL) { + PMD_DRV_LOG(ERR, + "No RSS query functionality present in ops table"); + return -ENOENT; + } + + err = process_priv->ctrl_ops->query_rss(priv); + if (err) { + PMD_DRV_LOG(ERR, "Failed to query device for RSS info."); + return err; + } + } + + return 0; +} + static int gve_dev_configure(struct rte_eth_dev *dev) { @@ -241,19 +267,25 @@ gve_dev_configure(struct rte_eth_dev *dev) } } - /* Reset RSS RETA in case number of queues changed. */ + /* Reset RSS RETA in case number of queues changed, but don't fail + * configure if the cache cannot be updated. + */ if (priv->rss_config.indir) { - struct gve_rss_config update_reta_config; - gve_init_rss_config_from_priv(priv, &update_reta_config); - gve_generate_rss_reta(dev, &update_reta_config); + err = gve_rss_update_cache(priv); + if (err == 0) { + struct gve_rss_config update_reta_config; - err = process_priv->ctrl_ops->configure_rss(priv, &update_reta_config); - if (err) - PMD_DRV_LOG(ERR, - "Could not reconfigure RSS redirection table."); + gve_init_rss_config_from_priv(priv, &update_reta_config); + gve_generate_rss_reta(dev, &update_reta_config); - gve_free_rss_config(&update_reta_config); - return err; + err = process_priv->ctrl_ops->configure_rss(priv, &update_reta_config); + if (err) + PMD_DRV_LOG(ERR, + "Could not reconfigure RSS redirection table."); + + gve_free_rss_config(&update_reta_config); + return err; + } } return 0; @@ -1118,7 +1150,6 @@ gve_xstats_get_names(struct rte_eth_dev *dev, return count; } - static int gve_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) @@ -1169,6 +1200,10 @@ gve_rss_hash_update(struct rte_eth_dev *dev, if (err) return err; + err = gve_rss_update_cache(priv); + if (err) + goto err; + gve_rss_conf.alg = GVE_RSS_HASH_TOEPLITZ; err = gve_update_rss_hash_types(priv, &gve_rss_conf, rss_conf); if (err) @@ -1196,6 +1231,7 @@ gve_rss_hash_conf_get(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf) { struct gve_priv *priv = dev->data->dev_private; + int err; if (!(dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_RSS_HASH)) { @@ -1203,6 +1239,9 @@ gve_rss_hash_conf_get(struct rte_eth_dev *dev, return -ENOTSUP; } + err = gve_rss_update_cache(priv); + if (err) + return err; gve_to_rte_rss_hf(priv->rss_config.hash_types, rss_conf); rss_conf->rss_key_len = priv->rss_config.key_size; @@ -1229,6 +1268,10 @@ gve_rss_reta_update(struct rte_eth_dev *dev, int err; int i; + err = gve_rss_update_cache(priv); + if (err) + return err; + /* RSS key must be set before the redirection table can be set. */ if (!priv->rss_config.key || priv->rss_config.key_size == 0) { PMD_DRV_LOG(ERR, "RSS hash key msut be set before the " @@ -1271,8 +1314,10 @@ static int gve_rss_reta_query(struct rte_eth_dev *dev, struct rte_eth_rss_reta_entry64 *reta_conf, uint16_t reta_size) { + struct gve_process_private *process_priv = dev->process_private; struct gve_priv *priv = dev->data->dev_private; int table_id; + int err; int i; if (!(dev->data->dev_conf.rxmode.offloads & @@ -1281,10 +1326,14 @@ gve_rss_reta_query(struct rte_eth_dev *dev, return -ENOTSUP; } - /* RSS key must be set before the redirection table can be queried. */ - if (!priv->rss_config.key) { - PMD_DRV_LOG(ERR, "RSS hash key must be set before the " - "redirection table can be initialized."); + err = gve_rss_update_cache(priv); + if (err != 0) + return err; + + if (process_priv->ctrl_ops->query_rss == NULL && + priv->rss_config.key == NULL) { + /* RSS key must be set before the redirection table can be queried. */ + PMD_DRV_LOG(ERR, "RSS hash key must be set before the redirection table can be initialized."); return -ENOTSUP; } @@ -1686,6 +1735,8 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device) priv->max_nb_txq, priv->max_nb_rxq); setup_device: + if (process_priv->ctrl_ops->query_rss != NULL) + priv->rss_cache_dirty = true; if (priv->max_flow_rules) { err = gve_setup_flow_subsystem(priv); if (err) diff --git a/drivers/net/gve/gve_ethdev.h b/drivers/net/gve/gve_ethdev.h index 5d4797bfd6..b6c06cd82d 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -395,6 +395,7 @@ struct gve_priv { uint16_t stats_end_idx; /* end index of array of stats written by NIC */ struct gve_rss_config rss_config; + bool rss_cache_dirty; struct gve_ptype_lut *ptype_lut_dqo; /* Flow rule management */ diff --git a/drivers/net/gve/gve_rss.c b/drivers/net/gve/gve_rss.c index 4084d7955f..691ec6dab1 100644 --- a/drivers/net/gve/gve_rss.c +++ b/drivers/net/gve/gve_rss.c @@ -119,6 +119,8 @@ gve_update_priv_rss_config(struct gve_priv *priv, struct gve_rss_config *config) memcpy(priv_config->key, config->key, config->key_size * sizeof(*priv_config->key)); + priv->rss_cache_dirty = false; + return 0; } -- 2.56.0.170.g584c36229d-goog
