xenguest optimisations
v7 cover xenguest optimisations
Reduce some number of parts passed to writev. Avoid possible allocation sending data with writev. Reduce number of allocations sending memory state.
Implement and use new Xen and Linux kernel ABI to copy foreign memory. This new ABI allows to replace theexpensive map/copy/unmap sequence with a single call.
Changes since v1:
- add commit to cache up to 4 pages in hypercall;
- add other 2 commits reducing chunks passed to write/writev.
Changes since v2:
- update patches commit prefixes;
- add other 2 optisations.
Changes since v3:
- address some comments;
- add patches for foreign copy optimisation.
Changes since v4:
- added Reviewed-by;
- improved commit messages;
- other minor fixes, see individual commits.
Changes since v5:
- avoids potential buffer underflow if nr_pages is 0 calling cache_alloc;
- do not overwrite errno if xenforeignmemory_map fails;
- lot of changes to "implement new foreign copy hypercall", see specific commit.
Changes since v6:
- removed merged patch;
- keep only optimization commits for now;
- improve comments;
- merged "fill directly iov structure collapsing them" and moved it;
- split "allocate various migration arrays just once";
- add a commit for memory checks using Valgrind.
Edwin Török (3):
libs/call: cache up to 4 pages in hypercall bounce buffers libs/guest: move batch_pfns into a separate structure libs/guest: allocate various migration arrays just once
Frediano Ziglio (3):
libs/ctrl: Allow writev_exact() to change the iov array libs/guest: fill directly iov structure collapsing them libs/guest: use Valgrind to detect various buffer overflows
tools/libs/call/buffer.c | 34 ++++++---- tools/libs/call/core.c | 3 +- tools/libs/call/private.h | 8 ++- tools/libs/ctrl/xc_private.c | 65 +++++-------------- tools/libs/ctrl/xc_private.h | 11 +++- tools/libs/guest/xg_sr_common.h | 19 +++++- tools/libs/guest/xg_sr_save.c | 107 +++++++++++++++----------------- 7 files changed, 124 insertions(+), 123 deletions(-)
Signature · 1 line
2.43.0
PATCH v7 1/6 libs/call: cache up to 4 pages in hypercall bounce buffers
From: Edwin Török <[email protected]>
During migration there are a lot of mmap/munmap calls, because xc_get_pfn_type_batch() exceeds the default hypercall bounce buffer cache size, and needs to allocate every time it is called.
munmap() is slow, especially in a PV Dom0 (takes an emulation fault), so is best avoided.
Eventually it'd be good if the memory pool from xmalloc_tlsf.c was reused here, but for now make it handle the commonly encountered sizes (so far up to 4 pages).
---
Changes since v2:
- change prefix in subject.
Changes since v4:
- fix off-by-one bug.
Changes since v5:
- avoids potential buffer underflow if nr_pages is 0 calling cache_alloc.
Changes since v6:
- align changes made to cache_alloc to cache_free.
--- tools/libs/call/buffer.c | 34 +++++++++++++++++++++++----------- tools/libs/call/core.c | 3 ++- tools/libs/call/private.h | 8 +++++--- 3 files changed, 30 insertions(+), 15 deletions(-)
tools/libs/call/buffer.c +23 -11
@@ -49,6 +49,9 @@ static void *cache_alloc(xencall_handle *xcall, size_t nr_pages) {void *p =NULL ; +if ( nr_pages ==0 ) +return NULL ; +cache_lock (xcall); xcall->buffer_total_allocations++;
@@ -56,13 +59,13 @@ static void *cache_alloc(xencall_handle *xcall, size_t nr_pages)if ( xcall->buffer_current_allocations > xcall->buffer_maximum_allocations ) xcall->buffer_maximum_allocations = xcall->buffer_current_allocations; -if ( nr_pages >1 ) +if ( nr_pages >ARRAY_SIZE (xcall->buffer_cache) ) { xcall->buffer_cache_toobig++; } -else if ( xcall->buffer_cache_nr >0 ) +else if ( xcall->buffer_cache_nr[nr_pages-1 ] >0 ) { - p = xcall->buffer_cache[--xcall->buffer_cache_nr]; + p = xcall->buffer_cache[nr_pages-1 ][--xcall->buffer_cache_nr[nr_pages-1 ]]; xcall->buffer_cache_hits++; }else
@@ -79,15 +82,18 @@ static int cache_free(xencall_handle *xcall, void *p, size_t nr_pages) {int rc =0 ; +if ( nr_pages ==0 ) +return 0 ; +cache_lock (xcall); xcall->buffer_total_releases++; xcall->buffer_current_allocations--; -if ( nr_pages ==1 && - xcall->buffer_cache_nr <BUFFER_CACHE_SIZE ) +if ( nr_pages && nr_pages <=ARRAY_SIZE (xcall->buffer_cache) && + xcall->buffer_cache_nr[nr_pages-1 ] <BUFFER_CACHE_SIZE ) { - xcall->buffer_cache[xcall->buffer_cache_nr++] = p; + xcall->buffer_cache[nr_pages-1 ][xcall->buffer_cache_nr[nr_pages-1 ]++] = p; rc =1 ; }
@@ -108,17 +114,23 @@ void buffer_release_cache(xencall_handle *xcall)DBGPRINTF ("current allocations:%d maximum allocations:%d" , xcall->buffer_current_allocations, xcall->buffer_maximum_allocations); -DBGPRINTF ("cache current size:%d" , - xcall->buffer_cache_nr); +for (unsigned i =0 ; i <ARRAY_SIZE (xcall->buffer_cache_nr); ++i ) + { +DBGPRINTF ("cache current size[%u pages]:%d" , i+1 , + xcall->buffer_cache_nr[i]); + }DBGPRINTF ("cache hits:%d misses:%d toobig:%d" , xcall->buffer_cache_hits, xcall->buffer_cache_misses, xcall->buffer_cache_toobig); -while ( xcall->buffer_cache_nr >0 ) +for (unsigned i =0 ; i <ARRAY_SIZE (xcall->buffer_cache_nr); ++i ) { - p = xcall->buffer_cache[--xcall->buffer_cache_nr]; -osdep_free_pages (xcall, p,1 ); +while ( xcall->buffer_cache_nr[i] >0 ) + { + p = xcall->buffer_cache[i][--xcall->buffer_cache_nr[i]]; +osdep_free_pages (xcall, p, i +1 ); + } }cache_unlock (xcall);
tools/libs/call/core.c +2 -1
@@ -14,6 +14,7 @@*/ #include <stdlib.h> +#include <string.h> #include "private.h"
@@ -44,7 +45,7 @@ xencall_handle *xencall_open(xentoollog_logger *logger, unsigned open_flags)xentoolcore__register_active_handle (&xcall->tc_ah); xcall->flags = open_flags; - xcall->buffer_cache_nr =0 ; +memset (xcall->buffer_cache_nr,0 ,sizeof (xcall->buffer_cache_nr)); xcall->buffer_total_allocations =0 ; xcall->buffer_total_releases =0 ;
tools/libs/call/private.h +5 -3
@@ -31,13 +31,15 @@ struct xencall_handle {Xentoolcore__Active_Handle tc_ah;/* -* A simple cache of unused, single page, hypercall buffers +* A simple cache of unused, small, hypercall buffers +* buffer_cache[i]'s size is (i+1) pages * * Protected by a global lock. */ #define BUFFER_CACHE_SIZE 4 -int buffer_cache_nr; -void *buffer_cache[BUFFER_CACHE_SIZE ]; +#define BUFFER_CACHE_NRPAGES 4 +int buffer_cache_nr[BUFFER_CACHE_NRPAGES ]; +void *buffer_cache[BUFFER_CACHE_NRPAGES ][BUFFER_CACHE_SIZE ];/* * Hypercall buffer statistics. All protected by the global
Signature · 1 line
2.43.0
PATCH v7 2/6 libs/ctrl: Allow writev_exact() to change the iov array
In reply to Frediano ZiglioAvoid having to allocate and copy the array if a partial write happens.
---
Changes since v2:
- change prefix in subject.
Changes since v6:
- use a single loop to skip IOVs;
- add a comment to the function.
--- tools/libs/ctrl/xc_private.c | 65 +++++++++--------------------------- tools/libs/ctrl/xc_private.h | 3 +- 2 files changed, 17 insertions(+), 51 deletions(-)
tools/libs/ctrl/xc_private.c +15 -50
@@ -635,7 +635,7 @@ int write_exact(int fd, const void *data, size_t size)/* * MiniOS's libc doesn't know about writev(). Implement it as multiple write()s. */ -int writev_exact (int fd,const struct iovec *iov,int iovcnt) +int writev_exact (int fd,struct iovec *iov,int iovcnt) {int rc, i;
@@ -649,70 +649,35 @@ int writev_exact(int fd, const struct iovec *iov, int iovcnt)return 0 ; }#else -int writev_exact (int fd,const struct iovec *iov,int iovcnt) +int writev_exact (int fd,struct iovec *iov,int iovcnt) { -struct iovec *local_iov =NULL ; -int rc =0 , iov_idx =0 , saved_errno =0 ; -ssize_t len; +int rc =0 , iov_idx =0 ; +ssize_t len =0 ;while ( iov_idx < iovcnt ) { -/* -* Skip over iov[] entries with 0 length. -* -* This is needed to cover the case where we took a partial write and -* all remaining vectors are of 0 length. In such a case, the results -* from writev() are indistinguishable from EOF. -*/ -while ( iov[iov_idx].iov_len ==0 ) -if ( ++iov_idx == iovcnt ) - goto out; +/* Check iov[] to see whether we had a partial or complete write. */ +if ( len >= iov[iov_idx].iov_len ) + { + len -= iov[iov_idx++].iov_len; +continue ; + } + +/* Partial write of iov[iov_idx]. */ + iov[iov_idx].iov_base += len; + iov[iov_idx].iov_len -= len; len =writev (fd, &iov[iov_idx],min (iovcnt - iov_idx,IOV_MAX )); - saved_errno = errno;if ( (len ==-1 ) && (errno ==EINTR ) )continue ;if ( len <=0 ) { rc =-1 ; - goto out; - } - -/* Check iov[] to see whether we had a partial or complete write. */ -while ( (len >0 ) && (iov_idx < iovcnt) ) - { -if ( len >= iov[iov_idx].iov_len ) - len -= iov[iov_idx++].iov_len; -else - { -/* Partial write of iov[iov_idx]. Copy iov so we can adjust -* element iov_idx and resubmit the rest. */ -if ( !local_iov ) - { - local_iov =malloc (iovcnt *sizeof (*iov)); -if ( !local_iov ) - { - saved_errno =ENOMEM ; - rc =-1 ; - goto out; - } - - iov =memcpy (local_iov, iov, iovcnt *sizeof (*iov)); - } - - local_iov[iov_idx].iov_base += len; - local_iov[iov_idx].iov_len -= len; -break ; - } +break ; } } - saved_errno =0 ; - - out: -free (local_iov); - errno = saved_errno;return rc; }#endif
tools/libs/ctrl/xc_private.h +2 -1
@@ -383,7 +383,8 @@ int xc_flush_mmu_updates(xc_interface *xch, struct xc_mmu *mmu);/* Return 0 on success; -1 on error setting errno. */ int read_exact (int fd,void *data,size_t size);/* EOF => -1, errno=0 */ int write_exact (int fd,const void *data,size_t size); -int writev_exact (int fd,const struct iovec *iov,int iovcnt); +/* May alter @iov to cope with partial writes. */ +int writev_exact (int fd,struct iovec *iov,int iovcnt);int xc_ffs8 (uint8_t x);int xc_ffs16 (uint16_t x);
Signature · 1 line
2.43.0
Re: [PATCH v7 2/6] libs/ctrl: Allow writev_exact() to change the iov array
Quoted 32 lines · Frediano Ziglio
tools/libs/ctrl/xc_private.c +10
-14@@ -649,70 +649,35 @@ int writev_exact(int fd, const struct iovec *iov, int iovcnt) return 0; }#else -int writev_exact (int fd,const struct iovec *iov,int iovcnt) +int writev_exact (int fd,struct iovec *iov,int iovcnt) { -struct iovec *local_iov =NULL ; -int rc =0 , iov_idx =0 , saved_errno =0 ; -ssize_t len; +int rc =0 , iov_idx =0 ; +ssize_t len =0 ;while ( iov_idx < iovcnt ) { -/* -* Skip over iov[] entries with 0 length. -* -* This is needed to cover the case where we took a partial write and -* all remaining vectors are of 0 length. In such a case, the results -* from writev() are indistinguishable from EOF. -*/ -while ( iov[iov_idx].iov_len ==0 ) -if ( ++iov_idx == iovcnt ) - goto out; +/* Check iov[] to see whether we had a partial or complete write. */ +if ( len >= iov[iov_idx].iov_len ) + { + len -= iov[iov_idx++].iov_len; +continue ; + } +
tools/libs/ctrl/xc_private.c int writev_exact(int fd, const struct iovec *iov, int iovcnt) · line 674
Quoted 10 lines
tools/libs/ctrl/xc_private.c +3
-1+/* Partial write of iov[iov_idx]. */ + iov[iov_idx].iov_base += len; + iov[iov_idx].iov_len -= len; len =writev (fd, &iov[iov_idx],min (iovcnt - iov_idx,IOV_MAX )); - saved_errno = errno;if ( (len ==-1 ) && (errno ==EINTR ) )continue ;if ( len <=0 )
You can return -1 here, and ...
Quoted 31 lines
tools/libs/ctrl/xc_private.c +0
-29{ rc =-1 ; - goto out; - } - -/* Check iov[] to see whether we had a partial or complete write. */ -while ( (len >0 ) && (iov_idx < iovcnt) ) - { -if ( len >= iov[iov_idx].iov_len ) - len -= iov[iov_idx++].iov_len; -else - { -/* Partial write of iov[iov_idx]. Copy iov so we can adjust -* element iov_idx and resubmit the rest. */ -if ( !local_iov ) - { - local_iov =malloc (iovcnt *sizeof (*iov)); -if ( !local_iov ) - { - saved_errno =ENOMEM ; - rc =-1 ; - goto out; - } - - iov =memcpy (local_iov, iov, iovcnt *sizeof (*iov)); - } - - local_iov[iov_idx].iov_base += len; - local_iov[iov_idx].iov_len -= len; -break ; - }
tools/libs/ctrl/xc_private.c int writev_exact(int fd, const struct iovec *iov, int iovcnt) · line 681
Quoted 10 lines
tools/libs/ctrl/xc_private.c +1
-5+break ; } } - saved_errno =0 ; - - out: -free (local_iov); - errno = saved_errno;return rc;
... return 0 here in order to drop the rc variable.
I can adjust on commit. Reviewed-by: Andrew Cooper <[email protected]>
~Andrew
PATCH v7 3/6 libs/guest: fill directly iov structure collapsing them
In reply to Frediano ZiglioInstead of storing page pointers into an array and lately adding to iov vector add the pages directly to iov to avoid "guest_data" array.
Each page was sent using a different iovec item. This potentially exceed Linux maximum (1024).
Coalesce adjacent IO vector elements to attempt to reduce the number of overall IO vectors for each operation.
Also some implementation (MiniOS) emulate writev with multiple write calls.
---
Changes since v2:
- change prefix in subject.
Changes since v4:
- added Reviewed-by;
- improved commit message;
- minor style fix.
Changes since v6:
- merged 2 commits;
- reduced diff.
--- tools/libs/guest/xg_sr_save.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)
tools/libs/guest/xg_sr_save.c +11 -22
@@ -88,7 +88,6 @@ static int write_batch(struct xc_sr_context *ctx)xc_interface *xch = ctx->xch;xen_pfn_t *mfns =NULL , *types =NULL ;void *guest_mapping =NULL ; -void **guest_data =NULL ;void **local_pages =NULL ;int *errors =NULL , rc =-1 ;unsigned int i, p, nr_pages =0 , nr_pages_mapped =0 ;
@@ -118,8 +117,6 @@ static int write_batch(struct xc_sr_context *ctx) types =malloc (nr_pfns *sizeof (*types));/* Errors from attempting to map the gfns. */ errors =malloc (nr_pfns *sizeof (*errors)); -/* Pointers to page data to send. Mapped gfns or local allocations. */ - guest_data =calloc (nr_pfns,sizeof (*guest_data));/* Pointers to locally allocated pages. Need freeing. */ local_pages =calloc (nr_pfns,sizeof (*local_pages));/* iovec[] for writev(). */
@@ -127,7 +124,7 @@ static int write_batch(struct xc_sr_context *ctx)/* page_data record PFNs list */ rec_pfns =malloc (nr_pfns *sizeof (*rec_pfns)); -if ( !mfns || !types || !errors || !guest_data || !local_pages || !iov || !rec_pfns ) +if ( !mfns || !types || !errors || !local_pages || !iov || !rec_pfns ) {ERROR ("Unable to allocate arrays for a batch of %u pages" , nr_pfns);
@@ -218,8 +215,17 @@ static int write_batch(struct xc_sr_context *ctx)else goto err; } +else if ( iov[iovcnt -1 ].iov_base + iov[iovcnt -1 ].iov_len != + page ) + { + iov[iovcnt].iov_base = page; + iov[iovcnt].iov_len =PAGE_SIZE ; + iovcnt++; + }else - guest_data[i] = page; + { + iov[iovcnt -1 ].iov_len +=PAGE_SIZE ; + } rc =-1 ; ++p;
@@ -231,28 +237,12 @@ static int write_batch(struct xc_sr_context *ctx)for ( i =0 ; i < nr_pfns; ++i ) rec_pfns[i] = ((uint64_t )(types[i]) <<32 ) | ctx->save.batch_pfns[i]; -if ( nr_pages ) - { -for ( i =0 ; i < nr_pfns; ++i ) - { -if ( guest_data[i] ) - { - iov[iovcnt].iov_base = guest_data[i]; - iov[iovcnt].iov_len =PAGE_SIZE ; - iovcnt++; - --nr_pages; - } - } - } -if (writev_exact (ctx->fd, iov, iovcnt) ) {PERROR ("Failed to write page data to stream" ); goto err; } -/* Sanity check we have sent all the pages we expected to. */ -assert (nr_pages ==0 ); rc = ctx->save.nr_batch_pfns =0 ; err:
@@ -263,7 +253,6 @@ static int write_batch(struct xc_sr_context *ctx)free (rec_pfns);free (iov);free (local_pages); -free (guest_data);free (errors);free (types);free (mfns);
Signature · 1 line
2.43.0
PATCH v7 4/6 libs/guest: move batch_pfns into a separate structure
In reply to Frediano ZiglioFrom: Edwin Török <[email protected]>
Prepare for following change.
---
Changes since v6:
- split from "libs/guest: allocate various migration arrays just once".
--- tools/libs/guest/xg_sr_common.h | 5 ++++- tools/libs/guest/xg_sr_save.c | 31 +++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-)
tools/libs/guest/xg_sr_common.h +4 -1
@@ -239,11 +239,14 @@ struct xc_sr_contextstruct precopy_stats stats; -xen_pfn_t *batch_pfns;unsigned int nr_batch_pfns;unsigned long *deferred_pages;unsigned long nr_deferred_pages;xc_hypercall_buffer_t dirty_bitmap_hbuf; +struct xc_sr_context_save_buffers + { +xen_pfn_t batch_pfns[MAX_BATCH_SIZE ]; + } *buffers; } save; struct /* Restore data. */
tools/libs/guest/xg_sr_save.c +17 -14
@@ -75,7 +75,7 @@ static int write_checkpoint_record(struct xc_sr_context *ctx)/* * Writes a batch of memory as a PAGE_DATA record into the stream. The batch -* is constructed in ctx->save.batch_pfns. +* is constructed in ctx->save.buffers->batch_pfns. * * This function: * - gets the types for each pfn in the batch.
@@ -95,6 +95,7 @@ static int write_batch(struct xc_sr_context *ctx)void *page, *orig_page;uint64_t *rec_pfns =NULL ;struct iovec *iov =NULL ;int iovcnt =0 ; +xen_pfn_t *batch_pfns;struct {struct xc_sr_rhdr rec;struct xc_sr_rec_page_data_header page_data;
@@ -110,6 +111,10 @@ static int write_batch(struct xc_sr_context *ctx) };assert (nr_pfns !=0 ); +assert (nr_pfns <=MAX_BATCH_SIZE ); +assert (ctx->save.buffers); + + batch_pfns = ctx->save.buffers->batch_pfns;/* Mfns of the batch pfns. */ mfns =malloc (nr_pfns *sizeof (*mfns));
@@ -141,13 +146,12 @@ static int write_batch(struct xc_sr_context *ctx)for ( i =0 ; i < nr_pfns; ++i ) { - types[i] = mfns[i] = ctx->save.ops.pfn_to_gfn (ctx, - ctx->save.batch_pfns[i]); + types[i] = mfns[i] = ctx->save.ops.pfn_to_gfn (ctx, batch_pfns[i]);/* Likely a ballooned page. */ if ( mfns[i] ==INVALID_MFN ) { -set_bit (ctx->save.batch_pfns[i], ctx->save.deferred_pages); +set_bit (batch_pfns[i], ctx->save.deferred_pages); ++ctx->save.nr_deferred_pages; } }
@@ -193,7 +197,7 @@ static int write_batch(struct xc_sr_context *ctx)if ( errors[p] ) {ERROR ("Mapping of pfn %#" PRIpfn" (mfn %#" PRIpfn") failed %d" , - ctx->save.batch_pfns[i], mfns[p], errors[p]); + batch_pfns[i], mfns[p], errors[p]); goto err; }
@@ -207,7 +211,7 @@ static int write_batch(struct xc_sr_context *ctx) {if ( rc ==-1 && errno ==EAGAIN ) { -set_bit (ctx->save.batch_pfns[i], ctx->save.deferred_pages); +set_bit (batch_pfns[i], ctx->save.deferred_pages); ++ctx->save.nr_deferred_pages; types[i] =XEN_DOMCTL_PFINFO_XTAB ; --nr_pages;
@@ -235,7 +239,7 @@ static int write_batch(struct xc_sr_context *ctx) hdrs.rec.length += nr_pages *PAGE_SIZE ;for ( i =0 ; i < nr_pfns; ++i ) - rec_pfns[i] = ((uint64_t )(types[i]) <<32 ) | ctx->save.batch_pfns[i]; + rec_pfns[i] = ((uint64_t )(types[i]) <<32 ) | batch_pfns[i];if (writev_exact (ctx->fd, iov, iovcnt) ) {
@@ -274,9 +278,9 @@ static int flush_batch(struct xc_sr_context *ctx)if ( !rc ) { -VALGRIND_MAKE_MEM_UNDEFINED (ctx->save.batch_pfns, +VALGRIND_MAKE_MEM_UNDEFINED (ctx->save.buffers->batch_pfns,MAX_BATCH_SIZE * -sizeof (*ctx->save.batch_pfns)); +sizeof (*ctx->save.buffers->batch_pfns)); }return rc;
@@ -293,7 +297,7 @@ static int add_to_batch(struct xc_sr_context *ctx, xen_pfn_t pfn) rc =flush_batch (ctx);if ( rc ==0 ) - ctx->save.batch_pfns[ctx->save.nr_batch_pfns++] = pfn; + ctx->save.buffers->batch_pfns[ctx->save.nr_batch_pfns++] = pfn;return rc; }
@@ -784,11 +788,10 @@ static int setup(struct xc_sr_context *ctx) dirty_bitmap =xc_hypercall_buffer_alloc_pages ( xch, dirty_bitmap,NRPAGES (bitmap_size (ctx->save.p2m_size))); - ctx->save.batch_pfns =malloc (MAX_BATCH_SIZE * -sizeof (*ctx->save.batch_pfns)); ctx->save.deferred_pages =bitmap_alloc (ctx->save.p2m_size); + ctx->save.buffers =calloc (1 ,sizeof (*ctx->save.buffers)); -if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) +if ( !ctx->save.buffers || !dirty_bitmap || !ctx->save.deferred_pages ) {ERROR ("Unable to allocate memory for dirty bitmaps, batch pfns and" " deferred pages" );
@@ -819,7 +822,7 @@ static void cleanup(struct xc_sr_context *ctx)xc_hypercall_buffer_free_pages (xch, dirty_bitmap,NRPAGES (bitmap_size (ctx->save.p2m_size)));free (ctx->save.deferred_pages); -free (ctx->save.batch_pfns); +free (ctx->save.buffers); }/*
Signature · 1 line
2.43.0
Re: [PATCH v7 4/6] libs/guest: move batch_pfns into a separate structure
Quoted 48 lines · Frediano Ziglio
From: Edwin Török <[email protected]>
Prepare for following change.
Signed-off-by Frediano Ziglio <[email protected]>---
Changes since v6:
- split from "libs/guest: allocate various migration arrays just once".--- tools/libs/guest/xg_sr_common.h | 5 ++++- tools/libs/guest/xg_sr_save.c | 31 +++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-)tools/libs/guest/xg_sr_common.h +4
-1@@ -239,11 +239,14 @@ struct xc_sr_contextstruct precopy_stats stats; -xen_pfn_t *batch_pfns;unsigned int nr_batch_pfns;unsigned long *deferred_pages;unsigned long nr_deferred_pages;xc_hypercall_buffer_t dirty_bitmap_hbuf; +struct xc_sr_context_save_buffers + { +xen_pfn_t batch_pfns[MAX_BATCH_SIZE ]; + } *buffers; } save; struct /* Restore data. */tools/libs/guest/xg_sr_save.c +1
-1@@ -75,7 +75,7 @@ static int write_checkpoint_record(struct xc_sr_context *ctx)/* * Writes a batch of memory as a PAGE_DATA record into the stream. The batch -* is constructed in ctx->save.batch_pfns. +* is constructed in ctx->save.buffers->batch_pfns. * * This function: * - gets the types for each pfn in the batch.
tools/libs/guest/xg_sr_save.c static int write_batch(struct xc_sr_context *ctx) · line 98
Quoted 4 lines
tools/libs/guest/xg_sr_save.c +1
-0@@ -95,6 +95,7 @@ static int write_batch(struct xc_sr_context *ctx)void *page, *orig_page;uint64_t *rec_pfns =NULL ;struct iovec *iov =NULL ;int iovcnt =0 ; +xen_pfn_t *batch_pfns;
What about a direct
xen_pfn_t *const batch_pfns = ctx->save.buffers->batch_pfns;
here ?
tools/libs/guest/xg_sr_save.c static int write_batch(struct xc_sr_context *ctx)
Quoted 15 lines
tools/libs/guest/xg_sr_save.c +4
-0struct {struct xc_sr_rhdr rec;struct xc_sr_rec_page_data_header page_data;@@ -110,6 +111,10 @@ static int write_batch(struct xc_sr_context *ctx) };assert (nr_pfns !=0 ); +assert (nr_pfns <=MAX_BATCH_SIZE ); +assert (ctx->save.buffers); + + batch_pfns = ctx->save.buffers->batch_pfns;/* Mfns of the batch pfns. */ mfns =malloc (nr_pfns *sizeof (*mfns));@@ -141,13 +146,12 @@ static int write_batch(struct xc_sr_context *ctx)
...
Frediano
PATCH v7 5/6 libs/guest: allocate various migration arrays just once
In reply to Frediano ZiglioFrom: Edwin Török <[email protected]>
Allocate these array just once at the start of migration, using the maximum batch size, and free them at the end.
---
Changes since v2:
- change prefix in subject.
Changes since v3:
- fix comment style
Changes since v4:
- change order of fields in structure.
Changes since v6:
- split preparation commit.
--- tools/libs/guest/xg_sr_common.h | 6 ++++++ tools/libs/guest/xg_sr_save.c | 33 ++++++++++++--------------------- 2 files changed, 18 insertions(+), 21 deletions(-)
tools/libs/guest/xg_sr_common.h +6 -0
@@ -246,6 +246,12 @@ struct xc_sr_contextstruct xc_sr_context_save_buffers {xen_pfn_t batch_pfns[MAX_BATCH_SIZE ]; +xen_pfn_t mfns[MAX_BATCH_SIZE ]; +xen_pfn_t types[MAX_BATCH_SIZE ]; +void *local_pages[MAX_BATCH_SIZE ]; +struct iovec iov[MAX_BATCH_SIZE +2 ];/* Headers + data. */ +uint64_t rec_pfns[MAX_BATCH_SIZE ]; +int errors[MAX_BATCH_SIZE ]; } *buffers; } save;
tools/libs/guest/xg_sr_save.c +12 -21
@@ -117,24 +117,18 @@ static int write_batch(struct xc_sr_context *ctx) batch_pfns = ctx->save.buffers->batch_pfns;/* Mfns of the batch pfns. */ - mfns =malloc (nr_pfns *sizeof (*mfns)); + mfns = ctx->save.buffers->mfns;/* Types of the batch pfns. */ - types =malloc (nr_pfns *sizeof (*types)); + types = ctx->save.buffers->types;/* Errors from attempting to map the gfns. */ - errors =malloc (nr_pfns *sizeof (*errors)); + errors = ctx->save.buffers->errors;/* Pointers to locally allocated pages. Need freeing. */ - local_pages =calloc (nr_pfns,sizeof (*local_pages)); + local_pages = ctx->save.buffers->local_pages; +memset (local_pages,0 ,sizeof (*local_pages) * nr_pfns);/* iovec[] for writev(). */ - iov =malloc ((nr_pfns +2 ) *sizeof (*iov)); + iov = ctx->save.buffers->iov;/* page_data record PFNs list */ - rec_pfns =malloc (nr_pfns *sizeof (*rec_pfns)); - -if ( !mfns || !types || !errors || !local_pages || !iov || !rec_pfns ) - { -ERROR ("Unable to allocate arrays for a batch of %u pages" , - nr_pfns); - goto err; - } + rec_pfns = ctx->save.buffers->rec_pfns; iov[0 ].iov_base = &hdrs; iov[0 ].iov_len =sizeof (hdrs);
@@ -253,13 +247,10 @@ static int write_batch(struct xc_sr_context *ctx)if ( guest_mapping )xenforeignmemory_unmap (xch->fmem, guest_mapping, nr_pages_mapped);for ( i =0 ; local_pages && i < nr_pfns; ++i ) + {free (local_pages[i]); -free (rec_pfns); -free (iov); -free (local_pages); -free (errors); -free (types); -free (mfns); + local_pages[i] =NULL ; + }return rc; }
@@ -793,8 +784,8 @@ static int setup(struct xc_sr_context *ctx)if ( !ctx->save.buffers || !dirty_bitmap || !ctx->save.deferred_pages ) { -ERROR ("Unable to allocate memory for dirty bitmaps, batch pfns and" -" deferred pages" ); +ERROR ("Unable to allocate memory for dirty bitmaps, deferred pages" +" and various batch buffers" ); rc =-1 ; errno =ENOMEM ; goto err;
Signature · 1 line
2.43.0
PATCH v7 6/6 libs/guest: use Valgrind to detect various buffer overflows
In reply to Frediano ZiglioPreviously this was done as buffers were allocated separately.
--- tools/libs/ctrl/xc_private.h | 8 ++++++++ tools/libs/guest/xg_sr_common.h | 8 ++++++++ tools/libs/guest/xg_sr_save.c | 12 ++++++++++++ 3 files changed, 28 insertions(+)
tools/libs/ctrl/xc_private.h +8 -0
@@ -45,8 +45,16 @@#if defined(HAVE_VALGRIND_MEMCHECK_H ) && !defined(NDEBUG ) && !defined(__MINIOS__)/* Compile in Valgrind client requests? */ #include <valgrind/memcheck.h> +#define MEM_NOACCESS_BUFFER (name, size) uint8_t name[size]; +#define MEM_NOACCESS_INIT (field) \ + VALGRIND_MAKE_MEM_NOACCESS(field, sizeof(field)) +#define MEM_UNDEFINED_INIT (field) \ + VALGRIND_MAKE_MEM_UNDEFINED(field, sizeof(field))#else #define VALGRIND_MAKE_MEM_UNDEFINED (addr, len)/* addr, len */ +#define MEM_NOACCESS_BUFFER (name, size) +#define MEM_NOACCESS_INIT (field) do {} while(0) +#define MEM_UNDEFINED_INIT (field) do {} while(0)#endif #if defined(__MINIOS__)
tools/libs/guest/xg_sr_common.h +8 -0
@@ -245,13 +245,21 @@ struct xc_sr_contextxc_hypercall_buffer_t dirty_bitmap_hbuf;struct xc_sr_context_save_buffers { + MEM_NOACCESS_BUFFER(na0, 16);xen_pfn_t batch_pfns[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na1, 16);xen_pfn_t mfns[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na2, 16);xen_pfn_t types[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na3, 16);void *local_pages[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na4, 16);struct iovec iov[MAX_BATCH_SIZE +2 ];/* Headers + data. */ + MEM_NOACCESS_BUFFER(na5, 16);uint64_t rec_pfns[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na6, 16);int errors[MAX_BATCH_SIZE ]; + MEM_NOACCESS_BUFFER(na7, 16); } *buffers; } save;
tools/libs/guest/xg_sr_save.c +12 -0
@@ -117,8 +117,10 @@ static int write_batch(struct xc_sr_context *ctx) batch_pfns = ctx->save.buffers->batch_pfns;/* Mfns of the batch pfns. */ +MEM_UNDEFINED_INIT (ctx->save.buffers->mfns); mfns = ctx->save.buffers->mfns;/* Types of the batch pfns. */ +MEM_UNDEFINED_INIT (ctx->save.buffers->types); types = ctx->save.buffers->types;/* Errors from attempting to map the gfns. */ errors = ctx->save.buffers->errors;
@@ -126,8 +128,10 @@ static int write_batch(struct xc_sr_context *ctx) local_pages = ctx->save.buffers->local_pages;memset (local_pages,0 ,sizeof (*local_pages) * nr_pfns);/* iovec[] for writev(). */ +MEM_UNDEFINED_INIT (ctx->save.buffers->iov); iov = ctx->save.buffers->iov;/* page_data record PFNs list */ +MEM_UNDEFINED_INIT (ctx->save.buffers->rec_pfns); rec_pfns = ctx->save.buffers->rec_pfns; iov[0 ].iov_base = &hdrs;
@@ -790,6 +794,14 @@ static int setup(struct xc_sr_context *ctx) errno =ENOMEM ; goto err; } +MEM_NOACCESS_INIT (ctx->save.buffers->na0); +MEM_NOACCESS_INIT (ctx->save.buffers->na1); +MEM_NOACCESS_INIT (ctx->save.buffers->na2); +MEM_NOACCESS_INIT (ctx->save.buffers->na3); +MEM_NOACCESS_INIT (ctx->save.buffers->na4); +MEM_NOACCESS_INIT (ctx->save.buffers->na5); +MEM_NOACCESS_INIT (ctx->save.buffers->na6); +MEM_NOACCESS_INIT (ctx->save.buffers->na7); rc =0 ;
Signature · 1 line
2.43.0