Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Content-Type: text/plain; charset=UTF-8
Cc:     "David S . Miller" <davem@davemloft.net>,
        "Eric Dumazet" <edumazet@google.com>,
        "Jakub Kicinski" <kuba@kernel.org>,
        "Paolo Abeni" <pabeni@redhat.com>,
        <linux-wireless@vger.kernel.org>, <netdev@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, "Felix Fietkau" <nbd@nbd.name>,
        "Toke Hoiland-Jorgensen" <toke@redhat.com>,
        "Linus Lussing" <linus.luessing@c0d3.blue>,
        "Kalle Valo" <kvalo@kernel.org>
Subject: Re: [RFC/RFT v5 3/4] mac80211: add busy time factor into expected
 throughput
From:   "Nicolas Escande" <nico.escande@gmail.com>
To:     "Baligh Gasmi" <gasmibal@gmail.com>,
        "Johannes Berg" <johannes@sipsolutions.net>
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Date:   Thu, 25 Aug 2022 15:36:34 +0200
Message-Id: <CMF5ERVFCDM9.G96GZB43SEWO@syracuse>
References: <20220719123525.3448926-1-gasmibal@gmail.com>
 <20220719123525.3448926-4-gasmibal@gmail.com>
In-Reply-To: <20220719123525.3448926-4-gasmibal@gmail.com>
Precedence: bulk

On Tue Jul 19, 2022 at 2:35 PM CEST, Baligh Gasmi wrote:
> When estimating the expected throughput, take into account the busy time
> of the current channel.
>
> Signed-off-by: Baligh Gasmi <gasmibal@gmail.com>
> ---
>  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 =3D 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 =3D sta->sdata;
>  	tx_time_est +=3D ack ? 4 : 0;
>  	tx_time_est +=3D retry ? retry * 2 : 2;
>
> @@ -2022,6 +2025,10 @@ void ieee80211_sta_update_tp(struct ieee80211_loca=
l *local,
>
>  	diff =3D jiffies - sta->deflink.status_stats.last_tp_update;
>  	if (diff > HZ / 10) {
> +		avg_busy =3D 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;
Once again div_u64() ?
> +
>  		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);
> --
> 2.37.1