| Message ID | 20200629182642.1170387-16-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | hw/block/nvme: bump to v1.3 | expand |
Looks good, Reviewed-by: Dmitry Fomichev <dmitry.fomichev@wdc.com> On Mon, 2020-06-29 at 20:26 +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jensen@samsung.com> > > Support returning Command Sequence Error if Set Features on Number of > Queues is called after queues have been created. > > Signed-off-by: Klaus Jensen <k.jensen@samsung.com> > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > --- > hw/block/nvme.c | 12 ++++++++++++ > hw/block/nvme.h | 1 + > 2 files changed, 13 insertions(+) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 8a816b558eeb..798f6f30e7da 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -911,6 +911,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) > cq = g_malloc0(sizeof(*cq)); > nvme_init_cq(cq, n, prp1, cqid, vector, qsize + 1, > NVME_CQ_FLAGS_IEN(qflags)); > + > + /* > + * It is only required to set qs_created when creating a completion queue; > + * creating a submission queue without a matching completion queue will > + * fail. > + */ > + n->qs_created = true; > return NVME_SUCCESS; > } > > @@ -1298,6 +1305,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) > blk_set_enable_write_cache(n->conf.blk, dw11 & 1); > break; > case NVME_NUMBER_OF_QUEUES: > + if (n->qs_created) { > + return NVME_CMD_SEQ_ERROR | NVME_DNR; > + } > + > /* > * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR > * and NSQR. > @@ -1430,6 +1441,7 @@ static void nvme_clear_ctrl(NvmeCtrl *n) > > n->aer_queued = 0; > n->outstanding_aers = 0; > + n->qs_created = false; > > blk_flush(n->conf.blk); > n->bar.cc = 0; > diff --git a/hw/block/nvme.h b/hw/block/nvme.h > index 34dddda29d96..54ec54f491bf 100644 > --- a/hw/block/nvme.h > +++ b/hw/block/nvme.h > @@ -124,6 +124,7 @@ typedef struct NvmeCtrl { > BlockConf conf; > NvmeParams params; > > + bool qs_created; > uint32_t page_size; > uint16_t page_bits; > uint16_t max_prp_ents;
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 8a816b558eeb..798f6f30e7da 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -911,6 +911,13 @@ static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeCmd *cmd) cq = g_malloc0(sizeof(*cq)); nvme_init_cq(cq, n, prp1, cqid, vector, qsize + 1, NVME_CQ_FLAGS_IEN(qflags)); + + /* + * It is only required to set qs_created when creating a completion queue; + * creating a submission queue without a matching completion queue will + * fail. + */ + n->qs_created = true; return NVME_SUCCESS; } @@ -1298,6 +1305,10 @@ static uint16_t nvme_set_feature(NvmeCtrl *n, NvmeCmd *cmd, NvmeRequest *req) blk_set_enable_write_cache(n->conf.blk, dw11 & 1); break; case NVME_NUMBER_OF_QUEUES: + if (n->qs_created) { + return NVME_CMD_SEQ_ERROR | NVME_DNR; + } + /* * NVMe v1.3, Section 5.21.1.7: 0xffff is not an allowed value for NCQR * and NSQR. @@ -1430,6 +1441,7 @@ static void nvme_clear_ctrl(NvmeCtrl *n) n->aer_queued = 0; n->outstanding_aers = 0; + n->qs_created = false; blk_flush(n->conf.blk); n->bar.cc = 0; diff --git a/hw/block/nvme.h b/hw/block/nvme.h index 34dddda29d96..54ec54f491bf 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -124,6 +124,7 @@ typedef struct NvmeCtrl { BlockConf conf; NvmeParams params; + bool qs_created; uint32_t page_size; uint16_t page_bits; uint16_t max_prp_ents;