Skip to contentSkip to conversation

xsk: do not remove umem from netdevice on fall-back to copy-mode

PATCH Applied Björn Töpel 2 participants 2 messages Feb 12, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xsk: do not remove umem from netdevice on fall-back to copy-mode

From: Björn Töpel <[email protected]>

Commit c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") stores the umem into the netdev._rx struct. However, the patch incorrectly removed the umem from the netdev._rx struct when user-space passed "best-effort" mode (i.e. select the fastest possible option available), and zero-copy mode was not available. This commit fixes that.

Fixes c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id")
---
 net/xdp/xdp_umem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
net/xdp/xdp_umem.c +2 -1
index 597866e7c441..37e1fe180769 100644
@@ -125,9 +125,10 @@ int xdp_umem_assign_dev(struct xdp_umem *umem, struct net_device *dev,
 	return 0;
 
 err_unreg_umem:
-	xdp_clear_umem_at_qid(dev, queue_id);
 	if (!force_zc)
 		err = 0; /* fallback to copy mode */
+	if (err)
+		xdp_clear_umem_at_qid(dev, queue_id);
 out_rtnl_unlock:
 	rtnl_unlock();
 	return err;
Signature · 1 line
2.19.1
#1 lore raw
Quoted 11 lines · Björn Töpel

From: Björn Töpel <[email protected]>

Commit c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") stores the umem into the netdev._rx struct. However, the patch incorrectly removed the umem from the netdev._rx struct when user-space passed "best-effort" mode (i.e. select the fastest possible option available), and zero-copy mode was not available. This commit fixes that.

Fixes c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id")

Applied, thanks!