From nobody Mon Feb 9 07:54:49 2026 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7685F36CDF4 for ; Tue, 20 Jan 2026 06:29:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768890545; cv=none; b=FU7GZetapB5vdgOhxwDPH6kkOagcCGs7dSf0nn9zutzegaCKm9TJKbvt/TuQmL7hZoL4JVqnFcL0/wMQ9+cSK87VepM8rPTHFG7aZNP2mxuhEBtfWbPgdIbfJrB4+bUrTAgkSNU4siaYAcPKDaMNpR5R+mxCLdB+BeOTSX9JU9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768890545; c=relaxed/simple; bh=opbV4IdcTAjTugROH0USOiae0jYpBQAjBUnIclDTNyE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TK8QLXxK18XewcxsJrhgzVT05o9GtAqR8vL4ITy1CNz5rzzB7TSKVXfBVkXMjrIZqKA386Ukxv9nmSpNu6DG2hpgP7rQARhPuwAPOZD7vpuBgPc9xB0MOoQ6yffDF/wW42JtHsOONgO4D8GFKjb80mA0bHsxCnyaGja4gI0LvYI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zacbowling.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PQQWr79p; arc=none smtp.client-ip=74.125.82.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zacbowling.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PQQWr79p" Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-2b04fcfc0daso5984515eec.0 for ; Mon, 19 Jan 2026 22:29:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768890542; x=1769495342; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=oLLa5fZdpzWHQDj1zzbC4zgrpjcPTG+wEA6kFtMuqxE=; b=PQQWr79pBmxcy1Qz6W84HEYSMmMT0+IUwcyFKyjmqUdbsCer+DedcO5Je/CPUlyuGV 9PwWpL++JYXHFsevjlYWMC7QK5xjwlXdnIhOiLqk0yie4bC/BthBnBVe3kR3DvW54FTP aDyGgL2sJgo/mdcJ9/uuGTJA0ruccCQyWyDDQK8sGlXoPKYdzL9Egk2by2PlOEMLnpwd dnsQUOqW5RS2J0Mo3rwa9DhdbBTMDROmyUFgtRKxcf0BzLrFjtoC4e3HUy+cDLpBV09c BtdpCDe0ekzCdWlsMpDVv6dBdMLeP9bxmoPX6YPxepgPk9pVch5JOiiYPUdiywR4JSC7 OlNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768890542; x=1769495342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oLLa5fZdpzWHQDj1zzbC4zgrpjcPTG+wEA6kFtMuqxE=; b=eLk6tHbMHVQ+2UUKRAl1y6MPNqv5bum3+fMUGLYxieX5RSt4LFgrA3r2/n0l7G8m8/ z7fFexh/UIg0MWs5QJpDls6RIRxsnkSE+3BdNcvHW5tqdoywXQPJAO+YcXzdCwm3m/Xb UeG87f/RYZlRJ+CCYsaiVrEw4N61g0jgw1xCCBub531eUzZjnEPlVseqm8mqA/djTYWa Myjac2dcfajfbQnd9576pR7g1Hu0OFI2/dERVSFGCJPgnaOGdmSpRNTzx1QrrgiL0r2t evVqAbKboOCecoj5X84yyAZUfGN3xbhiIS7N9pr5loExrctVnmNk01u7xgtvQCGjhdDL C4ug== X-Forwarded-Encrypted: i=1; AJvYcCWx/JTWaLbZWeBotnslUbLpxHkWYqAv50z+cTaoeAAEJlJv7Nts9nMLRKMzg+4Qcr7F7KH+oNjBAk6xjjg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx39JzAeg9ZPURM9RwVJ2HLXY9BCVWjvNnTWkqu/y+2gA+VGF1Z Qo8+B3NOv4wgIX6C/5K//2W1aBid2R/xn930W7+KHJ1MbqbdB7uV8SR7 X-Gm-Gg: AZuq6aL2eg6AWM+SPp/bn3yZ+1JrWImBfHnV3lwu4XXyKx2DkfmCOQJFkqBzDS2X8Nf D8RANZiLCV9p55wPCMj2W1JBqMyEZuPTk9sDSstngFQyO44YyPtvjZrs8UIopY0cS/3q4+yz0Oo FfWeHTk71VWFljBOrKHxrKGrgHtkDXyMFoTH00oAAKZQDZzpxQvFkgNjJmCo/ayRg9sa3+lL5qM KoSR9jvF7/x7JD1QN6AwrqYlexfBygeOSvRQcWt14FapPb4D0UnXvNAAM43yLSsv8uPIBN5mKBb 9au9JDsVGkvkTcXz7hKGoiIwPzF5Or6JVrlxmt1x4crtRP3S3vV6qlTMsGGcAtDk9JsPc5amV8u WTJlWa7vxkudV0NIAoD3Oiw+xrZ8tHoqw3KE50snhNEGIgBSIBoUJkPNDOf8aWJn/TVEPp9OYdt s9FKp5SXH3wLvGsRjde9r4MYg8pbcp0dAYYJkEyT7tXOlNdDaDXEAIXdhxSgl2 X-Received: by 2002:a05:7301:5f85:b0:2ae:5af4:7d65 with SMTP id 5a478bee46e88-2b6b410b608mr10898547eec.31.1768890542196; Mon, 19 Jan 2026 22:29:02 -0800 (PST) Received: from zcache.home.zacbowling.com ([2001:5a8:60d:bc9:f31e:1cb:296a:cc2a]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b6b3502c91sm15706784eec.9.2026.01.19.22.29.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 22:29:01 -0800 (PST) Sender: Zac Bowling From: Zac To: sean.wang@kernel.org Cc: deren.wu@mediatek.com, kvalo@kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-wireless@vger.kernel.org, lorenzo@kernel.org, nbd@nbd.name, ryder.lee@mediatek.com, sean.wang@mediatek.com, stable@vger.kernel.org, linux@frame.work, zbowling@gmail.com, Zac Bowling Subject: [PATCH 04/11] wifi: mt76: mt7921: fix deadlock in sta removal and suspend ROC abort Date: Mon, 19 Jan 2026 22:28:47 -0800 Message-ID: <20260120062854.126501-5-zac@zacbowling.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120062854.126501-1-zac@zacbowling.com> References: <20260120062854.126501-1-zac@zacbowling.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Zac Bowling Fix deadlock scenarios in mt7921 ROC (Remain On Channel) abort paths: 1. Suspend path deadlock (pci.c, sdio.c): - Previous fix (b74d48c46f) added mutex around mt7921_roc_abort_sync - But roc_work acquires mutex, so cancel_work_sync can deadlock - Fix: Remove mutex wrappers since mt7921_roc_abort_sync doesn't actually need them (it only calls timer_delete_sync, cancel_work_sync, and ieee80211_iterate_interfaces which handles its own locking) 2. sta_remove path deadlock: - mt7921_mac_sta_remove is called from mt76_sta_remove which holds mutex - Calling mt7921_roc_abort_sync =E2=86=92 cancel_work_sync can deadlock = if roc_work is waiting for the mutex - Fix: Add mt7921_roc_abort_async (matching mt7925 pattern) that sets abort flag and schedules work instead of blocking - Add abort flag checking in mt7921_roc_work to handle async abort The fix mirrors the mt7925 implementation which already handles these scenarios correctly. Fixes: b74d48c46f ("wifi: mt76: mt7921: fix mutex handling in multiple path= s") Signed-off-by: Zac Bowling --- .../net/wireless/mediatek/mt76/mt7921/main.c | 29 +++++++++++++++---- .../net/wireless/mediatek/mt76/mt7921/pci.c | 2 -- .../net/wireless/mediatek/mt76/mt7921/sdio.c | 2 -- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net= /wireless/mediatek/mt76/mt7921/main.c index 9315dbdf8880..07d1d0d497f1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -367,17 +367,24 @@ static void mt7921_roc_iter(void *priv, u8 *mac, mt7921_mcu_abort_roc(phy, mvif, phy->roc_token_id); } =20 +/* Async ROC abort - safe to call while holding mutex. + * Sets abort flag and schedules roc_work for cleanup. + */ +static void mt7921_roc_abort_async(struct mt792x_dev *dev) +{ + struct mt792x_phy *phy =3D &dev->phy; + + set_bit(MT76_STATE_ROC_ABORT, &phy->mt76->state); + timer_delete(&phy->roc_timer); + ieee80211_queue_work(phy->mt76->hw, &phy->roc_work); +} + void mt7921_roc_abort_sync(struct mt792x_dev *dev) { struct mt792x_phy *phy =3D &dev->phy; =20 timer_delete_sync(&phy->roc_timer); cancel_work_sync(&phy->roc_work); - /* Note: caller must hold mutex if ieee80211_iterate_interfaces is - * needed for ROC cleanup. Some call sites (like mt7921_mac_sta_remove) - * already hold the mutex via mt76_sta_remove(). For suspend paths, - * the mutex should be acquired before calling this function. - */ if (test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state)) ieee80211_iterate_interfaces(mt76_hw(dev), IEEE80211_IFACE_ITER_RESUME_ALL, @@ -392,6 +399,15 @@ void mt7921_roc_work(struct work_struct *work) phy =3D (struct mt792x_phy *)container_of(work, struct mt792x_phy, roc_work); =20 + /* Check abort flag before acquiring mutex to prevent deadlock. + * Only send expired callback if ROC was actually active. + */ + if (test_and_clear_bit(MT76_STATE_ROC_ABORT, &phy->mt76->state)) { + if (test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state)) + ieee80211_remain_on_channel_expired(phy->mt76->hw); + return; + } + if (!test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state)) return; =20 @@ -887,7 +903,8 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struc= t ieee80211_vif *vif, struct mt792x_dev *dev =3D container_of(mdev, struct mt792x_dev, mt76); struct mt792x_sta *msta =3D (struct mt792x_sta *)sta->drv_priv; =20 - mt7921_roc_abort_sync(dev); + /* Async abort - caller already holds mutex */ + mt7921_roc_abort_async(dev); mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->deflink.wcid); mt76_connac_pm_wake(&dev->mphy, &dev->pm); =20 diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/= wireless/mediatek/mt76/mt7921/pci.c index 9f76b334b93d..ec9686183251 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -426,9 +426,7 @@ static int mt7921_pci_suspend(struct device *device) cancel_delayed_work_sync(&pm->ps_work); cancel_work_sync(&pm->wake_work); =20 - mt792x_mutex_acquire(dev); mt7921_roc_abort_sync(dev); - mt792x_mutex_release(dev); =20 err =3D mt792x_mcu_drv_pmctrl(dev); if (err < 0) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net= /wireless/mediatek/mt76/mt7921/sdio.c index 92ea2811816f..3421e53dc948 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c @@ -219,9 +219,7 @@ static int mt7921s_suspend(struct device *__dev) cancel_delayed_work_sync(&pm->ps_work); cancel_work_sync(&pm->wake_work); =20 - mt792x_mutex_acquire(dev); mt7921_roc_abort_sync(dev); - mt792x_mutex_release(dev); =20 err =3D mt792x_mcu_drv_pmctrl(dev); if (err < 0) --=20 2.52.0