From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DD051C531F9 for ; Fri, 24 Jul 2026 05:31:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:content-type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8xywD1FktITv2ET4P0Ii3L4ggDdPmSOSKEZ5pr/1Ayg=; b=DjXBxPGD8VdHwjdoRYaLSCUobJ oWQYTUDjWGWcTIcGKDDrKSV1y15o6a/HPFZbJd56c6leIVt5Vez2WchInEqRMhzJsZkN+QBMDPpDN joR2SL/394ynjLbT3nSOgGMyaZ2ChDLSFxmDQf5Ie9AnaV8dbpWCFWeBjAsSVtM67gevv2a3d9DFl 4Hsm2y0tt48FWYlKER7WG5iI8G+kvXvRwGGNi4GUdSxEy+ooJ9MUGa0n9sfbiNW3KH1ZhZjC1yDHK ChMl0jWKMzya1VRI+Jlcy5TcjRcEpA+Qy5Q0GAS3lxorX8S5jN9ljamhlWTBbFIf3jeyme2PTfRY6 hcTPmztw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wn8Vr-0000000FW7O-26pM; Fri, 24 Jul 2026 05:31:59 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wn8Vo-0000000FW3O-3Qha for ath12k@lists.infradead.org; Fri, 24 Jul 2026 05:31:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784871116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8xywD1FktITv2ET4P0Ii3L4ggDdPmSOSKEZ5pr/1Ayg=; b=dvXXheBAVPYVRvxedXDJzBxUmyrOt43LGsVDZX2PLuQTsYn1BfQHmhT2BPTc+LYBCbeQi9 KzUNX3k+udbOy6xZ3+lQIiZMKdpAVDj/PeFLm8mUk4syY3RTK9y1BMkkNybtzhhrdlJd4v emHM0FFNQy6Rxf9KGJbwFKeTOUHIlws= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-371-bcFItajHO4GyAJLGHAom-w-1; Fri, 24 Jul 2026 01:31:50 -0400 X-MC-Unique: bcFItajHO4GyAJLGHAom-w-1 X-Mimecast-MFC-AGG-ID: bcFItajHO4GyAJLGHAom-w_1784871108 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CEA341944D21; Fri, 24 Jul 2026 05:31:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.44.48.50]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 58A2E30002CE; Fri, 24 Jul 2026 05:31:46 +0000 (UTC) From: Jose Ignacio Tornos Martinez To: jjohnson@kernel.org Cc: ath11k@lists.infradead.org, ath12k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Jose Ignacio Tornos Martinez Subject: [PATCH v4 4/4] wifi: ath12k: implement custom wake_tx_queue with flow control Date: Fri, 24 Jul 2026 07:31:21 +0200 Message-ID: <20260724053121.15759-5-jtornosm@redhat.com> In-Reply-To: <20260724053121.15759-1-jtornosm@redhat.com> References: <20260724053121.15759-1-jtornosm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: FjX31_deTkaQ14D-xhBJLfcIG5U8giKlzdSMW2A086I_1784871108 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260723_223156_932172_EE358020 X-CRM114-Status: GOOD ( 17.01 ) X-BeenThere: ath12k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "ath12k" Errors-To: ath12k-bounces+ath12k=archiver.kernel.org@lists.infradead.org Under heavy traffic, ath12k can hang and experiences -ENOMEM errors ("failed to transmit frame -12") when the hardware TCL ring fills up. This issue is more commonly observed in VMs with PCIe passthrough but also occurs on bare metal systems. Implement a custom wake_tx_queue operation that: 1. Checks hardware ring space before dequeuing packets from mac80211 2. Uses per-ring locking (wake_tx_lock with spin_lock_bh) to serialize concurrent wake_tx_queue calls targeting the same ring and to ensure bottom halves are disabled as required by ieee80211_tx_dequeue() 3. Syncs with hardware state to get accurate free slot count 4. Resolves the target TCL ring once using get_ring_selector(txq->ac), which selects the ring based on the access category 5. Returns early during firmware crash in the same way as other tx paths This approach follows the pattern used in the iwlwifi driver, adapted for ath12k's hardware ring architecture. This prevents hangs, eliminates -ENOMEM errors, and improves throughput by optimizing resource usage and preventing unnecessary packet drops. Signed-off-by: Jose Ignacio Tornos Martinez --- v4: Adapt to use get_ring_selector(txq->ac) instead of peek API due to concerns raised by Johannes Berg. v3: https://lore.kernel.org/all/20260720070852.206495-4-jtornosm@redhat.com/ drivers/net/wireless/ath/ath12k/dp.c | 1 + drivers/net/wireless/ath/ath12k/dp.h | 2 + drivers/net/wireless/ath/ath12k/hal.c | 1 + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 76 +++++++++++++++++++++- 4 files changed, 79 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c index af5f11fc1d84..3d46cfbf0a1c 100644 --- a/drivers/net/wireless/ath/ath12k/dp.c +++ b/drivers/net/wireless/ath/ath12k/dp.c @@ -1539,6 +1539,7 @@ static int ath12k_dp_setup(struct ath12k_base *ab) } for (i = 0; i < ab->hw_params->max_tx_ring; i++) { + spin_lock_init(&dp->tx_ring[i].wake_tx_lock); dp->tx_ring[i].tcl_data_ring_id = i; dp->tx_ring[i].tx_status_head = 0; diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h index f8cfc7bb29dd..68d2020be9b8 100644 --- a/drivers/net/wireless/ath/ath12k/dp.h +++ b/drivers/net/wireless/ath/ath12k/dp.h @@ -58,6 +58,8 @@ struct dp_tx_ring { u8 tcl_data_ring_id; struct dp_srng tcl_data_ring; struct dp_srng tcl_comp_ring; + /* Serializes wake_tx_queue operations for this ring */ + spinlock_t wake_tx_lock; struct hal_wbm_completion_ring_tx *tx_status; int tx_status_head; int tx_status_tail; diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c index a164563fff28..071cb5d30931 100644 --- a/drivers/net/wireless/ath/ath12k/hal.c +++ b/drivers/net/wireless/ath/ath12k/hal.c @@ -390,6 +390,7 @@ int ath12k_hal_srng_src_num_free(struct ath12k_base *ab, struct hal_srng *srng, else return ((srng->ring_size - hp + tp) / srng->entry_size) - 1; } +EXPORT_SYMBOL_GPL(ath12k_hal_srng_src_num_free); void *ath12k_hal_srng_src_next_peek(struct ath12k_base *ab, struct hal_srng *srng) diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hw.c b/drivers/net/wireless/ath/ath12k/wifi7/hw.c index 7436cf70925a..af0a3ba805dd 100644 --- a/drivers/net/wireless/ath/ath12k/wifi7/hw.c +++ b/drivers/net/wireless/ath/ath12k/wifi7/hw.c @@ -1100,9 +1100,83 @@ static void ath12k_wifi7_mac_op_tx(struct ieee80211_hw *hw, } } +static void ath12k_wifi7_mac_op_wake_tx_queue(struct ieee80211_hw *hw, + struct ieee80211_txq *txq) +{ + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(txq->vif); + struct ath12k_hw *ah = ath12k_hw_to_ah(hw); + struct ieee80211_tx_control control = { + .sta = txq->sta, + }; + struct ieee80211_vif *vif = txq->vif; + struct ath12k_link_vif *arvif; + struct dp_tx_ring *tx_ring; + struct hal_srng *tcl_ring; + struct ath12k_sta *ahsta; + struct ath12k_dp *dp; + struct sk_buff *skb; + struct ath12k *ar; + u8 ring_selector; + int num_free; + u8 ring_id; + u8 link_id; + + if (ieee80211_vif_is_mld(vif) && txq->sta) { + ahsta = ath12k_sta_to_ahsta(txq->sta); + link_id = ahsta->assoc_link_id; + } else { + link_id = ahvif->deflink.link_id; + } + + rcu_read_lock(); + + arvif = rcu_dereference(ahvif->link[link_id]); + if (!arvif || !arvif->ar) { + rcu_read_unlock(); + return; + } + + ar = arvif->ar; + dp = ar->ab->dp; + + ring_selector = dp->hw_params->hw_ops->get_ring_selector(txq->ac); + ring_id = ring_selector % dp->hw_params->max_tx_ring; + tx_ring = &dp->tx_ring[ring_id]; + tcl_ring = &dp->hal->srng_list[tx_ring->tcl_data_ring.ring_id]; + + while (1) { + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, + &ar->ab->dev_flags))) + break; + + spin_lock_bh(&tx_ring->wake_tx_lock); + + spin_lock(&tcl_ring->lock); + num_free = ath12k_hal_srng_src_num_free(ar->ab, tcl_ring, true); + spin_unlock(&tcl_ring->lock); + + if (num_free == 0) { + spin_unlock_bh(&tx_ring->wake_tx_lock); + break; + } + + skb = ieee80211_tx_dequeue(hw, txq); + if (!skb) { + spin_unlock_bh(&tx_ring->wake_tx_lock); + break; + } + + ath12k_wifi7_mac_op_tx(hw, &control, skb); + + spin_unlock_bh(&tx_ring->wake_tx_lock); + } + + rcu_read_unlock(); +} + static const struct ieee80211_ops ath12k_ops_wifi7 = { .tx = ath12k_wifi7_mac_op_tx, - .wake_tx_queue = ieee80211_handle_wake_tx_queue, + .wake_tx_queue = ath12k_wifi7_mac_op_wake_tx_queue, .start = ath12k_mac_op_start, .stop = ath12k_mac_op_stop, .reconfig_complete = ath12k_mac_op_reconfig_complete, -- 2.54.0