gve: Add adminq lock for queues creation and destruction

Adminq commands for queues creation and destruction were not
consistently protected by the driver's adminq_lock. This was previously
benign as these operations were always initiated from contexts holding
kernel-level locks (e.g., rtnl_lock, netdev_lock), which provided
serialization.

Upcoming PTP aux_work will issue adminq commands directly from the
driver to read the NIC clock, without such kernel lock protection.
To prevent race conditions with this new PTP work, this patch ensures
the adminq_lock is held during queues creation and destruction.

Signed-off-by: Ziwei Xiao <ziweixiao@google.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Harshitha Ramamurthy <hramamurthy@google.com>
Link: https://patch.msgid.link/20250614000754.164827-5-hramamurthy@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/google/gve/gve_adminq.c b/drivers/net/ethernet/google/gve/gve_adminq.c
index f57913a673b429dfc82c74434305bb333ccec949..a0cc05a9eefc2428838a243aabe7658e6e7406f9 100644 (file)
--- a/drivers/net/ethernet/google/gve/gve_adminq.c
+++ b/drivers/net/ethernet/google/gve/gve_adminq.c
@@ -463,6 +463,8 @@ static int gve_adminq_kick_and_wait(struct gve_priv *priv)
        int tail, head;
        int i;
 
+       lockdep_assert_held(&priv->adminq_lock);
+
        tail = ioread32be(&priv->reg_bar0->adminq_event_counter);
        head = priv->adminq_prod_cnt;
 
@@ -488,9 +490,6 @@ static int gve_adminq_kick_and_wait(struct gve_priv *priv)
        return 0;
 }
 
-/* This function is not threadsafe - the caller is responsible for any
- * necessary locks.
- */
 static int gve_adminq_issue_cmd(struct gve_priv *priv,
                                union gve_adminq_command *cmd_orig)
 {
@@ -498,6 +497,8 @@ static int gve_adminq_issue_cmd(struct gve_priv *priv,
        u32 opcode;
        u32 tail;
 
+       lockdep_assert_held(&priv->adminq_lock);
+
        tail = ioread32be(&priv->reg_bar0->adminq_event_counter);
 
        // Check if next command will overflow the buffer.
@@ -733,13 +734,19 @@ int gve_adminq_create_tx_queues(struct gve_priv *priv, u32 start_id, u32 num_que
        int err;
        int i;
 
+       mutex_lock(&priv->adminq_lock);
+
        for (i = start_id; i < start_id + num_queues; i++) {
                err = gve_adminq_create_tx_queue(priv, i);
                if (err)
-                       return err;
+                       goto out;
        }
 
-       return gve_adminq_kick_and_wait(priv);
+       err = gve_adminq_kick_and_wait(priv);
+
+out:
+       mutex_unlock(&priv->adminq_lock);
+       return err;
 }
 
 static void gve_adminq_get_create_rx_queue_cmd(struct gve_priv *priv,
@@ -812,13 +819,19 @@ int gve_adminq_create_rx_queues(struct gve_priv *priv, u32 num_queues)
        int err;
        int i;
 
+       mutex_lock(&priv->adminq_lock);
+
        for (i = 0; i < num_queues; i++) {
                err = gve_adminq_create_rx_queue(priv, i);
                if (err)
-                       return err;
+                       goto out;
        }
 
-       return gve_adminq_kick_and_wait(priv);
+       err = gve_adminq_kick_and_wait(priv);
+
+out:
+       mutex_unlock(&priv->adminq_lock);
+       return err;
 }
 
 static int gve_adminq_destroy_tx_queue(struct gve_priv *priv, u32 queue_index)
@@ -844,13 +857,19 @@ int gve_adminq_destroy_tx_queues(struct gve_priv *priv, u32 start_id, u32 num_qu
        int err;
        int i;
 
+       mutex_lock(&priv->adminq_lock);
+
        for (i = start_id; i < start_id + num_queues; i++) {
                err = gve_adminq_destroy_tx_queue(priv, i);
                if (err)
-                       return err;
+                       goto out;
        }
 
-       return gve_adminq_kick_and_wait(priv);
+       err = gve_adminq_kick_and_wait(priv);
+
+out:
+       mutex_unlock(&priv->adminq_lock);
+       return err;
 }
 
 static void gve_adminq_make_destroy_rx_queue_cmd(union gve_adminq_command *cmd,
@@ -885,13 +904,19 @@ int gve_adminq_destroy_rx_queues(struct gve_priv *priv, u32 num_queues)
        int err;
        int i;
 
+       mutex_lock(&priv->adminq_lock);
+
        for (i = 0; i < num_queues; i++) {
                err = gve_adminq_destroy_rx_queue(priv, i);
                if (err)
-                       return err;
+                       goto out;
        }
 
-       return gve_adminq_kick_and_wait(priv);
+       err = gve_adminq_kick_and_wait(priv);
+
+out:
+       mutex_unlock(&priv->adminq_lock);
+       return err;
 }
 
 static void gve_set_default_desc_cnt(struct gve_priv *priv,