[Qemu-commits] [qemu/qemu] 99c3ac: virtiofsd: Fix security.capability comparison

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 99c3ac6dbe18cdab3686a830d129f8fa586846bb
      
https://github.com/qemu/qemu/commit/99c3ac6dbe18cdab3686a830d129f8fa586846bb
  Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M tools/virtiofsd/passthrough_ll.c

  Log Message:
  -----------
  virtiofsd: Fix security.capability comparison

My security fix for the security.capability remap has a silly early
segfault in a simple case where there is an xattrmapping but it doesn't
remap the security.capability.

Fixes: e586edcb41054 ("virtiofs: drop remapped security.capability xattr as 
needed")
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20210401145845.78445-1-dgilbert@redhat.com>
Reviewed-by: Connor Kuehl <ckuehl@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: ecb23efea0899be6723f4ea9636de5cf7de90cfe
      
https://github.com/qemu/qemu/commit/ecb23efea0899be6723f4ea9636de5cf7de90cfe
  Author: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Fix missing qemu_fflush() on buffer file in bg_migration_thread

Added missing qemu_fflush() on buffer file holding precopy device state.
Increased initial QIOChannelBuffer allocation to 512KB to avoid reallocs.
Typical configurations often require >200KB for device state and VMDESC.

Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation
  of background snapshot thread)
Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
Message-Id: <20210401092226.102804-2-andrey.gruzdev@virtuozzo.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 1a8e44a89f1976e06300393337f78d561f95b339
      
https://github.com/qemu/qemu/commit/1a8e44a89f1976e06300393337f78d561f95b339
  Author: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M hw/virtio/virtio-balloon.c
    M include/migration/misc.h
    M migration/migration.c

  Log Message:
  -----------
  migration: Inhibit virtio-balloon for the duration of background snapshot

The same thing as for incoming postcopy - we cannot deal with concurrent
RAM discards when using background snapshot feature in outgoing migration.

Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation
  of background snapshot thread)
Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
Reported-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210401092226.102804-3-andrey.gruzdev@virtuozzo.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 8c6fdc619e6e3fc47ebd4921313402ee140cdcf4
      
https://github.com/qemu/qemu/commit/8c6fdc619e6e3fc47ebd4921313402ee140cdcf4
  Author: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h

  Log Message:
  -----------
  migration: Pre-fault memory before starting background snasphot

This commit solves the issue with userfault_fd WP feature that
background snapshot is based on. For any never poluated or discarded
memory page, the UFFDIO_WRITEPROTECT ioctl() would skip updating
PTE for that page, thereby loosing WP setting for it.

So we need to pre-fault pages for each RAM block to be protected
before making a userfault_fd wr-protect ioctl().

Fixes: 278e2f551a095b234de74dca9c214d5502a1f72c (migration: support
  UFFD write fault processing in ram_save_iterate())
Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
Reported-by: David Hildenbrand <david@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210401092226.102804-4-andrey.gruzdev@virtuozzo.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: 02b8a947e764020ecb95f29021426423d1ee9994
      
https://github.com/qemu/qemu/commit/02b8a947e764020ecb95f29021426423d1ee9994
  Author: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: Rename 'bs' to 'block' in background snapshot code

Rename 'bs' to commonly used 'block' in migration/ram.c background
snapshot code.

Signed-off-by: Andrey Gruzdev <andrey.gruzdev@virtuozzo.com>
Reported-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210401092226.102804-5-andrey.gruzdev@virtuozzo.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: c4e232bb57aca19ca60f692ee830023a76eca78e
      
https://github.com/qemu/qemu/commit/c4e232bb57aca19ca60f692ee830023a76eca78e
  Author: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
  Date:   2021-04-06 (Tue, 06 Apr 2021)

  Changed paths:
    M tests/migration/guestperf/engine.py

  Log Message:
  -----------
  tests/migration: fix parameter of auto-converge migration

when execute the following test command:
$ ./guestperf-batch.py --auto-converge \
    --auto-converge-step {percent} ...
test aborts and error message be throwed as the following:
"Parameter 'x-cpu-throttle-increment' is unexpected"

The reason is that 'x-cpu-throttle-increment' has been
deprecated and 'cpu-throttle-increment' was introduced
Since v2.7. Use the new parameter instead.

Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
Message-Id: 
<0195d34a317ce3cc417b3efd275e30cad35a7618.1616513998.git.huangy81@chinatelecom.cn>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>


  Commit: bd441a149802b4882313867115cfba69def524f3
      
https://github.com/qemu/qemu/commit/bd441a149802b4882313867115cfba69def524f3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-04-07 (Wed, 07 Apr 2021)

  Changed paths:
    M hw/virtio/virtio-balloon.c
    M include/migration/misc.h
    M migration/migration.c
    M migration/ram.c
    M migration/ram.h
    M tests/migration/guestperf/engine.py
    M tools/virtiofsd/passthrough_ll.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20210407a' 
into staging

migration+virtiofs fixes pull 2021-04-07

A seg fix in virtiofsd, a bunch of fixes for background snapshots, and
a migration test fix.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

# gpg: Signature made Wed 07 Apr 2021 11:18:39 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" 
[full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20210407a:
  tests/migration: fix parameter of auto-converge migration
  migration: Rename 'bs' to 'block' in background snapshot code
  migration: Pre-fault memory before starting background snasphot
  migration: Inhibit virtio-balloon for the duration of background snapshot
  migration: Fix missing qemu_fflush() on buffer file in bg_migration_thread
  virtiofsd: Fix security.capability comparison

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/6afa42140676...bd441a149802