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

MFC r272812: Make iSCSI connection close somewhat less aggressive.

Browse Source 
It allows to push out some final data from the send queue to the socket
before its close.  In particular, it increases chances for logout response
to be delivered to the initiator.
This commit is contained in:
mav 2014-10-20 07:35:46 +00:00
parent cc6cca3f1e
commit 5889805f1c
4 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/cam/ctl/ctl_frontend_iscsi.c
View File

@ -1139,7 +1139,6 @@ cfiscsi_maintenance_thread(void *arg)
* that anymore. We might need to revisit that.
*/
callout_drain(&cs->cs_callout);
icl_conn_shutdown(cs->cs_conn);
icl_conn_close(cs->cs_conn);
/*

27
sys/dev/iscsi/icl.c
View File

@ -877,8 +877,6 @@ icl_conn_send_pdus(struct icl_conn *ic, struct icl_pdu_stailq *queue)
SOCKBUF_UNLOCK(&so->so_snd);
while (!STAILQ_EMPTY(queue)) {
if (ic->ic_disconnecting)
return;
request = STAILQ_FIRST(queue);
size = icl_pdu_size(request);
if (available < size) {
@ -975,11 +973,6 @@ icl_send_thread(void *arg)
ic->ic_send_running = true;
for (;;) {
if (ic->ic_disconnecting) {
//ICL_DEBUG("terminating");
break;
}
for (;;) {
/*
* If the local queue is empty, populate it from
@ -1018,6 +1011,11 @@ icl_send_thread(void *arg)
break;
}
if (ic->ic_disconnecting) {
//ICL_DEBUG("terminating");
break;
}
cv_wait(&ic->ic_send_cv, ic->ic_lock);
}
@ -1300,21 +1298,6 @@ icl_conn_handoff(struct icl_conn *ic, int fd)
return (error);
}
void
icl_conn_shutdown(struct icl_conn *ic)
{
ICL_CONN_LOCK_ASSERT_NOT(ic);
ICL_CONN_LOCK(ic);
if (ic->ic_socket == NULL) {
ICL_CONN_UNLOCK(ic);
return;
}
ICL_CONN_UNLOCK(ic);
soshutdown(ic->ic_socket, SHUT_RDWR);
}
void
icl_conn_close(struct icl_conn *ic)
{

1
sys/dev/iscsi/icl.h
View File

@ -107,7 +107,6 @@ struct icl_conn {
struct icl_conn *icl_conn_new(const char *name, struct mtx *lock);
void icl_conn_free(struct icl_conn *ic);
int icl_conn_handoff(struct icl_conn *ic, int fd);
void icl_conn_shutdown(struct icl_conn *ic);
void icl_conn_close(struct icl_conn *ic);
bool icl_conn_connected(struct icl_conn *ic);

1
sys/dev/iscsi/iscsi.c
View File

@ -372,7 +372,6 @@ static void
iscsi_maintenance_thread_reconnect(struct iscsi_session *is)
{
icl_conn_shutdown(is->is_conn);
icl_conn_close(is->is_conn);
ISCSI_SESSION_LOCK(is);