Skip to content

Commit

Permalink
xdp: hold device for umem regardless of zero-copy mode
Browse files Browse the repository at this point in the history
Device pointer stored in umem regardless of zero-copy mode,
so we heed to hold the device in all cases.

Fixes: c9b47cc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  • Loading branch information
Ilya Maximets authored and Daniel Borkmann committed Jul 3, 2019
1 parent 11aca65 commit 162c820
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/xdp/xdp_umem.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,

umem->dev = dev;
umem->queue_id = queue_id;

dev_hold(dev);

if (force_copy)
/* For copy-mode, we are done. */
goto out_rtnl_unlock;
Expand All @@ -124,7 +127,6 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,
goto err_unreg_umem;
rtnl_unlock();

dev_hold(dev);
umem->zc = true;
return 0;

Expand Down Expand Up @@ -163,10 +165,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem)
xdp_clear_umem_at_qid(umem->dev, umem->queue_id);
rtnl_unlock();

if (umem->zc) {
dev_put(umem->dev);
umem->zc = false;
}
dev_put(umem->dev);
umem->dev = NULL;
umem->zc = false;
}

static void xdp_umem_unpin_pages(struct xdp_umem *umem)
Expand Down

0 comments on commit 162c820

Please sign in to comment.