From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xenproject.org
Cc: Olaf Hering <olaf@aepfle.de>, Juergen Gross <jgross@suse.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [PATCH v20210701 24/40] tools: restore: move mfns array
Date: Thu, 1 Jul 2021 11:56:19 +0200 [thread overview]
Message-ID: <20210701095635.15648-25-olaf@aepfle.de> (raw)
In-Reply-To: <20210701095635.15648-1-olaf@aepfle.de>
Remove allocation from hotpath, move mfns array into preallocated space.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
---
tools/libs/saverestore/common.h | 2 ++
tools/libs/saverestore/restore.c | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/libs/saverestore/common.h b/tools/libs/saverestore/common.h
index d798b79745..9d7efff03d 100644
--- a/tools/libs/saverestore/common.h
+++ b/tools/libs/saverestore/common.h
@@ -239,6 +239,8 @@ struct sr_restore_arrays {
/* handle_page_data */
xen_pfn_t pfns[MAX_BATCH_SIZE];
uint32_t types[MAX_BATCH_SIZE];
+ /* process_page_data */
+ xen_pfn_t mfns[MAX_BATCH_SIZE];
};
struct xc_sr_context
diff --git a/tools/libs/saverestore/restore.c b/tools/libs/saverestore/restore.c
index 8ea125cf73..d7ea52b89e 100644
--- a/tools/libs/saverestore/restore.c
+++ b/tools/libs/saverestore/restore.c
@@ -205,7 +205,7 @@ static int process_page_data(struct xc_sr_context *ctx, unsigned int count,
xen_pfn_t *pfns, uint32_t *types, void *page_data)
{
xc_interface *xch = ctx->xch;
- xen_pfn_t *mfns = malloc(count * sizeof(*mfns));
+ xen_pfn_t *mfns = ctx->restore.m->mfns;
int *map_errs = malloc(count * sizeof(*map_errs));
int rc;
void *mapping = NULL, *guest_page = NULL;
@@ -213,7 +213,7 @@ static int process_page_data(struct xc_sr_context *ctx, unsigned int count,
j, /* j indexes the subset of pfns we decide to map. */
nr_pages = 0;
- if ( !mfns || !map_errs )
+ if ( !map_errs )
{
rc = -1;
ERROR("Failed to allocate %zu bytes to process page data",
@@ -299,7 +299,6 @@ static int process_page_data(struct xc_sr_context *ctx, unsigned int count,
xenforeignmemory_unmap(xch->fmem, mapping, nr_pages);
free(map_errs);
- free(mfns);
return rc;
}
next prev parent reply other threads:[~2021-07-01 10:01 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 9:55 [PATCH v20210701 00/40] leftover from 2020 Olaf Hering
2021-07-01 9:55 ` [PATCH v20210701 01/40] hotplug/Linux: fix starting of xenstored with restarting systemd Olaf Hering
2021-07-01 9:55 ` [PATCH v20210701 02/40] tools: add API to work with sevaral bits at once Olaf Hering
2021-07-01 9:55 ` [PATCH v20210701 03/40] xl: fix description of migrate --debug Olaf Hering
2021-07-01 14:30 ` Anthony PERARD
2021-07-01 14:33 ` Andrew Cooper
2021-07-01 14:40 ` Olaf Hering
2021-07-01 14:41 ` Olaf Hering
2021-07-01 14:49 ` Andrew Cooper
2021-07-01 15:08 ` Olaf Hering
2021-07-01 9:55 ` [PATCH v20210701 04/40] tools: use integer division in convert-legacy-stream Olaf Hering
2021-07-02 15:10 ` Andrew Cooper
2021-07-01 9:56 ` [PATCH v20210701 05/40] tools: handle libxl__physmap_info.name properly " Olaf Hering
2021-07-02 15:35 ` Andrew Cooper
2021-07-01 9:56 ` [PATCH v20210701 06/40] tools: fix Python3.4 TypeError in format string Olaf Hering
2021-07-02 16:19 ` Marek Marczykowski-Górecki
2021-07-02 16:39 ` Andrew Cooper
2021-07-05 8:18 ` Olaf Hering
2021-07-05 9:47 ` Andrew Cooper
2021-07-05 8:07 ` Olaf Hering
2021-07-05 10:10 ` Andrew Cooper
2021-07-01 9:56 ` [PATCH v20210701 07/40] tools: create libxensaverestore Olaf Hering
2021-07-09 9:20 ` Olaf Hering
2021-07-09 9:31 ` Julien Grall
2021-07-09 9:33 ` Olaf Hering
2021-07-09 9:35 ` Julien Grall
2021-07-01 9:56 ` [PATCH v20210701 08/40] MAINTAINERS: add myself as saverestore maintainer Olaf Hering
2021-07-01 10:39 ` Jan Beulich
2021-07-01 11:01 ` Olaf Hering
2021-07-01 11:40 ` Julien Grall
2021-07-01 12:00 ` Olaf Hering
2021-07-01 12:09 ` Julien Grall
2021-07-01 9:56 ` [PATCH v20210701 09/40] tools: add readv_exact to libxenctrl Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 10/40] tools: add xc_is_known_page_type " Olaf Hering
2021-07-02 19:20 ` Andrew Cooper
2021-07-05 8:22 ` Olaf Hering
2021-07-05 9:51 ` Andrew Cooper
2021-07-05 14:24 ` Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 11/40] tools: use sr_is_known_page_type Olaf Hering
2021-07-02 19:27 ` Andrew Cooper
2021-07-05 8:25 ` Olaf Hering
2021-07-05 9:53 ` Andrew Cooper
2021-07-01 9:56 ` [PATCH v20210701 12/40] tools: unify type checking for data pfns in migration stream Olaf Hering
2021-07-02 19:43 ` Andrew Cooper
2021-07-05 8:59 ` Olaf Hering
2021-07-05 9:53 ` Andrew Cooper
2021-07-05 13:10 ` Andrew Cooper
2021-07-05 13:53 ` Olaf Hering
2021-07-05 18:54 ` Andrew Cooper
2021-07-05 19:06 ` Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 13/40] " Olaf Hering
2021-07-02 19:49 ` Andrew Cooper
2021-07-01 9:56 ` [PATCH v20210701 14/40] tools: show migration transfer rate in send_dirty_pages Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 15/40] tools: prepare to allocate saverestore arrays once Olaf Hering
2021-07-05 10:44 ` Andrew Cooper
2021-07-05 11:27 ` Olaf Hering
2021-07-05 13:01 ` Andrew Cooper
2021-07-05 14:11 ` Olaf Hering
2021-07-13 17:50 ` Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 16/40] tools: save: move mfns array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 17/40] tools: save: move types array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 18/40] tools: save: move errors array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 19/40] tools: save: move iov array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 20/40] tools: save: move rec_pfns array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 21/40] tools: save: move guest_data array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 22/40] tools: save: move local_pages array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 23/40] tools: restore: move types array Olaf Hering
2021-07-01 9:56 ` Olaf Hering [this message]
2021-07-01 9:56 ` [PATCH v20210701 25/40] tools: restore: move map_errs array Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 26/40] tools: restore: move mfns array in populate_pfns Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 27/40] tools: restore: move pfns " Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 28/40] tools: restore: split record processing Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 29/40] tools: restore: split handle_page_data Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 30/40] tools: restore: write data directly into guest Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 31/40] tools: recognize LIBXL_API_VERSION for 4.16 Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 32/40] tools: adjust libxl_domain_suspend to receive a struct props Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 33/40] tools: change struct precopy_stats to precopy_stats_t Olaf Hering
2021-07-01 16:45 ` Anthony PERARD
2021-07-01 17:08 ` Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 34/40] tools: add callback to libxl for precopy_policy and precopy_stats_t Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 35/40] tools: add --max_iters to libxl_domain_suspend Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 36/40] tools: add --min_remaining " Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 37/40] tools: add --abort_if_busy " Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 38/40] tools: add API for expandable bitmaps Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 39/40] tools: use xg_sr_bitmap for populated_pfns Olaf Hering
2021-07-01 9:56 ` [PATCH v20210701 40/40] tools/libxc: use superpages during restore of HVM guest Olaf Hering
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701095635.15648-25-olaf@aepfle.de \
--to=olaf@aepfle.de \
--cc=iwj@xenproject.org \
--cc=jgross@suse.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).