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 BFC98C432C3 for ; Sat, 16 Nov 2019 15:46:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88C99208CC for ; Sat, 16 Nov 2019 15:46:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919210; bh=xmdbH0phXbwmcfIEkdotRoCH7S548831AuKSrZqd5Mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YZPdcd9Oz2mb9AyA0WIoxThqqIMeVo2Y8247hp6NbzdoOwGdSc5CSumG5FZ4hiFP0 lNP1ebM8MVCcpggsxdSOwGnirAE7Zad+1WCTFhYCU9LCOAExFACYgsJGvniGappZWZ ptjzHMAIaST0VIa241r4uoH/eldZn4LPeMfwI5bM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728107AbfKPPqt (ORCPT ); Sat, 16 Nov 2019 10:46:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:52560 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729326AbfKPPqQ (ORCPT ); Sat, 16 Nov 2019 10:46:16 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (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 5A583207FA; Sat, 16 Nov 2019 15:46:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919175; bh=xmdbH0phXbwmcfIEkdotRoCH7S548831AuKSrZqd5Mg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MJBR1NwUsY7S3L8GuzlCGTHYRmssS46zD1OuSzEpBFkvCtLCUxJPBGoC05Lq7bB+f VL46Qfk2BDKuvlYZP5mWgemwzjVOboPKDDKQj3b8vbfnTI0LVSQGaqg07wR3FmtweI 3l4WTQjBUgLJdToE+apb+mv93ecmKZWKZQBIarEM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Eric Dumazet , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 183/237] net: do not abort bulk send on BQL status Date: Sat, 16 Nov 2019 10:40:18 -0500 Message-Id: <20191116154113.7417-183-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154113.7417-1-sashal@kernel.org> References: <20191116154113.7417-1-sashal@kernel.org> MIME-Version: 1.0 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: Eric Dumazet [ Upstream commit fe60faa5063822f2d555f4f326c7dd72a60929bf ] Before calling dev_hard_start_xmit(), upper layers tried to cook optimal skb list based on BQL budget. Problem is that GSO packets can end up comsuming more than the BQL budget. Breaking the loop is not useful, since requeued packets are ahead of any packets still in the qdisc. It is also more expensive, since next TX completion will push these packets later, while skbs are not in cpu caches. It is also a behavior difference with TSO packets, that can break the BQL limit by a large amount. Note that drivers should use __netdev_tx_sent_queue() in order to have optimal xmit_more support, and avoid useless atomic operations as shown in the following patch. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index 4a2ee1ce6c024..0a900e353cfff 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3277,7 +3277,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *first, struct net_device *de } skb = next; - if (netif_xmit_stopped(txq) && skb) { + if (netif_tx_queue_stopped(txq) && skb) { rc = NETDEV_TX_BUSY; break; } -- 2.20.1