From: Dmitry Fomichev <dmitry.fomichev@wdc.com>
To: "Kevin Wolf" <kwolf@redhat.com>,
"Keith Busch" <kbusch@kernel.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Maxim Levitsky" <mlevitsky@redhat.com>
Cc: Niklas Cassel <niklas.cassel@wdc.com>,
Damien Le Moal <damien.lemoal@wdc.com>,
qemu-block@nongnu.org, Dmitry Fomichev <dmitry.fomichev@wdc.com>,
qemu-devel@nongnu.org, Matias Bjorling <matias.bjorling@wdc.com>
Subject: [PATCH v2 14/18] hw/block/nvme: Generate zone AENs
Date: Thu, 18 Jun 2020 06:34:11 +0900 [thread overview]
Message-ID: <20200617213415.22417-15-dmitry.fomichev@wdc.com> (raw)
In-Reply-To: <20200617213415.22417-1-dmitry.fomichev@wdc.com>
Added an optional Boolean "zone_async_events" property to the driver.
Once it's turned on, the namespace will be sending "Zone Descriptor
Changed" asynchronous events to the host in particular situations
defined by the protocol. In order to clear these AENs, the host needs
to read the newly added Changed Zones Log.
Signed-off-by: Dmitry Fomichev <dmitry.fomichev@wdc.com>
---
hw/block/nvme.c | 300 ++++++++++++++++++++++++++++++++++++++++++-
hw/block/nvme.h | 13 +-
include/block/nvme.h | 23 +++-
3 files changed, 328 insertions(+), 8 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index c3898448c7..b9135a6b1f 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -201,12 +201,66 @@ static inline void nvme_aor_dec_active(NvmeCtrl *n, NvmeNamespace *ns)
assert(ns->nr_active_zones >= 0);
}
+static bool nvme_complete_async_req(NvmeCtrl *n, NvmeNamespace *ns,
+ enum NvmeAsyncEventType type, uint8_t info)
+{
+ NvmeAsyncEvent *ae;
+ uint32_t nsid = 0;
+ uint8_t log_page = 0;
+
+ switch (type) {
+ case NVME_AER_TYPE_ERROR:
+ case NVME_AER_TYPE_SMART:
+ break;
+ case NVME_AER_TYPE_NOTICE:
+ switch (info) {
+ case NVME_AER_NOTICE_ZONE_DESCR_CHANGED:
+ log_page = NVME_LOG_ZONE_CHANGED_LIST;
+ nsid = ns->nsid;
+ if (!(n->ae_cfg & NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES)) {
+ trace_pci_nvme_zone_ae_not_enabled(info, log_page, nsid);
+ return false;
+ }
+ if (ns->aen_pending) {
+ trace_pci_nvme_zone_ae_not_cleared(info, log_page, nsid);
+ return false;
+ }
+ ns->aen_pending = true;
+ }
+ break;
+ case NVME_AER_TYPE_CMDSET_SPECIFIC:
+ case NVME_AER_TYPE_VENDOR_SPECIFIC:
+ break;
+ }
+
+ ae = g_malloc0(sizeof(*ae));
+ ae->res = type;
+ ae->res |= (info << 8) & 0xff00;
+ ae->res |= (log_page << 16) & 0xff0000;
+ ae->nsid = nsid;
+
+ QTAILQ_INSERT_TAIL(&n->async_reqs, ae, entry);
+ timer_mod(n->admin_cq.timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 500);
+ return true;
+}
+
+static inline void nvme_notify_zone_changed(NvmeCtrl *n, NvmeNamespace *ns,
+ NvmeZone *zone)
+{
+ if (n->ae_cfg) {
+ zone->flags |= NVME_ZFLAGS_AEN_PEND;
+ nvme_complete_async_req(n, ns, NVME_AER_TYPE_NOTICE,
+ NVME_AER_NOTICE_ZONE_DESCR_CHANGED);
+ }
+}
+
static void nvme_set_rzr(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
{
assert(zone->flags & NVME_ZFLAGS_SET_RZR);
zone->tstamp = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
zone->flags &= ~NVME_ZFLAGS_TS_DELAY;
zone->d.za |= NVME_ZA_RESET_RECOMMENDED;
+ nvme_notify_zone_changed(n, ns, zone);
zone->flags &= ~NVME_ZFLAGS_SET_RZR;
trace_pci_nvme_zone_reset_recommended(zone->d.zslba);
}
@@ -215,10 +269,14 @@ static void nvme_clear_rzr(NvmeCtrl *n, NvmeNamespace *ns,
NvmeZone *zone, bool notify)
{
if (n->params.rrl_usec) {
- zone->flags &= ~(NVME_ZFLAGS_SET_RZR | NVME_ZFLAGS_TS_DELAY);
+ zone->flags &= ~(NVME_ZFLAGS_SET_RZR | NVME_ZFLAGS_TS_DELAY |
+ NVME_ZFLAGS_AEN_PEND);
notify = notify && (zone->d.za & NVME_ZA_RESET_RECOMMENDED);
zone->d.za &= ~NVME_ZA_RESET_RECOMMENDED;
zone->tstamp = 0;
+ if (notify) {
+ nvme_notify_zone_changed(n, ns, zone);
+ }
}
}
@@ -228,6 +286,7 @@ static void nvme_set_fzr(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
zone->tstamp = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
zone->flags &= ~NVME_ZFLAGS_TS_DELAY;
zone->d.za |= NVME_ZA_FINISH_RECOMMENDED;
+ nvme_notify_zone_changed(n, ns, zone);
zone->flags &= ~NVME_ZFLAGS_SET_FZR;
trace_pci_nvme_zone_finish_recommended(zone->d.zslba);
}
@@ -236,13 +295,61 @@ static void nvme_clear_fzr(NvmeCtrl *n, NvmeNamespace *ns,
NvmeZone *zone, bool notify)
{
if (n->params.frl_usec) {
- zone->flags &= ~(NVME_ZFLAGS_SET_FZR | NVME_ZFLAGS_TS_DELAY);
+ zone->flags &= ~(NVME_ZFLAGS_SET_FZR | NVME_ZFLAGS_TS_DELAY |
+ NVME_ZFLAGS_AEN_PEND);
notify = notify && (zone->d.za & NVME_ZA_FINISH_RECOMMENDED);
zone->d.za &= ~NVME_ZA_FINISH_RECOMMENDED;
zone->tstamp = 0;
+ if (notify) {
+ nvme_notify_zone_changed(n, ns, zone);
+ }
}
}
+static bool nvme_process_rrl(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
+{
+ if (zone->flags & NVME_ZFLAGS_SET_RZR) {
+ if (zone->flags & NVME_ZFLAGS_TS_DELAY) {
+ assert(!(zone->d.za & NVME_ZA_RESET_RECOMMENDED));
+ if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - zone->tstamp >=
+ n->params.rzr_delay_usec) {
+ nvme_set_rzr(n, ns, zone);
+ return true;
+ }
+ } else if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - zone->tstamp >=
+ n->params.rrl_usec) {
+ assert(zone->d.za & NVME_ZA_RESET_RECOMMENDED);
+ nvme_clear_rzr(n, ns, zone, true);
+ trace_pci_nvme_zone_reset_internal_op(zone->d.zslba);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+static bool nvme_process_frl(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
+{
+ if (zone->flags & NVME_ZFLAGS_SET_FZR) {
+ if (zone->flags & NVME_ZFLAGS_TS_DELAY) {
+ assert(!(zone->d.za & NVME_ZA_FINISH_RECOMMENDED));
+ if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - zone->tstamp >=
+ n->params.fzr_delay_usec) {
+ nvme_set_fzr(n, ns, zone);
+ return true;
+ }
+ } else if (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - zone->tstamp >=
+ n->params.frl_usec) {
+ assert(zone->d.za & NVME_ZA_FINISH_RECOMMENDED);
+ nvme_clear_fzr(n, ns, zone, true);
+ trace_pci_nvme_zone_finish_internal_op(zone->d.zslba);
+ return true;
+ }
+ }
+
+ return false;
+}
+
static void nvme_schedule_rzr(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
{
if (n->params.frl_usec) {
@@ -279,6 +386,48 @@ static void nvme_schedule_fzr(NvmeCtrl *n, NvmeNamespace *ns, NvmeZone *zone)
}
}
+static void nvme_observe_ns_zone_time_limits(NvmeCtrl *n, NvmeNamespace *ns)
+{
+ NvmeZone *zone;
+
+ if (n->params.frl_usec) {
+ for (zone = nvme_peek_zone_head(ns, ns->closed_zones);
+ zone;
+ zone = nvme_next_zone_in_list(ns, zone, ns->closed_zones)) {
+ nvme_process_frl(n, ns, zone);
+ }
+
+ for (zone = nvme_peek_zone_head(ns, ns->imp_open_zones);
+ zone;
+ zone = nvme_next_zone_in_list(ns, zone, ns->imp_open_zones)) {
+ nvme_process_frl(n, ns, zone);
+ }
+
+ for (zone = nvme_peek_zone_head(ns, ns->exp_open_zones);
+ zone;
+ zone = nvme_next_zone_in_list(ns, zone, ns->exp_open_zones)) {
+ nvme_process_frl(n, ns, zone);
+ }
+ }
+
+ if (n->params.rrl_usec) {
+ for (zone = nvme_peek_zone_head(ns, ns->full_zones);
+ zone;
+ zone = nvme_next_zone_in_list(ns, zone, ns->full_zones)) {
+ nvme_process_rrl(n, ns, zone);
+ }
+ }
+}
+
+static void nvme_observe_zone_time_limits(NvmeCtrl *n)
+{
+ int i;
+
+ for (i = 0; i < n->num_namespaces; i++) {
+ nvme_observe_ns_zone_time_limits(n, &n->namespaces[i]);
+ }
+}
+
static void nvme_assign_zone_state(NvmeCtrl *n, NvmeNamespace *ns,
NvmeZone *zone, uint8_t state)
{
@@ -563,6 +712,7 @@ static void nvme_post_cqes(void *opaque)
NvmeCQueue *cq = opaque;
NvmeCtrl *n = cq->ctrl;
NvmeRequest *req, *next;
+ NvmeAsyncEvent *ae;
QTAILQ_FOREACH_SAFE(req, &cq->req_list, entry, next) {
NvmeSQueue *sq;
@@ -572,8 +722,26 @@ static void nvme_post_cqes(void *opaque)
break;
}
+ ae = NULL;
+ if (req->flags & NVME_REQ_FLG_AER) {
+ if (likely(QTAILQ_EMPTY(&n->async_reqs))) {
+ continue;
+ } else {
+ ae = QTAILQ_FIRST(&n->async_reqs);
+ QTAILQ_REMOVE(&n->async_reqs, ae, entry);
+ }
+ }
+
QTAILQ_REMOVE(&cq->req_list, req, entry);
sq = req->sq;
+ if (unlikely(ae)) {
+ assert(!sq->sqid);
+ req->cqe.ae.info = cpu_to_le32(ae->res);
+ req->cqe.ae.nsid = cpu_to_le32(ae->nsid);
+ g_free(ae);
+ assert(n->nr_aers);
+ n->nr_aers--;
+ }
req->cqe.status = cpu_to_le16((req->status << 1) | cq->phase);
req->cqe.sq_id = cpu_to_le16(sq->sqid);
@@ -587,6 +755,15 @@ static void nvme_post_cqes(void *opaque)
if (cq->tail != cq->head) {
nvme_irq_assert(n, cq);
}
+
+ if (cq == &n->admin_cq &&
+ n->params.zoned && n->params.zone_async_events) {
+ nvme_observe_zone_time_limits(n);
+ if (timer_expired(cq->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL))) {
+ timer_mod(cq->timer,
+ qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 10 * SCALE_MS);
+ }
+ }
}
static void nvme_fill_data(QEMUSGList *qsg, QEMUIOVector *iov,
@@ -618,7 +795,9 @@ static void nvme_enqueue_req_completion(NvmeCQueue *cq, NvmeRequest *req)
assert(cq->cqid == req->sq->cqid);
QTAILQ_REMOVE(&req->sq->out_req_list, req, entry);
QTAILQ_INSERT_TAIL(&cq->req_list, req, entry);
- timer_mod(cq->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 500);
+ if (!(req->flags & NVME_REQ_FLG_AER)) {
+ timer_mod(cq->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 500);
+ }
}
static void nvme_auto_transition_zone(NvmeCtrl *n, NvmeNamespace *ns,
@@ -643,6 +822,7 @@ static void nvme_auto_transition_zone(NvmeCtrl *n, NvmeNamespace *ns,
zone->d.za |= NVME_ZA_FINISHED_BY_CTLR;
zone->flags = 0;
zone->tstamp = 0;
+ nvme_notify_zone_changed(n, ns, zone);
trace_pci_nvme_zone_finished_by_controller(zone->d.zslba);
}
}
@@ -1978,6 +2158,10 @@ static uint16_t nvme_get_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
break;
case NVME_TIMESTAMP:
return nvme_get_feature_timestamp(n, cmd);
+ case NVME_ASYNCHRONOUS_EVENT_CONF:
+ result = cpu_to_le32(n->ae_cfg);
+ trace_pci_nvme_getfeat_aen_cfg(result);
+ break;
case NVME_COMMAND_SET_PROFILE:
result = 0;
break;
@@ -2029,6 +2213,19 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
return nvme_set_feature_timestamp(n, cmd);
break;
+ case NVME_ASYNCHRONOUS_EVENT_CONF:
+ if (dw11 & NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES) {
+ if (!(n->ae_cfg & NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES)) {
+ trace_pci_nvme_zone_aen_not_requested(dw11);
+ } else {
+ trace_pci_nvme_setfeat_zone_info_aer_on();
+ }
+ } else if (n->ae_cfg & NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES) {
+ trace_pci_nvme_setfeat_zone_info_aer_off();
+ n->ae_cfg &= ~NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES;
+ }
+ break;
+
case NVME_COMMAND_SET_PROFILE:
if (dw11 & 0x1ff) {
trace_pci_nvme_err_invalid_iocsci(dw11 & 0x1ff);
@@ -2043,6 +2240,18 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
return NVME_SUCCESS;
}
+static uint16_t nvme_async_req(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
+{
+ if (n->nr_aers >= NVME_MAX_ASYNC_EVENTS) {
+ return NVME_AER_LIMIT_EXCEEDED | NVME_DNR;
+ }
+
+ assert(!(req->flags & NVME_REQ_FLG_AER));
+ req->flags |= NVME_REQ_FLG_AER;
+ n->nr_aers++;
+ return NVME_SUCCESS;
+}
+
static uint16_t nvme_handle_cmd_effects(NvmeCtrl *n, NvmeCmd *cmd,
uint64_t prp1, uint64_t prp2, uint64_t ofs, uint32_t len, uint8_t csi)
{
@@ -2068,6 +2277,7 @@ static uint16_t nvme_handle_cmd_effects(NvmeCtrl *n, NvmeCmd *cmd,
iocs[NVME_ADM_CMD_SET_FEATURES] = NVME_CMD_EFFECTS_CSUPP;
iocs[NVME_ADM_CMD_GET_FEATURES] = NVME_CMD_EFFECTS_CSUPP;
iocs[NVME_ADM_CMD_GET_LOG_PAGE] = NVME_CMD_EFFECTS_CSUPP;
+ iocs[NVME_ADM_CMD_ASYNC_EV_REQ] = NVME_CMD_EFFECTS_CSUPP;
if (NVME_CC_CSS(n->bar.cc) != CSS_ADMIN_ONLY) {
iocs[NVME_CMD_FLUSH] = NVME_CMD_EFFECTS_CSUPP | NVME_CMD_EFFECTS_LBCC;
@@ -2086,6 +2296,67 @@ static uint16_t nvme_handle_cmd_effects(NvmeCtrl *n, NvmeCmd *cmd,
return nvme_dma_read_prp(n, (uint8_t *)&cmd_eff_log, len, prp1, prp2);
}
+static uint16_t nvme_handle_changed_zone_log(NvmeCtrl *n, NvmeCmd *cmd,
+ uint64_t prp1, uint64_t prp2, uint16_t nsid, uint64_t ofs, uint32_t len,
+ uint8_t csi, bool rae)
+{
+ NvmeNamespace *ns;
+ NvmeChangedZoneLog zc_log = {};
+ NvmeZone *zone;
+ uint64_t *zid_ptr = &zc_log.zone_ids[0];
+ uint64_t *zid_end = zid_ptr + ARRAY_SIZE(zc_log.zone_ids);
+ int i, nids = 0, num_aen_zones = 0;
+
+ trace_pci_nvme_changed_zone_log_read(nsid);
+
+ if (!n->params.zoned || !n->params.zone_async_events) {
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
+ if (unlikely(nsid == 0 || nsid > n->num_namespaces)) {
+ trace_pci_nvme_err_invalid_ns(nsid, n->num_namespaces);
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+ ns = &n->namespaces[nsid - 1];
+ if (csi != ns->csi) {
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
+ if (ofs != 0) {
+ trace_pci_nvme_err_invalid_changed_zone_list_offset(ofs);
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+ if (len != sizeof(zc_log)) {
+ trace_pci_nvme_err_invalid_changed_zone_list_len(len);
+ return NVME_INVALID_FIELD | NVME_DNR;
+ }
+
+ zone = ns->zone_array;
+ for (i = 0; i < n->num_zones && zid_ptr < zid_end; i++, zone++) {
+ if (!(zone->flags & NVME_ZFLAGS_AEN_PEND)) {
+ continue;
+ }
+ num_aen_zones++;
+ if (zone->d.za) {
+ trace_pci_nvme_reporting_changed_zone(zone->d.zslba, zone->d.za);
+ *zid_ptr++ = cpu_to_le64(zone->d.zslba);
+ nids++;
+ }
+ if (!rae) {
+ zone->flags &= ~NVME_ZFLAGS_AEN_PEND;
+ }
+ }
+
+ if (num_aen_zones && !nids) {
+ trace_pci_nvme_empty_changed_zone_list();
+ nids = 0xffff;
+ }
+ zc_log.nr_zone_ids = cpu_to_le16(nids);
+ ns->aen_pending = false;
+
+ return nvme_dma_read_prp(n, (uint8_t *)&zc_log, len, prp1, prp2);
+}
+
static uint16_t nvme_get_log_page(NvmeCtrl *n, NvmeCmd *cmd)
{
uint64_t prp1 = le64_to_cpu(cmd->prp1);
@@ -2095,9 +2366,11 @@ static uint16_t nvme_get_log_page(NvmeCtrl *n, NvmeCmd *cmd)
uint64_t dw12 = le32_to_cpu(cmd->cdw12);
uint64_t dw13 = le32_to_cpu(cmd->cdw13);
uint64_t ofs = (dw13 << 32) | dw12;
+ uint32_t nsid = le32_to_cpu(cmd->nsid);
uint32_t numdl, numdu, len;
uint16_t lid = dw10 & 0xff;
uint8_t csi = le32_to_cpu(cmd->cdw14) >> 24;
+ bool rae = !!(dw10 & (1 << 15));
numdl = dw10 >> 16;
numdu = dw11 & 0xffff;
@@ -2106,6 +2379,9 @@ static uint16_t nvme_get_log_page(NvmeCtrl *n, NvmeCmd *cmd)
switch (lid) {
case NVME_LOG_CMD_EFFECTS:
return nvme_handle_cmd_effects(n, cmd, prp1, prp2, ofs, len, csi);
+ case NVME_LOG_ZONE_CHANGED_LIST:
+ return nvme_handle_changed_zone_log(n, cmd, prp1, prp2, nsid,
+ ofs, len, csi, rae);
}
trace_pci_nvme_unsupported_log_page(lid);
@@ -2131,6 +2407,8 @@ static uint16_t nvme_admin_cmd(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req)
return nvme_get_feature(n, cmd, req);
case NVME_ADM_CMD_GET_LOG_PAGE:
return nvme_get_log_page(n, cmd);
+ case NVME_ADM_CMD_ASYNC_EV_REQ:
+ return nvme_async_req(n, cmd, req);
default:
trace_pci_nvme_err_invalid_admin_opc(cmd->opcode);
return NVME_INVALID_OPCODE | NVME_DNR;
@@ -2171,6 +2449,7 @@ static void nvme_process_sq(void *opaque)
static void nvme_clear_ctrl(NvmeCtrl *n)
{
+ NvmeAsyncEvent *ae_entry, *next;
int i;
blk_drain(n->conf.blk);
@@ -2186,6 +2465,11 @@ static void nvme_clear_ctrl(NvmeCtrl *n)
}
}
+ QTAILQ_FOREACH_SAFE(ae_entry, &n->async_reqs, entry, next) {
+ g_free(ae_entry);
+ }
+ n->nr_aers = 0;
+
blk_flush(n->conf.blk);
n->bar.cc = 0;
}
@@ -2290,6 +2574,9 @@ static int nvme_start_ctrl(NvmeCtrl *n)
nvme_set_timestamp(n, 0ULL);
+ QTAILQ_INIT(&n->async_reqs);
+ n->nr_aers = 0;
+
return 0;
}
@@ -2724,6 +3011,10 @@ static void nvme_zoned_init_ctrl(NvmeCtrl *n, Error **errp)
n->params.max_active_zones = nz;
}
+ if (n->params.zone_async_events) {
+ n->ae_cfg |= NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES;
+ }
+
return;
}
@@ -2993,6 +3284,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
id->ieee[1] = 0x02;
id->ieee[2] = 0xb3;
id->oacs = cpu_to_le16(0);
+ id->oaes = cpu_to_le32(n->ae_cfg);
id->frmw = 7 << 1;
id->lpa = 1 << 1;
id->sqes = (0x6 << 4) | 0x6;
@@ -3111,6 +3403,8 @@ static Property nvme_props[] = {
DEFINE_PROP_UINT64("finish_rcmnd_delay", NvmeCtrl,
params.fzr_delay_usec, 0),
DEFINE_PROP_UINT64("finish_rcmnd_limit", NvmeCtrl, params.frl_usec, 0),
+ DEFINE_PROP_BOOL("zone_async_events", NvmeCtrl, params.zone_async_events,
+ true),
DEFINE_PROP_BOOL("cross_zone_read", NvmeCtrl, params.cross_zone_read, true),
DEFINE_PROP_BOOL("active_excursions", NvmeCtrl, params.active_excursions,
false),
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index be1920f1ef..e63f7736d7 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -3,6 +3,7 @@
#include "block/nvme.h"
+#define NVME_MAX_ASYNC_EVENTS 16
#define NVME_DEFAULT_ZONE_SIZE 128 /* MiB */
#define NVME_DEFAULT_MAX_ZA_SIZE 128 /* KiB */
@@ -15,6 +16,7 @@ typedef struct NvmeParams {
bool zoned;
bool cross_zone_read;
+ bool zone_async_events;
bool active_excursions;
uint8_t fill_pattern;
uint32_t zamds_bs;
@@ -29,13 +31,16 @@ typedef struct NvmeParams {
} NvmeParams;
typedef struct NvmeAsyncEvent {
- QSIMPLEQ_ENTRY(NvmeAsyncEvent) entry;
+ QTAILQ_ENTRY(NvmeAsyncEvent) entry;
+ uint32_t res;
+ uint32_t nsid;
} NvmeAsyncEvent;
enum NvmeRequestFlags {
NVME_REQ_FLG_HAS_SG = 1 << 0,
NVME_REQ_FLG_FILL = 1 << 1,
NVME_REQ_FLG_APPEND = 1 << 2,
+ NVME_REQ_FLG_AER = 1 << 3,
};
typedef struct NvmeRequest {
@@ -85,6 +90,7 @@ enum NvmeZoneFlags {
NVME_ZFLAGS_TS_DELAY = 1 << 0,
NVME_ZFLAGS_SET_RZR = 1 << 1,
NVME_ZFLAGS_SET_FZR = 1 << 2,
+ NVME_ZFLAGS_AEN_PEND = 1 << 3,
};
typedef struct NvmeZone {
@@ -119,6 +125,7 @@ typedef struct NvmeNamespace {
NvmeZoneList *full_zones;
int32_t nr_open_zones;
int32_t nr_active_zones;
+ bool aen_pending;
} NvmeNamespace;
static inline NvmeLBAF *nvme_ns_lbaf(NvmeNamespace *ns)
@@ -173,6 +180,10 @@ typedef struct NvmeCtrl {
NvmeSQueue admin_sq;
NvmeCQueue admin_cq;
NvmeIdCtrl id_ctrl;
+
+ QTAILQ_HEAD(, NvmeAsyncEvent) async_reqs;
+ uint32_t nr_aers;
+ uint32_t ae_cfg;
} NvmeCtrl;
/* calculate the number of LBAs that the namespace can accomodate */
diff --git a/include/block/nvme.h b/include/block/nvme.h
index 596c39162b..e06fb97337 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -633,16 +633,22 @@ enum NvmeAsyncErrorInfo {
enum NvmeAsyncNoticeInfo {
NVME_AER_NOTICE_NS_CHANGED = 0x00,
+ NVME_AER_NOTICE_ZONE_DESCR_CHANGED = 0xef,
};
enum NvmeAsyncEventCfg {
NVME_AEN_CFG_NS_ATTR = 1 << 8,
+ NVME_AEN_CFG_ZONE_DESCR_CHNGD_NOTICES = 1 << 27,
};
typedef struct NvmeCqe {
union {
uint64_t result64;
uint32_t result32;
+ struct {
+ uint32_t info;
+ uint32_t nsid;
+ } ae;
};
uint16_t sq_head;
uint16_t sq_id;
@@ -778,11 +784,19 @@ enum {
NVME_CMD_EFFECTS_UUID_SEL = 1 << 19,
};
+typedef struct NvmeChangedZoneLog {
+ uint16_t nr_zone_ids;
+ uint8_t rsvd2[6];
+ uint64_t zone_ids[511];
+} NvmeChangedZoneLog;
+
enum LogIdentifier {
- NVME_LOG_ERROR_INFO = 0x01,
- NVME_LOG_SMART_INFO = 0x02,
- NVME_LOG_FW_SLOT_INFO = 0x03,
- NVME_LOG_CMD_EFFECTS = 0x05,
+ NVME_LOG_ERROR_INFO = 0x01,
+ NVME_LOG_SMART_INFO = 0x02,
+ NVME_LOG_FW_SLOT_INFO = 0x03,
+ NVME_LOG_CHANGED_NS_LIST = 0x04,
+ NVME_LOG_CMD_EFFECTS = 0x05,
+ NVME_LOG_ZONE_CHANGED_LIST = 0xbf,
};
typedef struct NvmePSD {
@@ -1097,6 +1111,7 @@ static inline void _nvme_check_size(void)
QEMU_BUILD_BUG_ON(sizeof(NvmeIdNs) != 4096);
QEMU_BUILD_BUG_ON(sizeof(NvmeIdNsZoned) != 4096);
QEMU_BUILD_BUG_ON(sizeof(NvmeEffectsLog) != 4096);
+ QEMU_BUILD_BUG_ON(sizeof(NvmeChangedZoneLog) != 4096);
QEMU_BUILD_BUG_ON(sizeof(NvmeZoneDescr) != 64);
}
#endif
--
2.21.0
next prev parent reply other threads:[~2020-06-17 21:54 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-17 21:33 [PATCH v2 00/18] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set Dmitry Fomichev
2020-06-17 21:33 ` [PATCH v2 01/18] hw/block/nvme: Move NvmeRequest has_sg field to a bit flag Dmitry Fomichev
2020-06-30 0:56 ` Alistair Francis
2020-06-30 4:09 ` Klaus Jensen
2020-06-17 21:33 ` [PATCH v2 02/18] hw/block/nvme: Define 64 bit cqe.result Dmitry Fomichev
2020-06-30 0:58 ` Alistair Francis
2020-06-30 4:15 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 03/18] hw/block/nvme: Clean up unused AER definitions Dmitry Fomichev
2020-06-30 1:00 ` Alistair Francis
2020-06-30 4:40 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 04/18] hw/block/nvme: Add Commands Supported and Effects log Dmitry Fomichev
2020-06-30 1:35 ` Alistair Francis
2020-06-30 4:46 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 05/18] hw/block/nvme: Introduce the Namespace Types definitions Dmitry Fomichev
2020-06-30 2:12 ` Alistair Francis
2020-06-30 10:02 ` Niklas Cassel
2020-06-30 17:02 ` Keith Busch
2020-06-30 4:57 ` Klaus Jensen
2020-06-30 16:04 ` Niklas Cassel
2020-06-17 21:34 ` [PATCH v2 06/18] hw/block/nvme: Define trace events related to NS Types Dmitry Fomichev
2020-06-30 10:20 ` Klaus Jensen
2020-06-30 20:18 ` Alistair Francis
2020-06-17 21:34 ` [PATCH v2 07/18] hw/block/nvme: Add support for Namespace Types Dmitry Fomichev
2020-06-30 11:31 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 08/18] hw/block/nvme: Make Zoned NS Command Set definitions Dmitry Fomichev
2020-06-30 11:44 ` Klaus Jensen
2020-06-30 12:08 ` Klaus Jensen
2020-06-30 22:11 ` Alistair Francis
2020-06-17 21:34 ` [PATCH v2 09/18] hw/block/nvme: Define Zoned NS Command Set trace events Dmitry Fomichev
2020-06-30 12:14 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 10/18] hw/block/nvme: Support Zoned Namespace Command Set Dmitry Fomichev
2020-06-30 13:31 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 11/18] hw/block/nvme: Introduce max active and open zone limits Dmitry Fomichev
2020-07-01 0:26 ` Alistair Francis
2020-07-01 6:41 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 12/18] hw/block/nvme: Simulate Zone Active excursions Dmitry Fomichev
2020-07-01 0:30 ` Alistair Francis
2020-07-01 6:12 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 13/18] hw/block/nvme: Set Finish/Reset Zone Recommended attributes Dmitry Fomichev
2020-07-01 16:23 ` Klaus Jensen
2020-06-17 21:34 ` Dmitry Fomichev [this message]
2020-07-01 11:44 ` [PATCH v2 14/18] hw/block/nvme: Generate zone AENs Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 15/18] hw/block/nvme: Support Zone Descriptor Extensions Dmitry Fomichev
2020-07-01 16:32 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 16/18] hw/block/nvme: Add injection of Offline/Read-Only zones Dmitry Fomichev
2020-06-17 21:34 ` [PATCH v2 17/18] hw/block/nvme: Use zone metadata file for persistence Dmitry Fomichev
2020-07-01 17:26 ` Klaus Jensen
2020-06-17 21:34 ` [PATCH v2 18/18] hw/block/nvme: Document zoned parameters in usage text Dmitry Fomichev
2020-06-29 20:26 ` [PATCH v2 00/18] hw/block/nvme: Support Namespace Types and Zoned Namespace Command Set Dmitry Fomichev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200617213415.22417-15-dmitry.fomichev@wdc.com \
--to=dmitry.fomichev@wdc.com \
--cc=damien.lemoal@wdc.com \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=matias.bjorling@wdc.com \
--cc=mlevitsky@redhat.com \
--cc=niklas.cassel@wdc.com \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.