From nobody Sun Feb 23 00:38:57 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 4Z0lNd6rbkz5p2DS; Sun, 23 Feb 2025 00:38:57 +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 4Z0lNd2qqZz42Fn; Sun, 23 Feb 2025 00:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740271137; 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=2l68dQy3HY2C5ml7JfEh7U9xVbjibZ0HUXbn8f25MwE=; b=am0w8hcO9qxVS3Q1OT6ZOYcGCHORS/dFk1EvqyxQO6EYDAipUQpndlxujqU8hUIR8ZO/7d EUlpmgrF+R9cvbua/Fu8cXyIwEulwl5PTpQrERY+odvoYWOR+KRakPCRWEp8BcZhlertep rgPa2pvPQ5K44sJXq3D6JO/aZF1/yv99o4EmyYdY6tlsBHHMlCws67tscnhf0VpVAa/vcw /4u5aNLJyNEEk+LWXWvmPPEahEcnH0Y5kYBVsNHRcPHUVZ364gNyDrLDaY5Vl+qZaVQgbY isooph/ZN9FZG3C1CK+Oh7YFHO9S0sDscBR5s8FjZlvwnatgv24tFemvk+ygrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740271137; a=rsa-sha256; cv=none; b=X0kALH9eBhsgXFvbxh21bL0kNDZv2QkN5D1LTj5/gIGw9P1WqVS78ZZEv1YbQxmEVd2IAn B5+jqWpVkH9EsGvdxrdjxFdEJRlKopVAz7XAvpzn2IbysrJ8Na++yEFbVF1HZi0YxihVwC KY/ciEzvDWDE1OOs6hOmhzlFgjO9CAxR/n1fIGIC0t5u0L2Ve/B1zpXPgzYsZGwItPzYNd KOfEiS5TzTT1rkvkfWFBrRU65A7Y3hKCEDmfpm5J23EjWTPMiVH3jcdEtePKmKWl2roREh LV/cnP95heZP23UoOA/RsV0ZID9aVjqzEdMmNHGjqcEpYnYd1PofkrbPAYP8Ww== 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=1740271137; 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=2l68dQy3HY2C5ml7JfEh7U9xVbjibZ0HUXbn8f25MwE=; b=KO4ei/KR5eoOmjLEqpPvEwfL+WUBK3yZqU0rdJ8L8n8wRDOkFsEm3DGx/WYTDqJCQ4e4xs XH5V2GyCQHGqJr/J6QPTn00zqDKngVk5KrSA0QobcX9rR8+0pv/o5OA7V/T6xXbs46vsBL bFEdibJHyXW3VXNQhFWIl+rMY6IaQEMAzUSEPKbkwt4M9SP0kRNionVwJUSsXCL9LHqXPX jAj0h00zm0Jf1BfDgXiF37QDUlniA/feH4KxcDQZQNCLoG3TySsC+MGEaSQDG/pjVhGosi D66Fi3M2847HAP+GLqoW0XFxtuJqVd1uLTzdcAhA5U92T6AdJz8MRQwIso95jg== 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 4Z0lNd2QfZzXbx; Sun, 23 Feb 2025 00:38:57 +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 51N0cvTq014611; Sun, 23 Feb 2025 00:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51N0cvLB014608; Sun, 23 Feb 2025 00:38:57 GMT (envelope-from git) Date: Sun, 23 Feb 2025 00:38:57 GMT Message-Id: <202502230038.51N0cvLB014608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 65c573e47c40 - main - LinuxKPI: 802.11: fix locking in lkpi_ic_ampdu_rx_stop() 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/main X-Git-Reftype: branch X-Git-Commit: 65c573e47c40e3f167f3d7e41bd8db40b6b8f91e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=65c573e47c40e3f167f3d7e41bd8db40b6b8f91e commit 65c573e47c40e3f167f3d7e41bd8db40b6b8f91e Author: Bjoern A. Zeeb AuthorDate: 2025-02-22 23:38:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-02-23 00:36:50 +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 MFC after: 3 days --- 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 62d29feabb09..8daa2fa4dc8e 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);