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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 ADB40C433E0 for ; Tue, 23 Jun 2020 20:17:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 881FD2073E for ; Tue, 23 Jun 2020 20:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943472; bh=bV7BUloC7jlCvLKAtRiDjl5NFTDVv4DSEHmeddckrc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dIVBRaDIuXQqcyou8V8tm30YUTNMlYqVS6HZxm0eRfY02YMT1QBfmSDoVRl1r3cXn MF73e/1gQZSn14hkpFT6D7wuBWlwVPn69IpYOIshj4zDlhY35TKs5+n1reTi/YA/E5 FJRV4wUUZAPyHbf/WOt9rtxJtmgy4cz+cYAl0qz0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389598AbgFWURv (ORCPT ); Tue, 23 Jun 2020 16:17:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:34268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389595AbgFWURt (ORCPT ); Tue, 23 Jun 2020 16:17:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 317B020E65; Tue, 23 Jun 2020 20:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943469; bh=bV7BUloC7jlCvLKAtRiDjl5NFTDVv4DSEHmeddckrc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PKgKdmuQurJvB+aZ9EErYNe31J+XvTaTbXKoSwx5Dcl8qn7QxA5oPUfly9HgE9gBA sCKm+OlDqN8TqxBw2TyHLxXjsYAW/5KClf741E1h6/HPnfHrzkXSiErVoXXYK2LxxL Ai0YT6ZRbXfn392HDQozb6t1HYNZDpWp4puRYf1A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Li RongQing , Daniel Borkmann , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Sasha Levin Subject: [PATCH 5.7 374/477] xdp: Fix xsk_generic_xmit errno Date: Tue, 23 Jun 2020 21:56:11 +0200 Message-Id: <20200623195425.208617243@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 c350108aa38de..a4676107fad05 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -397,10 +397,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; -- 2.25.1