xdp: Fix xsk_generic_xmit errno

[ Upstream commit aa2cad0600ed2ca6a0ab39948d4db1666b6c962b ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 72caa4fb13f47374761f471c0361f20c7e985503..9ff2ab63e6392987a4690f41da70ebd87cacdcbb 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -233,10 +233,8 @@ static int xsk_generic_xmit(struct sock *sk, struct msghdr *m,
 
                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;