From patchwork Wed Aug 8 10:40:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Gong X-Patchwork-Id: 10559731 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 944FA13AC for ; Wed, 8 Aug 2018 10:40:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 836272A601 for ; Wed, 8 Aug 2018 10:40:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77A192A631; Wed, 8 Aug 2018 10:40:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20B422A601 for ; Wed, 8 Aug 2018 10:40:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbeHHM7k (ORCPT ); Wed, 8 Aug 2018 08:59:40 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:35540 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726793AbeHHM7k (ORCPT ); Wed, 8 Aug 2018 08:59:40 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 353E860B73; Wed, 8 Aug 2018 10:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1533724833; bh=245hdoBhLHDU5Fld0aDI+GOmR/kanzJfdNkt8uEmr0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FhJEwPlUnj3F58ub85uMhqxTub4RGjzsIELco64Z3P+kYSrxAtZfHZdk81sbJsFDI GQIKRXoi5WxKXJJAzhgErJJRonToAigkjHUqRL0kCZRZAzoe3OqbDDLW4ds8qzv70Y AY0hcucBAZHfwrFFzTmV8cspQMLbJAl+CH1AEKtA= Received: from localhost.localdomain (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: wgong@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 084BA606FA; Wed, 8 Aug 2018 10:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1533724832; bh=245hdoBhLHDU5Fld0aDI+GOmR/kanzJfdNkt8uEmr0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJwJ0gmc65Sgyq66YWOFXKyrba+1X4g1E0PXAh82lAs8HztiPJeb1jS6J+bubV7nI 6kEF0k5EFNcTEkEX+eylbYSwMD0DF2SgBnOZDXSg3a721AorpEk35Fe/KR1v7ACKUL Q+DzkzRCi68sjr+ooTX4qEJAVva91h7OYSCJhQdM= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 084BA606FA Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=wgong@codeaurora.org From: Wen Gong To: ath10k@lists.infradead.org, johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH v2 1/2] mac80211: Change sk_pacing_shift saved to ieee80211_hw Date: Wed, 8 Aug 2018 18:40:01 +0800 Message-Id: <1533724802-30944-2-git-send-email-wgong@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533724802-30944-1-git-send-email-wgong@codeaurora.org> References: <1533724802-30944-1-git-send-email-wgong@codeaurora.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the skb_pacing_shift adjustment, this change make it configurable for other driver. If no other driver set it, then mac8011 will use the default value. Signed-off-by: Wen Gong --- V2: -add the description for tx_sk_pacing_shift include/net/mac80211.h | 5 +++++ net/mac80211/main.c | 2 ++ net/mac80211/tx.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5790f55..9804d65 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -2290,6 +2290,10 @@ enum ieee80211_hw_flags { * supported by HW. * @max_nan_de_entries: maximum number of NAN DE functions supported by the * device. + * + * @tx_sk_pacing_shift: The TCP stack allow more than a single ms of data + * to be queued in the stack. The value is a bit-shift of 1 second, e.g. 8 + * is ~4ms of queued data. It only affects local TCP sockets. */ struct ieee80211_hw { struct ieee80211_conf conf; @@ -2325,6 +2329,7 @@ struct ieee80211_hw { u8 n_cipher_schemes; const struct ieee80211_cipher_scheme *cipher_schemes; u8 max_nan_de_entries; + u8 tx_sk_pacing_shift; }; static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw, diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 4fb2709..23490fa 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -594,6 +594,8 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, local->ops = ops; local->use_chanctx = use_chanctx; + local->hw.tx_sk_pacing_shift = 8; + /* set up some defaults */ local->hw.queues = 1; local->hw.max_rates = 1; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 6a79d56..80855a8 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3601,7 +3601,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, * second, so 8 is ~4ms of queued data. Only affects local TCP * sockets. */ - sk_pacing_shift_update(skb->sk, 8); + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); fast_tx = rcu_dereference(sta->fast_tx);