diff options
author | Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com> | 2016-11-30 15:29:02 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-12-01 09:58:40 -0500 |
commit | d262920998c891dfd87cf73f823f0ff60e20cdad (patch) | |
tree | 3d612a7f233c8d714d5a23546e767211093fcf7c | |
parent | 6d31e3ba232ea22458b2f36b6d3f2f9f11bf3fa4 (diff) |
nvmet: add support for the Write Zeroes command
Add support for handling write zeroes command on target.
Call into __blkdev_issue_zeroout, which the block layer expands into the
best suitable variant of zeroing the LBAs. Allow write zeroes operation
to deallocate the LBAs when calling __blkdev_issue_zeroout.
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@hgst.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | drivers/nvme/target/admin-cmd.c | 3 | ||||
-rw-r--r-- | drivers/nvme/target/io-cmd.c | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 7ab9c9381b98..383ea10b97cc 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c | |||
@@ -237,7 +237,8 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req) | |||
237 | id->maxcmd = cpu_to_le16(NVMET_MAX_CMD); | 237 | id->maxcmd = cpu_to_le16(NVMET_MAX_CMD); |
238 | 238 | ||
239 | id->nn = cpu_to_le32(ctrl->subsys->max_nsid); | 239 | id->nn = cpu_to_le32(ctrl->subsys->max_nsid); |
240 | id->oncs = cpu_to_le16(NVME_CTRL_ONCS_DSM); | 240 | id->oncs = cpu_to_le16(NVME_CTRL_ONCS_DSM | |
241 | NVME_CTRL_ONCS_WRITE_ZEROES); | ||
241 | 242 | ||
242 | /* XXX: don't report vwc if the underlying device is write through */ | 243 | /* XXX: don't report vwc if the underlying device is write through */ |
243 | id->vwc = NVME_CTRL_VWC_PRESENT; | 244 | id->vwc = NVME_CTRL_VWC_PRESENT; |
diff --git a/drivers/nvme/target/io-cmd.c b/drivers/nvme/target/io-cmd.c index c4dc9ea8ade0..4195115c7e54 100644 --- a/drivers/nvme/target/io-cmd.c +++ b/drivers/nvme/target/io-cmd.c | |||
@@ -170,6 +170,32 @@ static void nvmet_execute_dsm(struct nvmet_req *req) | |||
170 | } | 170 | } |
171 | } | 171 | } |
172 | 172 | ||
173 | static void nvmet_execute_write_zeroes(struct nvmet_req *req) | ||
174 | { | ||
175 | struct nvme_write_zeroes_cmd *write_zeroes = &req->cmd->write_zeroes; | ||
176 | struct bio *bio = NULL; | ||
177 | u16 status = NVME_SC_SUCCESS; | ||
178 | sector_t sector; | ||
179 | sector_t nr_sector; | ||
180 | |||
181 | sector = le64_to_cpu(write_zeroes->slba) << | ||
182 | (req->ns->blksize_shift - 9); | ||
183 | nr_sector = (((sector_t)le32_to_cpu(write_zeroes->length)) << | ||
184 | (req->ns->blksize_shift - 9)) + 1; | ||
185 | |||
186 | if (__blkdev_issue_zeroout(req->ns->bdev, sector, nr_sector, | ||
187 | GFP_KERNEL, &bio, true)) | ||
188 | status = NVME_SC_INTERNAL | NVME_SC_DNR; | ||
189 | |||
190 | if (bio) { | ||
191 | bio->bi_private = req; | ||
192 | bio->bi_end_io = nvmet_bio_done; | ||
193 | submit_bio(bio); | ||
194 | } else { | ||
195 | nvmet_req_complete(req, status); | ||
196 | } | ||
197 | } | ||
198 | |||
173 | int nvmet_parse_io_cmd(struct nvmet_req *req) | 199 | int nvmet_parse_io_cmd(struct nvmet_req *req) |
174 | { | 200 | { |
175 | struct nvme_command *cmd = req->cmd; | 201 | struct nvme_command *cmd = req->cmd; |
@@ -207,6 +233,9 @@ int nvmet_parse_io_cmd(struct nvmet_req *req) | |||
207 | req->data_len = le32_to_cpu(cmd->dsm.nr + 1) * | 233 | req->data_len = le32_to_cpu(cmd->dsm.nr + 1) * |
208 | sizeof(struct nvme_dsm_range); | 234 | sizeof(struct nvme_dsm_range); |
209 | return 0; | 235 | return 0; |
236 | case nvme_cmd_write_zeroes: | ||
237 | req->execute = nvmet_execute_write_zeroes; | ||
238 | return 0; | ||
210 | default: | 239 | default: |
211 | pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode); | 240 | pr_err("nvmet: unhandled cmd %d\n", cmd->common.opcode); |
212 | return NVME_SC_INVALID_OPCODE | NVME_SC_DNR; | 241 | return NVME_SC_INVALID_OPCODE | NVME_SC_DNR; |