]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: devmem: do not WARN conditionally after netdev_rx_queue_restart()
authorTaehee Yoo <ap420073@gmail.com>
Sun, 9 Mar 2025 13:42:18 +0000 (13:42 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 10 Mar 2025 20:31:12 +0000 (13:31 -0700)
When devmem socket is closed, netdev_rx_queue_restart() is called to
reset queue by the net_devmem_unbind_dmabuf(). But callback may return
-ENETDOWN if the interface is down because queues are already freed
when the interface is down so queue reset is not needed.
So, it should not warn if the return value is -ENETDOWN.

Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Reviewed-by: Mina Almasry <almasrymina@google.com>
Link: https://patch.msgid.link/20250309134219.91670-8-ap420073@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/core/devmem.c

index 3bba3f018df0349e125803a3bc4fed781bea46bc..0e5a2c672efd89d6d495ee67ca6ab525c21901eb 100644 (file)
@@ -109,6 +109,7 @@ void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)
        struct netdev_rx_queue *rxq;
        unsigned long xa_idx;
        unsigned int rxq_idx;
+       int err;
 
        if (binding->list.next)
                list_del(&binding->list);
@@ -120,7 +121,8 @@ void net_devmem_unbind_dmabuf(struct net_devmem_dmabuf_binding *binding)
 
                rxq_idx = get_netdev_rx_queue_index(rxq);
 
-               WARN_ON(netdev_rx_queue_restart(binding->dev, rxq_idx));
+               err = netdev_rx_queue_restart(binding->dev, rxq_idx);
+               WARN_ON(err && err != -ENETDOWN);
        }
 
        xa_erase(&net_devmem_dmabuf_bindings, binding->id);