Page MenuHomeFreeBSD
Files F140074661

D32953.id98433.diff
No OneTemporary
Actions

D32953.id98433.diff
View Options

Index: usr.sbin/bhyve/pci_nvme.c
===================================================================
--- usr.sbin/bhyve/pci_nvme.c
+++ usr.sbin/bhyve/pci_nvme.c
@@ -296,6 +296,7 @@
struct nvme_error_information_entry err_log;
struct nvme_health_information_page health_log;
struct nvme_firmware_page fw_log;
+ struct nvme_ns_list ns_log;
struct pci_nvme_blockstore nvstore;
@@ -598,15 +599,23 @@
}
static void
-pci_nvme_init_nsdata(struct pci_nvme_softc *sc,
- struct nvme_namespace_data *nd, uint32_t nsid,
- struct pci_nvme_blockstore *nvstore)
+pci_nvme_init_nsdata_size(struct pci_nvme_blockstore *nvstore,
+ struct nvme_namespace_data *nd)
{
/* Get capacity and block size information from backing store */
nd->nsze = nvstore->size / nvstore->sectsz;
nd->ncap = nd->nsze;
nd->nuse = nd->nsze;
+}
+
+static void
+pci_nvme_init_nsdata(struct pci_nvme_softc *sc,
+ struct nvme_namespace_data *nd, uint32_t nsid,
+ struct pci_nvme_blockstore *nvstore)
+{
+
+ pci_nvme_init_nsdata_size(nvstore, nd);
if (nvstore->type == NVME_STOR_BLOCKIF)
nvstore->deallocate = blockif_candelete(nvstore->ctx);
@@ -642,6 +651,7 @@
memset(&sc->err_log, 0, sizeof(sc->err_log));
memset(&sc->health_log, 0, sizeof(sc->health_log));
memset(&sc->fw_log, 0, sizeof(sc->fw_log));
+ memset(&sc->ns_log, 0, sizeof(sc->ns_log));
/* Set read/write remainder to round up according to spec */
sc->read_dunits_remainder = 999;
@@ -1349,6 +1359,13 @@
MIN(logsize, sizeof(sc->fw_log)),
NVME_COPY_TO_PRP);
break;
+ case NVME_LOG_CHANGED_NAMESPACE:
+ nvme_prp_memcpy(sc->nsc_pi->pi_vmctx, command->prp1,
+ command->prp2, (uint8_t *)&sc->ns_log,
+ MIN(logsize, sizeof(sc->ns_log)),
+ NVME_COPY_TO_PRP);
+ memset(&sc->ns_log, 0, sizeof(sc->ns_log));
+ break;
default:
DPRINTF("%s get log page %x command not supported",
__func__, logpage);
@@ -2949,6 +2966,28 @@
return (0);
}
+static void
+pci_nvme_resized(struct blockif_ctxt *bctxt, void *arg, size_t new_size)
+{
+ struct pci_nvme_softc *sc;
+ struct pci_nvme_blockstore *nvstore;
+ struct nvme_namespace_data *nd;
+
+ sc = arg;
+ nvstore = &sc->nvstore;
+ nd = &sc->nsdata;
+
+ nvstore->size = new_size;
+ pci_nvme_init_nsdata_size(nvstore, nd);
+
+ /* Add changed NSID to list */
+ sc->ns_log.ns[0] = 1;
+ sc->ns_log.ns[1] = 0;
+
+ pci_nvme_aen_post(sc, PCI_NVME_AE_TYPE_NOTICE,
+ PCI_NVME_AE_INFO_NS_ATTR_CHANGED);
+}
+
static int
pci_nvme_init(struct vmctx *ctx, struct pci_devinst *pi, nvlist_t *nvl)
{
@@ -3014,6 +3053,7 @@
pthread_mutex_init(&sc->mtx, NULL);
sem_init(&sc->iosemlock, 0, sc->ioslots);
+ blockif_register_resize_callback(sc->nvstore.ctx, pci_nvme_resized, sc);
pci_nvme_init_queues(sc, sc->max_queues, sc->max_queues);
/*

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 20, 9:47 PM (12 h, 57 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27101368
Default Alt Text
D32953.id98433.diff (2 KB)

Event Timeline