From nobody Wed Feb 26 15:03:14 2025 X-Original-To: dev-commits-src-branches@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 4Z2yQW0G2Vz5qGCS; Wed, 26 Feb 2025 15:03:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2yQV4CD0z3GR6; Wed, 26 Feb 2025 15:03:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582194; 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=xYPfhOhsSPm5r6+M4MSxP3BP9fO/VvHq7Vi//L90E5w=; b=oaibaGmFyEbUS6NI6Q+K12Re64kMLH4k3lo35pSqRSEBpyqxp2muwv/0jSsXFQmDyUMCjE jQFoTIrcsyjZVks1/AFcSl4d7v45jEzahmoMo7UbM+RixbKVuVSoKFdfEXBFzRwAKbGVrX Np9/nLUinbWbSw8TLpgzu1Ylb0+9erIZtkge0NOYhLG6vjDC6th0BQsqRzRhIzxDUF9Nd6 qdkQovRLPPV9T3oAvXtSgH9Ix1LXbERxYbw2zxH9QHuYjY7fkw12G4NekpXaZinbtjLS3V 2BSTUjtVk+y0BwmUEQcsVHVZ28obuZzNEDawzcOT7E4u+K37VrkXiZSaia5EsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740582194; a=rsa-sha256; cv=none; b=qoNCl+geajtrCsvRg3lZe6OTlkMiGbHppadK+Pf3w3b1v4I3O1b8AdgPmmHBzTRIMgf8z0 vW3Oor7TTORsU7pRQS5S7jQTxtJgcr5wdPOG8Cts8uogECgf2li3km6pDisuABbCYWLFVo j24KB5A8HYOttYN4vZld7gQGaCd9HOlnL3+OtKvhZ4GL8d2BkqzqOdI0c9NihuRwZn6JB+ TmqcJHc0AbVTkMHC4bz4pEIlducsCGNNOUaR+zVZUjs15UOK+fZcPy49SlQnQNyWLJfnIe s0tYolTEz7o6MXfHxEV7IPZiRDdeaOqrWaL1Qu5+iOuPyoyhtic/Meta1Z3Pbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740582194; 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=xYPfhOhsSPm5r6+M4MSxP3BP9fO/VvHq7Vi//L90E5w=; b=qfAWtEvUZmPwjeVNel0P/32dV8FLw2KWJvVABFyHmoOI60x8Q0Gt3kncaFG3XIMQx0tM9T vyc3rUYVC5ix58/aI/4bV5R68KD5IgEyXOhWfQIaxQz6yaLrpRtecraccBbMZM0K15o5MJ SCRUx2/Wk8V11ZE/WcD60qSChWFu/S/1hewX/NAbY+WFRQltMtjmPR/suCb/1aHNy8apT8 +R4iN5fenWOK6RHYDxAICx/HmV8NHYQ+bolranNog/HaT0+uSt3sIcoAbssDTkEI946S86 X/BRXnUMGHV5I7Z9Z5kswkTrV2u2wU922Lb/re04onMMZxykjO8Ulz8VHrgXmw== 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 4Z2yQV3pKHz1GnH; Wed, 26 Feb 2025 15:03: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 51QF3Epi014636; Wed, 26 Feb 2025 15:03:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51QF3E9l014633; Wed, 26 Feb 2025 15:03:14 GMT (envelope-from git) Date: Wed, 26 Feb 2025 15:03:14 GMT Message-Id: <202502261503.51QF3E9l014633@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: a775c23e4061 - stable/14 - LinuxKPI: 802.11: fix locking in lkpi_ic_ampdu_rx_stop() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: a775c23e406136b31d3c4c6bf6a7f2cf4a733c0b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a775c23e406136b31d3c4c6bf6a7f2cf4a733c0b commit a775c23e406136b31d3c4c6bf6a7f2cf4a733c0b Author: Bjoern A. Zeeb AuthorDate: 2025-02-22 23:38:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-26 02:39:35 +0000 LinuxKPI: 802.11: fix locking in lkpi_ic_ampdu_rx_stop() net80211 has inconsistent locking when calling into (*ic_ampdu_rx_stop)(). Make use of 054c5ddf587a7 and conditionally check if the caller locked or not and if locked temporary drop the lock to avoid sleeping on a non-sleepaable lock during the downcall into the driver. Sponsored by: The FreeBSD Foundation (cherry picked from commit 65c573e47c40e3f167f3d7e41bd8db40b6b8f91e) --- sys/compat/linuxkpi/common/src/linux_80211.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 1255691ccf70..5ecfdf495948 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -5024,6 +5024,7 @@ lkpi_ic_ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap) struct ieee80211_ampdu_params params = { }; int error; uint8_t tid; + bool ic_locked; ic = ni->ni_ic; lhw = ic->ic_softc; @@ -5061,11 +5062,14 @@ lkpi_ic_ampdu_rx_stop(struct ieee80211_node *ni, struct ieee80211_rx_ampdu *rap) params.tid = tid; params.amsdu = false; - // IEEE80211_UNLOCK(ic); + ic_locked = IEEE80211_IS_LOCKED(ic); + if (ic_locked) + IEEE80211_UNLOCK(ic); LKPI_80211_LHW_LOCK(lhw); error = lkpi_80211_mo_ampdu_action(hw, vif, ¶ms); LKPI_80211_LHW_UNLOCK(lhw); - // IEEE80211_LOCK(ic); + if (ic_locked) + IEEE80211_LOCK(ic); if (error != 0) ic_printf(ic, "%s: mo_ampdu_action returned %d. ni %p rap %p\n", __func__, error, ni, rap);