nvmet: don't split large I/Os unconditionally
Subsystems (2)
Sagi Grimberg
maintainerPATCH 2/2 nvmet: don't split large I/Os unconditionally
If we know that the I/O size exceeds our inline bio vec, no point using it and split the rest to begin with.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/target/io-cmd-bdev.c | 12 ++++++++++-- drivers/nvme/target/nvmet.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/nvme/target/io-cmd-bdev.c +10 -2
@@ -58,7 +58,7 @@ static void nvmet_bio_done(struct bio *bio)static void nvmet_bdev_execute_rw (struct nvmet_req *req) {int sg_cnt = req->sg_cnt; -struct bio *bio = &req->b.inline_bio; +struct bio *bio;struct bio_list list;struct scatterlist *sg;sector_t sector;
@@ -82,7 +82,14 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req) sector =le64_to_cpu (req->cmd->rw.slba); sector <<= (req->ns->blksize_shift -9 ); -bio_init (bio, req->inline_bvec,ARRAY_SIZE (req->inline_bvec)); +if (req->data_len <=NVMET_MAX_INLINE_DATA_LEN ) { + bio = &req->b.inline_bio; +bio_init (bio, req->inline_bvec,ARRAY_SIZE (req->inline_bvec)); + }else { + bio =bio_alloc (GFP_KERNEL ,min (sg_cnt,BIO_MAX_PAGES )); +if (unlikely (!bio)) + goto out; + }bio_set_dev (bio, req->ns->bdev); bio->bi_iter.bi_sector = sector; bio->bi_private = req;
@@ -121,6 +128,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)while ((bio =bio_list_pop (&list)))if (bio != &req->b.inline_bio)bio_put (bio); +out:nvmet_req_complete (req,NVME_SC_INTERNAL ); }
drivers/nvme/target/nvmet.h +1 -0
@@ -273,6 +273,7 @@ struct nvmet_fabrics_ops { };#define NVMET_MAX_INLINE_BIOVEC 8 +#define NVMET_MAX_INLINE_DATA_LEN NVMET_MAX_INLINE_BIOVEC * PAGE_SIZEstruct nvmet_req {struct nvme_command *cmd;
Signature · 1 line
2.17.1
Christoph Hellwig
maintainerPATCH 2/2 nvmet: don't split large I/Os unconditionally
Quoted 2 lines · Sagi Grimberg
If we know that the I/O size exceeds our inline bio vec, no point using it and split the rest to begin with.
In theory there would be a point if the I/O size did exactly fit the inline bio + a maximum size allocated bio. Probably not worth optimizing for, but maybe worth an updated changelog.