[RHEL7,COMMIT] ploop: Introduce fastpath for io_kaio

Submitted by Konstantin Khorenko on June 18, 2020, 5:09 p.m.

Details

Message ID 202006181709.05IH9FlE002678@finist-ce7.sw.ru
State New
Series "ploop: Add direct queuing support for io_kaio"
Headers show

Commit Message

Konstantin Khorenko June 18, 2020, 5:09 p.m.
The commit is pushed to "branch-rh7-3.10.0-1127.10.1.vz7.162.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1127.10.1.vz7.162.4
------>
commit 22425c7245194d7a8e7bde8e161dd78eb9b09186
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Thu Jun 18 20:09:14 2020 +0300

    ploop: Introduce fastpath for io_kaio
    
    Really, this just allows ext4-based files to continue
    using fastpath like they used in io_direct. The code
    is mostly copied from io_direct.c
    
    For full fs safity we also require inode::i_dio_count
    incrementing and i_mutex manipulation. This will be
    a subject of another patch: here we just port fastpath
    from io_direct.
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    
    =====================
    Patchset description:
    ploop: Add direct queuing support for io_kaio
    
    This introduces a possibility to dispath incomming request directly
    from ploop_make_request() without waking ploop thread up. We queue
    bio in case of it fits in a single extent (like fastpath for io_direct).
    To get the target bio location, ext4 extent tree is used.
    
    Currently, some sanity checks are missed, so that makes ploop file
    unsafe for touching by side software (like we have in io_direct).
    But this patchset is mostly for a view of testing improvements,
    and one else will go on top of this.
    
    Kirill Tkhai (3):
          ext4: Extract logic from ext4_overwrite_io() to underlining function
          ext4: Introduce ext4_fastmap()
          ploop: Introduce fastpath for io_kaio
---
 drivers/block/ploop/io_kaio.c | 73 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/block/ploop/io_kaio.c b/drivers/block/ploop/io_kaio.c
index 855c1c601eaa7..38b807b9253a5 100644
--- a/drivers/block/ploop/io_kaio.c
+++ b/drivers/block/ploop/io_kaio.c
@@ -1169,6 +1169,78 @@  static int kaio_autodetect(struct ploop_io * io)
 	return 0;
 }
 
+static int
+kaio_fastmap(struct ploop_io *io, struct bio *orig_bio,
+	     struct bio *bio, sector_t isec)
+{
+	struct inode *inode = io->files.inode;
+	struct request_queue * q;
+	sector_t phys_sec;
+	int i, ret;
+
+	if (!inode->i_op->fastmap)
+		return 1;
+
+	if (unlikely((orig_bio->bi_rw & (REQ_FLUSH | REQ_FUA)) &&
+		     test_bit(PLOOP_IO_FSYNC_DELAYED, &io->io_state)))
+		return 1;
+
+	if (orig_bio->bi_size == 0) {
+		bio->bi_vcnt   = 0;
+		bio->bi_sector = 0;
+		bio->bi_size   = 0;
+		bio->bi_idx    = 0;
+
+		bio->bi_rw   = orig_bio->bi_rw;
+		bio->bi_bdev = io->files.bdev;
+		return 0;
+	}
+
+	ret = inode->i_op->fastmap(inode, isec, orig_bio->bi_size, &phys_sec);
+	if (ret < 0) {
+		io->plo->st.fast_neg_noem++;
+		return 1;
+	}
+
+	BUG_ON(bio->bi_max_vecs < orig_bio->bi_vcnt);
+
+	memcpy(bio->bi_io_vec, orig_bio->bi_io_vec,
+	       orig_bio->bi_vcnt * sizeof(struct bio_vec));
+
+	bio->bi_sector = phys_sec;
+
+	bio->bi_bdev = io->files.bdev;
+	bio->bi_rw = orig_bio->bi_rw;
+	bio->bi_vcnt = orig_bio->bi_vcnt;
+	bio->bi_size = orig_bio->bi_size;
+	bio->bi_idx = orig_bio->bi_idx;
+
+	q = bdev_get_queue(bio->bi_bdev);
+
+	if (q->merge_bvec_fn == NULL)
+		return 0;
+
+	bio->bi_size = 0;
+	bio->bi_vcnt = 0;
+
+	for (i = 0; i < orig_bio->bi_vcnt; i++) {
+		struct bio_vec * bv = &bio->bi_io_vec[i];
+		struct bvec_merge_data bm_data = {
+			.bi_bdev = bio->bi_bdev,
+			.bi_sector = bio->bi_sector,
+			.bi_size = bio->bi_size,
+			.bi_rw = bio->bi_rw,
+		};
+		if (q->merge_bvec_fn(q, &bm_data, bv) < bv->bv_len) {
+			io->plo->st.fast_neg_backing++;
+			return 1;
+		}
+		bio->bi_size += bv->bv_len;
+		bio->bi_vcnt++;
+	}
+	return 0;
+}
+
 static struct ploop_io_ops ploop_io_ops_kaio =
 {
 	.id		=	PLOOP_IO_KAIO,
@@ -1204,6 +1276,7 @@  static struct ploop_io_ops ploop_io_ops_kaio =
 	.f_mode		=	generic_f_mode,
 
 	.autodetect     =       kaio_autodetect,
+	.fastmap	=	kaio_fastmap,
 };
 
 static int __init pio_kaio_mod_init(void)