From: Mehmet Fide A frame whose sender asked for its TX status waits in the TX report queue for the report of the firmware. When no report comes, the purge timer frees the frames with skb_queue_purge(), and rtw_core_deinit() does the same. mac80211 is not told: the sender gets no status, and the copy mac80211 keeps for the status of a frame from user space stays in its list until ieee80211_free_hw() warns about it. On an RTL8822CE with hostapd, after a firmware crash and an unbind of the driver: rtw88_8822ce 0000:01:00.0: failed to get tx report from firmware [...] Have pending ack frames! WARNING: net/mac80211/main.c:1761 at ieee80211_free_ack_frame+0x4c/0x70 [mac80211], CPU#1: sh/24725 Call trace: ieee80211_free_ack_frame+0x4c/0x70 [mac80211] (P) idr_for_each+0x6c/0xf4 ieee80211_free_hw+0x30/0x8c [mac80211] rtw_pci_remove+0xd8/0xf0 [rtw88_pci] pci_device_remove+0x44/0xd4 Take the frames off the queue under its lock and hand them to ieee80211_purge_tx_queue(), which reports each one as not sent. Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver") Signed-off-by: Mehmet Fide --- drivers/net/wireless/realtek/rtw88/main.c | 5 +---- drivers/net/wireless/realtek/rtw88/tx.c | 20 ++++++++++++++++---- drivers/net/wireless/realtek/rtw88/tx.h | 1 + 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index adc54b063382..ce65a1a80840 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -2225,7 +2225,6 @@ void rtw_core_deinit(struct rtw_dev *rtwdev) struct rtw_fw_state *fw = &rtwdev->fw; struct rtw_fw_state *wow_fw = &rtwdev->wow_fw; struct rtw_rsvd_page *rsvd_pkt, *tmp; - unsigned long flags; rtw_wait_firmware_completion(rtwdev); @@ -2237,9 +2236,7 @@ void rtw_core_deinit(struct rtw_dev *rtwdev) destroy_workqueue(rtwdev->tx_wq); timer_delete_sync(&rtwdev->tx_report.purge_timer); - spin_lock_irqsave(&rtwdev->tx_report.q_lock, flags); - skb_queue_purge(&rtwdev->tx_report.queue); - spin_unlock_irqrestore(&rtwdev->tx_report.q_lock, flags); + rtw_tx_report_purge(rtwdev); skb_queue_purge(&rtwdev->coex.queue); skb_queue_purge(&rtwdev->c2h_queue); diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c index 701ed7c4f3f7..87d993282b1c 100644 --- a/drivers/net/wireless/realtek/rtw88/tx.c +++ b/drivers/net/wireless/realtek/rtw88/tx.c @@ -176,21 +176,33 @@ static void rtw_tx_report_enable(struct rtw_dev *rtwdev, pkt_info->report = true; } +void rtw_tx_report_purge(struct rtw_dev *rtwdev) +{ + struct rtw_tx_report *tx_report = &rtwdev->tx_report; + struct sk_buff_head purge; + unsigned long flags; + + __skb_queue_head_init(&purge); + + spin_lock_irqsave(&tx_report->q_lock, flags); + skb_queue_splice_init(&tx_report->queue, &purge); + spin_unlock_irqrestore(&tx_report->q_lock, flags); + + ieee80211_purge_tx_queue(rtwdev->hw, &purge); +} + void rtw_tx_report_purge_timer(struct timer_list *t) { struct rtw_dev *rtwdev = timer_container_of(rtwdev, t, tx_report.purge_timer); struct rtw_tx_report *tx_report = &rtwdev->tx_report; - unsigned long flags; if (skb_queue_len(&tx_report->queue) == 0) return; rtw_warn(rtwdev, "failed to get tx report from firmware\n"); - spin_lock_irqsave(&tx_report->q_lock, flags); - skb_queue_purge(&tx_report->queue); - spin_unlock_irqrestore(&tx_report->q_lock, flags); + rtw_tx_report_purge(rtwdev); } void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn) diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h index 168f48e87853..363f63525965 100644 --- a/drivers/net/wireless/realtek/rtw88/tx.h +++ b/drivers/net/wireless/realtek/rtw88/tx.h @@ -98,6 +98,7 @@ void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev, struct sk_buff *skb); void rtw_tx_fill_tx_desc(struct rtw_dev *rtwdev, struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb); +void rtw_tx_report_purge(struct rtw_dev *rtwdev); void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn); void rtw_tx_report_handle(struct rtw_dev *rtwdev, struct sk_buff *skb, int src); void rtw_tx_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev, -- 2.56.0