Author: mav
Date: Fri Feb 17 04:29:23 2017
New Revision: 313851
URL: https://svnweb.freebsd.org/changeset/base/313851
Log:
Fix tight loop spinning on postponed requests.
MFC after: 2 weeks
Modified:
head/sys/dev/iscsi/iscsi.c
Modified: head/sys/dev/iscsi/iscsi.c
==============================================================================
--- head/sys/dev/iscsi/iscsi.c Fri Feb 17 03:27:20 2017 (r313850)
+++ head/sys/dev/iscsi/iscsi.c Fri Feb 17 04:29:23 2017 (r313851)
@@ -475,15 +475,14 @@ iscsi_maintenance_thread_terminate(struc
static void
iscsi_maintenance_thread(void *arg)
{
- struct iscsi_session *is;
-
- is = arg;
+ struct iscsi_session *is = arg;
+ ISCSI_SESSION_LOCK(is);
for (;;) {
- ISCSI_SESSION_LOCK(is);
if (is->is_reconnecting == false &&
is->is_terminating == false &&
- STAILQ_EMPTY(&is->is_postponed))
+ (STAILQ_EMPTY(&is->is_postponed) ||
+ ISCSI_SNGT(is->is_cmdsn, is->is_maxcmdsn)))
cv_wait(&is->is_maintenance_cv, &is->is_lock);
/* Terminate supersedes reconnect. */
@@ -497,12 +496,13 @@ iscsi_maintenance_thread(void *arg)
if (is->is_reconnecting) {
ISCSI_SESSION_UNLOCK(is);
iscsi_maintenance_thread_reconnect(is);
+ ISCSI_SESSION_LOCK(is);
continue;
}
iscsi_session_send_postponed(is);
- ISCSI_SESSION_UNLOCK(is);
}
+ ISCSI_SESSION_UNLOCK(is);
}
static void
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
