Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795056091; b=TBGfcdgh9/8rZ29bbwFHjIG1d0efBQpvdoaRx/3ygMYgvUcuxJXr53yRMydTEdcI70LF zL8rM8XbVMwc8d5aMSIDB6iAvjfcQm27HodynIVpIK3Di9BYpoO7l/lH200gBjBDwSU1p LSrRKZA7hWGQ+UlhVgo2kBsGE7yx/FQ0lAddOrQ0l8a7MyqpT/GvnxvBAyh54mXyYsxYU Dfu6VFVuR8fRR38PI5GbBVt7l/XpiMfbkX+X3xUqOx9LIEL4zGSdn1nGF7KB4i8tkjLdK /OIvVcUDqSUZjR2Ru69I8e3m1Ol9J7gMlVP8Sa+P/xaUXzijLasBw4MeeLbMOrsszPQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056091; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=FpK1Kt7rua35ELhiF/8pBR9E3JgsDIWFERbaza0HqDw=; b=YX330Bga76ZkMzSFcMg+g/PqCilJCcDsg7Sz98ha5RE3dzALbKqiLvsy5YF+wmkNUyKj tghW0A+OkfIlb/wayf/dgCJZZr5MbvOtqoBcKYI0zKLDPrTur1Tl1jDhfDww3TOg80+Xo TpMiV57Id+Zr1IZNReP5OcswToY02XTcKHbj2sjMtvjplQjR9Wxb1EvKTZFtR+uqtNTvS e/8bKJ//0zHQUmrnMHZmAJNAlFU9IUUdBW8UxJVQe98nJ0q8KJVsB8YSN42w//O8ilxda kQIGjyd5NkJQlA/xYBvjGAc9JucXeAOg3oodCdcm5cC9C2y4YRHEJ/0StchLMulFm0Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="ToA/XXZH"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25617606A320; Thu, 19 Nov 2026 02:41:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=ToA/XXZH Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7372A1F000C4; Thu, 19 Nov 2026 02:41:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056091; bh=FpK1Kt7rua35ELhiF/8pBR9E3JgsDIWFERbaza0HqDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ToA/XXZHonfup8K8H2FTkvCjaIfM8ROcryYO69zb2SLIKcbLjPx0pOpiBMfEklOmE BkSZ6K+rH3YgD5dc9zcylBg9np9X0tBGyPipE1Hs7r9aXBPJ35yNjYbewNZAgJEx83 L4bR+Zeqnbanj790GEp4YLaaUm2lHjmGMEWv0FtI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiale Yao , Baochen Qiang , Rameshkumar Sundaram , Jeff Johnson , Sasha Levin Subject: [PATCH 5.15 1857/2214] wifi: ath11k: avoid IDR mutation during vif mgmt TX cleanup Date: Wed, 18 Nov 2026 15:58:53 +0100 Message-ID: <20261118150125.640895179@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiale Yao [ Upstream commit dc29226dada34a6d19af77b4b51e90f8a3a8de34 ] ath11k_mac_op_remove_interface() walks txmgmt_idr with idr_for_each(), and its callback removes each entry belonging to the interface. Removing the current entry can invalidate the radix-tree iterator retained by idr_for_each(). Move the walk into a helper that uses idr_for_each_entry(). It performs a fresh lookup for every iteration, so each matching entry can be removed through the locked removal helper without retaining iterator state across the removal. Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Signed-off-by: Jiale Yao Reviewed-by: Baochen Qiang Reviewed-by: Rameshkumar Sundaram Link: https://patch.msgid.link/20261003092104.520135-4-yaojiale02@163.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath11k/mac.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index 9c4e5c31410bd..98a6f1c8cac05 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -4186,16 +4186,18 @@ void ath11k_mac_tx_mgmt_pending_free(struct ath11k *ar) ath11k_mac_tx_mgmt_free(ar, buf_id); } -static int ath11k_mac_vif_txmgmt_idr_remove(int buf_id, void *skb, void *ctx) +static void ath11k_mac_vif_txmgmt_cleanup(struct ath11k *ar, + struct ieee80211_vif *vif) { - struct ieee80211_vif *vif = ctx; - struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB((struct sk_buff *)skb); - struct ath11k *ar = skb_cb->ar; - - if (skb_cb->vif == vif) - ath11k_mac_tx_mgmt_free(ar, buf_id); + struct ath11k_skb_cb *skb_cb; + struct sk_buff *skb; + int buf_id; - return 0; + idr_for_each_entry(&ar->txmgmt_idr, skb, buf_id) { + skb_cb = ATH11K_SKB_CB(skb); + if (skb_cb->vif == vif) + ath11k_mac_tx_mgmt_free(ar, buf_id); + } } static int ath11k_mac_mgmt_tx_wmi(struct ath11k *ar, struct ath11k_vif *arvif, @@ -4988,8 +4990,7 @@ static void ath11k_mac_op_remove_interface(struct ieee80211_hw *hw, ath11k_peer_cleanup(ar, arvif->vdev_id); - idr_for_each(&ar->txmgmt_idr, - ath11k_mac_vif_txmgmt_idr_remove, vif); + ath11k_mac_vif_txmgmt_cleanup(ar, vif); for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { spin_lock_bh(&ab->dp.tx_ring[i].tx_idr_lock); -- 2.53.0