From nobody Tue Apr 22 20:03:55 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 4ZhtV36jc1z5t7TK; Tue, 22 Apr 2025 20:03:55 +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 4ZhtV31clpz3V8F; Tue, 22 Apr 2025 20:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745352235; 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=ustu5NiRBpH10iTSqMhfkh5IXGpL9RtV3RvHmRW4eWY=; b=Tm419XjRInQghatYxNM8RiAgWs96/HcmEwOolRLRSuQlW0XNQUS76zrRTKOoDbg4i9CQw7 O1FKS4ZvTxwufo/XMqrjGravz3LQ1Nf04j/QVfHhoDJD7gu3kIV+QHN3w1wjvL1G/hy/eJ oAt8+QKkXqXfZlCP8+Y1IC6A+LxtvFujju0awVgmC548VvSVuRVbLkL/f3jGD+lgLxU1lA Tztecfvq27DCtQ67wfHidJdy4OWn2+NJdb2re+BIYWziowxR6wBLsoSNmbMNcagmjTbxTX eDBqgazmeOhmwH0U6H672D4MnooPNKsIQGFlMxHXlWrO91jVbuc+rFQaSSmmlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745352235; a=rsa-sha256; cv=none; b=J9yEyqIBs0J6tdqUHBlvfQ7fUZSj7WEZtnz4rqvsc2vfhyXvCwRMv2ypoDG4ppp7omVlVv cM2kfFytpa3CiQFiF9DKRJ+gBSSDWg9LcMHPr+QzBiaPlAv9RidkefpRDpV0C//TMp5FLR KDqKyhGyoLzr6prMT/XNUywr2Yct3wjhhWmHOsZsuXSJ22jhX5BONPiVh+p+OWf5T8lrJM bryu9Sz08fwuEwyGIAz27hhD/lS7kP24SHzfBnyOFD5cEYGJsvUHb4KHkxpwesLx+o2MvR +6XwIsg3QIKzFpFFuiwOoNPm5uPyD82axsUGDFLKnIu1j1Hb8AMd7MtQWXnt1A== 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=1745352235; 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=ustu5NiRBpH10iTSqMhfkh5IXGpL9RtV3RvHmRW4eWY=; b=sgK/O81K/C5NPh9MDgqQdEfyiBWYanEk3hR2KELAKLvi17ZyIlMjrHkhODbyKoXP01seAb 6q8SiFhXGlNo7dL9+S6lzagImiPnEkQcaQZJvOc4Z8SJdOeht3NMDKfG8kyz6/Y+nWt8ot VZEZP8t2nFJ65MrXQ+TK2Re7VaGGsLBhG5MKd+w9wl0Hgore4QSShK0NnBpDxxatcTZdR9 1G+8SN67rLnO68IYESRCqKt/Q0UEqvDdmBRAw/dgboSyRpDjon9xBmDLmbGEFapBSmtrRn 40ajAf9ihHv+EvN0pVpPVAPwjuv49ykwUe3LfGVEvjxAvGfYEnFnBzoIjYThdg== 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 4ZhtV31DVfzZFB; Tue, 22 Apr 2025 20:03:55 +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 53MK3tL0099002; Tue, 22 Apr 2025 20:03:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53MK3tMf098999; Tue, 22 Apr 2025 20:03:55 GMT (envelope-from git) Date: Tue, 22 Apr 2025 20:03:55 GMT Message-Id: <202504222003.53MK3tMf098999@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: dbc3b1cb4fa6 - main - LinuxKPI: 802.11: no need to lock during lkpi_lsta_alloc() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbc3b1cb4fa6d1f9ac7ac1e860179ce1b432cd70 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dbc3b1cb4fa6d1f9ac7ac1e860179ce1b432cd70 commit dbc3b1cb4fa6d1f9ac7ac1e860179ce1b432cd70 Author: Bjoern A. Zeeb AuthorDate: 2025-04-22 19:52:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-04-22 20:03:31 +0000 LinuxKPI: 802.11: no need to lock during lkpi_lsta_alloc() Given upon sta allocation we do not adjust the chanctx in case of mismatch there is not need to lock here. This fixes a problem that upon shutdown net80211 once again can race into here replacing the node from a context where it is holding a lock which does not allow us to hold an sx lock (sleeping thread holds a non-sleepable lock). Sponsored by: The FreeBSD Foundation MFC after: 3 days Reported by: ziaee Tested by: ziaee --- sys/compat/linuxkpi/common/src/linux_80211.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 0cd70d63a748..47eb52677cdf 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -777,9 +777,7 @@ lkpi_lsta_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN], sta->deflink.bandwidth = IEEE80211_STA_RX_BW_20; sta->deflink.rx_nss = 1; - wiphy_lock(hw->wiphy); lkpi_sta_sync_from_ni(hw, vif, sta, ni, false); - wiphy_unlock(hw->wiphy); IMPROVE("he, eht, bw_320, ... smps_mode, ..");