Patchwork [bpf] xsk: do not remove umem from netdevice on fall-back to copy-mode

login
register
mail settings
Submitter Björn Töpel
Date Feb. 12, 2019, 7:51 a.m.
Message ID <20190212075114.6628-1-bjorn.topel@gmail.com>
Download mbox | patch
Permalink /patch/723679/
State New
Headers show

Comments

Björn Töpel - Feb. 12, 2019, 7:51 a.m.
From: Björn Töpel <bjorn.topel@intel.com>

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")
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
---
 net/xdp/xdp_umem.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Daniel Borkmann - Feb. 12, 2019, 4:09 p.m.
On 02/12/2019 08:51 AM, Björn Töpel wrote:
> From: Björn Töpel <bjorn.topel@intel.com>
> 
> 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")
> Signed-off-by: Björn Töpel <bjorn.topel@intel.com>

Applied, thanks!

Patch

diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 597866e7c441..37e1fe180769 100644
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -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;