src/sys/netgraph, branch releng/5.3

Merge kern_descrip.c:1.246, uipc_socket.c:1.214, uipc_usrreq.c:1.141,

2004-10-21T09:30:48Z

raw_cb.c:1.30, raw_usrreq.c:1.35, ddp_pcb.c:1.45, atm_socket.c:1.21, ng_btsocket_hci_raw.c:1.16, ng_btsocket_l2cap.c:1.14, ng_btsocket_l2cap_raw.c:1.13, ng_btsocket_rfcomm.c:1.13, in_pcb.c:1.156, tcp_subr.c:1.205, in6_pcb.c:1.61, ipx_pcb.c:1.29, ipx_usrreq.c:1.41, natm.c:1.35, socketvar.h:1.135 from HEAD to RELENG_5_3: Push acquisition of the accept mutex out of sofree() into the caller (sorele()/sotryfree()): - This permits the caller to acquire the accept mutex before the socket mutex, avoiding sofree() having to drop the socket mutex and re-order, which could lead to races permitting more than one thread to enter sofree() after a socket is ready to be free'd. - This also covers clearing of the so_pcb weak socket reference from the protocol to the socket, preventing races in clearing and evaluation of the reference such that sofree() might be called more than once on the same socket. This appears to close a race I was able to easily trigger by repeatedly opening and resetting TCP connections to a host, in which the tcp_close() code called as a result of the RST raced with the close() of the accepted socket in the user process resulting in simultaneous attempts to de-allocate the same socket. The new locking increases the overhead for operations that may potentially free the socket, so we will want to revise the synchronization strategy here as we normalize the reference counting model for sockets. The use of the accept mutex in freeing of sockets that are not listen sockets is primarily motivated by the potential need to remove the socket from the incomplete connection queue on its parent (listen) socket, so cleaning up the reference model here may allow us to substantially weaken the synchronization requirements. RELENG_5_3 candidate. MFC after: 3 days Reviewed by: dwhite Discussed with: gnn, dwhite, green Reported by: Marc UBM Bocklet Reported by: Vlad Approved by: re (scottl)

This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.

2004-10-16T08:43:07Z

This commit was manufactured by cvs2svn to create branch 'RELENG_5_3'.

2004-10-14T11:43:17Z

This commit was manufactured by cvs2svn to create branch 'RELENG_5'.

2004-09-24T18:42:06Z

MFC: Apply error and success logic consistently to the function netisr_queue()

2004-09-15T15:14:19Z

and its users. Approved by: re (kensmith)

MFC 1.34:

2004-09-10T06:16:34Z

Increase PPTP_MAX_TIMEOUT up to 3 seconds. 10 proved too much for high packet loss links, and 1 second appeared to be too small for high latency links. Approved by: re (scottl)

Merge ng_ksocket.c:1.47 to RELENG_5:

2004-09-07T23:09:37Z

date: 2004/09/02 19:53:13; author: rwatson; state: Exp; lines: +3 -3 In FreeBSD 5.x, curthread is always defined, so we don't need to to test and optionally use &thread0 if it's NULL. Spotted by: julian Approved by: re (scottl)

Merge sys/netgraph/ng_tty.c:1.30, sys/netinet6/ipsec.c:1.37,

2004-09-03T03:12:58Z

sys/netipx/ipx.c:1.27 to RELENG_5: Mark Netgraph TTY, KAME IPSEC, and IPX/SPX as requiring Giant for correct operation using NET_NEEDS_GIANT(). This will result in a boot-time restoration of Giant-enabled network operation, or run-time warning on dynamic load (applicable only to the Netgraph component). Additional components will likely need to be marked with this in the future. Approved by: re (scottl, kensmith)

Merge ng_socket.c:1.54 to RELENG_5:

2004-09-02T15:41:44Z

date: 2004/08/30 14:41:25; author: rwatson; state: Exp; lines: +2 -0 Acquire Giant arounds calls into the linker from Netgraph sockets. We now no longer hold Giant in send(), so it isn't inheritted by the linker, which calls into VFS. Reported by: glebius Discussed with: glebius, bz Approved by: re (kensmith)

MFC of field alignment change and a filed size change.

2004-08-26T20:58:46Z

5.3 seems the last change to get this in before we freeze the ABI for a while. MFC'd from: > 1.345 +7 -0 src/UPDATING > 1.6 +1 -6 src/sys/netgraph/bluetooth/include/ng_btsocket.h > 1.44 +1 -1 src/sys/netgraph/netgraph.h > 1.24 +5 -3 src/sys/netgraph/ng_message.h Submitted by: jdp, emax Approved by: re (scottl)