Subject: Re: [RFC/RFT] mac80211: Switch to a virtual time-based airtime
 scheduler
To:     =?UTF-8?Q?Toke_H=c3=b8iland-J=c3=b8rgensen?= <toke@redhat.com>,
        make-wifi-fast@lists.bufferbloat.net,
        linux-wireless@vger.kernel.org
Cc:     Rajkumar Manoharan <rmanohar@codeaurora.org>,
        Kan Yan <kyan@google.com>
References: <20190215170512.31512-1-toke@redhat.com>
 <f6c5bc25-a8b3-bac3-8d62-d41347a6c070@nbd.name> <874l8d7hjy.fsf@toke.dk>
From:   Felix Fietkau <nbd@nbd.name>
Openpgp: preference=signencrypt
Autocrypt: addr=nbd@nbd.name; prefer-encrypt=mutual; keydata=
 mQGiBEah5CcRBADIY7pu4LIv3jBlyQ/2u87iIZGe6f0f8pyB4UjzfJNXhJb8JylYYRzIOSxh
 ExKsdLCnJqsG1PY1mqTtoG8sONpwsHr2oJ4itjcGHfn5NJSUGTbtbbxLro13tHkGFCoCr4Z5
 Pv+XRgiANSpYlIigiMbOkide6wbggQK32tC20QxUIwCg4k6dtV/4kwEeiOUfErq00TVqIiEE
 AKcUi4taOuh/PQWx/Ujjl/P1LfJXqLKRPa8PwD4j2yjoc9l+7LptSxJThL9KSu6gtXQjcoR2
 vCK0OeYJhgO4kYMI78h1TSaxmtImEAnjFPYJYVsxrhay92jisYc7z5R/76AaELfF6RCjjGeP
 wdalulG+erWju710Bif7E1yjYVWeA/9Wd1lsOmx6uwwYgNqoFtcAunDaMKi9xVQW18FsUusM
 TdRvTZLBpoUAy+MajAL+R73TwLq3LnKpIcCwftyQXK5pEDKq57OhxJVv1Q8XkA9Dn1SBOjNB
 l25vJDFAT9ntp9THeDD2fv15yk4EKpWhu4H00/YX8KkhFsrtUs69+vZQwbQcRmVsaXggRmll
 dGthdSA8bmJkQG5iZC5uYW1lPohgBBMRAgAgBQJGoeQnAhsjBgsJCAcDAgQVAggDBBYCAwEC
 HgECF4AACgkQ130UHQKnbvXsvgCgjsAIIOsY7xZ8VcSm7NABpi91yTMAniMMmH7FRenEAYMa
 VrwYTIThkTlQuQINBEah5FQQCACMIep/hTzgPZ9HbCTKm9xN4bZX0JjrqjFem1Nxf3MBM5vN
 CYGBn8F4sGIzPmLhl4xFeq3k5irVg/YvxSDbQN6NJv8o+tP6zsMeWX2JjtV0P4aDIN1pK2/w
 VxcicArw0VYdv2ZCarccFBgH2a6GjswqlCqVM3gNIMI8ikzenKcso8YErGGiKYeMEZLwHaxE
 Y7mTPuOTrWL8uWWRL5mVjhZEVvDez6em/OYvzBwbkhImrryF29e3Po2cfY2n7EKjjr3/141K
 DHBBdgXlPNfDwROnA5ugjjEBjwkwBQqPpDA7AYPvpHh5vLbZnVGu5CwG7NAsrb2isRmjYoqk
 wu++3117AAMFB/9S0Sj7qFFQcD4laADVsabTpNNpaV4wAgVTRHKV/kC9luItzwDnUcsZUPdQ
 f3MueRJ3jIHU0UmRBG3uQftqbZJj3ikhnfvyLmkCNe+/hXhPu9sGvXyi2D4vszICvc1KL4RD
 aLSrOsROx22eZ26KqcW4ny7+va2FnvjsZgI8h4sDmaLzKczVRIiLITiMpLFEU/VoSv0m1F4B
 FtRgoiyjFzigWG0MsTdAN6FJzGh4mWWGIlE7o5JraNhnTd+yTUIPtw3ym6l8P+gbvfoZida0
 TspgwBWLnXQvP5EDvlZnNaKa/3oBes6z0QdaSOwZCRA3QSLHBwtgUsrT6RxRSweLrcabiEkE
 GBECAAkFAkah5FQCGwwACgkQ130UHQKnbvW2GgCfTKx80VvCR/PvsUlrvdOLsIgeRGAAn1ee
 RjMaxwtSdaCKMw3j33ZbsWS4
Message-ID: <a2b4c6c5-7b49-b809-a087-73548954e0bf@nbd.name>
Date:   Fri, 8 Mar 2019 19:16:34 +0100
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0)
 Gecko/20100101 Thunderbird/60.5.3
MIME-Version: 1.0
In-Reply-To: <874l8d7hjy.fsf@toke.dk>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

On 2019-03-08 12:05, Toke Høiland-Jørgensen wrote:
> Felix Fietkau <nbd@nbd.name> writes:
> 
>> On 2019-02-15 18:05, Toke Høiland-Jørgensen wrote:
>>> This switches the airtime scheduler in mac80211 to use a virtual time-based
>>> scheduler instead of the round-robin scheduler used before. This has a
>>> couple of advantages:
>>> 
>>> - No need to sync up the round-robin scheduler in firmware/hardware with
>>>   the round-robin airtime scheduler.
>>> 
>>> - If several stations are eligible for transmission we can schedule both of
>>>   them; no need to hard-block the scheduling rotation until the head of the
>>>   queue has used up its quantum.
>>> 
>>> - The check of whether a station is eligible for transmission becomes
>>>   simpler (in ieee80211_txq_may_transmit()).
>>> 
>>> The drawback is that scheduling becomes slightly more expensive, as we need
>>> to maintain an rbtree of TXQs sorted by virtual time. This means that
>>> ieee80211_register_airtime() becomes O(logN) in the number of currently
>>> scheduled TXQs. However, hopefully this number rarely grows too big (it's
>>> only TXQs currently backlogged, not all associated stations), so it
>>> shouldn't be too big of an issue.
>>> 
>>> Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
>> The approach looks good to me, but I haven't really reviewed it very
>> carefully yet. Just some points that I noticed below:
> 
> Cool!
> 
>>> diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
>>> index 11f058987a54..9d01fdd86e2d 100644
>>> --- a/net/mac80211/sta_info.c
>>> +++ b/net/mac80211/sta_info.c
>>> @@ -389,7 +389,6 @@ struct sta_info *sta_info_alloc(struct ieee80211_sub_if_data *sdata,
>>>  	for (i = 0; i < IEEE80211_NUM_ACS; i++) {
>>>  		skb_queue_head_init(&sta->ps_tx_buf[i]);
>>>  		skb_queue_head_init(&sta->tx_filtered[i]);
>>> -		sta->airtime[i].deficit = sta->airtime_weight;
>>>  	}
>>>  
>>>  	for (i = 0; i < IEEE80211_NUM_TIDS; i++)
>>> @@ -1831,18 +1830,32 @@ void ieee80211_sta_register_airtime(struct ieee80211_sta *pubsta, u8 tid,
>>>  {
>>>  	struct sta_info *sta = container_of(pubsta, struct sta_info, sta);
>>>  	struct ieee80211_local *local = sta->sdata->local;
>>> +	struct ieee80211_txq *txq = sta->sta.txq[tid];
>>>  	u8 ac = ieee80211_ac_from_tid(tid);
>>> -	u32 airtime = 0;
>>> +	u64 airtime = 0, weight_sum;
>>> +
>>> +	if (!txq)
>>> +		return;
>>>  
>>>  	if (sta->local->airtime_flags & AIRTIME_USE_TX)
>>>  		airtime += tx_airtime;
>>>  	if (sta->local->airtime_flags & AIRTIME_USE_RX)
>>>  		airtime += rx_airtime;
>>>  
>>> +	/* Weights scale so the unit weight is 256 */
>>> +	airtime <<= 8;
>>> +
>>>  	spin_lock_bh(&local->active_txq_lock[ac]);
>>> +
>>>  	sta->airtime[ac].tx_airtime += tx_airtime;
>>>  	sta->airtime[ac].rx_airtime += rx_airtime;
>>> -	sta->airtime[ac].deficit -= airtime;
>>> +
>>> +	weight_sum = local->airtime_weight_sum[ac] ?: sta->airtime_weight;
>>> +
>>> +	local->airtime_v_t[ac] += airtime / weight_sum;
>>> +	sta->airtime[ac].v_t += airtime / sta->airtime_weight;
>>> +	ieee80211_resort_txq(&local->hw, txq);
>> These divisions could be a bit expensive, any way to change the
>> calculation to avoid them?
> 
> Yeah, given that the denominators are constant from the PoV of the fast
> path, we can pre-compute reciprocals and turn these divides into
> multiplications. Will incorporate that...
Sounds good.

>> I'm a bit worried about this part. Does that mean that vif txqs always
>> have priority over sta txqs?
> 
> Yeah, it does. This sort of mirrors what the existing airtime scheduler
> does (because VIFs don't have an airtime deficit), but because it's a
> round-robin scheduler the effect is less severe as long as there are
> stations able to transmit.
> 
> I guess the obvious fix is to start accounting airtime usage for the VIF
> as well? We may want to do that in any case, as that would also give
> users a convenient way to set policy for multicast traffic. Any
> objections to this?
I think this is a good idea.

- Felix