From 519772814de2f8935fa2c259f5e4e66b28e1e4a7 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Tue, 29 Aug 2017 15:29:57 +0000 Subject: [PATCH] Add CAM/NVMe support for CAM_DATA_SG This adds support in pass(4) for data to be described with a scatter-gather list (sglist) to augment the existing (single) virtual address. Differential Revision: https://reviews.freebsd.org/D11361 Submitted by: Chuck Tuffli Reviewed by: imp@, scottl@, kenm@ --- sys/cam/cam_ccb.h | 3 ++- sys/cam/nvme/nvme_da.c | 7 +------ sys/cam/scsi/scsi_pass.c | 8 ++------ sys/dev/nvme/nvme_private.h | 15 +++++++++++++++ sys/dev/nvme/nvme_qpair.c | 8 ++++++++ sys/dev/nvme/nvme_sim.c | 2 ++ sys/kern/subr_bus_dma.c | 2 +- 7 files changed, 31 insertions(+), 14 deletions(-) diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h index 304bdb916dc6..fae7af453c5e 100644 --- a/sys/cam/cam_ccb.h +++ b/sys/cam/cam_ccb.h @@ -831,7 +831,8 @@ struct ccb_nvmeio { struct nvme_completion cpl; /* NVME completion, per NVME standard */ uint8_t *data_ptr; /* Ptr to the data buf/SG list */ uint32_t dxfer_len; /* Data transfer length */ - uint32_t resid; /* Transfer residual length: 2's comp unused ?*/ + uint16_t sglist_cnt; /* Number of SG list entries */ + uint16_t unused; /* padding for removed uint32_t */ }; /* diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index a6da18cee0ba..f4b62f2086d7 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -1010,12 +1010,7 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) bp->bio_resid = bp->bio_bcount; bp->bio_flags |= BIO_ERROR; } else { - if (state == NDA_CCB_TRIM) - bp->bio_resid = 0; - else - bp->bio_resid = nvmeio->resid; - if (bp->bio_resid > 0) - bp->bio_flags |= BIO_ERROR; + bp->bio_resid = 0; } if (state == NDA_CCB_TRIM) free(bp->bio_driver2, M_NVMEDA); diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c index 1c2d5dffdab4..621640df31a8 100644 --- a/sys/cam/scsi/scsi_pass.c +++ b/sys/cam/scsi/scsi_pass.c @@ -1396,15 +1396,11 @@ passmemsetup(struct cam_periph *periph, struct pass_io_req *io_req) io_req->data_flags = ccb->ccb_h.flags & CAM_DATA_MASK; - /* - * We only support a single virtual address for NVMe - */ - if ((ccb->ccb_h.flags & CAM_DATA_MASK) != CAM_DATA_VADDR) - return (EINVAL); - data_ptrs[0] = &ccb->nvmeio.data_ptr; lengths[0] = ccb->nvmeio.dxfer_len; dirs[0] = ccb->ccb_h.flags & CAM_DIR_MASK; + num_segs = ccb->nvmeio.sglist_cnt; + seg_cnt_ptr = &ccb->nvmeio.sglist_cnt; numbufs = 1; maxmap = softc->maxio; break; diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 8293e563cab3..d37af2932252 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -135,6 +135,7 @@ struct nvme_completion_poll_status { #ifdef NVME_UNMAPPED_BIO_SUPPORT #define NVME_REQUEST_BIO 4 #endif +#define NVME_REQUEST_CCB 5 struct nvme_request { @@ -517,6 +518,20 @@ nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg) return (req); } +static __inline struct nvme_request * +nvme_allocate_request_ccb(union ccb *ccb, nvme_cb_fn_t cb_fn, void *cb_arg) +{ + struct nvme_request *req; + + req = _nvme_allocate_request(cb_fn, cb_arg); + if (req != NULL) { + req->type = NVME_REQUEST_CCB; + req->u.payload = ccb; + } + + return (req); +} + #define nvme_free_request(req) uma_zfree(nvme_request_zone, req) void nvme_notify_async_consumers(struct nvme_controller *ctrlr, diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 299117128782..a3eb90c9bd2c 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -851,6 +851,14 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req) "bus_dmamap_load_bio returned 0x%x!\n", err); break; #endif + case NVME_REQUEST_CCB: + err = bus_dmamap_load_ccb(tr->qpair->dma_tag_payload, + tr->payload_dma_map, req->u.payload, + nvme_payload_map, tr, 0); + if (err != 0) + nvme_printf(qpair->ctrlr, + "bus_dmamap_load_ccb returned 0x%x!\n", err); + break; default: panic("unknown nvme request type 0x%x\n", req->type); break; diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 6f2de462c4e7..3bab7540fc0a 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -96,6 +96,8 @@ nvme_sim_nvmeio(struct cam_sim *sim, union ccb *ccb) if ((nvmeio->ccb_h.flags & CAM_DATA_MASK) == CAM_DATA_BIO) req = nvme_allocate_request_bio((struct bio *)payload, nvme_sim_nvmeio_done, ccb); + else if ((nvmeio->ccb_h.flags & CAM_DATA_SG) == CAM_DATA_SG) + req = nvme_allocate_request_ccb(ccb, nvme_sim_nvmeio_done, ccb); else if (payload == NULL) req = nvme_allocate_request_null(nvme_sim_nvmeio_done, ccb); else diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c index 0269ab9d34f2..05011222b090 100644 --- a/sys/kern/subr_bus_dma.c +++ b/sys/kern/subr_bus_dma.c @@ -225,7 +225,7 @@ _bus_dmamap_load_ccb(bus_dma_tag_t dmat, bus_dmamap_t map, union ccb *ccb, nvmeio = &ccb->nvmeio; data_ptr = nvmeio->data_ptr; dxfer_len = nvmeio->dxfer_len; - sglist_cnt = 0; + sglist_cnt = nvmeio->sglist_cnt; break; } default: