xsk: refactor xdp_umem_assign_dev()

Return early and only take the ref on dev once there is no possibility
of failing.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Acked-by: Björn Töpel <bjorn.topel@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index f47abb46c5874c8b949b8d3cb3d278c479775e06..c199d66b5f3fb93ec1aaa9ab7fcf49e3aeb31adc 100644 (file)
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -56,41 +56,34 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,
        if (force_copy)
                return 0;
 
-       dev_hold(dev);
+       if (!dev->netdev_ops->ndo_bpf || !dev->netdev_ops->ndo_xsk_async_xmit)
+               return force_zc ? -ENOTSUPP : 0; /* fail or fallback */
 
-       if (dev->netdev_ops->ndo_bpf && dev->netdev_ops->ndo_xsk_async_xmit) {
-               bpf.command = XDP_QUERY_XSK_UMEM;
+       bpf.command = XDP_QUERY_XSK_UMEM;
 
-               rtnl_lock();
-               err = dev->netdev_ops->ndo_bpf(dev, &bpf);
-               rtnl_unlock();
+       rtnl_lock();
+       err = dev->netdev_ops->ndo_bpf(dev, &bpf);
+       rtnl_unlock();
 
-               if (err) {
-                       dev_put(dev);
-                       return force_zc ? -ENOTSUPP : 0;
-               }
+       if (err)
+               return force_zc ? -ENOTSUPP : 0;
 
-               bpf.command = XDP_SETUP_XSK_UMEM;
-               bpf.xsk.umem = umem;
-               bpf.xsk.queue_id = queue_id;
+       bpf.command = XDP_SETUP_XSK_UMEM;
+       bpf.xsk.umem = umem;
+       bpf.xsk.queue_id = queue_id;
 
-               rtnl_lock();
-               err = dev->netdev_ops->ndo_bpf(dev, &bpf);
-               rtnl_unlock();
+       rtnl_lock();
+       err = dev->netdev_ops->ndo_bpf(dev, &bpf);
+       rtnl_unlock();
 
-               if (err) {
-                       dev_put(dev);
-                       return force_zc ? err : 0; /* fail or fallback */
-               }
-
-               umem->dev = dev;
-               umem->queue_id = queue_id;
-               umem->zc = true;
-               return 0;
-       }
+       if (err)
+               return force_zc ? err : 0; /* fail or fallback */
 
-       dev_put(dev);
-       return force_zc ? -ENOTSUPP : 0; /* fail or fallback */
+       dev_hold(dev);
+       umem->dev = dev;
+       umem->queue_id = queue_id;
+       umem->zc = true;
+       return 0;
 }
 
 static void xdp_umem_clear_dev(struct xdp_umem *umem)