migration: some small cleanups
cover migration: some small cleanups
From: Peter Xu <[email protected]>
I found three tiny little patches lying around probably for a long time, sending it out before deleting the branch. Review welcomed, thanks.
Peter Xu (3):
migration: Make threshold_size an uint64_t
migration: Drop unnecessary check in ram's pending_exact() analyze-migration.py: Remove trick on parsing ramblocks
migration/migration.h | 2 +- migration/ram.c | 9 ++++----- scripts/analyze-migration.py | 11 +++-------- 3 files changed, 8 insertions(+), 14 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/3 migration: Make threshold_size an uint64_t
From: Peter Xu <[email protected]>
It's always used to compare against another uint64_t. Make it always clear that it's never a negative.
--- migration/migration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/migration.h +1 -1
@@ -296,7 +296,7 @@ struct MigrationState {* this threshold; it's calculated from the requested downtime and * measured bandwidth, or avail-switchover-bandwidth if specified. */ -int64_t threshold_size; +uint64_t threshold_size;/* params from 'migrate-set-parameters' */ MigrationParameters parameters;
Signature · 1 line
2.43.0
Re: [PATCH 1/3] migration: Make threshold_size an uint64_t
Quoted 9 lines · On 17/1/24 08:58, [email protected] wrote:
From: Peter Xu <[email protected]>
It's always used to compare against another
uint64_t. Make it always clear that it's never a negative.Signed-off-by Peter Xu <[email protected]>--- migration/migration.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PATCH 1/3] migration: Make threshold_size an uint64_t
In reply to [email protected]Quoted 6 lines · [email protected] writes:
From: Peter Xu <[email protected]>
It's always used to compare against another
uint64_t. Make it always clear that it's never a negative.Signed-off-by Peter Xu <[email protected]>
PATCH 2/3 migration: Drop unnecessary check in ram's pending_exact()
In reply to [email protected]From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size < s->threshold_size
Must have been done already, actually at migration_iteration_run():
if (must_precopy <= s->threshold_size) {
qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop migrate_get_current() there too.
--- migration/ram.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
migration/ram.c +4 -5
@@ -3213,21 +3213,20 @@ static void ram_state_pending_estimate(void *opaque, uint64_t *must_precopy,static void ram_state_pending_exact (void *opaque,uint64_t *must_precopy,uint64_t *can_postcopy) { -MigrationState *s =migrate_get_current ();RAMState **temp = opaque;RAMState *rs = *temp; +uint64_t remaining_size; -uint64_t remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; - -if (!migration_in_postcopy () && remaining_size < s->threshold_size) { +if (!migration_in_postcopy ()) {bql_lock (); WITH_RCU_READ_LOCK_GUARD() {migration_bitmap_sync_precopy (rs, false); }bql_unlock (); - remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; } + remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; +if (migrate_postcopy_ram ()) {/* We can do postcopy, and all the data is postcopiable */ *can_postcopy += remaining_size;
Signature · 1 line
2.43.0
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
Quoted 15 lines · [email protected] writes:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
In reply to [email protected]Quoted 15 lines · On Wed, 2024-01-17 at 15:58 +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>
Hi Peter,
could you have a look at this issue:
https://gitlab.com/qemu-project/qemu/-/issues/1565
which I reopened. Previous thread here:
https://lore.kernel.org/qemu-devel/[email protected]/
I'm seeing migration failures with s390x TCG again, which look the same to me as those a while back.
Quoted 24 lines
--- migration/ram.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)migration/ram.c +2
-4@@ -3213,21 +3213,20 @@ static void ram_state_pending_estimate(void *opaque, uint64_t *must_precopy,static void ram_state_pending_exact (void *opaque,uint64_t *must_precopy,uint64_t *can_postcopy) { -MigrationState *s =migrate_get_current ();RAMState **temp = opaque;RAMState *rs = *temp; +uint64_t remaining_size; -uint64_t remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; - -if (!migration_in_postcopy () && remaining_size < s->threshold_size) { +if (!migration_in_postcopy ()) {bql_lock (); WITH_RCU_READ_LOCK_GUARD() {migration_bitmap_sync_precopy (rs, false);
migration/ram.c static void ram_state_pending_estimate(void *opaque, uint64_t *must_precopy, · line 3232
Quoted 10 lines
migration/ram.c +2
-1}bql_unlock (); - remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; } + remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; +if (migrate_postcopy_ram ()) {/* We can do postcopy, and all the data is postcopiable */ *can_postcopy += remaining_size;
This basically reverts 28ef5339c3 ("migration: fix ram_state_pending_exact()"), which originally made the issue disappear.
Any thoughts on the matter appreciated.
Thanks,
Nina
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
I cc'ed Juan, but it looks like he is no longer with Redhat.
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
In reply to Nina Schoetterl-GlauschQuoted 16 lines · Nina Schoetterl-Glausch
Quoted 15 lines · On Wed, 2024-01-17 at 15:58 +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.
Quoted 8 lines
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>Hi Peter,
Hi, Nina,
Quoted 10 lines
could you have a look at this issue:
https://gitlab.com/qemu-project/qemu/-/issues/1565which I reopened. Previous thread here:
https://lore.kernel.org/qemu-devel/[email protected]/
I'm seeing migration failures with s390x TCG again, which look the same to me as those a while back.
I'm still quite confused how that could be caused of this.
What you described in the previous bug report seems to imply some page was leftover in migration so some page got corrupted after migrated.
However what this patch mostly does is it can sync more than before even if I overlooked the condition check there (I still think the check is redundant, there's one outlier when remaining_size == threshold_size, but I don't think it should matter here as of now). It'll make more sense if this patch made the sync less, but that's not the case but vice versa.
Quoted 39 lines
Quoted 25 lines
--- migration/ram.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)migration/ram.c +2
-4@@ -3213,21 +3213,20 @@ static void ram_state_pending_estimate(void *opaque, uint64_t *must_precopy,static void ram_state_pending_exact (void *opaque,uint64_t *must_precopy,uint64_t *can_postcopy) { -MigrationState *s =migrate_get_current ();RAMState **temp = opaque;RAMState *rs = *temp; +uint64_t remaining_size; -uint64_t remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; - -if (!migration_in_postcopy () && remaining_size < s->threshold_size) { +if (!migration_in_postcopy ()) {bql_lock (); WITH_RCU_READ_LOCK_GUARD() {migration_bitmap_sync_precopy (rs, false);migration/ram.c static void ram_state_pending_estimate(void *opaque, uint64_t *must_precopy, · line 3232
Quoted 10 lines
migration/ram.c +2
-1}bql_unlock (); - remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; } + remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; +if (migrate_postcopy_ram ()) {/* We can do postcopy, and all the data is postcopiable */ *can_postcopy += remaining_size;This basically reverts
28ef5339c3("migration: fixram_state_pending_exact()"), which originally made the issue disappear.
Quoted 1 line
Any thoughts on the matter appreciated.
In the previous discussion, you mentioned that you bisected to the commit and also verified the fix. Now you also mentioned in the bz that you can't reporduce this bug manually.
Is it still possible to be reproduced with some scripts? Do you also mean that it's harder to reproduce comparing to before? In all cases, some way to reproduce it would definitely be helpful.
Even if we want to revert this change, we'll need to know whether this will fix your case so we need something to verify it before a revert. I'll consider that the last though as I had a feeling this is papering over something else.
Thanks,
Signature · 1 line
Peter Xu
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
Quoted 49 lines · Peter Xu
Quoted 16 lines · Nina Schoetterl-Glausch
Quoted 15 lines · On Wed, 2024-01-17 at 15:58 +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.Quoted 8 lines
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>Hi Peter,
Hi, Nina,
Quoted 10 lines
could you have a look at this issue:
https://gitlab.com/qemu-project/qemu/-/issues/1565which I reopened. Previous thread here:
https://lore.kernel.org/qemu-devel/[email protected]/
I'm seeing migration failures with s390x TCG again, which look the same to me as those a while back.
I'm still quite confused how that could be caused of this.
What you described in the previous bug report seems to imply some page was leftover in migration so some page got corrupted after migrated.
However what this patch mostly does is it can sync more than before even if I overlooked the condition check there (I still think the check is redundant, there's one outlier when
remaining_size==threshold_size, but I don't think it should matter here as of now). It'll make more sense if this patch made the sync less, but that's not the case but vice versa.
[...]
Quoted 7 lines
In the previous discussion, you mentioned that you bisected to the commit and also verified the fix. Now you also mentioned in the bz that you can't reporduce this bug manually.
Is it still possible to be reproduced with some scripts? Do you also mean that it's harder to reproduce comparing to before? In all cases, some way to reproduce it would definitely be helpful.
I tried running the kvm-unit-test a bunch of times in a loop and couldn't trigger a failure. I just tried again on a different system and managed just fine, yay. No idea why it wouldn't on the first system tho.
Quoted 5 lines
Even if we want to revert this change, we'll need to know whether this will fix your case so we need something to verify it before a revert. I'll consider that the last though as I had a feeling this is papering over something else.
I can check if I can reproduce the issue before & after b0504edd ("migration:
Drop unnecessary check in ram's pending_exact()").
I can also check if I can reproduce it on x86, that worked last time. Anything else? Ideas on how to pinpoint where the corruption happens?
Quoted 3 lines
Thanks,
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
Quoted 57 lines · Nina Schoetterl-Glausch
Quoted 49 lines · Peter Xu
Quoted 16 lines · Nina Schoetterl-Glausch
Quoted 15 lines · On Wed, 2024-01-17 at 15:58 +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.Quoted 8 lines
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>Hi Peter,
Hi, Nina,
Quoted 10 lines
could you have a look at this issue:
https://gitlab.com/qemu-project/qemu/-/issues/1565which I reopened. Previous thread here:
https://lore.kernel.org/qemu-devel/[email protected]/
I'm seeing migration failures with s390x TCG again, which look the same to me as those a while back.
I'm still quite confused how that could be caused of this.
What you described in the previous bug report seems to imply some page was leftover in migration so some page got corrupted after migrated.
However what this patch mostly does is it can sync more than before even if I overlooked the condition check there (I still think the check is redundant, there's one outlier when
remaining_size==threshold_size, but I don't think it should matter here as of now). It'll make more sense if this patch made the sync less, but that's not the case but vice versa.[...]
Quoted 4 lines
In the previous discussion, you mentioned that you bisected to the commit and also verified the fix. Now you also mentioned in the bz that you can't reporduce this bug manually.
Quoted 7 lines
Quoted 3 lines
Is it still possible to be reproduced with some scripts? Do you also mean that it's harder to reproduce comparing to before? In all cases, some way to reproduce it would definitely be helpful.
I tried running the kvm-unit-test a bunch of times in a loop and couldn't trigger a failure. I just tried again on a different system and managed just fine, yay. No idea why it wouldn't on the first system tho.
There's probably still a bug somewhere. If reproduction rate changed, it's also a sign that it might not be directly relevant to this change, as otherwise it should reproduce the same as before.
Quoted 10 lines
Quoted 5 lines
Even if we want to revert this change, we'll need to know whether this will fix your case so we need something to verify it before a revert. I'll consider that the last though as I had a feeling this is papering over something else.
I can check if I can reproduce the issue before & after
b0504edd("migration:
Drop unnecessary check in ram'spending_exact()").
I can also check if I can reproduce it on x86, that worked last time. Anything else? Ideas on how to pinpoint where the corruption happens?
I don't have a solid clue yet, but more information of the single case where it reproduced could help.
I saw from the bug link that the cmdline is pretty simple. However still not sure of something that can be relevant. E.g., did you use postcopy (including when postcopy-ram enabled but precopy completed)? Is there any special device, like s390's CMMA (would that simplest cmdline include such a device; apologies, I have zero knowledge there before today)?
I _think_ when reading the code I already found something quite unusual, but only when postcopy is selected: I notice postcopy will frequently sync dirty bitmap while it doesn't really necessarily need to, because ram_state_pending_estimate() will report all ram as "can_postcopy"; it means it's highly likely that this check will 99.999% always be true simply because must_precopy can in most cases be zero:
if (must_precopy <= s->threshold_size) { <---------------------------- here
qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);
pending_size = must_precopy + can_postcopy;
trace_migrate_pending_exact(pending_size, must_precopy, can_postcopy);
}I need to think more of this, but this doesn't sound right at all. There's no such issue with precopy-only, and I'm surprised it is like that for years.
Signature · 1 line
Peter Xu
Re: [PATCH 2/3] migration: Drop unnecessary check in ram's pending_exact()
Quoted 97 lines · Peter Xu
Quoted 57 lines · Nina Schoetterl-Glausch
Quoted 49 lines · Peter Xu
Quoted 16 lines · Nina Schoetterl-Glausch
Quoted 15 lines · On Wed, 2024-01-17 at 15:58 +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
When the migration frameworks fetches the exact pending sizes, it means this check:
remaining_size<s->threshold_sizeMust have been done already, actually at
migration_iteration_run():if (must_precopy <= s->threshold_size) { qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy);That should be after one round of
ram_state_pending_estimate(). It makes the 2nd check meaningless and can be dropped.Quoted 8 lines
Quoted 6 lines
To say it in another way, when reaching ->state_pending_exact(), we unconditionally sync dirty bits for precopy.
Then we can drop
migrate_get_current()there too.Signed-off-by Peter Xu <[email protected]>Hi Peter,
Hi, Nina,
Quoted 10 lines
could you have a look at this issue:
https://gitlab.com/qemu-project/qemu/-/issues/1565which I reopened. Previous thread here:
https://lore.kernel.org/qemu-devel/[email protected]/
I'm seeing migration failures with s390x TCG again, which look the same to me as those a while back.
I'm still quite confused how that could be caused of this.
What you described in the previous bug report seems to imply some page was leftover in migration so some page got corrupted after migrated.
However what this patch mostly does is it can sync more than before even if I overlooked the condition check there (I still think the check is redundant, there's one outlier when
remaining_size==threshold_size, but I don't think it should matter here as of now). It'll make more sense if this patch made the sync less, but that's not the case but vice versa.[...]
Quoted 4 lines
In the previous discussion, you mentioned that you bisected to the commit and also verified the fix. Now you also mentioned in the bz that you can't reporduce this bug manually.
Quoted 7 lines
Quoted 3 lines
Is it still possible to be reproduced with some scripts? Do you also mean that it's harder to reproduce comparing to before? In all cases, some way to reproduce it would definitely be helpful.
I tried running the kvm-unit-test a bunch of times in a loop and couldn't trigger a failure. I just tried again on a different system and managed just fine, yay. No idea why it wouldn't on the first system tho.
There's probably still a bug somewhere. If reproduction rate changed, it's also a sign that it might not be directly relevant to this change, as otherwise it should reproduce the same as before.
Quoted 10 lines
Quoted 5 lines
Even if we want to revert this change, we'll need to know whether this will fix your case so we need something to verify it before a revert. I'll consider that the last though as I had a feeling this is papering over something else.
I can check if I can reproduce the issue before & after
b0504edd("migration:
Drop unnecessary check in ram'spending_exact()").
I can also check if I can reproduce it on x86, that worked last time. Anything else? Ideas on how to pinpoint where the corruption happens?I don't have a solid clue yet, but more information of the single case where it reproduced could help.
I saw from the bug link that the cmdline is pretty simple. However still not sure of something that can be relevant. E.g., did you use postcopy (including when postcopy-ram enabled but precopy completed)? Is there any special device, like s390's CMMA (would that simplest cmdline include such a device; apologies, I have zero knowledge there before today)?
I _think_ when reading the code I already found something quite unusual, but only when postcopy is selected: I notice postcopy will frequently sync dirty bitmap while it doesn't really necessarily need to, because
ram_state_pending_estimate()will report all ram as "can_postcopy"; it means it's highly likely that this check will 99.999% always be true simply becausemust_precopycan in most cases be zero:
Quoted 8 lines
if (must_precopy <= s->threshold_size) { <---------------------------- here qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy); pending_size = must_precopy + can_postcopy; trace_migrate_pending_exact(pending_size, must_precopy, can_postcopy); }I need to think more of this, but this doesn't sound right at all. There's no such issue with precopy-only, and I'm surprised it is like that for years.
It seems this can be a separate new bug.. possible introduced in the same commit since 8.0. I will post a patch for this soon.
One more thing to mention is I am aware Nicholas & Phil also hit some s390 tcg issues, and just recently there got a fix landed, I'm suspecting that could also be relevant. See:
https://lore.kernel.org/qemu-devel/[email protected]/03bfc2188f physmem: Fix migration dirty bitmap coherency with TCG memory access
I would suspect this issue reproduces easier before this. I think Nicholas also mentioned there can be other bug floating around:
https://lore.kernel.org/qemu-devel/CZSDDVZW4G3L.6CV89ZRMQK9G@wheely/
Let me add all into this loop.
Thanks,
Signature · 1 line
Peter Xu
PATCH 3/3 analyze-migration.py: Remove trick on parsing ramblocks
In reply to [email protected]From: Peter Xu <[email protected]>
RAM_SAVE_FLAG_MEM_SIZE contains the total length of ramblock idstr to know whether scanning of ramblocks is complete. Drop the trick.
--- scripts/analyze-migration.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
scripts/analyze-migration.py +3 -8
@@ -151,17 +151,12 @@ def read(self): addr &= ~(self.TARGET_PAGE_SIZE - 1) if flags & self.RAM_SAVE_FLAG_MEM_SIZE: - while True: + total_length = addr + while total_length > 0: namelen = self.file.read8() - # We assume that no RAM chunk is big enough to ever - # hit the first byte of the address, so when we see - # a zero here we know it has to be an address, not the - # length of the next block. - if namelen == 0: - self.file.file.seek(-1, 1) - break self.name = self.file.readstr(len = namelen) len = self.file.read64() + total_length -= len self.sizeinfo[self.name] = '0x%016x' % len if self.write_memory: print(self.name)
Signature · 1 line
2.43.0
Re: [PATCH 3/3] analyze-migration.py: Remove trick on parsing ramblocks
Quoted 6 lines · [email protected] writes:
From: Peter Xu <[email protected]>
RAM_SAVE_FLAG_MEM_SIZEcontains the total length of ramblock idstr to know whether scanning of ramblocks is complete. Drop the trick.Signed-off-by Peter Xu <[email protected]>
Quoted 10 lines · On Wed, Jan 17, 2024 at 03:58:45PM +0800, [email protected] wrote:
From: Peter Xu <[email protected]>
I found three tiny little patches lying around probably for a long time, sending it out before deleting the branch. Review welcomed, thanks.
Peter Xu (3):
migration: Makethreshold_sizeanuint64_t
migration: Drop unnecessary check in ram'spending_exact()analyze-migration.py: Remove trick on parsing ramblocks
Quoted 4 lines
migration/migration.h | 2 +- migration/ram.c | 9 ++++----- scripts/analyze-migration.py | 11 +++-------- 3 files changed, 8 insertions(+), 14 deletions(-)
queued.
Signature · 1 line
Peter Xu