qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 8b09b7: hw/scsi/lsi53c895a: add missing decre

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 8b09b7: hw/scsi/lsi53c895a: add missing decrement of reent...
Date: Thu, 08 Feb 2024 03:59:59 -0800 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 8b09b7fe47082c69295a0fc0cc01b041b6385025
      
https://github.com/qemu/qemu/commit/8b09b7fe47082c69295a0fc0cc01b041b6385025
  Author: Sven Schnelle <svens@stackframe.org>
  Date:   2024-02-05 (Mon, 05 Feb 2024)

  Changed paths:
    M hw/scsi/lsi53c895a.c

  Log Message:
  -----------
  hw/scsi/lsi53c895a: add missing decrement of reentrancy counter

When the maximum count of SCRIPTS instructions is reached, the code
stops execution and returns, but fails to decrement the reentrancy
counter. This effectively renders the SCSI controller unusable
because on next entry the reentrancy counter is still above the limit.

This bug was seen on HP-UX 10.20 which seems to trigger SCRIPTS
loops.

Fixes: b987718bbb ("hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI 
controller (CVE-2023-0330)")
Signed-off-by: Sven Schnelle <svens@stackframe.org>
Message-ID: <20240128202214.2644768-1-svens@stackframe.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Helge Deller <deller@gmx.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 5bfb75f15297a91161f720f997792dd9abc05dea
      
https://github.com/qemu/qemu/commit/5bfb75f15297a91161f720f997792dd9abc05dea
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-05 (Mon, 05 Feb 2024)

  Changed paths:
    M hw/ppc/spapr_cpu_core.c
    M qom/object.c
    M target/ppc/cpu-models.c

  Log Message:
  -----------
  target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules

The character "+" is now forbidden in QOM device names (see commit
b447378e1217 - "Limit type names to alphanumerical and some few special
characters"). For the "power5+" and "power7+" CPU names, there is
currently a hack in type_name_is_valid() to still allow them for
compatibility reasons. However, there is a much nicer solution for this:
Simply use aliases! This way we can still support the old names without
the need for the ugly hack in type_name_is_valid().

Message-ID: <20240117141054.73841-2-thuth@redhat.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 6a41a621715976237bdf24499b617592a24fefb2
      
https://github.com/qemu/qemu/commit/6a41a621715976237bdf24499b617592a24fefb2
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2024-02-05 (Mon, 05 Feb 2024)

  Changed paths:
    M docs/about/deprecated.rst

  Log Message:
  -----------
  docs/about: Deprecate the old "power5+" and "power7+" CPU names

For consistency we should drop the names with a "+" in it in the
long run.

Message-ID: <20240117141054.73841-3-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a6e55a82e9b4b9f85f46e93a4f540ac0ec72c3ad
      
https://github.com/qemu/qemu/commit/a6e55a82e9b4b9f85f46e93a4f540ac0ec72c3ad
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M target/s390x/helper.h
    M target/s390x/tcg/insn-data.h.inc
    M target/s390x/tcg/int_helper.c
    M target/s390x/tcg/translate.c

  Log Message:
  -----------
  target/s390x: Emulate CVDG

CVDG is the same as CVD, except that it converts 64 bits into 128,
rather than 32 into 64. Create a new helper, which uses Int128
wrappers.

Reported-by: Ido Plat <Ido.Plat@ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240205205830.6425-2-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: b4b8d58e5622d9e4df5a877c827c6a304cde5e98
      
https://github.com/qemu/qemu/commit/b4b8d58e5622d9e4df5a877c827c6a304cde5e98
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M target/s390x/helper.h
    M target/s390x/tcg/insn-data.h.inc
    M target/s390x/tcg/int_helper.c
    M target/s390x/tcg/translate.c

  Log Message:
  -----------
  target/s390x: Emulate CVB, CVBY and CVBG

Convert to Binary - counterparts of the already implemented Convert
to Decimal (CVD*) instructions.
Example from the Principles of Operation: 25594C becomes 63FA.

Co-developed-by: Pavel Zbitskiy <pavel.zbitskiy@gmail.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240205205830.6425-3-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 5b003b59aceb415a4df18ff5071501d282c13655
      
https://github.com/qemu/qemu/commit/5b003b59aceb415a4df18ff5071501d282c13655
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M tests/tcg/s390x/Makefile.target
    A tests/tcg/s390x/cvd.c

  Log Message:
  -----------
  tests/tcg/s390x: Test CONVERT TO DECIMAL

Check the CVD's, CVDY's, and CVDG's corner cases.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240205205830.6425-4-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: eb14b021f80a2a295f4cb654c95f2815c87931f1
      
https://github.com/qemu/qemu/commit/eb14b021f80a2a295f4cb654c95f2815c87931f1
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M tests/tcg/s390x/Makefile.target
    A tests/tcg/s390x/cvb.c

  Log Message:
  -----------
  tests/tcg/s390x: Test CONVERT TO BINARY

Check the CVB's, CVBY's, and CVBG's corner cases.

Co-developed-by: Pavel Zbitskiy <pavel.zbitskiy@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240205205830.6425-5-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: d0143fa9ee5632900ddc6f03c36c46845d48af18
      
https://github.com/qemu/qemu/commit/d0143fa9ee5632900ddc6f03c36c46845d48af18
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M target/s390x/cpu-dump.c
    M target/s390x/gdbstub.c
    M target/s390x/helper.c
    M target/s390x/kvm/kvm.c
    M target/s390x/tcg/excp_helper.c
    M target/s390x/tcg/misc_helper.c
    M target/s390x/tcg/translate.c

  Log Message:
  -----------
  target/s390x: Prefer fast cpu_env() over slower CPU QOM cast macro

Mechanical patch produced running the command documented
in scripts/coccinelle/cpu_env.cocci_template header.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240129164514.73104-25-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 7f0bf5ea415d7108bebda2013ab782d4ccaaba9d
      
https://github.com/qemu/qemu/commit/7f0bf5ea415d7108bebda2013ab782d4ccaaba9d
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M tests/vm/basevm.py

  Log Message:
  -----------
  tests/vm: Set UseDNS=no in the sshd configuration

make vm-build-freebsd sometimes fails with "Connection timed out during
banner exchange". The client strace shows:

    13:59:30 write(3, "SSH-2.0-OpenSSH_9.3\r\n", 21) = 21
    13:59:30 getpid()                       = 252655
    13:59:30 poll([{fd=3, events=POLLIN}], 1, 5000) = 1 ([{fd=3, 
revents=POLLIN}])
    13:59:32 read(3, "S", 1)                = 1
    13:59:32 poll([{fd=3, events=POLLIN}], 1, 3625) = 1 ([{fd=3, 
revents=POLLIN}])
    13:59:32 read(3, "S", 1)                = 1
    13:59:32 poll([{fd=3, events=POLLIN}], 1, 3625) = 1 ([{fd=3, 
revents=POLLIN}])
    13:59:32 read(3, "H", 1)                = 1

There is a 2s delay during connection, and ConnectTimeout is set to 1.
Raising it makes the issue go away, but we can do better. The server
truss shows:

    888: 27.811414714 socket(PF_INET,SOCK_DGRAM|SOCK_CLOEXEC,0) = 5 (0x5)
    888: 27.811765030 connect(5,{ AF_INET 10.0.2.3:53 },16) = 0 (0x0)
    888: 27.812166941 sendto(5,"\^Z/\^A\0\0\^A\0\0\0\0\0\0\^A2"...,39,0,NULL,0) 
= 39 (0x27)
    888: 29.363970743 poll({ 5/POLLRDNORM },1,5000) = 1 (0x1)

So the delay is due to a DNS query. Disable DNS queries in the server
config.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240206002344.12372-2-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: fceffd6b3fa8f1e10248baf75af0c62a9f20df7b
      
https://github.com/qemu/qemu/commit/fceffd6b3fa8f1e10248baf75af0c62a9f20df7b
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M tests/vm/freebsd

  Log Message:
  -----------
  tests/vm/freebsd: Reload the sshd configuration

After console_sshd_config(), the SSH server needs to be nudged to pick
up the new configs. The scripts for the other BSD flavors already do
this with a reboot, but a simple reload is sufficient.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240206002344.12372-3-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 3faebbcd64a657a5fd1f03cbad4bd171331f61b6
      
https://github.com/qemu/qemu/commit/3faebbcd64a657a5fd1f03cbad4bd171331f61b6
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M tests/unit/test-util-filemonitor.c

  Log Message:
  -----------
  test-util-filemonitor: Adapt to the FreeBSD inotify rename semantics

Unlike on Linux, on FreeBSD renaming a file when the destination
already exists results in an IN_DELETE event for that existing file:

    $ FILEMONITOR_DEBUG=1 build/tests/unit/test-util-filemonitor
    Rename /tmp/test-util-filemonitor-K13LI2/fish/one.txt -> 
/tmp/test-util-filemonitor-K13LI2/two.txt
    Event id=200000000 event=2 file=one.txt
    Queue event id 200000000 event 2 file one.txt
    Queue event id 100000000 event 2 file two.txt
    Queue event id 100000002 event 2 file two.txt
    Queue event id 100000000 event 0 file two.txt
    Queue event id 100000002 event 0 file two.txt
    Event id=100000000 event=0 file=two.txt
    Expected event 0 but got 2

This difference in behavior is not expected to break the real users, so
teach the test to accept it.

Suggested-by: "Daniel P. Berrange" <berrange@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Message-ID: <20240206002344.12372-4-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: a1a9800e9721f7a4b0762b97ff8961473870bc54
      
https://github.com/qemu/qemu/commit/a1a9800e9721f7a4b0762b97ff8961473870bc54
  Author: Ilya Leoshkevich <iii@linux.ibm.com>
  Date:   2024-02-06 (Tue, 06 Feb 2024)

  Changed paths:
    M meson.build
    M util/meson.build

  Log Message:
  -----------
  meson: Link with libinotify on FreeBSD

make vm-build-freebsd fails with:

    ld: error: undefined symbol: inotify_init1
    >>> referenced by filemonitor-inotify.c:183 
(../src/util/filemonitor-inotify.c:183)
    >>>               util_filemonitor-inotify.c.o:(qemu_file_monitor_new) in 
archive libqemuutil.a

On FreeBSD the inotify functions are defined in libinotify.so. Add it
to the dependencies.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240206002344.12372-5-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>


  Commit: 8ab67b6ebc721041b22aa0e60f5422166dada234
      
https://github.com/qemu/qemu/commit/8ab67b6ebc721041b22aa0e60f5422166dada234
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-08 (Thu, 08 Feb 2024)

  Changed paths:
    M backends/hostmem.c
    M hw/hyperv/hv-balloon.c
    M hw/mem/memory-device.c
    M hw/virtio/virtio-mem.c
    M include/hw/qdev-core.h
    M include/qemu/osdep.h
    M system/vl.c
    M util/oslib-posix.c
    M util/oslib-win32.c

  Log Message:
  -----------
  Merge tag 'mem-2024-02-06-v3' of https://github.com/davidhildenbrand/qemu 
into staging

Hi,

"Host Memory Backends" and "Memory devices" queue ("mem"):
- Reintroduce memory region size checks for memory devices; the removal
  lead to some undesired side effects
- Preallocate memory of memory backends in selected configurations
  asynchronously (so we preallocate concurrently), to speed up QEMU
  startup time.

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEG9nKrXNcTDpGDfzKTd4Q9wD/g1oFAmXB3LcRHGRhdmlkQHJl
# ZGhhdC5jb20ACgkQTd4Q9wD/g1plRA/+N8y4aJB+qEwacl5scIpiWShqeBA0aybS
# Rp3796djgjkqozkv7AFGHrOIGiLDtCh4W1JYuML7kLN7IvuJoHSY+AHzfhDiae1l
# eluX/Cs/5rgEninwT9M0yEkgvUybA8+kx+z96hBJgkfJOrdbETc7YVbU5iP/sOOF
# UtfEVWGwT1RJOun0qrgEhHiJCTMcHyJjSEy8D867ymC+knu3OZIz22+axcmpHz6i
# QJFgY40OCP1yxBvPVLR3K/Z0se/FkxG55LwM58j7N/m+VDv4IqZCTbkZb5BTJVla
# 5vKgIrZfZ+XFqrenyMsBnBLgQuyCmDJIDFfxM0A9gOvJbwtf8T4DhL9FoRvVZMDD
# SHBl/EZcViXFDDKVHjotBSA5JoNbjHac5J5jCFu7pRq+2DbzxWHmW6xV7sY9gkSO
# +SdW9hcmF/vF5MKHfoQR2kVLLJ2/EKHiN/xVVsha0+RQDctucrhg1Y9MS2obJV3u
# u2udaVk5UNcfNPuVPwkG8YQ0sIyuDYXOTThwNtsj0tyZ+tGVQmMIlou/GAsrc9PF
# xmqzkCXXyrILrPMQJrYBcdwasBLuEcJMW59BqgxHCVP9NiAQgsNVzXFg4mr3+mVF
# xTrt8wioTvAPoDvXe+BPoaH6AsIY2TqE8j7IqA1Q/IFNf+KLYkPcHknZfzfxSkdW
# woRHVtjrkMo=
# =lW5h
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 06 Feb 2024 07:16:07 GMT
# gpg:                using RSA key 1BD9CAAD735C4C3A460DFCCA4DDE10F700FF835A
# gpg:                issuer "david@redhat.com"
# gpg: Good signature from "David Hildenbrand <david@redhat.com>" [marginal]
# gpg:                 aka "David Hildenbrand <davidhildenbrand@gmail.com>" 
[full]
# gpg:                 aka "David Hildenbrand <hildenbr@in.tum.de>" [unknown]
# Primary key fingerprint: 1BD9 CAAD 735C 4C3A 460D  FCCA 4DDE 10F7 00FF 835A

* tag 'mem-2024-02-06-v3' of https://github.com/davidhildenbrand/qemu:
  oslib-posix: initialize backend memory objects in parallel
  memory-device: reintroduce memory region size check
  hv-balloon: use get_min_alignment() to express 32 GiB alignment

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


  Commit: 9e34f127f419b3941b36dfdfac79640dc81e97e2
      
https://github.com/qemu/qemu/commit/9e34f127f419b3941b36dfdfac79640dc81e97e2
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-02-08 (Thu, 08 Feb 2024)

  Changed paths:
    M docs/about/deprecated.rst
    M hw/ppc/spapr_cpu_core.c
    M hw/scsi/lsi53c895a.c
    M meson.build
    M qom/object.c
    M target/ppc/cpu-models.c
    M target/s390x/cpu-dump.c
    M target/s390x/gdbstub.c
    M target/s390x/helper.c
    M target/s390x/helper.h
    M target/s390x/kvm/kvm.c
    M target/s390x/tcg/excp_helper.c
    M target/s390x/tcg/insn-data.h.inc
    M target/s390x/tcg/int_helper.c
    M target/s390x/tcg/misc_helper.c
    M target/s390x/tcg/translate.c
    M tests/tcg/s390x/Makefile.target
    A tests/tcg/s390x/cvb.c
    A tests/tcg/s390x/cvd.c
    M tests/unit/test-util-filemonitor.c
    M tests/vm/basevm.py
    M tests/vm/freebsd
    M util/meson.build

  Log Message:
  -----------
  Merge tag 'pull-request-2024-02-06' of https://gitlab.com/thuth/qemu into 
staging

* Emulate CVB, CVBY, CVBG and CVDG s390x instructions
* Fix bug in lsi53c895a reentrancy counter
* Deprecate the "power5+" and "power7+" CPU names
* Fix problems in the freebsd VM test

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmXCCXURHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbXtEA/9HKWMHbWqDAdlrpmfW8lCFaBHgV0+Fqsy
# GlxJykni2BxIWNoR7J6SdAqbgx3E2/7i8IMIUwYXlNBjEs/UQ0ZcnI5k6OfUS24p
# qfbdH717SgsaB9R1vCBhmOGGWYBfe/RqPGIcni/eg+jSxB5cn2XvEv3+ZBckvDsh
# KFuuAa6vvuBVhyXLbkP8Z+LEe27ttIYi5v1dvJ1an4UbFESqxVb0knyuFYpZpY8Y
# h7dZ0hyCid7YT03zVmSADK7anO+epBdzUU3SsKXj2dB9nebSjmkav6lQQBKYHHUg
# THojcWKwFPNK0AojhBuBCqFYgkGGt/9kjwlUt7jfm1TcSemN65XLNYHThRekPuAJ
# Jcze8dcEerbj1xsNWYh4hPvB92laEiyVR5BYFfUkJ9m2IAamPQLHvOT7jzhC3Y9k
# 4wvVcf9QKVtKW0QO54SQjD4A/qQu/4777oH5w83nGuxjUthmHDqZmjDlIRe6lKJt
# gsA+mKn+w9HrtiXOSkoMhK8PAyvCoAef/N7kvHZoHmp6TtfQAjPs4/v2uZMpnd60
# z7Cw50giHpo9lmiZ1Ey2fQvw9orYhNoXAc4XfYGHuYdQFWpCGz1PB2Km8uTPTEUe
# as364ULBqWoFBCRuRndy2+z2e3zhK5THTPCAyHf48M6teMEPa4KTsTCk7MzmfVfx
# C8RsLcmrFPI=
# =eQNc
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 06 Feb 2024 10:27:01 GMT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2024-02-06' of https://gitlab.com/thuth/qemu:
  meson: Link with libinotify on FreeBSD
  test-util-filemonitor: Adapt to the FreeBSD inotify rename semantics
  tests/vm/freebsd: Reload the sshd configuration
  tests/vm: Set UseDNS=no in the sshd configuration
  target/s390x: Prefer fast cpu_env() over slower CPU QOM cast macro
  tests/tcg/s390x: Test CONVERT TO BINARY
  tests/tcg/s390x: Test CONVERT TO DECIMAL
  target/s390x: Emulate CVB, CVBY and CVBG
  target/s390x: Emulate CVDG
  docs/about: Deprecate the old "power5+" and "power7+" CPU names
  target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules
  hw/scsi/lsi53c895a: add missing decrement of reentrancy counter

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


Compare: https://github.com/qemu/qemu/compare/d05f553a7f8d...9e34f127f419
reply via email to
[Prev in Thread] Current Thread [Next in Thread]