[Qemu-commits] [qemu/qemu] f74e5b: iotests: fix expected output from gnutls

[Jan Klötzke]

  Branch: refs/heads/staging-9.1
  Home:   https://github.com/qemu/qemu
  Commit: f74e5bd9b9ecd189a108c6a0f2f386799804fb9b
      
https://github.com/qemu/qemu/commit/f74e5bd9b9ecd189a108c6a0f2f386799804fb9b
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2024-09-11 (Wed, 11 Sep 2024)

  Changed paths:
    M tests/qemu-iotests/233.out

  Log Message:
  -----------
  iotests: fix expected output from gnutls

Error reporting from gnutls was improved by:

  commit 57941c9c86357a6a642f9ee3279d881df4043b6d
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Fri Mar 15 14:07:58 2024 +0000

    crypto: push error reporting into TLS session I/O APIs

This has the effect of changing the output from one of the NBD
tests.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 48b8583698d96d6290726400789fcd51c55691b1)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 8c47e5bc5508c9741c90a8653bd64a1cb6c8ced4
      
https://github.com/qemu/qemu/commit/8c47e5bc5508c9741c90a8653bd64a1cb6c8ced4
  Author: David Hildenbrand <david@redhat.com>
  Date:   2024-09-11 (Wed, 11 Sep 2024)

  Changed paths:
    M include/exec/ramlist.h
    M system/physmem.c

  Log Message:
  -----------
  softmmu/physmem: fix memory leak in dirty_memory_extend()

As reported by Peter, we might be leaking memory when removing the
highest RAMBlock (in the weird ram_addr_t space), and adding a new one.

We will fail to realize that we already allocated bitmaps for more
dirty memory blocks, and effectively discard the pointers to them.

Fix it by getting rid of last_ram_page() and by remembering the number
of dirty memory blocks that have been allocated already.

While at it, let's use "unsigned int" for the number of blocks, which
should be sufficient until we reach ~32 exabytes.

Looks like this leak was introduced as we switched from using a single
bitmap_zero_extend() to allocating multiple bitmaps:
bitmap_zero_extend() relies on g_renew() which should have taken care of
this.

Resolves: 
https://lkml.kernel.org/r/CAFEAcA-k7a+VObGAfCFNygQNfCKL=AfX6A4kScq=VSSK0peqPg@mail.gmail.com
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Fixes: 5b82b703b69a ("memory: RCU ram_list.dirty_memory[] for safe RAM hotplug")
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-stable@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Link: https://lore.kernel.org/r/20240828090743.128647-1-david@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
(cherry picked from commit b84f06c2bee727b3870b4eeccbe3a45c5aea14c1)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 5d8382a8e984ad58874e009f1f242e17a4290cfc
      
https://github.com/qemu/qemu/commit/5d8382a8e984ad58874e009f1f242e17a4290cfc
  Author: Tiago Pasqualini <tiago.pasqualini@canonical.com>
  Date:   2024-09-11 (Wed, 11 Sep 2024)

  Changed paths:
    M crypto/pbkdf.c

  Log Message:
  -----------
  crypto: run qcrypto_pbkdf2_count_iters in a new thread

CPU time accounting in the kernel has been demonstrated to have a
sawtooth pattern[1][2]. This can cause the getrusage system call to
not be as accurate as we are expecting, which can cause this calculation
to stall.

The kernel discussions shows that this inaccuracy happens when CPU time
gets big enough, so this patch changes qcrypto_pbkdf2_count_iters to run
in a fresh thread to avoid this inaccuracy. It also adds a sanity check
to fail the process if CPU time is not accounted.

[1] 
https://lore.kernel.org/lkml/159231011694.16989.16351419333851309713.tip-bot2@tip-bot2/
[2] 
https://lore.kernel.org/lkml/20221226031010.4079885-1-maxing.lan@bytedance.com/t/#m1c7f2fdc0ea742776a70fd1aa2a2e414c437f534

Resolves: #2398
Signed-off-by: Tiago Pasqualini <tiago.pasqualini@canonical.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit c72cab5ad9f849bbcfcf4be7952b8b8946cc626e)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: e864ce2b481cf563d60345b6450bcf839b41556c
      
https://github.com/qemu/qemu/commit/e864ce2b481cf563d60345b6450bcf839b41556c
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2024-09-11 (Wed, 11 Sep 2024)

  Changed paths:
    M crypto/pbkdf-gcrypt.c
    M crypto/pbkdf-gnutls.c

  Log Message:
  -----------
  crypto: check gnutls & gcrypt support the requested pbkdf hash

Both gnutls and gcrypt can be configured to exclude support for certain
algorithms via a runtime check against system crypto policies. Thus it
is not sufficient to have a compile time test for hash support in their
pbkdf implementations.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit e6c09ea4f9e5f8af92a6453642b84b9efd52892f)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: c0c602f1ad47d394b4344ef20a5c6a55bce6fce6
      
https://github.com/qemu/qemu/commit/c0c602f1ad47d394b4344ef20a5c6a55bce6fce6
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2024-09-11 (Wed, 11 Sep 2024)

  Changed paths:
    M crypto/cipher-nettle.c.inc

  Log Message:
  -----------
  crypto: avoid leak of ctx when bad cipher mode is given

Fixes: Coverity CID 1546884
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 586ac2c67d707c2588766c5195d94fa553cc25af)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: e7e76a01aa8840b1f710583063faf7f2f2919de6
      
https://github.com/qemu/qemu/commit/e7e76a01aa8840b1f710583063faf7f2f2919de6
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2024-09-12 (Thu, 12 Sep 2024)

  Changed paths:
    M .gitlab-ci.d/container-cross.yml
    M .gitlab-ci.d/crossbuilds.yml
    R tests/docker/dockerfiles/debian-armel-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: remove debian-armel-cross

As debian-11 transitions to LTS we are starting to have problems
building the image. While we could update to a later Debian building a
32 bit QEMU without modern floating point is niche host amongst the
few remaining 32 bit hosts we regularly build for. For now we still
have armhf-debian-cross-container which is currently built from the
more recent debian-12.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240910173900.4154726-2-alex.bennee@linaro.org>
(cherry picked from commit d0068b746a0a8cd4bb148527a0d199b130cd5288)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 0db070bd981d3149224cb35887e20e333f627e9c
      
https://github.com/qemu/qemu/commit/0db070bd981d3149224cb35887e20e333f627e9c
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2024-09-12 (Thu, 12 Sep 2024)

  Changed paths:
    M tests/docker/dockerfiles/debian-i686-cross.docker
    M tests/docker/dockerfiles/debian-mipsel-cross.docker
    M tests/lcitool/refresh

  Log Message:
  -----------
  tests/docker: update debian i686 and mipsel images to bookworm

Whatever issues there were which stopped these being updates when the
rest were have now been resolved. However mips64el continues to be
broken so don't update it here.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240910173900.4154726-3-alex.bennee@linaro.org>
(cherry picked from commit 19d2111059c87d3f58349f27b9be9dee81fc1681)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: cfe6dfe1f5e325ab4b0013cdd595495ccbe0cc28
      
https://github.com/qemu/qemu/commit/cfe6dfe1f5e325ab4b0013cdd595495ccbe0cc28
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-09-12 (Thu, 12 Sep 2024)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M contrib/plugins/Makefile

  Log Message:
  -----------
  contrib/plugins/Makefile: Add a 'distclean' target

Running "make distclean" in the build tree currently fails since this
tries to run the "distclean" target in the contrib/plugins/ folder, too,
but the Makefile there is missing this target. Thus add 'distclean' there
to fix this issue.

And to avoid regressions with "make distclean", add this command to one
of the build jobs, too.

Message-ID: <20240902154749.73876-1-thuth@redhat.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 1231bc7d12c373e445171dda9e7e5146eee7da55)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: f0453f1815062cd04434763340e92e91e824f425
      
https://github.com/qemu/qemu/commit/f0453f1815062cd04434763340e92e91e824f425
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2024-09-14 (Sat, 14 Sep 2024)

  Changed paths:
    M hw/audio/trace-events
    M hw/audio/virtio-snd.c

  Log Message:
  -----------
  hw/audio/virtio-sound: fix heap buffer overflow

Currently, the guest may write to the device configuration space,
whereas the virtio sound device specification in chapter 5.14.4
clearly states that the fields in the device configuration space
are driver-read-only.

Remove the set_config function from the virtio_snd class.

This also prevents a heap buffer overflow. See QEMU issue #2296.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2296
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20240901130112.8242-1-vr_qemu@t-online.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit 7fc6611cad3e9627b23ce83e550b668abba6c886)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 9e4712a8c858840f8377183ca2efe2483dbd3588
      
https://github.com/qemu/qemu/commit/9e4712a8c858840f8377183ca2efe2483dbd3588
  Author: Jan Klötzke <jan.kloetzke@kernkonzept.com>
  Date:   2024-09-14 (Sat, 14 Sep 2024)

  Changed paths:
    M hw/intc/arm_gic.c

  Log Message:
  -----------
  hw/intc/arm_gic: fix spurious level triggered interrupts

On GICv2 and later, level triggered interrupts are pending when either
the interrupt line is asserted or the interrupt was made pending by a
GICD_ISPENDRn write. Making a level triggered interrupt pending by
software persists until either the interrupt is acknowledged or cleared
by writing GICD_ICPENDRn. As long as the interrupt line is asserted,
the interrupt is pending in any case.

This logic is transparently implemented in gic_test_pending() for
GICv1 and GICv2.  The function combines the "pending" irq_state flag
(used for edge triggered interrupts and software requests) and the
line status (tracked in the "level" field).  However, we also
incorrectly set the pending flag on a guest write to GICD_ISENABLERn
if the line of a level triggered interrupt was asserted.  This keeps
the interrupt pending even if the line is de-asserted after some
time.

This incorrect logic is a leftover of the initial 11MPCore GIC
implementation.  That handles things slightly differently to the
architected GICv1 and GICv2.  The 11MPCore TRM does not give a lot of
detail on the corner cases of its GIC's behaviour, and historically
we have not wanted to investigate exactly what it does in reality, so
QEMU's GIC model takes the approach of "retain our existing behaviour
for 11MPCore, and implement the architectural standard for later GIC
revisions".

On that basis, commit 8d999995e45c10 in 2013 is where we added the
"level-triggered interrupt with the line asserted" handling to
gic_test_pending(), and we deliberately kept the old behaviour of
gic_test_pending() for REV_11MPCORE.  That commit should have added
the "only if 11MPCore" condition to the setting of the pending bit on
writes to GICD_ISENABLERn, but forgot it.

Add the missing "if REV_11MPCORE" condition, so that our behaviour
on GICv1 and GICv2 matches the GIC architecture requirements.

Cc: qemu-stable@nongnu.org
Fixes: 8d999995e45c10 ("arm_gic: Fix GIC pending behavior")
Signed-off-by: Jan Klötzke <jan.kloetzke@kernkonzept.com>
Message-id: 20240911114826.3558302-1-jan.kloetzke@kernkonzept.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
[PMM: expanded comment a little and converted to coding-style form;
 expanded commit message with the historical backstory]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
(cherry picked from commit 110684c9a69a02cbabfbddcd3afa921826ad565c)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


Compare: https://github.com/qemu/qemu/compare/20eee6cb3d3d...9e4712a8c858

To unsubscribe from these emails, change your notification settings at 
https://github.com/qemu/qemu/settings/notifications