2022-12-07 14:23:57

by Yang Yingliang

Subject: [PATCH v3 0/3] wifi: rtlwifi: don't call kfree_skb() under spin_lock_irqsave()

It is not allowed to call kfree_skb() from hardware interrupt
context or with interrupts being disabled. This patchset is
trying to add all skb to a free list, then free them after
spin_unlock_irqrestore() at once.

v2 -> v3:
Update commit messages.

v1 -> v2:
change subject prefix to "wifi: rtlwifi: ..."

Yang Yingliang (3):
wifi: rtlwifi: rtl8821ae: don't call kfree_skb() under
spin_lock_irqsave()
wifi: rtlwifi: rtl8188ee: don't call kfree_skb() under
spin_lock_irqsave()
wifi: rtlwifi: rtl8723be: don't call kfree_skb() under
spin_lock_irqsave()

drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +++++-
drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 +++++-
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 6 +++++-
3 files changed, 15 insertions(+), 3 deletions(-)

--
2.25.1

2022-12-07 14:24:14

by Yang Yingliang

Subject: [PATCH v3 2/3] wifi: rtlwifi: rtl8188ee: don't call kfree_skb() under spin_lock_irqsave()

It is not allowed to call kfree_skb() from hardware interrupt
context or with interrupts being disabled. All the SKBs have
been dequeued from the old queue, so it's safe to enqueue these
SKBs to a free queue, then free them after spin_unlock_irqrestore()
at once. Compile tested only.

Fixes: 7fe3b3abb5da ("rtlwifi: rtl8188ee: rtl8821ae: Fix a queue locking problem")
Signed-off-by: Yang Yingliang <[email protected]>
Acked-by: Ping-Ke Shih <[email protected]>
---
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
index 58c2ab3d44be..de61c9c0ddec 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
@@ -68,8 +68,10 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
struct rtl_priv *rtlpriv = rtl_priv(hw);
struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
struct rtl8192_tx_ring *ring = &rtlpci->tx_ring[BEACON_QUEUE];
+ struct sk_buff_head free_list;
unsigned long flags;

+ skb_queue_head_init(&free_list);
spin_lock_irqsave(&rtlpriv->locks.irq_th_lock, flags);
while (skb_queue_len(&ring->queue)) {
struct rtl_tx_desc *entry = &ring->desc[ring->idx];
@@ -79,10 +81,12 @@ static void _rtl88ee_return_beacon_queue_skb(struct ieee80211_hw *hw)
rtlpriv->cfg->ops->get_desc(hw, (u8 *)entry,
true, HW_DESC_TXBUFF_ADDR),
skb->len, DMA_TO_DEVICE);
- kfree_skb(skb);
+ __skb_queue_tail(&free_list, skb);
ring->idx = (ring->idx + 1) % ring->entries;
}
spin_unlock_irqrestore(&rtlpriv->locks.irq_th_lock, flags);
+
+ __skb_queue_purge(&free_list);
}

static void _rtl88ee_disable_bcn_sub_func(struct ieee80211_hw *hw)
--
2.25.1