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;
From:   Toke =?utf-8?Q?H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
To:     Peter Seiderer <ps.report@gmx.net>, linux-wireless@vger.kernel.org
Cc:     Kalle Valo <kvalo@kernel.org>,
        "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Johannes Berg <johannes@sipsolutions.net>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        Felix Fietkau <nbd@nbd.name>
Subject: Re: [PATCH v1 2/2] mac80211: minstrel_ht: fill all requested rates
In-Reply-To: <20220402153014.31332-2-ps.report@gmx.net>
References: <20220402153014.31332-1-ps.report@gmx.net>
 <20220402153014.31332-2-ps.report@gmx.net>
Date:   Mon, 04 Apr 2022 20:21:24 +0200
Message-ID: <87fsmseml7.fsf@toke.dk>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

+Felix

Peter Seiderer <ps.report@gmx.net> writes:

> Fill all requested rates (in case of ath9k 4 rate slots are
> available, so fill all 4 instead of only 3), improves throughput in
> noisy environment.

How did you test this? Could you quantify the gains in throughput you saw?

-Toke

> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  net/mac80211/rc80211_minstrel_ht.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c
> index 9c6ace858107..cd6a0f153688 100644
> --- a/net/mac80211/rc80211_minstrel_ht.c
> +++ b/net/mac80211/rc80211_minstrel_ht.c
> @@ -1436,17 +1436,17 @@ minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
>  	/* Start with max_tp_rate[0] */
>  	minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_tp_rate[0]);
>  
> -	if (mp->hw->max_rates >= 3) {
> -		/* At least 3 tx rates supported, use max_tp_rate[1] next */
> -		minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_tp_rate[1]);
> -	}
> +	/* Fill up remaining, keep one entry for max_probe_rate */
> +	for (; i < (mp->hw->max_rates - 1); i++)
> +		minstrel_ht_set_rate(mp, mi, rates, i, mi->max_tp_rate[i]);
>  
> -	if (mp->hw->max_rates >= 2) {
> +	if (i < mp->hw->max_rates)
>  		minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_prob_rate);
> -	}
> +
> +	if (i < IEEE80211_TX_RATE_TABLE_SIZE)
> +		rates->rate[i].idx = -1;
>  
>  	mi->sta->max_rc_amsdu_len = minstrel_ht_get_max_amsdu_len(mi);
> -	rates->rate[i].idx = -1;
>  	rate_control_set_rates(mp->hw, mi->sta, rates);
>  }
>  
> -- 
> 2.35.1