Allow write zeroes operations (REQ_OP_WRITE_ZEROES) on the queue
if device supports optinal command bit set for write zeroes.
Add support to setup write zeroes command.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulka...@hgst.com>
---
 drivers/nvme/host/core.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3fcd1f4..d1ebb2c 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -272,6 +272,21 @@ static inline int nvme_setup_discard(struct nvme_ns *ns, 
struct request *req,
        return 0;
 }
 
+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)
 {
@@ -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);
 
@@ -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)
+               queue_flag_set_unlocked(QUEUE_FLAG_WRITE_ZEROES, ns->queue);
+
        blk_mq_unfreeze_queue(disk->queue);
 }
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to