Author: mav
Date: Sun Aug 17 18:23:43 2014
New Revision: 270107
URL: http://svnweb.freebsd.org/changeset/base/270107
Log:
MFC r269587:
Reimplement WRITE USING TOKEN with Block Zero token using WRITE SAME.
On my ZVOL of SSDs that increases speed of zero writing in that way from
1 to 2.5GB/s by reducing CPU overhead.
Modified:
stable/10/sys/cam/ctl/ctl_tpc.c
stable/10/sys/cam/ctl/ctl_util.c
stable/10/sys/cam/ctl/ctl_util.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl_tpc.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_tpc.c Sun Aug 17 18:22:42 2014
(r270106)
+++ stable/10/sys/cam/ctl/ctl_tpc.c Sun Aug 17 18:23:43 2014
(r270107)
@@ -828,11 +828,10 @@ complete:
/*sense_key*/ SSD_KEY_COPY_ABORTED,
/*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
return (CTL_RETVAL_ERROR);
- } else {
- list->cursectors += list->segsectors;
- list->curbytes += list->segbytes;
- return (CTL_RETVAL_COMPLETE);
}
+ list->cursectors += list->segsectors;
+ list->curbytes += list->segbytes;
+ return (CTL_RETVAL_COMPLETE);
}
TAILQ_INIT(&list->allio);
@@ -1141,14 +1140,6 @@ complete:
return (CTL_RETVAL_COMPLETE);
dstblock = list->lun->be_lun->blocksize;
- /* Special case: no token == Block device zero ROD token */
- if (list->token == NULL) {
- srcblock = 1;
- srclba = 0;
- numbytes = INT64_MAX;
- goto dstp;
- }
-
/* Check where we are on source ranges list. */
srcblock = list->token->blocksize;
if (tpc_skip_ranges(list->token->range, list->token->nrange,
@@ -1163,7 +1154,6 @@ complete:
srclba = scsi_8btou64(list->token->range[srange].lba) + soffset;
numbytes = srcblock * omin(TPC_MAX_IOCHUNK_SIZE / srcblock,
(scsi_4btoul(list->token->range[srange].length) - soffset));
-dstp:
dstlba = scsi_8btou64(list->range[drange].lba) + doffset;
numbytes = omin(numbytes,
dstblock * omin(TPC_MAX_IOCHUNK_SIZE / dstblock,
@@ -1190,10 +1180,6 @@ dstp:
while (donebytes < numbytes) {
roundbytes = MIN(numbytes - donebytes, TPC_MAX_IO_SIZE);
- if (list->token == NULL) {
- tior = NULL;
- goto dstw;
- }
tior = malloc(sizeof(*tior), M_CTL, M_WAITOK | M_ZERO);
TAILQ_INIT(&tior->run);
tior->list = list;
@@ -1217,7 +1203,6 @@ dstp:
tior->lun = list->token->lun;
tior->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tior;
-dstw:
tiow = malloc(sizeof(*tiow), M_CTL, M_WAITOK | M_ZERO);
TAILQ_INIT(&tiow->run);
tiow->list = list;
@@ -1241,14 +1226,9 @@ dstw:
tiow->lun = list->lun->lun;
tiow->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tiow;
- if (tior) {
- TAILQ_INSERT_TAIL(&tior->run, tiow, rlinks);
- TAILQ_INSERT_TAIL(prun, tior, rlinks);
- prun = &tior->run;
- } else {
- TAILQ_INSERT_TAIL(prun, tiow, rlinks);
- prun = &tiow->run;
- }
+ TAILQ_INSERT_TAIL(&tior->run, tiow, rlinks);
+ TAILQ_INSERT_TAIL(prun, tior, rlinks);
+ prun = &tior->run;
donebytes += roundbytes;
}
@@ -1262,6 +1242,89 @@ dstw:
return (CTL_RETVAL_QUEUED);
}
+static int
+tpc_process_zero_wut(struct tpc_list *list)
+{
+ struct tpc_io *tio, *tiow;
+ struct runl run, *prun;
+ int r;
+ uint32_t dstblock, len;
+
+ if (list->stage > 0) {
+complete:
+ /* Cleanup after previous rounds. */
+ while ((tio = TAILQ_FIRST(&list->allio)) != NULL) {
+ TAILQ_REMOVE(&list->allio, tio, links);
+ ctl_free_io(tio->io);
+ free(tio, M_CTL);
+ }
+ free(list->buf, M_CTL);
+ if (list->abort) {
+ ctl_set_task_aborted(list->ctsio);
+ return (CTL_RETVAL_ERROR);
+ } else if (list->error) {
+ ctl_set_sense(list->ctsio, /*current_error*/ 1,
+ /*sense_key*/ SSD_KEY_COPY_ABORTED,
+ /*asc*/ 0x0d, /*ascq*/ 0x01, SSD_ELEM_NONE);
+ return (CTL_RETVAL_ERROR);
+ }
+ list->cursectors += list->segsectors;
+ list->curbytes += list->segbytes;
+ return (CTL_RETVAL_COMPLETE);
+ }
+
+ dstblock = list->lun->be_lun->blocksize;
+ list->buf = malloc(dstblock, M_CTL, M_WAITOK | M_ZERO);
+ TAILQ_INIT(&run);
+ prun = &run;
+ list->tbdio = 1;
+ TAILQ_INIT(&list->allio);
+ list->segsectors = 0;
+ for (r = 0; r < list->nrange; r++) {
+ len = scsi_4btoul(list->range[r].length);
+ if (len == 0)
+ continue;
+
+ tiow = malloc(sizeof(*tiow), M_CTL, M_WAITOK | M_ZERO);
+ TAILQ_INIT(&tiow->run);
+ tiow->list = list;
+ TAILQ_INSERT_TAIL(&list->allio, tiow, links);
+ tiow->io = tpcl_alloc_io();
+ if (tiow->io == NULL) {
+ list->error = 1;
+ goto complete;
+ }
+ ctl_scsi_write_same(tiow->io,
+ /*data_ptr*/ list->buf,
+ /*data_len*/ dstblock,
+ /*byte2*/ 0,
+ /*lba*/ scsi_8btou64(list->range[r].lba),
+ /*num_blocks*/ len,
+ /*tag_type*/ CTL_TAG_SIMPLE,
+ /*control*/ 0);
+ tiow->io->io_hdr.retries = 3;
+ tiow->lun = list->lun->lun;
+ tiow->io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr = tiow;
+
+ TAILQ_INSERT_TAIL(prun, tiow, rlinks);
+ prun = &tiow->run;
+ list->segsectors += len;
+ }
+ list->segbytes = list->segsectors * dstblock;
+
+ if (TAILQ_EMPTY(&run))
+ goto complete;
+
+ while ((tiow = TAILQ_FIRST(&run)) != NULL) {
+ TAILQ_REMOVE(&run, tiow, rlinks);
+ if (tpcl_queue(tiow->io, tiow->lun) != CTL_RETVAL_COMPLETE)
+ panic("tpcl_queue() error");
+ }
+
+ list->stage++;
+ return (CTL_RETVAL_QUEUED);
+}
+
static void
tpc_process(struct tpc_list *list)
{
@@ -1271,7 +1334,10 @@ tpc_process(struct tpc_list *list)
int retval = CTL_RETVAL_COMPLETE;
if (list->service_action == EC_WUT) {
- retval = tpc_process_wut(list);
+ if (list->token != NULL)
+ retval = tpc_process_wut(list);
+ else
+ retval = tpc_process_zero_wut(list);
if (retval == CTL_RETVAL_QUEUED)
return;
if (retval == CTL_RETVAL_ERROR) {
Modified: stable/10/sys/cam/ctl/ctl_util.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_util.c Sun Aug 17 18:22:42 2014
(r270106)
+++ stable/10/sys/cam/ctl/ctl_util.c Sun Aug 17 18:23:43 2014
(r270107)
@@ -345,6 +345,37 @@ ctl_scsi_read_write(union ctl_io *io, ui
}
void
+ctl_scsi_write_same(union ctl_io *io, uint8_t *data_ptr, uint32_t data_len,
+ uint8_t byte2, uint64_t lba, uint32_t num_blocks,
+ ctl_tag_type tag_type, uint8_t control)
+{
+ struct ctl_scsiio *ctsio;
+ struct scsi_write_same_16 *cdb;
+
+ ctl_scsi_zero_io(io);
+
+ io->io_hdr.io_type = CTL_IO_SCSI;
+ ctsio = &io->scsiio;
+ ctsio->cdb_len = sizeof(*cdb);
+ cdb = (struct scsi_write_same_16 *)ctsio->cdb;
+ cdb->opcode = WRITE_SAME_16;
+ cdb->byte2 = byte2;
+ scsi_u64to8b(lba, cdb->addr);
+ scsi_ulto4b(num_blocks, cdb->length);
+ cdb->group = 0;
+ cdb->control = control;
+
+ io->io_hdr.io_type = CTL_IO_SCSI;
+ io->io_hdr.flags = CTL_FLAG_DATA_OUT;
+ ctsio->tag_type = tag_type;
+ ctsio->ext_data_ptr = data_ptr;
+ ctsio->ext_data_len = data_len;
+ ctsio->ext_sg_entries = 0;
+ ctsio->ext_data_filled = 0;
+ ctsio->sense_len = SSD_FULL_SIZE;
+}
+
+void
ctl_scsi_read_capacity(union ctl_io *io, uint8_t *data_ptr, uint32_t data_len,
uint32_t addr, int reladr, int pmi,
ctl_tag_type tag_type, uint8_t control)
Modified: stable/10/sys/cam/ctl/ctl_util.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_util.h Sun Aug 17 18:22:42 2014
(r270106)
+++ stable/10/sys/cam/ctl/ctl_util.h Sun Aug 17 18:23:43 2014
(r270107)
@@ -61,6 +61,10 @@ void ctl_scsi_read_write(union ctl_io *i
int minimum_cdb_size, uint64_t lba,
uint32_t num_blocks, ctl_tag_type tag_type,
uint8_t control);
+void ctl_scsi_write_same(union ctl_io *io, uint8_t *data_ptr,
+ uint32_t data_len, uint8_t byte2,
+ uint64_t lba, uint32_t num_blocks,
+ ctl_tag_type tag_type, uint8_t control);
void ctl_scsi_read_capacity(union ctl_io *io, uint8_t *data_ptr,
uint32_t data_len, uint32_t addr, int reladr,
int pmi, ctl_tag_type tag_type, uint8_t control);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
