xdp: hold device for umem regardless of zero-copy mode
Device pointer stored in umem regardless of zero-copy mode,
so we heed to hold the device in all cases.
Fixes: c9b47cc1fa
("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>
This commit is contained in:
parent
11aca65ec4
commit
162c820ed8
|
@ -105,6 +105,9 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,
|
||||||
|
|
||||||
umem->dev = dev;
|
umem->dev = dev;
|
||||||
umem->queue_id = queue_id;
|
umem->queue_id = queue_id;
|
||||||
|
|
||||||
|
dev_hold(dev);
|
||||||
|
|
||||||
if (force_copy)
|
if (force_copy)
|
||||||
/* For copy-mode, we are done. */
|
/* For copy-mode, we are done. */
|
||||||
goto out_rtnl_unlock;
|
goto out_rtnl_unlock;
|
||||||
|
@ -124,7 +127,6 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,
|
||||||
goto err_unreg_umem;
|
goto err_unreg_umem;
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
dev_hold(dev);
|
|
||||||
umem->zc = true;
|
umem->zc = true;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -163,10 +165,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem)
|
||||||
xdp_clear_umem_at_qid(umem->dev, umem->queue_id);
|
xdp_clear_umem_at_qid(umem->dev, umem->queue_id);
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
if (umem->zc) {
|
dev_put(umem->dev);
|
||||||
dev_put(umem->dev);
|
umem->dev = NULL;
|
||||||
umem->zc = false;
|
umem->zc = false;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xdp_umem_unpin_pages(struct xdp_umem *umem)
|
static void xdp_umem_unpin_pages(struct xdp_umem *umem)
|
||||||
|
|
Loading…
Reference in a new issue