From patchwork Tue Jul 19 12:35:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baligh GASMI X-Patchwork-Id: 12922497 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 577EBC43334 for ; Tue, 19 Jul 2022 13:20:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238296AbiGSNT7 (ORCPT ); Tue, 19 Jul 2022 09:19:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243683AbiGSNT3 (ORCPT ); Tue, 19 Jul 2022 09:19:29 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 447D49C7A6; Tue, 19 Jul 2022 05:36:26 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id c22so699009wmr.2; Tue, 19 Jul 2022 05:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EwCMz9qqrnH8Nt8qCl6GBxcKBN6DmBQJlZeoDH9NWT0=; b=N0JtbG7mbs2RDw5hpLepX1IX1wRtM5Ewkt3zHHKW77hXaEOyFA4eByxHRdMiHx6+TV BteFrsLRqK1pY1L4+SXYwaAVmV5I0LxziJfk8eAxQNj9bUk4S43Q2SGLVWPfQedvi7hd 0JOnPHIFw2fEgETTMdP5aAisqaOybs0tfQMNO6XFNSSkJ4+j6RMaCPXgBPXksb4ZcD7L 6HeVKp+aoAaWBKBsg9uW/cKbhwUSxu6/8CgNfhlGGfqcynrRZP6s2LXrbR6zIkWvQIZj X7f2JOINDzrw80aF1chDJK0vXs0gbyU9Z1X1181oKNDXKDT0s5jhv8C3WdRrSID4PAQL J2Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EwCMz9qqrnH8Nt8qCl6GBxcKBN6DmBQJlZeoDH9NWT0=; b=oBapGFfXYkexBho315ufjQVKqkrE/kbOr1hSUFGEcfhNRwP4olIVrQGMvFpWenyh6L 3Pcr08vIsoRrPULbrU/w3ZcW6/GOJvwdZ8Ax2gSR5TMFOcqLvEZaqrg29XUUPiJAGY3b 7LArvcf4vGm9VAQ5pU/LYe1sSXtKl2Yrx5fjN2bjQhkBvvkGjDDayr1xn1Zcpf8GVU7h 05Nc+m8i2EPW9Z30nc+r/KIhFz9nFfo7d5eL8nL7EGUP1Zw2qclH8IMMbVpqZiUJTPlm /xgSh/2bvxRL6FZ2bq9uFPmjNAwtIyGoJTUXIyeLmDetNp3IU5kXLEouBUXp8cjdD7bx OFDQ== X-Gm-Message-State: AJIora9e48OwKJmRlSKnvYh6u+LRJbKdbyijEju9h0krLAdNCgUleNuT 4cHto2kW3P/Spg2oobR8lyM= X-Google-Smtp-Source: AGRyM1sYN+VBwSIPD7Mcxo2XwuGkEnv86MHQ9OsJk0WMKs/tNG+gPZgAtFXTt9BR8+w6WHLN5lt0Jg== X-Received: by 2002:a05:600c:3546:b0:3a1:861d:e75a with SMTP id i6-20020a05600c354600b003a1861de75amr37062000wmq.58.1658234184400; Tue, 19 Jul 2022 05:36:24 -0700 (PDT) Received: from baligh-ThinkCentre-M720q.iliad.local (freebox.vlq16.iliad.fr. [213.36.7.13]) by smtp.googlemail.com with ESMTPSA id bp30-20020a5d5a9e000000b0021e297d6850sm3337522wrb.110.2022.07.19.05.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 05:36:24 -0700 (PDT) From: Baligh Gasmi To: Johannes Berg Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau , Toke Hoiland-Jorgensen , Linus Lussing , Kalle Valo , Baligh Gasmi , kernel test robot Subject: [RFC/RFT v5 1/4] mac80211: use AQL airtime for expected throughput. Date: Tue, 19 Jul 2022 14:35:22 +0200 Message-Id: <20220719123525.3448926-2-gasmibal@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220719123525.3448926-1-gasmibal@gmail.com> References: <20220719123525.3448926-1-gasmibal@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since the integration of AQL, packet TX airtime estimation is calculated and counted to be used for the dequeue limit. Use this estimated airtime to compute expected throughput for each station. It will be a generic mac80211 implementation. that can be used if the driver do not have get_expected_throughput implementation. Useful for L2 routing protocols, like B.A.T.M.A.N. Signed-off-by: Baligh Gasmi Reported-by: kernel test robot CC: Felix Fietkau --- net/mac80211/driver-ops.h | 2 ++ net/mac80211/sta_info.c | 39 +++++++++++++++++++++++++++++++++++++++ net/mac80211/sta_info.h | 11 +++++++++++ net/mac80211/status.c | 2 ++ net/mac80211/tx.c | 8 +++++++- 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 4e2fc1a08681..fa9952154795 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -1142,6 +1142,8 @@ static inline u32 drv_get_expected_throughput(struct ieee80211_local *local, trace_drv_get_expected_throughput(&sta->sta); if (local->ops->get_expected_throughput && sta->uploaded) ret = local->ops->get_expected_throughput(&local->hw, &sta->sta); + else + ret = ewma_avg_est_tp_read(&sta->deflink.status_stats.avg_est_tp); trace_drv_return_u32(local, ret); return ret; diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index e04a0905e941..201aab465234 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -1993,6 +1993,45 @@ void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, tx_pending, 0); } +void ieee80211_sta_update_tp(struct ieee80211_local *local, + struct sta_info *sta, + struct sk_buff *skb, + u16 tx_time_est, + bool ack, int retry) +{ + unsigned long diff; + struct rate_control_ref *ref = NULL; + + if (!skb || !sta || !tx_time_est) + return; + + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) + ref = sta->rate_ctrl; + + if (ref && ref->ops->get_expected_throughput) + return; + + if (local->ops->get_expected_throughput) + return; + + tx_time_est += ack ? 4 : 0; + tx_time_est += retry ? retry * 2 : 2; + + sta->deflink.tx_stats.tp_tx_size += (skb->len * 8) * 1000; + sta->deflink.tx_stats.tp_tx_time_est += tx_time_est; + + diff = jiffies - sta->deflink.status_stats.last_tp_update; + if (diff > HZ / 10) { + ewma_avg_est_tp_add(&sta->deflink.status_stats.avg_est_tp, + sta->deflink.tx_stats.tp_tx_size / + sta->deflink.tx_stats.tp_tx_time_est); + + sta->deflink.tx_stats.tp_tx_size = 0; + sta->deflink.tx_stats.tp_tx_time_est = 0; + sta->deflink.status_stats.last_tp_update = jiffies; + } +} + int sta_info_move_state(struct sta_info *sta, enum ieee80211_sta_state new_state) { diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 35c390bedfba..4200856fefcd 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -123,6 +123,7 @@ enum ieee80211_sta_info_flags { #define HT_AGG_STATE_STOP_CB 7 #define HT_AGG_STATE_SENT_ADDBA 8 +DECLARE_EWMA(avg_est_tp, 8, 16) DECLARE_EWMA(avg_signal, 10, 8) enum ieee80211_agg_stop_reason { AGG_STOP_DECLINED, @@ -157,6 +158,12 @@ void ieee80211_register_airtime(struct ieee80211_txq *txq, struct sta_info; +void ieee80211_sta_update_tp(struct ieee80211_local *local, + struct sta_info *sta, + struct sk_buff *skb, + u16 tx_time_est, + bool ack, int retry); + /** * struct tid_ampdu_tx - TID aggregation information (Tx). * @@ -549,6 +556,8 @@ struct link_sta_info { s8 last_ack_signal; bool ack_signal_filled; struct ewma_avg_signal avg_ack_signal; + struct ewma_avg_est_tp avg_est_tp; + unsigned long last_tp_update; } status_stats; /* Updated from TX path only, no locking requirements */ @@ -558,6 +567,8 @@ struct link_sta_info { struct ieee80211_tx_rate last_rate; struct rate_info last_rate_info; u64 msdu[IEEE80211_NUM_TIDS + 1]; + u64 tp_tx_size; + u64 tp_tx_time_est; } tx_stats; enum ieee80211_sta_rx_bandwidth cur_max_bandwidth; diff --git a/net/mac80211/status.c b/net/mac80211/status.c index e69272139437..1fb93abc1709 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -1152,6 +1152,8 @@ void ieee80211_tx_status_ext(struct ieee80211_hw *hw, ack_signal_valid = !!(info->status.flags & IEEE80211_TX_STATUS_ACK_SIGNAL_VALID); + ieee80211_sta_update_tp(local, sta, skb, tx_time_est, acked, retry_count); + if (pubsta) { struct ieee80211_sub_if_data *sdata = sta->sdata; diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index c425f4fb7c2e..beb79b04c287 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3617,6 +3617,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, struct ieee80211_tx_data tx; ieee80211_tx_result r; struct ieee80211_vif *vif = txq->vif; + struct rate_control_ref *ref = NULL; WARN_ON_ONCE(softirq_count() == 0); @@ -3775,8 +3776,13 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, encap_out: IEEE80211_SKB_CB(skb)->control.vif = vif; + if (tx.sta && test_sta_flag(tx.sta, WLAN_STA_RATE_CONTROL)) + ref = tx.sta->rate_ctrl; + if (vif && - wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) { + ((!local->ops->get_expected_throughput && + (!ref || !ref->ops->get_expected_throughput)) || + wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL))) { bool ampdu = txq->ac != IEEE80211_AC_VO; u32 airtime; From patchwork Tue Jul 19 12:35:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baligh GASMI X-Patchwork-Id: 12922498 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C33DCC43334 for ; Tue, 19 Jul 2022 13:20:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238989AbiGSNUB (ORCPT ); Tue, 19 Jul 2022 09:20:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243699AbiGSNTb (ORCPT ); Tue, 19 Jul 2022 09:19:31 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFF859C7B5; Tue, 19 Jul 2022 05:36:27 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id a5so21364520wrx.12; Tue, 19 Jul 2022 05:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C5Yck6u5bzJdtJYVbvpnhCrTJsEoVdG4F3GJtRMkNSU=; b=Pq6BwkMe6F15WzfFLXBphW9Y1WnWCkuRntFHdLh05HInSisbTHbQpOucPzP7dOiUVj nBaqkTYMdn8XYwZli54EZ0O7SwW9IWpG2+Ak0iL6RaEwoRi4F75S6q9UdmocPfsWVrfZ iRt+avNMEb55iegR+lat44HSLsHOYVflsxOrE5RVg8m9wyY2qI0y11Wmh57LNyOlYAyT a+UvZUokkQMerkDLLqn/K+kNMBUqge9imfb+faAIWSmj3QgBRFvvKHRwFbijUa+K+TzQ gC1yyoFchdCAOzCjkpiV8JGNsXRBkVNfL8zpafuhaG9iH6okIDfTXqZZm+kLQy4rOtZG e08w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C5Yck6u5bzJdtJYVbvpnhCrTJsEoVdG4F3GJtRMkNSU=; b=JAWInYiGbvco8504GCE/BmPh1/C210F1j52GPb3sK5ICZi5np+dHfSeZ7fC0CtwOhy 5IvMCQ5qCRLGEpjzAMzn8wYpdD3Z7oPbduXJOaDQupyBmPSw2HFM3V5RwOghUb+ke8sm xBU/E8FK0LLfOTWRP55YaUf7s9EMyDxqqmvIi3dMTTkuE/bXKFNYdfu3Jp2jUIHUKT33 vQl5fNTjZ0L6XTggs2vD9gr3imhgaU8jI5Dm20PaIHXVDDpRiPfceBU5ot7X+wP80euH 8A0lJMk5LTt2672Eh0vsBj0vEAWUvktoYakQJycyQmGjMf4Hr4imhmfcBzIy04XykM5s OsRw== X-Gm-Message-State: AJIora9RvNohbRuAAwzKI/KCb5loHy+VD4sso+KpwOTJcCUeW6cYrZEF jZDtrhBB9V4w6ZEi4ieJ6Wk= X-Google-Smtp-Source: AGRyM1sQSUbrsR97drF4VYh5l75YPNOjd50TPGyKJdH1eV/SqdOcjS43IbZjIeLc9O1FsmvXmnYwLg== X-Received: by 2002:a5d:64ad:0:b0:21d:adb6:c266 with SMTP id m13-20020a5d64ad000000b0021dadb6c266mr28160614wrp.638.1658234186008; Tue, 19 Jul 2022 05:36:26 -0700 (PDT) Received: from baligh-ThinkCentre-M720q.iliad.local (freebox.vlq16.iliad.fr. [213.36.7.13]) by smtp.googlemail.com with ESMTPSA id bp30-20020a5d5a9e000000b0021e297d6850sm3337522wrb.110.2022.07.19.05.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 05:36:25 -0700 (PDT) From: Baligh Gasmi To: Johannes Berg Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau , Toke Hoiland-Jorgensen , Linus Lussing , Kalle Valo , Baligh Gasmi Subject: [RFC/RFT v5 2/4] mac80211: add periodic monitor for channel busy time Date: Tue, 19 Jul 2022 14:35:23 +0200 Message-Id: <20220719123525.3448926-3-gasmibal@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220719123525.3448926-1-gasmibal@gmail.com> References: <20220719123525.3448926-1-gasmibal@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add a worker scheduled periodicaly to calculate the busy time average of the current channel. This will be used in the estimation for expected throughput. Signed-off-by: Baligh Gasmi --- net/mac80211/ieee80211_i.h | 6 ++++ net/mac80211/iface.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 86ef0a46a68c..2cb388335ce8 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -901,6 +901,7 @@ struct ieee80211_if_nan { struct idr function_inst_ids; }; +DECLARE_EWMA(avg_busy, 8, 4) struct ieee80211_sub_if_data { struct list_head list; @@ -1024,6 +1025,11 @@ struct ieee80211_sub_if_data { } debugfs; #endif + struct delayed_work monitor_work; + u64 last_time; + u64 last_time_busy; + struct ewma_avg_busy avg_busy; + /* must be last, dynamically sized area in this! */ struct ieee80211_vif vif; }; diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 15a73b7fdd75..e1b20964933c 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1972,6 +1972,64 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, mutex_unlock(&local->iflist_mtx); } +#define DEFAULT_MONITOR_INTERVAL_MS 1000 + +static void ieee80211_if_monitor_work(struct work_struct *work) +{ + struct delayed_work *delayed_work = to_delayed_work(work); + struct ieee80211_sub_if_data *sdata = + container_of(delayed_work, struct ieee80211_sub_if_data, + monitor_work); + struct survey_info survey; + struct ieee80211_local *local = sdata->local; + struct ieee80211_chanctx_conf *chanctx_conf; + struct ieee80211_channel *channel = NULL; + int q = 0; + u64 interval = DEFAULT_MONITOR_INTERVAL_MS; + + rcu_read_lock(); + chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf); + if (chanctx_conf) + channel = chanctx_conf->def.chan; + rcu_read_unlock(); + + if (!channel) + goto end; + + if (!local->started) + goto end; + + do { + survey.filled = 0; + if (drv_get_survey(local, q++, &survey) != 0) { + survey.filled = 0; + break; + } + } while (channel != survey.channel); + + if (survey.filled & SURVEY_INFO_TIME) { + /* real interval */ + interval = survey.time - sdata->last_time; + /* store last time */ + sdata->last_time = survey.time; + } + + if (survey.filled & SURVEY_INFO_TIME_BUSY) { + /* busy */ + u64 busy = survey.time_busy < sdata->last_time_busy ? 0 : + survey.time_busy - sdata->last_time_busy; + /* average percent busy time */ + ewma_avg_busy_add(&sdata->avg_busy, + (busy * 100) / interval); + /* store last busy time */ + sdata->last_time_busy = survey.time_busy; + } + +end: + schedule_delayed_work(&sdata->monitor_work, + msecs_to_jiffies(DEFAULT_MONITOR_INTERVAL_MS)); +} + int ieee80211_if_add(struct ieee80211_local *local, const char *name, unsigned char name_assign_type, struct wireless_dev **new_wdev, enum nl80211_iftype type, @@ -2085,6 +2143,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, ieee80211_dfs_cac_timer_work); INIT_DELAYED_WORK(&sdata->dec_tailroom_needed_wk, ieee80211_delayed_tailroom_dec); + INIT_DELAYED_WORK(&sdata->monitor_work, + ieee80211_if_monitor_work); for (i = 0; i < NUM_NL80211_BANDS; i++) { struct ieee80211_supported_band *sband; @@ -2156,6 +2216,9 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, list_add_tail_rcu(&sdata->list, &local->interfaces); mutex_unlock(&local->iflist_mtx); + schedule_delayed_work(&sdata->monitor_work, + msecs_to_jiffies(DEFAULT_MONITOR_INTERVAL_MS)); + if (new_wdev) *new_wdev = &sdata->wdev; @@ -2166,6 +2229,8 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) { ASSERT_RTNL(); + cancel_delayed_work_sync(&sdata->monitor_work); + mutex_lock(&sdata->local->iflist_mtx); list_del_rcu(&sdata->list); mutex_unlock(&sdata->local->iflist_mtx); From patchwork Tue Jul 19 12:35:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baligh GASMI X-Patchwork-Id: 12922499 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B76CC433EF for ; Tue, 19 Jul 2022 13:20:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239571AbiGSNUD (ORCPT ); Tue, 19 Jul 2022 09:20:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243747AbiGSNTf (ORCPT ); Tue, 19 Jul 2022 09:19:35 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DEF442AC8; Tue, 19 Jul 2022 05:36:29 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id z13so1812781wro.13; Tue, 19 Jul 2022 05:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yM3+8zTlhjwI5zRwAownh+8azeEiykzkYJwzAaOCCI8=; b=eHLDMDFDuMgJmsxLX+mrq/2WWxFiv9kIWo0TDVM4NuItY1cXJzj+WyQfSKLgGUxQva 1x3/aou1FHLuWC64UqnMIVTxHzOxlMzJOxaDD6PpaC+Y7NSnlJwEbfh8BojhfXJQd7TY rFx+9YbTmbkRXIjsK2/SW76CS6p9Yqpw05ZzJ6brlzRYI6FT7ZQKEcqVtDs+TjOitID3 9HHvj1dU2mw9yDPryTtRZYViDoXf4pYmmAsPGwdY3xE8i+APbmVZQXV8WR8KqsUxBzXz foB8a392YYEJGFajl69kE9n+7jEk2sYQCjFYSqnpXI6zT7vhfcYc67YQECqRnKndGYGz S9Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yM3+8zTlhjwI5zRwAownh+8azeEiykzkYJwzAaOCCI8=; b=pkYy1UHk+7tTePS3lmOqKNfWpBvT4xtdrzUeQb3Tr7dWEg+m9MFh+oiNNaO9nabV4E /Y+pMwnXCG9gEHvezkMIcE0A0XL3cYO8ZtCkdE9Fwqc57XGjhQScNFHeqxtdeiz40OJw jXWhJGLtOEou+zn3mSPbHNwkMwk8suejWKYpeI2rP1jVlXXcJPPsiSXAe2Vc8PdybUDa k6mr/szgtxFTUB+oyVF3HDKXgtX0psmkG2mDIeUdJAcRBfUiJVqveaopgcVs+tUgiMm/ XNFk1O9oJscbNjtKeu93NJV5zVP3AcZdEpedGz1gAVic2INRL+3lQCAxthEYYa5JedIc qCsQ== X-Gm-Message-State: AJIora8GwCYReoqL5DDwxDc3b3yz+anrWjpC/HxLXB2WOQ7E0Qs/b9Ws geovrNUT0rN5tfItlQMInQg= X-Google-Smtp-Source: AGRyM1trZfY/zjIyZWbNtVdlg7dvhrcyOaGsOw4O0be2ggT6hc6Qb2glit1C0HvevtTsQWG/jMOKEA== X-Received: by 2002:a5d:414a:0:b0:21d:6be5:1765 with SMTP id c10-20020a5d414a000000b0021d6be51765mr27173653wrq.419.1658234187491; Tue, 19 Jul 2022 05:36:27 -0700 (PDT) Received: from baligh-ThinkCentre-M720q.iliad.local (freebox.vlq16.iliad.fr. [213.36.7.13]) by smtp.googlemail.com with ESMTPSA id bp30-20020a5d5a9e000000b0021e297d6850sm3337522wrb.110.2022.07.19.05.36.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 05:36:27 -0700 (PDT) From: Baligh Gasmi To: Johannes Berg Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau , Toke Hoiland-Jorgensen , Linus Lussing , Kalle Valo , Baligh Gasmi Subject: [RFC/RFT v5 3/4] mac80211: add busy time factor into expected throughput Date: Tue, 19 Jul 2022 14:35:24 +0200 Message-Id: <20220719123525.3448926-4-gasmibal@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220719123525.3448926-1-gasmibal@gmail.com> References: <20220719123525.3448926-1-gasmibal@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When estimating the expected throughput, take into account the busy time of the current channel. Signed-off-by: Baligh Gasmi --- net/mac80211/sta_info.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 201aab465234..7e32c06ae771 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -2000,6 +2000,8 @@ void ieee80211_sta_update_tp(struct ieee80211_local *local, bool ack, int retry) { unsigned long diff; + struct ieee80211_sub_if_data *sdata; + u32 avg_busy; struct rate_control_ref *ref = NULL; if (!skb || !sta || !tx_time_est) @@ -2014,6 +2016,7 @@ void ieee80211_sta_update_tp(struct ieee80211_local *local, if (local->ops->get_expected_throughput) return; + sdata = sta->sdata; tx_time_est += ack ? 4 : 0; tx_time_est += retry ? retry * 2 : 2; @@ -2022,6 +2025,10 @@ void ieee80211_sta_update_tp(struct ieee80211_local *local, diff = jiffies - sta->deflink.status_stats.last_tp_update; if (diff > HZ / 10) { + avg_busy = ewma_avg_busy_read(&sdata->avg_busy) >> 1; + sta->deflink.tx_stats.tp_tx_time_est += + (sta->deflink.tx_stats.tp_tx_time_est * avg_busy) / 100; + ewma_avg_est_tp_add(&sta->deflink.status_stats.avg_est_tp, sta->deflink.tx_stats.tp_tx_size / sta->deflink.tx_stats.tp_tx_time_est); From patchwork Tue Jul 19 12:35:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baligh GASMI X-Patchwork-Id: 12922500 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B614CCA481 for ; Tue, 19 Jul 2022 13:20:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240390AbiGSNUE (ORCPT ); Tue, 19 Jul 2022 09:20:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243757AbiGSNTg (ORCPT ); Tue, 19 Jul 2022 09:19:36 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C059C9088; Tue, 19 Jul 2022 05:36:30 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id ay11-20020a05600c1e0b00b003a3013da120so9874032wmb.5; Tue, 19 Jul 2022 05:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FfVB0Ls9OHYS9xIHYyqXiXhrpeb/G/aaLlwnUyTVJA8=; b=XOTBaMeaGi+WzNAxZBg9C4y6yOUXU/B2acZDPMK3PMCUgFXxDfObqQoxTFPJajNRKB XxUUiugJgfbyTA/uqIvUm1c/BwsYAinZYaqy4EKOzHNPkIvj9gSklnewYIZgnJ82JE+3 O+U2gyzft6k6fbWrMisDuuQCVehEFLY9wkAQ3SB50m8daSXF3dxL6Yn27yry80FciP/H ERUI9nctkeGCj+OaFAM2TaZ38qhL4wzqndwM+AvCnTofPd+ML7TRDuTK6wtAByGEAtju 9gxUzJOYGaoriqQxo10aiK4meSuunbHW0cXIAc6cyl/EeKIrF/VmLfsf17LJT5jEsXi4 D6sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FfVB0Ls9OHYS9xIHYyqXiXhrpeb/G/aaLlwnUyTVJA8=; b=SQvYvZAI1X7pBgehabQg6Rjl8EVykv0bi2Ra2XGjCt2vToQDgNW531xe1/lY3bxYtc Ua6kS3Tvk97SwhGZ6A7yj6phdXAU1UzguLaADX20G6bNSa4EBpqI+03TL4o5UnUdF3Ci 1Vv3PBmaSNio+vh2i0iZ7LlJGowRmVVRob34zUL25WGmkDt/XvcbGuSWlOWM8THf5puh awnVOG16npE9YcuTPH4yELVKe+gSP4ZZIC9GGRQty+A2oC7eq5iNzPeDQRRn2joL86fx jBqWZcuBxKQMQt92aBeoxReyUzujtwu32kQo/9rcyzwADiY1VDfNWNdpq5pYDq5TURP/ rX2A== X-Gm-Message-State: AJIora8MIoprAtFGw0oNGn31q3R3CWTQT8+Me2r/EQ1wKjfR+6riD4Vv m4LQwSekLlJTxPV7d1HqqVM= X-Google-Smtp-Source: AGRyM1tIXn8RcsbRF7l5mXmB4tuxIzJwsRdnhqt1OUt66TC/zLf9o78m70gcpfvOTI6vZrAIIBFGAw== X-Received: by 2002:a05:600c:21d4:b0:3a3:10a0:cc4f with SMTP id x20-20020a05600c21d400b003a310a0cc4fmr17442769wmj.75.1658234188822; Tue, 19 Jul 2022 05:36:28 -0700 (PDT) Received: from baligh-ThinkCentre-M720q.iliad.local (freebox.vlq16.iliad.fr. [213.36.7.13]) by smtp.googlemail.com with ESMTPSA id bp30-20020a5d5a9e000000b0021e297d6850sm3337522wrb.110.2022.07.19.05.36.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 05:36:28 -0700 (PDT) From: Baligh Gasmi To: Johannes Berg Cc: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Fietkau , Toke Hoiland-Jorgensen , Linus Lussing , Kalle Valo , Baligh Gasmi Subject: [RFC/RFT v5 4/4] mac80211: extend channel info with average busy time. Date: Tue, 19 Jul 2022 14:35:25 +0200 Message-Id: <20220719123525.3448926-5-gasmibal@gmail.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220719123525.3448926-1-gasmibal@gmail.com> References: <20220719123525.3448926-1-gasmibal@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Add the average busy time of the channel in the nl80211. Signed-off-by: Baligh Gasmi --- include/net/cfg80211.h | 1 + include/uapi/linux/nl80211.h | 2 ++ net/mac80211/cfg.c | 8 ++++++++ net/wireless/nl80211.c | 6 ++++++ 4 files changed, 17 insertions(+) diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 80f41446b1f0..38bafcaf3446 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4494,6 +4494,7 @@ struct cfg80211_ops { struct cfg80211_fils_aad *fils_aad); int (*set_radar_background)(struct wiphy *wiphy, struct cfg80211_chan_def *chandef); + int (*get_avg_busy_time)(struct wiphy *wiphy, struct net_device *dev); }; /* diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index d9490e3062a7..4e625f656bd6 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -3177,6 +3177,8 @@ enum nl80211_attrs { NL80211_ATTR_DISABLE_EHT, + NL80211_ATTR_WIPHY_AVG_BUSY_TIME, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 4ddf297f40f2..21a9d0b37ff5 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -4536,6 +4536,13 @@ ieee80211_set_radar_background(struct wiphy *wiphy, return local->ops->set_radar_background(&local->hw, chandef); } +static int ieee80211_get_avg_busy_time(struct wiphy *wiphy, + struct net_device *dev) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + return ewma_avg_busy_read(&sdata->avg_busy); +} + const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, @@ -4641,4 +4648,5 @@ const struct cfg80211_ops mac80211_config_ops = { .set_sar_specs = ieee80211_set_sar_specs, .color_change = ieee80211_color_change, .set_radar_background = ieee80211_set_radar_background, + .get_avg_busy_time = ieee80211_get_avg_busy_time, }; diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 740b29481bc6..eeb3d85fd506 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -3717,6 +3717,12 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag goto nla_put_failure; } + if (rdev->ops->get_avg_busy_time) { + int busy = rdev->ops->get_avg_busy_time(&rdev->wiphy, dev); + nla_put_u32(msg, NL80211_ATTR_WIPHY_AVG_BUSY_TIME, + busy); + } + wdev_lock(wdev); switch (wdev->iftype) { case NL80211_IFTYPE_AP: