From: Li RongQing <lirongqing@baidu.com>
Date: Thu, 11 Jun 2020 05:11:06 +0000 (+0800)
Subject: xdp: Fix xsk_generic_xmit errno
X-Git-Tag: v5.8-rc1~3^2~2^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa2cad0600ed2ca6a0ab39948d4db1666b6c962b;p=thirdparty%2Fkernel%2Flinux.git

xdp: Fix xsk_generic_xmit errno

Propagate sock_alloc_send_skb error code, not set it to
EAGAIN unconditionally, when fail to allocate skb, which
might cause that user space unnecessary loops.

Fixes: 35fcde7f8deb ("xsk: support for Tx")
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Björn Töpel <bjorn.topel@intel.com>
Link: https://lore.kernel.org/bpf/1591852266-24017-1-git-send-email-lirongqing@baidu.com
---

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index b6c0f08bd80d2..3700266229f63 100644
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -352,10 +352,8 @@ static int xsk_generic_xmit(struct sock *sk)
 
 		len = desc.len;
 		skb = sock_alloc_send_skb(sk, len, 1, &err);
-		if (unlikely(!skb)) {
-			err = -EAGAIN;
+		if (unlikely(!skb))
 			goto out;
-		}
 
 		skb_put(skb, len);
 		addr = desc.addr;