[Qemu-commits] [qemu/qemu] 64c538: *-user: remove the guest_user

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 64c538: *-user: remove the guest_user_syscall

From:	Richard Henderson
Subject:	[Qemu-commits] [qemu/qemu] 64c538: *-user: remove the guest_user_syscall tracepoints
Date:	Wed, 31 May 2023 13:15:00 -0700
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 64c538e204fdf91cdce12fb0a2c019b9560bade1
      
https://github.com/qemu/qemu/commit/64c538e204fdf91cdce12fb0a2c019b9560bade1
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M bsd-user/freebsd/os-syscall.c
    M include/user/syscall-trace.h
    M trace-events

  Log Message:
  -----------
  *-user: remove the guest_user_syscall tracepoints

This is pure duplication now. Both bsd-user and linux-user have
builtin strace support and we can also track syscalls via the plugins
system.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-2-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-2-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 24f1503b784bd251f642e34281678ab1884d60d9
      
https://github.com/qemu/qemu/commit/24f1503b784bd251f642e34281678ab1884d60d9
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M hw/core/cpu-common.c
    M hw/core/trace-events
    M trace-events
    M trace/control-target.c
    M trace/control.c

  Log Message:
  -----------
  trace-events: remove the remaining vcpu trace events

While these are all in helper functions being designated vcpu events
complicates the removal of the dynamic vcpu state code. TCG plugins
allow you to instrument vcpu_[init|exit|idle].

We rename cpu_reset and make it a normal trace point.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-3-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-3-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 32045276239611c0c5967f3f5c849c3f7555f26c
      
https://github.com/qemu/qemu/commit/32045276239611c0c5967f3f5c849c3f7555f26c
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M scripts/tracetool/format/c.py
    M scripts/tracetool/format/h.py
    M trace/control-internal.h
    M trace/control.c
    M trace/event-internal.h

  Log Message:
  -----------
  trace: remove vcpu_id from the TraceEvent structure

This does involve temporarily stubbing out some helper functions
before we excise the rest of the code.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-4-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-4-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 3aa7977761c784d3beb530962e0c48a772c9e850
      
https://github.com/qemu/qemu/commit/3aa7977761c784d3beb530962e0c48a772c9e850
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M scripts/qapi/gen.py

  Log Message:
  -----------
  scripts/qapi: document the tool that generated the file

This makes it a little easier for developers to find where things
where being generated.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-5-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-5-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: ab13c09278362cceca8a19d4e36f10fe140de8dd
      
https://github.com/qemu/qemu/commit/ab13c09278362cceca8a19d4e36f10fe140de8dd
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M docs/about/deprecated.rst

  Log Message:
  -----------
  docs/deprecated: move QMP events bellow QMP command section

Also rename the section to make the fact this is part of the
management protocol even clearer.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-6-alex.bennee@linaro.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: f39446169a8f5cb572394537233f796448cce080
      
https://github.com/qemu/qemu/commit/f39446169a8f5cb572394537233f796448cce080
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M docs/about/deprecated.rst
    M qapi/trace.json

  Log Message:
  -----------
  qapi: make the vcpu parameters deprecated for 8.1

I don't think I can remove the parameters directly but certainly mark
them as deprecated.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-7-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-6-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: de0190f3fe7dfac0245f8e0eebfa4a95105f85f4
      
https://github.com/qemu/qemu/commit/de0190f3fe7dfac0245f8e0eebfa4a95105f85f4
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M hw/core/cpu-common.c
    M stubs/trace-control.c
    M trace/control-internal.h
    M trace/control-target.c
    M trace/control-vcpu.h
    M trace/control.c
    M trace/control.h
    M trace/qmp.c
    M trace/trace-hmp-cmds.c

  Log Message:
  -----------
  trace: remove code that depends on setting vcpu

Now we no longer have any events that are for vcpus we can start
excising the code from the trace control. As the vcpu parameter is
encoded as part of QMP we just stub out the has_vcpu/vcpu parameters
rather than alter the API.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-8-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-7-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: dd109eae9a1d13f6938e1b32ab4a670eea2f57f7
      
https://github.com/qemu/qemu/commit/dd109eae9a1d13f6938e1b32ab4a670eea2f57f7
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M scripts/tracetool/format/h.py
    R trace/control-vcpu.h
    M trace/qmp.c

  Log Message:
  -----------
  trace: remove control-vcpu.h

Now we no longer have vcpu controlled trace events we can excise the
code that allows us to query its status.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-9-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-8-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: fbc69de13f579bb6065cc25eae792f4e5f329e65
      
https://github.com/qemu/qemu/commit/fbc69de13f579bb6065cc25eae792f4e5f329e65
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tb-hash.h
    M accel/tcg/tb-maint.c
    M accel/tcg/translate-all.c
    M include/exec/exec-all.h
    M include/hw/core/cpu.h

  Log Message:
  -----------
  tcg: remove the final vestiges of dstate

Now we no longer have dynamic state affecting things we can remove the
additional fields in cpu.h and simplify the TB hash calculation.

For the benchmark:

    hyperfine -w 2 -m 20 \
      "./arm-softmmu/qemu-system-arm -cpu cortex-a15 \
        -machine type=virt,highmem=off \
        -display none -m 2048 \
        -serial mon:stdio \
        -netdev user,id=unet,hostfwd=tcp::2222-:22 \
        -device virtio-net-pci,netdev=unet \
        -device virtio-scsi-pci \
        -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-armhf
 \
        -device scsi-hd,drive=hd -smp 4 \
        -kernel /home/alex/lsrc/linux.git/builds/arm/arch/arm/boot/zImage \
        -append 'console=ttyAMA0 root=/dev/sda2 systemd.unit=benchmark.service' 
\
        -snapshot"

It has a marginal effect on runtime, before:

  Time (mean ± σ):     26.279 s ±  2.438 s    [User: 41.113 s, System: 1.843 s]
  Range (min … max):   24.420 s … 32.565 s    20 runs

after:

  Time (mean ± σ):     24.440 s ±  2.885 s    [User: 34.474 s, System: 2.028 s]
  Range (min … max):   21.663 s … 29.937 s    20 runs

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1358
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-10-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-9-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: fc7e011e9aca26f00560f71e2f0c0cb049f79600
      
https://github.com/qemu/qemu/commit/fc7e011e9aca26f00560f71e2f0c0cb049f79600
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M hw/9pfs/9p.c

  Log Message:
  -----------
  hw/9pfs: use qemu_xxhash4

No need to pass zeros as we have helpers that do that for us.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20230526165401.574474-11-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-10-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 2e7eda52e5ea2f066b37ecd9fdb5983851eabbbf
      
https://github.com/qemu/qemu/commit/2e7eda52e5ea2f066b37ecd9fdb5983851eabbbf
  Author: Alex Bennée <alex.bennee@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tb-hash.h
    M accel/tcg/tb-maint.c
    M include/qemu/xxhash.h
    M util/qsp.c

  Log Message:
  -----------
  accel/tcg: include cs_base in our hash calculations

We weren't using cs_base in the hash calculations before. Since the
arm front end moved a chunk of flags in a378206a20 (target/arm: Move
mode specific TB flags to tb->cs_base) they comprise of an important
part of the execution state.

Widen the tb_hash_func to include cs_base and expand to qemu_xxhash8()
to accommodate it.

My initial benchmark shows very little difference in the
runtime.

Before:

armhf

➜  hyperfine -w 2 -m 20 "./arm-softmmu/qemu-system-arm -cpu cortex-a15 -machine 
type=virt,highmem=off -display none -m 2048 -serial mon:stdio -netdev 
user,id=unet,hostfwd=tcp::2222-:22 -device virtio-net-pci,netdev=unet -device 
virtio-scsi-pci -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-armhf
 -device scsi-hd,drive=hd -smp 4 -kernel 
/home/alex/lsrc/linux.git/builds/arm/arch/arm/boot/zImage -append 
'console=ttyAMA0 root=/dev/sda2 systemd.unit=benchmark.service' -snapshot"
Benchmark 1: ./arm-softmmu/qemu-system-arm -cpu cortex-a15 -machine 
type=virt,highmem=off -display none -m 2048 -serial mon:stdio -netdev 
user,id=unet,hostfwd=tcp::2222-:22 -device virtio-net-pci,netdev=unet -device 
virtio-scsi-pci -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-armhf
 -device scsi-hd,drive=hd -smp 4 -kernel 
/home/alex/lsrc/linux.git/builds/arm/arch/arm/boot/zImage -append 
'console=ttyAMA0 root=/dev/sda2 systemd.unit=benchmark.service' -snapshot
  Time (mean ± σ):     24.627 s ±  2.708 s    [User: 34.309 s, System: 1.797 s]
  Range (min … max):   22.345 s … 29.864 s    20 runs

arm64

➜  hyperfine -w 2 -n 20 "./qemu-system-aarch64 -cpu max,pauth-impdef=on 
-machine type=virt,virtualization=on,gic-version=3 -display none -serial 
mon:stdio -netdev user,id=unet,hostfwd=tcp::2222-:22,hostfwd=tcp::1234-:1234 
-device virtio-net-pci,netdev=unet -device virtio-scsi-pci -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-arm64
 -device scsi-hd,drive=hd -smp 4 -kernel 
~/lsrc/linux.git/builds/arm64/arch/arm64/boot/Image.gz -append 'console=ttyAMA0 
root=/dev/sda2 systemd.unit=benchmark-pigz.service' -snapshot"
Benchmark 1: 20
  Time (mean ± σ):     62.559 s ±  2.917 s    [User: 189.115 s, System: 4.089 s]
  Range (min … max):   59.997 s … 70.153 s    10 runs

After:

armhf

Benchmark 1: ./arm-softmmu/qemu-system-arm -cpu cortex-a15 -machine 
type=virt,highmem=off -display none -m 2048 -serial mon:stdio -netdev 
user,id=unet,hostfwd=tcp::2222-:22 -device virtio-net-pci,netdev=unet -device 
virtio-scsi-pci -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-armhf
 -device scsi-hd,drive=hd -smp 4 -kernel 
/home/alex/lsrc/linux.git/builds/arm/arch/arm/boot/zImage -append 
'console=ttyAMA0 root=/dev/sda2 systemd.unit=benchmark.service' -snapshot
  Time (mean ± σ):     24.223 s ±  2.151 s    [User: 34.284 s, System: 1.906 s]
  Range (min … max):   22.000 s … 28.476 s    20 runs

arm64

hyperfine -w 2 -n 20 "./qemu-system-aarch64 -cpu max,pauth-impdef=on -machine 
type=virt,virtualization=on,gic-version=3 -display none -serial mon:stdio 
-netdev user,id=unet,hostfwd=tcp::2222-:22,hostfwd=tcp::1234-:1234 -device 
virtio-net-pci,netdev=unet -device virtio-scsi-pci -blockdev 
driver=raw,node-name=hd,discard=unmap,file.driver=host_device,file.filename=/dev/zen-disk/debian-bullseye-arm64
 -device scsi-hd,drive=hd -smp 4 -kernel 
~/lsrc/linux.git/builds/arm64/arch/arm64/boot/Image.gz -append 'console=ttyAMA0 
root=/dev/sda2 systemd.unit=benchmark-pigz.service' -snapshot"
Benchmark 1: 20
  Time (mean ± σ):     62.769 s ±  1.978 s    [User: 188.431 s, System: 5.269 s]
  Range (min … max):   60.285 s … 66.868 s    10 runs

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230526165401.574474-12-alex.bennee@linaro.org
Message-Id: <20230524133952.3971948-11-alex.bennee@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 2d786cdffa7d06f31c11d00dc66d2ab65574fb35
      
https://github.com/qemu/qemu/commit/2d786cdffa7d06f31c11d00dc66d2ab65574fb35
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-05-31 (Wed, 31 May 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tb-hash.h
    M accel/tcg/tb-maint.c
    M accel/tcg/translate-all.c
    M bsd-user/freebsd/os-syscall.c
    M docs/about/deprecated.rst
    M hw/9pfs/9p.c
    M hw/core/cpu-common.c
    M hw/core/trace-events
    M include/exec/exec-all.h
    M include/hw/core/cpu.h
    M include/qemu/xxhash.h
    M include/user/syscall-trace.h
    M qapi/trace.json
    M scripts/qapi/gen.py
    M scripts/tracetool/format/c.py
    M scripts/tracetool/format/h.py
    M stubs/trace-control.c
    M trace-events
    M trace/control-internal.h
    M trace/control-target.c
    R trace/control-vcpu.h
    M trace/control.c
    M trace/control.h
    M trace/event-internal.h
    M trace/qmp.c
    M trace/trace-hmp-cmds.c
    M util/qsp.c

  Log Message:
  -----------
  Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into 
staging

Pull request

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmR3pGwACgkQnKSrs4Gr
# c8i8RAf8CvZEWjXySRer/8pLdGPVxuNDJ2Ju4gbpQ3chW+31T8LhfZ+KUtJnUcgX
# 43ICKIZTppq7QxXLcty7yqB7O0OlLylDjrU39uSp60qSdxGFpPk3Pu09bvg+rFua
# k84weSS2BRg6A9BGB7GCiN9IM2TLSCF72Am9ufVUn6kjhTAQr78bxijw+HB/nqXc
# +F//aEiEV8UMvfK+bPoTB2ZyLDnO50McbyXbpcZ3Mugz8qFqh71ZbxL7VONyPQaa
# mfWiPUcUvT42iK71hPBMSnn11SmJpjtS5FIrj+eOmnDX5MmECEVc0Cjxrfnu5suT
# ZPGAloA+1ORXtpjcDt27ub1YzMjq2w==
# =tuOx
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 31 May 2023 12:47:56 PM PDT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]

* tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu:
  accel/tcg: include cs_base in our hash calculations
  hw/9pfs: use qemu_xxhash4
  tcg: remove the final vestiges of dstate
  trace: remove control-vcpu.h
  trace: remove code that depends on setting vcpu
  qapi: make the vcpu parameters deprecated for 8.1
  docs/deprecated: move QMP events bellow QMP command section
  scripts/qapi: document the tool that generated the file
  trace: remove vcpu_id from the TraceEvent structure
  trace-events: remove the remaining vcpu trace events
  *-user: remove the guest_user_syscall tracepoints

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/ab7252279727...2d786cdffa7d
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 64c538: *-user: remove the guest_user_syscall tracepoints, Richard Henderson <=
Prev by Date: [Qemu-commits] [qemu/qemu] ab7252: gitlab: switch from 'stable' to 'latest' docker co...
Next by Date: [Qemu-commits] [qemu/qemu] 9341b2: python/qmp: allow sockets to be passed to connect()
Previous by thread: [Qemu-commits] [qemu/qemu] ab7252: gitlab: switch from 'stable' to 'latest' docker co...
Next by thread: [Qemu-commits] [qemu/qemu] 9341b2: python/qmp: allow sockets to be passed to connect()
Index(es):
- Date
- Thread