Page MenuHomeFreeBSD
Files F142115744

D49791.id153557.diff
No OneTemporary
Actions

D49791.id153557.diff
View Options

diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h
--- a/sys/compat/linuxkpi/common/src/linux_80211.h
+++ b/sys/compat/linuxkpi/common/src/linux_80211.h
@@ -187,6 +187,7 @@
struct lkpi_sta *lvif_bss;
+ int ic_unlocked; /* Count of ic unlocks pending (*mo_set_key) */
int nt_unlocked; /* Count of nt unlocks pending (*mo_set_key) */
bool lvif_bss_synched;
bool added_to_drv; /* Driver knows; i.e. we called add_interface(). */
diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c
--- a/sys/compat/linuxkpi/common/src/linux_80211.c
+++ b/sys/compat/linuxkpi/common/src/linux_80211.c
@@ -1427,7 +1427,7 @@
struct lkpi_hw *lhw;
struct ieee80211_hw *hw;
struct lkpi_vif *lvif;
- bool islocked;
+ bool icislocked, ntislocked;
ic = vap->iv_ic;
lhw = ic->ic_softc;
@@ -1435,28 +1435,35 @@
lvif = VAP_TO_LVIF(vap);
nt = &ic->ic_sta;
- islocked = IEEE80211_NODE_IS_LOCKED(nt);
+ icislocked = IEEE80211_IS_LOCKED(ic);
+ ntislocked = IEEE80211_NODE_IS_LOCKED(nt);
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
- ic_printf(vap->iv_ic, "%s: tid %d vap %p nt %p %slocked "
- "lvif nt_unlocked %d\n", __func__, curthread->td_tid,
- vap, nt, islocked ? "" : "un", lvif->nt_unlocked);
+ ic_printf(ic, "%s: tid %d vap %p ic %p %slocked nt %p %slocked "
+ "lvif ic_unlocked %d nt_unlocked %d\n", __func__,
+ curthread->td_tid, vap,
+ ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un",
+ lvif->ic_unlocked, lvif->nt_unlocked);
#endif
/* This is inconsistent net80211 locking to be fixed one day. */
- if (islocked)
+ if (icislocked)
+ IEEE80211_UNLOCK(ic);
+ if (ntislocked)
IEEE80211_NODE_UNLOCK(nt);
wiphy_lock(hw->wiphy);
/*
- * nt_unlocked could be a bool given we are under the lock and there
+ * ic/nt_unlocked could be a bool given we are under the lock and there
* must only be a single thread.
* In case anything in the future disturbs the order the refcnt will
* help us catching problems a lot easier.
*/
- if (islocked)
+ if (icislocked)
+ refcount_acquire(&lvif->ic_unlocked);
+ if (ntislocked)
refcount_acquire(&lvif->nt_unlocked);
}
@@ -1468,7 +1475,7 @@
struct lkpi_hw *lhw;
struct ieee80211_hw *hw;
struct lkpi_vif *lvif;
- bool islocked;
+ bool icislocked, ntislocked;
ic = vap->iv_ic;
lhw = ic->ic_softc;
@@ -1476,14 +1483,18 @@
lvif = VAP_TO_LVIF(vap);
nt = &ic->ic_sta;
- islocked = IEEE80211_NODE_IS_LOCKED(nt);
- MPASS(!islocked);
+ icislocked = IEEE80211_IS_LOCKED(ic);
+ MPASS(!icislocked);
+ ntislocked = IEEE80211_NODE_IS_LOCKED(nt);
+ MPASS(!ntislocked);
#ifdef LINUXKPI_DEBUG_80211
if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO)
- ic_printf(vap->iv_ic, "%s: tid %d vap %p nt %p %slocked "
- "lvif nt_unlocked %d\n", __func__, curthread->td_tid,
- vap, nt, islocked ? "" : "un", lvif->nt_unlocked);
+ ic_printf(ic, "%s: tid %d vap %p ic %p %slocked nt %p %slocked "
+ "lvif ic_unlocked %d nt_unlocked %d\n", __func__,
+ curthread->td_tid, vap,
+ ic, icislocked ? "" : "un", nt, ntislocked ? "" : "un",
+ lvif->ic_unlocked, lvif->nt_unlocked);
#endif
/*
@@ -1491,12 +1502,15 @@
* In case the refcnt gets out of sync locking in net80211 will
* quickly barf as well (trying to unlock a lock not held).
*/
- islocked = refcount_release_if_last(&lvif->nt_unlocked);
+ icislocked = refcount_release_if_last(&lvif->ic_unlocked);
+ ntislocked = refcount_release_if_last(&lvif->nt_unlocked);
wiphy_unlock(hw->wiphy);
/* This is inconsistent net80211 locking to be fixed one day. */
- if (islocked)
+ if (ntislocked)
IEEE80211_NODE_LOCK(nt);
+ if (icislocked)
+ IEEE80211_LOCK(ic);
}
#endif

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 17, 4:02 AM (6 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27680107
Default Alt Text
D49791.id153557.diff (3 KB)

Event Timeline