]> www.infradead.org Git - users/hch/misc.git/commitdiff
eth: gve: add missing netdev locks on reset and shutdown paths
authorJakub Kicinski <kuba@kernel.org>
Fri, 28 Mar 2025 16:47:42 +0000 (09:47 -0700)
committerJakub Kicinski <kuba@kernel.org>
Mon, 31 Mar 2025 23:53:05 +0000 (16:53 -0700)
All the misc entry points end up calling into either gve_open()
or gve_close(), they take rtnl_lock today but since the recent
instance locking changes should also take the instance lock.

Found by code inspection and untested.

Fixes: cae03e5bdd9e ("net: hold netdev instance lock during queue operations")
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com>
Link: https://patch.msgid.link/20250328164742.1268069-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/google/gve/gve_main.c

index cb2f9978f45e2ce9dc8be309d7463bb344280f3a..f9a73c9568614951d8f575bc1ce61aa2b6cf27d1 100644 (file)
@@ -2077,7 +2077,9 @@ static void gve_handle_reset(struct gve_priv *priv)
 
        if (gve_get_do_reset(priv)) {
                rtnl_lock();
+               netdev_lock(priv->dev);
                gve_reset(priv, false);
+               netdev_unlock(priv->dev);
                rtnl_unlock();
        }
 }
@@ -2714,6 +2716,7 @@ static void gve_shutdown(struct pci_dev *pdev)
        bool was_up = netif_running(priv->dev);
 
        rtnl_lock();
+       netdev_lock(netdev);
        if (was_up && gve_close(priv->dev)) {
                /* If the dev was up, attempt to close, if close fails, reset */
                gve_reset_and_teardown(priv, was_up);
@@ -2721,6 +2724,7 @@ static void gve_shutdown(struct pci_dev *pdev)
                /* If the dev wasn't up or close worked, finish tearing down */
                gve_teardown_priv_resources(priv);
        }
+       netdev_unlock(netdev);
        rtnl_unlock();
 }