Skip to content

Commit

Permalink
nvme: add support for the Write Zeroes command
Browse files Browse the repository at this point in the history
Allow write zeroes operations (REQ_OP_WRITE_ZEROES) on the block
device, if the device supports optional command bit set for write
zeroes. Add support to setup write zeroes command. Set maximum possible
write zeroes sectors in one write zeroes command according to
nvme write zeroes command definition.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
  • Loading branch information
Chaitanya Kulkarni authored and Jens Axboe committed Dec 1, 2016
1 parent 3b7c33b commit 6d31e3b
Showing 1 changed file with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions drivers/nvme/host/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,21 @@ static inline int nvme_setup_discard(struct nvme_ns *ns, struct request *req,
return BLK_MQ_RQ_QUEUE_OK;
}

static inline void nvme_setup_write_zeroes(struct nvme_ns *ns,
struct request *req, struct nvme_command *cmnd)
{
struct nvme_write_zeroes_cmd *write_zeroes = &cmnd->write_zeroes;

memset(cmnd, 0, sizeof(*cmnd));
write_zeroes->opcode = nvme_cmd_write_zeroes;
write_zeroes->nsid = cpu_to_le32(ns->ns_id);
write_zeroes->slba =
cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req)));
write_zeroes->length =
cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1);
write_zeroes->control = 0;
}

static inline void nvme_setup_rw(struct nvme_ns *ns, struct request *req,
struct nvme_command *cmnd)
{
Expand Down Expand Up @@ -325,6 +340,8 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req,
nvme_setup_flush(ns, cmd);
else if (req_op(req) == REQ_OP_DISCARD)
ret = nvme_setup_discard(ns, req, cmd);
else if (req_op(req) == REQ_OP_WRITE_ZEROES)
nvme_setup_write_zeroes(ns, req, cmd);
else
nvme_setup_rw(ns, req, cmd);

Expand Down Expand Up @@ -943,6 +960,10 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id)

if (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM)
nvme_config_discard(ns);
if (ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES)
blk_queue_max_write_zeroes_sectors(ns->queue,
((u32)(USHRT_MAX + 1) * bs) >> 9);

blk_mq_unfreeze_queue(disk->queue);
}

Expand Down

0 comments on commit 6d31e3b

Please sign in to comment.