[CRIU] [PATCH v3 3/3] page-read: Implement asynchronous mode of reading pages (v2)
Mike Rapoport
rppt at linux.vnet.ibm.com
Sat Nov 12 23:27:51 PST 2016
From: Pavel Emelyanov <xemul at virtuozzo.com>
Currently each page read request results in pread() call. But
we can do better -- if there's no urgent need in data (which is
likely the case for non-cow pagemaps) we can save where the
date should go to and then read it in in one preadv syscall.
For lazy pages we get an ability to do async read_pages call
that would send the request to server and return w/o data in
the buffer.
The explicit sync() method is added since .close is void and
nobody checks its return code.
v2: Lost limits.h in pagemap.c for IOV_MAX (compilation).
v3: split added code into smaller chunks
Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
Signed-off-by: Mike Rapoport <rppt at linux.vnet.ibm.com>
---
criu/include/pagemap.h | 4 ++
criu/mem.c | 3 +
criu/pagemap.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 159 insertions(+), 6 deletions(-)
diff --git a/criu/include/pagemap.h b/criu/include/pagemap.h
index af0dca0..61d3331 100644
--- a/criu/include/pagemap.h
+++ b/criu/include/pagemap.h
@@ -1,6 +1,7 @@
#ifndef __CR_PAGE_READ_H__
#define __CR_PAGE_READ_H__
+#include "common/list.h"
#include "images/pagemap.pb-c.h"
/*
@@ -53,6 +54,7 @@ struct page_read {
void (*skip_pages)(struct page_read *, unsigned long len);
int (*seek_page)(struct page_read *pr, unsigned long vaddr, bool warn);
void (*reset)(struct page_read *pr);
+ int (*sync)(struct page_read *pr);
/* Private data of reader */
struct cr_img *pmi;
@@ -75,6 +77,8 @@ struct page_read {
PagemapEntry **pmes;
int nr_pmes;
int curr_pme;
+
+ struct list_head async;
};
/* flags for ->read_pages */
diff --git a/criu/mem.c b/criu/mem.c
index 86d2016..2258605 100644
--- a/criu/mem.c
+++ b/criu/mem.c
@@ -834,6 +834,9 @@ static int restore_priv_vma_content(struct pstree_item *t)
}
err_read:
+ if (pr.sync(&pr))
+ return -1;
+
pr.close(&pr);
if (ret < 0)
return ret;
diff --git a/criu/pagemap.c b/criu/pagemap.c
index ea5ae19..009180b 100644
--- a/criu/pagemap.c
+++ b/criu/pagemap.c
@@ -2,6 +2,8 @@
#include <stdio.h>
#include <unistd.h>
#include <linux/falloc.h>
+#include <sys/uio.h>
+#include <limits.h>
#include "types.h"
#include "image.h"
@@ -20,6 +22,18 @@
#define MAX_BUNCH_SIZE 256
+/*
+ * One "job" for the preadv() syscall in pagemap.c
+ */
+struct page_read_iov {
+ off_t from; /* offset in pi file where to start reading from */
+ off_t end; /* the end of the read == sum to.iov_len -s */
+ struct iovec *to; /* destination iovs */
+ unsigned int nr; /* their number */
+
+ struct list_head l;
+};
+
void pagemap2iovec(PagemapEntry *pe, struct iovec *iov)
{
iov->iov_base = decode_pointer(pe->vaddr);
@@ -256,16 +270,23 @@ static int read_parent_page(struct page_read *pr, unsigned long vaddr,
}
static int read_local_page(struct page_read *pr, unsigned long vaddr,
- unsigned long len, void *buf, unsigned flags)
+ unsigned long len, void *buf)
{
int fd = img_raw_fd(pr->pi);
int ret;
+ /*
+ * Flush any pending async requests if any not to break the
+ * linear reading from the pages.img file.
+ */
+ if (pr->sync(pr))
+ return -1;
+
if (pr->pi_off_cur != pr->pi_off_next)
pr->pi_off_cur = lseek(fd, pr->pi_off_next, SEEK_SET);
pr_debug("\tpr%u Read page from self %lx/%"PRIx64"\n", pr->id, pr->cvaddr, pr->pi_off_cur);
- ret = read(fd, buf, len);
+ ret = pread(fd, buf, len, pr->pi_off_cur);
if (ret != len) {
pr_perror("Can't read mapping page %d", ret);
return -1;
@@ -273,15 +294,107 @@ static int read_local_page(struct page_read *pr, unsigned long vaddr,
if (opts.auto_dedup) {
ret = punch_hole(pr, pr->pi_off_cur, len, false);
- if (ret == -1) {
+ if (ret == -1)
return -1;
- }
}
+ return 0;
+}
+
+static int enqueue_async_iov(struct page_read *pr, unsigned long len, void *buf)
+{
+ struct page_read_iov *pr_iov;
+ struct iovec *iov;
+
+ pr_iov = xzalloc(sizeof(*pr_iov));
+ if (!pr_iov)
+ return -1;
+
+ pr_iov->from = pr->pi_off_next;
+ pr_iov->end = pr->pi_off_next + len;
+
+ iov = xzalloc(sizeof(*iov));
+ if (!iov) {
+ xfree(pr_iov);
+ return -1;
+ }
+
+ iov->iov_base = buf;
+ iov->iov_len = len;
+
+ pr_iov->to = iov;
+ pr_iov->nr = 1;
+
+ list_add_tail(&pr_iov->l, &pr->async);
+
+ return 0;
+}
+
+static int enqueue_async_page(struct page_read *pr, unsigned long vaddr,
+ unsigned long len, void *buf)
+{
+ struct page_read_iov *cur_async = NULL;
+ struct iovec *iov;
+
+ if (!list_empty(&pr->async))
+ cur_async = list_entry(pr->async.prev, struct page_read_iov, l);
+
+ /*
+ * We don't have any async requests or we have new read
+ * request that should happen at pos _after_ some hole from
+ * the previous one.
+ * Start the new preadv request here.
+ */
+ if (!cur_async || pr->pi_off_next != cur_async->end)
+ return enqueue_async_iov(pr, len, buf);
+
+ /*
+ * This read is pure continuation of the previous one. Let's
+ * just add another IOV (or extend one of the existing).
+ */
+ iov = &cur_async->to[cur_async->nr - 1];
+ if (iov->iov_base + iov->iov_len == buf) {
+ /* Extendable */
+ iov->iov_len += len;
+ } else {
+ /* Need one more target iovec */
+ unsigned int n_iovs = cur_async->nr + 1;
+
+ if (n_iovs >= IOV_MAX)
+ return enqueue_async_iov(pr, len, buf);
+
+ iov = xrealloc(cur_async->to, n_iovs * sizeof(*iov));
+ if (!iov)
+ return -1;
+
+ cur_async->to = iov;
+
+ iov += cur_async->nr;
+ iov->iov_base = buf;
+ iov->iov_len = len;
+
+ cur_async->nr = n_iovs;
+ }
+
+ cur_async->end += len;
+
+ return 0;
+}
+
+static int maybe_read_page(struct page_read *pr, unsigned long vaddr,
+ unsigned long len, void *buf, unsigned flags)
+{
+ int ret;
+
+ if (flags & PR_ASYNC)
+ ret = enqueue_async_page(pr, vaddr, len, buf);
+ else
+ ret = read_local_page(pr, vaddr, len, buf);
+
pr->pi_off_cur += len;
pr->pi_off_next += len;
- return 0;
+ return ret;
}
static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr,
@@ -299,7 +412,7 @@ static int read_pagemap_page(struct page_read *pr, unsigned long vaddr, int nr,
/* zero mappings should be skipped by get_pagemap */
BUG();
} else {
- if (read_local_page(pr, vaddr, len, buf, flags) < 0)
+ if (maybe_read_page(pr, vaddr, len, buf, flags) < 0)
return -1;
}
@@ -318,10 +431,41 @@ static void free_pagemaps(struct page_read *pr)
xfree(pr->pmes);
}
+static int process_async_reads(struct page_read *pr)
+{
+ int fd, ret = 0;
+ struct page_read_iov *piov, *n;
+
+ fd = img_raw_fd(pr->pi);
+ list_for_each_entry_safe(piov, n, &pr->async, l) {
+ int ret;
+
+ ret = preadv(fd, piov->to, piov->nr, piov->from);
+ if (ret != piov->end - piov->from) {
+ pr_err("Can't read async pr bytes\n");
+ return -1;
+ }
+
+ if (opts.auto_dedup && punch_hole(pr, piov->from, ret, false))
+ return -1;
+
+ list_del(&piov->l);
+ xfree(piov->to);
+ xfree(piov);
+ }
+
+ if (pr->parent)
+ ret = process_async_reads(pr->parent);
+
+ return ret;
+}
+
static void close_page_read(struct page_read *pr)
{
int ret;
+ BUG_ON(!list_empty(&pr->async));
+
if (pr->bunch.iov_len > 0) {
ret = punch_hole(pr, 0, 0, true);
if (ret == -1)
@@ -487,6 +631,7 @@ int open_page_read_at(int dfd, int pid, struct page_read *pr, int pr_flags)
return -1;
}
+ INIT_LIST_HEAD(&pr->async);
pr->pe = NULL;
pr->parent = NULL;
pr->cvaddr = 0;
@@ -527,6 +672,7 @@ int open_page_read_at(int dfd, int pid, struct page_read *pr, int pr_flags)
pr->skip_pages = skip_pagemap_pages;
pr->seek_page = seek_pagemap_page;
pr->reset = reset_pagemap;
+ pr->sync = process_async_reads;
pr->id = ids++;
pr_debug("Opened page read %u (parent %u)\n",
--
1.9.1
More information about the CRIU
mailing list