nvme: fix write zeroes offset and count
PATCH 1/1 nvme: fix write zeroes offset and count
The implementation used blocks units rather than the expected bytes.
Fixes c03e7ef12a9 ("nvme: Implement Write Zeroes")
Reported-by Ming Lei <[email protected]>
Signed-off-by Keith Busch <[email protected]>
--- hw/block/nvme.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/block/nvme.c +3 -3
@@ -324,8 +324,8 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd,const uint8_t data_shift = ns->id_ns.lbaf[lba_index].ds;uint64_t slba =le64_to_cpu (rw->slba);uint32_t nlb =le16_to_cpu (rw->nlb) +1 ; -uint64_t aio_slba = slba << (data_shift -BDRV_SECTOR_BITS ); -uint32_t aio_nlb = nlb << (data_shift -BDRV_SECTOR_BITS ); +uint64_t offset = slba << data_shift; +uint32_t count = nlb << data_shift;if (unlikely (slba + nlb > ns->id_ns.nsze)) {trace_nvme_err_invalid_lba_range (slba, nlb, ns->id_ns.nsze);
@@ -335,7 +335,7 @@ static uint16_t nvme_write_zeros(NvmeCtrl *n, NvmeNamespace *ns, NvmeCmd *cmd, req->has_sg = false;block_acct_start (blk_get_stats (n->conf.blk), &req->acct,0 ,BLOCK_ACCT_WRITE ); - req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, aio_slba, aio_nlb, + req->aiocb =blk_aio_pwrite_zeroes (n->conf.blk, offset, count,BDRV_REQ_MAY_UNMAP , nvme_rw_cb, req);return NVME_NO_COMPLETE ; }
Signature · 1 line
2.14.4
PATCH 1/1 nvme: fix write zeroes offset and count
Quoted 1 line · Keith Busch
The implementation used blocks units rather than the expected bytes.
Thank,
looks good:
Reviewed-by Christoph Hellwig <hch at lst.de>
And sorry for causing this mess.
Kevin Wolf
AppliedPATCH 1/1 nvme: fix write zeroes offset and count
In reply to Keith BuschAm 11.03.2019 um 16:11 hat Keith Busch geschrieben:
Quoted 5 lines
The implementation used blocks units rather than the expected bytes.
Fixes c03e7ef12a9 ("nvme: Implement Write Zeroes")Reported-by Ming Lei <ming.lei at redhat.com>Signed-off-by Keith Busch <keith.busch at intel.com>
Thanks, applied to the block branch.
Kevin