gve: introduce config-based allocation for XDP

An earlier patch series[1] introduced RX/TX ring allocation configuration
structs which contained metadata used to allocate and configure new RX
and TX rings. This led to a much cleaner and safer allocation pattern
wherein queue resources were not deallocated until new queue resources
were successfully allocated.

Migrate the XDP allocation path to use the same pattern to allow for the
existence of a single allocation path instead of relying on XDP-specific
allocation methods. These extra allocation methods result in the
duplication of many existing behaviors while being prone to error when
configuration changes unrelated to XDP occur.

Link: https://lore.kernel.org/netdev/20240122182632.1102721-1-shailend@google.com/
Reviewed-by: Praveen Kaligineedi <pkaligineedi@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Joshua Washington <joshwash@google.com>
Signed-off-by: Harshitha Ramamurthy <hramamurthy@google.com>
Link: https://patch.msgid.link/20250321002910.1343422-3-hramamurthy@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/google/gve/gve.h b/drivers/net/ethernet/google/gve/gve.h
index 2064e592dfdd336ae6f7041c54c2da20893b7be2..e5cc3fada9c92f66d9077ddfbff4af9cacc3d7e3 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve.h
+++ b/drivers/net/ethernet/google/gve/gve.h
@@ -631,10 +631,17 @@ struct gve_notify_block {
        u32 irq;
 };
 
-/* Tracks allowed and current queue settings */
-struct gve_queue_config {
+/* Tracks allowed and current rx queue settings */
+struct gve_rx_queue_config {
        u16 max_queues;
-       u16 num_queues; /* current */
+       u16 num_queues;
+};
+
+/* Tracks allowed and current tx queue settings */
+struct gve_tx_queue_config {
+       u16 max_queues;
+       u16 num_queues; /* number of TX queues, excluding XDP queues */
+       u16 num_xdp_queues;
 };
 
 /* Tracks the available and used qpl IDs */
@@ -658,11 +665,11 @@ struct gve_ptype_lut {
 
 /* Parameters for allocating resources for tx queues */
 struct gve_tx_alloc_rings_cfg {
-       struct gve_queue_config *qcfg;
+       struct gve_tx_queue_config *qcfg;
+
+       u16 num_xdp_rings;
 
        u16 ring_size;
-       u16 start_idx;
-       u16 num_rings;
        bool raw_addressing;
 
        /* Allocated resources are returned here */
@@ -672,8 +679,8 @@ struct gve_tx_alloc_rings_cfg {
 /* Parameters for allocating resources for rx queues */
 struct gve_rx_alloc_rings_cfg {
        /* tx config is also needed to determine QPL ids */
-       struct gve_queue_config *qcfg;
-       struct gve_queue_config *qcfg_tx;
+       struct gve_rx_queue_config *qcfg_rx;
+       struct gve_tx_queue_config *qcfg_tx;
 
        u16 ring_size;
        u16 packet_buffer_size;
@@ -764,9 +771,8 @@ struct gve_priv {
        u32 rx_copybreak; /* copy packets smaller than this */
        u16 default_num_queues; /* default num queues to set up */
 
-       u16 num_xdp_queues;
-       struct gve_queue_config tx_cfg;
-       struct gve_queue_config rx_cfg;
+       struct gve_tx_queue_config tx_cfg;
+       struct gve_rx_queue_config rx_cfg;
        u32 num_ntfy_blks; /* spilt between TX and RX so must be even */
 
        struct gve_registers __iomem *reg_bar0; /* see gve_register.h */
@@ -1039,27 +1045,16 @@ static inline bool gve_is_qpl(struct gve_priv *priv)
 }
 
 /* Returns the number of tx queue page lists */
-static inline u32 gve_num_tx_qpls(const struct gve_queue_config *tx_cfg,
-                                 int num_xdp_queues,
+static inline u32 gve_num_tx_qpls(const struct gve_tx_queue_config *tx_cfg,
                                  bool is_qpl)
 {
        if (!is_qpl)
                return 0;
-       return tx_cfg->num_queues + num_xdp_queues;
-}
-
-/* Returns the number of XDP tx queue page lists
- */
-static inline u32 gve_num_xdp_qpls(struct gve_priv *priv)
-{
-       if (priv->queue_format != GVE_GQI_QPL_FORMAT)
-               return 0;
-
-       return priv->num_xdp_queues;
+       return tx_cfg->num_queues + tx_cfg->num_xdp_queues;
 }
 
 /* Returns the number of rx queue page lists */
-static inline u32 gve_num_rx_qpls(const struct gve_queue_config *rx_cfg,
+static inline u32 gve_num_rx_qpls(const struct gve_rx_queue_config *rx_cfg,
                                  bool is_qpl)
 {
        if (!is_qpl)
@@ -1077,7 +1072,8 @@ static inline u32 gve_rx_qpl_id(struct gve_priv *priv, int rx_qid)
        return priv->tx_cfg.max_queues + rx_qid;
 }
 
-static inline u32 gve_get_rx_qpl_id(const struct gve_queue_config *tx_cfg, int rx_qid)
+static inline u32 gve_get_rx_qpl_id(const struct gve_tx_queue_config *tx_cfg,
+                                   int rx_qid)
 {
        return tx_cfg->max_queues + rx_qid;
 }
@@ -1087,7 +1083,7 @@ static inline u32 gve_tx_start_qpl_id(struct gve_priv *priv)
        return gve_tx_qpl_id(priv, 0);
 }
 
-static inline u32 gve_rx_start_qpl_id(const struct gve_queue_config *tx_cfg)
+static inline u32 gve_rx_start_qpl_id(const struct gve_tx_queue_config *tx_cfg)
 {
        return gve_get_rx_qpl_id(tx_cfg, 0);
 }
@@ -1118,7 +1114,7 @@ static inline bool gve_is_gqi(struct gve_priv *priv)
 
 static inline u32 gve_num_tx_queues(struct gve_priv *priv)
 {
-       return priv->tx_cfg.num_queues + priv->num_xdp_queues;
+       return priv->tx_cfg.num_queues + priv->tx_cfg.num_xdp_queues;
 }
 
 static inline u32 gve_xdp_tx_queue_id(struct gve_priv *priv, u32 queue_id)
@@ -1234,8 +1230,8 @@ int gve_adjust_config(struct gve_priv *priv,
                      struct gve_tx_alloc_rings_cfg *tx_alloc_cfg,
                      struct gve_rx_alloc_rings_cfg *rx_alloc_cfg);
 int gve_adjust_queues(struct gve_priv *priv,
-                     struct gve_queue_config new_rx_config,
-                     struct gve_queue_config new_tx_config,
+                     struct gve_rx_queue_config new_rx_config,
+                     struct gve_tx_queue_config new_tx_config,
                      bool reset_rss);
 /* flow steering rule */
 int gve_get_flow_rule_entry(struct gve_priv *priv, struct ethtool_rxnfc *cmd);

diff --git a/drivers/net/ethernet/google/gve/gve_ethtool.c b/drivers/net/ethernet/google/gve/gve_ethtool.c
index bc59b5b4235a05381fe985ebb2d0a693dc96d7ef..a862031ba5d160ed6d4dd435f061639f384042ee 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_ethtool.c
+++ b/drivers/net/ethernet/google/gve/gve_ethtool.c
@@ -475,8 +475,8 @@ static int gve_set_channels(struct net_device *netdev,
                            struct ethtool_channels *cmd)
 {
        struct gve_priv *priv = netdev_priv(netdev);
-       struct gve_queue_config new_tx_cfg = priv->tx_cfg;
-       struct gve_queue_config new_rx_cfg = priv->rx_cfg;
+       struct gve_tx_queue_config new_tx_cfg = priv->tx_cfg;
+       struct gve_rx_queue_config new_rx_cfg = priv->rx_cfg;
        struct ethtool_channels old_settings;
        int new_tx = cmd->tx_count;
        int new_rx = cmd->rx_count;
@@ -491,10 +491,17 @@ static int gve_set_channels(struct net_device *netdev,
        if (!new_rx || !new_tx)
                return -EINVAL;
 
-       if (priv->num_xdp_queues &&
-           (new_tx != new_rx || (2 * new_tx > priv->tx_cfg.max_queues))) {
-               dev_err(&priv->pdev->dev, "XDP load failed: The number of configured RX queues should be equal to the number of configured TX queues and the number of configured RX/TX queues should be less than or equal to half the maximum number of RX/TX queues");
-               return -EINVAL;
+       if (priv->xdp_prog) {
+               if (new_tx != new_rx ||
+                   (2 * new_tx > priv->tx_cfg.max_queues)) {
+                       dev_err(&priv->pdev->dev, "The number of configured RX queues should be equal to the number of configured TX queues and the number of configured RX/TX queues should be less than or equal to half the maximum number of RX/TX queues when XDP program is installed");
+                       return -EINVAL;
+               }
+
+               /* One XDP TX queue per RX queue. */
+               new_tx_cfg.num_xdp_queues = new_rx;
+       } else {
+               new_tx_cfg.num_xdp_queues = 0;
        }
 
        if (new_rx != priv->rx_cfg.num_queues &&

diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
index 6dcdcaf518f4cf35fd72a3b945f709b0a123e0fc..354f526a923851a5e8f4618a40ca8ee8416084b0 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_main.c
+++ b/drivers/net/ethernet/google/gve/gve_main.c
@@ -795,30 +795,13 @@ static struct gve_queue_page_list *gve_rx_get_qpl(struct gve_priv *priv, int idx
                return rx->dqo.qpl;
 }
 
-static int gve_register_xdp_qpls(struct gve_priv *priv)
-{
-       int start_id;
-       int err;
-       int i;
-
-       start_id = gve_xdp_tx_start_queue_id(priv);
-       for (i = start_id; i < start_id + gve_num_xdp_qpls(priv); i++) {
-               err = gve_register_qpl(priv, gve_tx_get_qpl(priv, i));
-               /* This failure will trigger a reset - no need to clean up */
-               if (err)
-                       return err;
-       }
-       return 0;
-}
-
 static int gve_register_qpls(struct gve_priv *priv)
 {
        int num_tx_qpls, num_rx_qpls;
        int err;
        int i;
 
-       num_tx_qpls = gve_num_tx_qpls(&priv->tx_cfg, gve_num_xdp_qpls(priv),
-                                     gve_is_qpl(priv));
+       num_tx_qpls = gve_num_tx_qpls(&priv->tx_cfg, gve_is_qpl(priv));
        num_rx_qpls = gve_num_rx_qpls(&priv->rx_cfg, gve_is_qpl(priv));
 
        for (i = 0; i < num_tx_qpls; i++) {
@@ -836,30 +819,13 @@ static int gve_register_qpls(struct gve_priv *priv)
        return 0;
 }
 
-static int gve_unregister_xdp_qpls(struct gve_priv *priv)
-{
-       int start_id;
-       int err;
-       int i;
-
-       start_id = gve_xdp_tx_start_queue_id(priv);
-       for (i = start_id; i < start_id + gve_num_xdp_qpls(priv); i++) {
-               err = gve_unregister_qpl(priv, gve_tx_get_qpl(priv, i));
-               /* This failure will trigger a reset - no need to clean */
-               if (err)
-                       return err;
-       }
-       return 0;
-}
-
 static int gve_unregister_qpls(struct gve_priv *priv)
 {
        int num_tx_qpls, num_rx_qpls;
        int err;
        int i;
 
-       num_tx_qpls = gve_num_tx_qpls(&priv->tx_cfg, gve_num_xdp_qpls(priv),
-                                     gve_is_qpl(priv));
+       num_tx_qpls = gve_num_tx_qpls(&priv->tx_cfg, gve_is_qpl(priv));
        num_rx_qpls = gve_num_rx_qpls(&priv->rx_cfg, gve_is_qpl(priv));
 
        for (i = 0; i < num_tx_qpls; i++) {
@@ -878,27 +844,6 @@ static int gve_unregister_qpls(struct gve_priv *priv)
        return 0;
 }
 
-static int gve_create_xdp_rings(struct gve_priv *priv)
-{
-       int err;
-
-       err = gve_adminq_create_tx_queues(priv,
-                                         gve_xdp_tx_start_queue_id(priv),
-                                         priv->num_xdp_queues);
-       if (err) {
-               netif_err(priv, drv, priv->dev, "failed to create %d XDP tx queues\n",
-                         priv->num_xdp_queues);
-               /* This failure will trigger a reset - no need to clean
-                * up
-                */
-               return err;
-       }
-       netif_dbg(priv, drv, priv->dev, "created %d XDP tx queues\n",
-                 priv->num_xdp_queues);
-
-       return 0;
-}
-
 static int gve_create_rings(struct gve_priv *priv)
 {
        int num_tx_queues = gve_num_tx_queues(priv);
@@ -954,7 +899,7 @@ static void init_xdp_sync_stats(struct gve_priv *priv)
        int i;
 
        /* Init stats */
-       for (i = start_id; i < start_id + priv->num_xdp_queues; i++) {
+       for (i = start_id; i < start_id + priv->tx_cfg.num_xdp_queues; i++) {
                int ntfy_idx = gve_tx_idx_to_ntfy(priv, i);
 
                u64_stats_init(&priv->tx[i].statss);
@@ -979,24 +924,21 @@ static void gve_init_sync_stats(struct gve_priv *priv)
 static void gve_tx_get_curr_alloc_cfg(struct gve_priv *priv,
                                      struct gve_tx_alloc_rings_cfg *cfg)
 {
-       int num_xdp_queues = priv->xdp_prog ? priv->rx_cfg.num_queues : 0;
-
        cfg->qcfg = &priv->tx_cfg;
        cfg->raw_addressing = !gve_is_qpl(priv);
        cfg->ring_size = priv->tx_desc_cnt;
-       cfg->start_idx = 0;
-       cfg->num_rings = priv->tx_cfg.num_queues + num_xdp_queues;
+       cfg->num_xdp_rings = cfg->qcfg->num_xdp_queues;
        cfg->tx = priv->tx;
 }
 
-static void gve_tx_stop_rings(struct gve_priv *priv, int start_id, int num_rings)
+static void gve_tx_stop_rings(struct gve_priv *priv, int num_rings)
 {
        int i;
 
        if (!priv->tx)
                return;
 
-       for (i = start_id; i < start_id + num_rings; i++) {
+       for (i = 0; i < num_rings; i++) {
                if (gve_is_gqi(priv))
                        gve_tx_stop_ring_gqi(priv, i);
                else
@@ -1004,12 +946,11 @@ static void gve_tx_stop_rings(struct gve_priv *priv, int start_id, int num_rings
        }
 }
 
-static void gve_tx_start_rings(struct gve_priv *priv, int start_id,
-                              int num_rings)
+static void gve_tx_start_rings(struct gve_priv *priv, int num_rings)
 {
        int i;
 
-       for (i = start_id; i < start_id + num_rings; i++) {
+       for (i = 0; i < num_rings; i++) {
                if (gve_is_gqi(priv))
                        gve_tx_start_ring_gqi(priv, i);
                else
@@ -1017,28 +958,6 @@ static void gve_tx_start_rings(struct gve_priv *priv, int start_id,
        }
 }
 
-static int gve_alloc_xdp_rings(struct gve_priv *priv)
-{
-       struct gve_tx_alloc_rings_cfg cfg = {0};
-       int err = 0;
-
-       if (!priv->num_xdp_queues)
-               return 0;
-
-       gve_tx_get_curr_alloc_cfg(priv, &cfg);
-       cfg.start_idx = gve_xdp_tx_start_queue_id(priv);
-       cfg.num_rings = priv->num_xdp_queues;
-
-       err = gve_tx_alloc_rings_gqi(priv, &cfg);
-       if (err)
-               return err;
-
-       gve_tx_start_rings(priv, cfg.start_idx, cfg.num_rings);
-       init_xdp_sync_stats(priv);
-
-       return 0;
-}
-
 static int gve_queues_mem_alloc(struct gve_priv *priv,
                                struct gve_tx_alloc_rings_cfg *tx_alloc_cfg,
                                struct gve_rx_alloc_rings_cfg *rx_alloc_cfg)
@@ -1069,26 +988,6 @@ free_tx:
        return err;
 }
 
-static int gve_destroy_xdp_rings(struct gve_priv *priv)
-{
-       int start_id;
-       int err;
-
-       start_id = gve_xdp_tx_start_queue_id(priv);
-       err = gve_adminq_destroy_tx_queues(priv,
-                                          start_id,
-                                          priv->num_xdp_queues);
-       if (err) {
-               netif_err(priv, drv, priv->dev,
-                         "failed to destroy XDP queues\n");
-               /* This failure will trigger a reset - no need to clean up */
-               return err;
-       }
-       netif_dbg(priv, drv, priv->dev, "destroyed XDP queues\n");
-
-       return 0;
-}
-
 static int gve_destroy_rings(struct gve_priv *priv)
 {
        int num_tx_queues = gve_num_tx_queues(priv);
@@ -1113,20 +1012,6 @@ static int gve_destroy_rings(struct gve_priv *priv)
        return 0;
 }
 
-static void gve_free_xdp_rings(struct gve_priv *priv)
-{
-       struct gve_tx_alloc_rings_cfg cfg = {0};
-
-       gve_tx_get_curr_alloc_cfg(priv, &cfg);
-       cfg.start_idx = gve_xdp_tx_start_queue_id(priv);
-       cfg.num_rings = priv->num_xdp_queues;
-
-       if (priv->tx) {
-               gve_tx_stop_rings(priv, cfg.start_idx, cfg.num_rings);
-               gve_tx_free_rings_gqi(priv, &cfg);
-       }
-}
-
 static void gve_queues_mem_free(struct gve_priv *priv,
                                struct gve_tx_alloc_rings_cfg *tx_cfg,
                                struct gve_rx_alloc_rings_cfg *rx_cfg)
@@ -1253,7 +1138,7 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev)
        int i, j;
        u32 tx_qid;
 
-       if (!priv->num_xdp_queues)
+       if (!priv->tx_cfg.num_xdp_queues)
                return 0;
 
        for (i = 0; i < priv->rx_cfg.num_queues; i++) {
@@ -1283,7 +1168,7 @@ static int gve_reg_xdp_info(struct gve_priv *priv, struct net_device *dev)
                }
        }
 
-       for (i = 0; i < priv->num_xdp_queues; i++) {
+       for (i = 0; i < priv->tx_cfg.num_xdp_queues; i++) {
                tx_qid = gve_xdp_tx_queue_id(priv, i);
                priv->tx[tx_qid].xsk_pool = xsk_get_pool_from_qid(dev, i);
        }
@@ -1304,7 +1189,7 @@ static void gve_unreg_xdp_info(struct gve_priv *priv)
 {
        int i, tx_qid;
 
-       if (!priv->num_xdp_queues)
+       if (!priv->tx_cfg.num_xdp_queues || !priv->rx || !priv->tx)
                return;
 
        for (i = 0; i < priv->rx_cfg.num_queues; i++) {
@@ -1317,7 +1202,7 @@ static void gve_unreg_xdp_info(struct gve_priv *priv)
                }
        }
 
-       for (i = 0; i < priv->num_xdp_queues; i++) {
+       for (i = 0; i < priv->tx_cfg.num_xdp_queues; i++) {
                tx_qid = gve_xdp_tx_queue_id(priv, i);
                priv->tx[tx_qid].xsk_pool = NULL;
        }
@@ -1334,7 +1219,7 @@ static void gve_drain_page_cache(struct gve_priv *priv)
 static void gve_rx_get_curr_alloc_cfg(struct gve_priv *priv,
                                      struct gve_rx_alloc_rings_cfg *cfg)
 {
-       cfg->qcfg = &priv->rx_cfg;
+       cfg->qcfg_rx = &priv->rx_cfg;
        cfg->qcfg_tx = &priv->tx_cfg;
        cfg->raw_addressing = !gve_is_qpl(priv);
        cfg->enable_header_split = priv->header_split_enabled;
@@ -1415,17 +1300,13 @@ static int gve_queues_start(struct gve_priv *priv,
 
        /* Record new configs into priv */
        priv->tx_cfg = *tx_alloc_cfg->qcfg;
-       priv->rx_cfg = *rx_alloc_cfg->qcfg;
+       priv->tx_cfg.num_xdp_queues = tx_alloc_cfg->num_xdp_rings;
+       priv->rx_cfg = *rx_alloc_cfg->qcfg_rx;
        priv->tx_desc_cnt = tx_alloc_cfg->ring_size;
        priv->rx_desc_cnt = rx_alloc_cfg->ring_size;
 
-       if (priv->xdp_prog)
-               priv->num_xdp_queues = priv->rx_cfg.num_queues;
-       else
-               priv->num_xdp_queues = 0;
-
-       gve_tx_start_rings(priv, 0, tx_alloc_cfg->num_rings);
-       gve_rx_start_rings(priv, rx_alloc_cfg->qcfg->num_queues);
+       gve_tx_start_rings(priv, gve_num_tx_queues(priv));
+       gve_rx_start_rings(priv, rx_alloc_cfg->qcfg_rx->num_queues);
        gve_init_sync_stats(priv);
 
        err = netif_set_real_num_tx_queues(dev, priv->tx_cfg.num_queues);
@@ -1477,7 +1358,7 @@ reset:
        /* return the original error */
        return err;
 stop_and_free_rings:
-       gve_tx_stop_rings(priv, 0, gve_num_tx_queues(priv));
+       gve_tx_stop_rings(priv, gve_num_tx_queues(priv));
        gve_rx_stop_rings(priv, priv->rx_cfg.num_queues);
        gve_queues_mem_remove(priv);
        return err;
@@ -1526,7 +1407,7 @@ static int gve_queues_stop(struct gve_priv *priv)
 
        gve_unreg_xdp_info(priv);
 
-       gve_tx_stop_rings(priv, 0, gve_num_tx_queues(priv));
+       gve_tx_stop_rings(priv, gve_num_tx_queues(priv));
        gve_rx_stop_rings(priv, priv->rx_cfg.num_queues);
 
        priv->interface_down_cnt++;
@@ -1556,56 +1437,6 @@ static int gve_close(struct net_device *dev)
        return 0;
 }
 
-static int gve_remove_xdp_queues(struct gve_priv *priv)
-{
-       int err;
-
-       err = gve_destroy_xdp_rings(priv);
-       if (err)
-               return err;
-
-       err = gve_unregister_xdp_qpls(priv);
-       if (err)
-               return err;
-
-       gve_unreg_xdp_info(priv);
-       gve_free_xdp_rings(priv);
-
-       priv->num_xdp_queues = 0;
-       return 0;
-}
-
-static int gve_add_xdp_queues(struct gve_priv *priv)
-{
-       int err;
-
-       priv->num_xdp_queues = priv->rx_cfg.num_queues;
-
-       err = gve_alloc_xdp_rings(priv);
-       if (err)
-               goto err;
-
-       err = gve_reg_xdp_info(priv, priv->dev);
-       if (err)
-               goto free_xdp_rings;
-
-       err = gve_register_xdp_qpls(priv);
-       if (err)
-               goto free_xdp_rings;
-
-       err = gve_create_xdp_rings(priv);
-       if (err)
-               goto free_xdp_rings;
-
-       return 0;
-
-free_xdp_rings:
-       gve_free_xdp_rings(priv);
-err:
-       priv->num_xdp_queues = 0;
-       return err;
-}
-
 static void gve_handle_link_status(struct gve_priv *priv, bool link_status)
 {
        if (!gve_get_napi_enabled(priv))
@@ -1623,6 +1454,18 @@ static void gve_handle_link_status(struct gve_priv *priv, bool link_status)
        }
 }
 
+static int gve_configure_rings_xdp(struct gve_priv *priv,
+                                  u16 num_xdp_rings)
+{
+       struct gve_tx_alloc_rings_cfg tx_alloc_cfg = {0};
+       struct gve_rx_alloc_rings_cfg rx_alloc_cfg = {0};
+
+       gve_get_curr_alloc_cfgs(priv, &tx_alloc_cfg, &rx_alloc_cfg);
+       tx_alloc_cfg.num_xdp_rings = num_xdp_rings;
+
+       return gve_adjust_config(priv, &tx_alloc_cfg, &rx_alloc_cfg);
+}
+
 static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog,
                       struct netlink_ext_ack *extack)
 {
@@ -1635,29 +1478,26 @@ static int gve_set_xdp(struct gve_priv *priv, struct bpf_prog *prog,
                WRITE_ONCE(priv->xdp_prog, prog);
                if (old_prog)
                        bpf_prog_put(old_prog);
+
+               /* Update priv XDP queue configuration */
+               priv->tx_cfg.num_xdp_queues = priv->xdp_prog ?
+                       priv->rx_cfg.num_queues : 0;
                return 0;
        }
 
-       gve_turndown(priv);
-       if (!old_prog && prog) {
-               // Allocate XDP TX queues if an XDP program is
-               // being installed
-               err = gve_add_xdp_queues(priv);
-               if (err)
-                       goto out;
-       } else if (old_prog && !prog) {
-               // Remove XDP TX queues if an XDP program is
-               // being uninstalled
-               err = gve_remove_xdp_queues(priv);
-               if (err)
-                       goto out;
-       }
+       if (!old_prog && prog)
+               err = gve_configure_rings_xdp(priv, priv->rx_cfg.num_queues);
+       else if (old_prog && !prog)
+               err = gve_configure_rings_xdp(priv, 0);
+
+       if (err)
+               goto out;
+
        WRITE_ONCE(priv->xdp_prog, prog);
        if (old_prog)
                bpf_prog_put(old_prog);
 
 out:
-       gve_turnup(priv);
        status = ioread32be(&priv->reg_bar0->device_status);
        gve_handle_link_status(priv, GVE_DEVICE_STATUS_LINK_STATUS_MASK & status);
        return err;
@@ -1908,13 +1748,12 @@ int gve_adjust_config(struct gve_priv *priv,
 }
 
 int gve_adjust_queues(struct gve_priv *priv,
-                     struct gve_queue_config new_rx_config,
-                     struct gve_queue_config new_tx_config,
+                     struct gve_rx_queue_config new_rx_config,
+                     struct gve_tx_queue_config new_tx_config,
                      bool reset_rss)
 {
        struct gve_tx_alloc_rings_cfg tx_alloc_cfg = {0};
        struct gve_rx_alloc_rings_cfg rx_alloc_cfg = {0};
-       int num_xdp_queues;
        int err;
 
        gve_get_curr_alloc_cfgs(priv, &tx_alloc_cfg, &rx_alloc_cfg);
@@ -1922,13 +1761,8 @@ int gve_adjust_queues(struct gve_priv *priv,
        /* Relay the new config from ethtool */
        tx_alloc_cfg.qcfg = &new_tx_config;
        rx_alloc_cfg.qcfg_tx = &new_tx_config;
-       rx_alloc_cfg.qcfg = &new_rx_config;
+       rx_alloc_cfg.qcfg_rx = &new_rx_config;
        rx_alloc_cfg.reset_rss = reset_rss;
-       tx_alloc_cfg.num_rings = new_tx_config.num_queues;
-
-       /* Add dedicated XDP TX queues if enabled. */
-       num_xdp_queues = priv->xdp_prog ? new_rx_config.num_queues : 0;
-       tx_alloc_cfg.num_rings += num_xdp_queues;
 
        if (netif_running(priv->dev)) {
                err = gve_adjust_config(priv, &tx_alloc_cfg, &rx_alloc_cfg);
@@ -2056,7 +1890,7 @@ static void gve_turnup(struct gve_priv *priv)
                napi_schedule(&block->napi);
        }
 
-       if (priv->num_xdp_queues && gve_supports_xdp_xmit(priv))
+       if (priv->tx_cfg.num_xdp_queues && gve_supports_xdp_xmit(priv))
                xdp_features_set_redirect_target(priv->dev, false);
 
        gve_set_napi_enabled(priv);
@@ -2412,6 +2246,7 @@ static int gve_init_priv(struct gve_priv *priv, bool skip_describe_device)
                priv->rx_cfg.num_queues = min_t(int, priv->default_num_queues,
                                                priv->rx_cfg.num_queues);
        }
+       priv->tx_cfg.num_xdp_queues = 0;
 
        dev_info(&priv->pdev->dev, "TX queues %d, RX queues %d\n",
                 priv->tx_cfg.num_queues, priv->rx_cfg.num_queues);

diff --git a/drivers/net/ethernet/google/gve/gve_rx.c b/drivers/net/ethernet/google/gve/gve_rx.c
index acb73d4d0de6bc174ac178249bddc3cefba92a38..7b774cc510ccaa4dadc52b1fd6ccf1c64b30669e 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_rx.c
+++ b/drivers/net/ethernet/google/gve/gve_rx.c
@@ -385,12 +385,12 @@ int gve_rx_alloc_rings_gqi(struct gve_priv *priv,
        int err = 0;
        int i, j;
 
-       rx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_rx_ring),
+       rx = kvcalloc(cfg->qcfg_rx->max_queues, sizeof(struct gve_rx_ring),
                      GFP_KERNEL);
        if (!rx)
                return -ENOMEM;
 
-       for (i = 0; i < cfg->qcfg->num_queues; i++) {
+       for (i = 0; i < cfg->qcfg_rx->num_queues; i++) {
                err = gve_rx_alloc_ring_gqi(priv, cfg, &rx[i], i);
                if (err) {
                        netif_err(priv, drv, priv->dev,
@@ -419,7 +419,7 @@ void gve_rx_free_rings_gqi(struct gve_priv *priv,
        if (!rx)
                return;
 
-       for (i = 0; i < cfg->qcfg->num_queues;  i++)
+       for (i = 0; i < cfg->qcfg_rx->num_queues;  i++)
                gve_rx_free_ring_gqi(priv, &rx[i], cfg);
 
        kvfree(rx);

diff --git a/drivers/net/ethernet/google/gve/gve_rx_dqo.c b/drivers/net/ethernet/google/gve/gve_rx_dqo.c
index 856ade0c209f6fdd2fe7c5d625eb325a69869a7b..dcdad6d09bf39ccb84374f52609aec49cb271823 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_rx_dqo.c
+++ b/drivers/net/ethernet/google/gve/gve_rx_dqo.c
@@ -299,12 +299,12 @@ int gve_rx_alloc_rings_dqo(struct gve_priv *priv,
        int err;
        int i;
 
-       rx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_rx_ring),
+       rx = kvcalloc(cfg->qcfg_rx->max_queues, sizeof(struct gve_rx_ring),
                      GFP_KERNEL);
        if (!rx)
                return -ENOMEM;
 
-       for (i = 0; i < cfg->qcfg->num_queues; i++) {
+       for (i = 0; i < cfg->qcfg_rx->num_queues; i++) {
                err = gve_rx_alloc_ring_dqo(priv, cfg, &rx[i], i);
                if (err) {
                        netif_err(priv, drv, priv->dev,
@@ -333,7 +333,7 @@ void gve_rx_free_rings_dqo(struct gve_priv *priv,
        if (!rx)
                return;
 
-       for (i = 0; i < cfg->qcfg->num_queues;  i++)
+       for (i = 0; i < cfg->qcfg_rx->num_queues;  i++)
                gve_rx_free_ring_dqo(priv, &rx[i], cfg);
 
        kvfree(rx);

diff --git a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c
index c8c067e1805983b8eea7785bf7e134d59643376a..1b40bf0c811a3e6962332b92fbba0c64d440323b 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_tx.c
+++ b/drivers/net/ethernet/google/gve/gve_tx.c
@@ -334,27 +334,23 @@ int gve_tx_alloc_rings_gqi(struct gve_priv *priv,
                           struct gve_tx_alloc_rings_cfg *cfg)
 {
        struct gve_tx_ring *tx = cfg->tx;
+       int total_queues;
        int err = 0;
        int i, j;
 
-       if (cfg->start_idx + cfg->num_rings > cfg->qcfg->max_queues) {
+       total_queues = cfg->qcfg->num_queues + cfg->num_xdp_rings;
+       if (total_queues > cfg->qcfg->max_queues) {
                netif_err(priv, drv, priv->dev,
                          "Cannot alloc more than the max num of Tx rings\n");
                return -EINVAL;
        }
 
-       if (cfg->start_idx == 0) {
-               tx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_tx_ring),
-                             GFP_KERNEL);
-               if (!tx)
-                       return -ENOMEM;
-       } else if (!tx) {
-               netif_err(priv, drv, priv->dev,
-                         "Cannot alloc tx rings from a nonzero start idx without tx array\n");
-               return -EINVAL;
-       }
+       tx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_tx_ring),
+                     GFP_KERNEL);
+       if (!tx)
+               return -ENOMEM;
 
-       for (i = cfg->start_idx; i < cfg->start_idx + cfg->num_rings; i++) {
+       for (i = 0; i < total_queues; i++) {
                err = gve_tx_alloc_ring_gqi(priv, cfg, &tx[i], i);
                if (err) {
                        netif_err(priv, drv, priv->dev,
@@ -370,8 +366,7 @@ int gve_tx_alloc_rings_gqi(struct gve_priv *priv,
 cleanup:
        for (j = 0; j < i; j++)
                gve_tx_free_ring_gqi(priv, &tx[j], cfg);
-       if (cfg->start_idx == 0)
-               kvfree(tx);
+       kvfree(tx);
        return err;
 }
 
@@ -384,13 +379,11 @@ void gve_tx_free_rings_gqi(struct gve_priv *priv,
        if (!tx)
                return;
 
-       for (i = cfg->start_idx; i < cfg->start_idx + cfg->num_rings; i++)
+       for (i = 0; i < cfg->qcfg->num_queues + cfg->qcfg->num_xdp_queues; i++)
                gve_tx_free_ring_gqi(priv, &tx[i], cfg);
 
-       if (cfg->start_idx == 0) {
-               kvfree(tx);
-               cfg->tx = NULL;
-       }
+       kvfree(tx);
+       cfg->tx = NULL;
 }
 
 /* gve_tx_avail - Calculates the number of slots available in the ring
@@ -844,7 +837,7 @@ int gve_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,
                return -ENETDOWN;
 
        qid = gve_xdp_tx_queue_id(priv,
-                                 smp_processor_id() % priv->num_xdp_queues);
+                                 smp_processor_id() % priv->tx_cfg.num_xdp_queues);
 
        tx = &priv->tx[qid];
 

diff --git a/drivers/net/ethernet/google/gve/gve_tx_dqo.c b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
index 394debc62268aadf2579f9b516e045cb48287e7c..2eba868d80370a908ea70b1f6c1c85081d180508 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_tx_dqo.c
+++ b/drivers/net/ethernet/google/gve/gve_tx_dqo.c
@@ -379,27 +379,23 @@ int gve_tx_alloc_rings_dqo(struct gve_priv *priv,
                           struct gve_tx_alloc_rings_cfg *cfg)
 {
        struct gve_tx_ring *tx = cfg->tx;
+       int total_queues;
        int err = 0;
        int i, j;
 
-       if (cfg->start_idx + cfg->num_rings > cfg->qcfg->max_queues) {
+       total_queues = cfg->qcfg->num_queues + cfg->num_xdp_rings;
+       if (total_queues > cfg->qcfg->max_queues) {
                netif_err(priv, drv, priv->dev,
                          "Cannot alloc more than the max num of Tx rings\n");
                return -EINVAL;
        }
 
-       if (cfg->start_idx == 0) {
-               tx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_tx_ring),
-                             GFP_KERNEL);
-               if (!tx)
-                       return -ENOMEM;
-       } else if (!tx) {
-               netif_err(priv, drv, priv->dev,
-                         "Cannot alloc tx rings from a nonzero start idx without tx array\n");
-               return -EINVAL;
-       }
+       tx = kvcalloc(cfg->qcfg->max_queues, sizeof(struct gve_tx_ring),
+                     GFP_KERNEL);
+       if (!tx)
+               return -ENOMEM;
 
-       for (i = cfg->start_idx; i < cfg->start_idx + cfg->num_rings; i++) {
+       for (i = 0; i < total_queues; i++) {
                err = gve_tx_alloc_ring_dqo(priv, cfg, &tx[i], i);
                if (err) {
                        netif_err(priv, drv, priv->dev,
@@ -415,8 +411,7 @@ int gve_tx_alloc_rings_dqo(struct gve_priv *priv,
 err:
        for (j = 0; j < i; j++)
                gve_tx_free_ring_dqo(priv, &tx[j], cfg);
-       if (cfg->start_idx == 0)
-               kvfree(tx);
+       kvfree(tx);
        return err;
 }
 
@@ -429,13 +424,11 @@ void gve_tx_free_rings_dqo(struct gve_priv *priv,
        if (!tx)
                return;
 
-       for (i = cfg->start_idx; i < cfg->start_idx + cfg->num_rings; i++)
+       for (i = 0; i < cfg->qcfg->num_queues + cfg->qcfg->num_xdp_queues; i++)
                gve_tx_free_ring_dqo(priv, &tx[i], cfg);
 
-       if (cfg->start_idx == 0) {
-               kvfree(tx);
-               cfg->tx = NULL;
-       }
+       kvfree(tx);
+       cfg->tx = NULL;
 }
 
 /* Returns the number of slots available in the ring */