| Message ID | 20200316142928.153431-20-its@irrelevant.dk |
|---|---|
| State | New |
| Headers | show |
| Series | nvme: support NVMe v1.3d, SGLs and multiple namespaces | expand |
On Mon, 2020-03-16 at 07:29 -0700, 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> > --- > hw/block/nvme.c | 7 +++++++ > hw/block/nvme.h | 1 + > 2 files changed, 8 insertions(+) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 007f8817f101..b40d27cddc46 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -881,6 +881,8 @@ 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)); > + > + n->qs_created = true; Very minor nitpick, maybe it is worth mentioning in a comment, why this is only needed in CQ creation, as you explained to me. > return NVME_SUCCESS; > } > > @@ -1194,6 +1196,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. > @@ -1332,6 +1338,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 b709a8bb8d40..b4d1738a3d0a 100644 > --- a/hw/block/nvme.h > +++ b/hw/block/nvme.h > @@ -99,6 +99,7 @@ typedef struct NvmeCtrl { > BlockConf conf; > NvmeParams params; > > + bool qs_created; > uint32_t page_size; > uint16_t page_bits; > uint16_t max_prp_ents; Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Best regards, Maxim Levitsky
On Mar 25 12:43, Maxim Levitsky wrote: > On Mon, 2020-03-16 at 07:29 -0700, 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> > > --- > > hw/block/nvme.c | 7 +++++++ > > hw/block/nvme.h | 1 + > > 2 files changed, 8 insertions(+) > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > index 007f8817f101..b40d27cddc46 100644 > > --- a/hw/block/nvme.c > > +++ b/hw/block/nvme.c > > @@ -881,6 +881,8 @@ 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)); > > + > > + n->qs_created = true; > Very minor nitpick, maybe it is worth mentioning in a comment, > why this is only needed in CQ creation, as you explained to me. > Added. > > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > Best regards, > Maxim Levitsky > > > > >
On Tue, 2020-03-31 at 07:41 +0200, Klaus Birkelund Jensen wrote: > On Mar 25 12:43, Maxim Levitsky wrote: > > On Mon, 2020-03-16 at 07:29 -0700, 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> > > > --- > > > hw/block/nvme.c | 7 +++++++ > > > hw/block/nvme.h | 1 + > > > 2 files changed, 8 insertions(+) > > > > > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > > > index 007f8817f101..b40d27cddc46 100644 > > > --- a/hw/block/nvme.c > > > +++ b/hw/block/nvme.c > > > @@ -881,6 +881,8 @@ 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)); > > > + > > > + n->qs_created = true; > > > > Very minor nitpick, maybe it is worth mentioning in a comment, > > why this is only needed in CQ creation, as you explained to me. > > > > Added. Thanks a lot! > > > > > Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> > > > > Best regards, > > Maxim Levitsky > > > > > > > > > > > > Best regards, Maxim Levitsky
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 007f8817f101..b40d27cddc46 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -881,6 +881,8 @@ 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)); + + n->qs_created = true; return NVME_SUCCESS; } @@ -1194,6 +1196,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. @@ -1332,6 +1338,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 b709a8bb8d40..b4d1738a3d0a 100644 --- a/hw/block/nvme.h +++ b/hw/block/nvme.h @@ -99,6 +99,7 @@ typedef struct NvmeCtrl { BlockConf conf; NvmeParams params; + bool qs_created; uint32_t page_size; uint16_t page_bits; uint16_t max_prp_ents;