Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 3 Nov 2014 03:45:41 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r274004 - in stable/10/sys/cam: ctl scsi
Message-ID:  <201411030345.sA33jf9k024441@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mav
Date: Mon Nov  3 03:45:41 2014
New Revision: 274004
URL: https://svnweb.freebsd.org/changeset/base/274004

Log:
  MFC r273809:
  Implement better handling for ENOSPC error for both CTL and CAM.
  
  This makes VMWare VAAI Thin Provisioning Stun primitive activate, pausing
  the virtual machine, when backing storage (ZFS pool) is getting overflowed.

Modified:
  stable/10/sys/cam/ctl/ctl_backend_block.c
  stable/10/sys/cam/ctl/ctl_error.c
  stable/10/sys/cam/ctl/ctl_error.h
  stable/10/sys/cam/scsi/scsi_all.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_backend_block.c	Mon Nov  3 03:44:59 2014	(r274003)
+++ stable/10/sys/cam/ctl/ctl_backend_block.c	Mon Nov  3 03:45:41 2014	(r274004)
@@ -504,6 +504,8 @@ ctl_be_block_biodone(struct bio *bio)
 	if (beio->num_errors > 0) {
 		if (error == EOPNOTSUPP) {
 			ctl_set_invalid_opcode(&io->scsiio);
+		} else if (error == ENOSPC) {
+			ctl_set_space_alloc_fail(&io->scsiio);
 		} else if (beio->bio_cmd == BIO_FLUSH) {
 			/* XXX KDM is there is a better error here? */
 			ctl_set_internal_failure(&io->scsiio,
@@ -714,14 +716,12 @@ ctl_be_block_dispatch_file(struct ctl_be
 		char path_str[32];
 
 		ctl_scsi_path_string(io, path_str, sizeof(path_str));
-		/*
-		 * XXX KDM ZFS returns ENOSPC when the underlying
-		 * filesystem fills up.  What kind of SCSI error should we
-		 * return for that?
-		 */
 		printf("%s%s command returned errno %d\n", path_str,
 		       (beio->bio_cmd == BIO_READ) ? "READ" : "WRITE", error);
-		ctl_set_medium_error(&io->scsiio);
+		if (error == ENOSPC) {
+			ctl_set_space_alloc_fail(&io->scsiio);
+		} else
+			ctl_set_medium_error(&io->scsiio);
 		ctl_complete_beio(beio);
 		return;
 	}
@@ -807,7 +807,10 @@ ctl_be_block_dispatch_zvol(struct ctl_be
 	 * return the I/O to the user.
 	 */
 	if (error != 0) {
-		ctl_set_medium_error(&io->scsiio);
+		if (error == ENOSPC) {
+			ctl_set_space_alloc_fail(&io->scsiio);
+		} else
+			ctl_set_medium_error(&io->scsiio);
 		ctl_complete_beio(beio);
 		return;
 	}

Modified: stable/10/sys/cam/ctl/ctl_error.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_error.c	Mon Nov  3 03:44:59 2014	(r274003)
+++ stable/10/sys/cam/ctl/ctl_error.c	Mon Nov  3 03:45:41 2014	(r274004)
@@ -806,6 +806,18 @@ ctl_set_task_aborted(struct ctl_scsiio *
 }
 
 void
+ctl_set_space_alloc_fail(struct ctl_scsiio *ctsio)
+{
+	/* "Space allocation failed write protect" */
+	ctl_set_sense(ctsio,
+		      /*current_error*/ 1,
+		      /*sense_key*/ SSD_KEY_DATA_PROTECT,
+		      /*asc*/ 0x27,
+		      /*ascq*/ 0x07,
+		      SSD_ELEM_NONE);
+}
+
+void
 ctl_set_success(struct ctl_scsiio *ctsio)
 {
 	struct scsi_sense_data *sense;

Modified: stable/10/sys/cam/ctl/ctl_error.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_error.h	Mon Nov  3 03:44:59 2014	(r274003)
+++ stable/10/sys/cam/ctl/ctl_error.h	Mon Nov  3 03:45:41 2014	(r274004)
@@ -81,6 +81,7 @@ void ctl_set_reservation_conflict(struct
 void ctl_set_queue_full(struct ctl_scsiio *ctsio);
 void ctl_set_busy(struct ctl_scsiio *ctsio);
 void ctl_set_task_aborted(struct ctl_scsiio *ctsio);
+void ctl_set_space_alloc_fail(struct ctl_scsiio *ctsio);
 void ctl_set_success(struct ctl_scsiio *ctsio);
 
 #endif	/* _CTL_ERROR_H_ */

Modified: stable/10/sys/cam/scsi/scsi_all.c
==============================================================================
--- stable/10/sys/cam/scsi/scsi_all.c	Mon Nov  3 03:44:59 2014	(r274003)
+++ stable/10/sys/cam/scsi/scsi_all.c	Mon Nov  3 03:45:41 2014	(r274004)
@@ -1733,7 +1733,7 @@ static struct asc_table_entry asc_table[
 	{ SST(0x27, 0x06, SS_RDEF,	/* XXX TBD */
 	    "Conditional write protect") },
 	/* D         B    */
-	{ SST(0x27, 0x07, SS_RDEF,	/* XXX TBD */
+	{ SST(0x27, 0x07, SS_FATAL | ENOSPC,
 	    "Space allocation failed write protect") },
 	/* DTLPWROMAEBKVF */
 	{ SST(0x28, 0x00, SS_FATAL | ENXIO,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411030345.sA33jf9k024441>