wifi: rtw89: process TX wait skbs for USB via C2H handler

TX wait skbs need to be completed when they are done.  PCIe part does this
inside rtw89_pci_tx_status() during RPP processing.  Other HCIs use a
mechanism based on C2H firmware messages.

Store TX wait skbs inside TX report queue so that it'll be possible to
identify completed items inside the C2H handler.  Try to do this as
similar to PCIe path as possible.  When the corresponding TX wait skb is
found inside TX report queue, unlink it from there and call
rtw89_core_tx_wait_complete() to mark the completion.

If the callee waiting for the completion has already timed out, the TX
wait skb is placed into TX wait list (like PCIe part does).

It's important that during HCI reset all pending TX wait frames should be
completed inside hci.ops->reset method before calling
rtw89_tx_wait_list_clear().

Found by Linux Verification Center (linuxtesting.org).

Acked-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20251104135720.321110-11-pchelkin@ispras.ru

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 6059e30a0590c04d6b6bb1e1308b66098da6953d..1d30ff27bce1a7b5feff390560116eefd2fbafcf 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -1131,7 +1131,7 @@ rtw89_core_tx_update_desc_info(struct rtw89_dev *rtwdev,
        if (addr_cam->valid && desc_info->mlo)
                upd_wlan_hdr = true;
 
-       if (rtw89_is_tx_rpt_skb(tx_req->skb))
+       if (rtw89_is_tx_rpt_skb(rtwdev, tx_req->skb))
                rtw89_tx_rpt_init(rtwdev, tx_req);
 
        is_bmc = (is_broadcast_ether_addr(hdr->addr1) ||
@@ -1263,14 +1263,13 @@ static int rtw89_core_tx_write_link(struct rtw89_dev *rtwdev,
        tx_req.rtwvif_link = rtwvif_link;
        tx_req.rtwsta_link = rtwsta_link;
        tx_req.desc_info.sw_mld = sw_mld;
+       rcu_assign_pointer(skb_data->wait, wait);
 
        rtw89_traffic_stats_accu(rtwdev, rtwvif, skb, true, true);
        rtw89_wow_parse_akm(rtwdev, skb);
        rtw89_core_tx_update_desc_info(rtwdev, &tx_req);
        rtw89_core_tx_wake(rtwdev, &tx_req);
 
-       rcu_assign_pointer(skb_data->wait, wait);
-
        ret = rtw89_hci_tx_write(rtwdev, &tx_req);
        if (ret) {
                rtw89_err(rtwdev, "failed to transmit skb to HCI\n");

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index cb71bd87b193a41d7c1a72a883c227dd8742b04a..71eb7078a0dc54cb0cc22a7166abcc4f3377f214 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -6328,6 +6328,7 @@ static inline int rtw89_hci_tx_write(struct rtw89_dev *rtwdev,
 static inline void rtw89_hci_reset(struct rtw89_dev *rtwdev)
 {
        rtwdev->hci.ops->reset(rtwdev);
+       /* hci.ops->reset must complete all pending TX wait SKBs */
        rtw89_tx_wait_list_clear(rtwdev);
 }
 
@@ -7409,6 +7410,12 @@ static inline struct sk_buff *rtw89_alloc_skb_for_rx(struct rtw89_dev *rtwdev,
        return dev_alloc_skb(length);
 }
 
+static inline bool rtw89_core_is_tx_wait(struct rtw89_dev *rtwdev,
+                                        struct rtw89_tx_skb_data *skb_data)
+{
+       return rcu_access_pointer(skb_data->wait);
+}
+
 static inline bool rtw89_core_tx_wait_complete(struct rtw89_dev *rtwdev,
                                               struct rtw89_tx_skb_data *skb_data,
                                               u8 tx_status)

diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h
index 56751dd6e99bb19744073615049899438291c712..ce3474a7ba030005cfbad7f89b074c7c4fce546a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/mac.h
+++ b/drivers/net/wireless/realtek/rtw89/mac.h
@@ -1645,19 +1645,26 @@ void rtw89_tx_rpt_init(struct rtw89_dev *rtwdev,
 }
 
 static inline
-bool rtw89_is_tx_rpt_skb(struct sk_buff *skb)
+bool rtw89_is_tx_rpt_skb(struct rtw89_dev *rtwdev, struct sk_buff *skb)
 {
+       struct rtw89_tx_skb_data *skb_data = RTW89_TX_SKB_CB(skb);
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
 
-       return info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS;
+       return rtw89_core_is_tx_wait(rtwdev, skb_data) ||
+              (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS);
 }
 
 static inline
 void rtw89_tx_rpt_tx_status(struct rtw89_dev *rtwdev, struct sk_buff *skb,
                            u8 tx_status)
 {
-       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+       struct rtw89_tx_skb_data *skb_data = RTW89_TX_SKB_CB(skb);
+       struct ieee80211_tx_info *info;
+
+       if (rtw89_core_tx_wait_complete(rtwdev, skb_data, tx_status))
+               return;
 
+       info = IEEE80211_SKB_CB(skb);
        ieee80211_tx_info_clear_status(info);
 
        if (tx_status == RTW89_TX_DONE)

diff --git a/drivers/net/wireless/realtek/rtw89/usb.c b/drivers/net/wireless/realtek/rtw89/usb.c
index f54e00c3033e946e7e6e8d24f3e5baf944610875..d7d968207a39eae7fbbc474bf6bd3cf02a55a97a 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/usb.c
+++ b/drivers/net/wireless/realtek/rtw89/usb.c
@@ -194,7 +194,7 @@ static void rtw89_usb_write_port_complete(struct urb *urb)
 
                skb_pull(skb, txdesc_size);
 
-               if (rtw89_is_tx_rpt_skb(skb)) {
+               if (rtw89_is_tx_rpt_skb(rtwdev, skb)) {
                        if (urb->status == 0)
                                rtw89_tx_rpt_skb_add(rtwdev, skb);
                        else