Skip to content

Commit

Permalink
nvmet: add copy command support for bdev and file ns
Browse files Browse the repository at this point in the history
Add support for handling target command on target.
For bdev-ns we call into blkdev_issue_copy, which the block layer
completes by a offloaded copy request to backend bdev or by emulating the
request.

For file-ns we call vfs_copy_file_range to service our request.

Currently target always shows copy capability by setting
NVME_CTRL_ONCS_COPY in controller ONCS.

Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Anuj Gupta <anuj20.g@samsung.com>
  • Loading branch information
nj-shetty authored and intel-lab-lkp committed Mar 29, 2023
1 parent 11efed3 commit f846a8a
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 2 deletions.
9 changes: 7 additions & 2 deletions drivers/nvme/target/admin-cmd.c
Expand Up @@ -433,8 +433,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
id->nn = cpu_to_le32(NVMET_MAX_NAMESPACES);
id->mnan = cpu_to_le32(NVMET_MAX_NAMESPACES);
id->oncs = cpu_to_le16(NVME_CTRL_ONCS_DSM |
NVME_CTRL_ONCS_WRITE_ZEROES);

NVME_CTRL_ONCS_WRITE_ZEROES | NVME_CTRL_ONCS_COPY);
/* XXX: don't report vwc if the underlying device is write through */
id->vwc = NVME_CTRL_VWC_PRESENT;

Expand Down Expand Up @@ -536,6 +535,12 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)

if (req->ns->bdev)
nvmet_bdev_set_limits(req->ns->bdev, id);
else {
id->msrc = (u8)to0based(BIO_MAX_VECS - 1);
id->mssrl = cpu_to_le16(BIO_MAX_VECS <<
(PAGE_SHIFT - SECTOR_SHIFT));
id->mcl = cpu_to_le32(le16_to_cpu(id->mssrl));
}

/*
* We just provide a single LBA format that matches what the
Expand Down
58 changes: 58 additions & 0 deletions drivers/nvme/target/io-cmd-bdev.c
Expand Up @@ -46,6 +46,19 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id)
id->npda = id->npdg;
/* NOWS = Namespace Optimal Write Size */
id->nows = to0based(bdev_io_opt(bdev) / bdev_logical_block_size(bdev));

/*Copy limits*/
if (bdev_max_copy_sectors(bdev)) {
id->msrc = id->msrc;
id->mssrl = cpu_to_le16((bdev_max_copy_sectors(bdev) <<
SECTOR_SHIFT) / bdev_logical_block_size(bdev));
id->mcl = cpu_to_le32(id->mssrl);
} else {
id->msrc = (u8)to0based(BIO_MAX_VECS - 1);
id->mssrl = cpu_to_le16((BIO_MAX_VECS << PAGE_SHIFT) /
bdev_logical_block_size(bdev));
id->mcl = cpu_to_le32(id->mssrl);
}
}

void nvmet_bdev_ns_disable(struct nvmet_ns *ns)
Expand Down Expand Up @@ -184,6 +197,19 @@ static void nvmet_bio_done(struct bio *bio)
nvmet_req_bio_put(req, bio);
}

static void nvmet_bdev_copy_end_io(void *private, int comp_len)
{
struct nvmet_req *req = (struct nvmet_req *)private;

if (comp_len == req->copy_len) {
req->cqe->result.u32 = cpu_to_le32(1);
nvmet_req_complete(req, errno_to_nvme_status(req, 0));
} else {
req->cqe->result.u32 = cpu_to_le32(0);
nvmet_req_complete(req, blk_to_nvme_status(req, BLK_STS_IOERR));
}
}

#ifdef CONFIG_BLK_DEV_INTEGRITY
static int nvmet_bdev_alloc_bip(struct nvmet_req *req, struct bio *bio,
struct sg_mapping_iter *miter)
Expand Down Expand Up @@ -450,6 +476,34 @@ static void nvmet_bdev_execute_write_zeroes(struct nvmet_req *req)
}
}

/* At present we handle only one range entry */
static void nvmet_bdev_execute_copy(struct nvmet_req *req)
{
struct nvme_copy_range range;
struct nvme_command *cmnd = req->cmd;
int ret;


ret = nvmet_copy_from_sgl(req, 0, &range, sizeof(range));
if (ret)
goto out;

ret = blkdev_issue_copy(req->ns->bdev,
le64_to_cpu(cmnd->copy.sdlba) << req->ns->blksize_shift,
req->ns->bdev,
le64_to_cpu(range.slba) << req->ns->blksize_shift,
(le16_to_cpu(range.nlb) + 1) << req->ns->blksize_shift,
nvmet_bdev_copy_end_io, (void *)req, GFP_KERNEL);
if (ret) {
req->cqe->result.u32 = cpu_to_le32(0);
nvmet_req_complete(req, blk_to_nvme_status(req, BLK_STS_IOERR));
}

return;
out:
nvmet_req_complete(req, errno_to_nvme_status(req, ret));
}

u16 nvmet_bdev_parse_io_cmd(struct nvmet_req *req)
{
switch (req->cmd->common.opcode) {
Expand All @@ -468,6 +522,10 @@ u16 nvmet_bdev_parse_io_cmd(struct nvmet_req *req)
case nvme_cmd_write_zeroes:
req->execute = nvmet_bdev_execute_write_zeroes;
return 0;
case nvme_cmd_copy:
req->execute = nvmet_bdev_execute_copy;
return 0;

default:
return nvmet_report_invalid_opcode(req);
}
Expand Down
52 changes: 52 additions & 0 deletions drivers/nvme/target/io-cmd-file.c
Expand Up @@ -322,6 +322,49 @@ static void nvmet_file_dsm_work(struct work_struct *w)
}
}

static void nvmet_file_copy_work(struct work_struct *w)
{
struct nvmet_req *req = container_of(w, struct nvmet_req, f.work);
int nr_range;
loff_t pos;
struct nvme_command *cmnd = req->cmd;
int ret = 0, len = 0, src, id;

nr_range = cmnd->copy.nr_range + 1;
pos = le64_to_cpu(req->cmd->copy.sdlba) << req->ns->blksize_shift;
if (unlikely(pos + req->transfer_len > req->ns->size)) {
nvmet_req_complete(req, errno_to_nvme_status(req, -ENOSPC));
return;
}

for (id = 0 ; id < nr_range; id++) {
struct nvme_copy_range range;

ret = nvmet_copy_from_sgl(req, id * sizeof(range), &range,
sizeof(range));
if (ret)
goto out;

len = (le16_to_cpu(range.nlb) + 1) << (req->ns->blksize_shift);
src = (le64_to_cpu(range.slba) << (req->ns->blksize_shift));
ret = vfs_copy_file_range(req->ns->file, src, req->ns->file,
pos, len, 0);
out:
if (ret != len) {
pos += ret;
req->cqe->result.u32 = cpu_to_le32(id);
nvmet_req_complete(req, ret < 0 ?
errno_to_nvme_status(req, ret) :
errno_to_nvme_status(req, -EIO));
return;

} else
pos += len;
}

nvmet_req_complete(req, 0);

}
static void nvmet_file_execute_dsm(struct nvmet_req *req)
{
if (!nvmet_check_data_len_lte(req, nvmet_dsm_len(req)))
Expand All @@ -330,6 +373,12 @@ static void nvmet_file_execute_dsm(struct nvmet_req *req)
queue_work(nvmet_wq, &req->f.work);
}

static void nvmet_file_execute_copy(struct nvmet_req *req)
{
INIT_WORK(&req->f.work, nvmet_file_copy_work);
queue_work(nvmet_wq, &req->f.work);
}

static void nvmet_file_write_zeroes_work(struct work_struct *w)
{
struct nvmet_req *req = container_of(w, struct nvmet_req, f.work);
Expand Down Expand Up @@ -376,6 +425,9 @@ u16 nvmet_file_parse_io_cmd(struct nvmet_req *req)
case nvme_cmd_write_zeroes:
req->execute = nvmet_file_execute_write_zeroes;
return 0;
case nvme_cmd_copy:
req->execute = nvmet_file_execute_copy;
return 0;
default:
return nvmet_report_invalid_opcode(req);
}
Expand Down
6 changes: 6 additions & 0 deletions drivers/nvme/target/loop.c
Expand Up @@ -146,6 +146,12 @@ static blk_status_t nvme_loop_queue_rq(struct blk_mq_hw_ctx *hctx,
return ret;

nvme_start_request(req);
if (unlikely((req->cmd_flags & REQ_COPY) &&
(req_op(req) == REQ_OP_READ))) {
blk_mq_set_request_complete(req);
blk_mq_end_request(req, BLK_STS_OK);
return BLK_STS_OK;
}
iod->cmd.common.flags |= NVME_CMD_SGL_METABUF;
iod->req.port = queue->ctrl->port;
if (!nvmet_req_init(&iod->req, &queue->nvme_cq,
Expand Down
1 change: 1 addition & 0 deletions drivers/nvme/target/nvmet.h
Expand Up @@ -393,6 +393,7 @@ struct nvmet_req {
struct device *p2p_client;
u16 error_loc;
u64 error_slba;
size_t copy_len;
};

#define NVMET_MAX_MPOOL_BVEC 16
Expand Down

0 comments on commit f846a8a

Please sign in to comment.