migration: Check current_migration in migration_is_running()

Commit Message

Peter Xu Nov. 5, 2024, 6:27 p.m. UTC

Report shows that commit 34a8892dec broke iotest 055:

https://lore.kernel.org/r/[e-mail]

When replacing migration_is_idle() with "!migration_is_running()", it was
overlooked that the idle helper also checks for current_migration being
available first.

The check would be there if the whole series was applied, but since the
last patches in the previous series rely on some other patches to land
first, we need to recover the behavior of migration_is_idle() first before
that whole set will be merged.

I left migration_is_active / migration_is_device alone, as I don't think
it's possible for them to hit his case (current_migration not initialized).
Also they're prone to removal soon from VFIO side.

Cc: Fabiano Rosas <[e-mail]>
Cc: Peter Maydell <[e-mail]>
Fixes: 34a8892dec ("migration: Drop migration_is_idle()")
Reported-by: Pierrick Bouvier <[e-mail]>
Tested-by: Pierrick Bouvier <[e-mail]>
Signed-off-by: Peter Xu <[e-mail]>
---
 migration/migration.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Pierrick Bouvier Nov. 5, 2024, 6:31 p.m. UTC | #1

On 11/5/24 10:27, Peter Xu wrote:
> Report shows that commit 34a8892dec broke iotest 055:
> 
> https://lore.kernel.org/r/[e-mail]
> 
> When replacing migration_is_idle() with "!migration_is_running()", it was
> overlooked that the idle helper also checks for current_migration being
> available first.
> 
> The check would be there if the whole series was applied, but since the
> last patches in the previous series rely on some other patches to land
> first, we need to recover the behavior of migration_is_idle() first before
> that whole set will be merged.
> 
> I left migration_is_active / migration_is_device alone, as I don't think
> it's possible for them to hit his case (current_migration not initialized).
> Also they're prone to removal soon from VFIO side.
> 
> Cc: Fabiano Rosas <[e-mail]>
> Cc: Peter Maydell <[e-mail]>
> Fixes: 34a8892dec ("migration: Drop migration_is_idle()")
> Reported-by: Pierrick Bouvier <[e-mail]>
> Tested-by: Pierrick Bouvier <[e-mail]>
> Signed-off-by: Peter Xu <[e-mail]>
> ---
>   migration/migration.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index aedf7f0751..8c5bd0a75c 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -1117,6 +1117,10 @@ bool migration_is_running(void)
>   {
>       MigrationState *s = current_migration;
>   
> +    if (!s) {
> +        return false;
> +    }
> +
>       switch (s->state) {
>       case MIGRATION_STATUS_ACTIVE:
>       case MIGRATION_STATUS_POSTCOPY_ACTIVE:

Reviewed-by: Pierrick Bouvier <[e-mail]>

Fabiano Rosas Nov. 5, 2024, 8:45 p.m. UTC | #2

Peter Xu <[e-mail]> writes:

> Report shows that commit 34a8892dec broke iotest 055:
>
> https://lore.kernel.org/r/[e-mail]
>
> When replacing migration_is_idle() with "!migration_is_running()", it was
> overlooked that the idle helper also checks for current_migration being
> available first.
>
> The check would be there if the whole series was applied, but since the
> last patches in the previous series rely on some other patches to land
> first, we need to recover the behavior of migration_is_idle() first before
> that whole set will be merged.
>
> I left migration_is_active / migration_is_device alone, as I don't think
> it's possible for them to hit his case (current_migration not initialized).
> Also they're prone to removal soon from VFIO side.
>
> Cc: Fabiano Rosas <[e-mail]>
> Cc: Peter Maydell <[e-mail]>
> Fixes: 34a8892dec ("migration: Drop migration_is_idle()")
> Reported-by: Pierrick Bouvier <[e-mail]>
> Tested-by: Pierrick Bouvier <[e-mail]>
> Signed-off-by: Peter Xu <[e-mail]>

Reviewed-by: Fabiano Rosas <[e-mail]>

Patch

diff --git a/migration/migration.c b/migration/migration.c
index aedf7f0751..8c5bd0a75c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1117,6 +1117,10 @@  bool migration_is_running(void)
 {
     MigrationState *s = current_migration;
 
+    if (!s) {
+        return false;
+    }
+
     switch (s->state) {
     case MIGRATION_STATUS_ACTIVE:
     case MIGRATION_STATUS_POSTCOPY_ACTIVE: