* [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins)
@ 2024-09-10 14:07 Alex Bennée
2024-09-10 14:07 ` [PATCH 01/26] tests/docker: remove debian-armel-cross Alex Bennée
` (25 more replies)
0 siblings, 26 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
Hi,
Here is the current state of my maintainer trees.
Testing
I've updated a number of the docker containers to deal with breakages
in the crossdev environments as bullseye moves to LTS. I've dropped
the armel environment which doesn't really add much to the armhf cross
build we have that works. i686 and mipsel cross containers are bumped
up to bookworm. Currently mips64el is still broken.
gdbstub
This brings in Gustavo's patches to support MTE for system mode
expanding on the previously implemented user mode support.
plugins
I start by deprecating some options that don't make much sense for
instrumentation including 32 bit and TCI support. They will still work
but there are caveats and it doesn't seem worth wasting CI time
keeping track of them.
There are a couple of new plugins including some useful analysis ones.
The bbv plugin can generate files that can be fed into simpoint. The
cflow plugin I've posted before separately but takes advantage of the
new conditional and store helpers to try and be more efficient tracing
control flow.
Finally there is not one but two memory APIs. Pierrick's updates to
the main memory instrumentation now makes values available to the
plugins and should be used if you absolutely want to track what value
was read or stored. I've added a softmmu test case building on
memory.c and I'll merge the updated linux-user test case once its been
re-spun.
Rowan's API provides a more direct access through the existing debug
API but comes with the caveats that it should only used on memory you
don't expect to be changing. The example provided allows for the
contents of syscalls to be probed at the syscall point.
Finally there is a RFC for a gdbstub hook which I mostly wrote while I
was debugging weirdness in the memory stuff. I'll probably drop it
before the PR and let it cook a bit more on plugins/next.
The following still need review:
plugins: add ability to register a GDB triggered callback
util/timer: avoid deadlock when shutting down
tests/tcg: add a system test to check memory instrumentation
tests/tcg: only read/write 64 bit words on 64 bit systems
tests/tcg: clean up output of memory system test
contrib/plugins: control flow plugin
deprecation: don't enable TCG plugins by default with TCI
deprecation: don't enable TCG plugins by default on 32 bit hosts
scripts/ci: update the gitlab-runner playbook
docs/devel: fix duplicate line
tests/docker: update debian i686 and mipsel images to bookworm
tests/docker: remove debian-armel-cross
Akihiko Odaki (1):
contrib/plugins: Add a plugin to generate basic block vectors
Alex Bennée (12):
tests/docker: remove debian-armel-cross
tests/docker: update debian i686 and mipsel images to bookworm
docs/devel: fix duplicate line
scripts/ci: update the gitlab-runner playbook
deprecation: don't enable TCG plugins by default on 32 bit hosts
deprecation: don't enable TCG plugins by default with TCI
contrib/plugins: control flow plugin
tests/tcg: clean up output of memory system test
tests/tcg: only read/write 64 bit words on 64 bit systems
tests/tcg: add a system test to check memory instrumentation
util/timer: avoid deadlock when shutting down
plugins: add ability to register a GDB triggered callback
Gustavo Romero (5):
gdbstub: Use specific MMU index when probing MTE addresses
gdbstub: Add support for MTE in system mode
tests/guest-debug: Support passing arguments to the GDB test script
tests/tcg/aarch64: Improve linker script organization
tests/tcg/aarch64: Extend MTE gdbstub tests to system mode
Pierrick Bouvier (5):
plugins: save value during memory accesses
plugins: extend API to get latest memory value accessed
tests/tcg: add mechanism to run specific tests with plugins
tests/tcg: allow to check output of plugins
tests/plugin/mem: add option to print memory accesses
Rowan Hart (2):
plugins: add plugin API to read guest memory
plugins: add option to dump write argument to syscall plugin
Thomas Huth (1):
contrib/plugins/Makefile: Add a 'distclean' target
docs/about/deprecated.rst | 19 +
docs/about/emulation.rst | 44 +-
docs/devel/testing/main.rst | 6 -
configure | 37 +-
accel/tcg/atomic_template.h | 66 ++-
include/hw/core/cpu.h | 4 +
include/qemu/plugin-event.h | 1 +
include/qemu/plugin.h | 4 +
include/qemu/qemu-plugin.h | 80 +++-
plugins/plugin.h | 9 +
contrib/plugins/bbv.c | 158 +++++++
contrib/plugins/cflow.c | 413 ++++++++++++++++++
plugins/api.c | 71 +++
plugins/core.c | 43 ++
target/arm/gdbstub64.c | 21 +-
tcg/tcg-op-ldst.c | 66 ++-
tests/tcg/multiarch/system/memory.c | 123 ++++--
tests/tcg/plugins/mem.c | 254 ++++++++++-
tests/tcg/plugins/syscall.c | 117 +++++
util/qemu-timer.c | 14 +-
accel/tcg/atomic_common.c.inc | 13 +-
accel/tcg/ldst_common.c.inc | 38 +-
.gitlab-ci.d/buildtest.yml | 2 +
.gitlab-ci.d/container-cross.yml | 6 -
.gitlab-ci.d/crossbuilds.yml | 7 -
contrib/plugins/Makefile | 4 +-
plugins/qemu-plugins.symbols | 3 +
scripts/ci/setup/gitlab-runner.yml | 39 +-
.../dockerfiles/debian-armel-cross.docker | 179 --------
.../dockerfiles/debian-i686-cross.docker | 10 +-
.../dockerfiles/debian-mipsel-cross.docker | 10 +-
tests/guest-debug/run-test.py | 6 +
tests/guest-debug/test_gdbstub.py | 5 +
tests/lcitool/refresh | 10 +-
tests/tcg/Makefile.target | 12 +-
tests/tcg/aarch64/Makefile.softmmu-target | 49 ++-
tests/tcg/aarch64/Makefile.target | 3 +-
tests/tcg/aarch64/gdbstub/test-mte.py | 71 ++-
tests/tcg/aarch64/system/boot.S | 11 +
tests/tcg/aarch64/system/kernel.ld | 33 +-
tests/tcg/aarch64/system/mte.S | 109 +++++
tests/tcg/alpha/Makefile.softmmu-target | 2 +-
.../multiarch/system/Makefile.softmmu-target | 6 +
.../system/validate-memory-counts.py | 115 +++++
44 files changed, 1935 insertions(+), 358 deletions(-)
create mode 100644 contrib/plugins/bbv.c
create mode 100644 contrib/plugins/cflow.c
delete mode 100644 tests/docker/dockerfiles/debian-armel-cross.docker
create mode 100644 tests/tcg/aarch64/system/mte.S
create mode 100755 tests/tcg/multiarch/system/validate-memory-counts.py
--
2.39.2
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH 01/26] tests/docker: remove debian-armel-cross
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm Alex Bennée
` (24 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
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.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/container-cross.yml | 6 -
.gitlab-ci.d/crossbuilds.yml | 7 -
.../dockerfiles/debian-armel-cross.docker | 179 ------------------
tests/lcitool/refresh | 6 -
4 files changed, 198 deletions(-)
delete mode 100644 tests/docker/dockerfiles/debian-armel-cross.docker
diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index e3103940a0..9a3ebd885e 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -22,12 +22,6 @@ arm64-debian-cross-container:
variables:
NAME: debian-arm64-cross
-armel-debian-cross-container:
- extends: .container_job_template
- stage: containers
- variables:
- NAME: debian-armel-cross
-
armhf-debian-cross-container:
extends: .container_job_template
stage: containers
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index cb499e4ee0..459273f9da 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -1,13 +1,6 @@
include:
- local: '/.gitlab-ci.d/crossbuild-template.yml'
-cross-armel-user:
- extends: .cross_user_build_job
- needs:
- job: armel-debian-cross-container
- variables:
- IMAGE: debian-armel-cross
-
cross-armhf-user:
extends: .cross_user_build_job
needs:
diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
deleted file mode 100644
index 8476fc8cce..0000000000
--- a/tests/docker/dockerfiles/debian-armel-cross.docker
+++ /dev/null
@@ -1,179 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:11-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- bash \
- bc \
- bison \
- bsdextrautils \
- bzip2 \
- ca-certificates \
- ccache \
- dbus \
- debianutils \
- diffutils \
- exuberant-ctags \
- findutils \
- flex \
- gcc \
- gcovr \
- gettext \
- git \
- hostname \
- libglib2.0-dev \
- libgtk-vnc-2.0-dev \
- libpcre2-dev \
- libsndio-dev \
- libspice-protocol-dev \
- llvm \
- locales \
- make \
- meson \
- mtools \
- ncat \
- ninja-build \
- openssh-client \
- pkgconf \
- python3 \
- python3-numpy \
- python3-opencv \
- python3-pillow \
- python3-pip \
- python3-setuptools \
- python3-sphinx \
- python3-sphinx-rtd-theme \
- python3-venv \
- python3-wheel \
- python3-yaml \
- rpm2cpio \
- sed \
- socat \
- sparse \
- tar \
- tesseract-ocr \
- tesseract-ocr-eng \
- xorriso \
- zstd && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-
-RUN /usr/bin/pip3 install tomli
-
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture armel && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- gcc-arm-linux-gnueabi \
- libaio-dev:armel \
- libasan6:armel \
- libasound2-dev:armel \
- libattr1-dev:armel \
- libbpf-dev:armel \
- libbrlapi-dev:armel \
- libbz2-dev:armel \
- libc6-dev:armel \
- libcacard-dev:armel \
- libcap-ng-dev:armel \
- libcapstone-dev:armel \
- libcmocka-dev:armel \
- libcurl4-gnutls-dev:armel \
- libdaxctl-dev:armel \
- libdrm-dev:armel \
- libepoxy-dev:armel \
- libfdt-dev:armel \
- libffi-dev:armel \
- libfuse3-dev:armel \
- libgbm-dev:armel \
- libgcrypt20-dev:armel \
- libglib2.0-dev:armel \
- libglusterfs-dev:armel \
- libgnutls28-dev:armel \
- libgtk-3-dev:armel \
- libibverbs-dev:armel \
- libiscsi-dev:armel \
- libjemalloc-dev:armel \
- libjpeg62-turbo-dev:armel \
- libjson-c-dev:armel \
- liblttng-ust-dev:armel \
- liblzo2-dev:armel \
- libncursesw5-dev:armel \
- libnfs-dev:armel \
- libnuma-dev:armel \
- libpam0g-dev:armel \
- libpipewire-0.3-dev:armel \
- libpixman-1-dev:armel \
- libpng-dev:armel \
- libpulse-dev:armel \
- librbd-dev:armel \
- librdmacm-dev:armel \
- libsasl2-dev:armel \
- libsdl2-dev:armel \
- libsdl2-image-dev:armel \
- libseccomp-dev:armel \
- libselinux1-dev:armel \
- libslirp-dev:armel \
- libsnappy-dev:armel \
- libspice-server-dev:armel \
- libssh-gcrypt-dev:armel \
- libsystemd-dev:armel \
- libtasn1-6-dev:armel \
- libubsan1:armel \
- libudev-dev:armel \
- liburing-dev:armel \
- libusb-1.0-0-dev:armel \
- libusbredirhost-dev:armel \
- libvdeplug-dev:armel \
- libvirglrenderer-dev:armel \
- libvte-2.91-dev:armel \
- libzstd-dev:armel \
- nettle-dev:armel \
- systemtap-sdt-dev:armel \
- zlib1g-dev:armel && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- printf "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
-
-ENV ABI "arm-linux-gnueabi"
-ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"
-ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi-
-ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user
-# As a final step configure the user (if env is defined)
-ARG USER
-ARG UID
-RUN if [ "${USER}" ]; then \
- id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index ac803e34f1..199d5fad87 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -154,12 +154,6 @@ try:
trailer=cross_build("aarch64-linux-gnu-",
"aarch64-softmmu,aarch64-linux-user"))
- # migration to bookworm stalled: https://lists.debian.org/debian-arm/2023/09/msg00006.html
- generate_dockerfile("debian-armel-cross", "debian-11",
- cross="armv6l",
- trailer=cross_build("arm-linux-gnueabi-",
- "arm-softmmu,arm-linux-user,armeb-linux-user"))
-
generate_dockerfile("debian-armhf-cross", "debian-12",
cross="armv7l",
trailer=cross_build("arm-linux-gnueabihf-",
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
2024-09-10 14:07 ` [PATCH 01/26] tests/docker: remove debian-armel-cross Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 03/26] docs/devel: fix duplicate line Alex Bennée
` (23 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
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.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/debian-i686-cross.docker | 10 ++++------
tests/docker/dockerfiles/debian-mipsel-cross.docker | 10 ++++------
tests/lcitool/refresh | 4 ++--
3 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index 3fe8ee623d..2328ee1732 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch i686 debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
+ swtpm \
tar \
tesseract-ocr \
tesseract-ocr-eng \
@@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
dpkg-reconfigure locales && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -145,6 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:i386 \
libvirglrenderer-dev:i386 \
libvte-2.91-dev:i386 \
+ libxdp-dev:i386 \
libzstd-dev:i386 \
nettle-dev:i386 \
systemtap-sdt-dev:i386 \
diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
index 0d559ae4ba..4ac314e22e 100644
--- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
+++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
@@ -1,10 +1,10 @@
# THIS FILE WAS AUTO-GENERATED
#
-# $ lcitool dockerfile --layers all --cross-arch mipsel debian-11 qemu
+# $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu
#
# https://gitlab.com/libvirt/libvirt-ci
-FROM docker.io/library/debian:11-slim
+FROM docker.io/library/debian:12-slim
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
@@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-opencv \
python3-pillow \
python3-pip \
- python3-setuptools \
python3-sphinx \
python3-sphinx-rtd-theme \
python3-venv \
- python3-wheel \
python3-yaml \
rpm2cpio \
sed \
socat \
sparse \
+ swtpm \
tar \
tesseract-ocr \
tesseract-ocr-eng \
@@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
dpkg-reconfigure locales && \
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
-RUN /usr/bin/pip3 install tomli
-
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
@@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libvdeplug-dev:mipsel \
libvirglrenderer-dev:mipsel \
libvte-2.91-dev:mipsel \
+ libxdp-dev:mipsel \
libzstd-dev:mipsel \
nettle-dev:mipsel \
systemtap-sdt-dev:mipsel \
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 199d5fad87..c60490a7fa 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -159,7 +159,7 @@ try:
trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user"))
- generate_dockerfile("debian-i686-cross", "debian-11",
+ generate_dockerfile("debian-i686-cross", "debian-12",
cross="i686",
trailer=cross_build("i686-linux-gnu-",
"x86_64-softmmu,"
@@ -171,7 +171,7 @@ try:
trailer=cross_build("mips64el-linux-gnuabi64-",
"mips64el-softmmu,mips64el-linux-user"))
- generate_dockerfile("debian-mipsel-cross", "debian-11",
+ generate_dockerfile("debian-mipsel-cross", "debian-12",
cross="mipsel",
trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user"))
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 03/26] docs/devel: fix duplicate line
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
2024-09-10 14:07 ` [PATCH 01/26] tests/docker: remove debian-armel-cross Alex Bennée
2024-09-10 14:07 ` [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 04/26] scripts/ci: update the gitlab-runner playbook Alex Bennée
` (22 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
I guess the same change came in via two patch series. Remove the
repetition.
Fixes: 2a851fca9f (docs/devel: remind developers to run CI container pipeline when updating images)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/devel/testing/main.rst | 6 ------
1 file changed, 6 deletions(-)
diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst
index e9921a4b10..09725e8ea9 100644
--- a/docs/devel/testing/main.rst
+++ b/docs/devel/testing/main.rst
@@ -500,12 +500,6 @@ first to contribute the mapping to the ``libvirt-ci`` project:
`CI <https://www.qemu.org/docs/master/devel/ci.html>`__ documentation
page on how to trigger gitlab CI pipelines on your change.
- * Please also trigger gitlab container generation pipelines on your change
- for as many OS distros as practical to make sure that there are no
- obvious breakages when adding the new pre-requisite. Please see
- `CI <https://www.qemu.org/docs/master/devel/ci.html>`__ documentation
- page on how to trigger gitlab CI pipelines on your change.
-
For enterprise distros that default to old, end-of-life versions of the
Python runtime, QEMU uses a separate set of mappings that work with more
recent versions. These can be found in ``tests/lcitool/mappings.yml``.
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 04/26] scripts/ci: update the gitlab-runner playbook
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (2 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 03/26] docs/devel: fix duplicate line Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:43 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 05/26] gdbstub: Use specific MMU index when probing MTE addresses Alex Bennée
` (21 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
The upstream install instructions:
https://docs.gitlab.com/runner/install/linux-repository.html
Now refer to repositories and a setup script. Modernise the playbook
to use the preferred delivery method.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
scripts/ci/setup/gitlab-runner.yml | 39 +++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 9 deletions(-)
diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
index 7bdafab511..57e7faebf1 100644
--- a/scripts/ci/setup/gitlab-runner.yml
+++ b/scripts/ci/setup/gitlab-runner.yml
@@ -49,30 +49,51 @@
- debug:
msg: gitlab-runner arch is {{ gitlab_runner_arch }}
- - name: Download the matching gitlab-runner (DEB)
+ # Debian/Ubuntu setup
+ - name: Get gitlab-runner repo setup script (DEB)
get_url:
dest: "/root/"
- url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb"
+ url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh"
+ mode: 0755
when:
- ansible_facts['distribution'] == 'Ubuntu'
- - name: Download the matching gitlab-runner (RPM)
+ - name: Run gitlab-runner repo setup script (DEB)
+ shell: "/root/script.deb.sh"
+ when:
+ - ansible_facts['distribution'] == 'Ubuntu'
+
+ - name: Install gitlab-runner (DEB)
+ ansible.builtin.apt:
+ name: gitlab-runner
+ update_cache: yes
+ state: present
+ when:
+ - ansible_facts['distribution'] == 'Ubuntu'
+
+ # RPM setup
+ - name: Get gitlab-runner repo setup script (RPM)
get_url:
dest: "/root/"
- url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
+ url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh"
+ mode: 0755
when:
- ansible_facts['distribution'] == 'CentOS'
- - name: Install gitlab-runner via package manager (DEB)
- apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb"
+ - name: Run gitlab-runner repo setup script (RPM)
+ shell: "/root/script.rpm.sh"
when:
- - ansible_facts['distribution'] == 'Ubuntu'
+ - ansible_facts['distribution'] == 'CentOS'
- - name: Install gitlab-runner via package manager (RPM)
- yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
+ - name: Install gitlab-runner (RPM)
+ yum:
+ name: gitlab-runner
+ update_cache: yes
+ state: present
when:
- ansible_facts['distribution'] == 'CentOS'
+ # Register Runners
- name: Register the gitlab-runner
command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 05/26] gdbstub: Use specific MMU index when probing MTE addresses
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (3 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 04/26] scripts/ci: update the gitlab-runner playbook Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 06/26] gdbstub: Add support for MTE in system mode Alex Bennée
` (20 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
From: Gustavo Romero <gustavo.romero@linaro.org>
Use cpu_mmu_index() to determine the specific translation regime (MMU
index) before probing addresses using allocation_tag_mem_probe().
Currently, the MMU index is hardcoded to 0 and only works for user mode.
By obtaining the specific MMU index according to the translation regime,
future use of the stubs relying on allocation_tag_mem_probe in other
regimes will be possible, like in EL1.
This commit also changes the ptr_size value passed to
allocation_tag_mem_probe() from 8 to 1. The ptr_size parameter actually
represents the number of bytes in the memory access (which can be as
small as 1 byte), rather than the number of bits used in the address
space pointed to by ptr.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240906143316.657436-2-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/gdbstub64.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c
index 5221381cc8..85a19c14c7 100644
--- a/target/arm/gdbstub64.c
+++ b/target/arm/gdbstub64.c
@@ -435,6 +435,7 @@ static void handle_q_memtag(GArray *params, void *user_ctx)
{
ARMCPU *cpu = ARM_CPU(user_ctx);
CPUARMState *env = &cpu->env;
+ uint32_t mmu_index;
uint64_t addr = gdb_get_cmd_param(params, 0)->val_ull;
uint64_t len = gdb_get_cmd_param(params, 1)->val_ul;
@@ -458,8 +459,10 @@ static void handle_q_memtag(GArray *params, void *user_ctx)
gdb_put_packet("E03");
}
+ /* Find out the current translation regime for probe. */
+ mmu_index = cpu_mmu_index(env_cpu(env), false);
/* Note that tags are packed here (2 tags packed in one byte). */
- tags = allocation_tag_mem_probe(env, 0, addr, MMU_DATA_LOAD, 8 /* 64-bit */,
+ tags = allocation_tag_mem_probe(env, mmu_index, addr, MMU_DATA_LOAD, 1,
MMU_DATA_LOAD, true, 0);
if (!tags) {
/* Address is not in a tagged region. */
@@ -478,13 +481,16 @@ static void handle_q_isaddresstagged(GArray *params, void *user_ctx)
{
ARMCPU *cpu = ARM_CPU(user_ctx);
CPUARMState *env = &cpu->env;
+ uint32_t mmu_index;
uint64_t addr = gdb_get_cmd_param(params, 0)->val_ull;
uint8_t *tags;
const char *reply;
- tags = allocation_tag_mem_probe(env, 0, addr, MMU_DATA_LOAD, 8 /* 64-bit */,
+ /* Find out the current translation regime for probe. */
+ mmu_index = cpu_mmu_index(env_cpu(env), false);
+ tags = allocation_tag_mem_probe(env, mmu_index, addr, MMU_DATA_LOAD, 1,
MMU_DATA_LOAD, true, 0);
reply = tags ? "01" : "00";
@@ -495,6 +501,7 @@ static void handle_Q_memtag(GArray *params, void *user_ctx)
{
ARMCPU *cpu = ARM_CPU(user_ctx);
CPUARMState *env = &cpu->env;
+ uint32_t mmu_index;
uint64_t start_addr = gdb_get_cmd_param(params, 0)->val_ull;
uint64_t len = gdb_get_cmd_param(params, 1)->val_ul;
@@ -527,8 +534,10 @@ static void handle_Q_memtag(GArray *params, void *user_ctx)
* Get all tags in the page starting from the tag of the start address.
* Note that there are two tags packed into a single byte here.
*/
- tags = allocation_tag_mem_probe(env, 0, start_addr, MMU_DATA_STORE,
- 8 /* 64-bit */, MMU_DATA_STORE, true, 0);
+ /* Find out the current translation regime for probe. */
+ mmu_index = cpu_mmu_index(env_cpu(env), false);
+ tags = allocation_tag_mem_probe(env, mmu_index, start_addr, MMU_DATA_STORE,
+ 1, MMU_DATA_STORE, true, 0);
if (!tags) {
/* Address is not in a tagged region. */
gdb_put_packet("E04");
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 06/26] gdbstub: Add support for MTE in system mode
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (4 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 05/26] gdbstub: Use specific MMU index when probing MTE addresses Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 07/26] tests/guest-debug: Support passing arguments to the GDB test script Alex Bennée
` (19 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
From: Gustavo Romero <gustavo.romero@linaro.org>
This commit makes handle_q_memtag, handle_q_isaddresstagged, and
handle_Q_memtag stubs build for system mode, allowing all GDB
'memory-tag' subcommands to work with QEMU gdbstub on aarch64 system
mode.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/620
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240906143316.657436-3-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
target/arm/gdbstub64.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c
index 85a19c14c7..9462d3f560 100644
--- a/target/arm/gdbstub64.c
+++ b/target/arm/gdbstub64.c
@@ -430,6 +430,7 @@ int aarch64_gdb_set_tag_ctl_reg(CPUState *cs, uint8_t *buf, int reg)
return 0;
#endif
}
+#endif /* CONFIG_USER_ONLY */
static void handle_q_memtag(GArray *params, void *user_ctx)
{
@@ -600,12 +601,10 @@ static const GdbCmdParseEntry cmd_handler_table[NUM_CMDS] = {
.need_cpu_context = true
},
};
-#endif /* CONFIG_USER_ONLY */
void aarch64_cpu_register_gdb_commands(ARMCPU *cpu, GString *qsupported,
GPtrArray *qtable, GPtrArray *stable)
{
-#ifdef CONFIG_USER_ONLY
/* MTE */
if (cpu_isar_feature(aa64_mte, cpu)) {
g_string_append(qsupported, ";memory-tagging+");
@@ -614,5 +613,4 @@ void aarch64_cpu_register_gdb_commands(ARMCPU *cpu, GString *qsupported,
g_ptr_array_add(qtable, (gpointer) &cmd_handler_table[qIsAddressTagged]);
g_ptr_array_add(stable, (gpointer) &cmd_handler_table[QMemTags]);
}
-#endif
}
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 07/26] tests/guest-debug: Support passing arguments to the GDB test script
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (5 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 06/26] gdbstub: Add support for MTE in system mode Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 08/26] tests/tcg/aarch64: Improve linker script organization Alex Bennée
` (18 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
From: Gustavo Romero <gustavo.romero@linaro.org>
This commit adds support for passing arguments to the GDB test scripts
so it's possible to parse the args in an "argparse way" in the test
scripts launched by the runner. The arguments should be preceded by --
when passed to the runner. For example, passing "--help" arg to the
GDB_TEST_SCRIPT:
run-test.py [...] --test <GDB_TEST_SCRIPT> -- --help
The test script should not use the argparse module directly but import
arg_parser from test_gdbstub module. arg_parser then can be used just
like the argparse.ArgumentParser class:
from test_gdbstub import arg_parser
p = arg_parser(prog="test-mytest.py", description="My test.")
p.add_argument("--vowel", help="Select vowel",
required=True, choices=['a','e','i','o','u'])
[...]
The arg_parser allows a smooth and informative exit if, for instance,
the caller of the runner script passes an invalid argument or misses a
required argument by the test script.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240906143316.657436-4-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/guest-debug/run-test.py | 6 ++++++
tests/guest-debug/test_gdbstub.py | 5 +++++
2 files changed, 11 insertions(+)
diff --git a/tests/guest-debug/run-test.py b/tests/guest-debug/run-test.py
index 368ff8a890..5a091db8be 100755
--- a/tests/guest-debug/run-test.py
+++ b/tests/guest-debug/run-test.py
@@ -27,6 +27,10 @@ def get_args():
parser.add_argument("--binary", help="Binary to debug",
required=True)
parser.add_argument("--test", help="GDB test script")
+ parser.add_argument('test_args', nargs='*',
+ help="Additional args for GDB test script. "
+ "The args should be preceded by -- to avoid confusion "
+ "with flags for runner script")
parser.add_argument("--gdb", help="The gdb binary to use",
default=None)
parser.add_argument("--gdb-args", help="Additional gdb arguments")
@@ -91,6 +95,8 @@ def log(output, msg):
gdb_cmd += " -ex 'target remote %s'" % (socket_name)
# finally the test script itself
if args.test:
+ if args.test_args:
+ gdb_cmd += f" -ex \"py sys.argv={args.test_args}\""
gdb_cmd += " -x %s" % (args.test)
diff --git a/tests/guest-debug/test_gdbstub.py b/tests/guest-debug/test_gdbstub.py
index 46fbf98f0c..a715c0e3f5 100644
--- a/tests/guest-debug/test_gdbstub.py
+++ b/tests/guest-debug/test_gdbstub.py
@@ -2,6 +2,7 @@
"""
from __future__ import print_function
+import argparse
import gdb
import os
import sys
@@ -9,6 +10,10 @@
fail_count = 0
+class arg_parser(argparse.ArgumentParser):
+ def exit(self, status=None, message=""):
+ print("Wrong GDB script test argument! " + message)
+ gdb.execute("exit 1")
def report(cond, msg):
"""Report success/fail of a test"""
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 08/26] tests/tcg/aarch64: Improve linker script organization
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (6 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 07/26] tests/guest-debug: Support passing arguments to the GDB test script Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 09/26] tests/tcg/aarch64: Extend MTE gdbstub tests to system mode Alex Bennée
` (17 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
From: Gustavo Romero <gustavo.romero@linaro.org>
Improve kernel.ld linker script organization by using MEMORY command.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Message-Id: <20240906143316.657436-5-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/aarch64/system/kernel.ld | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/tcg/aarch64/system/kernel.ld b/tests/tcg/aarch64/system/kernel.ld
index 7b3a76dcbf..5f39258d32 100644
--- a/tests/tcg/aarch64/system/kernel.ld
+++ b/tests/tcg/aarch64/system/kernel.ld
@@ -1,23 +1,23 @@
ENTRY(__start)
-SECTIONS
-{
- /* virt machine, RAM starts at 1gb */
- . = (1 << 30);
+MEMORY {
+ /* On virt machine RAM starts at 1 GiB. */
+
+ /* Align text and rodata to the 1st 2 MiB chunk. */
+ TXT (rx) : ORIGIN = 1 << 30, LENGTH = 2M
+ /* Align r/w data to the 2nd 2 MiB chunk. */
+ DAT (rw) : ORIGIN = (1 << 30) + 2M, LENGTH = 2M
+}
+
+SECTIONS {
.text : {
*(.text)
- }
- .rodata : {
*(.rodata)
- }
- /* align r/w section to next 2mb */
- . = ALIGN(1 << 21);
+ } >TXT
.data : {
*(.data)
- }
- .bss : {
*(.bss)
- }
+ } >DAT
/DISCARD/ : {
*(.ARM.attributes)
}
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 09/26] tests/tcg/aarch64: Extend MTE gdbstub tests to system mode
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (7 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 08/26] tests/tcg/aarch64: Improve linker script organization Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 10/26] contrib/plugins/Makefile: Add a 'distclean' target Alex Bennée
` (16 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
From: Gustavo Romero <gustavo.romero@linaro.org>
Extend MTE gdbstub tests to also run in system mode (share tests between
user mode and system mode). The tests will only run if a version of GDB
that supports MTE on baremetal is available in the test environment and
if available compiler supports the 'memtag' flag
(-march=armv8.5-a+memtag).
For the tests running in system mode, a page that supports MTE ops. is
necessary. Therefore, an MTE-enabled page is made available (mapped) in
the third 2 MB chunk of the second 1 GB space in the flat mapping set in
boot.S. A new binary, mte.S, is also introduced for the tests. It links
against boot.S and is executed by QEMU in system mode.
Signed-off-by: Gustavo Romero <gustavo.romero@linaro.org>
Message-Id: <20240906143316.657436-6-gustavo.romero@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 5 +
tests/tcg/aarch64/Makefile.softmmu-target | 49 +++++++++-
tests/tcg/aarch64/Makefile.target | 3 +-
tests/tcg/aarch64/gdbstub/test-mte.py | 71 +++++++++-----
tests/tcg/aarch64/system/boot.S | 11 +++
tests/tcg/aarch64/system/kernel.ld | 9 ++
tests/tcg/aarch64/system/mte.S | 109 ++++++++++++++++++++++
7 files changed, 229 insertions(+), 28 deletions(-)
create mode 100644 tests/tcg/aarch64/system/mte.S
diff --git a/configure b/configure
index d08b71f14b..40186d865e 100755
--- a/configure
+++ b/configure
@@ -1679,6 +1679,11 @@ for target in $target_list; do
echo "GDB_HAS_MTE=y" >> $config_target_mak
fi
+ if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 16.0; then
+ # GDB has to support MTE in baremetal to allow debugging MTE in QEMU system mode
+ echo "GDB_SUPPORTS_MTE_IN_BAREMETAL=y" >> $config_target_mak
+ fi
+
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs
tcg_tests_targets="$tcg_tests_targets $target"
fi
diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target
index 139e04d15f..59ee662cda 100644
--- a/tests/tcg/aarch64/Makefile.softmmu-target
+++ b/tests/tcg/aarch64/Makefile.softmmu-target
@@ -2,14 +2,22 @@
# Aarch64 system tests
#
-AARCH64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/aarch64/system
+AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64
+AARCH64_SYSTEM_SRC=$(AARCH64_SRC)/system
+
VPATH+=$(AARCH64_SYSTEM_SRC)
# These objects provide the basic boot code and helper functions for all tests
CRT_OBJS=boot.o
-AARCH64_TEST_SRCS=$(wildcard $(AARCH64_SYSTEM_SRC)/*.c)
-AARCH64_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.c, %, $(AARCH64_TEST_SRCS))
+AARCH64_TEST_C_SRCS_=$(wildcard $(AARCH64_SYSTEM_SRC)/*.c)
+AARCH64_TEST_S_SRCS=$(AARCH64_SYSTEM_SRC)/mte.S
+
+AARCH64_C_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.c, %, $(AARCH64_TEST_C_SRCS))
+AARCH64_S_TESTS = $(patsubst $(AARCH64_SYSTEM_SRC)/%.S, %, $(AARCH64_TEST_S_SRCS))
+
+AARCH64_TESTS = $(AARCH64_C_TESTS)
+AARCH64_TESTS += $(AARCH64_S_TESTS)
CRT_PATH=$(AARCH64_SYSTEM_SRC)
LINK_SCRIPT=$(AARCH64_SYSTEM_SRC)/kernel.ld
@@ -21,7 +29,8 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
config-cc.mak: Makefile
$(quiet-@)( \
- $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3)) 3> config-cc.mak
+ $(call cc-option,-march=armv8.3-a, CROSS_CC_HAS_ARMV8_3); \
+ $(call cc-option,-march=armv8.5-a+memtag, CROSS_CC_HAS_ARMV8_MTE)) 3> config-cc.mak
-include config-cc.mak
# building head blobs
@@ -88,3 +97,35 @@ pauth-3:
run-pauth-3:
$(call skip-test, "RUN of pauth-3", "not built")
endif
+
+ifneq ($(CROSS_CC_HAS_ARMV8_MTE),)
+QEMU_MTE_ENABLED_MACHINE=-M virt,mte=on -cpu max -display none
+QEMU_OPTS_WITH_MTE_ON = $(QEMU_MTE_ENABLED_MACHINE) $(QEMU_BASE_ARGS) -kernel
+mte: CFLAGS+=-march=armv8.5-a+memtag
+mte: mte.S $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
+
+run-mte: QEMU_OPTS=$(QEMU_OPTS_WITH_MTE_ON)
+run-mte: mte
+
+ifeq ($(GDB_SUPPORTS_MTE_IN_BAREMETAL),y)
+run-gdbstub-mte: QEMU_OPTS=$(QEMU_OPTS_WITH_MTE_ON)
+run-gdbstub-mte: mte
+ $(call run-test, $@, $(GDB_SCRIPT) \
+ --output run-gdbstub-mte.out \
+ --gdb $(GDB) \
+ --qemu $(QEMU) --qargs "-chardev null$(COMMA)id=output $(QEMU_OPTS)" \
+ --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py -- --mode=system, \
+ gdbstub MTE support)
+
+EXTRA_RUNS += run-gdbstub-mte
+else # !GDB_SUPPORTS_MTE_IN_BAREMETAL
+run-gdbstub-mte:
+ $(call skip-test "RUN of gdbstub-mte", "GDB does not support MTE in baremetal!")
+endif
+else # !CROSS_CC_HAS_ARMV8_MTE
+mte:
+ $(call skip-test, "BUILD of $@", "missing compiler support")
+run-mte:
+ $(call skip-test, "RUN of mte", "not build")
+endif
diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target
index 8cc62eb456..9efe2f81ad 100644
--- a/tests/tcg/aarch64/Makefile.target
+++ b/tests/tcg/aarch64/Makefile.target
@@ -138,7 +138,8 @@ run-gdbstub-mte: mte-8
$(call run-test, $@, $(GDB_SCRIPT) \
--gdb $(GDB) \
--qemu $(QEMU) --qargs "$(QEMU_OPTS)" \
- --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py, \
+ --bin $< --test $(AARCH64_SRC)/gdbstub/test-mte.py \
+ -- --mode=user, \
gdbstub MTE support)
EXTRA_RUNS += run-gdbstub-mte
diff --git a/tests/tcg/aarch64/gdbstub/test-mte.py b/tests/tcg/aarch64/gdbstub/test-mte.py
index 66f9c25f8a..a4cae6caa0 100644
--- a/tests/tcg/aarch64/gdbstub/test-mte.py
+++ b/tests/tcg/aarch64/gdbstub/test-mte.py
@@ -1,21 +1,26 @@
from __future__ import print_function
#
# Test GDB memory-tag commands that exercise the stubs for the qIsAddressTagged,
-# qMemTag, and QMemTag packets. Logical tag-only commands rely on local
-# operations, hence don't exercise any stub.
+# qMemTag, and QMemTag packets, which are used for manipulating allocation tags.
+# Logical tags-related commands rely on local operations, hence don't exercise
+# any stub and so are not used in this test.
#
-# The test consists in breaking just after a atag() call (which sets the
-# allocation tag -- see mte-8.c for details) and setting/getting tags in
-# different memory locations and ranges starting at the address of the array
-# 'a'.
+# The test consists in breaking just after a tag is set in a specific memory
+# chunk, and then using the GDB 'memory-tagging' subcommands to set/get tags in
+# different memory locations and ranges in the MTE-enabled memory chunk.
#
# This is launched via tests/guest-debug/run-test.py
#
-import gdb
+try:
+ import gdb
+except ModuleNotFoundError:
+ from sys import exit
+ exit("This script must be launched via tests/guest-debug/run-test.py!")
import re
-from test_gdbstub import main, report
+from sys import argv
+from test_gdbstub import arg_parser, main, report
PATTERN_0 = "Memory tags for address 0x[0-9a-f]+ match \\(0x[0-9a-f]+\\)."
@@ -23,12 +28,32 @@
def run_test():
- gdb.execute("break 95", False, True)
+ p = arg_parser(prog="test-mte.py", description="TCG MTE tests.")
+ p.add_argument("--mode", help="Run test for QEMU system or user mode.",
+ required=True, choices=['system','user'])
+
+ args = p.parse_args(args=argv)
+
+ if args.mode == "system":
+ # Break address: where to break before performing the tests
+ # See mte.S for details about this label.
+ ba = "main_end"
+ # Tagged address: the start of the MTE-enabled memory chunk to be tested
+ # 'tagged_addr' (x1) is a pointer to the MTE-enabled page. See mte.S.
+ ta = "$x1"
+ else: # mode="user"
+ # Line 95 in mte-8.c
+ ba = "95"
+ # 'a' array. See mte-8.c
+ ta = "a"
+
+ gdb.execute(f"break {ba}", False, True)
gdb.execute("continue", False, True)
+
try:
- # Test if we can check correctly that the allocation tag for
- # array 'a' matches the logical tag after atag() is called.
- co = gdb.execute("memory-tag check a", False, True)
+ # Test if we can check correctly that the allocation tag for the address
+ # in {ta} matches the logical tag in {ta}.
+ co = gdb.execute(f"memory-tag check {ta}", False, True)
tags_match = re.findall(PATTERN_0, co, re.MULTILINE)
if tags_match:
report(True, f"{tags_match[0]}")
@@ -39,20 +64,20 @@ def run_test():
# tags rely on local operation and so don't exercise any stub.
# Set the allocation tag for the first granule (16 bytes) of
- # address starting at 'a' address to a known value, i.e. 0x04.
- gdb.execute("memory-tag set-allocation-tag a 1 04", False, True)
+ # address starting at {ta} address to a known value, i.e. 0x04.
+ gdb.execute(f"memory-tag set-allocation-tag {ta} 1 04", False, True)
# Then set the allocation tag for the second granule to a known
# value, i.e. 0x06. This tests that contiguous tag granules are
- # set correct and don't run over each other.
- gdb.execute("memory-tag set-allocation-tag a+16 1 06", False, True)
+ # set correctly and don't run over each other.
+ gdb.execute(f"memory-tag set-allocation-tag {ta}+16 1 06", False, True)
# Read the known values back and check if they remain the same.
- co = gdb.execute("memory-tag print-allocation-tag a", False, True)
+ co = gdb.execute(f"memory-tag print-allocation-tag {ta}", False, True)
first_tag = re.match(PATTERN_1, co)[1]
- co = gdb.execute("memory-tag print-allocation-tag a+16", False, True)
+ co = gdb.execute(f"memory-tag print-allocation-tag {ta}+16", False, True)
second_tag = re.match(PATTERN_1, co)[1]
if first_tag == "0x4" and second_tag == "0x6":
@@ -61,15 +86,15 @@ def run_test():
report(False, "Can't set/print allocation tags!")
# Now test fill pattern by setting a whole page with a pattern.
- gdb.execute("memory-tag set-allocation-tag a 4096 0a0b", False, True)
+ gdb.execute(f"memory-tag set-allocation-tag {ta} 4096 0a0b", False, True)
# And read back the tags of the last two granules in page so
# we also test if the pattern is set correctly up to the end of
# the page.
- co = gdb.execute("memory-tag print-allocation-tag a+4096-32", False, True)
+ co = gdb.execute(f"memory-tag print-allocation-tag {ta}+4096-32", False, True)
tag = re.match(PATTERN_1, co)[1]
- co = gdb.execute("memory-tag print-allocation-tag a+4096-16", False, True)
+ co = gdb.execute(f"memory-tag print-allocation-tag {ta}+4096-16", False, True)
last_tag = re.match(PATTERN_1, co)[1]
if tag == "0xa" and last_tag == "0xb":
@@ -78,8 +103,8 @@ def run_test():
report(False, "Fill pattern failed!")
except gdb.error:
- # This usually happens because a GDB version that does not
- # support memory tagging was used to run the test.
+ # This usually happens because a GDB version that does not support
+ # memory tagging was used to run the test.
report(False, "'memory-tag' command failed!")
diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boot.S
index 501685d0ec..4eb1b35b88 100644
--- a/tests/tcg/aarch64/system/boot.S
+++ b/tests/tcg/aarch64/system/boot.S
@@ -135,6 +135,17 @@ __start:
orr x1, x1, x3
str x1, [x2] /* 2nd 2mb (.data & .bss)*/
+ /* Third block: at 'mte_page', set in kernel.ld */
+ adrp x1, mte_page
+ add x1, x1, :lo12:mte_page
+ bic x1, x1, #(1 << 21) - 1
+ and x4, x1, x5
+ add x2, x0, x4, lsr #(21 - 3)
+ /* attr(AF, NX, block, AttrIndx=Attr1) */
+ ldr x3, =(3 << 53) | 0x401 | (1 << 2)
+ orr x1, x1, x3
+ str x1, [x2]
+
/* Setup/enable the MMU. */
/*
diff --git a/tests/tcg/aarch64/system/kernel.ld b/tests/tcg/aarch64/system/kernel.ld
index 5f39258d32..aef043e31d 100644
--- a/tests/tcg/aarch64/system/kernel.ld
+++ b/tests/tcg/aarch64/system/kernel.ld
@@ -7,6 +7,8 @@ MEMORY {
TXT (rx) : ORIGIN = 1 << 30, LENGTH = 2M
/* Align r/w data to the 2nd 2 MiB chunk. */
DAT (rw) : ORIGIN = (1 << 30) + 2M, LENGTH = 2M
+ /* Align the MTE-enabled page to the 3rd 2 MiB chunk. */
+ TAG (rw) : ORIGIN = (1 << 30) + 4M, LENGTH = 2M
}
SECTIONS {
@@ -18,6 +20,13 @@ SECTIONS {
*(.data)
*(.bss)
} >DAT
+ .tag : {
+ /*
+ * Symbol 'mte_page' is used in boot.S to setup the PTE and in the mte.S
+ * test as the address that the MTE instructions operate on.
+ */
+ mte_page = .;
+ } >TAG
/DISCARD/ : {
*(.ARM.attributes)
}
diff --git a/tests/tcg/aarch64/system/mte.S b/tests/tcg/aarch64/system/mte.S
new file mode 100644
index 0000000000..b611240a95
--- /dev/null
+++ b/tests/tcg/aarch64/system/mte.S
@@ -0,0 +1,109 @@
+/*
+ * Code to help test the MTE gdbstubs in system mode.
+ *
+ * Copyright (c) 2024 Linaro Limited
+ *
+ * Author: Gustavo Romero <gustavo.romero@linaro.org>
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#define addr x0 /* Ptr to the start of the MTE-enabled page. */
+#define tagged_addr x1 /* 'addr' ptr with a random-generated tag added. */
+#define tmp0 x2 /* Scratch register. */
+#define tmp1 x3 /* Scratch register. */
+#define tmp2 x4 /* Scratch register. */
+#define tmp3 x5 /* Sctatch register. */
+
+ .file "mte.S"
+
+ .text
+ .align 4
+
+ .globl main
+ .type main, @function
+
+main:
+ /*
+ * Set MAIR_EL1 (Memory Attribute Index Register). In boot.S, the
+ * attribute index for .mte_page is set to point to MAILR_EL field Attr1
+ * (AttrIndx=Attr1), so set Attr1 as Tagged Normal (MTE) to enable MTE
+ * on this page.
+ *
+ * Attr1 = 0xF0 => Tagged Normal (MTE)
+ */
+ mrs tmp0, mair_el1
+ orr tmp0, tmp0, (0xF0 << 8)
+ msr mair_el1, tmp0
+
+ /*
+ * Set TCR_EL1 (Translation Control Registers) to ignore the top byte
+ * in the translated addresses so it can be used to keep the tags.
+ *
+ * TBI0[37] = 0b1 => Top Byte ignored and used for tagged addresses
+ */
+ mrs tmp1, tcr_el1
+ orr tmp1, tmp1, (1 << 37)
+ msr tcr_el1, tmp1
+
+ /*
+ * Set SCTLR_EL1 (System Control Register) to enable the use of MTE
+ * insns., like stg & friends, and to enable synchronous exception in
+ * case of a tag mismatch, i.e., when the logical tag in 'tagged_addr'
+ * is different from the allocation tag related to 'addr' address.
+ *
+ * ATA[43] = 0b1 => Enable access to allocation tags at EL1
+ * TCF[41:40] = 0b01 => Tag Check Faults cause a synchronous exception
+ *
+ */
+ mrs tmp2, sctlr_el1
+ mov tmp3, (1 << 43) | (1 << 40)
+ orr tmp2, tmp2, tmp3
+ msr sctlr_el1, tmp2
+
+ isb
+
+ /*
+ * MTE-enabled page resides at the 3rd 2MB chunk in the second 1GB
+ * block, i.e., at 0x40400000 address. See .mte_page section in boot.S
+ * and kernel.ld (where the address is effectively computed).
+ *
+ * Load .mte_page address into 'addr' register.
+ */
+ adrp addr, mte_page
+ add addr, addr, :lo12:mte_page
+
+ /*
+ * Set GCR for random tag generation. 0xA5 is just a random value to set
+ * GCR != 0 so the tag generated by 'irg' insn. is not zero, which is
+ * more interesting for the tests than when tag is zero.
+ */
+ mov tmp0, 0xA5
+ msr gcr_el1, tmp0
+
+ /*
+ * Generate a logical tag, add it to 'addr' address and put it into
+ * 'tagged_addr'.
+ */
+ irg tagged_addr, addr
+
+ /*
+ * Store the generated tag to memory region pointed to by 'addr', i.e.
+ * set the allocation tag for granule at 'addr'. The tag is extracted
+ * by stg from tagged_addr pointer.
+ */
+ stg tagged_addr, [addr]
+
+ /*
+ * Store a random value (0xdeadbeef) to tagged_addr address. This must
+ * not cause any Tag Check Fault since logical tag in tagged_addr and
+ * allocation tag associated with the memory pointed by tagged_addr are
+ * set the same, otherwise something is off and the test fails -- an
+ * exception is generated.
+ */
+ ldr tmp1, =0xdeadbeef
+ str tmp1, [tagged_addr]
+
+ /* This label is used by GDB Python script test-mte.py. */
+main_end:
+ ret
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 10/26] contrib/plugins/Makefile: Add a 'distclean' target
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (8 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 09/26] tests/tcg/aarch64: Extend MTE gdbstub tests to system mode Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts Alex Bennée
` (15 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
From: Thomas Huth <thuth@redhat.com>
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.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240902154749.73876-1-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/buildtest.yml | 2 ++
contrib/plugins/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 1d2afae996..8bc67ef7e9 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -345,6 +345,8 @@ build-tcg-disabled:
124 132 139 142 144 145 151 152 155 157 165 194 196 200 202
208 209 216 218 227 234 246 247 248 250 254 255 257 258
260 261 262 263 264 270 272 273 277 279 image-fleecing
+ - cd ../..
+ - make distclean
build-user:
extends: .native_build_job_template
diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
index edf256cd9d..05a2a45c5c 100644
--- a/contrib/plugins/Makefile
+++ b/contrib/plugins/Makefile
@@ -77,7 +77,7 @@ lib%$(SO_SUFFIX): %.o
endif
-clean:
+clean distclean:
rm -f *.o *$(SO_SUFFIX) *.d
rm -Rf .libs
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (9 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 10/26] contrib/plugins/Makefile: Add a 'distclean' target Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:45 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI Alex Bennée
` (14 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
The existing plugins already liberally use host pointer stuffing for
passing user data which will fail when doing 64 bit guests on 32 bit
hosts. We should discourage this by officially deprecating support and
adding another nail to the 32 bit host coffin.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v2
- don't manually set based on CPU type, use __SIZEOF_POINTER__
---
docs/about/deprecated.rst | 11 +++++++++++
configure | 21 ++++++++++++++++++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 88f0f03786..f7c7c33d39 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -184,6 +184,17 @@ be an effective use of its limited resources, and thus intends to discontinue
it. Since all recent x86 hardware from the past >10 years is capable of the
64-bit x86 extensions, a corresponding 64-bit OS should be used instead.
+TCG Plugin support not enabled by default on 32-bit hosts (since 9.2)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+While it is still possible to enable TCG plugin support for 32-bit
+hosts there are a number of potential pitfalls when instrumenting
+64-bit guests. The plugin APIs typically pass most addresses as
+uint64_t but practices like encoding that address in a host pointer
+for passing as user-data will lose data. As most software analysis
+benefits from having plenty of host memory it seems reasonable to
+encourage users to use 64 bit builds of QEMU for analysis work
+whatever targets they are instrumenting.
System emulator CPUs
--------------------
diff --git a/configure b/configure
index 40186d865e..14581c1b9a 100755
--- a/configure
+++ b/configure
@@ -516,6 +516,25 @@ case "$cpu" in
;;
esac
+# Now we have our CPU_CFLAGS we can check if we are targeting a 32 or
+# 64 bit host.
+
+check_64bit_host() {
+cat > $TMPC <<EOF
+#if __SIZEOF_POINTER__ != 8
+#error not 64 bit system
+#endif
+int main(void) { return 0; }
+EOF
+ compile_object "$1"
+}
+
+if check_64bit_host "$CPU_CFLAGS"; then
+ host_bits=64
+else
+ host_bits=32
+fi
+
if test -n "$host_arch" && {
! test -d "$source_path/linux-user/include/host/$host_arch" ||
! test -d "$source_path/common-user/host/$host_arch"; }; then
@@ -1028,7 +1047,7 @@ if test "$static" = "yes" ; then
fi
plugins="no"
fi
-if test "$plugins" != "no"; then
+if test "$plugins" != "no" && test $host_bits -eq 64; then
plugins=yes
subdirs="$subdirs contrib/plugins"
fi
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (10 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:45 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 13/26] contrib/plugins: control flow plugin Alex Bennée
` (13 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
The softmmu memory instrumentation test sees so many more accesses
than a normal translated host and its really not worth fixing up. Lets
deprecate this odd configuration and save on the CI cycles.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/about/deprecated.rst | 8 ++++++++
configure | 11 +++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index f7c7c33d39..5aa2e35314 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -196,6 +196,14 @@ benefits from having plenty of host memory it seems reasonable to
encourage users to use 64 bit builds of QEMU for analysis work
whatever targets they are instrumenting.
+TCG Plugin support not enabled by default with TCI (since 9.2)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+While the TCG interpreter can interpret the TCG ops used by plugins it
+is going to be so much slower it wouldn't make sense for any serious
+instrumentation. Due to implementation differences there will also be
+anomalies in things like memory instrumentation.
+
System emulator CPUs
--------------------
diff --git a/configure b/configure
index 14581c1b9a..1bda6b3a3b 100755
--- a/configure
+++ b/configure
@@ -629,6 +629,9 @@ meson_option_parse() {
exit 1
fi
}
+has_meson_option() {
+ test "${meson_options#*"$1"}" != "$meson_options"
+}
meson_add_machine_file() {
if test "$cross_compile" = "yes"; then
@@ -1048,8 +1051,12 @@ if test "$static" = "yes" ; then
plugins="no"
fi
if test "$plugins" != "no" && test $host_bits -eq 64; then
- plugins=yes
- subdirs="$subdirs contrib/plugins"
+ if has_meson_option "-Dtcg_interpreter=true"; then
+ plugins="no"
+ else
+ plugins=yes
+ subdirs="$subdirs contrib/plugins"
+ fi
fi
cat > $TMPC << EOF
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 13/26] contrib/plugins: control flow plugin
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (11 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:52 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 14/26] plugins: save value during memory accesses Alex Bennée
` (12 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Gustavo Romero
This is a simple control flow tracking plugin that uses the latest
inline and conditional operations to detect and track control flow
changes. It is currently an exercise at seeing how useful the changes
are.
Based-on: <20240312075428.244210-1-pierrick.bouvier@linaro.org>
Cc: Gustavo Romero <gustavo.romero@linaro.org>
Cc: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20240311153432.1395190-1-alex.bennee@linaro.org>
---
v2
- only need a single call back
- drop need for INSN_WIDTH
- still don't understand the early exits
v3
- move initial STORE ops to first instruction to avoid confusion
with the conditional callback on the start
- filter out non-branches before processing
- fix off-by-one with accounting
- display "sync fault" or "branch" instead of raw numbers
v4
- rename hotdest to hottest (i.e. the hottest branch insn)
- rename early to exception
- WIP insn structure
---
contrib/plugins/cflow.c | 413 +++++++++++++++++++++++++++++++++++++++
contrib/plugins/Makefile | 1 +
2 files changed, 414 insertions(+)
create mode 100644 contrib/plugins/cflow.c
diff --git a/contrib/plugins/cflow.c b/contrib/plugins/cflow.c
new file mode 100644
index 0000000000..173daec60d
--- /dev/null
+++ b/contrib/plugins/cflow.c
@@ -0,0 +1,413 @@
+/*
+ * Control Flow plugin
+ *
+ * This plugin will track changes to control flow and detect where
+ * instructions fault.
+ *
+ * Copyright (c) 2024 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+#include <glib.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <qemu-plugin.h>
+
+QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
+
+typedef enum {
+ SORT_HOTTEST, /* hottest branch insn */
+ SORT_EXCEPTION, /* most early exits */
+ SORT_POPDEST, /* most destinations (usually ret's) */
+} ReportType;
+
+ReportType report = SORT_HOTTEST;
+int topn = 10;
+
+typedef struct {
+ uint64_t daddr;
+ uint64_t dcount;
+} DestData;
+
+/* A node is an address where we can go to multiple places */
+typedef struct {
+ GMutex lock;
+ /* address of the branch point */
+ uint64_t addr;
+ /* array of DestData */
+ GArray *dests;
+ /* early exit/fault count */
+ uint64_t early_exit;
+ /* jump destination count */
+ uint64_t dest_count;
+ /* instruction data */
+ char *insn_disas;
+ /* symbol? */
+ const char *symbol;
+ /* times translated as last in block? */
+ int last_count;
+ /* times translated in the middle of block? */
+ int mid_count;
+} NodeData;
+
+typedef enum {
+ /* last insn in block, expected flow control */
+ LAST_INSN = (1 << 0),
+ /* mid-block insn, can only be an exception */
+ EXCP_INSN = (1 << 1),
+ /* multiple disassembly, may have changed */
+ MULT_INSN = (1 << 2),
+} InsnTypes;
+
+typedef struct {
+ /* address of the branch point */
+ uint64_t addr;
+ /* disassembly */
+ char *insn_disas;
+ /* symbol? */
+ const char *symbol;
+ /* types */
+ InsnTypes type_flag;
+} InsnData;
+
+/* We use this to track the current execution state */
+typedef struct {
+ /* address of end of block */
+ uint64_t end_block;
+ /* next pc after end of block */
+ uint64_t pc_after_block;
+ /* address of last executed PC */
+ uint64_t last_pc;
+} VCPUScoreBoard;
+
+/* descriptors for accessing the above scoreboard */
+static qemu_plugin_u64 end_block;
+static qemu_plugin_u64 pc_after_block;
+static qemu_plugin_u64 last_pc;
+
+
+static GMutex node_lock;
+static GHashTable *nodes;
+struct qemu_plugin_scoreboard *state;
+
+static GMutex insn_lock;
+static GHashTable *insn_hash;
+
+/* SORT_HOTTEST */
+static gint hottest(gconstpointer a, gconstpointer b)
+{
+ NodeData *na = (NodeData *) a;
+ NodeData *nb = (NodeData *) b;
+
+ return na->dest_count > nb->dest_count ? -1 :
+ na->dest_count == nb->dest_count ? 0 : 1;
+}
+
+static gint exception(gconstpointer a, gconstpointer b)
+{
+ NodeData *na = (NodeData *) a;
+ NodeData *nb = (NodeData *) b;
+
+ return na->early_exit > nb->early_exit ? -1 :
+ na->early_exit == nb->early_exit ? 0 : 1;
+}
+
+static gint popular(gconstpointer a, gconstpointer b)
+{
+ NodeData *na = (NodeData *) a;
+ NodeData *nb = (NodeData *) b;
+
+ return na->dests->len > nb->dests->len ? -1 :
+ na->dests->len == nb->dests->len ? 0 : 1;
+}
+
+/* Filter out non-branches - returns true to remove entry */
+static gboolean filter_non_branches(gpointer key, gpointer value, gpointer user_data)
+{
+ NodeData *node = (NodeData *) value;
+
+ return node->dest_count == 0;
+}
+
+static void plugin_exit(qemu_plugin_id_t id, void *p)
+{
+ g_autoptr(GString) result = g_string_new("collected ");
+ GList *data;
+ GCompareFunc sort = &hottest;
+ int n = 0;
+
+ g_mutex_lock(&node_lock);
+ g_string_append_printf(result, "%d control flow nodes in the hash table\n",
+ g_hash_table_size(nodes));
+
+ /* remove all nodes that didn't branch */
+ g_hash_table_foreach_remove(nodes, filter_non_branches, NULL);
+
+ data = g_hash_table_get_values(nodes);
+
+ switch (report) {
+ case SORT_HOTTEST:
+ sort = &hottest;
+ break;
+ case SORT_EXCEPTION:
+ sort = &exception;
+ break;
+ case SORT_POPDEST:
+ sort = &popular;
+ break;
+ }
+
+ data = g_list_sort(data, sort);
+
+ for (GList *l = data;
+ l != NULL && n < topn;
+ l = l->next, n++) {
+ NodeData *n = l->data;
+ const char *type = n->mid_count ? "sync fault" : "branch";
+ g_string_append_printf(result, " addr: 0x%"PRIx64 " %s: %s (%s)\n",
+ n->addr, n->symbol, n->insn_disas, type);
+ if (n->early_exit) {
+ g_string_append_printf(result, " early exits %"PRId64"\n",
+ n->early_exit);
+ }
+ g_string_append_printf(result, " branches %"PRId64"\n",
+ n->dest_count);
+ for (int j = 0; j < n->dests->len; j++ ) {
+ DestData *dd = &g_array_index(n->dests, DestData, j);
+ g_string_append_printf(result, " to 0x%"PRIx64" (%"PRId64")\n",
+ dd->daddr, dd->dcount);
+ }
+ }
+
+ qemu_plugin_outs(result->str);
+
+ g_mutex_unlock(&node_lock);
+}
+
+static void plugin_init(void)
+{
+ g_mutex_init(&node_lock);
+ nodes = g_hash_table_new(NULL, g_direct_equal);
+ state = qemu_plugin_scoreboard_new(sizeof(VCPUScoreBoard));
+
+ /* score board declarations */
+ end_block = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, end_block);
+ pc_after_block = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, pc_after_block);
+ last_pc = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, last_pc);
+}
+
+static NodeData *create_node(uint64_t addr)
+{
+ NodeData *node = g_new0(NodeData, 1);
+ g_mutex_init(&node->lock);
+ node->addr = addr;
+ node->dests = g_array_new(true, true, sizeof(DestData));
+ return node;
+}
+
+static NodeData *fetch_node(uint64_t addr, bool create_if_not_found)
+{
+ NodeData *node = NULL;
+
+ g_mutex_lock(&node_lock);
+ node = (NodeData *) g_hash_table_lookup(nodes, (gconstpointer) addr);
+ if (!node && create_if_not_found) {
+ node = create_node(addr);
+ g_hash_table_insert(nodes, (gpointer) addr, (gpointer) node);
+ }
+ g_mutex_unlock(&node_lock);
+ return node;
+}
+
+#if 0
+static InsnData *fetch_insn(uint64_t addr, struct qemu_plugin_insn *insn, InsnTypes flag)
+{
+ InsnData *d = NULL;
+
+ g_mutex_lock(&insn_lock);
+ d = (InsnData *) g_hash_table_lookup(insn_hash, (gconstpointer) addr);
+ if (!d) {
+ d = g_new0(InsnData, 1);
+ d->addr = addr;
+ d->type_flag = flag;
+ d->insn_disas = qemu_plugin_insn_disas(insn);
+ d->symbol = qemu_plugin_insn_symbol(insn);
+ g_hash_table_insert(insn_hash, (gpointer) addr, (gpointer) d);
+ } else {
+ g_autofree char* cmp_disas = qemu_plugin_insn_disas(insn);
+ if (g_strcmp0(d->insn_disas, cmp_disas) != 0) {
+ d->type_flag |= MULT_INSN;
+ }
+ d->type_flag |= flag;
+ }
+ g_mutex_unlock(&insn_lock);
+ return d;
+}
+#endif
+
+/*
+ * Called when we detect a non-linear execution (pc !=
+ * pc_after_block). This could be due to a fault causing some sort of
+ * exit exception (if last_pc != block_end) or just a taken branch.
+ */
+static void vcpu_tb_branched_exec(unsigned int cpu_index, void *udata)
+{
+ uint64_t lpc = qemu_plugin_u64_get(last_pc, cpu_index);
+ uint64_t ebpc = qemu_plugin_u64_get(end_block, cpu_index);
+ uint64_t npc = qemu_plugin_u64_get(pc_after_block, cpu_index);
+ uint64_t pc = GPOINTER_TO_UINT(udata);
+
+ /* return early for address 0 */
+ if (!lpc) {
+ return;
+ }
+
+ NodeData *node = fetch_node(lpc, true);
+ DestData *data = NULL;
+ bool early_exit = (lpc != ebpc);
+ GArray *dests;
+
+ /* the condition should never hit */
+ g_assert(pc != npc);
+
+ g_mutex_lock(&node->lock);
+
+ if (early_exit) {
+ fprintf(stderr, "%s: pc=%"PRIx64", epbc=%"PRIx64
+ " npc=%"PRIx64", lpc=%"PRIx64", \n",
+ __func__, pc, ebpc, npc, lpc);
+ node->early_exit++;
+ if (!node->mid_count) {
+ /* count now as we've only just allocated */
+ node->mid_count++;
+ }
+ }
+
+ dests = node->dests;
+ for (int i = 0; i < dests->len; i++) {
+ if (g_array_index(dests, DestData, i).daddr == pc) {
+ data = &g_array_index(dests, DestData, i);
+ }
+ }
+
+ /* we've never seen this before, allocate a new entry */
+ if (!data) {
+ DestData new_entry = { .daddr = pc };
+ g_array_append_val(dests, new_entry);
+ data = &g_array_index(dests, DestData, dests->len - 1);
+ g_assert(data->daddr == pc);
+ }
+
+ data->dcount++;
+ node->dest_count++;
+
+ g_mutex_unlock(&node->lock);
+}
+
+/*
+ * At the start of each block we need to resolve two things:
+ *
+ * - is last_pc == block_end, if not we had an early exit
+ * - is start of block last_pc + insn width, if not we jumped
+ *
+ * Once those are dealt with we can instrument the rest of the
+ * instructions for their execution.
+ *
+ */
+static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
+{
+ uint64_t pc = qemu_plugin_tb_vaddr(tb);
+ size_t insns = qemu_plugin_tb_n_insns(tb);
+ struct qemu_plugin_insn *first_insn = qemu_plugin_tb_get_insn(tb, 0);
+ struct qemu_plugin_insn *last_insn = qemu_plugin_tb_get_insn(tb, insns - 1);
+
+ /*
+ * check if we are executing linearly after the last block. We can
+ * handle both early block exits and normal branches in the
+ * callback if we hit it.
+ */
+ gpointer udata = GUINT_TO_POINTER(pc);
+ qemu_plugin_register_vcpu_tb_exec_cond_cb(
+ tb, vcpu_tb_branched_exec, QEMU_PLUGIN_CB_NO_REGS,
+ QEMU_PLUGIN_COND_NE, pc_after_block, pc, udata);
+
+ /*
+ * Now we can set start/end for this block so the next block can
+ * check where we are at. Do this on the first instruction and not
+ * the TB so we don't get mixed up with above.
+ */
+ qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(first_insn,
+ QEMU_PLUGIN_INLINE_STORE_U64,
+ end_block, qemu_plugin_insn_vaddr(last_insn));
+ qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(first_insn,
+ QEMU_PLUGIN_INLINE_STORE_U64,
+ pc_after_block,
+ qemu_plugin_insn_vaddr(last_insn) +
+ qemu_plugin_insn_size(last_insn));
+
+ for (int idx = 0; idx < qemu_plugin_tb_n_insns(tb); ++idx) {
+ struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, idx);
+ uint64_t ipc = qemu_plugin_insn_vaddr(insn);
+ /*
+ * If this is a potential branch point check if we could grab
+ * the disassembly for it. If it is the last instruction
+ * always create an entry.
+ */
+ NodeData *node = fetch_node(ipc, last_insn);
+ if (node) {
+ g_mutex_lock(&node->lock);
+ if (!node->insn_disas) {
+ node->insn_disas = qemu_plugin_insn_disas(insn);
+ }
+ if (!node->symbol) {
+ node->symbol = qemu_plugin_insn_symbol(insn);
+ }
+ if (last_insn == insn) {
+ node->last_count++;
+ } else {
+ node->mid_count++;
+ }
+ g_mutex_unlock(&node->lock);
+ }
+
+ /* Store the PC of what we are about to execute */
+ qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(insn,
+ QEMU_PLUGIN_INLINE_STORE_U64,
+ last_pc, ipc);
+ }
+}
+
+QEMU_PLUGIN_EXPORT
+int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
+ int argc, char **argv)
+{
+ for (int i = 0; i < argc; i++) {
+ char *opt = argv[i];
+ g_auto(GStrv) tokens = g_strsplit(opt, "=", 2);
+ if (g_strcmp0(tokens[0], "sort") == 0) {
+ if (g_strcmp0(tokens[1], "hottest") == 0) {
+ report = SORT_HOTTEST;
+ } else if (g_strcmp0(tokens[1], "early") == 0) {
+ report = SORT_EXCEPTION;
+ } else if (g_strcmp0(tokens[1], "exceptions") == 0) {
+ report = SORT_POPDEST;
+ } else {
+ fprintf(stderr, "failed to parse: %s\n", tokens[1]);
+ return -1;
+ }
+ } else {
+ fprintf(stderr, "option parsing failed: %s\n", opt);
+ return -1;
+ }
+ }
+
+ plugin_init();
+
+ qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
+ qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
+ return 0;
+}
diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
index 05a2a45c5c..d4ac599f93 100644
--- a/contrib/plugins/Makefile
+++ b/contrib/plugins/Makefile
@@ -29,6 +29,7 @@ NAMES += cache
NAMES += drcov
NAMES += ips
NAMES += stoptrigger
+NAMES += cflow
ifeq ($(CONFIG_WIN32),y)
SO_SUFFIX := .dll
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 14/26] plugins: save value during memory accesses
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (12 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 13/26] contrib/plugins: control flow plugin Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 15/26] plugins: extend API to get latest memory value accessed Alex Bennée
` (11 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Different code paths handle memory accesses:
- tcg generated code
- load/store helpers
- atomic helpers
This value is saved in cpu->neg.plugin_mem_value_{high,low}. Values are
written only for accessed word size (upper bits are not set).
Atomic operations are doing read/write at the same time, so we generate
two memory callbacks instead of one, to allow plugins to access distinct
values.
For now, we can have access only up to 128 bits, thus split this in two
64 bits words. When QEMU will support wider operations, we'll be able to
reconsider this.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240724194708.1843704-2-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
accel/tcg/atomic_template.h | 66 ++++++++++++++++++++++++++++++-----
include/hw/core/cpu.h | 4 +++
include/qemu/plugin.h | 4 +++
plugins/core.c | 6 ++++
tcg/tcg-op-ldst.c | 66 +++++++++++++++++++++++++++++++----
accel/tcg/atomic_common.c.inc | 13 ++++++-
accel/tcg/ldst_common.c.inc | 38 ++++++++++++--------
7 files changed, 167 insertions(+), 30 deletions(-)
diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
index 1dc2151daf..89593b2502 100644
--- a/accel/tcg/atomic_template.h
+++ b/accel/tcg/atomic_template.h
@@ -53,6 +53,14 @@
# error unsupported data size
#endif
+#if DATA_SIZE == 16
+# define VALUE_LOW(val) int128_getlo(val)
+# define VALUE_HIGH(val) int128_gethi(val)
+#else
+# define VALUE_LOW(val) val
+# define VALUE_HIGH(val) 0
+#endif
+
#if DATA_SIZE >= 4
# define ABI_TYPE DATA_TYPE
#else
@@ -83,7 +91,12 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
ret = qatomic_cmpxchg__nocheck(haddr, cmpv, newv);
#endif
ATOMIC_MMU_CLEANUP;
- atomic_trace_rmw_post(env, addr, oi);
+ atomic_trace_rmw_post(env, addr,
+ VALUE_LOW(ret),
+ VALUE_HIGH(ret),
+ VALUE_LOW(newv),
+ VALUE_HIGH(newv),
+ oi);
return ret;
}
@@ -97,7 +110,12 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
ret = qatomic_xchg__nocheck(haddr, val);
ATOMIC_MMU_CLEANUP;
- atomic_trace_rmw_post(env, addr, oi);
+ atomic_trace_rmw_post(env, addr,
+ VALUE_LOW(ret),
+ VALUE_HIGH(ret),
+ VALUE_LOW(val),
+ VALUE_HIGH(val),
+ oi);
return ret;
}
@@ -109,7 +127,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
haddr = atomic_mmu_lookup(env_cpu(env), addr, oi, DATA_SIZE, retaddr); \
ret = qatomic_##X(haddr, val); \
ATOMIC_MMU_CLEANUP; \
- atomic_trace_rmw_post(env, addr, oi); \
+ atomic_trace_rmw_post(env, addr, \
+ VALUE_LOW(ret), \
+ VALUE_HIGH(ret), \
+ VALUE_LOW(val), \
+ VALUE_HIGH(val), \
+ oi); \
return ret; \
}
@@ -145,7 +168,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
cmp = qatomic_cmpxchg__nocheck(haddr, old, new); \
} while (cmp != old); \
ATOMIC_MMU_CLEANUP; \
- atomic_trace_rmw_post(env, addr, oi); \
+ atomic_trace_rmw_post(env, addr, \
+ VALUE_LOW(old), \
+ VALUE_HIGH(old), \
+ VALUE_LOW(xval), \
+ VALUE_HIGH(xval), \
+ oi); \
return RET; \
}
@@ -188,7 +216,12 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
ret = qatomic_cmpxchg__nocheck(haddr, BSWAP(cmpv), BSWAP(newv));
#endif
ATOMIC_MMU_CLEANUP;
- atomic_trace_rmw_post(env, addr, oi);
+ atomic_trace_rmw_post(env, addr,
+ VALUE_LOW(ret),
+ VALUE_HIGH(ret),
+ VALUE_LOW(newv),
+ VALUE_HIGH(newv),
+ oi);
return BSWAP(ret);
}
@@ -202,7 +235,12 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
ret = qatomic_xchg__nocheck(haddr, BSWAP(val));
ATOMIC_MMU_CLEANUP;
- atomic_trace_rmw_post(env, addr, oi);
+ atomic_trace_rmw_post(env, addr,
+ VALUE_LOW(ret),
+ VALUE_HIGH(ret),
+ VALUE_LOW(val),
+ VALUE_HIGH(val),
+ oi);
return BSWAP(ret);
}
@@ -214,7 +252,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
haddr = atomic_mmu_lookup(env_cpu(env), addr, oi, DATA_SIZE, retaddr); \
ret = qatomic_##X(haddr, BSWAP(val)); \
ATOMIC_MMU_CLEANUP; \
- atomic_trace_rmw_post(env, addr, oi); \
+ atomic_trace_rmw_post(env, addr, \
+ VALUE_LOW(ret), \
+ VALUE_HIGH(ret), \
+ VALUE_LOW(val), \
+ VALUE_HIGH(val), \
+ oi); \
return BSWAP(ret); \
}
@@ -247,7 +290,12 @@ ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
ldn = qatomic_cmpxchg__nocheck(haddr, ldo, BSWAP(new)); \
} while (ldo != ldn); \
ATOMIC_MMU_CLEANUP; \
- atomic_trace_rmw_post(env, addr, oi); \
+ atomic_trace_rmw_post(env, addr, \
+ VALUE_LOW(old), \
+ VALUE_HIGH(old), \
+ VALUE_LOW(xval), \
+ VALUE_HIGH(xval), \
+ oi); \
return RET; \
}
@@ -281,3 +329,5 @@ GEN_ATOMIC_HELPER_FN(add_fetch, ADD, DATA_TYPE, new)
#undef SUFFIX
#undef DATA_SIZE
#undef SHIFT
+#undef VALUE_LOW
+#undef VALUE_HIGH
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 1c9c775df6..04e9ad4996 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -350,6 +350,8 @@ typedef union IcountDecr {
* from CPUArchState, via small negative offsets.
* @can_do_io: True if memory-mapped IO is allowed.
* @plugin_mem_cbs: active plugin memory callbacks
+ * @plugin_mem_value_low: 64 lower bits of latest accessed mem value.
+ * @plugin_mem_value_high: 64 higher bits of latest accessed mem value.
*/
typedef struct CPUNegativeOffsetState {
CPUTLB tlb;
@@ -358,6 +360,8 @@ typedef struct CPUNegativeOffsetState {
* The callback pointer are accessed via TCG (see gen_empty_mem_helper).
*/
GArray *plugin_mem_cbs;
+ uint64_t plugin_mem_value_low;
+ uint64_t plugin_mem_value_high;
#endif
IcountDecr icount_decr;
bool can_do_io;
diff --git a/include/qemu/plugin.h b/include/qemu/plugin.h
index af5f9db469..9726a9ebf3 100644
--- a/include/qemu/plugin.h
+++ b/include/qemu/plugin.h
@@ -167,6 +167,8 @@ qemu_plugin_vcpu_syscall(CPUState *cpu, int64_t num, uint64_t a1,
void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret);
void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
+ uint64_t value_low,
+ uint64_t value_high,
MemOpIdx oi, enum qemu_plugin_mem_rw rw);
void qemu_plugin_flush_cb(void);
@@ -251,6 +253,8 @@ void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret)
{ }
static inline void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
+ uint64_t value_low,
+ uint64_t value_high,
MemOpIdx oi,
enum qemu_plugin_mem_rw rw)
{ }
diff --git a/plugins/core.c b/plugins/core.c
index 2897453cac..bb105e8e68 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -602,6 +602,8 @@ void exec_inline_op(enum plugin_dyn_cb_type type,
}
void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
+ uint64_t value_low,
+ uint64_t value_high,
MemOpIdx oi, enum qemu_plugin_mem_rw rw)
{
GArray *arr = cpu->neg.plugin_mem_cbs;
@@ -610,6 +612,10 @@ void qemu_plugin_vcpu_mem_cb(CPUState *cpu, uint64_t vaddr,
if (arr == NULL) {
return;
}
+
+ cpu->neg.plugin_mem_value_low = value_low;
+ cpu->neg.plugin_mem_value_high = value_high;
+
for (i = 0; i < arr->len; i++) {
struct qemu_plugin_dyn_cb *cb =
&g_array_index(arr, struct qemu_plugin_dyn_cb, i);
diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c
index 8510160258..23dc807f11 100644
--- a/tcg/tcg-op-ldst.c
+++ b/tcg/tcg-op-ldst.c
@@ -148,11 +148,11 @@ static TCGv_i64 plugin_maybe_preserve_addr(TCGTemp *addr)
return NULL;
}
+#ifdef CONFIG_PLUGIN
static void
plugin_gen_mem_callbacks(TCGv_i64 copy_addr, TCGTemp *orig_addr, MemOpIdx oi,
enum qemu_plugin_mem_rw rw)
{
-#ifdef CONFIG_PLUGIN
if (tcg_ctx->plugin_insn != NULL) {
qemu_plugin_meminfo_t info = make_plugin_meminfo(oi, rw);
@@ -172,6 +172,54 @@ plugin_gen_mem_callbacks(TCGv_i64 copy_addr, TCGTemp *orig_addr, MemOpIdx oi,
}
}
}
+}
+#endif
+
+static void
+plugin_gen_mem_callbacks_i32(TCGv_i32 val,
+ TCGv_i64 copy_addr, TCGTemp *orig_addr,
+ MemOpIdx oi, enum qemu_plugin_mem_rw rw)
+{
+#ifdef CONFIG_PLUGIN
+ if (tcg_ctx->plugin_insn != NULL) {
+ tcg_gen_st_i32(val, tcg_env,
+ offsetof(CPUState, neg.plugin_mem_value_low) -
+ sizeof(CPUState) + (HOST_BIG_ENDIAN * 4));
+ plugin_gen_mem_callbacks(copy_addr, orig_addr, oi, rw);
+ }
+#endif
+}
+
+static void
+plugin_gen_mem_callbacks_i64(TCGv_i64 val,
+ TCGv_i64 copy_addr, TCGTemp *orig_addr,
+ MemOpIdx oi, enum qemu_plugin_mem_rw rw)
+{
+#ifdef CONFIG_PLUGIN
+ if (tcg_ctx->plugin_insn != NULL) {
+ tcg_gen_st_i64(val, tcg_env,
+ offsetof(CPUState, neg.plugin_mem_value_low) -
+ sizeof(CPUState));
+ plugin_gen_mem_callbacks(copy_addr, orig_addr, oi, rw);
+ }
+#endif
+}
+
+static void
+plugin_gen_mem_callbacks_i128(TCGv_i128 val,
+ TCGv_i64 copy_addr, TCGTemp *orig_addr,
+ MemOpIdx oi, enum qemu_plugin_mem_rw rw)
+{
+#ifdef CONFIG_PLUGIN
+ if (tcg_ctx->plugin_insn != NULL) {
+ tcg_gen_st_i64(TCGV128_LOW(val), tcg_env,
+ offsetof(CPUState, neg.plugin_mem_value_low) -
+ sizeof(CPUState));
+ tcg_gen_st_i64(TCGV128_HIGH(val), tcg_env,
+ offsetof(CPUState, neg.plugin_mem_value_high) -
+ sizeof(CPUState));
+ plugin_gen_mem_callbacks(copy_addr, orig_addr, oi, rw);
+ }
#endif
}
@@ -203,7 +251,8 @@ static void tcg_gen_qemu_ld_i32_int(TCGv_i32 val, TCGTemp *addr,
opc = INDEX_op_qemu_ld_a64_i32;
}
gen_ldst(opc, tcgv_i32_temp(val), NULL, addr, oi);
- plugin_gen_mem_callbacks(copy_addr, addr, orig_oi, QEMU_PLUGIN_MEM_R);
+ plugin_gen_mem_callbacks_i32(val, copy_addr, addr, orig_oi,
+ QEMU_PLUGIN_MEM_R);
if ((orig_memop ^ memop) & MO_BSWAP) {
switch (orig_memop & MO_SIZE) {
@@ -271,7 +320,7 @@ static void tcg_gen_qemu_st_i32_int(TCGv_i32 val, TCGTemp *addr,
}
}
gen_ldst(opc, tcgv_i32_temp(val), NULL, addr, oi);
- plugin_gen_mem_callbacks(NULL, addr, orig_oi, QEMU_PLUGIN_MEM_W);
+ plugin_gen_mem_callbacks_i32(val, NULL, addr, orig_oi, QEMU_PLUGIN_MEM_W);
if (swap) {
tcg_temp_free_i32(swap);
@@ -324,7 +373,8 @@ static void tcg_gen_qemu_ld_i64_int(TCGv_i64 val, TCGTemp *addr,
opc = INDEX_op_qemu_ld_a64_i64;
}
gen_ldst_i64(opc, val, addr, oi);
- plugin_gen_mem_callbacks(copy_addr, addr, orig_oi, QEMU_PLUGIN_MEM_R);
+ plugin_gen_mem_callbacks_i64(val, copy_addr, addr, orig_oi,
+ QEMU_PLUGIN_MEM_R);
if ((orig_memop ^ memop) & MO_BSWAP) {
int flags = (orig_memop & MO_SIGN
@@ -396,7 +446,7 @@ static void tcg_gen_qemu_st_i64_int(TCGv_i64 val, TCGTemp *addr,
opc = INDEX_op_qemu_st_a64_i64;
}
gen_ldst_i64(opc, val, addr, oi);
- plugin_gen_mem_callbacks(NULL, addr, orig_oi, QEMU_PLUGIN_MEM_W);
+ plugin_gen_mem_callbacks_i64(val, NULL, addr, orig_oi, QEMU_PLUGIN_MEM_W);
if (swap) {
tcg_temp_free_i64(swap);
@@ -606,7 +656,8 @@ static void tcg_gen_qemu_ld_i128_int(TCGv_i128 val, TCGTemp *addr,
tcg_constant_i32(orig_oi));
}
- plugin_gen_mem_callbacks(ext_addr, addr, orig_oi, QEMU_PLUGIN_MEM_R);
+ plugin_gen_mem_callbacks_i128(val, ext_addr, addr, orig_oi,
+ QEMU_PLUGIN_MEM_R);
}
void tcg_gen_qemu_ld_i128_chk(TCGv_i128 val, TCGTemp *addr, TCGArg idx,
@@ -722,7 +773,8 @@ static void tcg_gen_qemu_st_i128_int(TCGv_i128 val, TCGTemp *addr,
tcg_constant_i32(orig_oi));
}
- plugin_gen_mem_callbacks(ext_addr, addr, orig_oi, QEMU_PLUGIN_MEM_W);
+ plugin_gen_mem_callbacks_i128(val, ext_addr, addr, orig_oi,
+ QEMU_PLUGIN_MEM_W);
}
void tcg_gen_qemu_st_i128_chk(TCGv_i128 val, TCGTemp *addr, TCGArg idx,
diff --git a/accel/tcg/atomic_common.c.inc b/accel/tcg/atomic_common.c.inc
index 95a5c5ff12..6056598c23 100644
--- a/accel/tcg/atomic_common.c.inc
+++ b/accel/tcg/atomic_common.c.inc
@@ -14,9 +14,20 @@
*/
static void atomic_trace_rmw_post(CPUArchState *env, uint64_t addr,
+ uint64_t read_value_low,
+ uint64_t read_value_high,
+ uint64_t write_value_low,
+ uint64_t write_value_high,
MemOpIdx oi)
{
- qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_RW);
+ if (cpu_plugin_mem_cbs_enabled(env_cpu(env))) {
+ qemu_plugin_vcpu_mem_cb(env_cpu(env), addr,
+ read_value_low, read_value_high,
+ oi, QEMU_PLUGIN_MEM_R);
+ qemu_plugin_vcpu_mem_cb(env_cpu(env), addr,
+ write_value_low, write_value_high,
+ oi, QEMU_PLUGIN_MEM_W);
+ }
}
/*
diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
index 87ceb95487..ebbf380d76 100644
--- a/accel/tcg/ldst_common.c.inc
+++ b/accel/tcg/ldst_common.c.inc
@@ -123,10 +123,15 @@ void helper_st_i128(CPUArchState *env, uint64_t addr, Int128 val, MemOpIdx oi)
* Load helpers for cpu_ldst.h
*/
-static void plugin_load_cb(CPUArchState *env, abi_ptr addr, MemOpIdx oi)
+static void plugin_load_cb(CPUArchState *env, abi_ptr addr,
+ uint64_t value_low,
+ uint64_t value_high,
+ MemOpIdx oi)
{
if (cpu_plugin_mem_cbs_enabled(env_cpu(env))) {
- qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_R);
+ qemu_plugin_vcpu_mem_cb(env_cpu(env), addr,
+ value_low, value_high,
+ oi, QEMU_PLUGIN_MEM_R);
}
}
@@ -136,7 +141,7 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra)
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_UB);
ret = do_ld1_mmu(env_cpu(env), addr, oi, ra, MMU_DATA_LOAD);
- plugin_load_cb(env, addr, oi);
+ plugin_load_cb(env, addr, ret, 0, oi);
return ret;
}
@@ -147,7 +152,7 @@ uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr addr,
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_16);
ret = do_ld2_mmu(env_cpu(env), addr, oi, ra, MMU_DATA_LOAD);
- plugin_load_cb(env, addr, oi);
+ plugin_load_cb(env, addr, ret, 0, oi);
return ret;
}
@@ -158,7 +163,7 @@ uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr addr,
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_32);
ret = do_ld4_mmu(env_cpu(env), addr, oi, ra, MMU_DATA_LOAD);
- plugin_load_cb(env, addr, oi);
+ plugin_load_cb(env, addr, ret, 0, oi);
return ret;
}
@@ -169,7 +174,7 @@ uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr addr,
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_64);
ret = do_ld8_mmu(env_cpu(env), addr, oi, ra, MMU_DATA_LOAD);
- plugin_load_cb(env, addr, oi);
+ plugin_load_cb(env, addr, ret, 0, oi);
return ret;
}
@@ -180,7 +185,7 @@ Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr,
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_128);
ret = do_ld16_mmu(env_cpu(env), addr, oi, ra);
- plugin_load_cb(env, addr, oi);
+ plugin_load_cb(env, addr, int128_getlo(ret), int128_gethi(ret), oi);
return ret;
}
@@ -188,10 +193,15 @@ Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr,
* Store helpers for cpu_ldst.h
*/
-static void plugin_store_cb(CPUArchState *env, abi_ptr addr, MemOpIdx oi)
+static void plugin_store_cb(CPUArchState *env, abi_ptr addr,
+ uint64_t value_low,
+ uint64_t value_high,
+ MemOpIdx oi)
{
if (cpu_plugin_mem_cbs_enabled(env_cpu(env))) {
- qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, oi, QEMU_PLUGIN_MEM_W);
+ qemu_plugin_vcpu_mem_cb(env_cpu(env), addr,
+ value_low, value_high,
+ oi, QEMU_PLUGIN_MEM_W);
}
}
@@ -199,7 +209,7 @@ void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val,
MemOpIdx oi, uintptr_t retaddr)
{
helper_stb_mmu(env, addr, val, oi, retaddr);
- plugin_store_cb(env, addr, oi);
+ plugin_store_cb(env, addr, val, 0, oi);
}
void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
@@ -207,7 +217,7 @@ void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_16);
do_st2_mmu(env_cpu(env), addr, val, oi, retaddr);
- plugin_store_cb(env, addr, oi);
+ plugin_store_cb(env, addr, val, 0, oi);
}
void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
@@ -215,7 +225,7 @@ void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_32);
do_st4_mmu(env_cpu(env), addr, val, oi, retaddr);
- plugin_store_cb(env, addr, oi);
+ plugin_store_cb(env, addr, val, 0, oi);
}
void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
@@ -223,7 +233,7 @@ void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_64);
do_st8_mmu(env_cpu(env), addr, val, oi, retaddr);
- plugin_store_cb(env, addr, oi);
+ plugin_store_cb(env, addr, val, 0, oi);
}
void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
@@ -231,7 +241,7 @@ void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_128);
do_st16_mmu(env_cpu(env), addr, val, oi, retaddr);
- plugin_store_cb(env, addr, oi);
+ plugin_store_cb(env, addr, int128_getlo(val), int128_gethi(val), oi);
}
/*
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 15/26] plugins: extend API to get latest memory value accessed
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (13 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 14/26] plugins: save value during memory accesses Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 16/26] tests/tcg: add mechanism to run specific tests with plugins Alex Bennée
` (10 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Xingtao Yao
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
This value can be accessed only during a memory callback, using
new qemu_plugin_mem_get_value function.
Returned value can be extended when QEMU will support accesses wider
than 128 bits.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1719
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2152
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Xingtao Yao <yaoxt.fnst@fujitsu.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240724194708.1843704-3-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
include/qemu/qemu-plugin.h | 32 ++++++++++++++++++++++++++++++++
plugins/api.c | 33 +++++++++++++++++++++++++++++++++
plugins/qemu-plugins.symbols | 1 +
3 files changed, 66 insertions(+)
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index c71c705b69..649ce89815 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -262,6 +262,29 @@ enum qemu_plugin_mem_rw {
QEMU_PLUGIN_MEM_RW,
};
+enum qemu_plugin_mem_value_type {
+ QEMU_PLUGIN_MEM_VALUE_U8,
+ QEMU_PLUGIN_MEM_VALUE_U16,
+ QEMU_PLUGIN_MEM_VALUE_U32,
+ QEMU_PLUGIN_MEM_VALUE_U64,
+ QEMU_PLUGIN_MEM_VALUE_U128,
+};
+
+/* typedef qemu_plugin_mem_value - value accessed during a load/store */
+typedef struct {
+ enum qemu_plugin_mem_value_type type;
+ union {
+ uint8_t u8;
+ uint16_t u16;
+ uint32_t u32;
+ uint64_t u64;
+ struct {
+ uint64_t low;
+ uint64_t high;
+ } u128;
+ } data;
+} qemu_plugin_mem_value;
+
/**
* enum qemu_plugin_cond - condition to enable callback
*
@@ -551,6 +574,15 @@ bool qemu_plugin_mem_is_big_endian(qemu_plugin_meminfo_t info);
QEMU_PLUGIN_API
bool qemu_plugin_mem_is_store(qemu_plugin_meminfo_t info);
+/**
+ * qemu_plugin_mem_get_mem_value() - return last value loaded/stored
+ * @info: opaque memory transaction handle
+ *
+ * Returns: memory value
+ */
+QEMU_PLUGIN_API
+qemu_plugin_mem_value qemu_plugin_mem_get_value(qemu_plugin_meminfo_t info);
+
/**
* qemu_plugin_get_hwaddr() - return handle for memory operation
* @info: opaque memory info structure
diff --git a/plugins/api.c b/plugins/api.c
index 2ff13d09de..3316d4a04d 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -351,6 +351,39 @@ bool qemu_plugin_mem_is_store(qemu_plugin_meminfo_t info)
return get_plugin_meminfo_rw(info) & QEMU_PLUGIN_MEM_W;
}
+qemu_plugin_mem_value qemu_plugin_mem_get_value(qemu_plugin_meminfo_t info)
+{
+ uint64_t low = current_cpu->neg.plugin_mem_value_low;
+ qemu_plugin_mem_value value;
+
+ switch (qemu_plugin_mem_size_shift(info)) {
+ case 0:
+ value.type = QEMU_PLUGIN_MEM_VALUE_U8;
+ value.data.u8 = (uint8_t)low;
+ break;
+ case 1:
+ value.type = QEMU_PLUGIN_MEM_VALUE_U16;
+ value.data.u16 = (uint16_t)low;
+ break;
+ case 2:
+ value.type = QEMU_PLUGIN_MEM_VALUE_U32;
+ value.data.u32 = (uint32_t)low;
+ break;
+ case 3:
+ value.type = QEMU_PLUGIN_MEM_VALUE_U64;
+ value.data.u64 = low;
+ break;
+ case 4:
+ value.type = QEMU_PLUGIN_MEM_VALUE_U128;
+ value.data.u128.low = low;
+ value.data.u128.high = current_cpu->neg.plugin_mem_value_high;
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ return value;
+}
+
/*
* Virtual Memory queries
*/
diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols
index ca773d8d9f..eed9d8abd9 100644
--- a/plugins/qemu-plugins.symbols
+++ b/plugins/qemu-plugins.symbols
@@ -13,6 +13,7 @@
qemu_plugin_insn_size;
qemu_plugin_insn_symbol;
qemu_plugin_insn_vaddr;
+ qemu_plugin_mem_get_value;
qemu_plugin_mem_is_big_endian;
qemu_plugin_mem_is_sign_extended;
qemu_plugin_mem_is_store;
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 16/26] tests/tcg: add mechanism to run specific tests with plugins
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (14 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 15/26] plugins: extend API to get latest memory value accessed Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 17/26] tests/tcg: allow to check output of plugins Alex Bennée
` (9 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Xingtao Yao
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Only multiarch tests are run with plugins, and we want to be able to run
per-arch test with plugins too.
Tested-by: Xingtao Yao <yaoxt.fnst@fujitsu.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240724194708.1843704-4-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/Makefile.target | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index 452a2cde65..c5b1c7a786 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -152,10 +152,11 @@ PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c)))
# only expand MULTIARCH_TESTS which are common on most of our targets
# to avoid an exponential explosion as new tests are added. We also
# add some special helpers the run-plugin- rules can use below.
+# In more, extra tests can be added using ADDITIONAL_PLUGINS_TESTS variable.
ifneq ($(MULTIARCH_TESTS),)
$(foreach p,$(PLUGINS), \
- $(foreach t,$(MULTIARCH_TESTS),\
+ $(foreach t,$(MULTIARCH_TESTS) $(ADDITIONAL_PLUGINS_TESTS),\
$(eval run-plugin-$(t)-with-$(p): $t $p) \
$(eval RUN_TESTS+=run-plugin-$(t)-with-$(p))))
endif # MULTIARCH_TESTS
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 17/26] tests/tcg: allow to check output of plugins
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (15 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 16/26] tests/tcg: add mechanism to run specific tests with plugins Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 18/26] tests/plugin/mem: add option to print memory accesses Alex Bennée
` (8 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Xingtao Yao
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
A specific plugin test can now read and check a plugin output, to ensure
it contains expected values.
Tested-by: Xingtao Yao <yaoxt.fnst@fujitsu.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240724194708.1843704-5-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/Makefile.target | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target
index c5b1c7a786..2da70b2fcf 100644
--- a/tests/tcg/Makefile.target
+++ b/tests/tcg/Makefile.target
@@ -90,6 +90,7 @@ CFLAGS=
LDFLAGS=
QEMU_OPTS=
+CHECK_PLUGIN_OUTPUT_COMMAND=
# If TCG debugging, or TCI is enabled things are a lot slower
@@ -180,6 +181,10 @@ run-plugin-%:
-plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \
-d plugin -D $*.pout \
$(call strip-plugin,$<))
+ $(if $(CHECK_PLUGIN_OUTPUT_COMMAND), \
+ $(call quiet-command, $(CHECK_PLUGIN_OUTPUT_COMMAND) $*.pout, \
+ TEST, check plugin $(call extract-plugin,$@) output \
+ with $(call strip-plugin,$<)))
else
run-%: %
$(call run-test, $<, \
@@ -194,6 +199,10 @@ run-plugin-%:
-plugin $(PLUGIN_LIB)/$(call extract-plugin,$@)$(PLUGIN_ARGS) \
-d plugin -D $*.pout \
$(QEMU_OPTS) $(call strip-plugin,$<))
+ $(if $(CHECK_PLUGIN_OUTPUT_COMMAND), \
+ $(call quiet-command, $(CHECK_PLUGIN_OUTPUT_COMMAND) $*.pout, \
+ TEST, check plugin $(call extract-plugin,$@) output \
+ with $(call strip-plugin,$<)))
endif
gdb-%: %
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 18/26] tests/plugin/mem: add option to print memory accesses
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (16 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 17/26] tests/tcg: allow to check output of plugins Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 19/26] tests/tcg: clean up output of memory system test Alex Bennée
` (7 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Xingtao Yao
From: Pierrick Bouvier <pierrick.bouvier@linaro.org>
By using "print-accesses=true" option, mem plugin will now print every
value accessed, with associated size, type (store vs load), symbol,
instruction address and phys/virt address accessed.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Xingtao Yao <yaoxt.fnst@fujitsu.com>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240724194708.1843704-6-pierrick.bouvier@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/plugins/mem.c | 69 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 68 insertions(+), 1 deletion(-)
diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c
index b650dddcce..086e6f5bdf 100644
--- a/tests/tcg/plugins/mem.c
+++ b/tests/tcg/plugins/mem.c
@@ -21,10 +21,15 @@ typedef struct {
uint64_t io_count;
} CPUCount;
+typedef struct {
+ uint64_t vaddr;
+ const char *sym;
+} InsnInfo;
+
static struct qemu_plugin_scoreboard *counts;
static qemu_plugin_u64 mem_count;
static qemu_plugin_u64 io_count;
-static bool do_inline, do_callback;
+static bool do_inline, do_callback, do_print_accesses;
static bool do_haddr;
static enum qemu_plugin_mem_rw rw = QEMU_PLUGIN_MEM_RW;
@@ -60,6 +65,44 @@ static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
}
}
+static void print_access(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
+ uint64_t vaddr, void *udata)
+{
+ InsnInfo *insn_info = udata;
+ unsigned size = 8 << qemu_plugin_mem_size_shift(meminfo);
+ const char *type = qemu_plugin_mem_is_store(meminfo) ? "store" : "load";
+ qemu_plugin_mem_value value = qemu_plugin_mem_get_value(meminfo);
+ uint64_t hwaddr =
+ qemu_plugin_hwaddr_phys_addr(qemu_plugin_get_hwaddr(meminfo, vaddr));
+ g_autoptr(GString) out = g_string_new("");
+ g_string_printf(out,
+ "0x%"PRIx64",%s,0x%"PRIx64",0x%"PRIx64",%d,%s,",
+ insn_info->vaddr, insn_info->sym,
+ vaddr, hwaddr, size, type);
+ switch (value.type) {
+ case QEMU_PLUGIN_MEM_VALUE_U8:
+ g_string_append_printf(out, "0x%02"PRIx8, value.data.u8);
+ break;
+ case QEMU_PLUGIN_MEM_VALUE_U16:
+ g_string_append_printf(out, "0x%04"PRIx16, value.data.u16);
+ break;
+ case QEMU_PLUGIN_MEM_VALUE_U32:
+ g_string_append_printf(out, "0x%08"PRIx32, value.data.u32);
+ break;
+ case QEMU_PLUGIN_MEM_VALUE_U64:
+ g_string_append_printf(out, "0x%016"PRIx64, value.data.u64);
+ break;
+ case QEMU_PLUGIN_MEM_VALUE_U128:
+ g_string_append_printf(out, "0x%016"PRIx64"%016"PRIx64,
+ value.data.u128.high, value.data.u128.low);
+ break;
+ default:
+ g_assert_not_reached();
+ }
+ g_string_append_printf(out, "\n");
+ qemu_plugin_outs(out->str);
+}
+
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
size_t n = qemu_plugin_tb_n_insns(tb);
@@ -79,6 +122,16 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
QEMU_PLUGIN_CB_NO_REGS,
rw, NULL);
}
+ if (do_print_accesses) {
+ /* we leak this pointer, to avoid locking to keep track of it */
+ InsnInfo *insn_info = g_malloc(sizeof(InsnInfo));
+ const char *sym = qemu_plugin_insn_symbol(insn);
+ insn_info->sym = sym ? sym : "";
+ insn_info->vaddr = qemu_plugin_insn_vaddr(insn);
+ qemu_plugin_register_vcpu_mem_cb(insn, print_access,
+ QEMU_PLUGIN_CB_NO_REGS,
+ rw, (void *) insn_info);
+ }
}
}
@@ -117,6 +170,12 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
return -1;
}
+ } else if (g_strcmp0(tokens[0], "print-accesses") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1],
+ &do_print_accesses)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ return -1;
+ }
} else {
fprintf(stderr, "option parsing failed: %s\n", opt);
return -1;
@@ -129,6 +188,14 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
return -1;
}
+ if (do_print_accesses) {
+ g_autoptr(GString) out = g_string_new("");
+ g_string_printf(out,
+ "insn_vaddr,insn_symbol,mem_vaddr,mem_hwaddr,"
+ "access_size,access_type,mem_value\n");
+ qemu_plugin_outs(out->str);
+ }
+
counts = qemu_plugin_scoreboard_new(sizeof(CPUCount));
mem_count = qemu_plugin_scoreboard_u64_in_struct(
counts, CPUCount, mem_count);
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 19/26] tests/tcg: clean up output of memory system test
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (17 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 18/26] tests/plugin/mem: add option to print memory accesses Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:47 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems Alex Bennée
` (6 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
This is useful information when debugging memory issues so lets
improve by:
- include the ptr address for u8 fills (like the others)
- indicate the number of operations for reads and writes
- explicitly note when we are flushing
- move the fill printf to after the reset
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/multiarch/system/memory.c | 47 ++++++++++++++++++-----------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c
index 6eb2eb16f7..8f2371975d 100644
--- a/tests/tcg/multiarch/system/memory.c
+++ b/tests/tcg/multiarch/system/memory.c
@@ -63,12 +63,14 @@ static void init_test_data_u8(int unused_offset)
int i;
(void)(unused_offset);
- ml_printf("Filling test area with u8:");
+ ml_printf("Filling test area with u8 (%p):", ptr);
+
for (i = 0; i < TEST_SIZE; i++) {
*ptr++ = BYTE_NEXT(count);
pdot(i);
}
- ml_printf("done\n");
+
+ ml_printf("done %d @ %p\n", i, ptr);
}
/*
@@ -94,7 +96,7 @@ static void init_test_data_s8(bool neg_first)
*ptr++ = get_byte(i, !neg_first);
pdot(i);
}
- ml_printf("done\n");
+ ml_printf("done %d @ %p\n", i * 2, ptr);
}
/*
@@ -105,9 +107,18 @@ static void reset_start_data(int offset)
{
uint32_t *ptr = (uint32_t *) &test_data[0];
int i;
+
+ if (!offset) {
+ return;
+ }
+
+ ml_printf("Flushing %d bytes from %p: ", offset, ptr);
+
for (i = 0; i < offset; i++) {
*ptr++ = 0;
}
+
+ ml_printf("done %d @ %p\n", i, ptr);
}
static void init_test_data_u16(int offset)
@@ -117,17 +128,17 @@ static void init_test_data_u16(int offset)
const int max = (TEST_SIZE - offset) / sizeof(word);
int i;
- ml_printf("Filling test area with u16 (offset %d, %p):", offset, ptr);
-
reset_start_data(offset);
+ ml_printf("Filling test area with u16 (offset %d, %p):", offset, ptr);
+
for (i = 0; i < max; i++) {
uint16_t low = BYTE_NEXT(count), high = BYTE_NEXT(count);
word = BYTE_SHIFT(high, 1) | BYTE_SHIFT(low, 0);
*ptr++ = word;
pdot(i);
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
}
static void init_test_data_u32(int offset)
@@ -137,10 +148,10 @@ static void init_test_data_u32(int offset)
const int max = (TEST_SIZE - offset) / sizeof(word);
int i;
- ml_printf("Filling test area with u32 (offset %d, %p):", offset, ptr);
-
reset_start_data(offset);
+ ml_printf("Filling test area with u32 (offset %d, %p):", offset, ptr);
+
for (i = 0; i < max; i++) {
uint32_t b4 = BYTE_NEXT(count), b3 = BYTE_NEXT(count);
uint32_t b2 = BYTE_NEXT(count), b1 = BYTE_NEXT(count);
@@ -149,7 +160,7 @@ static void init_test_data_u32(int offset)
*ptr++ = word;
pdot(i);
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
}
static void init_test_data_u64(int offset)
@@ -159,10 +170,10 @@ static void init_test_data_u64(int offset)
const int max = (TEST_SIZE - offset) / sizeof(word);
int i;
- ml_printf("Filling test area with u64 (offset %d, %p):", offset, ptr);
-
reset_start_data(offset);
+ ml_printf("Filling test area with u64 (offset %d, %p):", offset, ptr);
+
for (i = 0; i < max; i++) {
uint64_t b8 = BYTE_NEXT(count), b7 = BYTE_NEXT(count);
uint64_t b6 = BYTE_NEXT(count), b5 = BYTE_NEXT(count);
@@ -174,7 +185,7 @@ static void init_test_data_u64(int offset)
*ptr++ = word;
pdot(i);
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
}
static bool read_test_data_u16(int offset)
@@ -198,7 +209,7 @@ static bool read_test_data_u16(int offset)
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
return true;
}
@@ -239,7 +250,7 @@ static bool read_test_data_u32(int offset)
pdot(i);
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
return true;
}
@@ -293,7 +304,7 @@ static bool read_test_data_u64(int offset)
pdot(i);
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
return true;
}
@@ -365,7 +376,7 @@ static bool read_test_data_s8(int offset, bool neg_first)
return false;
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i * 2, ptr);
return true;
}
@@ -398,7 +409,7 @@ static bool read_test_data_s16(int offset, bool neg_first)
return false;
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
return true;
}
@@ -431,7 +442,7 @@ static bool read_test_data_s32(int offset, bool neg_first)
return false;
}
}
- ml_printf("done @ %p\n", ptr);
+ ml_printf("done %d @ %p\n", i, ptr);
return true;
}
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (18 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 19/26] tests/tcg: clean up output of memory system test Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:48 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 21/26] tests/tcg: add a system test to check memory instrumentation Alex Bennée
` (5 subsequent siblings)
25 siblings, 1 reply; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
While the compilers will generally happily synthesise a 64 bit value
for you on 32 bit systems it doesn't exercise anything on QEMU. It
also makes it hard to accurately compare the accesses to test_data
when instrumenting.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/multiarch/system/memory.c | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c
index 8f2371975d..680dd4800b 100644
--- a/tests/tcg/multiarch/system/memory.c
+++ b/tests/tcg/multiarch/system/memory.c
@@ -163,6 +163,7 @@ static void init_test_data_u32(int offset)
ml_printf("done %d @ %p\n", i, ptr);
}
+#if __SIZEOF_POINTER__ == 8
static void init_test_data_u64(int offset)
{
uint8_t count = 0;
@@ -187,6 +188,7 @@ static void init_test_data_u64(int offset)
}
ml_printf("done %d @ %p\n", i, ptr);
}
+#endif
static bool read_test_data_u16(int offset)
{
@@ -254,6 +256,7 @@ static bool read_test_data_u32(int offset)
return true;
}
+#if __SIZEOF_POINTER__ == 8
static bool read_test_data_u64(int offset)
{
uint64_t word, *ptr = (uint64_t *)&test_data[offset];
@@ -307,11 +310,16 @@ static bool read_test_data_u64(int offset)
ml_printf("done %d @ %p\n", i, ptr);
return true;
}
+#endif
/* Read the test data and verify at various offsets */
-read_ufn read_ufns[] = { read_test_data_u16,
- read_test_data_u32,
- read_test_data_u64 };
+read_ufn read_ufns[] = {
+ read_test_data_u16,
+ read_test_data_u32,
+#if __SIZEOF_POINTER__ == 8
+ read_test_data_u64
+#endif
+};
bool do_unsigned_reads(int start_off)
{
@@ -476,10 +484,14 @@ bool do_signed_reads(bool neg_first)
return ok;
}
-init_ufn init_ufns[] = { init_test_data_u8,
- init_test_data_u16,
- init_test_data_u32,
- init_test_data_u64 };
+init_ufn init_ufns[] = {
+ init_test_data_u8,
+ init_test_data_u16,
+ init_test_data_u32,
+#if __SIZEOF_POINTER__ == 8
+ init_test_data_u64
+#endif
+};
int main(void)
{
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 21/26] tests/tcg: add a system test to check memory instrumentation
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (19 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 22/26] util/timer: avoid deadlock when shutting down Alex Bennée
` (4 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
At first I thought I could compile the user-mode test for system mode
however we already have a fairly comprehensive test case for system
mode in "memory" so lets use that.
First we extend the test to report where the test_data region is. Then
we expand the pdot() function to track the total number of reads and
writes to the region. We have to add some addition pdot() calls to
take into account multiple reads/writes in the test loops.
As tracking every access will quickly build up with "print-access" we
add a new mode to track groups of reads and writes to regions. Because
the test_data is page aligned we can be sure all accesses to it are
ones we can count.
Finally we add a python script to integrate the data from the plugin
and the output of the test and validate they both agree on the total
counts.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v2
- aggressively align test_data on "region size"
- sort the regions in the final report
- ensure alpha-softmmu uses byte access when it can
---
tests/tcg/multiarch/system/memory.c | 50 +++--
tests/tcg/plugins/mem.c | 178 +++++++++++++++++-
tests/tcg/alpha/Makefile.softmmu-target | 2 +-
.../multiarch/system/Makefile.softmmu-target | 6 +
.../system/validate-memory-counts.py | 115 +++++++++++
5 files changed, 332 insertions(+), 19 deletions(-)
create mode 100755 tests/tcg/multiarch/system/validate-memory-counts.py
diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c
index 680dd4800b..ccff699015 100644
--- a/tests/tcg/multiarch/system/memory.c
+++ b/tests/tcg/multiarch/system/memory.c
@@ -14,26 +14,35 @@
#include <stdint.h>
#include <stdbool.h>
+#include <inttypes.h>
#include <minilib.h>
#ifndef CHECK_UNALIGNED
# error "Target does not specify CHECK_UNALIGNED"
#endif
+uint32_t test_read_count;
+uint32_t test_write_count;
+
#define MEM_PAGE_SIZE 4096 /* nominal 4k "pages" */
#define TEST_SIZE (MEM_PAGE_SIZE * 4) /* 4 pages */
#define ARRAY_SIZE(x) ((sizeof(x) / sizeof((x)[0])))
-__attribute__((aligned(MEM_PAGE_SIZE)))
+__attribute__((aligned(TEST_SIZE)))
static uint8_t test_data[TEST_SIZE];
typedef void (*init_ufn) (int offset);
typedef bool (*read_ufn) (int offset);
typedef bool (*read_sfn) (int offset, bool nf);
-static void pdot(int count)
+static void pdot(int count, bool write)
{
+ if (write) {
+ test_write_count++;
+ } else {
+ test_read_count++;
+ }
if (count % 128 == 0) {
ml_printf(".");
}
@@ -67,7 +76,7 @@ static void init_test_data_u8(int unused_offset)
for (i = 0; i < TEST_SIZE; i++) {
*ptr++ = BYTE_NEXT(count);
- pdot(i);
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i, ptr);
@@ -93,8 +102,9 @@ static void init_test_data_s8(bool neg_first)
neg_first ? "neg first" : "pos first");
for (i = 0; i < TEST_SIZE / 2; i++) {
*ptr++ = get_byte(i, neg_first);
+ pdot(i, true);
*ptr++ = get_byte(i, !neg_first);
- pdot(i);
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i * 2, ptr);
}
@@ -116,6 +126,7 @@ static void reset_start_data(int offset)
for (i = 0; i < offset; i++) {
*ptr++ = 0;
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i, ptr);
@@ -136,7 +147,7 @@ static void init_test_data_u16(int offset)
uint16_t low = BYTE_NEXT(count), high = BYTE_NEXT(count);
word = BYTE_SHIFT(high, 1) | BYTE_SHIFT(low, 0);
*ptr++ = word;
- pdot(i);
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i, ptr);
}
@@ -158,7 +169,7 @@ static void init_test_data_u32(int offset)
word = BYTE_SHIFT(b1, 3) | BYTE_SHIFT(b2, 2) | BYTE_SHIFT(b3, 1) |
BYTE_SHIFT(b4, 0);
*ptr++ = word;
- pdot(i);
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i, ptr);
}
@@ -184,7 +195,7 @@ static void init_test_data_u64(int offset)
BYTE_SHIFT(b4, 4) | BYTE_SHIFT(b5, 3) | BYTE_SHIFT(b6, 2) |
BYTE_SHIFT(b7, 1) | BYTE_SHIFT(b8, 0);
*ptr++ = word;
- pdot(i);
+ pdot(i, true);
}
ml_printf("done %d @ %p\n", i, ptr);
}
@@ -207,7 +218,7 @@ static bool read_test_data_u16(int offset)
ml_printf("Error %d < %d\n", high, low);
return false;
} else {
- pdot(i);
+ pdot(i, false);
}
}
@@ -249,7 +260,7 @@ static bool read_test_data_u32(int offset)
ml_printf("Error %d, %d, %d, %d", b1, b2, b3, b4);
return false;
} else {
- pdot(i);
+ pdot(i, false);
}
}
ml_printf("done %d @ %p\n", i, ptr);
@@ -304,7 +315,7 @@ static bool read_test_data_u64(int offset)
b1, b2, b3, b4, b5, b6, b7, b8);
return false;
} else {
- pdot(i);
+ pdot(i, false);
}
}
ml_printf("done %d @ %p\n", i, ptr);
@@ -376,9 +387,11 @@ static bool read_test_data_s8(int offset, bool neg_first)
second = *ptr++;
if (neg_first && first < 0 && second > 0) {
- pdot(i);
+ pdot(i, false);
+ pdot(i, false);
} else if (!neg_first && first > 0 && second < 0) {
- pdot(i);
+ pdot(i, false);
+ pdot(i, false);
} else {
ml_printf("Error %d %c %d\n", first, neg_first ? '<' : '>', second);
return false;
@@ -409,9 +422,9 @@ static bool read_test_data_s16(int offset, bool neg_first)
int32_t data = *ptr++;
if (neg_first && data < 0) {
- pdot(i);
+ pdot(i, false);
} else if (!neg_first && data > 0) {
- pdot(i);
+ pdot(i, false);
} else {
ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>');
return false;
@@ -442,9 +455,9 @@ static bool read_test_data_s32(int offset, bool neg_first)
int64_t data = *ptr++;
if (neg_first && data < 0) {
- pdot(i);
+ pdot(i, false);
} else if (!neg_first && data > 0) {
- pdot(i);
+ pdot(i, false);
} else {
ml_printf("Error %d %c 0\n", data, neg_first ? '<' : '>');
return false;
@@ -498,6 +511,9 @@ int main(void)
int i;
bool ok = true;
+ ml_printf("Test data start: 0x%"PRIxPTR"\n", &test_data[0]);
+ ml_printf("Test data end: 0x%"PRIxPTR"\n", &test_data[TEST_SIZE]);
+
/* Run through the unsigned tests first */
for (i = 0; i < ARRAY_SIZE(init_ufns) && ok; i++) {
ok = do_unsigned_test(init_ufns[i]);
@@ -513,6 +529,8 @@ int main(void)
ok = do_signed_reads(true);
}
+ ml_printf("Test data read: %"PRId32"\n", test_read_count);
+ ml_printf("Test data write: %"PRId32"\n", test_write_count);
ml_printf("Test complete: %s\n", ok ? "PASSED" : "FAILED");
return ok ? 0 : -1;
}
diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c
index 086e6f5bdf..42d735d5c8 100644
--- a/tests/tcg/plugins/mem.c
+++ b/tests/tcg/plugins/mem.c
@@ -9,6 +9,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <endian.h>
#include <stdio.h>
#include <glib.h>
@@ -26,13 +27,46 @@ typedef struct {
const char *sym;
} InsnInfo;
+/*
+ * For the "memory" system test we need to track accesses to
+ * individual regions. We mirror the data written to the region and
+ * then check when it is read that it matches up.
+ *
+ * We do this as regions rather than pages to save on complications
+ * with page crossing and the fact the test only cares about the
+ * test_data region.
+ */
+static uint64_t region_size = 4096 * 4;
+static uint64_t region_mask;
+
+typedef struct {
+ uint64_t region_address;
+ uint64_t reads;
+ uint64_t writes;
+ uint8_t *data;
+ bool seen_all; /* Did we see every write and read with correct values? */
+} RegionInfo;
+
static struct qemu_plugin_scoreboard *counts;
static qemu_plugin_u64 mem_count;
static qemu_plugin_u64 io_count;
-static bool do_inline, do_callback, do_print_accesses;
+static bool do_inline, do_callback, do_print_accesses, do_region_summary;
static bool do_haddr;
static enum qemu_plugin_mem_rw rw = QEMU_PLUGIN_MEM_RW;
+
+static GMutex lock;
+static GHashTable *regions;
+
+static gint addr_order(gconstpointer a, gconstpointer b)
+{
+ RegionInfo *na = (RegionInfo *) a;
+ RegionInfo *nb = (RegionInfo *) b;
+
+ return na->region_address > nb->region_address ? 1 : -1;
+}
+
+
static void plugin_exit(qemu_plugin_id_t id, void *p)
{
g_autoptr(GString) out = g_string_new("");
@@ -46,9 +80,129 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
qemu_plugin_u64_sum(io_count));
}
qemu_plugin_outs(out->str);
+
+
+ if (do_region_summary) {
+ GList *counts = g_hash_table_get_values(regions);
+
+ counts = g_list_sort(counts, addr_order);
+
+ g_string_printf(out, "Region Base, Reads, Writes, Seen all\n");
+
+ if (counts && g_list_next(counts)) {
+ for (/* counts */; counts->next; counts = counts->next) {
+ RegionInfo *ri = (RegionInfo *) counts->data;
+
+ g_string_append_printf(out,
+ "0x%016"PRIx64", "
+ "%"PRId64", %"PRId64", %s\n",
+ ri->region_address,
+ ri->reads,
+ ri->writes,
+ ri->seen_all ? "true" : "false");
+ }
+ }
+ qemu_plugin_outs(out->str);
+ }
+
qemu_plugin_scoreboard_free(counts);
}
+/*
+ * Update the region tracking info for the access. We split up accesses
+ * that span regions even though the plugin infrastructure will deliver
+ * it as a single access.
+ */
+static void update_region_info(uint64_t region, uint64_t offset,
+ qemu_plugin_meminfo_t meminfo,
+ qemu_plugin_mem_value value,
+ unsigned size)
+{
+ bool be = qemu_plugin_mem_is_big_endian(meminfo);
+ bool is_store = qemu_plugin_mem_is_store(meminfo);
+ RegionInfo *ri;
+ bool unseen_data = false;
+
+ g_assert(offset + size <= region_size);
+
+ g_mutex_lock(&lock);
+ ri = (RegionInfo *) g_hash_table_lookup(regions, GUINT_TO_POINTER(region));
+
+ if (!ri) {
+ ri = g_new0(RegionInfo, 1);
+ ri->region_address = region;
+ ri->data = g_malloc0(region_size);
+ ri->seen_all = true;
+ g_hash_table_insert(regions, GUINT_TO_POINTER(region), (gpointer) ri);
+ }
+
+ if (is_store) {
+ ri->writes++;
+ } else {
+ ri->reads++;
+ }
+
+ switch (value.type) {
+ case QEMU_PLUGIN_MEM_VALUE_U8:
+ if (is_store) {
+ ri->data[offset] = value.data.u8;
+ } else if (ri->data[offset] != value.data.u8) {
+ unseen_data = true;
+ }
+ break;
+ case QEMU_PLUGIN_MEM_VALUE_U16:
+ {
+ uint16_t *p = (uint16_t *) &ri->data[offset];
+ if (is_store) {
+ *p = be ? be16toh(value.data.u16) : value.data.u16;
+ } else if (*p != value.data.u16) {
+ unseen_data = true;
+ }
+ break;
+ }
+ case QEMU_PLUGIN_MEM_VALUE_U32:
+ {
+ uint32_t *p = (uint32_t *) &ri->data[offset];
+ if (is_store) {
+ *p = be ? be32toh(value.data.u32) : value.data.u32;
+ } else if (*p != value.data.u32) {
+ unseen_data = true;
+ }
+ break;
+ }
+ case QEMU_PLUGIN_MEM_VALUE_U64:
+ {
+ uint64_t *p = (uint64_t *) &ri->data[offset];
+ if (is_store) {
+ *p = be ? be64toh(value.data.u64) : value.data.u64;
+ } else if (*p != value.data.u64) {
+ unseen_data = true;
+ }
+ break;
+ }
+ case QEMU_PLUGIN_MEM_VALUE_U128:
+ /* skip */
+ break;
+ default:
+ g_assert_not_reached();
+ }
+
+ /*
+ * This is expected for regions initialised by QEMU (.text etc) but we
+ * expect to see all data read and written to the test_data region
+ * of the memory test.
+ */
+ if (unseen_data && ri->seen_all) {
+ g_autoptr(GString) error = g_string_new("Warning: ");
+ g_string_append_printf(error, "0x%016"PRIx64":%"PRId64" read an un-instrumented value\n",
+ region, offset);
+ qemu_plugin_outs(error->str);
+ ri->seen_all = false;
+ }
+
+ g_mutex_unlock(&lock);
+}
+
static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
uint64_t vaddr, void *udata)
{
@@ -63,6 +217,15 @@ static void vcpu_mem(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
} else {
qemu_plugin_u64_add(mem_count, cpu_index, 1);
}
+
+ if (do_region_summary) {
+ uint64_t region = vaddr & ~region_mask;
+ uint64_t offset = vaddr & region_mask;
+ qemu_plugin_mem_value value = qemu_plugin_mem_get_value(meminfo);
+ unsigned size = 1 << qemu_plugin_mem_size_shift(meminfo);
+
+ update_region_info(region, offset, meminfo, value, size);
+ }
}
static void print_access(unsigned int cpu_index, qemu_plugin_meminfo_t meminfo,
@@ -117,7 +280,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
QEMU_PLUGIN_INLINE_ADD_U64,
mem_count, 1);
}
- if (do_callback) {
+ if (do_callback || do_region_summary) {
qemu_plugin_register_vcpu_mem_cb(insn, vcpu_mem,
QEMU_PLUGIN_CB_NO_REGS,
rw, NULL);
@@ -176,6 +339,12 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
return -1;
}
+ } else if (g_strcmp0(tokens[0], "region-summary") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1],
+ &do_region_summary)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ return -1;
+ }
} else {
fprintf(stderr, "option parsing failed: %s\n", opt);
return -1;
@@ -196,6 +365,11 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
qemu_plugin_outs(out->str);
}
+ if (do_region_summary) {
+ region_mask = (region_size - 1);
+ regions = g_hash_table_new(NULL, g_direct_equal);
+ }
+
counts = qemu_plugin_scoreboard_new(sizeof(CPUCount));
mem_count = qemu_plugin_scoreboard_u64_in_struct(
counts, CPUCount, mem_count);
diff --git a/tests/tcg/alpha/Makefile.softmmu-target b/tests/tcg/alpha/Makefile.softmmu-target
index a0eca4d6ea..a944102a3c 100644
--- a/tests/tcg/alpha/Makefile.softmmu-target
+++ b/tests/tcg/alpha/Makefile.softmmu-target
@@ -28,7 +28,7 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS)
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
-memory: CFLAGS+=-DCHECK_UNALIGNED=0
+memory: CFLAGS+=-DCHECK_UNALIGNED=0 -mbwx
# Running
QEMU_OPTS+=-serial chardev:output -kernel
diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target
index 32dc0f9830..07be001102 100644
--- a/tests/tcg/multiarch/system/Makefile.softmmu-target
+++ b/tests/tcg/multiarch/system/Makefile.softmmu-target
@@ -65,3 +65,9 @@ endif
MULTIARCH_RUNS += run-gdbstub-memory run-gdbstub-interrupt \
run-gdbstub-untimely-packet run-gdbstub-registers
+
+# Test plugin memory access instrumentation
+run-plugin-memory-with-libmem.so: \
+ PLUGIN_ARGS=$(COMMA)region-summary=true
+run-plugin-memory-with-libmem.so: \
+ CHECK_PLUGIN_OUTPUT_COMMAND=$(MULTIARCH_SYSTEM_SRC)/validate-memory-counts.py $@.out
diff --git a/tests/tcg/multiarch/system/validate-memory-counts.py b/tests/tcg/multiarch/system/validate-memory-counts.py
new file mode 100755
index 0000000000..16c2788384
--- /dev/null
+++ b/tests/tcg/multiarch/system/validate-memory-counts.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+#
+# validate-memory-counts.py: check we instrumented memory properly
+#
+# This program takes two inputs:
+# - the mem plugin output
+# - the memory binary output
+#
+# Copyright (C) 2024 Linaro Ltd
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+import sys
+
+def extract_counts(path):
+ """
+ Load the output from path and extract the lines containing:
+
+ Test data start: 0x40214000
+ Test data end: 0x40218001
+ Test data read: 2522280
+ Test data write: 262111
+
+ From the stream of data. Extract the values for use in the
+ validation function.
+ """
+ start_address = None
+ end_address = None
+ read_count = 0
+ write_count = 0
+ with open(path, 'r') as f:
+ for line in f:
+ if line.startswith("Test data start:"):
+ start_address = int(line.split(':')[1].strip(), 16)
+ elif line.startswith("Test data end:"):
+ end_address = int(line.split(':')[1].strip(), 16)
+ elif line.startswith("Test data read:"):
+ read_count = int(line.split(':')[1].strip())
+ elif line.startswith("Test data write:"):
+ write_count = int(line.split(':')[1].strip())
+ return start_address, end_address, read_count, write_count
+
+
+def parse_plugin_output(path, start, end):
+ """
+ Load the plugin output from path in the form of:
+
+ Region Base, Reads, Writes, Seen all
+ 0x0000000040004000, 31093, 0, false
+ 0x0000000040214000, 2522280, 278579, true
+ 0x0000000040000000, 137398, 0, false
+ 0x0000000040210000, 54727397, 33721956, false
+
+ And extract the ranges that match test data start and end and
+ return the results.
+ """
+ total_reads = 0
+ total_writes = 0
+ seen_all = False
+
+ with open(path, 'r') as f:
+ next(f) # Skip the header
+ for line in f:
+
+ if line.startswith("Region Base"):
+ continue
+
+ parts = line.strip().split(', ')
+ if len(parts) != 4:
+ continue
+
+ region_base = int(parts[0], 16)
+ reads = int(parts[1])
+ writes = int(parts[2])
+
+ if start <= region_base < end: # Checking if within range
+ total_reads += reads
+ total_writes += writes
+ seen_all = parts[3] == "true"
+
+ return total_reads, total_writes, seen_all
+
+def main():
+ if len(sys.argv) != 3:
+ print("Usage: <script_name>.py <memory_binary_output_path> <mem_plugin_output_path>")
+ sys.exit(1)
+
+ memory_binary_output_path = sys.argv[1]
+ mem_plugin_output_path = sys.argv[2]
+
+ # Extract counts from memory binary
+ start, end, expected_reads, expected_writes = extract_counts(memory_binary_output_path)
+
+ if start is None or end is None:
+ print("Failed to extract start or end address from memory binary output.")
+ sys.exit(1)
+
+ # Parse plugin output
+ actual_reads, actual_writes, seen_all = parse_plugin_output(mem_plugin_output_path, start, end)
+
+ if not seen_all:
+ print("Fail: didn't instrument all accesses to test_data.")
+ sys.exit(1)
+
+ # Compare and report
+ if actual_reads == expected_reads and actual_writes == expected_writes:
+ sys.exit(0)
+ else:
+ print("Fail: The memory reads and writes count does not match.")
+ print(f"Expected Reads: {expected_reads}, Actual Reads: {actual_reads}")
+ print(f"Expected Writes: {expected_writes}, Actual Writes: {actual_writes}")
+ sys.exit(1)
+
+if __name__ == "__main__":
+ main()
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 22/26] util/timer: avoid deadlock when shutting down
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (20 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 21/26] tests/tcg: add a system test to check memory instrumentation Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 23/26] contrib/plugins: Add a plugin to generate basic block vectors Alex Bennée
` (3 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Elisha Hollander
When we shut down a guest we disable the timers. However this can
cause deadlock if the guest has queued some async work that is trying
to advance system time and spins forever trying to wind time forward.
Pay attention to the return code and bail early if we can't wind time
forward.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reported-by: Elisha Hollander <just4now666666@gmail.com>
---
util/qemu-timer.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/util/qemu-timer.c b/util/qemu-timer.c
index 213114be68..6b1533bc2a 100644
--- a/util/qemu-timer.c
+++ b/util/qemu-timer.c
@@ -685,10 +685,17 @@ int64_t qemu_clock_advance_virtual_time(int64_t dest)
{
int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
AioContext *aio_context;
+ int64_t deadline;
+
aio_context = qemu_get_aio_context();
- while (clock < dest) {
- int64_t deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL,
+
+ deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL,
QEMU_TIMER_ATTR_ALL);
+ /*
+ * A deadline of < 0 indicates this timer is not enabled, so we
+ * won't get far trying to run it forward.
+ */
+ while (deadline >= 0 && clock < dest) {
int64_t warp = qemu_soonest_timeout(dest - clock, deadline);
qemu_virtual_clock_set_ns(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + warp);
@@ -696,6 +703,9 @@ int64_t qemu_clock_advance_virtual_time(int64_t dest)
qemu_clock_run_timers(QEMU_CLOCK_VIRTUAL);
timerlist_run_timers(aio_context->tlg.tl[QEMU_CLOCK_VIRTUAL]);
clock = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
+
+ deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL,
+ QEMU_TIMER_ATTR_ALL);
}
qemu_clock_notify(QEMU_CLOCK_VIRTUAL);
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 23/26] contrib/plugins: Add a plugin to generate basic block vectors
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (21 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 22/26] util/timer: avoid deadlock when shutting down Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 24/26] plugins: add plugin API to read guest memory Alex Bennée
` (2 subsequent siblings)
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Akihiko Odaki,
Yotaro Nada
From: Akihiko Odaki <akihiko.odaki@daynix.com>
SimPoint is a widely used tool to find the ideal microarchitecture
simulation points so Valgrind[2] and Pin[3] support generating basic
block vectors for use with them. Let's add a corresponding plugin to
QEMU too.
Note that this plugin has a different goal with tests/plugin/bb.c.
This plugin creates a vector for each constant interval instead of
counting the execution of basic blocks for the entire run and able to
describe the change of execution behavior. Its output is also
syntactically simple and better suited for parsing, while the output of
tests/plugin/bb.c is more human-readable.
[1] https://cseweb.ucsd.edu/~calder/simpoint/
[2] https://valgrind.org/docs/manual/bbv-manual.html
[3] https://www.intel.com/content/www/us/en/developer/articles/tool/pin-a-dynamic-binary-instrumentation-tool.html
Signed-off-by: Yotaro Nada <yotaro.nada@gmail.com>
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240816-bb-v3-1-b9aa4a5c75c5@daynix.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
docs/about/emulation.rst | 30 ++++++++
contrib/plugins/bbv.c | 158 +++++++++++++++++++++++++++++++++++++++
contrib/plugins/Makefile | 1 +
3 files changed, 189 insertions(+)
create mode 100644 contrib/plugins/bbv.c
diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst
index eea1261baa..a4470127c9 100644
--- a/docs/about/emulation.rst
+++ b/docs/about/emulation.rst
@@ -272,6 +272,36 @@ Behaviour can be tweaked with the following arguments:
* - idle=true|false
- Dump the current execution stats whenever the guest vCPU idles
+Basic Block Vectors
+...................
+
+``contrib/plugins/bbv.c``
+
+The bbv plugin allows you to generate basic block vectors for use with the
+`SimPoint <https://cseweb.ucsd.edu/~calder/simpoint/>`__ analysis tool.
+
+.. list-table:: Basic block vectors arguments
+ :widths: 20 80
+ :header-rows: 1
+
+ * - Option
+ - Description
+ * - interval=N
+ - The interval to generate a basic block vector specified by the number of
+ instructions (Default: N = 100000000)
+ * - outfile=PATH
+ - The path to output files.
+ It will be suffixed with ``.N.bb`` where ``N`` is a vCPU index.
+
+Example::
+
+ $ qemu-aarch64 \
+ -plugin contrib/plugins/libbbv.so,interval=100,outfile=sha1 \
+ tests/tcg/aarch64-linux-user/sha1
+ SHA1=15dd99a1991e0b3826fede3deffc1feba42278e6
+ $ du sha1.0.bb
+ 23128 sha1.0.bb
+
Instruction
...........
diff --git a/contrib/plugins/bbv.c b/contrib/plugins/bbv.c
new file mode 100644
index 0000000000..a5256517dd
--- /dev/null
+++ b/contrib/plugins/bbv.c
@@ -0,0 +1,158 @@
+/*
+ * Generate basic block vectors for use with the SimPoint analysis tool.
+ * SimPoint: https://cseweb.ucsd.edu/~calder/simpoint/
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include <stdio.h>
+#include <glib.h>
+
+#include <qemu-plugin.h>
+
+typedef struct Bb {
+ uint64_t vaddr;
+ struct qemu_plugin_scoreboard *count;
+ unsigned int index;
+} Bb;
+
+typedef struct Vcpu {
+ uint64_t count;
+ FILE *file;
+} Vcpu;
+
+QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
+static GHashTable *bbs;
+static GRWLock bbs_lock;
+static char *filename;
+static struct qemu_plugin_scoreboard *vcpus;
+static uint64_t interval = 100000000;
+
+static void plugin_exit(qemu_plugin_id_t id, void *p)
+{
+ for (int i = 0; i < qemu_plugin_num_vcpus(); i++) {
+ fclose(((Vcpu *)qemu_plugin_scoreboard_find(vcpus, i))->file);
+ }
+
+ g_hash_table_unref(bbs);
+ g_free(filename);
+ qemu_plugin_scoreboard_free(vcpus);
+}
+
+static void free_bb(void *data)
+{
+ qemu_plugin_scoreboard_free(((Bb *)data)->count);
+ g_free(data);
+}
+
+static qemu_plugin_u64 count_u64(void)
+{
+ return qemu_plugin_scoreboard_u64_in_struct(vcpus, Vcpu, count);
+}
+
+static qemu_plugin_u64 bb_count_u64(Bb *bb)
+{
+ return qemu_plugin_scoreboard_u64(bb->count);
+}
+
+static void vcpu_init(qemu_plugin_id_t id, unsigned int vcpu_index)
+{
+ g_autofree gchar *vcpu_filename = NULL;
+ Vcpu *vcpu = qemu_plugin_scoreboard_find(vcpus, vcpu_index);
+
+ vcpu_filename = g_strdup_printf("%s.%u.bb", filename, vcpu_index);
+ vcpu->file = fopen(vcpu_filename, "w");
+}
+
+static void vcpu_interval_exec(unsigned int vcpu_index, void *udata)
+{
+ Vcpu *vcpu = qemu_plugin_scoreboard_find(vcpus, vcpu_index);
+ GHashTableIter iter;
+ void *value;
+
+ if (!vcpu->file) {
+ return;
+ }
+
+ vcpu->count -= interval;
+
+ fputc('T', vcpu->file);
+
+ g_rw_lock_reader_lock(&bbs_lock);
+ g_hash_table_iter_init(&iter, bbs);
+
+ while (g_hash_table_iter_next(&iter, NULL, &value)) {
+ Bb *bb = value;
+ uint64_t bb_count = qemu_plugin_u64_get(bb_count_u64(bb), vcpu_index);
+
+ if (!bb_count) {
+ continue;
+ }
+
+ fprintf(vcpu->file, ":%u:%" PRIu64 " ", bb->index, bb_count);
+ qemu_plugin_u64_set(bb_count_u64(bb), vcpu_index, 0);
+ }
+
+ g_rw_lock_reader_unlock(&bbs_lock);
+ fputc('\n', vcpu->file);
+}
+
+static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
+{
+ uint64_t n_insns = qemu_plugin_tb_n_insns(tb);
+ uint64_t vaddr = qemu_plugin_tb_vaddr(tb);
+ Bb *bb;
+
+ g_rw_lock_writer_lock(&bbs_lock);
+ bb = g_hash_table_lookup(bbs, &vaddr);
+ if (!bb) {
+ bb = g_new(Bb, 1);
+ bb->vaddr = vaddr;
+ bb->count = qemu_plugin_scoreboard_new(sizeof(uint64_t));
+ bb->index = g_hash_table_size(bbs);
+ g_hash_table_replace(bbs, &bb->vaddr, bb);
+ }
+ g_rw_lock_writer_unlock(&bbs_lock);
+
+ qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
+ tb, QEMU_PLUGIN_INLINE_ADD_U64, count_u64(), n_insns);
+
+ qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu(
+ tb, QEMU_PLUGIN_INLINE_ADD_U64, bb_count_u64(bb), n_insns);
+
+ qemu_plugin_register_vcpu_tb_exec_cond_cb(
+ tb, vcpu_interval_exec, QEMU_PLUGIN_CB_NO_REGS,
+ QEMU_PLUGIN_COND_GE, count_u64(), interval, NULL);
+}
+
+QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
+ const qemu_info_t *info,
+ int argc, char **argv)
+{
+ for (int i = 0; i < argc; i++) {
+ char *opt = argv[i];
+ g_auto(GStrv) tokens = g_strsplit(opt, "=", 2);
+ if (g_strcmp0(tokens[0], "interval") == 0) {
+ interval = g_ascii_strtoull(tokens[1], NULL, 10);
+ } else if (g_strcmp0(tokens[0], "outfile") == 0) {
+ filename = tokens[1];
+ tokens[1] = NULL;
+ } else {
+ fprintf(stderr, "option parsing failed: %s\n", opt);
+ return -1;
+ }
+ }
+
+ if (!filename) {
+ fputs("outfile unspecified\n", stderr);
+ return -1;
+ }
+
+ bbs = g_hash_table_new_full(g_int64_hash, g_int64_equal, NULL, free_bb);
+ vcpus = qemu_plugin_scoreboard_new(sizeof(Vcpu));
+ qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
+ qemu_plugin_register_vcpu_init_cb(id, vcpu_init);
+ qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
+
+ return 0;
+}
diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
index d4ac599f93..bbddd4800f 100644
--- a/contrib/plugins/Makefile
+++ b/contrib/plugins/Makefile
@@ -13,6 +13,7 @@ TOP_SRC_PATH = $(SRC_PATH)/../..
VPATH += $(SRC_PATH)
NAMES :=
+NAMES += bbv
NAMES += execlog
NAMES += hotblocks
NAMES += hotpages
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 24/26] plugins: add plugin API to read guest memory
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (22 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 23/26] contrib/plugins: Add a plugin to generate basic block vectors Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 25/26] plugins: add option to dump write argument to syscall plugin Alex Bennée
2024-09-10 14:07 ` [PATCH 26/26] plugins: add ability to register a GDB triggered callback Alex Bennée
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Rowan Hart
From: Rowan Hart <rowanbhart@gmail.com>
Signed-off-by: Rowan Hart <rowanbhart@gmail.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240827215329.248434-2-rowanbhart@gmail.com>
[AJB: tweaked cpu_memory_rw_debug call]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
vAJB:
- explicit bool for cpu_memory_rw_debug
---
include/qemu/qemu-plugin.h | 32 +++++++++++++++++++++++++++++++-
plugins/api.c | 20 ++++++++++++++++++++
plugins/qemu-plugins.symbols | 1 +
3 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 649ce89815..2015d6b409 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -57,11 +57,19 @@ typedef uint64_t qemu_plugin_id_t;
* - Remove qemu_plugin_register_vcpu_{tb, insn, mem}_exec_inline.
* Those functions are replaced by *_per_vcpu variants, which guarantee
* thread-safety for operations.
+ *
+ * version 3:
+ * - modified arguments and return value of qemu_plugin_insn_data to copy
+ * the data into a user-provided buffer instead of returning a pointer
+ * to the data.
+ *
+ * version 4:
+ * - added qemu_plugin_read_memory_vaddr
*/
extern QEMU_PLUGIN_EXPORT int qemu_plugin_version;
-#define QEMU_PLUGIN_VERSION 3
+#define QEMU_PLUGIN_VERSION 4
/**
* struct qemu_info_t - system information for plugins
@@ -884,6 +892,28 @@ typedef struct {
QEMU_PLUGIN_API
GArray *qemu_plugin_get_registers(void);
+/**
+ * qemu_plugin_read_memory_vaddr() - read from memory using a virtual address
+ *
+ * @addr: A virtual address to read from
+ * @data: A byte array to store data into
+ * @len: The number of bytes to read, starting from @addr
+ *
+ * @len bytes of data is read starting at @addr and stored into @data. If @data
+ * is not large enough to hold @len bytes, it will be expanded to the necessary
+ * size, reallocating if necessary. @len must be greater than 0.
+ *
+ * This function does not ensure writes are flushed prior to reading, so
+ * callers should take care when calling this function in plugin callbacks to
+ * avoid attempting to read data which may not yet be written and should use
+ * the memory callback API instead.
+ *
+ * Returns true on success and false on failure.
+ */
+QEMU_PLUGIN_API
+bool qemu_plugin_read_memory_vaddr(uint64_t addr,
+ GByteArray *data, size_t len);
+
/**
* qemu_plugin_read_register() - read register for current vCPU
*
diff --git a/plugins/api.c b/plugins/api.c
index 3316d4a04d..24ea64e2de 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -560,6 +560,26 @@ GArray *qemu_plugin_get_registers(void)
return create_register_handles(regs);
}
+bool qemu_plugin_read_memory_vaddr(vaddr addr, GByteArray *data, size_t len)
+{
+ g_assert(current_cpu);
+
+ if (len == 0) {
+ return false;
+ }
+
+ g_byte_array_set_size(data, len);
+
+ int result = cpu_memory_rw_debug(current_cpu, addr, data->data,
+ data->len, false);
+
+ if (result < 0) {
+ return false;
+ }
+
+ return true;
+}
+
int qemu_plugin_read_register(struct qemu_plugin_register *reg, GByteArray *buf)
{
g_assert(current_cpu);
diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols
index eed9d8abd9..032661f9ea 100644
--- a/plugins/qemu-plugins.symbols
+++ b/plugins/qemu-plugins.symbols
@@ -21,6 +21,7 @@
qemu_plugin_num_vcpus;
qemu_plugin_outs;
qemu_plugin_path_to_binary;
+ qemu_plugin_read_memory_vaddr;
qemu_plugin_read_register;
qemu_plugin_register_atexit_cb;
qemu_plugin_register_flush_cb;
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 25/26] plugins: add option to dump write argument to syscall plugin
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (23 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 24/26] plugins: add plugin API to read guest memory Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
2024-09-10 14:07 ` [PATCH 26/26] plugins: add ability to register a GDB triggered callback Alex Bennée
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta, Rowan Hart
From: Rowan Hart <rowanbhart@gmail.com>
Signed-off-by: Rowan Hart <rowanbhart@gmail.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Tested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240827215329.248434-3-rowanbhart@gmail.com>
[AJB: tweak fmt string for vaddr]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
vAJB
- tweak fmt string for PRIu64
---
docs/about/emulation.rst | 14 ++++-
tests/tcg/plugins/syscall.c | 117 ++++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 1 deletion(-)
diff --git a/docs/about/emulation.rst b/docs/about/emulation.rst
index a4470127c9..23e4949049 100644
--- a/docs/about/emulation.rst
+++ b/docs/about/emulation.rst
@@ -418,6 +418,19 @@ run::
160 1 0
135 1 0
+Behaviour can be tweaked with the following arguments:
+
+.. list-table:: Syscall plugin arguments
+ :widths: 20 80
+ :header-rows: 1
+
+ * - Option
+ - Description
+ * - print=true|false
+ - Print the number of times each syscall is called
+ * - log_writes=true|false
+ - Log the buffer of each write syscall in hexdump format
+
Test inline operations
......................
@@ -807,4 +820,3 @@ Other emulation features
When running system emulation you can also enable deterministic
execution which allows for repeatable record/replay debugging. See
:ref:`Record/Replay<replay>` for more details.
-
diff --git a/tests/tcg/plugins/syscall.c b/tests/tcg/plugins/syscall.c
index 72e1a5bf90..647f478090 100644
--- a/tests/tcg/plugins/syscall.c
+++ b/tests/tcg/plugins/syscall.c
@@ -22,8 +22,57 @@ typedef struct {
int64_t errors;
} SyscallStats;
+struct SyscallInfo {
+ const char *name;
+ int64_t write_sysno;
+};
+
+const struct SyscallInfo arch_syscall_info[] = {
+ { "aarch64", 64 },
+ { "aarch64_be", 64 },
+ { "alpha", 4 },
+ { "arm", 4 },
+ { "armeb", 4 },
+ { "avr", -1 },
+ { "cris", -1 },
+ { "hexagon", 64 },
+ { "hppa", -1 },
+ { "i386", 4 },
+ { "loongarch64", -1 },
+ { "m68k", 4 },
+ { "microblaze", 4 },
+ { "microblazeel", 4 },
+ { "mips", 1 },
+ { "mips64", 1 },
+ { "mips64el", 1 },
+ { "mipsel", 1 },
+ { "mipsn32", 1 },
+ { "mipsn32el", 1 },
+ { "or1k", -1 },
+ { "ppc", 4 },
+ { "ppc64", 4 },
+ { "ppc64le", 4 },
+ { "riscv32", 64 },
+ { "riscv64", 64 },
+ { "rx", -1 },
+ { "s390x", -1 },
+ { "sh4", -1 },
+ { "sh4eb", -1 },
+ { "sparc", 4 },
+ { "sparc32plus", 4 },
+ { "sparc64", 4 },
+ { "tricore", -1 },
+ { "x86_64", 1 },
+ { "xtensa", 13 },
+ { "xtensaeb", 13 },
+ { NULL, -1 },
+};
+
static GMutex lock;
static GHashTable *statistics;
+static GByteArray *memory_buffer;
+static bool do_log_writes;
+static int64_t write_sysno = -1;
static SyscallStats *get_or_create_entry(int64_t num)
{
@@ -39,6 +88,44 @@ static SyscallStats *get_or_create_entry(int64_t num)
return entry;
}
+/*
+ * Hex-dump a GByteArray to the QEMU plugin output in the format:
+ * 61 63 63 65 6c 09 09 20 20 20 66 70 75 09 09 09 | accel.....fpu...
+ * 20 6d 6f 64 75 6c 65 2d 63 6f 6d 6d 6f 6e 2e 63 | .module-common.c
+ */
+static void hexdump(const GByteArray *data)
+{
+ g_autoptr(GString) out = g_string_new("");
+
+ for (guint index = 0; index < data->len; index += 16) {
+ for (guint col = 0; col < 16; col++) {
+ if (index + col < data->len) {
+ g_string_append_printf(out, "%02x ", data->data[index + col]);
+ } else {
+ g_string_append(out, " ");
+ }
+ }
+
+ g_string_append(out, " | ");
+
+ for (guint col = 0; col < 16; col++) {
+ if (index + col >= data->len) {
+ break;
+ }
+
+ if (g_ascii_isgraph(data->data[index + col])) {
+ g_string_append_printf(out, "%c", data->data[index + col]);
+ } else {
+ g_string_append(out, ".");
+ }
+ }
+
+ g_string_append(out, "\n");
+ }
+
+ qemu_plugin_outs(out->str);
+}
+
static void vcpu_syscall(qemu_plugin_id_t id, unsigned int vcpu_index,
int64_t num, uint64_t a1, uint64_t a2,
uint64_t a3, uint64_t a4, uint64_t a5,
@@ -54,6 +141,14 @@ static void vcpu_syscall(qemu_plugin_id_t id, unsigned int vcpu_index,
g_autofree gchar *out = g_strdup_printf("syscall #%" PRIi64 "\n", num);
qemu_plugin_outs(out);
}
+
+ if (do_log_writes && num == write_sysno) {
+ if (qemu_plugin_read_memory_vaddr(a2, memory_buffer, a3)) {
+ hexdump(memory_buffer);
+ } else {
+ fprintf(stderr, "Error reading memory from vaddr %"PRIu64"\n", a2);
+ }
+ }
}
static void vcpu_syscall_ret(qemu_plugin_id_t id, unsigned int vcpu_idx,
@@ -127,6 +222,10 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_print)) {
fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
}
+ } else if (g_strcmp0(tokens[0], "log_writes") == 0) {
+ if (!qemu_plugin_bool_parse(tokens[0], tokens[1], &do_log_writes)) {
+ fprintf(stderr, "boolean argument parsing failed: %s\n", opt);
+ }
} else {
fprintf(stderr, "unsupported argument: %s\n", argv[i]);
return -1;
@@ -137,6 +236,24 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
statistics = g_hash_table_new_full(NULL, g_direct_equal, NULL, g_free);
}
+ if (do_log_writes) {
+ for (const struct SyscallInfo *syscall_info = arch_syscall_info;
+ syscall_info->name != NULL; syscall_info++) {
+
+ if (g_strcmp0(syscall_info->name, info->target_name) == 0) {
+ write_sysno = syscall_info->write_sysno;
+ break;
+ }
+ }
+
+ if (write_sysno == -1) {
+ fprintf(stderr, "write syscall number not found\n");
+ return -1;
+ }
+
+ memory_buffer = g_byte_array_new();
+ }
+
qemu_plugin_register_vcpu_syscall_cb(id, vcpu_syscall);
qemu_plugin_register_vcpu_syscall_ret_cb(id, vcpu_syscall_ret);
qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH 26/26] plugins: add ability to register a GDB triggered callback
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
` (24 preceding siblings ...)
2024-09-10 14:07 ` [PATCH 25/26] plugins: add option to dump write argument to syscall plugin Alex Bennée
@ 2024-09-10 14:07 ` Alex Bennée
25 siblings, 0 replies; 36+ messages in thread
From: Alex Bennée @ 2024-09-10 14:07 UTC (permalink / raw)
To: qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Alex Bennée,
Pierrick Bouvier, Yanan Wang, Peter Maydell, Mahmoud Mandour,
Thomas Huth, qemu-arm, devel, Jiaxun Yang, Paolo Bonzini,
Richard Henderson, Wainer dos Santos Moschetta
Now gdbstub has gained the ability to extend its command tables we can
allow it to trigger plugin callbacks. This is probably most useful for
QEMU developers debugging plugins themselves but might be useful for
other stuff.
Trigger the callback by sending:
maintenance packet Qqemu.plugin_cb
I've extended the memory plugin to report on the packet.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
include/qemu/plugin-event.h | 1 +
include/qemu/qemu-plugin.h | 16 ++++++++++++++++
plugins/plugin.h | 9 +++++++++
plugins/api.c | 18 ++++++++++++++++++
plugins/core.c | 37 ++++++++++++++++++++++++++++++++++++
tests/tcg/plugins/mem.c | 11 +++++++++--
plugins/qemu-plugins.symbols | 1 +
7 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/include/qemu/plugin-event.h b/include/qemu/plugin-event.h
index 7056d8427b..d9aa56cf4f 100644
--- a/include/qemu/plugin-event.h
+++ b/include/qemu/plugin-event.h
@@ -20,6 +20,7 @@ enum qemu_plugin_event {
QEMU_PLUGIN_EV_VCPU_SYSCALL_RET,
QEMU_PLUGIN_EV_FLUSH,
QEMU_PLUGIN_EV_ATEXIT,
+ QEMU_PLUGIN_EV_GDBSTUB,
QEMU_PLUGIN_EV_MAX, /* total number of plugin events we support */
};
diff --git a/include/qemu/qemu-plugin.h b/include/qemu/qemu-plugin.h
index 2015d6b409..3592e142f8 100644
--- a/include/qemu/qemu-plugin.h
+++ b/include/qemu/qemu-plugin.h
@@ -802,6 +802,22 @@ QEMU_PLUGIN_API
void qemu_plugin_register_atexit_cb(qemu_plugin_id_t id,
qemu_plugin_udata_cb_t cb, void *userdata);
+
+/**
+ * qemu_plugin_register_gdb_cb() - register a gdb callback
+ * @id: plugin ID
+ * @cb: callback
+ * @userdata: user data for callback
+ *
+ * When using the gdbstub to debug a guest you can send a command that
+ * will trigger the callback. This is useful if you want the plugin to
+ * print out collected state at particular points when debugging a
+ * program.
+ */
+QEMU_PLUGIN_API
+void qemu_plugin_register_gdb_cb(qemu_plugin_id_t id,
+ qemu_plugin_udata_cb_t cb, void *userdata);
+
/* returns how many vcpus were started at this point */
int qemu_plugin_num_vcpus(void);
diff --git a/plugins/plugin.h b/plugins/plugin.h
index 30e2299a54..f37667c9fb 100644
--- a/plugins/plugin.h
+++ b/plugins/plugin.h
@@ -118,4 +118,13 @@ struct qemu_plugin_scoreboard *plugin_scoreboard_new(size_t element_size);
void plugin_scoreboard_free(struct qemu_plugin_scoreboard *score);
+/**
+ * plugin_register_gdbstub_commands - register gdbstub commands
+ *
+ * This should only be called once to register gdbstub commands so we
+ * can trigger callbacks if needed.
+ */
+void plugin_register_gdbstub_commands(void);
+
+
#endif /* PLUGIN_H */
diff --git a/plugins/api.c b/plugins/api.c
index 24ea64e2de..62141616f4 100644
--- a/plugins/api.c
+++ b/plugins/api.c
@@ -681,3 +681,21 @@ void qemu_plugin_update_ns(const void *handle, int64_t new_time)
}
#endif
}
+
+/*
+ * gdbstub hooks
+ */
+
+static bool gdbstub_callbacks;
+
+void qemu_plugin_register_gdb_cb(qemu_plugin_id_t id,
+ qemu_plugin_udata_cb_t cb,
+ void *udata)
+{
+ plugin_register_cb_udata(id, QEMU_PLUGIN_EV_GDBSTUB, cb, udata);
+
+ if (!gdbstub_callbacks) {
+ plugin_register_gdbstub_commands();
+ gdbstub_callbacks = true;
+ }
+}
diff --git a/plugins/core.c b/plugins/core.c
index bb105e8e68..e7fce08799 100644
--- a/plugins/core.c
+++ b/plugins/core.c
@@ -23,6 +23,7 @@
#include "qemu/xxhash.h"
#include "qemu/rcu.h"
#include "hw/core/cpu.h"
+#include "gdbstub/commands.h"
#include "exec/exec-all.h"
#include "exec/tb-flush.h"
@@ -147,6 +148,7 @@ static void plugin_cb__udata(enum qemu_plugin_event ev)
switch (ev) {
case QEMU_PLUGIN_EV_ATEXIT:
+ case QEMU_PLUGIN_EV_GDBSTUB:
QLIST_FOREACH_SAFE_RCU(cb, &plugin.cb_lists[ev], entry, next) {
qemu_plugin_udata_cb_t func = cb->f.udata;
@@ -768,3 +770,38 @@ void plugin_scoreboard_free(struct qemu_plugin_scoreboard *score)
g_array_free(score->data, TRUE);
g_free(score);
}
+
+/*
+ * gdbstub integration
+ */
+
+static void handle_plugin_cb(GArray *params, void *user_ctx)
+{
+ plugin_cb__udata(QEMU_PLUGIN_EV_GDBSTUB);
+ gdb_put_packet("OK");
+}
+
+enum Command {
+ PluginCallback,
+ NUM_GDB_CMDS
+};
+
+static const GdbCmdParseEntry cmd_handler_table[NUM_GDB_CMDS] = {
+ [PluginCallback] = {
+ .handler = handle_plugin_cb,
+ .cmd_startswith = true,
+ .cmd = "qemu.plugin_cb",
+ .schema = "s?",
+ },
+};
+
+void plugin_register_gdbstub_commands(void)
+{
+ g_autoptr(GPtrArray) set_table = g_ptr_array_new();
+
+ for (int i = 0; i < NUM_GDB_CMDS; i++) {
+ g_ptr_array_add(set_table, (gpointer) &cmd_handler_table[PluginCallback]);
+ }
+
+ gdb_extend_set_table(set_table);
+}
diff --git a/tests/tcg/plugins/mem.c b/tests/tcg/plugins/mem.c
index 42d735d5c8..ee71bd02c9 100644
--- a/tests/tcg/plugins/mem.c
+++ b/tests/tcg/plugins/mem.c
@@ -66,8 +66,7 @@ static gint addr_order(gconstpointer a, gconstpointer b)
return na->region_address > nb->region_address ? 1 : -1;
}
-
-static void plugin_exit(qemu_plugin_id_t id, void *p)
+static void plugin_report(qemu_plugin_id_t id, void *p)
{
g_autoptr(GString) out = g_string_new("");
@@ -81,6 +80,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
}
qemu_plugin_outs(out->str);
+ g_mutex_lock(&lock);
if (do_region_summary) {
GList *counts = g_hash_table_get_values(regions);
@@ -105,6 +105,12 @@ static void plugin_exit(qemu_plugin_id_t id, void *p)
qemu_plugin_outs(out->str);
}
+ g_mutex_unlock(&lock);
+}
+
+static void plugin_exit(qemu_plugin_id_t id, void *p)
+{
+ plugin_report(id, p);
qemu_plugin_scoreboard_free(counts);
}
@@ -375,6 +381,7 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id,
counts, CPUCount, mem_count);
io_count = qemu_plugin_scoreboard_u64_in_struct(counts, CPUCount, io_count);
qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
+ qemu_plugin_register_gdb_cb(id, plugin_report, NULL);
qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
return 0;
}
diff --git a/plugins/qemu-plugins.symbols b/plugins/qemu-plugins.symbols
index 032661f9ea..d272e8e0f3 100644
--- a/plugins/qemu-plugins.symbols
+++ b/plugins/qemu-plugins.symbols
@@ -25,6 +25,7 @@
qemu_plugin_read_register;
qemu_plugin_register_atexit_cb;
qemu_plugin_register_flush_cb;
+ qemu_plugin_register_gdb_cb;
qemu_plugin_register_vcpu_exit_cb;
qemu_plugin_register_vcpu_idle_cb;
qemu_plugin_register_vcpu_init_cb;
--
2.39.2
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH 01/26] tests/docker: remove debian-armel-cross
2024-09-10 14:07 ` [PATCH 01/26] tests/docker: remove debian-armel-cross Alex Bennée
@ 2024-09-10 14:42 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:42 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> 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.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> .gitlab-ci.d/container-cross.yml | 6 -
> .gitlab-ci.d/crossbuilds.yml | 7 -
> .../dockerfiles/debian-armel-cross.docker | 179 ------------------
> tests/lcitool/refresh | 6 -
> 4 files changed, 198 deletions(-)
> delete mode 100644 tests/docker/dockerfiles/debian-armel-cross.docker
>
> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
> index e3103940a0..9a3ebd885e 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -22,12 +22,6 @@ arm64-debian-cross-container:
> variables:
> NAME: debian-arm64-cross
>
> -armel-debian-cross-container:
> - extends: .container_job_template
> - stage: containers
> - variables:
> - NAME: debian-armel-cross
> -
> armhf-debian-cross-container:
> extends: .container_job_template
> stage: containers
> diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
> index cb499e4ee0..459273f9da 100644
> --- a/.gitlab-ci.d/crossbuilds.yml
> +++ b/.gitlab-ci.d/crossbuilds.yml
> @@ -1,13 +1,6 @@
> include:
> - local: '/.gitlab-ci.d/crossbuild-template.yml'
>
> -cross-armel-user:
> - extends: .cross_user_build_job
> - needs:
> - job: armel-debian-cross-container
> - variables:
> - IMAGE: debian-armel-cross
> -
> cross-armhf-user:
> extends: .cross_user_build_job
> needs:
> diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker
> deleted file mode 100644
> index 8476fc8cce..0000000000
> --- a/tests/docker/dockerfiles/debian-armel-cross.docker
> +++ /dev/null
> @@ -1,179 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -# $ lcitool dockerfile --layers all --cross-arch armv6l debian-11 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci
> -
> -FROM docker.io/library/debian:11-slim
> -
> -RUN export DEBIAN_FRONTEND=noninteractive && \
> - apt-get update && \
> - apt-get install -y eatmydata && \
> - eatmydata apt-get dist-upgrade -y && \
> - eatmydata apt-get install --no-install-recommends -y \
> - bash \
> - bc \
> - bison \
> - bsdextrautils \
> - bzip2 \
> - ca-certificates \
> - ccache \
> - dbus \
> - debianutils \
> - diffutils \
> - exuberant-ctags \
> - findutils \
> - flex \
> - gcc \
> - gcovr \
> - gettext \
> - git \
> - hostname \
> - libglib2.0-dev \
> - libgtk-vnc-2.0-dev \
> - libpcre2-dev \
> - libsndio-dev \
> - libspice-protocol-dev \
> - llvm \
> - locales \
> - make \
> - meson \
> - mtools \
> - ncat \
> - ninja-build \
> - openssh-client \
> - pkgconf \
> - python3 \
> - python3-numpy \
> - python3-opencv \
> - python3-pillow \
> - python3-pip \
> - python3-setuptools \
> - python3-sphinx \
> - python3-sphinx-rtd-theme \
> - python3-venv \
> - python3-wheel \
> - python3-yaml \
> - rpm2cpio \
> - sed \
> - socat \
> - sparse \
> - tar \
> - tesseract-ocr \
> - tesseract-ocr-eng \
> - xorriso \
> - zstd && \
> - eatmydata apt-get autoremove -y && \
> - eatmydata apt-get autoclean -y && \
> - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
> - dpkg-reconfigure locales && \
> - rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
> -
> -RUN /usr/bin/pip3 install tomli
> -
> -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> -ENV LANG "en_US.UTF-8"
> -ENV MAKE "/usr/bin/make"
> -ENV NINJA "/usr/bin/ninja"
> -ENV PYTHON "/usr/bin/python3"
> -
> -RUN export DEBIAN_FRONTEND=noninteractive && \
> - dpkg --add-architecture armel && \
> - eatmydata apt-get update && \
> - eatmydata apt-get dist-upgrade -y && \
> - eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
> - eatmydata apt-get install --no-install-recommends -y \
> - gcc-arm-linux-gnueabi \
> - libaio-dev:armel \
> - libasan6:armel \
> - libasound2-dev:armel \
> - libattr1-dev:armel \
> - libbpf-dev:armel \
> - libbrlapi-dev:armel \
> - libbz2-dev:armel \
> - libc6-dev:armel \
> - libcacard-dev:armel \
> - libcap-ng-dev:armel \
> - libcapstone-dev:armel \
> - libcmocka-dev:armel \
> - libcurl4-gnutls-dev:armel \
> - libdaxctl-dev:armel \
> - libdrm-dev:armel \
> - libepoxy-dev:armel \
> - libfdt-dev:armel \
> - libffi-dev:armel \
> - libfuse3-dev:armel \
> - libgbm-dev:armel \
> - libgcrypt20-dev:armel \
> - libglib2.0-dev:armel \
> - libglusterfs-dev:armel \
> - libgnutls28-dev:armel \
> - libgtk-3-dev:armel \
> - libibverbs-dev:armel \
> - libiscsi-dev:armel \
> - libjemalloc-dev:armel \
> - libjpeg62-turbo-dev:armel \
> - libjson-c-dev:armel \
> - liblttng-ust-dev:armel \
> - liblzo2-dev:armel \
> - libncursesw5-dev:armel \
> - libnfs-dev:armel \
> - libnuma-dev:armel \
> - libpam0g-dev:armel \
> - libpipewire-0.3-dev:armel \
> - libpixman-1-dev:armel \
> - libpng-dev:armel \
> - libpulse-dev:armel \
> - librbd-dev:armel \
> - librdmacm-dev:armel \
> - libsasl2-dev:armel \
> - libsdl2-dev:armel \
> - libsdl2-image-dev:armel \
> - libseccomp-dev:armel \
> - libselinux1-dev:armel \
> - libslirp-dev:armel \
> - libsnappy-dev:armel \
> - libspice-server-dev:armel \
> - libssh-gcrypt-dev:armel \
> - libsystemd-dev:armel \
> - libtasn1-6-dev:armel \
> - libubsan1:armel \
> - libudev-dev:armel \
> - liburing-dev:armel \
> - libusb-1.0-0-dev:armel \
> - libusbredirhost-dev:armel \
> - libvdeplug-dev:armel \
> - libvirglrenderer-dev:armel \
> - libvte-2.91-dev:armel \
> - libzstd-dev:armel \
> - nettle-dev:armel \
> - systemtap-sdt-dev:armel \
> - zlib1g-dev:armel && \
> - eatmydata apt-get autoremove -y && \
> - eatmydata apt-get autoclean -y && \
> - mkdir -p /usr/local/share/meson/cross && \
> - printf "[binaries]\n\
> -c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
> -ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
> -strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
> -pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
> -\n\
> -[host_machine]\n\
> -system = 'linux'\n\
> -cpu_family = 'arm'\n\
> -cpu = 'arm'\n\
> -endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
> - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
> - mkdir -p /usr/libexec/ccache-wrappers && \
> - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
> - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
> -
> -ENV ABI "arm-linux-gnueabi"
> -ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"
> -ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi-
> -ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user
> -# As a final step configure the user (if env is defined)
> -ARG USER
> -ARG UID
> -RUN if [ "${USER}" ]; then \
> - id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index ac803e34f1..199d5fad87 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -154,12 +154,6 @@ try:
> trailer=cross_build("aarch64-linux-gnu-",
> "aarch64-softmmu,aarch64-linux-user"))
>
> - # migration to bookworm stalled: https://lists.debian.org/debian-arm/2023/09/msg00006.html
> - generate_dockerfile("debian-armel-cross", "debian-11",
> - cross="armv6l",
> - trailer=cross_build("arm-linux-gnueabi-",
> - "arm-softmmu,arm-linux-user,armeb-linux-user"))
> -
> generate_dockerfile("debian-armhf-cross", "debian-12",
> cross="armv7l",
> trailer=cross_build("arm-linux-gnueabihf-",
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm
2024-09-10 14:07 ` [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm Alex Bennée
@ 2024-09-10 14:42 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:42 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> 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.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/dockerfiles/debian-i686-cross.docker | 10 ++++------
> tests/docker/dockerfiles/debian-mipsel-cross.docker | 10 ++++------
> tests/lcitool/refresh | 4 ++--
> 3 files changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
> index 3fe8ee623d..2328ee1732 100644
> --- a/tests/docker/dockerfiles/debian-i686-cross.docker
> +++ b/tests/docker/dockerfiles/debian-i686-cross.docker
> @@ -1,10 +1,10 @@
> # THIS FILE WAS AUTO-GENERATED
> #
> -# $ lcitool dockerfile --layers all --cross-arch i686 debian-11 qemu
> +# $ lcitool dockerfile --layers all --cross-arch i686 debian-12 qemu
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM docker.io/library/debian:11-slim
> +FROM docker.io/library/debian:12-slim
>
> RUN export DEBIAN_FRONTEND=noninteractive && \
> apt-get update && \
> @@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> - python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> - python3-wheel \
> python3-yaml \
> rpm2cpio \
> sed \
> socat \
> sparse \
> + swtpm \
> tar \
> tesseract-ocr \
> tesseract-ocr-eng \
> @@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> -RUN /usr/bin/pip3 install tomli
> -
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> @@ -145,6 +142,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> libvdeplug-dev:i386 \
> libvirglrenderer-dev:i386 \
> libvte-2.91-dev:i386 \
> + libxdp-dev:i386 \
> libzstd-dev:i386 \
> nettle-dev:i386 \
> systemtap-sdt-dev:i386 \
> diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> index 0d559ae4ba..4ac314e22e 100644
> --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker
> +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker
> @@ -1,10 +1,10 @@
> # THIS FILE WAS AUTO-GENERATED
> #
> -# $ lcitool dockerfile --layers all --cross-arch mipsel debian-11 qemu
> +# $ lcitool dockerfile --layers all --cross-arch mipsel debian-12 qemu
> #
> # https://gitlab.com/libvirt/libvirt-ci
>
> -FROM docker.io/library/debian:11-slim
> +FROM docker.io/library/debian:12-slim
>
> RUN export DEBIAN_FRONTEND=noninteractive && \
> apt-get update && \
> @@ -48,16 +48,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> python3-opencv \
> python3-pillow \
> python3-pip \
> - python3-setuptools \
> python3-sphinx \
> python3-sphinx-rtd-theme \
> python3-venv \
> - python3-wheel \
> python3-yaml \
> rpm2cpio \
> sed \
> socat \
> sparse \
> + swtpm \
> tar \
> tesseract-ocr \
> tesseract-ocr-eng \
> @@ -69,8 +68,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> dpkg-reconfigure locales && \
> rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
>
> -RUN /usr/bin/pip3 install tomli
> -
> ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
> ENV LANG "en_US.UTF-8"
> ENV MAKE "/usr/bin/make"
> @@ -143,6 +140,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
> libvdeplug-dev:mipsel \
> libvirglrenderer-dev:mipsel \
> libvte-2.91-dev:mipsel \
> + libxdp-dev:mipsel \
> libzstd-dev:mipsel \
> nettle-dev:mipsel \
> systemtap-sdt-dev:mipsel \
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 199d5fad87..c60490a7fa 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -159,7 +159,7 @@ try:
> trailer=cross_build("arm-linux-gnueabihf-",
> "arm-softmmu,arm-linux-user"))
>
> - generate_dockerfile("debian-i686-cross", "debian-11",
> + generate_dockerfile("debian-i686-cross", "debian-12",
> cross="i686",
> trailer=cross_build("i686-linux-gnu-",
> "x86_64-softmmu,"
> @@ -171,7 +171,7 @@ try:
> trailer=cross_build("mips64el-linux-gnuabi64-",
> "mips64el-softmmu,mips64el-linux-user"))
>
> - generate_dockerfile("debian-mipsel-cross", "debian-11",
> + generate_dockerfile("debian-mipsel-cross", "debian-12",
> cross="mipsel",
> trailer=cross_build("mipsel-linux-gnu-",
> "mipsel-softmmu,mipsel-linux-user"))
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 03/26] docs/devel: fix duplicate line
2024-09-10 14:07 ` [PATCH 03/26] docs/devel: fix duplicate line Alex Bennée
@ 2024-09-10 14:42 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:42 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> I guess the same change came in via two patch series. Remove the
> repetition.
>
> Fixes: 2a851fca9f (docs/devel: remind developers to run CI container pipeline when updating images)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> docs/devel/testing/main.rst | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/docs/devel/testing/main.rst b/docs/devel/testing/main.rst
> index e9921a4b10..09725e8ea9 100644
> --- a/docs/devel/testing/main.rst
> +++ b/docs/devel/testing/main.rst
> @@ -500,12 +500,6 @@ first to contribute the mapping to the ``libvirt-ci`` project:
> `CI <https://www.qemu.org/docs/master/devel/ci.html>`__ documentation
> page on how to trigger gitlab CI pipelines on your change.
>
> - * Please also trigger gitlab container generation pipelines on your change
> - for as many OS distros as practical to make sure that there are no
> - obvious breakages when adding the new pre-requisite. Please see
> - `CI <https://www.qemu.org/docs/master/devel/ci.html>`__ documentation
> - page on how to trigger gitlab CI pipelines on your change.
> -
> For enterprise distros that default to old, end-of-life versions of the
> Python runtime, QEMU uses a separate set of mappings that work with more
> recent versions. These can be found in ``tests/lcitool/mappings.yml``.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 04/26] scripts/ci: update the gitlab-runner playbook
2024-09-10 14:07 ` [PATCH 04/26] scripts/ci: update the gitlab-runner playbook Alex Bennée
@ 2024-09-10 14:43 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:43 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> The upstream install instructions:
>
> https://docs.gitlab.com/runner/install/linux-repository.html
>
> Now refer to repositories and a setup script. Modernise the playbook
> to use the preferred delivery method.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> scripts/ci/setup/gitlab-runner.yml | 39 +++++++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
> index 7bdafab511..57e7faebf1 100644
> --- a/scripts/ci/setup/gitlab-runner.yml
> +++ b/scripts/ci/setup/gitlab-runner.yml
> @@ -49,30 +49,51 @@
> - debug:
> msg: gitlab-runner arch is {{ gitlab_runner_arch }}
>
> - - name: Download the matching gitlab-runner (DEB)
> + # Debian/Ubuntu setup
> + - name: Get gitlab-runner repo setup script (DEB)
> get_url:
> dest: "/root/"
> - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/deb/gitlab-runner_{{ gitlab_runner_arch }}.deb"
> + url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh"
> + mode: 0755
> when:
> - ansible_facts['distribution'] == 'Ubuntu'
>
> - - name: Download the matching gitlab-runner (RPM)
> + - name: Run gitlab-runner repo setup script (DEB)
> + shell: "/root/script.deb.sh"
> + when:
> + - ansible_facts['distribution'] == 'Ubuntu'
> +
> + - name: Install gitlab-runner (DEB)
> + ansible.builtin.apt:
> + name: gitlab-runner
> + update_cache: yes
> + state: present
> + when:
> + - ansible_facts['distribution'] == 'Ubuntu'
> +
> + # RPM setup
> + - name: Get gitlab-runner repo setup script (RPM)
> get_url:
> dest: "/root/"
> - url: "https://gitlab-runner-downloads.s3.amazonaws.com/latest/rpm/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
> + url: "https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.rpm.sh"
> + mode: 0755
> when:
> - ansible_facts['distribution'] == 'CentOS'
>
> - - name: Install gitlab-runner via package manager (DEB)
> - apt: deb="/root/gitlab-runner_{{ gitlab_runner_arch }}.deb"
> + - name: Run gitlab-runner repo setup script (RPM)
> + shell: "/root/script.rpm.sh"
> when:
> - - ansible_facts['distribution'] == 'Ubuntu'
> + - ansible_facts['distribution'] == 'CentOS'
>
> - - name: Install gitlab-runner via package manager (RPM)
> - yum: name="/root/gitlab-runner_{{ gitlab_runner_arch }}.rpm"
> + - name: Install gitlab-runner (RPM)
> + yum:
> + name: gitlab-runner
> + update_cache: yes
> + state: present
> when:
> - ansible_facts['distribution'] == 'CentOS'
>
> + # Register Runners
> - name: Register the gitlab-runner
> command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts
2024-09-10 14:07 ` [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts Alex Bennée
@ 2024-09-10 14:45 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:45 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> The existing plugins already liberally use host pointer stuffing for
> passing user data which will fail when doing 64 bit guests on 32 bit
> hosts. We should discourage this by officially deprecating support and
> adding another nail to the 32 bit host coffin.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>
> ---
> v2
> - don't manually set based on CPU type, use __SIZEOF_POINTER__
> ---
> docs/about/deprecated.rst | 11 +++++++++++
> configure | 21 ++++++++++++++++++++-
> 2 files changed, 31 insertions(+), 1 deletion(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 88f0f03786..f7c7c33d39 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -184,6 +184,17 @@ be an effective use of its limited resources, and thus intends to discontinue
> it. Since all recent x86 hardware from the past >10 years is capable of the
> 64-bit x86 extensions, a corresponding 64-bit OS should be used instead.
>
> +TCG Plugin support not enabled by default on 32-bit hosts (since 9.2)
> +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +While it is still possible to enable TCG plugin support for 32-bit
> +hosts there are a number of potential pitfalls when instrumenting
> +64-bit guests. The plugin APIs typically pass most addresses as
> +uint64_t but practices like encoding that address in a host pointer
> +for passing as user-data will lose data. As most software analysis
> +benefits from having plenty of host memory it seems reasonable to
> +encourage users to use 64 bit builds of QEMU for analysis work
> +whatever targets they are instrumenting.
>
> System emulator CPUs
> --------------------
> diff --git a/configure b/configure
> index 40186d865e..14581c1b9a 100755
> --- a/configure
> +++ b/configure
> @@ -516,6 +516,25 @@ case "$cpu" in
> ;;
> esac
>
> +# Now we have our CPU_CFLAGS we can check if we are targeting a 32 or
> +# 64 bit host.
> +
> +check_64bit_host() {
> +cat > $TMPC <<EOF
> +#if __SIZEOF_POINTER__ != 8
> +#error not 64 bit system
> +#endif
> +int main(void) { return 0; }
> +EOF
> + compile_object "$1"
> +}
> +
> +if check_64bit_host "$CPU_CFLAGS"; then
> + host_bits=64
> +else
> + host_bits=32
> +fi
> +
> if test -n "$host_arch" && {
> ! test -d "$source_path/linux-user/include/host/$host_arch" ||
> ! test -d "$source_path/common-user/host/$host_arch"; }; then
> @@ -1028,7 +1047,7 @@ if test "$static" = "yes" ; then
> fi
> plugins="no"
> fi
> -if test "$plugins" != "no"; then
> +if test "$plugins" != "no" && test $host_bits -eq 64; then
> plugins=yes
> subdirs="$subdirs contrib/plugins"
> fi
Thanks, it should open the door to be able to build plugins with meson.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI
2024-09-10 14:07 ` [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI Alex Bennée
@ 2024-09-10 14:45 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:45 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> The softmmu memory instrumentation test sees so many more accesses
> than a normal translated host and its really not worth fixing up. Lets
> deprecate this odd configuration and save on the CI cycles.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> docs/about/deprecated.rst | 8 ++++++++
> configure | 11 +++++++++--
> 2 files changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index f7c7c33d39..5aa2e35314 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -196,6 +196,14 @@ benefits from having plenty of host memory it seems reasonable to
> encourage users to use 64 bit builds of QEMU for analysis work
> whatever targets they are instrumenting.
>
> +TCG Plugin support not enabled by default with TCI (since 9.2)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +While the TCG interpreter can interpret the TCG ops used by plugins it
> +is going to be so much slower it wouldn't make sense for any serious
> +instrumentation. Due to implementation differences there will also be
> +anomalies in things like memory instrumentation.
> +
> System emulator CPUs
> --------------------
>
> diff --git a/configure b/configure
> index 14581c1b9a..1bda6b3a3b 100755
> --- a/configure
> +++ b/configure
> @@ -629,6 +629,9 @@ meson_option_parse() {
> exit 1
> fi
> }
> +has_meson_option() {
> + test "${meson_options#*"$1"}" != "$meson_options"
> +}
>
> meson_add_machine_file() {
> if test "$cross_compile" = "yes"; then
> @@ -1048,8 +1051,12 @@ if test "$static" = "yes" ; then
> plugins="no"
> fi
> if test "$plugins" != "no" && test $host_bits -eq 64; then
> - plugins=yes
> - subdirs="$subdirs contrib/plugins"
> + if has_meson_option "-Dtcg_interpreter=true"; then
> + plugins="no"
> + else
> + plugins=yes
> + subdirs="$subdirs contrib/plugins"
> + fi
> fi
>
> cat > $TMPC << EOF
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 19/26] tests/tcg: clean up output of memory system test
2024-09-10 14:07 ` [PATCH 19/26] tests/tcg: clean up output of memory system test Alex Bennée
@ 2024-09-10 14:47 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:47 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> This is useful information when debugging memory issues so lets
> improve by:
>
> - include the ptr address for u8 fills (like the others)
> - indicate the number of operations for reads and writes
> - explicitly note when we are flushing
> - move the fill printf to after the reset
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/tcg/multiarch/system/memory.c | 47 ++++++++++++++++++-----------
> 1 file changed, 29 insertions(+), 18 deletions(-)
>
> diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c
> index 6eb2eb16f7..8f2371975d 100644
> --- a/tests/tcg/multiarch/system/memory.c
> +++ b/tests/tcg/multiarch/system/memory.c
> @@ -63,12 +63,14 @@ static void init_test_data_u8(int unused_offset)
> int i;
> (void)(unused_offset);
>
> - ml_printf("Filling test area with u8:");
> + ml_printf("Filling test area with u8 (%p):", ptr);
> +
> for (i = 0; i < TEST_SIZE; i++) {
> *ptr++ = BYTE_NEXT(count);
> pdot(i);
> }
> - ml_printf("done\n");
> +
> + ml_printf("done %d @ %p\n", i, ptr);
> }
>
> /*
> @@ -94,7 +96,7 @@ static void init_test_data_s8(bool neg_first)
> *ptr++ = get_byte(i, !neg_first);
> pdot(i);
> }
> - ml_printf("done\n");
> + ml_printf("done %d @ %p\n", i * 2, ptr);
> }
>
> /*
> @@ -105,9 +107,18 @@ static void reset_start_data(int offset)
> {
> uint32_t *ptr = (uint32_t *) &test_data[0];
> int i;
> +
> + if (!offset) {
> + return;
> + }
> +
> + ml_printf("Flushing %d bytes from %p: ", offset, ptr);
> +
> for (i = 0; i < offset; i++) {
> *ptr++ = 0;
> }
> +
> + ml_printf("done %d @ %p\n", i, ptr);
> }
>
> static void init_test_data_u16(int offset)
> @@ -117,17 +128,17 @@ static void init_test_data_u16(int offset)
> const int max = (TEST_SIZE - offset) / sizeof(word);
> int i;
>
> - ml_printf("Filling test area with u16 (offset %d, %p):", offset, ptr);
> -
> reset_start_data(offset);
>
> + ml_printf("Filling test area with u16 (offset %d, %p):", offset, ptr);
> +
> for (i = 0; i < max; i++) {
> uint16_t low = BYTE_NEXT(count), high = BYTE_NEXT(count);
> word = BYTE_SHIFT(high, 1) | BYTE_SHIFT(low, 0);
> *ptr++ = word;
> pdot(i);
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> }
>
> static void init_test_data_u32(int offset)
> @@ -137,10 +148,10 @@ static void init_test_data_u32(int offset)
> const int max = (TEST_SIZE - offset) / sizeof(word);
> int i;
>
> - ml_printf("Filling test area with u32 (offset %d, %p):", offset, ptr);
> -
> reset_start_data(offset);
>
> + ml_printf("Filling test area with u32 (offset %d, %p):", offset, ptr);
> +
> for (i = 0; i < max; i++) {
> uint32_t b4 = BYTE_NEXT(count), b3 = BYTE_NEXT(count);
> uint32_t b2 = BYTE_NEXT(count), b1 = BYTE_NEXT(count);
> @@ -149,7 +160,7 @@ static void init_test_data_u32(int offset)
> *ptr++ = word;
> pdot(i);
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> }
>
> static void init_test_data_u64(int offset)
> @@ -159,10 +170,10 @@ static void init_test_data_u64(int offset)
> const int max = (TEST_SIZE - offset) / sizeof(word);
> int i;
>
> - ml_printf("Filling test area with u64 (offset %d, %p):", offset, ptr);
> -
> reset_start_data(offset);
>
> + ml_printf("Filling test area with u64 (offset %d, %p):", offset, ptr);
> +
> for (i = 0; i < max; i++) {
> uint64_t b8 = BYTE_NEXT(count), b7 = BYTE_NEXT(count);
> uint64_t b6 = BYTE_NEXT(count), b5 = BYTE_NEXT(count);
> @@ -174,7 +185,7 @@ static void init_test_data_u64(int offset)
> *ptr++ = word;
> pdot(i);
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> }
>
> static bool read_test_data_u16(int offset)
> @@ -198,7 +209,7 @@ static bool read_test_data_u16(int offset)
> }
>
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
>
> @@ -239,7 +250,7 @@ static bool read_test_data_u32(int offset)
> pdot(i);
> }
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
>
> @@ -293,7 +304,7 @@ static bool read_test_data_u64(int offset)
> pdot(i);
> }
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
>
> @@ -365,7 +376,7 @@ static bool read_test_data_s8(int offset, bool neg_first)
> return false;
> }
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i * 2, ptr);
> return true;
> }
>
> @@ -398,7 +409,7 @@ static bool read_test_data_s16(int offset, bool neg_first)
> return false;
> }
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
>
> @@ -431,7 +442,7 @@ static bool read_test_data_s32(int offset, bool neg_first)
> return false;
> }
> }
> - ml_printf("done @ %p\n", ptr);
> + ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems
2024-09-10 14:07 ` [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems Alex Bennée
@ 2024-09-10 14:48 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:48 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta
On 9/10/24 07:07, Alex Bennée wrote:
> While the compilers will generally happily synthesise a 64 bit value
> for you on 32 bit systems it doesn't exercise anything on QEMU. It
> also makes it hard to accurately compare the accesses to test_data
> when instrumenting.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/tcg/multiarch/system/memory.c | 26 +++++++++++++++++++-------
> 1 file changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/tests/tcg/multiarch/system/memory.c b/tests/tcg/multiarch/system/memory.c
> index 8f2371975d..680dd4800b 100644
> --- a/tests/tcg/multiarch/system/memory.c
> +++ b/tests/tcg/multiarch/system/memory.c
> @@ -163,6 +163,7 @@ static void init_test_data_u32(int offset)
> ml_printf("done %d @ %p\n", i, ptr);
> }
>
> +#if __SIZEOF_POINTER__ == 8
> static void init_test_data_u64(int offset)
> {
> uint8_t count = 0;
> @@ -187,6 +188,7 @@ static void init_test_data_u64(int offset)
> }
> ml_printf("done %d @ %p\n", i, ptr);
> }
> +#endif
>
> static bool read_test_data_u16(int offset)
> {
> @@ -254,6 +256,7 @@ static bool read_test_data_u32(int offset)
> return true;
> }
>
> +#if __SIZEOF_POINTER__ == 8
> static bool read_test_data_u64(int offset)
> {
> uint64_t word, *ptr = (uint64_t *)&test_data[offset];
> @@ -307,11 +310,16 @@ static bool read_test_data_u64(int offset)
> ml_printf("done %d @ %p\n", i, ptr);
> return true;
> }
> +#endif
>
> /* Read the test data and verify at various offsets */
> -read_ufn read_ufns[] = { read_test_data_u16,
> - read_test_data_u32,
> - read_test_data_u64 };
> +read_ufn read_ufns[] = {
> + read_test_data_u16,
> + read_test_data_u32,
> +#if __SIZEOF_POINTER__ == 8
> + read_test_data_u64
> +#endif
> +};
>
> bool do_unsigned_reads(int start_off)
> {
> @@ -476,10 +484,14 @@ bool do_signed_reads(bool neg_first)
> return ok;
> }
>
> -init_ufn init_ufns[] = { init_test_data_u8,
> - init_test_data_u16,
> - init_test_data_u32,
> - init_test_data_u64 };
> +init_ufn init_ufns[] = {
> + init_test_data_u8,
> + init_test_data_u16,
> + init_test_data_u32,
> +#if __SIZEOF_POINTER__ == 8
> + init_test_data_u64
> +#endif
> +};
>
> int main(void)
> {
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH 13/26] contrib/plugins: control flow plugin
2024-09-10 14:07 ` [PATCH 13/26] contrib/plugins: control flow plugin Alex Bennée
@ 2024-09-10 14:52 ` Pierrick Bouvier
0 siblings, 0 replies; 36+ messages in thread
From: Pierrick Bouvier @ 2024-09-10 14:52 UTC (permalink / raw)
To: Alex Bennée, qemu-devel
Cc: Eduardo Habkost, Zhao Liu, Marcel Apfelbaum, Beraldo Leal,
Philippe Mathieu-Daudé, Alexandre Iooss, Yanan Wang,
Peter Maydell, Mahmoud Mandour, Thomas Huth, qemu-arm, devel,
Jiaxun Yang, Paolo Bonzini, Richard Henderson,
Wainer dos Santos Moschetta, Gustavo Romero
On 9/10/24 07:07, Alex Bennée wrote:
> This is a simple control flow tracking plugin that uses the latest
> inline and conditional operations to detect and track control flow
> changes. It is currently an exercise at seeing how useful the changes
> are.
>
> Based-on: <20240312075428.244210-1-pierrick.bouvier@linaro.org>
> Cc: Gustavo Romero <gustavo.romero@linaro.org>
> Cc: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20240311153432.1395190-1-alex.bennee@linaro.org>
>
> ---
> v2
> - only need a single call back
> - drop need for INSN_WIDTH
> - still don't understand the early exits
>
> v3
> - move initial STORE ops to first instruction to avoid confusion
> with the conditional callback on the start
> - filter out non-branches before processing
> - fix off-by-one with accounting
> - display "sync fault" or "branch" instead of raw numbers
> v4
> - rename hotdest to hottest (i.e. the hottest branch insn)
> - rename early to exception
> - WIP insn structure
> ---
> contrib/plugins/cflow.c | 413 +++++++++++++++++++++++++++++++++++++++
> contrib/plugins/Makefile | 1 +
> 2 files changed, 414 insertions(+)
> create mode 100644 contrib/plugins/cflow.c
>
> diff --git a/contrib/plugins/cflow.c b/contrib/plugins/cflow.c
> new file mode 100644
> index 0000000000..173daec60d
> --- /dev/null
> +++ b/contrib/plugins/cflow.c
> @@ -0,0 +1,413 @@
> +/*
> + * Control Flow plugin
> + *
> + * This plugin will track changes to control flow and detect where
> + * instructions fault.
> + *
> + * Copyright (c) 2024 Linaro Ltd
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +#include <glib.h>
> +#include <inttypes.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +#include <unistd.h>
> +
> +#include <qemu-plugin.h>
> +
> +QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION;
> +
> +typedef enum {
> + SORT_HOTTEST, /* hottest branch insn */
> + SORT_EXCEPTION, /* most early exits */
> + SORT_POPDEST, /* most destinations (usually ret's) */
> +} ReportType;
> +
> +ReportType report = SORT_HOTTEST;
> +int topn = 10;
> +
> +typedef struct {
> + uint64_t daddr;
> + uint64_t dcount;
> +} DestData;
> +
> +/* A node is an address where we can go to multiple places */
> +typedef struct {
> + GMutex lock;
> + /* address of the branch point */
> + uint64_t addr;
> + /* array of DestData */
> + GArray *dests;
> + /* early exit/fault count */
> + uint64_t early_exit;
> + /* jump destination count */
> + uint64_t dest_count;
> + /* instruction data */
> + char *insn_disas;
> + /* symbol? */
> + const char *symbol;
> + /* times translated as last in block? */
> + int last_count;
> + /* times translated in the middle of block? */
> + int mid_count;
> +} NodeData;
> +
> +typedef enum {
> + /* last insn in block, expected flow control */
> + LAST_INSN = (1 << 0),
> + /* mid-block insn, can only be an exception */
> + EXCP_INSN = (1 << 1),
> + /* multiple disassembly, may have changed */
> + MULT_INSN = (1 << 2),
> +} InsnTypes;
> +
> +typedef struct {
> + /* address of the branch point */
> + uint64_t addr;
> + /* disassembly */
> + char *insn_disas;
> + /* symbol? */
> + const char *symbol;
> + /* types */
> + InsnTypes type_flag;
> +} InsnData;
> +
> +/* We use this to track the current execution state */
> +typedef struct {
> + /* address of end of block */
> + uint64_t end_block;
> + /* next pc after end of block */
> + uint64_t pc_after_block;
> + /* address of last executed PC */
> + uint64_t last_pc;
> +} VCPUScoreBoard;
> +
> +/* descriptors for accessing the above scoreboard */
> +static qemu_plugin_u64 end_block;
> +static qemu_plugin_u64 pc_after_block;
> +static qemu_plugin_u64 last_pc;
> +
> +
> +static GMutex node_lock;
> +static GHashTable *nodes;
> +struct qemu_plugin_scoreboard *state;
> +
> +static GMutex insn_lock;
> +static GHashTable *insn_hash;
> +
> +/* SORT_HOTTEST */
> +static gint hottest(gconstpointer a, gconstpointer b)
> +{
> + NodeData *na = (NodeData *) a;
> + NodeData *nb = (NodeData *) b;
> +
> + return na->dest_count > nb->dest_count ? -1 :
> + na->dest_count == nb->dest_count ? 0 : 1;
> +}
> +
> +static gint exception(gconstpointer a, gconstpointer b)
> +{
> + NodeData *na = (NodeData *) a;
> + NodeData *nb = (NodeData *) b;
> +
> + return na->early_exit > nb->early_exit ? -1 :
> + na->early_exit == nb->early_exit ? 0 : 1;
> +}
> +
> +static gint popular(gconstpointer a, gconstpointer b)
> +{
> + NodeData *na = (NodeData *) a;
> + NodeData *nb = (NodeData *) b;
> +
> + return na->dests->len > nb->dests->len ? -1 :
> + na->dests->len == nb->dests->len ? 0 : 1;
> +}
> +
> +/* Filter out non-branches - returns true to remove entry */
> +static gboolean filter_non_branches(gpointer key, gpointer value, gpointer user_data)
> +{
> + NodeData *node = (NodeData *) value;
> +
> + return node->dest_count == 0;
> +}
> +
> +static void plugin_exit(qemu_plugin_id_t id, void *p)
> +{
> + g_autoptr(GString) result = g_string_new("collected ");
> + GList *data;
> + GCompareFunc sort = &hottest;
> + int n = 0;
> +
> + g_mutex_lock(&node_lock);
> + g_string_append_printf(result, "%d control flow nodes in the hash table\n",
> + g_hash_table_size(nodes));
> +
> + /* remove all nodes that didn't branch */
> + g_hash_table_foreach_remove(nodes, filter_non_branches, NULL);
> +
> + data = g_hash_table_get_values(nodes);
> +
> + switch (report) {
> + case SORT_HOTTEST:
> + sort = &hottest;
> + break;
> + case SORT_EXCEPTION:
> + sort = &exception;
> + break;
> + case SORT_POPDEST:
> + sort = &popular;
> + break;
> + }
> +
> + data = g_list_sort(data, sort);
> +
> + for (GList *l = data;
> + l != NULL && n < topn;
> + l = l->next, n++) {
> + NodeData *n = l->data;
> + const char *type = n->mid_count ? "sync fault" : "branch";
> + g_string_append_printf(result, " addr: 0x%"PRIx64 " %s: %s (%s)\n",
> + n->addr, n->symbol, n->insn_disas, type);
> + if (n->early_exit) {
> + g_string_append_printf(result, " early exits %"PRId64"\n",
> + n->early_exit);
> + }
> + g_string_append_printf(result, " branches %"PRId64"\n",
> + n->dest_count);
> + for (int j = 0; j < n->dests->len; j++ ) {
> + DestData *dd = &g_array_index(n->dests, DestData, j);
> + g_string_append_printf(result, " to 0x%"PRIx64" (%"PRId64")\n",
> + dd->daddr, dd->dcount);
> + }
> + }
> +
> + qemu_plugin_outs(result->str);
> +
> + g_mutex_unlock(&node_lock);
> +}
> +
> +static void plugin_init(void)
> +{
> + g_mutex_init(&node_lock);
> + nodes = g_hash_table_new(NULL, g_direct_equal);
> + state = qemu_plugin_scoreboard_new(sizeof(VCPUScoreBoard));
> +
> + /* score board declarations */
> + end_block = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, end_block);
> + pc_after_block = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, pc_after_block);
> + last_pc = qemu_plugin_scoreboard_u64_in_struct(state, VCPUScoreBoard, last_pc);
> +}
> +
> +static NodeData *create_node(uint64_t addr)
> +{
> + NodeData *node = g_new0(NodeData, 1);
> + g_mutex_init(&node->lock);
> + node->addr = addr;
> + node->dests = g_array_new(true, true, sizeof(DestData));
> + return node;
> +}
> +
> +static NodeData *fetch_node(uint64_t addr, bool create_if_not_found)
> +{
> + NodeData *node = NULL;
> +
> + g_mutex_lock(&node_lock);
> + node = (NodeData *) g_hash_table_lookup(nodes, (gconstpointer) addr);
> + if (!node && create_if_not_found) {
> + node = create_node(addr);
> + g_hash_table_insert(nodes, (gpointer) addr, (gpointer) node);
> + }
> + g_mutex_unlock(&node_lock);
> + return node;
> +}
> +
> +#if 0
> +static InsnData *fetch_insn(uint64_t addr, struct qemu_plugin_insn *insn, InsnTypes flag)
> +{
> + InsnData *d = NULL;
> +
> + g_mutex_lock(&insn_lock);
> + d = (InsnData *) g_hash_table_lookup(insn_hash, (gconstpointer) addr);
> + if (!d) {
> + d = g_new0(InsnData, 1);
> + d->addr = addr;
> + d->type_flag = flag;
> + d->insn_disas = qemu_plugin_insn_disas(insn);
> + d->symbol = qemu_plugin_insn_symbol(insn);
> + g_hash_table_insert(insn_hash, (gpointer) addr, (gpointer) d);
> + } else {
> + g_autofree char* cmp_disas = qemu_plugin_insn_disas(insn);
> + if (g_strcmp0(d->insn_disas, cmp_disas) != 0) {
> + d->type_flag |= MULT_INSN;
> + }
> + d->type_flag |= flag;
> + }
> + g_mutex_unlock(&insn_lock);
> + return d;
> +}
> +#endif
> +
> +/*
> + * Called when we detect a non-linear execution (pc !=
> + * pc_after_block). This could be due to a fault causing some sort of
> + * exit exception (if last_pc != block_end) or just a taken branch.
> + */
> +static void vcpu_tb_branched_exec(unsigned int cpu_index, void *udata)
> +{
> + uint64_t lpc = qemu_plugin_u64_get(last_pc, cpu_index);
> + uint64_t ebpc = qemu_plugin_u64_get(end_block, cpu_index);
> + uint64_t npc = qemu_plugin_u64_get(pc_after_block, cpu_index);
> + uint64_t pc = GPOINTER_TO_UINT(udata);
> +
> + /* return early for address 0 */
> + if (!lpc) {
> + return;
> + }
> +
> + NodeData *node = fetch_node(lpc, true);
> + DestData *data = NULL;
> + bool early_exit = (lpc != ebpc);
> + GArray *dests;
> +
> + /* the condition should never hit */
> + g_assert(pc != npc);
> +
> + g_mutex_lock(&node->lock);
> +
> + if (early_exit) {
> + fprintf(stderr, "%s: pc=%"PRIx64", epbc=%"PRIx64
> + " npc=%"PRIx64", lpc=%"PRIx64", \n",
> + __func__, pc, ebpc, npc, lpc);
> + node->early_exit++;
> + if (!node->mid_count) {
> + /* count now as we've only just allocated */
> + node->mid_count++;
> + }
> + }
> +
> + dests = node->dests;
> + for (int i = 0; i < dests->len; i++) {
> + if (g_array_index(dests, DestData, i).daddr == pc) {
> + data = &g_array_index(dests, DestData, i);
> + }
> + }
> +
> + /* we've never seen this before, allocate a new entry */
> + if (!data) {
> + DestData new_entry = { .daddr = pc };
> + g_array_append_val(dests, new_entry);
> + data = &g_array_index(dests, DestData, dests->len - 1);
> + g_assert(data->daddr == pc);
> + }
> +
> + data->dcount++;
> + node->dest_count++;
> +
> + g_mutex_unlock(&node->lock);
> +}
> +
> +/*
> + * At the start of each block we need to resolve two things:
> + *
> + * - is last_pc == block_end, if not we had an early exit
> + * - is start of block last_pc + insn width, if not we jumped
> + *
> + * Once those are dealt with we can instrument the rest of the
> + * instructions for their execution.
> + *
> + */
> +static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
> +{
> + uint64_t pc = qemu_plugin_tb_vaddr(tb);
> + size_t insns = qemu_plugin_tb_n_insns(tb);
> + struct qemu_plugin_insn *first_insn = qemu_plugin_tb_get_insn(tb, 0);
> + struct qemu_plugin_insn *last_insn = qemu_plugin_tb_get_insn(tb, insns - 1);
> +
> + /*
> + * check if we are executing linearly after the last block. We can
> + * handle both early block exits and normal branches in the
> + * callback if we hit it.
> + */
> + gpointer udata = GUINT_TO_POINTER(pc);
> + qemu_plugin_register_vcpu_tb_exec_cond_cb(
> + tb, vcpu_tb_branched_exec, QEMU_PLUGIN_CB_NO_REGS,
> + QEMU_PLUGIN_COND_NE, pc_after_block, pc, udata);
> +
> + /*
> + * Now we can set start/end for this block so the next block can
> + * check where we are at. Do this on the first instruction and not
> + * the TB so we don't get mixed up with above.
> + */
> + qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(first_insn,
> + QEMU_PLUGIN_INLINE_STORE_U64,
> + end_block, qemu_plugin_insn_vaddr(last_insn));
> + qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(first_insn,
> + QEMU_PLUGIN_INLINE_STORE_U64,
> + pc_after_block,
> + qemu_plugin_insn_vaddr(last_insn) +
> + qemu_plugin_insn_size(last_insn));
> +
> + for (int idx = 0; idx < qemu_plugin_tb_n_insns(tb); ++idx) {
> + struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, idx);
> + uint64_t ipc = qemu_plugin_insn_vaddr(insn);
> + /*
> + * If this is a potential branch point check if we could grab
> + * the disassembly for it. If it is the last instruction
> + * always create an entry.
> + */
> + NodeData *node = fetch_node(ipc, last_insn);
> + if (node) {
> + g_mutex_lock(&node->lock);
> + if (!node->insn_disas) {
> + node->insn_disas = qemu_plugin_insn_disas(insn);
> + }
> + if (!node->symbol) {
> + node->symbol = qemu_plugin_insn_symbol(insn);
> + }
> + if (last_insn == insn) {
> + node->last_count++;
> + } else {
> + node->mid_count++;
> + }
> + g_mutex_unlock(&node->lock);
> + }
> +
> + /* Store the PC of what we are about to execute */
> + qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu(insn,
> + QEMU_PLUGIN_INLINE_STORE_U64,
> + last_pc, ipc);
> + }
> +}
> +
> +QEMU_PLUGIN_EXPORT
> +int qemu_plugin_install(qemu_plugin_id_t id, const qemu_info_t *info,
> + int argc, char **argv)
> +{
> + for (int i = 0; i < argc; i++) {
> + char *opt = argv[i];
> + g_auto(GStrv) tokens = g_strsplit(opt, "=", 2);
> + if (g_strcmp0(tokens[0], "sort") == 0) {
> + if (g_strcmp0(tokens[1], "hottest") == 0) {
> + report = SORT_HOTTEST;
> + } else if (g_strcmp0(tokens[1], "early") == 0) {
> + report = SORT_EXCEPTION;
> + } else if (g_strcmp0(tokens[1], "exceptions") == 0) {
> + report = SORT_POPDEST;
> + } else {
> + fprintf(stderr, "failed to parse: %s\n", tokens[1]);
> + return -1;
> + }
> + } else {
> + fprintf(stderr, "option parsing failed: %s\n", opt);
> + return -1;
> + }
> + }
> +
> + plugin_init();
> +
> + qemu_plugin_register_vcpu_tb_trans_cb(id, vcpu_tb_trans);
> + qemu_plugin_register_atexit_cb(id, plugin_exit, NULL);
> + return 0;
> +}
> diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
> index 05a2a45c5c..d4ac599f93 100644
> --- a/contrib/plugins/Makefile
> +++ b/contrib/plugins/Makefile
> @@ -29,6 +29,7 @@ NAMES += cache
> NAMES += drcov
> NAMES += ips
> NAMES += stoptrigger
> +NAMES += cflow
>
> ifeq ($(CONFIG_WIN32),y)
> SO_SUFFIX := .dll
I still think it would be better to track edges than nodes, as explained
on original RFC posted, but it can be worked on later.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2024-09-10 14:53 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-10 14:07 [PATCH 00/26] Maintainer updates (testing, gdbstub, plugins) Alex Bennée
2024-09-10 14:07 ` [PATCH 01/26] tests/docker: remove debian-armel-cross Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 02/26] tests/docker: update debian i686 and mipsel images to bookworm Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 03/26] docs/devel: fix duplicate line Alex Bennée
2024-09-10 14:42 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 04/26] scripts/ci: update the gitlab-runner playbook Alex Bennée
2024-09-10 14:43 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 05/26] gdbstub: Use specific MMU index when probing MTE addresses Alex Bennée
2024-09-10 14:07 ` [PATCH 06/26] gdbstub: Add support for MTE in system mode Alex Bennée
2024-09-10 14:07 ` [PATCH 07/26] tests/guest-debug: Support passing arguments to the GDB test script Alex Bennée
2024-09-10 14:07 ` [PATCH 08/26] tests/tcg/aarch64: Improve linker script organization Alex Bennée
2024-09-10 14:07 ` [PATCH 09/26] tests/tcg/aarch64: Extend MTE gdbstub tests to system mode Alex Bennée
2024-09-10 14:07 ` [PATCH 10/26] contrib/plugins/Makefile: Add a 'distclean' target Alex Bennée
2024-09-10 14:07 ` [PATCH 11/26] deprecation: don't enable TCG plugins by default on 32 bit hosts Alex Bennée
2024-09-10 14:45 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 12/26] deprecation: don't enable TCG plugins by default with TCI Alex Bennée
2024-09-10 14:45 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 13/26] contrib/plugins: control flow plugin Alex Bennée
2024-09-10 14:52 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 14/26] plugins: save value during memory accesses Alex Bennée
2024-09-10 14:07 ` [PATCH 15/26] plugins: extend API to get latest memory value accessed Alex Bennée
2024-09-10 14:07 ` [PATCH 16/26] tests/tcg: add mechanism to run specific tests with plugins Alex Bennée
2024-09-10 14:07 ` [PATCH 17/26] tests/tcg: allow to check output of plugins Alex Bennée
2024-09-10 14:07 ` [PATCH 18/26] tests/plugin/mem: add option to print memory accesses Alex Bennée
2024-09-10 14:07 ` [PATCH 19/26] tests/tcg: clean up output of memory system test Alex Bennée
2024-09-10 14:47 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 20/26] tests/tcg: only read/write 64 bit words on 64 bit systems Alex Bennée
2024-09-10 14:48 ` Pierrick Bouvier
2024-09-10 14:07 ` [PATCH 21/26] tests/tcg: add a system test to check memory instrumentation Alex Bennée
2024-09-10 14:07 ` [PATCH 22/26] util/timer: avoid deadlock when shutting down Alex Bennée
2024-09-10 14:07 ` [PATCH 23/26] contrib/plugins: Add a plugin to generate basic block vectors Alex Bennée
2024-09-10 14:07 ` [PATCH 24/26] plugins: add plugin API to read guest memory Alex Bennée
2024-09-10 14:07 ` [PATCH 25/26] plugins: add option to dump write argument to syscall plugin Alex Bennée
2024-09-10 14:07 ` [PATCH 26/26] plugins: add ability to register a GDB triggered callback Alex Bennée
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).