Date: Thu, 17 Jun 2004 22:48:12 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/fs/fifofs fifo_vnops.c src/sys/fs/portalfs portal_vnops.c src/sys/kern sys_socket.c uipc_socket.c uipc_socket2.c vfs_aio.c src/sys/netgraph ng_ksocket.csrc/sys/netsmb ... Message-ID: <200406172248.i5HMmCLt023294@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rwatson 2004-06-17 22:48:11 UTC
FreeBSD src repository
Modified files:
sys/fs/fifofs fifo_vnops.c
sys/fs/portalfs portal_vnops.c
sys/kern sys_socket.c uipc_socket.c uipc_socket2.c
vfs_aio.c
sys/netgraph ng_ksocket.c
sys/netgraph/bluetooth/socket ng_btsocket_rfcomm.c
sys/netsmb smb_trantcp.c
sys/nfsserver nfs_syscalls.c
Log:
Merge additional socket buffer locking from rwatson_netperf:
- Lock down low hanging fruit use of sb_flags with socket buffer
lock.
- Lock down low hanging fruit use of so_state with socket lock.
- Lock down low hanging fruit use of so_options.
- Lock down low-hanging fruit use of sb_lowwat and sb_hiwat with
socket buffer lock.
- Annotate situations in which we unlock the socket lock and then
grab the receive socket buffer lock, which are currently actually
the same lock. Depending on how we want to play our cards, we
may want to coallesce these lock uses to reduce overhead.
- Convert a if()->panic() into a KASSERT relating to so_state in
soaccept().
- Remove a number of splnet()/splx() references.
More complex merging of socket and socket buffer locking to
follow.
Revision Changes Path
1.98 +2 -0 src/sys/fs/fifofs/fifo_vnops.c
1.63 +4 -0 src/sys/fs/portalfs/portal_vnops.c
1.60 +20 -0 src/sys/kern/sys_socket.c
1.179 +25 -14 src/sys/kern/uipc_socket.c
1.132 +24 -0 src/sys/kern/uipc_socket2.c
1.171 +15 -2 src/sys/kern/vfs_aio.c
1.11 +12 -0 src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
1.45 +14 -0 src/sys/netgraph/ng_ksocket.c
1.21 +6 -0 src/sys/netsmb/smb_trantcp.c
1.101 +8 -0 src/sys/nfsserver/nfs_syscalls.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406172248.i5HMmCLt023294>