From nobody Sat May 3 15:39:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZqX5Z5qyYz5vVhV; Sat, 03 May 2025 15:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZqX5Z3svGz3b4C; Sat, 03 May 2025 15:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746286754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NWvmFDTt0/YTL8HVNHB2ws/UmdLZ8fQcb84ibS3Kzs=; b=lGt37TywG7sGMqgTqA9yGTgzHb/glKCR/XXVqCf9Rm7KUL+4MQUVIySFA9Xs5RXR4zZAN6 8q6qYqQZhEwCJs4gRpo+jmjZ4L9oDegUHD9Cqg0xRV8kQvMvvc22C20l/CS5/oKCvcx6eK Ln7RZP8xpyRm5ZmWpsnrjTLHPNsOhHY88bf2Rb8x7gFdSDPKp5At6Pol2xhjFQSjL7FfQs pAOMVo071eGCwHcvr09Emo0vaAEbRZmQ9k7n98iKEuYtTk/MJDId2fKZAibtsAkkIT+55z 0fF45d9o0Nf30rs3jDP1HRi1GaBlLBXVyDxfsGAwO8ENb5LCcxvOWQ5vWwUdrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746286754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7NWvmFDTt0/YTL8HVNHB2ws/UmdLZ8fQcb84ibS3Kzs=; b=shZEhIRA3K1DbK6REQ84v8MwjYUxzbuw3BG3Sq1AN/pZ7ct7dYlB3vihuy0xlP1GzTW+v0 LrESkqHfqFBC4xpYdr80RM7TcICgW1j81Ji5kXoUWwmvXQJkkup+mozIrKCCcocuBlbM9H UhX82McH1tlXBkTwviOqMvmj5gRUQ0sATTGo+iqefkp+q/gMI+ivyae8O7o2ykTFadTg3N Bq5Qukfjtu0YL4WKjicpTh2MElAZ7yoU+0p4kf9HnQFeaKZYdvEXnyoUyBlmrGFrD+umjA ShDYDVzRuvCSPzvMJ8emRkuG5qPzQoPzjVSbEfR3tp8CWeFvTJ1y97akO7vjSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746286754; a=rsa-sha256; cv=none; b=C70In+QSYJjFQw54DEhIgyClxUt6T5s2bgEjGxdHE50eukk1LHI8AaX5MfwDulQF1iPvqD XCyyosSxQYNCcGJAFaVOr6DzttQOSk7/BR5bRo0zSwWM+aniyfzUqt9u3Nby9jfZO5LB+G Lpj1oMWbRfwNRclx3vhwmfwfBmO+5YbOA52JEKTmwUe6RvG9qIbWHXMG6i64wcu0DkaN1m 6653HlSnwCDeoZ55CiRRnalFz5qBC4N0rEvGixyFmXWTG1hj0DVcRUM13Yj5dHRUqeNtgM LixO2e96pa5aLnt5gYMzUAmJkjW/ee0LWgMOhuT1rI27tPuCu3r8BgYtnrguZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZqX5Z2jR8zpKM; Sat, 03 May 2025 15:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 543FdEXv083112; Sat, 3 May 2025 15:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FdETN083109; Sat, 3 May 2025 15:39:14 GMT (envelope-from git) Date: Sat, 3 May 2025 15:39:14 GMT Message-Id: <202505031539.543FdETN083109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 44ec60a4290b - main - net80211: fix ff_approx_txtime() to handle VHT rates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44ec60a4290b1b4dd4842889038c399a7bed17bd Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=44ec60a4290b1b4dd4842889038c399a7bed17bd commit 44ec60a4290b1b4dd4842889038c399a7bed17bd Author: Adrian Chadd AuthorDate: 2025-04-10 20:27:14 +0000 Commit: Adrian Chadd CommitDate: 2025-05-03 15:38:51 +0000 net80211: fix ff_approx_txtime() to handle VHT rates The fast frames / A-MSDU aggregation code is calculating whether to aggregate frames based on transmit time, which requires a frame length calculation. Unfortunately this is another place where VHT rates started showing up but weren't being handled. This only shows up if IEEE80211_SUPPORT_SUPERG is enabled, which isn't enabled by default (which means there's also no net80211 software driven A-MSDU assembly.) So: * Fetch the rate type * Handle HT, LEGACY, VHT and UNDEFINED * default UNDEFINED to 4ms, which should avoid the FF/A-MSDU aggregation * default VHT to 1ms, to allow SOME possible A-MSDU aggregation where possible. There needs to be a bit more work done on HT/VHT for doing A-MSDU with and without A-MPDU running, as that drastically changes the math. Differential Revision: https://reviews.freebsd.org/D49766 --- sys/net80211/ieee80211_superg.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/sys/net80211/ieee80211_superg.c b/sys/net80211/ieee80211_superg.c index ee3b70d5ed9f..fcf0c614b0a0 100644 --- a/sys/net80211/ieee80211_superg.c +++ b/sys/net80211/ieee80211_superg.c @@ -721,6 +721,7 @@ static uint32_t ff_approx_txtime(struct ieee80211_node *ni, const struct mbuf *m1, const struct mbuf *m2) { + struct ieee80211_node_txrate txr; struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap = ni->ni_vap; uint32_t framelen; @@ -743,20 +744,33 @@ ff_approx_txtime(struct ieee80211_node *ni, if (m2 != NULL) framelen += m2->m_pkthdr.len; - /* - * For now, we assume non-shortgi, 20MHz, just because I want to - * at least test 802.11n. - */ - dot11rate = ieee80211_node_get_txrate_dot11rate(ni); - if (dot11rate & IEEE80211_RATE_MCS) + ieee80211_node_get_txrate(ni, &txr); + + switch (txr.type) { + case IEEE80211_NODE_TXRATE_LEGACY: + dot11rate = ieee80211_node_get_txrate_dot11rate(ni); + frame_time = ieee80211_compute_duration(ic->ic_rt, framelen, + dot11rate, 0); + break; + case IEEE80211_NODE_TXRATE_HT: + /* TODO: check ht40/shortgi */ + dot11rate = ieee80211_node_get_txrate_dot11rate(ni); frame_time = ieee80211_compute_duration_ht(framelen, dot11rate, IEEE80211_HT_RC_2_STREAMS(dot11rate), 0, /* isht40 */ 0); /* isshortgi */ - else - frame_time = ieee80211_compute_duration(ic->ic_rt, framelen, - dot11rate, 0); + break; + case IEEE80211_NODE_TXRATE_VHT: + /* TODO: there's no VHT frame length calculation just yet */ + frame_time = 1000; /* 1ms */ + break; + case IEEE80211_NODE_TXRATE_UNDEFINED: + /* TODO: proper error handling */ + frame_time = 4000; /* 4ms */ + break; + } + return (frame_time); }