Page MenuHomeFreeBSD

D61629.1794930484.diff
No OneTemporary

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

D61629.1794930484.diff

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -639,17 +639,88 @@
return (0);
}
+static uint32_t
+nvme_ctrlr_active_namespaces(struct nvme_controller *ctrlr, uint32_t *nsids,
+ uint32_t max)
+{
+ struct nvme_completion_poll_status status;
+ struct nvme_ns_list *nsl;
+ uint32_t count, i, last;
+
+ count = 0;
+
+ if (ctrlr->cdata.ver < NVME_REV(1, 1))
+ goto dense;
+
+ nsl = malloc(sizeof(*nsl), M_NVME, M_WAITOK);
+ last = 0;
+ for (;;) {
+ status.done = 0;
+ nvme_ctrlr_cmd_identify_active_ns(ctrlr, last, nsl,
+ nvme_completion_poll_cb, &status);
+ nvme_completion_poll(&status);
+ if (nvme_completion_is_error(&status.cpl)) {
+ free(nsl, M_NVME);
+ count = 0;
+ goto dense;
+ }
+
+ for (i = 0; i < nitems(nsl->ns); i++) {
+ last = le32toh(nsl->ns[i]);
+ if (last == 0)
+ break;
+ if (count == max) {
+ nvme_printf(ctrlr, "not attaching namespaces "
+ "beyond the first %u\n", max);
+ free(nsl, M_NVME);
+ return (count);
+ }
+ nsids[count++] = last;
+ }
+
+ if (i < nitems(nsl->ns))
+ break;
+ }
+ free(nsl, M_NVME);
+ return (count);
+
+dense:
+ for (i = 1; i <= ctrlr->cdata.nn && count < max; i++)
+ nsids[count++] = i;
+ return (count);
+}
+
static int
nvme_ctrlr_construct_namespaces(struct nvme_controller *ctrlr)
{
- struct nvme_namespace *ns;
- uint32_t i;
+ uint32_t *nsids;
+ uint32_t count, i, max;
- for (i = 0; i < nvme_ctrlr_num_namespaces(ctrlr); i++) {
- ns = &ctrlr->ns[i];
- nvme_ns_construct(ns, i+1, ctrlr);
+ if (ctrlr->ns != NULL) {
+ for (i = 0; i < ctrlr->num_ns; i++)
+ nvme_ns_construct(&ctrlr->ns[i], ctrlr->ns[i].id,
+ ctrlr);
+ return (0);
+ }
+
+ max = NVME_MAX_NAMESPACES;
+ if ((ctrlr->quirks & QUIRK_APPLE_S3X_NS1_ONLY) != 0)
+ max = 1;
+
+ nsids = malloc(max * sizeof(*nsids), M_NVME, M_WAITOK);
+ count = nvme_ctrlr_active_namespaces(ctrlr, nsids, max);
+ if (count == 0) {
+ free(nsids, M_NVME);
+ return (0);
}
+ ctrlr->ns = malloc(count * sizeof(*ctrlr->ns), M_NVME,
+ M_WAITOK | M_ZERO);
+ ctrlr->num_ns = count;
+ for (i = 0; i < count; i++)
+ nvme_ns_construct(&ctrlr->ns[i], nsids[i], ctrlr);
+ free(nsids, M_NVME);
+
return (0);
}
@@ -1487,7 +1558,8 @@
if (nsl->ns[0] == 0 && ctrlr->quirks & QUIRK_EMPTY_NAMESPACE_CHANGED_LOG) {
for (int i = 0; i < nvme_ctrlr_num_namespaces(ctrlr); i++)
for (int j = 0; j < n_children; j++)
- NVME_NS_CHANGED(children[j], i + 1);
+ NVME_NS_CHANGED(children[j],
+ ctrlr->ns[i].id);
}
free(children, M_TEMP);
}
@@ -2005,8 +2077,11 @@
else
nvme_notify_fail(ctrlr);
- for (i = 0; i < NVME_MAX_NAMESPACES; i++)
+ for (i = 0; i < ctrlr->num_ns; i++)
nvme_ns_destruct(&ctrlr->ns[i]);
+ free(ctrlr->ns, M_NVME);
+ ctrlr->ns = NULL;
+ ctrlr->num_ns = 0;
if (ctrlr->cdev)
destroy_dev(ctrlr->cdev);
diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c
--- a/sys/dev/nvme/nvme_ctrlr_cmd.c
+++ b/sys/dev/nvme/nvme_ctrlr_cmd.c
@@ -72,6 +72,24 @@
nvme_ctrlr_submit_admin_request(ctrlr, req);
}
+void
+nvme_ctrlr_cmd_identify_active_ns(struct nvme_controller *ctrlr, uint32_t nsid,
+ struct nvme_ns_list *payload, nvme_cb_fn_t cb_fn, void *cb_arg)
+{
+ struct nvme_request *req;
+ struct nvme_command *cmd;
+
+ req = nvme_allocate_request_vaddr(payload, sizeof(*payload), M_WAITOK,
+ cb_fn, cb_arg);
+
+ cmd = &req->cmd;
+ cmd->opc = NVME_OPC_IDENTIFY;
+ cmd->nsid = htole32(nsid);
+ cmd->cdw10 = htole32(2);
+
+ nvme_ctrlr_submit_admin_request(ctrlr, req);
+}
+
void
nvme_ctrlr_cmd_create_io_cq(struct nvme_controller *ctrlr,
struct nvme_qpair *io_que, nvme_cb_fn_t cb_fn, void *cb_arg)
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -617,10 +617,11 @@
}
/*
- * Namespace IDs start at 1, so we need to subtract 1 to create a
- * correct unit number.
+ * NSIDs may be sparse; the unit number is the position in the
+ * controller's namespace array.
*/
- unit = device_get_unit(ctrlr->dev) * NVME_MAX_NAMESPACES + ns->id - 1;
+ unit = device_get_unit(ctrlr->dev) * NVME_MAX_NAMESPACES +
+ (ns - ctrlr->ns);
make_dev_args_init(&md_args);
md_args.mda_devsw = &nvme_ns_cdevsw;
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -76,7 +76,7 @@
#define NVME_INT_COAL_TIME (0) /* disabled */
#define NVME_INT_COAL_THRESHOLD (0) /* 0-based */
-#define NVME_MAX_NAMESPACES (16)
+#define NVME_MAX_NAMESPACES (1024)
#define NVME_MAX_ASYNC_EVENTS (8)
#define NVME_ADMIN_TIMEOUT_PERIOD (60) /* in seconds */
@@ -317,7 +317,10 @@
struct nvme_qpair *ioq;
struct nvme_controller_data cdata;
- struct nvme_namespace ns[NVME_MAX_NAMESPACES];
+
+ /** attached namespaces, ascending by NSID */
+ struct nvme_namespace *ns;
+ uint32_t num_ns;
struct cdev *cdev;
@@ -359,18 +362,24 @@
static inline uint32_t
nvme_ctrlr_num_namespaces(const struct nvme_controller *ctrlr)
{
- uint32_t nn;
+ return (ctrlr->num_ns);
+}
- nn = min(ctrlr->cdata.nn, NVME_MAX_NAMESPACES);
- if ((ctrlr->quirks & QUIRK_APPLE_S3X_NS1_ONLY) != 0)
- nn = min(nn, 1U);
- return (nn);
+static inline struct nvme_namespace *
+nvme_ctrlr_ns_lookup(const struct nvme_controller *ctrlr, uint32_t nsid)
+{
+ for (uint32_t i = 0; i < ctrlr->num_ns; i++) {
+ if (ctrlr->ns[i].id == nsid)
+ return (__DECONST(struct nvme_namespace *,
+ &ctrlr->ns[i]));
+ }
+ return (NULL);
}
static inline bool
nvme_ctrlr_nsid_visible(const struct nvme_controller *ctrlr, uint32_t nsid)
{
- return (nsid >= 1 && nsid <= nvme_ctrlr_num_namespaces(ctrlr));
+ return (nvme_ctrlr_ns_lookup(ctrlr, nsid) != NULL);
}
/*
@@ -407,6 +416,10 @@
void nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr,
uint32_t nsid, void *payload,
nvme_cb_fn_t cb_fn, void *cb_arg);
+void nvme_ctrlr_cmd_identify_active_ns(struct nvme_controller *ctrlr,
+ uint32_t nsid,
+ struct nvme_ns_list *payload,
+ nvme_cb_fn_t cb_fn, void *cb_arg);
void nvme_ctrlr_cmd_set_interrupt_coalescing(struct nvme_controller *ctrlr,
uint32_t microseconds,
uint32_t threshold,
diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c
--- a/sys/dev/nvme/nvme_sim.c
+++ b/sys/dev/nvme/nvme_sim.c
@@ -199,7 +199,8 @@
cpi->hba_misc = PIM_UNMAPPED | PIM_NOSCAN;
cpi->hba_eng_cnt = 0;
cpi->max_target = 0;
- cpi->max_lun = nvme_ctrlr_num_namespaces(ctrlr);
+ cpi->max_lun = ctrlr->num_ns == 0 ? 0 :
+ ctrlr->ns[ctrlr->num_ns - 1].id;
cpi->maxio = ctrlr->max_xfer_size;
cpi->initiator_id = 0;
cpi->bus_id = cam_sim_bus(sim);
@@ -456,7 +457,10 @@
nvme_sim_ns_changed(device_t dev, uint32_t nsid)
{
struct nvme_sim_softc *sc = device_get_softc(dev);
- struct nvme_namespace *ns = &sc->s_ctrlr->ns[nsid - 1];
+ struct nvme_namespace *ns = nvme_ctrlr_ns_lookup(sc->s_ctrlr, nsid);
+
+ if (ns == NULL)
+ return (ENXIO);
/*
* These wind up being the same. For a configured cam_ed, we generate

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 3:48 PM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41802431
Default Alt Text
D61629.1794930484.diff (6 KB)

Event Timeline