migration/postcopy: map tmp and large zero page in setup stage
cover migration/postcopy: map tmp and large zero page in setup stage
Currently we map these page when we want to use it, while this may be a little late.
To make the code consistency, these two patches move the map into postcopy_ram_incoming_setup.
Wei Yang (2):
migration/postcopy: allocate tmp_page in setup stage migration/postcopy: map large zero page in
postcopy_ram_incoming_setup()
migration/postcopy-ram.c | 74 +++++++++++++++------------------------- migration/postcopy-ram.h | 7 ---- migration/ram.c | 2 +- 3 files changed, 28 insertions(+), 55 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 migration/postcopy: allocate tmp_page in setup stage
During migration, a tmp page is allocated so that we could place a whole host page during postcopy.
Currently the page is allocated during load stage, this is a little bit late. And more important, if we failed to allocate it, the error is not checked properly. Even it is NULL, we would still use it.
This patch moves the allocation to setup stage and if failed error message would be printed and caller would notice it.
--- migration/postcopy-ram.c | 40 ++++++++++------------------------------ migration/postcopy-ram.h | 7 ------- migration/ram.c | 2 +- 3 files changed, 11 insertions(+), 38 deletions(-)
migration/postcopy-ram.c +10 -30
@@ -1132,6 +1132,16 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } + mis->postcopy_tmp_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE ,MAP_PRIVATE | +MAP_ANONYMOUS ,-1 ,0 ); +if (mis->postcopy_tmp_page ==MAP_FAILED ) { + mis->postcopy_tmp_page =NULL ; +error_report ("%s: Failed to map postcopy_tmp_page %s" , + __func__,strerror (errno)); +return -1 ; + } +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults.
@@ -1258,30 +1268,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, } } -/* -* Returns a target page of memory that can be mapped at a later point in time -* using postcopy_place_page -* The same address is used repeatedly, postcopy_place_page just takes the -* backing page away. -* Returns: Pointer to allocated page -* -*/ -void *postcopy_get_tmp_page (MigrationIncomingState *mis) -{ -if (!mis->postcopy_tmp_page) { - mis->postcopy_tmp_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE ,MAP_PRIVATE | -MAP_ANONYMOUS ,-1 ,0 ); -if (mis->postcopy_tmp_page ==MAP_FAILED ) { - mis->postcopy_tmp_page =NULL ; -error_report ("%s: %s" , __func__,strerror (errno)); -return NULL ; - } - } - -return mis->postcopy_tmp_page; -} -#else /* No target OS support, stubs just fail */ void fill_destination_postcopy_migration_info (MigrationInfo *info)
@@ -1339,12 +1325,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,return -1 ; } -void *postcopy_get_tmp_page (MigrationIncomingState *mis) -{ -assert (0 ); -return NULL ; -} -int postcopy_wake_shared (struct PostCopyFD *pcfd,uint64_t client_addr,RAMBlock *rb)
migration/postcopy-ram.h +0 -7
@@ -100,13 +100,6 @@ typedef enum {POSTCOPY_INCOMING_END } PostcopyState; -/* -* Allocate a page of memory that can be mapped at a later point in time -* using postcopy_place_page -* Returns: Pointer to allocated page -*/ -void *postcopy_get_tmp_page (MigrationIncomingState *mis); -PostcopyState postcopy_state_get (void );/* Set the state and return the old state */ PostcopyState postcopy_state_set(PostcopyState new_state,
migration/ram.c +1 -1
@@ -4048,7 +4048,7 @@ static int ram_load_postcopy(QEMUFile *f)bool matches_target_page_size = false;MigrationIncomingState *mis =migration_incoming_get_current ();/* Temporary page that is later 'placed' */ -void *postcopy_host_page =postcopy_get_tmp_page (mis); +void *postcopy_host_page = mis->postcopy_tmp_page;void *last_host =NULL ;bool all_zero = false;
Signature · 1 line
2.17.1
Re: [PATCH 1/2] migration/postcopy: allocate tmp_page in setup stage
Quoted 6 lines · * Wei Yang ([email protected]) wrote:
During migration, a tmp page is allocated so that we could place a whole host page during postcopy.
Currently the page is allocated during load stage, this is a little bit late. And more important, if we failed to allocate it, the error is not checked properly. Even it is NULL, we would still use it.
Oops, yes.
Quoted 110 lines
This patch moves the allocation to setup stage and if failed error message would be printed and caller would notice it.
Signed-off-by Wei Yang <[email protected]>--- migration/postcopy-ram.c | 40 ++++++++++------------------------------ migration/postcopy-ram.h | 7 ------- migration/ram.c | 2 +- 3 files changed, 11 insertions(+), 38 deletions(-)migration/postcopy-ram.c +10
-30@@ -1132,6 +1132,16 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } + mis->postcopy_tmp_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE ,MAP_PRIVATE | +MAP_ANONYMOUS ,-1 ,0 ); +if (mis->postcopy_tmp_page ==MAP_FAILED ) { + mis->postcopy_tmp_page =NULL ; +error_report ("%s: Failed to map postcopy_tmp_page %s" , + __func__,strerror (errno)); +return -1 ; + } +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults. @@ -1258,30 +1268,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, } } -/* -* Returns a target page of memory that can be mapped at a later point in time -* using postcopy_place_page -* The same address is used repeatedly, postcopy_place_page just takes the -* backing page away. -* Returns: Pointer to allocated page -* -*/ -void *postcopy_get_tmp_page (MigrationIncomingState *mis) -{ -if (!mis->postcopy_tmp_page) { - mis->postcopy_tmp_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE ,MAP_PRIVATE | -MAP_ANONYMOUS ,-1 ,0 ); -if (mis->postcopy_tmp_page ==MAP_FAILED ) { - mis->postcopy_tmp_page =NULL ; -error_report ("%s: %s" , __func__,strerror (errno)); -return NULL ; - } - } - -return mis->postcopy_tmp_page; -} -#else /* No target OS support, stubs just fail */ void fill_destination_postcopy_migration_info (MigrationInfo *info)@@ -1339,12 +1325,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,return -1 ; } -void *postcopy_get_tmp_page (MigrationIncomingState *mis) -{ -assert (0 ); -return NULL ; -} -int postcopy_wake_shared (struct PostCopyFD *pcfd,uint64_t client_addr,RAMBlock *rb)migration/postcopy-ram.h +0
-7@@ -100,13 +100,6 @@ typedef enum {POSTCOPY_INCOMING_END } PostcopyState; -/* -* Allocate a page of memory that can be mapped at a later point in time -* using postcopy_place_page -* Returns: Pointer to allocated page -*/ -void *postcopy_get_tmp_page (MigrationIncomingState *mis); -PostcopyState postcopy_state_get (void );/* Set the state and return the old state */ PostcopyState postcopy_state_set(PostcopyState new_state,migration/ram.c +1
-1@@ -4048,7 +4048,7 @@ static int ram_load_postcopy(QEMUFile *f)bool matches_target_page_size = false;MigrationIncomingState *mis =migration_incoming_get_current ();/* Temporary page that is later 'placed' */ -void *postcopy_host_page =postcopy_get_tmp_page (mis); +void *postcopy_host_page = mis->postcopy_tmp_page;void *last_host =NULL ;bool all_zero = false;Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH 2/2 migration/postcopy: map large zero page in postcopy_ram_incoming_setup()
In reply to Wei Yangpostcopy_ram_incoming_setup() and postcopy_ram_incoming_cleanup() are counterpart. It is reasonable to map/unmap large zero page in these two functions respectively.
--- migration/postcopy-ram.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
migration/postcopy-ram.c +17 -17
@@ -1142,6 +1142,22 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } +/* +* Map large zero page when kernel can't use UFFDIO_ZEROPAGE for hugepages +*/ + mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS , +-1 ,0 ); +if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { +int e = errno; + mis->postcopy_tmp_zero_page =NULL ; +error_report ("%s: Failed to map large zero page %s" , + __func__,strerror (e)); +return -e; + } +memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults.
@@ -1248,23 +1264,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,qemu_ram_block_host_offset (rb, host)); }else { -/* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ -if (!mis->postcopy_tmp_zero_page) { - mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE , -MAP_PRIVATE |MAP_ANONYMOUS , --1 ,0 ); -if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { -int e = errno; - mis->postcopy_tmp_zero_page =NULL ; -error_report ("%s: %s mapping large zero page" , - __func__,strerror (e)); -return -e; - } -memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); - } -return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, - rb); +return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, rb); } }
Signature · 1 line
2.17.1
Re: [PATCH 2/2] migration/postcopy: map large zero page in postcopy_ram_incoming_setup()
Quoted 5 lines · * Wei Yang ([email protected]) wrote:
postcopy_ram_incoming_setup()andpostcopy_ram_incoming_cleanup()are counterpart. It is reasonable to map/unmap large zero page in these two functions respectively.Signed-off-by Wei Yang <[email protected]>
Yes, OK.
Quoted 15 lines
--- migration/postcopy-ram.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)migration/postcopy-ram.c +3
-0@@ -1142,6 +1142,22 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } +/* +* Map large zero page when kernel can't use UFFDIO_ZEROPAGE for hugepages +*/
migration/postcopy-ram.c int postcopy_ram_incoming_setup(MigrationIncomingState *mis) · line 1157
Quoted 10 lines
migration/postcopy-ram.c +10
-0+ mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS , +-1 ,0 ); +if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { +int e = errno; + mis->postcopy_tmp_zero_page =NULL ; +error_report ("%s: Failed to map large zero page %s" , + __func__,strerror (e)); +return -e;
Note this starts returning -errno where the rest of this function returns 0 or -1; returning -errno is a good thing I think and it might be good to change the other returns.
Quoted 34 lines
migration/postcopy-ram.c +4
-17+ } +memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults. @@ -1248,23 +1264,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,qemu_ram_block_host_offset (rb, host)); }else { -/* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ -if (!mis->postcopy_tmp_zero_page) { - mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE , -MAP_PRIVATE |MAP_ANONYMOUS , --1 ,0 ); -if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { -int e = errno; - mis->postcopy_tmp_zero_page =NULL ; -error_report ("%s: %s mapping large zero page" , - __func__,strerror (e)); -return -e; - } -memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); - } -return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, - rb); +return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, rb); } }Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 2/2] migration/postcopy: map large zero page in postcopy_ram_incoming_setup()
Quoted 30 lines · Dr. David Alan Gilbert
Quoted 5 lines · * Wei Yang ([email protected]) wrote:
postcopy_ram_incoming_setup()andpostcopy_ram_incoming_cleanup()are counterpart. It is reasonable to map/unmap large zero page in these two functions respectively.Signed-off-by Wei Yang <[email protected]>Yes, OK.
Quoted 21 lines
--- migration/postcopy-ram.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)migration/postcopy-ram.c +9
-0@@ -1142,6 +1142,22 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } +/* +* Map large zero page when kernel can't use UFFDIO_ZEROPAGE for hugepages +*/ + mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS , +-1 ,0 ); +if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { +int e = errno;
Quoted 9 lines
migration/postcopy-ram.c int postcopy_ram_incoming_setup(MigrationIncomingState *mis) · line 1157
Quoted 4 lines
migration/postcopy-ram.c +4
-0+ mis->postcopy_tmp_zero_page =NULL ; +error_report ("%s: Failed to map large zero page %s" , + __func__,strerror (e)); +return -e;Note this starts returning -errno where the rest of this function returns 0 or -1; returning -errno is a good thing I think and it might be good to change the other returns.
This is reasonable, while I am thinking how caller would handle this.
For example, the return value would be finally returned to qemu_loadvm_state_main(). If we handle each errno respectively in this function, the code would be difficult to read and maintain.
Would it be good to classify return value to different category? Like
POSTCOPY_FATAL
POSTCOPY_RETRY
POSTCOPY_DISABLE
Quoted 39 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 34 lines
migration/postcopy-ram.c +4
-17+ } +memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults. @@ -1248,23 +1264,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,qemu_ram_block_host_offset (rb, host)); }else { -/* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ -if (!mis->postcopy_tmp_zero_page) { - mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE , -MAP_PRIVATE |MAP_ANONYMOUS , --1 ,0 ); -if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { -int e = errno; - mis->postcopy_tmp_zero_page =NULL ; -error_report ("%s: %s mapping large zero page" , - __func__,strerror (e)); -return -e; - } -memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); - } -return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, - rb); +return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, rb); } }Signature · 1 line
2.17.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Signature · 2 lines
Wei Yang Help you, Help me
Re: [PATCH 2/2] migration/postcopy: map large zero page in postcopy_ram_incoming_setup()
Quoted 47 lines · * Wei Yang ([email protected]) wrote:
Quoted 30 lines · Dr. David Alan Gilbert
Quoted 5 lines · * Wei Yang ([email protected]) wrote:
postcopy_ram_incoming_setup()andpostcopy_ram_incoming_cleanup()are counterpart. It is reasonable to map/unmap large zero page in these two functions respectively.Signed-off-by Wei Yang <[email protected]>Yes, OK.
Quoted 21 lines
--- migration/postcopy-ram.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)migration/postcopy-ram.c +9
-0@@ -1142,6 +1142,22 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)return -1 ; } +/* +* Map large zero page when kernel can't use UFFDIO_ZEROPAGE for hugepages +*/ + mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, +PROT_READ |PROT_WRITE , +MAP_PRIVATE |MAP_ANONYMOUS , +-1 ,0 ); +if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { +int e = errno;Quoted 9 lines
migration/postcopy-ram.c int postcopy_ram_incoming_setup(MigrationIncomingState *mis) · line 1157
Quoted 4 lines
migration/postcopy-ram.c +4
-0+ mis->postcopy_tmp_zero_page =NULL ; +error_report ("%s: Failed to map large zero page %s" , + __func__,strerror (e)); +return -e;Note this starts returning -errno where the rest of this function returns 0 or -1; returning -errno is a good thing I think and it might be good to change the other returns.
This is reasonable, while I am thinking how caller would handle this.
For example, the return value would be finally returned to
qemu_loadvm_state_main(). If we handle each errno respectively in this function, the code would be difficult to read and maintain.
Quoted 5 lines
Would it be good to classify return value to different category? Like
POSTCOPY_FATAL
POSTCOPY_RETRY
POSTCOPY_DISABLE
It's actually quite difficult because unix errno's are too simple; an EIO has too many causes.
ideally we'd like to be able to separate out a network transport error that occurs during the postcopy phase for recovery and make sure that we don't confuse that with any other error.
Dave
Quoted 35 lines
Quoted 35 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>Quoted 31 lines
migration/postcopy-ram.c +4
-17+ } +memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); +/* * Ballooning can mark pages as absent while we're postcopying * that would cause false userfaults. @@ -1248,23 +1264,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,qemu_ram_block_host_offset (rb, host)); }else { -/* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ -if (!mis->postcopy_tmp_zero_page) { - mis->postcopy_tmp_zero_page =mmap (NULL , mis->largest_page_size, -PROT_READ |PROT_WRITE , -MAP_PRIVATE |MAP_ANONYMOUS , --1 ,0 ); -if (mis->postcopy_tmp_zero_page ==MAP_FAILED ) { -int e = errno; - mis->postcopy_tmp_zero_page =NULL ; -error_report ("%s: %s mapping large zero page" , - __func__,strerror (e)); -return -e; - } -memset (mis->postcopy_tmp_zero_page,'\0' , mis->largest_page_size); - } -return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, - rb); +return postcopy_place_page (mis, host, mis->postcopy_tmp_zero_page, rb); } }
Quoted 9 lines
Quoted 5 lines
Quoted 3 lines
Signature · 1 line
2.17.1--
Dr. David Alan Gilbert / [email protected] / Manchester, UKSignature · 2 lines
Wei Yang Help you, Help me
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 5 lines · * Wei Yang ([email protected]) wrote:
Currently we map these page when we want to use it, while this may be a little late.
To make the code consistency, these two patches move the map into
postcopy_ram_incoming_setup.
Queued
Quoted 6 lines
Wei Yang (2):
migration/postcopy: allocatetmp_pagein setup stage migration/postcopy: map large zero page in
postcopy_ram_incoming_setup()
Quoted 9 lines
migration/postcopy-ram.c | 74 +++++++++++++++------------------------- migration/postcopy-ram.h | 7 ---- migration/ram.c | 2 +- 3 files changed, 28 insertions(+), 55 deletions(-)Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK