From nobody Mon Feb 9 23:14:59 2026 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (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 A3CEC3A7E0E for ; Tue, 20 Jan 2026 20:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768939853; cv=none; b=mhip5mfTQ8JCclhWLEchAZv6HTzqdlu/gVDczX+VAfX8ScQk/oWrbiV74aMYEuvJXwYZO4sFKSgyVHWIsR29c+UnZU6x4Ywu2SL2ifCYvez+wKgDnPeEOYT+3+PKlXjoHpnlEz8F1JXp+J8WGp2d38t+0CwOfJ5pavj5RkXLJ3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768939853; c=relaxed/simple; bh=mXrVqUsFr+KWKIhla8VgweQxi5AiinnrHhpbrpqMzfA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cFXUgNuiSic1BvGPZ18Ds0prINRLnjVWkqp1XHtp4pEI2MStrYwZAdB5KbFSUHMs1/i1/jMmz2jHKsCDwXTWucUBv6mk/JL6g5uU2rbJoRxFyIjqpjqywlmb5tii06KKCqiF9Ii28OEqywn+zQwpeqKvCi+Bu2mL5E9rhy7JWPU= 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=LTGrqMCy; arc=none smtp.client-ip=74.125.82.54 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="LTGrqMCy" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-11f36012fb2so8414526c88.1 for ; Tue, 20 Jan 2026 12:10:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768939849; x=1769544649; 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=S4eJ97Uk/V3oa3o11cK676DDz0RecUq4tSnmFW3bFfU=; b=LTGrqMCyeucEKAV5iwR5LWKm4As/pSnZ2FoBwrGqiAYyqyHW4fnSCPh0dl76fuQN3P ApCR+aT8UX6gfAZV3MGFF/yt8pNKIjKXPbhBKzrHC5ZtCSWtpO3Oi2tCiNeT8YQgLOJK /easkkss1CUP0UdK1v/3SKl08DkGpWi/cry4P3ks9DGMDgNrlI9VJGCasO9cFMTW6E76 /FWTq8PGSWLMHaMLToQI9vI1ZILWRZTEGtMxyYQL+wul3vYxBGKknSepSmq8HXvfq7/V b4qU0quNx/+iMM9f9T0hO0N6LaiQYdb9LSijb6tsYFZUF4CAUskRQ2/YRV/syuubBqmH kWjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768939849; x=1769544649; 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=S4eJ97Uk/V3oa3o11cK676DDz0RecUq4tSnmFW3bFfU=; b=HWbmpWMJmbRtZq9GRxH1/oPhSYGp3aztrks3mLL4gLol0m3z1IalJaB9NwpHfHm8UU VBj4fsqyoGv/xRJFLh7dkuxTdji93SGU4lOH/1BzdOTGFRyOjiEaLLragf7KIrsrpWEM IfmZ7flPXecIqqFBLgSGm8G9y2UmiwZ3iluoolZKNOYPEU9Z3JRhvTCoJBpJttAxWlbx 2gG0bz5RKuXzCVLZOeoW7YKcO/KGY4+JewGefS7o525qqUkX1pAjj5jf49JVlFLzq7rH fIcdk3osaT19Zxu+zqiKf7KuXUuggNslg/25/c35biIYL2HIc7L1d9d+MEKVrHDDJq4F FaFA== X-Forwarded-Encrypted: i=1; AJvYcCXbnwk35Ka3rmpmo875DQOMVg4BjrBsNidIeyfkW55dRDoQFS+gVrBjhifdXNvV9DGAEZ8OI2dfq1v07JE=@vger.kernel.org X-Gm-Message-State: AOJu0YypQ3xtP1h/9zW3w6xZGOAQtv4nlWevmVlamueHAVo4euoOsJl3 xTJEzvzY0mwouxFRXDU26JCBDqJ+GOP+4YMojDUWRV6KAlHUBojHjDWV X-Gm-Gg: AY/fxX7ZYpFrGSh+3hCEw2T0JF/x8Hx9sEmxV6w1olPDu+qzqfYhZg9Q2f9We5BxeEE yLa/bTPVOKzvEL3Li5aPbue8f6lF2dXNGAii/7OkRfHcmRb2EiiTpLDSbyftEM/6loCCww9AguH 8sfGzVY3ATdAkj1o1IV9cNMUjb1bolcat05ZLRlTEqAHpWKfyPCYENP5xcg6S/AWlSWVpTszGuP lPlwqDK2ZMQR74ZtC7CstLwhciXy218chDRgDH4QX0s2dxSDfI4bDMfcpTvjn38yV7Brlo6zslH IxSEOKM+7CNmIakzw4SX9wPwerz/4GPqflDnYoosQeTXSJxLAPemCF4JOFCKFk5XkpzBgKjuAPI 0sMLChIb1gNqcErkfSyA8xO1PhvxqMUdysH6j9cIOdcb1NlZ7HxzQ/qS4rreqNsp/mpyQjCRsPc Ryi2jcbHaPBxAQvpafHYt/lJOgUTDIunTLaqMNsBum1zH2ByxZLjDbNGysqvmX2Q== X-Received: by 2002:a05:7022:1289:b0:11a:51a8:eca with SMTP id a92af1059eb24-1244b32e446mr9126176c88.18.1768939849233; Tue, 20 Jan 2026 12:10:49 -0800 (PST) Received: from zcache.home.zacbowling.com ([2001:5a8:60d:bc9:4a3c:9f7c:8037:90c1]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1244ad7201fsm21982990c88.7.2026.01.20.12.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jan 2026 12:10:46 -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, linux@frame.work, lorenzo@kernel.org, nbd@nbd.name, ryder.lee@mediatek.com, sean.wang@mediatek.com, zac@zacbowling.com, zbowling@gmail.com, Quan Zhou Subject: [PATCH 01/13] wifi: mt76: mt7925: fix potential deadlock in mt7925_roc_abort_sync Date: Tue, 20 Jan 2026 12:10:31 -0800 Message-ID: <20260120201043.38225-2-zac@zacbowling.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120201043.38225-1-zac@zacbowling.com> References: <20260120201043.38225-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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sean Wang roc_abort_sync() can deadlock with roc_work(). roc_work() holds dev->mt76.mutex, while cancel_work_sync() waits for roc_work() to finish. If the caller already owns the same mutex, both sides block and no progress is possible. This deadlock can occur during station removal when mt76_sta_state() -> mt76_sta_remove() -> mt7925_mac_sta_remove_link() -> mt7925_mac_link_sta_remove() -> mt7925_roc_abort_sync() invokes cancel_work_sync() while roc_work() is still running and holding dev->mt76.mutex. This avoids the mutex deadlock and preserves exactly-once work ownership. Fixes: 45064d19fd3a ("wifi: mt76: mt7925: fix a potential association failu= re upon resuming") Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Sean Wang --- drivers/net/wireless/mediatek/mt76/mt7925/main.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net= /wireless/mediatek/mt76/mt7925/main.c index 2d358a96640c..05990455ee7d 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -457,12 +457,16 @@ void mt7925_roc_abort_sync(struct mt792x_dev *dev) { struct mt792x_phy *phy =3D &dev->phy; =20 + if (!test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state)) + return; + timer_delete_sync(&phy->roc_timer); - cancel_work_sync(&phy->roc_work); - if (test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state)) - ieee80211_iterate_interfaces(mt76_hw(dev), - IEEE80211_IFACE_ITER_RESUME_ALL, - mt7925_roc_iter, (void *)phy); + + cancel_work(&phy->roc_work); + + ieee80211_iterate_interfaces(mt76_hw(dev), + IEEE80211_IFACE_ITER_RESUME_ALL, + mt7925_roc_iter, (void *)phy); } EXPORT_SYMBOL_GPL(mt7925_roc_abort_sync); =20 --=20 2.52.0