4 files changed, 23 insertions, 3 deletions

diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c
index 1ac0d142443b..8ed801524089 100644
--- a/sys/dev/nvmf/host/nvmf.c
+++ b/sys/dev/nvmf/host/nvmf.c
@@ -498,7 +498,7 @@ nvmf_attach(device_t dev)
 	nvlist_t *nvl = device_get_ivars(dev);
 	const nvlist_t * const *io;
 	struct sysctl_oid *oid;
-	uint64_t val;
+	uint64_t mpsmin, val;
 	u_int i;
 	int error;
 
@@ -545,13 +545,20 @@ nvmf_attach(device_t dev)
 	sc->vs = val;
 
 	/* Honor MDTS if it is set. */
+	mpsmin = (uint64_t)1 << (NVME_MPS_SHIFT +
+	    NVME_CAP_HI_MPSMIN(sc->cap >> 32));
 	sc->max_xfer_size = maxphys;
 	if (sc->cdata->mdts != 0) {
 		sc->max_xfer_size = ulmin(sc->max_xfer_size,
-		    1 << (sc->cdata->mdts + NVME_MPS_SHIFT +
-		    NVME_CAP_HI_MPSMIN(sc->cap >> 32)));
+		    mpsmin << sc->cdata->mdts);
 	}
 
+	/* Honor any transfer size restriction imposed by the transport. */
+	val = nvmf_max_xfer_size_qp(sc->io[0]);
+	if (val >= mpsmin)
+		sc->max_xfer_size = ulmin(sc->max_xfer_size,
+		    rounddown2(val, mpsmin));
+
 	io = nvlist_get_nvlist_array(nvl, "io", NULL);
 	sc->max_pending_io = nvlist_get_number(io[0], "qsize") *
 	    sc->num_io_queues;
@@ -1230,6 +1237,9 @@ nvmf_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag,
 	case NVME_GET_CONTROLLER_DATA:
 		memcpy(arg, sc->cdata, sizeof(*sc->cdata));
 		return (0);
+	case DIOCGIDENT:
+		nvme_cdata_get_disk_ident(sc->cdata, (uint8_t *)arg);
+		return (0);
 	case NVMF_RECONNECT_PARAMS:
 		nv = (struct nvmf_ioc_nv *)arg;
 		return (nvmf_reconnect_params(sc, nv));
diff --git a/sys/dev/nvmf/host/nvmf_ns.c b/sys/dev/nvmf/host/nvmf_ns.c
index 4215c8295d2e..d57280e19d41 100644
--- a/sys/dev/nvmf/host/nvmf_ns.c
+++ b/sys/dev/nvmf/host/nvmf_ns.c
@@ -278,6 +278,9 @@ nvmf_ns_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int flag,
 		    sizeof(gnsid->cdev));
 		gnsid->nsid = ns->id;
 		return (0);
+	case DIOCGIDENT:
+		nvme_cdata_get_disk_ident(ns->sc->cdata, (uint8_t *)arg);
+		return (0);
 	case DIOCGMEDIASIZE:
 		*(off_t *)arg = ns->size;
 		return (0);
diff --git a/sys/dev/nvmf/host/nvmf_qpair.c b/sys/dev/nvmf/host/nvmf_qpair.c
index 2f511cf0406d..adb57e52d002 100644
--- a/sys/dev/nvmf/host/nvmf_qpair.c
+++ b/sys/dev/nvmf/host/nvmf_qpair.c
@@ -416,6 +416,12 @@ nvmf_destroy_qp(struct nvmf_host_qpair *qp)
 	free(qp, M_NVMF);
 }
 
+uint64_t
+nvmf_max_xfer_size_qp(struct nvmf_host_qpair *qp)
+{
+	return (nvmf_max_xfer_size(qp->qp));
+}
+
 void
 nvmf_submit_request(struct nvmf_request *req)
 {
diff --git a/sys/dev/nvmf/host/nvmf_var.h b/sys/dev/nvmf/host/nvmf_var.h
index 606245b3969c..9190da300d85 100644
--- a/sys/dev/nvmf/host/nvmf_var.h
+++ b/sys/dev/nvmf/host/nvmf_var.h
@@ -210,6 +210,7 @@ struct nvmf_host_qpair *nvmf_init_qp(struct nvmf_softc *sc,
     enum nvmf_trtype trtype, const nvlist_t *nvl, const char *name, u_int qid);
 void	nvmf_shutdown_qp(struct nvmf_host_qpair *qp);
 void	nvmf_destroy_qp(struct nvmf_host_qpair *qp);
+uint64_t nvmf_max_xfer_size_qp(struct nvmf_host_qpair *qp);
 struct nvmf_request *nvmf_allocate_request(struct nvmf_host_qpair *qp,
     void *sqe, nvmf_request_complete_t *cb, void *cb_arg, int how);
 void	nvmf_submit_request(struct nvmf_request *req);