qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Julian Ganz" <neither@nut.email>,
	"David Hildenbrand" <david@redhat.com>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	"Thomas Huth" <thuth@redhat.com>,
	qemu-s390x@nongnu.org (open list:S390 TCG CPUs)
Subject: [PULL 24/35] target/s390x: call plugin trap callbacks
Date: Wed, 29 Oct 2025 15:50:33 +0000	[thread overview]
Message-ID: <20251029155045.257802-25-alex.bennee@linaro.org> (raw)
In-Reply-To: <20251029155045.257802-1-alex.bennee@linaro.org>

From: Julian Ganz <neither@nut.email>

We recently introduced API for registering callbacks for trap related
events as well as the corresponding hook functions. Due to differences
between architectures, the latter need to be called from target specific
code.

This change places hooks for IBM System/390 targets. We treat "program
interrupts" and service calls as exceptions. We treat external and io
"exceptions" as well as resets as interrupts.

Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Julian Ganz <neither@nut.email>
Message-ID: <20251027110344.2289945-25-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index 0ae4e266065..c6641280bc6 100644
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -35,6 +35,7 @@
 #include "hw/s390x/s390_flic.h"
 #include "hw/boards.h"
 #endif
+#include "qemu/plugin.h"
 
 G_NORETURN void tcg_s390_program_interrupt(CPUS390XState *env,
                                            uint32_t code, uintptr_t ra)
@@ -502,6 +503,7 @@ void s390_cpu_do_interrupt(CPUState *cs)
     S390CPU *cpu = S390_CPU(cs);
     CPUS390XState *env = &cpu->env;
     bool stopped = false;
+    uint64_t last_pc = cpu->env.psw.addr;
 
     qemu_log_mask(CPU_LOG_INT, "%s: %d at psw=%" PRIx64 ":%" PRIx64 "\n",
                   __func__, cs->exception_index, env->psw.mask, env->psw.addr);
@@ -531,21 +533,27 @@ try_deliver:
     switch (cs->exception_index) {
     case EXCP_PGM:
         do_program_interrupt(env);
+        qemu_plugin_vcpu_exception_cb(cs, last_pc);
         break;
     case EXCP_SVC:
         do_svc_interrupt(env);
+        qemu_plugin_vcpu_exception_cb(cs, last_pc);
         break;
     case EXCP_EXT:
         do_ext_interrupt(env);
+        qemu_plugin_vcpu_interrupt_cb(cs, last_pc);
         break;
     case EXCP_IO:
         do_io_interrupt(env);
+        qemu_plugin_vcpu_interrupt_cb(cs, last_pc);
         break;
     case EXCP_MCHK:
         do_mchk_interrupt(env);
+        qemu_plugin_vcpu_interrupt_cb(cs, last_pc);
         break;
     case EXCP_RESTART:
         do_restart_interrupt(env);
+        qemu_plugin_vcpu_interrupt_cb(cs, last_pc);
         break;
     case EXCP_STOP:
         do_stop_interrupt(env);
-- 
2.47.3



  parent reply	other threads:[~2025-10-29 16:01 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-29 15:50 [PULL 00/35] maintainer updates (ci, plugins, semihosting) Alex Bennée
2025-10-29 15:50 ` [PULL 01/35] ci: clean-up remaining bits of armhf builds Alex Bennée
2025-10-29 15:50 ` [PULL 02/35] scripts/ci/setup: regenerate yaml Alex Bennée
2025-10-29 15:50 ` [PULL 03/35] scripts/ci: move build-environment.yaml up a level Alex Bennée
2025-10-29 15:50 ` [PULL 04/35] scripts/ci: allow both Ubuntu or Debian to run upgrade Alex Bennée
2025-10-29 15:50 ` [PULL 05/35] tests/lcitool: generate a yaml file for the ppc64le runner Alex Bennée
2025-10-29 15:50 ` [PULL 06/35] scripts/ci: modify gitlab runner deb setup Alex Bennée
2025-10-29 15:50 ` [PULL 07/35] plugins: add types for callbacks related to certain discontinuities Alex Bennée
2025-10-29 15:50 ` [PULL 08/35] plugins: add API for registering discontinuity callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 09/35] plugins: add hooks for new discontinuity related callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 10/35] contrib/plugins: add plugin showcasing new dicontinuity related API Alex Bennée
2025-10-29 15:50 ` [PULL 11/35] target/alpha: call plugin trap callbacks Alex Bennée
2025-10-29 15:50 ` [PULL 12/35] target/arm: " Alex Bennée
2025-10-29 15:50 ` [PULL 13/35] target/avr: " Alex Bennée
2025-10-29 15:50 ` [PULL 14/35] target/hppa: " Alex Bennée
2025-10-29 15:50 ` [PULL 15/35] target/i386: " Alex Bennée
2025-10-29 15:50 ` [PULL 16/35] target/loongarch: " Alex Bennée
2025-10-29 15:50 ` [PULL 17/35] target/m68k: " Alex Bennée
2025-10-29 15:50 ` [PULL 18/35] target/microblaze: " Alex Bennée
2025-10-29 15:50 ` [PULL 19/35] target/mips: " Alex Bennée
2025-10-29 15:50 ` [PULL 20/35] target/openrisc: " Alex Bennée
2025-10-29 15:50 ` [PULL 21/35] target/ppc: " Alex Bennée
2025-10-29 15:50 ` [PULL 22/35] target/riscv: " Alex Bennée
2025-10-29 15:50 ` [PULL 23/35] target/rx: " Alex Bennée
2025-10-29 15:50 ` Alex Bennée [this message]
2025-10-29 15:50 ` [PULL 25/35] target/sh4: " Alex Bennée
2025-10-29 15:50 ` [PULL 26/35] target/sparc: " Alex Bennée
2025-10-29 15:50 ` [PULL 27/35] target/tricore: " Alex Bennée
2025-10-29 15:50 ` [PULL 28/35] target/xtensa: " Alex Bennée
2025-10-29 15:50 ` [PULL 29/35] tests: add plugin asserting correctness of discon event's to_pc Alex Bennée
2025-10-29 15:50 ` [PULL 30/35] tests: add test for double-traps on rv64 Alex Bennée
2025-10-29 15:50 ` [PULL 31/35] tests: add test with interrupted memory accesses " Alex Bennée
2025-10-29 15:50 ` [PULL 32/35] plugins/core: add missing QEMU_DISABLE_CFI annotations Alex Bennée
2025-10-29 15:50 ` [PULL 33/35] configs: drop SBSA_REF from minimal specification Alex Bennée
2025-10-29 15:50 ` [PULL 34/35] gdbstub: Fix %s formatting Alex Bennée
2025-10-29 15:50 ` [PULL 35/35] semihosting: Fix GDB File-I/O FLEN Alex Bennée
2025-10-31  9:25 ` [PULL 00/35] maintainer updates (ci, plugins, semihosting) Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251029155045.257802-25-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=david@redhat.com \
    --cc=iii@linux.ibm.com \
    --cc=neither@nut.email \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).