Few fixes for userspace NVME driver
cover Few fixes for userspace NVME driver
Hi!
These are few assorted fixes and features for the userspace nvme driver.
Tested that on my laptop with my Samsung X5 thunderbolt drive, which happens to have 4K sectors, support for discard and write zeros.
Also bunch of fixes sitting in my queue from the period when I developed the nvme-mdev driver.
Best regards,
Maxim Levitsky
Maxim Levitsky (5):
block/nvme: don't flip CQ phase bits block/nvme: fix doorbell stride
block/nvme: support larger that 512 bytes sector devices block/nvme: add support for write zeros block/nvme: add support for discard
block/nvme.c | 194 +++++++++++++++++++++++++++++++++++++++++-- block/trace-events | 3 + include/block/nvme.h | 17 +++- 3 files changed, 204 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.2
PATCH 1/5 block/nvme: don't flip CQ phase bits
Phase bits are only set by the hardware to indicate new completions and not by the device driver.
--- block/nvme.c | 2 -- 1 file changed, 2 deletions(-)
block/nvme.c +0 -2
@@ -340,8 +340,6 @@ static bool nvme_process_completion(BDRVNVMeState *s, NVMeQueuePair *q)qemu_mutex_lock (&q->lock); c->cid =cpu_to_le16 (0 ); q->inflight--; -/* Flip Phase Tag bit. */ - c->status =cpu_to_le16 (le16_to_cpu (c->status) ^0x1 ); progress = true; }if (progress) {
Signature · 1 line
2.17.2
PATCH 2/5 block/nvme: fix doorbell stride
In reply to Maxim LevitskyFix the math involving non standard doorbell stride
--- block/nvme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/nvme.c +1 -1
@@ -216,7 +216,7 @@ static NVMeQueuePair *nvme_create_queue_pair(BlockDriverState *bs,error_propagate (errp, local_err); goto fail; } - q->cq.doorbell = &s->regs->doorbells[idx *2 * s->doorbell_scale +1 ]; + q->cq.doorbell = &s->regs->doorbells[(idx *2 +1 ) * s->doorbell_scale];return q; fail:
Signature · 1 line
2.17.2
PATCH 3/5 block/nvme: support larger that 512 bytes sector devices
In reply to Maxim LevitskyCurrently the driver hardcodes the sector size to 512, and doesn't check the underlying device
--- block/nvme.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-)
block/nvme.c +35 -5
@@ -101,8 +101,11 @@ typedef struct {size_t doorbell_scale;bool write_cache_supported;EventNotifier irq_notifier; +uint64_t nsze;/* Namespace size reported by identify command */ int nsid;/* The namespace id to read/write data. */ +size_t blkshift; +uint64_t max_transfer;bool plugged;
@@ -415,8 +418,9 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp)BDRVNVMeState *s = bs->opaque;NvmeIdCtrl *idctrl;NvmeIdNs *idns; +NvmeLBAF *lbaf;uint8_t *resp; -int r; +int r, hwsect_size;uint64_t iova;NvmeCmd cmd = { .opcode =NVME_ADM_CMD_IDENTIFY ,
@@ -463,7 +467,22 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) } s->nsze =le64_to_cpu (idns->nsze); + lbaf = &idns->lbaf[idns->flbas &0x0f ]; + +if (lbaf->ms) { +error_setg (errp,"Namespaces with metadata are not yet supported" ); + goto out; + } + + hwsect_size =1 << lbaf->ds; + +if (hwsect_size <BDRV_SECTOR_BITS || hwsect_size > s->page_size) { +error_setg (errp,"Namespace has unsupported block size (%d)" , + hwsect_size); + goto out; + } + s->blkshift = lbaf->ds; out:qemu_vfio_dma_unmap (s->vfio, resp);qemu_vfree (resp);
@@ -782,8 +801,17 @@ fail:static int64_t nvme_getlength (BlockDriverState *bs) {BDRVNVMeState *s = bs->opaque; +return s->nsze << s->blkshift; +} + -return s->nsze <<BDRV_SECTOR_BITS ; +static int nvme_probe_blocksizes (BlockDriverState *bs,BlockSizes *bsz) +{ +BDRVNVMeState *s = bs->opaque; +assert (s->blkshift >=9 ); + bsz->phys =1 << s->blkshift; + bsz->log =1 << s->blkshift; +return 0 ; }/* Called with s->dma_map_lock */
@@ -914,13 +942,14 @@ static coroutine_fn int nvme_co_prw_aligned(BlockDriverState *bs,BDRVNVMeState *s = bs->opaque;NVMeQueuePair *ioq = s->queues[1 ];NVMeRequest *req; -uint32_t cdw12 = (((bytes >>BDRV_SECTOR_BITS ) -1 ) &0xFFFF ) | + +uint32_t cdw12 = (((bytes >> s->blkshift) -1 ) &0xFFFF ) | (flags &BDRV_REQ_FUA ?1 <<30 :0 );NvmeCmd cmd = { .opcode = is_write ?NVME_CMD_WRITE :NVME_CMD_READ , .nsid =cpu_to_le32 (s->nsid), - .cdw10 =cpu_to_le32 ((offset >>BDRV_SECTOR_BITS ) &0xFFFFFFFF ), - .cdw11 =cpu_to_le32 (((offset >>BDRV_SECTOR_BITS ) >>32 ) &0xFFFFFFFF ), + .cdw10 =cpu_to_le32 ((offset >> s->blkshift) &0xFFFFFFFF ), + .cdw11 =cpu_to_le32 (((offset >> s->blkshift) >>32 ) &0xFFFFFFFF ), .cdw12 =cpu_to_le32 (cdw12), };NVMeCoData data = {
@@ -1151,6 +1180,7 @@ static BlockDriver bdrv_nvme = { .bdrv_file_open = nvme_file_open, .bdrv_close = nvme_close, .bdrv_getlength = nvme_getlength, + .bdrv_probe_blocksizes = nvme_probe_blocksizes, .bdrv_co_preadv = nvme_co_preadv, .bdrv_co_pwritev = nvme_co_pwritev,
Signature · 1 line
2.17.2
PATCH 4/5 block/nvme: add support for write zeros
In reply to Maxim Levitsky--- block/nvme.c | 69 +++++++++++++++++++++++++++++++++++++++++++- block/trace-events | 1 + include/block/nvme.h | 17 ++++++++++- 3 files changed, 85 insertions(+), 2 deletions(-)
block/nvme.c +68 -1
@@ -109,6 +109,8 @@ typedef struct {uint64_t max_transfer;bool plugged; +bool supports_write_zeros; +CoMutex dma_map_lock;CoQueue dma_flush_queue;
@@ -457,6 +459,10 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) s->max_transfer =MIN_NON_ZERO (s->max_transfer, s->page_size /sizeof (uint64_t ) * s->page_size); + + + s->supports_write_zeros = (idctrl->oncs &NVME_ONCS_WRITE_ZEROS ) !=0 ; +memset (resp,0 ,4096 ); cmd.cdw10 =0 ;
@@ -469,6 +475,11 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) s->nsze =le64_to_cpu (idns->nsze); lbaf = &idns->lbaf[idns->flbas &0x0f ]; +if (NVME_ID_NS_DLFEAT_DALLOC_WZEROS (idns->dlfeat) && +NVME_ID_NS_DLFEAT_READ_BEHAVIER (idns->dlfeat) == +NVME_ID_NS_DLFEAT_READ_BEHAVIER_ZEROS ) + bs->supported_write_flags |=BDRV_REQ_MAY_UNMAP ; +if (lbaf->ms) {error_setg (errp,"Namespaces with metadata are not yet supported" ); goto out;
@@ -763,6 +774,8 @@ static int nvme_file_open(BlockDriverState *bs, QDict *options, int flags,int ret;BDRVNVMeState *s = bs->opaque; + bs->supported_write_flags =BDRV_REQ_FUA ; + opts =qemu_opts_create (&runtime_opts,NULL ,0 , &error_abort);qemu_opts_absorb_qdict (opts, options, &error_abort); device =qemu_opt_get (opts,NVME_BLOCK_OPT_DEVICE );
@@ -791,7 +804,6 @@ static int nvme_file_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } } - bs->supported_write_flags =BDRV_REQ_FUA ;return 0 ; fail:nvme_close (bs);
@@ -1080,6 +1092,58 @@ static coroutine_fn int nvme_co_flush(BlockDriverState *bs) } +static coroutine_fn int nvme_co_pwrite_zeroes(BlockDriverState *bs, +int64_t offset,int bytes,BdrvRequestFlags flags) +{ +BDRVNVMeState *s = bs->opaque; +NVMeQueuePair *ioq = s->queues[1 ]; +NVMeRequest *req; + +if (!s->supports_write_zeros) { +return -ENOTSUP ; + } + +uint32_t cdw12 = ((bytes >> s->blkshift) -1 ) &0xFFFF ; + +NvmeCmd cmd = { + .opcode =NVME_CMD_WRITE_ZEROS , + .nsid =cpu_to_le32 (s->nsid), + .cdw10 =cpu_to_le32 ((offset >> s->blkshift) &0xFFFFFFFF ), + .cdw11 =cpu_to_le32 (((offset >> s->blkshift) >>32 ) &0xFFFFFFFF ), + }; + +NVMeCoData data = { + .ctx =bdrv_get_aio_context (bs), + .ret = -EINPROGRESS , + }; + +if (flags &BDRV_REQ_MAY_UNMAP ) { + cdw12 |= (1 <<25 ); + } + +if (flags &BDRV_REQ_FUA ) { + cdw12 |= (1 <<30 ); + } + + cmd.cdw12 =cpu_to_le32 (cdw12); + +trace_nvme_write_zeros (s, offset, bytes, flags); +assert (s->nr_queues >1 ); + req =nvme_get_free_req (ioq); +assert (req); + +nvme_submit_command (s, ioq, req, &cmd, nvme_rw_cb, &data); + + data.co =qemu_coroutine_self (); +while (data.ret == -EINPROGRESS ) { +qemu_coroutine_yield (); + } + +trace_nvme_rw_done (s, true, offset, bytes, data.ret); +return data.ret; +} + +static int nvme_reopen_prepare (BDRVReopenState *reopen_state,BlockReopenQueue *queue,Error **errp) {
@@ -1184,6 +1248,9 @@ static BlockDriver bdrv_nvme = { .bdrv_co_preadv = nvme_co_preadv, .bdrv_co_pwritev = nvme_co_pwritev, + + .bdrv_co_pwrite_zeroes = nvme_co_pwrite_zeroes, + .bdrv_co_flush_to_disk = nvme_co_flush, .bdrv_reopen_prepare = nvme_reopen_prepare,
block/trace-events +1 -0
@@ -144,6 +144,7 @@ nvme_submit_command_raw(int c0, int c1, int c2, int c3, int c4, int c5, int c6, nvme_handle_event(void *s) "s %p" nvme_poll_cb(void *s) "s %p" nvme_prw_aligned(void *s, int is_write, uint64_t offset, uint64_t bytes, int flags, int niov) "s %p is_write %d offset %"PRId64" bytes %"PRId64" flags %d niov %d" +nvme_write_zeros(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p offset %"PRId64" bytes %"PRId64" flags %d" nvme_qiov_unaligned(const void *qiov, int n, void *base, size_t size, int align) "qiov %p n %d base %p size 0x%zx align 0x%x" nvme_prw_buffered(void *s, uint64_t offset, uint64_t bytes, int niov, int is_write) "s %p offset %"PRId64" bytes %"PRId64" niov %d is_write %d" nvme_rw_done(void *s, int is_write, uint64_t offset, uint64_t bytes, int ret) "s %p is_write %d offset %"PRId64" bytes %"PRId64" ret %d"
include/block/nvme.h +16 -1
@@ -653,12 +653,27 @@ typedef struct NvmeIdNs {uint8_t mc;uint8_t dpc;uint8_t dps; -uint8_t res30[98 ]; + +uint8_t nmic; +uint8_t rescap; +uint8_t fpi; +uint8_t dlfeat; + +uint8_t res30[94 ];NvmeLBAF lbaf[16 ];uint8_t res192[192 ];uint8_t vs[3712 ]; } NvmeIdNs; +#define NVME_ID_NS_DLFEAT_GUARD_CRC (dlfeat) ((dlfeat) & 0x10) +#define NVME_ID_NS_DLFEAT_DALLOC_WZEROS (dlfeat) ((dlfeat) & 0x04) + +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER (dlfeat) ((dlfeat) & 0x3) +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_UNDEFINED 0 +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_ZEROS 1 +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_ONES 2 + +#define NVME_ID_NS_NSFEAT_THIN (nsfeat) ((nsfeat & 0x1))#define NVME_ID_NS_FLBAS_EXTENDED (flbas) ((flbas >> 4) & 0x1)#define NVME_ID_NS_FLBAS_INDEX (flbas) ((flbas & 0xf))
Signature · 1 line
2.17.2
Re: [Qemu-devel] [Qemu-block] [PATCH 4/5] block/nvme: add support for write zeros
include/block/nvme.h typedef struct NvmeIdNs { · line 676
Quoted 6 lines · Maxim Levitsky
include/block/nvme.h +6
-0+#define NVME_ID_NS_DLFEAT_READ_BEHAVIER (dlfeat) ((dlfeat) & 0x3) +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_UNDEFINED 0 +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_ZEROS 1 +#define NVME_ID_NS_DLFEAT_READ_BEHAVIER_ONES 2 + +
s/BEHAVIER/BEHAVIOR/
Paolo
PATCH 5/5 block/nvme: add support for discard
In reply to Maxim Levitsky--- block/nvme.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++ block/trace-events | 2 ++ 2 files changed, 83 insertions(+)
block/nvme.c +81 -0
@@ -110,6 +110,7 @@ typedef struct {bool plugged;bool supports_write_zeros; +bool supports_discard;CoMutex dma_map_lock;CoQueue dma_flush_queue;
@@ -462,6 +463,7 @@ static void nvme_identify(BlockDriverState *bs, int namespace, Error **errp) s->supports_write_zeros = (idctrl->oncs &NVME_ONCS_WRITE_ZEROS ) !=0 ; + s->supports_discard = (idctrl->oncs &NVME_ONCS_DSM ) !=0 ;memset (resp,0 ,4096 );
@@ -1144,6 +1146,83 @@ static coroutine_fn int nvme_co_pwrite_zeroes(BlockDriverState *bs, } +static int coroutine_fn nvme_co_pdiscard(BlockDriverState *bs, +int64_t offset,int bytes) +{ +BDRVNVMeState *s = bs->opaque; +NVMeQueuePair *ioq = s->queues[1 ]; +NVMeRequest *req; +NvmeDsmRange *buf; +QEMUIOVector local_qiov; +int r; + +NvmeCmd cmd = { + .opcode =NVME_CMD_DSM , + .nsid =cpu_to_le32 (s->nsid), + .cdw10 =0 ,/*number of ranges - 0 based*/ + .cdw11 =cpu_to_le32 (1 <<2 ),/*deallocate bit*/ + }; + +NVMeCoData data = { + .ctx =bdrv_get_aio_context (bs), + .ret = -EINPROGRESS , + }; + +if (!s->supports_discard) { +return -ENOTSUP ; + } + +assert (s->nr_queues >1 ); + + buf =qemu_try_blockalign0 (bs,4096 ); +if (!buf) { +return -ENOMEM ; + } + + buf->nlb = bytes >> s->blkshift; + buf->slba = offset >> s->blkshift; + buf->cattr =0 ; + +qemu_iovec_init (&local_qiov,1 ); +qemu_iovec_add (&local_qiov, buf,4096 ); + + req =nvme_get_free_req (ioq); +assert (req); + +qemu_co_mutex_lock (&s->dma_map_lock); + r =nvme_cmd_map_qiov (bs, &cmd, req, &local_qiov); +qemu_co_mutex_unlock (&s->dma_map_lock); + +if (r) { + req->busy = false; +return r; + } + +trace_nvme_dsm (s, offset, bytes); + +nvme_submit_command (s, ioq, req, &cmd, nvme_rw_cb, &data); + + data.co =qemu_coroutine_self (); +while (data.ret == -EINPROGRESS ) { +qemu_coroutine_yield (); + } + +qemu_co_mutex_lock (&s->dma_map_lock); + r =nvme_cmd_unmap_qiov (bs, &local_qiov); +qemu_co_mutex_unlock (&s->dma_map_lock); +if (r) { +return r; + } + +trace_nvme_dsm_done (s, offset, bytes, data.ret); + +qemu_iovec_destroy (&local_qiov); +qemu_vfree (buf); +return data.ret; + +} + +static int nvme_reopen_prepare (BDRVReopenState *reopen_state,BlockReopenQueue *queue,Error **errp) {
@@ -1250,6 +1329,8 @@ static BlockDriver bdrv_nvme = { .bdrv_co_pwritev = nvme_co_pwritev, .bdrv_co_pwrite_zeroes = nvme_co_pwrite_zeroes, + .bdrv_co_pdiscard = nvme_co_pdiscard, + .bdrv_co_flush_to_disk = nvme_co_flush, .bdrv_reopen_prepare = nvme_reopen_prepare,
block/trace-events +2 -0
@@ -148,6 +148,8 @@ nvme_write_zeros(void *s, uint64_t offset, uint64_t bytes, int flags) "s %p offs nvme_qiov_unaligned(const void *qiov, int n, void *base, size_t size, int align) "qiov %p n %d base %p size 0x%zx align 0x%x" nvme_prw_buffered(void *s, uint64_t offset, uint64_t bytes, int niov, int is_write) "s %p offset %"PRId64" bytes %"PRId64" niov %d is_write %d" nvme_rw_done(void *s, int is_write, uint64_t offset, uint64_t bytes, int ret) "s %p is_write %d offset %"PRId64" bytes %"PRId64" ret %d" +nvme_dsm(void *s, uint64_t offset, uint64_t bytes) "s %p offset %"PRId64" bytes %"PRId64"" +nvme_dsm_done(void *s, uint64_t offset, uint64_t bytes, int ret) "s %p offset %"PRId64" bytes %"PRId64" ret %d" nvme_dma_map_flush(void *s) "s %p" nvme_free_req_queue_wait(void *q) "q %p" nvme_cmd_map_qiov(void *s, void *cmd, void *req, void *qiov, int entries) "s %p cmd %p req %p qiov %p entries %d"
Signature · 1 line
2.17.2
Re: [Qemu-devel] [Qemu-block] [PATCH 5/5] block/nvme: add support for discard
block/nvme.c static BlockDriver bdrv_nvme = { · line 1335
Quoted 5 lines · Maxim Levitsky
.bdrv_co_pwrite_zeroes =
nvme_co_pwrite_zeroes,block/nvme.c +2
-0+ .bdrv_co_pdiscard = nvme_co_pdiscard, + .bdrv_co_flush_to_disk = nvme_co_flush,
Extra blank line.
Paolo
Quoted 6 lines · Maxim Levitsky
Hi!
These are few assorted fixes and features for the userspace nvme driver.
Quoted 8 lines
Tested that on my laptop with my Samsung X5 thunderbolt drive, which happens to have 4K sectors, support for discard and write zeros.
Also bunch of fixes sitting in my queue from the period when I developed the nvme-mdev driver.
Best regards,
Maxim Levitsky
I only pointed out just two cosmetic changes. Thanks very much!
Paolo
Quoted 13 lines · Paolo Bonzini
Quoted 12 lines · Maxim Levitsky
Hi!
These are few assorted fixes and features for the userspace nvme driver.Tested that on my laptop with my Samsung X5 thunderbolt drive, which happens to have 4K sectors, support for discard and write zeros.
Also bunch of fixes sitting in my queue from the period when I developed the nvme-mdev driver.
Quoted 7 lines
Quoted 2 lines
Best regards,
Maxim LevitskyI only pointed out just two cosmetic changes. Thanks very much!
Paolo
Hi Paolo!
Thank you very much!
I have just resent V2 of the series with the fixes.
Best regards,
Maxim Levitsky
Quoted 26 lines · Maxim Levitsky
Hi!
These are few assorted fixes and features for the userspace nvme driver.Tested that on my laptop with my Samsung X5 thunderbolt drive, which happens to have 4K sectors, support for discard and write zeros.
Also bunch of fixes sitting in my queue from the period when I developed the nvme-mdev driver.
Best regards,
Maxim LevitskyMaxim Levitsky (5):
block/nvme: don't flip CQ phase bits block/nvme: fix doorbell stride
block/nvme: support larger that 512 bytes sector devices block/nvme: add support for write zeros block/nvme: add support for discard
Quoted 5 lines
block/nvme.c | 194 +++++++++++++++++++++++++++++++++++++++++-- block/trace-events | 3 + include/block/nvme.h | 17 +++- 3 files changed, 204 insertions(+), 10 deletions(-)
Ping.
Best regards,
Maxim Levitsky