upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 09:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nvmf: Rescan all namespaces if the changed NS log page is too large

Browse source 
Previously this just punted with a warning message.

Reviewed by:	imp
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D45460
This commit is contained in:
John Baldwin 2024-06-05 12:52:43 -07:00
parent 8a082ca89f
commit f6d434f110
3 changed files with 51 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
sys/dev/nvmf/host/nvmf.c
View file

@ -804,6 +804,55 @@ nvmf_rescan_ns(struct nvmf_softc *sc, uint32_t nsid)
free(data, M_NVMF);
}
static void
nvmf_purge_namespaces(struct nvmf_softc *sc, uint32_t first_nsid,
uint32_t next_valid_nsid)
{
struct nvmf_namespace *ns;
for (uint32_t nsid = first_nsid; nsid < next_valid_nsid; nsid++)
{
/* XXX: Needs locking around sc->ns[]. */
ns = sc->ns[nsid - 1];
if (ns != NULL) {
nvmf_destroy_ns(ns);
sc->ns[nsid - 1] = NULL;
nvmf_sim_rescan_ns(sc, nsid);
}
}
}
static bool
nvmf_rescan_ns_cb(struct nvmf_softc *sc, uint32_t nsid,
const struct nvme_namespace_data *data, void *arg)
{
uint32_t *last_nsid = arg;
/* Check for any gaps prior to this namespace. */
nvmf_purge_namespaces(sc, *last_nsid + 1, nsid);
*last_nsid = nsid;
nvmf_rescan_ns_1(sc, nsid, data);
return (true);
}
void
nvmf_rescan_all_ns(struct nvmf_softc *sc)
{
uint32_t last_nsid;
last_nsid = 0;
if (!nvmf_scan_active_namespaces(sc, nvmf_rescan_ns_cb, &last_nsid))
return;
/*
* Check for any namespace devices after the last active
* namespace.
*/
nvmf_purge_namespaces(sc, last_nsid + 1, sc->cdata->nn + 1);
}
int
nvmf_passthrough_cmd(struct nvmf_softc *sc, struct nvme_pt_command *pt,
bool admin)

2
sys/dev/nvmf/host/nvmf_aer.c
View file

@ -62,7 +62,7 @@ nvmf_handle_changed_namespaces(struct nvmf_softc *sc,
* probably just rescan the entire set of namespaces.
*/
if (ns_list->ns[0] == 0xffffffff) {
device_printf(sc->dev, "too many changed namespaces\n");
nvmf_rescan_all_ns(sc);
return;
}

1
sys/dev/nvmf/host/nvmf_var.h
View file

@ -148,6 +148,7 @@ int nvmf_init_ivars(struct nvmf_ivars *ivars, struct nvmf_handoff_host *hh);
void nvmf_free_ivars(struct nvmf_ivars *ivars);
void nvmf_disconnect(struct nvmf_softc *sc);
void nvmf_rescan_ns(struct nvmf_softc *sc, uint32_t nsid);
void nvmf_rescan_all_ns(struct nvmf_softc *sc);
int nvmf_passthrough_cmd(struct nvmf_softc *sc, struct nvme_pt_command *pt,
bool admin);