From nobody Wed Jun 11 09:14:26 2025 X-Original-To: dev-commits-src-all@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 4bHKjb6rcFz5yyst; Wed, 11 Jun 2025 09:14:27 +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 4bHKjZ3bMPz3lxX; Wed, 11 Jun 2025 09:14:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633266; 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=8WF1sz3Dwn9W3VPdn+4g2dPcuQJIrVydsZ2yfckW2rY=; b=ijZGk8br2tWjIIvABvob7bSF4TT5TyAN7JTg8yHmM8D8ZS6UeuipkwCbKAMsmvV/SfPIJs VAlZbamz5NG+k+4QMJeBjSFwz1kBbxaCOSdeR4bt4Nkmqf6YJw0S99wTt9QDaEkidyJMY2 3DF9/VRvccYLd4flDn+eS3+5a9vIMUMUXG/0LwU3Q8PXnfS4B22H381Oqsxa5mPCdmolbz 6L19j435jY/56GSCCESOQECEHcSsgg/jUVtw4pEvSALaQ07MXxNmkaPZVK+gWiLFR48bZY GYKvuI0Tfi+ihXgsuuiw08SUIm9hXIR3cyxl/WhKGuL/PwYidzRk8yLOHGFuCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749633266; 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=8WF1sz3Dwn9W3VPdn+4g2dPcuQJIrVydsZ2yfckW2rY=; b=i3roXvWXV4GPuZ66cx+vFL6xVACLmr32iik66GTsFcQwn/EMHYNNG/ZVzr9gdWe230kqox P71mK3Jwagv/tOZvHpiXNm5f62Ylv/Q7LUktLho+9+h0A8uB3odw/MyoIrPaG4LYmAskaM Vji6e0eivs9JhC/tsyPmrFeXwf2kFN8aGkin8Ux4azVq7LYlGg3MlbJIAPmzuD4WRB3s48 zmFL7hxJrmmR3abyoz1+cLKJR0l941i486acHoiAlI26UBVauf8zzf8hFBd2tLn7Zu9Iz5 4HOlEuvHmpN6gJDHtYi969Xp17i1dKTVVSwchHiyWwdPiKUmNDPEv4VOLRE3Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749633266; a=rsa-sha256; cv=none; b=bHxDSM9ol4KbHH3qJtAEr6R9kheEzYeaoC8tIEpUkjI/vnSn1N2qTPTwReNd+UbjhPtRmm cDbA6PIrVPiER8kjv7bXZcsxHqS5ozQGdeDylXZszOtjstGcur7cQ5F9LpGxSh4Oeg06Gh Y79+Ob5iKjyZRQl342PuuBsoqKoB14KkF/s+Lz1UAt1Q+4rTyRktwomqiEBCzXF9TnXO86 GQ4iQ9mMiM1njeS7W1mKrxyiTKp2PB9cz8Pr1EJButR6DOdN9oMT2eG+hzq35M9PzTqn43 TC+93TgHmkvLW+49+CwojzCRiDBqBA7++G1OYYq4ejBukroVEZho9xMuQXn01Q== 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 4bHKjZ39B8z5n9; Wed, 11 Jun 2025 09:14:26 +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 55B9EQis062313; Wed, 11 Jun 2025 09:14:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55B9EQD3062310; Wed, 11 Jun 2025 09:14:26 GMT (envelope-from git) Date: Wed, 11 Jun 2025 09:14:26 GMT Message-Id: <202506110914.55B9EQD3062310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c43bd922a772 - stable/14 - LinuxKPI: 802.11: stop queues during key updates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c43bd922a7724d5fd6919e6bbd222566f7a483f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c43bd922a7724d5fd6919e6bbd222566f7a483f1 commit c43bd922a7724d5fd6919e6bbd222566f7a483f1 Author: Bjoern A. Zeeb AuthorDate: 2025-06-05 21:47:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-06-10 23:40:38 +0000 LinuxKPI: 802.11: stop queues during key updates When beginning key updates do stop and afterwards re-enable the tx queues to avoid packets being passed to the driver. This is a theoretical problem at this point but helps some cases. These functions will likely need refinement in the future. Sponsored by: The FreeBSD Foundation (cherry picked from commit db480c29879cac1afba1d887d7b8871aa4eef6db) --- sys/compat/linuxkpi/common/src/linux_80211.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index be671a2ed7a3..1b1e5721d7b2 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -174,6 +174,7 @@ static void lkpi_ieee80211_free_skb_mbuf(void *); #ifdef LKPI_80211_WME static int lkpi_wme_update(struct lkpi_hw *, struct ieee80211vap *, bool); #endif +static void lkpi_ieee80211_wake_queues_locked(struct ieee80211_hw *); static const char * lkpi_rate_info_bw_to_str(enum rate_info_bw bw) @@ -1631,6 +1632,11 @@ lkpi_iv_key_update_begin(struct ieee80211vap *vap) refcount_acquire(&lvif->ic_unlocked); if (ntislocked) refcount_acquire(&lvif->nt_unlocked); + + /* + * Stop the queues while doing key updates. + */ + ieee80211_stop_queues(hw); } static void @@ -1649,6 +1655,11 @@ lkpi_iv_key_update_end(struct ieee80211vap *vap) lvif = VAP_TO_LVIF(vap); nt = &ic->ic_sta; + /* + * Re-enabled the queues after the key update. + */ + lkpi_ieee80211_wake_queues_locked(hw); + icislocked = IEEE80211_IS_LOCKED(ic); MPASS(!icislocked); ntislocked = IEEE80211_NODE_IS_LOCKED(nt);