From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFB11C433E0 for ; Thu, 18 Jun 2020 01:29:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 97F4A22225 for ; Thu, 18 Jun 2020 01:29:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443743; bh=BMiGM4Qt2i3j6dALG2VUcDlayXcteWcKXfh32RJncQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UiBPWgop0NenygSu/ks/+m2Tqc0lBnARlXtQn/B7kF9+218jYPs5gzdEp0rGgqsyB bdam6vUsTkJm8u4lANSkQ6EaMQxkfUfaauRO+MekqEfTMbC9yUuxXgpwZcRMKfPC7C CigACQaLS9sVgt3BxKmHdaTia7xIbTN54d25WwyU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732220AbgFRB3B (ORCPT ); Wed, 17 Jun 2020 21:29:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:33192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731549AbgFRBZ7 (ORCPT ); Wed, 17 Jun 2020 21:25:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D8B4821D7A; Thu, 18 Jun 2020 01:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443558; bh=BMiGM4Qt2i3j6dALG2VUcDlayXcteWcKXfh32RJncQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrfL1KYEoo67vxTcwzAMWSWkObk9IsLiPCy5fbxo1NDcjWOzCZbn0BawgTzifv2vb tGjnjOiwSMTre17iCQfFk/J3cjri8Cy9cT74iA6sV+ktU2xFvknbQl8v0k147thta8 /XmTfCjI3Lo+0eqyG9/XUZIFwv/VJ6ep+ZP54oRE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li RongQing , Daniel Borkmann , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 172/172] xdp: Fix xsk_generic_xmit errno Date: Wed, 17 Jun 2020 21:22:18 -0400 Message-Id: <20200618012218.607130-172-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012218.607130-1-sashal@kernel.org> References: <20200618012218.607130-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li RongQing [ 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 Signed-off-by: Daniel Borkmann Acked-by: Björn Töpel Link: https://lore.kernel.org/bpf/1591852266-24017-1-git-send-email-lirongqing@baidu.com Signed-off-by: Sasha Levin --- net/xdp/xsk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 72caa4fb13f4..9ff2ab63e639 100644 --- 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; -- 2.25.1