d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iw_cxgbe: Make sure that send_abort results in a TCP RST and not a FIN.

Browse Source 
Release the hold on ep->com immediately after sending the RST.  This
fixes a bug that sometimes leaves userspace iWARP tools hung when the
user presses ^C.

Submitted by:	Krishnamraju Eraparaju @ Chelsio
Approved by:	re (gjb@)
Sponsored by:	Chelsio Communications
This commit is contained in:
Navdeep Parhar 2016-06-14 21:02:36 +00:00
parent 9e2d05841e
commit 390006c70f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=301897
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/cxgbe/iw_cxgbe/cm.c
View File

@ -760,7 +760,7 @@ process_socket_event(struct c4iw_ep *ep)
}
/* peer close */
if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && state < CLOSING) {
if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && state <= CLOSING) {
process_peer_close(ep);
return;
}
@ -1223,9 +1223,23 @@ static int send_abort(struct c4iw_ep *ep)
CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep);
abort_socket(ep);
err = close_socket(&ep->com, 0);
/*
* Since socket options were set as l_onoff=1 and l_linger=0 in in
* abort_socket, invoking soclose here sends a RST (reset) to the peer.
*/
err = close_socket(&ep->com, 1);
set_bit(ABORT_CONN, &ep->com.history);
CTR2(KTR_IW_CXGBE, "%s:abE %p", __func__, ep);
/*
* TBD: iw_cgbe driver should receive ABORT reply for every ABORT
* request it has sent. But the current TOE driver is not propagating
* this ABORT reply event (via do_abort_rpl) to iw_cxgbe. So as a work-
* around de-refer 'ep' (which was refered before sending ABORT request)
* here instead of doing it in abort_rpl() handler of iw_cxgbe driver.
*/
c4iw_put_ep(&ep->com);
return err;
}