svn commit: r328704 - stable/11/sys/cam/nvme

[Alexander Motin]

Author: mav
Date: Thu Feb  1 19:13:19 2018
New Revision: 328704
URL: https://svnweb.freebsd.org/changeset/base/328704

Log:
  MFC r324632 (by imp):
  Be nicer on the dump stack by allocating only a ccb_nvmeio rather than
  a full ccb. This saves a few hundre bytes, which might be important
  during a crash dump...

Modified:
  stable/11/sys/cam/nvme/nvme_da.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cam/nvme/nvme_da.c
==============================================================================
--- stable/11/sys/cam/nvme/nvme_da.c	Thu Feb  1 19:07:21 2018	(r328703)
+++ stable/11/sys/cam/nvme/nvme_da.c	Thu Feb  1 19:13:19 2018	(r328704)
@@ -379,7 +379,7 @@ ndadump(void *arg, void *virtual, vm_offset_t physical
 	struct	    cam_periph *periph;
 	struct	    nda_softc *softc;
 	u_int	    secsize;
-	union	    ccb ccb;
+	struct ccb_nvmeio nvmeio;
 	struct	    disk *dp;
 	uint64_t    lba;
 	uint32_t    count;
@@ -401,15 +401,15 @@ ndadump(void *arg, void *virtual, vm_offset_t physical
 	/* xpt_get_ccb returns a zero'd allocation for the ccb, mimic that here */
 	memset(&nvmeio, 0, sizeof(nvmeio));
 	if (length > 0) {
-		xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
-		ccb.ccb_h.ccb_state = NDA_CCB_DUMP;
-		nda_nvme_write(softc, &ccb.nvmeio, virtual, lba, length, count);
-		xpt_polled_action(&ccb);
+		xpt_setup_ccb(&nvmeio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
+		nvmeio.ccb_h.ccb_state = NDA_CCB_DUMP;
+		nda_nvme_write(softc, &nvmeio, virtual, lba, length, count);
+		xpt_polled_action((union ccb *)&nvmeio);
 
-		error = cam_periph_error(&ccb,
+		error = cam_periph_error((union ccb *)&nvmeio,
 		    0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
-		if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0)
-			cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0,
+		if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0)
+			cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0,
 			    /*reduction*/0, /*timeout*/0, /*getcount_only*/0);
 		if (error != 0)
 			printf("Aborting dump due to I/O error.\n");
@@ -419,16 +419,16 @@ ndadump(void *arg, void *virtual, vm_offset_t physical
 	}
 	
 	/* Flush */
-	xpt_setup_ccb(&ccb.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
+	xpt_setup_ccb(&nvmeio.ccb_h, periph->path, CAM_PRIORITY_NORMAL);
 
-	ccb.ccb_h.ccb_state = NDA_CCB_DUMP;
-	nda_nvme_flush(softc, &ccb.nvmeio);
-	xpt_polled_action(&ccb);
+	nvmeio.ccb_h.ccb_state = NDA_CCB_DUMP;
+	nda_nvme_flush(softc, &nvmeio);
+	xpt_polled_action((union ccb *)&nvmeio);
 
-	error = cam_periph_error(&ccb,
+	error = cam_periph_error((union ccb *)&nvmeio,
 	    0, SF_NO_RECOVERY | SF_NO_RETRY, NULL);
-	if ((ccb.ccb_h.status & CAM_DEV_QFRZN) != 0)
-		cam_release_devq(ccb.ccb_h.path, /*relsim_flags*/0,
+	if ((nvmeio.ccb_h.status & CAM_DEV_QFRZN) != 0)
+		cam_release_devq(nvmeio.ccb_h.path, /*relsim_flags*/0,
 		    /*reduction*/0, /*timeout*/0, /*getcount_only*/0);
 	if (error != 0)
 		xpt_print(periph->path, "flush cmd failed\n");