Introduce a flag that determines whether the RSS configuration stored in priv is the latest from the device or not. 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.
The RSS configuration should never be read if the cache is dirty. Signed-off-by: Joshua Washington <[email protected]> --- drivers/net/gve/base/gve_adminq.c | 1 + drivers/net/gve/gve_ethdev.c | 75 ++++++++++++++++++++++++------- drivers/net/gve/gve_ethdev.h | 1 + drivers/net/gve/gve_rss.c | 2 + 4 files changed, 63 insertions(+), 16 deletions(-) diff --git a/drivers/net/gve/base/gve_adminq.c b/drivers/net/gve/base/gve_adminq.c index db3e43c6b0..60e8544ef4 100644 --- a/drivers/net/gve/base/gve_adminq.c +++ b/drivers/net/gve/base/gve_adminq.c @@ -1278,6 +1278,7 @@ int gve_adminq_configure_rss(struct gve_priv *priv, }; err = gve_adminq_execute_cmd(priv, &cmd); + priv->rss_cache_dirty = true; if (err == 0) gve_update_priv_rss_config(priv, rss_config); diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c index 49604f9362..fd77b5928a 100644 --- a/drivers/net/gve/gve_ethdev.c +++ b/drivers/net/gve/gve_ethdev.c @@ -210,6 +210,27 @@ gve_teardown_queue_page_list(struct gve_priv *priv, return 0; } +static int +gve_rss_update_cache(struct gve_priv *priv) +{ + if (priv->rss_cache_dirty) { + if (priv->ctrl_ops->query_rss == NULL) { + PMD_DRV_LOG(ERR, + "No RSS query functionality present in ops table"); + return -ENOENT; + } + + priv->ctrl_ops->query_rss(priv); + if (priv->rss_cache_dirty) { + PMD_DRV_LOG(ERR, + "RSS cache not updated after querying device."); + return -ENODATA; + } + } + + return 0; +} + static int gve_dev_configure(struct rte_eth_dev *dev) { @@ -233,19 +254,24 @@ 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 = priv->ctrl_ops->configure_rss(priv, &update_reta_config); - if (err) - PMD_DRV_LOG(ERR, - "Could not reconfigure RSS redirection table."); + err = gve_rss_update_cache(priv); + if (err == 0) { + 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 = 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; + gve_free_rss_config(&update_reta_config); + return err; + } } return 0; @@ -1093,7 +1119,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) @@ -1143,6 +1168,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) @@ -1170,6 +1199,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)) { @@ -1177,6 +1207,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; @@ -1202,6 +1235,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 " @@ -1246,6 +1283,7 @@ gve_rss_reta_query(struct rte_eth_dev *dev, { struct gve_priv *priv = dev->data->dev_private; int table_id; + int err; int i; if (!(dev->data->dev_conf.rxmode.offloads & @@ -1254,10 +1292,13 @@ 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 (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; } @@ -1655,6 +1696,8 @@ gve_init_priv(struct gve_priv *priv, bool skip_describe_device) priv->max_nb_txq, priv->max_nb_rxq); setup_device: + if (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 9d8939da33..ef93db0c1d 100644 --- a/drivers/net/gve/gve_ethdev.h +++ b/drivers/net/gve/gve_ethdev.h @@ -399,6 +399,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 67b910ed22..5cd65f2df9 100644 --- a/drivers/net/gve/gve_rss.c +++ b/drivers/net/gve/gve_rss.c @@ -120,6 +120,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.rc1.315.gc6ed9934b7-goog
