src/sys/netgraph/bluetooth, 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)

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)

Introduce ng_hci_inquiry_response structure and use it in the hccontrol(8)

2004-08-10T00:38:50Z

MFp4: Last references to dev/usb/usbdevs.h converted.

2004-06-27T16:51:01Z

Catch up with usbd_get_string_desc() change.

2004-06-26T13:24:29Z

Spotted by: Tai-hwa Liang

Fix line discipline switching issues: If opening a new ldisc fails,

2004-06-26T08:44:04Z

we have to revert to TTYDISC which we know will successfully open rather than try the previous ldisc which might also fail to open. Do not let ldisc implementations muck about with ->t_line, and remove code which checks for reopens, it should never happen. Move ldisc->l_hotchar to tty->t_hotchar and have ldisc implementation initialize it in their open routines. Reset to zero when we enter TTYDISC. ("no" should really be -1 since zero could be a valid hotchar for certain old european mainframe protocols.)

Add '#include ' to fix the kernel build.

2004-06-25T23:03:33Z

Correct merge-o: make sure to unlock symmetrically socket buffer

2004-06-18T05:09:42Z

locks on bluetooth sockets when clearing upcall flags. Submitted by: emax

Merge additional socket buffer locking from rwatson_netperf:

2004-06-17T22:48:11Z

- 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.

Second half of the dev_t cleanup.

2004-06-17T17:16:53Z

The big lines are: NODEV -> NULL NOUDEV -> NODEV udev_t -> dev_t udev2dev() -> findcdev() Various minor adjustments including handling of userland access to kernel space struct cdev etc.