[SCSI] libiscsi regression in 2.6.25: fix setting of recv timer (c8611f97) · Commits · 戴 / test

If the ping tmo is longer than the recv tmo then we could miss a window where we were supposed to check the recv tmo. This happens because the ping code will set the next timeout for the ping timeout, and if the ping executes quickly there will be a long chunk of time before the timer wakes up again. This patch has the ping processing code kick off a recv tmo check when getting a nop in response to our ping. Signed-off-by:

Mike Christie <michaelc@cs.wisc.edu> Cc: Stable Tree <stable@kernel.org> Signed-off-by:

James Bottomley <James.Bottomley@HansenPartnership.com>

drivers/scsi/libiscsi.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -730,7 +730,9 @@ static int __iscsi_complete_pdu(struct iscsi_conn conn, struct iscsi_hdr hdr,
		if (iscsi_recv_pdu(conn->cls_conn, hdr, data,
		datalen))
		rc = ISCSI_ERR_CONN_FAILED;
		}
		} else
		mod_timer(&conn->transport_timer,
		jiffies + conn->recv_timeout);
		iscsi_free_mgmt_task(conn, mtask);
		break;
		default:
		@@ -1478,11 +1480,9 @@ static void iscsi_check_transport_timeouts(unsigned long data)
		}

		if (time_before_eq(last_recv + recv_timeout, jiffies)) {
		if (time_before_eq(conn->last_ping, last_recv)) {
		/* send a ping to try to provoke some traffic */
		debug_scsi("Sending nopout as ping on conn %p\n", conn);
		iscsi_send_nopout(conn, NULL);
		}
		next_timeout = conn->last_ping + (conn->ping_timeout * HZ);
		} else
		next_timeout = last_recv + recv_timeout;

Admin message