diff options
| author | rwatson <rwatson@FreeBSD.org> | 2009-08-23 20:40:19 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2009-08-23 20:40:19 +0000 |
| commit | ef8d755d4df716bf13f8a1833f7dd1db0b78c569 (patch) | |
| tree | 83b839696bd918acacee8b38993abd3c6857a5fb /sys/net/bridgestp.c | |
| parent | 3d8e6186e2a82569f4f5214f8c8af700e5e36c13 (diff) | |
| download | FreeBSD-src-ef8d755d4df716bf13f8a1833f7dd1db0b78c569.zip FreeBSD-src-ef8d755d4df716bf13f8a1833f7dd1db0b78c569.tar.gz | |
Rework global locks for interface list and index management, correcting
several critical bugs, including race conditions and lock order issues:
Replace the single rwlock, ifnet_lock, with two locks, an rwlock and an
sxlock. Either can be held to stablize the lists and indexes, but both
are required to write. This allows the list to be held stable in both
network interrupt contexts and sleepable user threads across sleeping
memory allocations or device driver interactions. As before, writes to
the interface list must occur from sleepable contexts.
Reviewed by: bz, julian
MFC after: 3 days
Diffstat (limited to 'sys/net/bridgestp.c')
| -rw-r--r-- | sys/net/bridgestp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 3e65113..2993838 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -2019,7 +2019,7 @@ bstp_reinit(struct bstp_state *bs) * not need to be part of the bridge, it just needs to be a unique * value. */ - IFNET_RLOCK(); + IFNET_RLOCK_NOSLEEP(); TAILQ_FOREACH(ifp, &V_ifnet, if_link) { if (ifp->if_type != IFT_ETHER) continue; @@ -2036,7 +2036,7 @@ bstp_reinit(struct bstp_state *bs) continue; } } - IFNET_RUNLOCK(); + IFNET_RUNLOCK_NOSLEEP(); if (LIST_EMPTY(&bs->bs_bplist) || mif == NULL) { /* Set the bridge and root id (lower bits) to zero */ |
