Attachment 228734 Details for Bug 259152 – permit_expdatasn_0.patch

[patch] permit_expdatasn_0.patch

file_259152.txt (text/plain), 1.57 KB, created by John Baldwin on 2021-10-15 22:43:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Baldwin

Created: 2021-10-15 22:43:41 UTC

Size: 1.57 KB

patch

obsolete

>diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
>index eba365f7ad3e..317fd0a450c8 100644
>--- a/sys/dev/iscsi/iscsi.c
>+++ b/sys/dev/iscsi/iscsi.c
>@@ -892,15 +892,39 @@ iscsi_pdu_handle_scsi_response(struct icl_pdu *response)
> 	}
> 
> 	ccb = io->io_ccb;
>-	if (ntohl(bhssr->bhssr_expdatasn) != io->io_datasn) {
>-		ISCSI_SESSION_WARN(is,
>-		    "ExpDataSN mismatch in SCSI Response (%u vs %u)",
>-		    ntohl(bhssr->bhssr_expdatasn), io->io_datasn);
>-		icl_pdu_free(response);
>-		iscsi_session_reconnect(is);
>-		ISCSI_SESSION_UNLOCK(is);
>-		return;
>+	if (bhssr->response == BHSSR_RESPONSE_COMMAND_COMPLETED) {
>+		if (ntohl(bhssr->bhssr_expdatasn) != io->io_datasn) {
>+			ISCSI_SESSION_WARN(is,
>+			    "ExpDataSN mismatch in SCSI Response (%u vs %u)",
>+			    ntohl(bhssr->bhssr_expdatasn), io->io_datasn);
>+
>+			/*
>+			 * XXX: Permit an ExpDataSN of zero for errors.
>+			 *
>+			 * This doesn't conform to RFC 7143, but some
>+			 * targets seem to do this.
>+			 */
>+			if (bhssr->bhssr_status != 0 &&
>+			    bhssr->bhssr_expdatasn == htonl(0))
>+				goto skip_expdatasn;
>+
>+			icl_pdu_free(response);
>+			iscsi_session_reconnect(is);
>+			ISCSI_SESSION_UNLOCK(is);
>+			return;
>+		}
>+	} else {
>+		if (bhssr->bhssr_expdatasn != htonl(0)) {
>+			ISCSI_SESSION_WARN(is,
>+			    "ExpDataSN mismatch in SCSI Response (%u vs 0)",
>+			    ntohl(bhssr->bhssr_expdatasn));
>+			icl_pdu_free(response);
>+			iscsi_session_reconnect(is);
>+			ISCSI_SESSION_UNLOCK(is);
>+			return;
>+		}
> 	}
>+skip_expdatasn:
> 
> 	/*
> 	 * With iSER, after getting good response we can be sure

Actions: View | Diff

Attachments on bug 259152: 228677 | 228726 | 228734 | 228921 | 228924 | 228938