Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp7699625pxu; Sat, 26 Dec 2020 01:52:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwBGU7sQ/A3YuzXzv9GbZlscJ6i6lbhy5b6Wsx5/FuYqwZseFDUHKBDTZNJYzBVV2aBSl4G X-Received: by 2002:a17:907:11ca:: with SMTP id va10mr32917184ejb.78.1608976376594; Sat, 26 Dec 2020 01:52:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1608976376; cv=none; d=google.com; s=arc-20160816; b=BFluAuTVOJzUBpVtHs6kt4O6B3kMBlSClokIf+KSxBj/vIvCKdG/KsQuPW6TqkN0Li RG8/w1IMNineQXGiUAVf/972snHBEHkb6TvahMhPuWdw+D8xYXrg8fT6t6qry3sL3HLC BSSV9AIJQK5tCxkbWFyvO8S23SnF9xOUqPfAQ60MRbcotFnAve4zvCsfC5qL5gVtVKb4 tf+N8qy3/Fq774fmjNNdxsRtFLnZxmPiYY+oPksxxjAw+ubmnyufP2ygVQko10HjGoWY jaAmWYhEDLsZI/ETyGJ2PxODzc34v2A+m66w2WdrLLLss/+pPLa4cUpZxOXprlSiOjZl l+Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=t5SxLElEGbF7dAT2bLW31BLfA8EU9AM5LLWfgshIvc8=; b=B8vkVasU3uGKb+sFYpPvZMvx3fAI2QJr9W8HNg7X/KjeR+zlFQAaClsfFHNuMe2q6O IkpY+KjCfrtsxYUVL/bOY6Lero8Rl3PQJBr8HrEttDmxJxdU1WCm87IPBKwvBnn0sQgS A/8QRw9uncUea/lc/Xawy35sFtxgxvfrp1Qxj2E7wgNcxDaiJP50SuVIvUtzmogbiLDJ Ty1IaJIvF0R1obF71fetK2jSocRe67+TfEeI2ZGACQFno+3YFO9G6fV9NvLn/n94j9Z5 5h829YAkXjPkQBMR63JiMkZ/TsUn1xJf2wNiXF9IjfvgcC0BZID0DYIptYsRZ2TLu+SU IzOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=p5YhCn1q; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b6si16144100eju.123.2020.12.26.01.52.33; Sat, 26 Dec 2020 01:52:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=p5YhCn1q; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726015AbgLZJts (ORCPT + 99 others); Sat, 26 Dec 2020 04:49:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:44440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725947AbgLZJtr (ORCPT ); Sat, 26 Dec 2020 04:49:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id EB7D1221ED; Sat, 26 Dec 2020 09:49:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1608976147; bh=wOAsFsWid5f4MpOgWRVIs8Yy/rKSa+2DMlO+N7ol/pk=; h=From:To:Cc:Subject:Date:From; b=p5YhCn1qBCj19E3G/lvy2+n4eDPlgMj+Kv8FjqTU+EKNQs5zbOe1zgJ/knNGt6Kph fC2F+ooLh4KALD7jnN2KJRzypXl+sS7q/JHJNlEDi4PjW3TZwLUvwJZlzSHlDHUcN+ kh21n7giMiqCiXe0Ktz0UUnDGJBuA7dWLfnKEmXPiA2MBWa5ldvler+Lcgd1MIDe8K +hOIzua/dHDETy+pUXTm+z5vuaiWMTlqPKTFjNkI8rROTMm0qCRf0cWIolC4HkCM5Y Uy2dh9/yTP0SCdVsLbm0KkAza5kq0e8Mi41R55Zvl+szSFZ78aIw6f8uCcPfYEIxbh 9h0vJbAfTYlZQ== From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: kyan@google.com, toke@redhat.com, johannes@sipsolutions.net, lorenzo.bianconi@redhat.com Subject: [PATCH mac80211-next] mac80211: introduce aql_enable node in debugfs Date: Sat, 26 Dec 2020 10:49:18 +0100 Message-Id: <0ad278def3875fc2c60b4898daa3f0d53288c168.1608975795.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Introduce aql_enable node in debugfs in order to enable/disable aql. This is useful for debugging purpose. Signed-off-by: Lorenzo Bianconi --- net/mac80211/debugfs.c | 1 + net/mac80211/ieee80211_i.h | 1 + net/mac80211/main.c | 1 + net/mac80211/tx.c | 3 +++ 4 files changed, 6 insertions(+) diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c index 48f144f107d5..898ad57bebd0 100644 --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c @@ -581,6 +581,7 @@ void debugfs_hw_add(struct ieee80211_local *local) DEBUGFS_ADD(aql_txq_limit); debugfs_create_u32("aql_threshold", 0600, phyd, &local->aql_threshold); + debugfs_create_bool("aql_enable", 0600, phyd, &local->aql_enable); statsd = debugfs_create_dir("statistics", phyd); diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 8bf9c0e974d6..8c9cce373010 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1162,6 +1162,7 @@ struct ieee80211_local { u32 aql_txq_limit_low[IEEE80211_NUM_ACS]; u32 aql_txq_limit_high[IEEE80211_NUM_ACS]; u32 aql_threshold; + bool aql_enable; atomic_t aql_total_pending_airtime; const struct ieee80211_ops *ops; diff --git a/net/mac80211/main.c b/net/mac80211/main.c index dee88ec566ad..b3bec68943c8 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -700,6 +700,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, local->airtime_flags = AIRTIME_USE_TX | AIRTIME_USE_RX; local->aql_threshold = IEEE80211_AQL_THRESHOLD; + local->aql_enable = true; atomic_set(&local->aql_total_pending_airtime, 0); INIT_LIST_HEAD(&local->chanctx_list); diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 6422da6690f7..86503d47d86e 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3832,6 +3832,9 @@ bool ieee80211_txq_airtime_check(struct ieee80211_hw *hw, if (!wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) return true; + if (!local->aql_enable) + return true; + if (!txq->sta) return true; -- 2.29.2