From nobody Fri Jun 14 18:43:07 2024 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 4W17Sq5kMmz5PKB6; Fri, 14 Jun 2024 18:43:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W17Sq4QFlz4GPq; Fri, 14 Jun 2024 18:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718390587; 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=PYdtql7e5GT7FXwe3D3MMoEMzGUV1dG60ZvhufyGaz4=; b=PYB8BkZlurnYQCN9toJclsaLjsTm4ps3gA5nK164HbccXDSbQ7WlBuS/GghA46eVgXpo3x Zoe/pkbS6yJdDMDVQmfTVHMiFTxul2bQF9Ds0R6iRFOQGF84QWkbIyv1RNmJ1xwcRWRUGY U05CHp8YBTltR5qvKNPRrfu8bLdb7uYPOaOnGMIcvDQ+4xt1M09sVfuTquIPvrrhPgJO/u SNkLVRpC+P77WOBQLfjLY/tFWC3KBATgK9cdvlkjdVIXt54PJJj+BHb3vjQ9hkTv0IoqAS m5Ov6VwufFWcNTr78Jev8VolYoYMg1kTqovu4013w4GiP+KbmUXgck28GDPcKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718390587; a=rsa-sha256; cv=none; b=SSJ9K/qIdxxtHuOt8x0j3oHVeERnyZB1EwCXovfOtVb2ROrF7QM0mhVMe4Ya+wox3BrpBH tBwd4qO89iIRlR6T4+mxy7L2+Q2c8G0EWHQxoBzKK0EelUhe1ILZUF1JBEAOYGCmkkT9n/ SqfapvwtPJgLXlavmKVXtOlbpdxG1jMHzzriEus/w1YPUL7vxHAA7qkIcUpRpvLb99Xa3F 9mCwEnAP+5ghoyUWFWGCi0vTPdS6a6OpOEwemlyyEGsh0R+IgGdf51vxfq5xtJhjICT7iB 5ofJpvERlAbpNvlkK+s51lJV70rUadyKQ02/qxTr495QNHhe3tBa72SXJmzBlg== 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=1718390587; 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=PYdtql7e5GT7FXwe3D3MMoEMzGUV1dG60ZvhufyGaz4=; b=Y9GYoV+rcpflkF5j8V2deYMfGen6KV4kGDOoSGrXeyidkEjGY/KjzDh1JjKMRGBvQPLnPC KeduCUOjmHO3tUa3Q8xfI+JvcoHXtHc2zZukLiNZ06JHx5gtm+hNOQJhNtnVy2P2V1x6Tq 9c4PQsfIm7hN91Wb9Ej23Wy8zPBco7u3eAhQy7JZBefouumB9bbbXMwdg45Sbu5Szshq3/ YzIg4DES8xo+AhOjwdG8IP4uXuyAJ9g/Ea3Y2OozgaO8It+U7bbydUDRMK7wG5gbdx9Fg/ aoAV25zrt4c6HBa090ueWCqIK0gCskzVnrhyc30qpcOHZoATUAvOhteaSC3lqQ== 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 4W17Sq40yszXKH; Fri, 14 Jun 2024 18:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45EIh7us020703; Fri, 14 Jun 2024 18:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EIh7HY020700; Fri, 14 Jun 2024 18:43:07 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:43:07 GMT Message-Id: <202406141843.45EIh7HY020700@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: 66627e5c1345 - stable/13 - LinuxKPI: 802.11: lock MO tx/wake_tx_queue() downcalls 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/13 X-Git-Reftype: branch X-Git-Commit: 66627e5c1345aa46d0ea4cafb0280b942bbe86b4 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=66627e5c1345aa46d0ea4cafb0280b942bbe86b4 commit 66627e5c1345aa46d0ea4cafb0280b942bbe86b4 Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 21:07:08 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-06-14 14:55:16 +0000 LinuxKPI: 802.11: lock MO tx/wake_tx_queue() downcalls Lock the two TX MO downcalls into driver/firmware in lkpi_80211_txq_tx_one() to make sure they cannot happen in the middle of other (net80211 triggered) updates calling down into the driver/firmware. Sponsored by: The FreeBSD Foundation (commit) Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43966 (cherry picked from commit 45bce6fa306fc3a211949f63c9bbb7932fe5a3bd) --- sys/compat/linuxkpi/common/src/linux_80211.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 870c3414f19e..9a28e637c9fe 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -3770,7 +3770,9 @@ lkpi_80211_txq_tx_one(struct lkpi_sta *lsta, struct mbuf *m) ltxq->txq.tid, ac, skb->priority, skb->qmap); #endif LKPI_80211_LTXQ_UNLOCK(ltxq); + LKPI_80211_LHW_LOCK(lhw); lkpi_80211_mo_wake_tx_queue(hw, <xq->txq); + LKPI_80211_LHW_UNLOCK(lhw); return; ops_tx: @@ -3783,7 +3785,9 @@ ops_tx: #endif memset(&control, 0, sizeof(control)); control.sta = sta; + LKPI_80211_LHW_LOCK(lhw); lkpi_80211_mo_tx(hw, &control, skb); + LKPI_80211_LHW_UNLOCK(lhw); } static void