[RHEL7,COMMIT] ploop: Teach dio_sync_io() work with many pages

Submitted by Konstantin Khorenko on Feb. 5, 2020, 9:55 a.m.

Details

Message ID 202002050955.0159tH0q028627@finist-ce7.sw.ru
State New
Series "Possibility to batch page reads and batch on holes_bitmap population"
Headers show

Commit Message

Konstantin Khorenko Feb. 5, 2020, 9:55 a.m.
The commit is pushed to "branch-rh7-3.10.0-1062.7.1.vz7.130.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1062.7.1.vz7.130.15
------>
commit e90103970f20590ee8985f8d6792330237008b53
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Wed Feb 5 12:55:16 2020 +0300

    ploop: Teach dio_sync_io() work with many pages
    
    This will be used to submit bunch of pages in next patches.
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    
    Patchset description:
    Possibility to batch page reads and batch on holes_bitmap population
    
    Submit batch request up to 10 clusters (10Mb, 2560 pages)
    during holes_bitmap population to speed up ploop mount
    of big images.
    
    https://jira.sw.ru/browse/PSBM-101246
    
    Kirill Tkhai (4):
          ploop: Teach dio_sync_io() work with many pages
          ploop: Teach kaio_sync_io() work with many pages
          ploop: Introduce .sync_read_many method
          ploop: Read 10 BAT clusters on holes_bitmap population
---
 drivers/block/ploop/io_direct.c | 42 +++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/block/ploop/io_direct.c b/drivers/block/ploop/io_direct.c
index 1beb4f3292a2e..5b56fc59da07e 100644
--- a/drivers/block/ploop/io_direct.c
+++ b/drivers/block/ploop/io_direct.c
@@ -1149,12 +1149,17 @@  dio_make_io(struct ploop_io *io, int rw, struct page *page,
 	return err;
 }
 
+/*
+ * @off is offset within first page in bytes.
+ * @len is sum length in bytes.
+ */
 static int
-dio_sync_io(struct ploop_io *io, int rw, struct page *page,
-	    unsigned int len, unsigned int off, sector_t sec)
+dio_sync_io(struct ploop_io *io, int rw, struct page **pages,
+	    int nr_pages, unsigned int len,
+	    unsigned int off, sector_t sec)
 {
+	int i, count, nr_bios = 0, ret = 0;
 	struct dio_comp comp;
-	int nr_bios;
 
 	BUG_ON((len & 511) || (off & 511));
 
@@ -1166,36 +1171,53 @@  dio_sync_io(struct ploop_io *io, int rw, struct page *page,
 	init_completion(&comp.comp);
 	comp.error = 0;
 
-	nr_bios = dio_make_io(io, rw, page, len, off, sec,
-			      dio_endio_sync, &comp);
-	if (nr_bios < 0)
-		return nr_bios;
+	for (i = 0; i < nr_pages; i++) {
+		count = PAGE_SIZE - off;
+		if (count > len)
+			count = len;
+
+		ret = dio_make_io(io, rw, pages[i], count, off, sec,
+				      dio_endio_sync, &comp);
+		if (ret < 0)
+			goto sub_and_wait;
+		nr_bios += ret;
+		sec += (count >> 9);
+		len -= count;
+		off = 0;
+	}
+
+	if (WARN_ON_ONCE(len))
+		ret = -EIO;
 
+sub_and_wait:
 	if (atomic_sub_and_test(INT_MAX - nr_bios, &comp.count))
 		complete(&comp.comp);
 
 	wait_for_completion(&comp.comp);
 
-	return comp.error;
+	return ret < 0 ? ret : comp.error;
 }
 
 static int
 dio_sync_read(struct ploop_io * io, struct page * page, unsigned int len,
 	      unsigned int off, sector_t pos)
 {
-	return dio_sync_io(io, READ_SYNC, page, len, off, pos);
+	struct page *pages[] = { page };
+
+	return dio_sync_io(io, READ_SYNC, pages, 1, len, off, pos);
 }
 
 static int
 dio_sync_write(struct ploop_io * io, struct page * page, unsigned int len,
 	       unsigned int off, sector_t sec)
 {
+	struct page *pages[] = { page };
 	int err;
 
 	if (!(io->files.file->f_mode & FMODE_WRITE))
 		return -EBADF;
 
-	err = dio_sync_io(io, WRITE_SYNC, page, len, off, sec);
+	err = dio_sync_io(io, WRITE_SYNC, pages, 1, len, off, sec);
 
 	if (sec < io->plo->track_end)
 		ploop_tracker_notify(io->plo, sec);