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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 BD1C4C43381 for ; Wed, 27 Feb 2019 10:08:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9329E2084D for ; Wed, 27 Feb 2019 10:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726510AbfB0KIY (ORCPT ); Wed, 27 Feb 2019 05:08:24 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:40196 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726230AbfB0KIX (ORCPT ); Wed, 27 Feb 2019 05:08:23 -0500 Received: by mail-ed1-f67.google.com with SMTP id 10so13377459eds.7 for ; Wed, 27 Feb 2019 02:08:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=wq0vkZnHeUAODHK4VBReW1etSGmum8b1qnrDITbwb6k=; b=tXvsd1DzR2uWQNHEdZU9BhYO6mxPEWUHd92g19xHXXFtVyOBG9FQrWHNEmMnjBC75u CKTQiRboDGGmGxyOcOUIL+l08upHQ5jvEDkHyU7PeC2Tf0Deab10eYlDS2qgdcV3AwIB VREj4OzgtpQR57NkuLDbDg2vzdOUIGmR/GZugdT+NKHeiJTvh+BkFBohh/KJ77XG3ibm OXHzNF/C6AWRsdCAIc6ARqEBdUbhTt/7bH12i6SZfSgTZq9CcswcHzYuqKjPqfUjwzRu BU9GI4/uyIDP2cEYLPe3AxNuvgvj4al6k2v76bgXOhf/YeWafWq3YOv5MNSFOOYAysJF c6Rg== X-Gm-Message-State: AHQUAuYxLccJJihSI6hBicU29q7rN5v0TtIHwvar0O4Rt0fvzcyjlCUU Rphdy94nZoPhdQjvT/RvtfqOgx2aaC1Kcg== X-Google-Smtp-Source: AHgI3Ib05qsNmpCEFetNc879T3KpOZ4MP6BbGjqRtXS6DO4lY2WjggXx7deuy2KbxW7TDufWISf+Tg== X-Received: by 2002:a50:ba06:: with SMTP id g6mr1658762edc.93.1551262102215; Wed, 27 Feb 2019 02:08:22 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk (alrua-x1.vpn.toke.dk. [2a00:7660:6da:10::2]) by smtp.gmail.com with ESMTPSA id q55sm4195324eda.19.2019.02.27.02.08.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Feb 2019 02:08:21 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 18BC8183BB9; Wed, 27 Feb 2019 11:08:21 +0100 (CET) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: stable@vger.kernel.org Cc: Johannes Berg , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Subject: [PATCH for-4.19] mac80211: Change sk_pacing_shift to 7 Date: Wed, 27 Feb 2019 11:08:07 +0100 Message-Id: <20190227100807.4015-1-toke@redhat.com> X-Mailer: git-send-email 2.20.1 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 commit 5c14a4d05f68415af9e41a4e667d1748d41d1baf upstream. When we did the original tests for the optimal value of sk_pacing_shift, we came up with 6 ms of buffering as the default. Sadly, 6 is not a power of two, so when picking the shift value I erred on the size of less buffering and picked 4 ms instead of 8. This was probably wrong; those 2 ms of extra buffering makes a larger difference than I thought. So, change the default pacing shift to 7, which corresponds to 8 ms of buffering. The point of diminishing returns really kicks in after 8 ms, and so having this as a default should cut down on the need for extensive per-device testing and overrides needed in the drivers. Stable backport moves the change to where the value was set before the addition of per-device override support in 4.20. Signed-off-by: Toke Høiland-Jørgensen --- net/mac80211/tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c7ccd7b71b15..743cde66aaf6 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3614,10 +3614,10 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, /* We need a bit of data queued to build aggregates properly, so * instruct the TCP stack to allow more than a single ms of data * to be queued in the stack. The value is a bit-shift of 1 - * second, so 8 is ~4ms of queued data. Only affects local TCP + * second, so 7 is ~8ms of queued data. Only affects local TCP * sockets. */ - sk_pacing_shift_update(skb->sk, 8); + sk_pacing_shift_update(skb->sk, 7); fast_tx = rcu_dereference(sta->fast_tx); -- 2.20.1