kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-16 23:02:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

LinuxKPI: 802.11: improve queue locking

Browse source 
Introduce an internal lkpi_ieee80211_wake_queues_locked() function
that can be used from context holding the wiphy lock.
Make linuxkpi_ieee80211_wake_queues() a wrapper with locking around
this.

Equally apply the wiphy lock to linuxkpi_ieee80211_wake_queue().

In lkpi_ieee80211_wake_queues() only wakeup the driver if the queue
is not empty;  otherwise weird sideeffects can happen with some drivers.

Sponsored by:	The FreeBSD Foundation
MFC after:	3 days
This commit is contained in:
Bjoern A. Zeeb 2025-06-05 22:02:01 +00:00
parent 284af34297
commit bc24342d96
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sys/compat/linuxkpi/common/src/linux_80211.c
View file

@ -7395,6 +7395,7 @@ linuxkpi_ieee80211_tx_dequeue(struct ieee80211_hw *hw,
struct lkpi_vif *lvif;
struct sk_buff *skb;
IMPROVE("wiphy_lock? or assert?");
skb = NULL;
ltxq = TXQ_TO_LTXQ(txq);
ltxq->seen_dequeue = true;
@ -7898,8 +7899,8 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq)
ltxq->stopped = false;
/* XXX-BZ see when this explodes with all the locking. taskq? */
lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]);
if (!skb_queue_empty(&ltxq->skbq))
lkpi_80211_mo_wake_tx_queue(hw, sta->txq[tid]);
}
}
rcu_read_unlock();
@ -7909,8 +7910,8 @@ lkpi_ieee80211_wake_queues(struct ieee80211_hw *hw, int hwq)
LKPI_80211_LHW_LVIF_UNLOCK(lhw);
}
void
linuxkpi_ieee80211_wake_queues(struct ieee80211_hw *hw)
static void
lkpi_ieee80211_wake_queues_locked(struct ieee80211_hw *hw)
{
int i;
@ -7919,6 +7920,14 @@ linuxkpi_ieee80211_wake_queues(struct ieee80211_hw *hw)
lkpi_ieee80211_wake_queues(hw, i);
}
void
linuxkpi_ieee80211_wake_queues(struct ieee80211_hw *hw)
{
wiphy_lock(hw->wiphy);
lkpi_ieee80211_wake_queues_locked(hw);
wiphy_unlock(hw->wiphy);
}
void
linuxkpi_ieee80211_wake_queue(struct ieee80211_hw *hw, int qnum)
{
@ -7926,7 +7935,9 @@ linuxkpi_ieee80211_wake_queue(struct ieee80211_hw *hw, int qnum)
KASSERT(qnum < hw->queues, ("%s: qnum %d >= hw->queues %d, hw %p\n",
__func__, qnum, hw->queues, hw));
wiphy_lock(hw->wiphy);
lkpi_ieee80211_wake_queues(hw, qnum);
wiphy_unlock(hw->wiphy);
}
/* This is just hardware queues. */