Author: adrian
Date: Sun Mar 15 20:44:52 2015
New Revision: 280077
URL: https://svnweb.freebsd.org/changeset/base/280077
Log:
Add node table lock - addresses LOR in wpi_node_free().
PR: kern/197143
Submitted by: Andriy Voskoboinyk <s3er...@gmail.com>
Modified:
head/sys/dev/wpi/if_wpi.c
head/sys/dev/wpi/if_wpivar.h
Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:43:58 2015 (r280076)
+++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:44:52 2015 (r280077)
@@ -384,6 +384,7 @@ wpi_attach(device_t dev)
}
WPI_LOCK_INIT(sc);
+ WPI_NT_LOCK_INIT(sc);
WPI_TXQ_LOCK_INIT(sc);
/* Allocate DMA memory for firmware transfers. */
@@ -681,6 +682,7 @@ wpi_detach(device_t dev)
DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
WPI_TXQ_LOCK_DESTROY(sc);
+ WPI_NT_LOCK_DESTROY(sc);
WPI_LOCK_DESTROY(sc);
return 0;
}
@@ -1582,12 +1584,12 @@ wpi_node_free(struct ieee80211_node *ni)
struct wpi_node *wn = WPI_NODE(ni);
if (wn->id != WPI_ID_UNDEFINED) {
- WPI_LOCK(sc);
+ WPI_NT_LOCK(sc);
if (wpi_check_node_entry(sc, wn->id)) {
wpi_del_node_entry(sc, wn->id);
wpi_del_node(sc, ni);
}
- WPI_UNLOCK(sc);
+ WPI_NT_UNLOCK(sc);
}
sc->sc_node_free(ni);
@@ -2095,7 +2097,9 @@ wpi_notif_intr(struct wpi_softc *sc)
le32toh(*status));
if (le32toh(*status) & 1) {
+ WPI_NT_LOCK(sc);
wpi_clear_node_table(sc);
+ WPI_NT_UNLOCK(sc);
ieee80211_runtask(ic, &sc->sc_radiooff_task);
return;
}
@@ -2557,7 +2561,9 @@ wpi_tx_data(struct wpi_softc *sc, struct
if (wn->id == WPI_ID_UNDEFINED &&
(vap->iv_opmode == IEEE80211_M_IBSS ||
vap->iv_opmode == IEEE80211_M_AHDEMO)) {
+ WPI_NT_LOCK(sc);
error = wpi_add_ibss_node(sc, ni);
+ WPI_NT_UNLOCK(sc);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not add IBSS node, error %d\n",
@@ -3501,10 +3507,16 @@ wpi_send_rxon(struct wpi_softc *sc, int
error = wpi_cmd(sc, WPI_CMD_RXON_ASSOC, &rxon_assoc,
sizeof (struct wpi_assoc), async);
} else {
+ if (async)
+ WPI_NT_LOCK(sc);
+
error = wpi_cmd(sc, WPI_CMD_RXON, &sc->rxon,
sizeof (struct wpi_rxon), async);
wpi_clear_node_table(sc);
+
+ if (async)
+ WPI_NT_UNLOCK(sc);
}
if (error != 0) {
device_printf(sc->sc_dev, "RXON command failed, error %d\n",
@@ -4069,7 +4081,9 @@ wpi_run(struct wpi_softc *sc, struct iee
if (vap->iv_opmode == IEEE80211_M_STA) {
/* Add BSS node. */
+ WPI_NT_LOCK(sc);
error = wpi_add_sta_node(sc, ni);
+ WPI_NT_UNLOCK(sc);
if (error != 0) {
device_printf(sc->sc_dev,
"%s: could not add BSS node, error %d\n", __func__,
Modified: head/sys/dev/wpi/if_wpivar.h
==============================================================================
--- head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:43:58 2015
(r280076)
+++ head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:44:52 2015
(r280077)
@@ -185,7 +185,9 @@ struct wpi_softc {
struct wpi_rxon rxon;
int temp;
uint32_t qfullmsk;
+
uint32_t nodesmsk;
+ struct mtx nt_mtx;
int sc_tx_timer;
int sc_scan_timer;
@@ -219,7 +221,7 @@ struct wpi_softc {
char domain[4]; /* Regulatory domain. */
};
-/* WPI_LOCK > WPI_TXQ_LOCK */
+/* WPI_LOCK > WPI_NT_LOCK > WPI_TXQ_LOCK */
#define WPI_LOCK_INIT(_sc) \
mtx_init(&(_sc)->sc_mtx, device_get_nameunit((_sc)->sc_dev), \
@@ -229,6 +231,12 @@ struct wpi_softc {
#define WPI_LOCK_ASSERT(sc) mtx_assert(&(sc)->sc_mtx, MA_OWNED)
#define WPI_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx)
+#define WPI_NT_LOCK_INIT(_sc) \
+ mtx_init(&(_sc)->nt_mtx, "node table lock", NULL, MTX_DEF)
+#define WPI_NT_LOCK(_sc) mtx_lock(&(_sc)->nt_mtx)
+#define WPI_NT_UNLOCK(_sc) mtx_unlock(&(_sc)->nt_mtx)
+#define WPI_NT_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->nt_mtx)
+
#define WPI_TXQ_LOCK_INIT(_sc) \
mtx_init(&(_sc)->txq_mtx, "txq/cmdq lock", NULL, MTX_DEF)
#define WPI_TXQ_LOCK(_sc) mtx_lock(&(_sc)->txq_mtx)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
