[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v20210601 20/38] tools/guest: restore: move mfns array


  • To: xen-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Olaf Hering <olaf@xxxxxxxxx>
  • Date: Tue, 1 Jun 2021 18:11:00 +0200
  • Arc-authentication-results: i=1; strato.com; dkim=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1622563894; s=strato-dkim-0002; d=strato.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=z4yh0601yitxQDA4KYzEdbnjeAj2W9nnPiW8js19Yoc=; b=tRhf971bAx8V7lliMKUwnmZnrWq10x1IewtiX9BIroszIi5zpyi9whPdppL+JfkjWh 48m1XweFg1qyXLA++7UWS6rAierRXtXnKrY/0X4250XBEqxd9y13pBuViuPEqz9wc9lv 1GOQh10dVz9lVYEZsR2K2dJA1hU6XoquqN9Pkexf3heRUUqE4rOFndz10ooMqqwKvmXR Yq4Nsc8l0Ne2n6e49UJktQOK+b4qCX6j4IFEBjGdrLJZiI34aw1P2hZHSe7h/FGE+sAl GHGTFexX7BV9by0Xn5jz71OeoBzZbW0BEZSS7mz0xLL9nDgHGNJS631r1ue1yZdQG4Wb 4Hrw==
  • Arc-seal: i=1; a=rsa-sha256; t=1622563894; cv=none; d=strato.com; s=strato-dkim-0002; b=ClxwDl0qOSDjoIzNwbzCmJ4ADXloUwbcJ7wlHM4iM61l6JqODFCZZpqcu0/GlNFtlG 5oA2jSfzWBMYdDDzvhd3lnaUbTHRVkTFASjvrgWoXjHxyBLaXavo/dcy3Cl1KKGpfRwa 6t240vWP1WoA+vo0e/qyvLEoJCqXumv1FMIpvN7F6F/xFhtb4lS0FM/Q2dK+bwxgH44M HG4dud/1aqI7dpg0Lp5tO4CYltpEK0jqmgTkRZ3ErK8vc8LRIwB60FsntryBmVe6sRvK DwT9ikobnc+pdygCRehXCwJU2aWA0mpVU+tady/FNC63CQYB2hvwic+r8nmyhQ9xEgz6 9nKg==
  • Authentication-results: strato.com; dkim=none
  • Cc: Olaf Hering <olaf@xxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Tue, 01 Jun 2021 16:12:00 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

Remove allocation from hotpath, move mfns array into preallocated space.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---
 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 96cd60e0d6..c7291bb5ca 100644
--- a/tools/libs/saverestore/common.h
+++ b/tools/libs/saverestore/common.h
@@ -239,6 +239,8 @@ struct xc_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 815a2d5a12..aadf322428 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;
 }



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.