From nobody Fri Dec 19 06:31:32 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1751564508; cv=none; d=zohomail.com; s=zohoarc; b=F9D/tQC/konWZbSt8nZ9gkr24CciexU+I+wo4SKaDBdNcFUGs+fPXmLW0tILstNe2a7JZzR5kOf1XKszQQoG1TyyNrsKg+v6fQ4LkD3ISZQffrZ+91oRecqDMzhDqLkxGfNS31MXO/W0vAL4jjXitEFhbD19269IGlDVjkfEhGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751564508; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gKkY66WSncDjfDBkQ2PUmi6A59h3Sya1fBXJtO0Vmlo=; b=N8BCoiS//TjTKMFWdCdINqA+3Z1toV7/FZ0h+aFn8jOa7KW/cEb2BghRnoMVdsyhz8P/cui6VL84N4Mk84Bo2O6b6cscbP868JNnq//F2kVmcZOSwaY2ScULRoE990fpi0l1YIlficaC+NVT8psPEGVJzF7LGrMG093GnlpelSc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1751564508394758.618827959951; Thu, 3 Jul 2025 10:41:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uXNql-0000pX-Iw; Thu, 03 Jul 2025 13:35:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uXNqJ-0000Lr-4U for qemu-devel@nongnu.org; Thu, 03 Jul 2025 13:35:31 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uXNq8-0001fD-Qf for qemu-devel@nongnu.org; Thu, 03 Jul 2025 13:35:26 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-450ce671a08so609285e9.3 for ; Thu, 03 Jul 2025 10:35:16 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b4708d0941sm335801f8f.26.2025.07.03.10.35.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Jul 2025 10:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1751564114; x=1752168914; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gKkY66WSncDjfDBkQ2PUmi6A59h3Sya1fBXJtO0Vmlo=; b=tPdA24ulhZy6CJQaYWic7IFCZwkqghaerONcbKvJ0pPaMNScifPk5ak8TpS3QF0NTw RT+A/0H4WyWRgUCV3iM4IlGIKtvHRdTkt5bxeUKD6hBZOPAEm/GFpoRn9cmYSBM5kdYu 2YhMJ8gE76W0cu3FmwHyoAVjl742LyLYdIE5wEBG2Eq95WpJspmYuI9fJPkubXLR4VCs n6gedwWzOk5afLtJ8wqNyRxjjB4APrIvbiJg1/3WVhdW+CqsqTMIp67SlaW0keP5ubdw b+11n/ozrjB4EX06VusJbqAoFjcWxz4n3p2CA22Run0XZ123TdgGTj9yHHDLruTB/wXR EbJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751564114; x=1752168914; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gKkY66WSncDjfDBkQ2PUmi6A59h3Sya1fBXJtO0Vmlo=; b=qrw1rc38Ct/108nWRteF42HOVkFnGd2zKA243HSoXlJqRFnkum94SYfIl6cGla34rD q4XiiJdaONfYgDN+8f0tLMC/mCscHdtbEVQZHS5DGjx8t91AEZCsz/vKgkzCYXwZTkXO d7f7mKykIjE0fMFNM33fB034hRMNo1joX0cKWQtMMBUL//DrWvqqK+5AiFNhkay5Ki0O VClYH07aTDTGPhNocM8+bGDDPHVnUx5oH8nsrRTzPz9bISV4R3xjmTY7aCCZ1oG0BZYi YhgWeD0RvR0qZWiEgUjUq210FF6xSzCBdadILuG0F3/+6VGlMdHvlB+LrDiE3nVe52F5 Qc5w== X-Gm-Message-State: AOJu0YyE2SHEYKmwyKGIA+ocV889h+y3OQgrTiiTrAYA+XLuVNfgb7nW eaKfndPFo68/Vd6vZj2YD1/i1GqEatWaVc3Wgz+AkvXAkeyLKCKPYLYaeTjroVaDNIgF7xm9z4t 4JV3SmJQ= X-Gm-Gg: ASbGncuK7EsQgxV0t/q3cY6R0v84vxg/sjnPDcvBVQBA2VQmMGm9si5GvvXkUgBn53s VkIWJlbCxv6HZyBtYxNkYyjP1mNSet0CuLSi+lDbnFgQ+7I3etxwFndzJC7vsvJxhXEMMJGqov2 QMJAw+TVMostj3NoogMrlbUsA9WYzLzWnJ495vIxkEajXpmODFPs53EDPz6DjWynJe36lcw37kZ o4n/CaKSzv0t6jcZtXdxayd+H2si6J9y7LdWDIqOwI13e2dRIPuJreEyf5+H/rjehd0PAgXPSuo E3UjQb9TMiXEQew40pmwvR66Bxzbu3pbbtTHEIdc7s96bftB2eLTnUy3hLLGLBIddQdTRXeOiI6 xfFAW8g+Z5jpIxwKOy5uKxaQ9HpXcayEbLpYC X-Google-Smtp-Source: AGHT+IE+oERmztqeh1GValBSAb7xMH8Gnkn6Ou+BXUEMTkBVWQVLxXxIW2RoSLeYtG+owzfK+o46Iw== X-Received: by 2002:a05:600c:c48f:b0:448:e8c0:c778 with SMTP id 5b1f17b1804b1-454a370cd65mr74636835e9.22.1751564114470; Thu, 03 Jul 2025 10:35:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Zhao Liu , Paolo Bonzini , Richard Henderson , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 27/39] accel: Pass old/new interrupt mask to handle_interrupt() handler Date: Thu, 3 Jul 2025 19:32:33 +0200 Message-ID: <20250703173248.44995-28-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250703173248.44995-1-philmd@linaro.org> References: <20250703173248.44995-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1751564509609116600 Update CPUState::interrupt_request once in cpu_interrupt(). Pass the old and new masks along. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Zhao Liu --- accel/tcg/tcg-accel-ops-icount.h | 2 +- accel/tcg/tcg-accel-ops.h | 2 +- include/system/accel-ops.h | 2 +- accel/tcg/tcg-accel-ops-icount.c | 8 +++----- accel/tcg/tcg-accel-ops.c | 4 +--- system/cpus.c | 12 +++++++----- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/accel/tcg/tcg-accel-ops-icount.h b/accel/tcg/tcg-accel-ops-ico= unt.h index 16a301b6dc0..1d9d66f0707 100644 --- a/accel/tcg/tcg-accel-ops-icount.h +++ b/accel/tcg/tcg-accel-ops-icount.h @@ -15,6 +15,6 @@ void icount_prepare_for_run(CPUState *cpu, int64_t cpu_bu= dget); int64_t icount_percpu_budget(int cpu_count); void icount_process_data(CPUState *cpu); =20 -void icount_handle_interrupt(CPUState *cpu, int mask); +void icount_handle_interrupt(CPUState *cpu, int old_mask, int new_mask); =20 #endif /* TCG_ACCEL_OPS_ICOUNT_H */ diff --git a/accel/tcg/tcg-accel-ops.h b/accel/tcg/tcg-accel-ops.h index 6feeb3f3e9b..6e7c2aae5a8 100644 --- a/accel/tcg/tcg-accel-ops.h +++ b/accel/tcg/tcg-accel-ops.h @@ -16,7 +16,7 @@ =20 void tcg_cpu_destroy(CPUState *cpu); int tcg_cpu_exec(CPUState *cpu); -void tcg_handle_interrupt(CPUState *cpu, int mask); +void tcg_handle_interrupt(CPUState *cpu, int old_mask, int new_mask); void tcg_cpu_init_cflags(CPUState *cpu, bool parallel); =20 #endif /* TCG_ACCEL_OPS_H */ diff --git a/include/system/accel-ops.h b/include/system/accel-ops.h index 2075691331c..d84eaa376c2 100644 --- a/include/system/accel-ops.h +++ b/include/system/accel-ops.h @@ -61,7 +61,7 @@ struct AccelOpsClass { void (*synchronize_pre_loadvm)(CPUState *cpu); void (*synchronize_pre_resume)(bool step_pending); =20 - void (*handle_interrupt)(CPUState *cpu, int mask); + void (*handle_interrupt)(CPUState *cpu, int old_mask, int new_mask); =20 /** * @get_virtual_clock: fetch virtual clock diff --git a/accel/tcg/tcg-accel-ops-icount.c b/accel/tcg/tcg-accel-ops-ico= unt.c index d0f7b410fab..500b5dd4942 100644 --- a/accel/tcg/tcg-accel-ops-icount.c +++ b/accel/tcg/tcg-accel-ops-icount.c @@ -147,14 +147,12 @@ void icount_process_data(CPUState *cpu) replay_mutex_unlock(); } =20 -void icount_handle_interrupt(CPUState *cpu, int mask) +void icount_handle_interrupt(CPUState *cpu, int old_mask, int new_mask) { - int old_mask =3D cpu->interrupt_request; - - tcg_handle_interrupt(cpu, mask); + tcg_handle_interrupt(cpu, old_mask, new_mask); if (qemu_cpu_is_self(cpu) && !cpu->neg.can_do_io - && (mask & ~old_mask) !=3D 0) { + && (new_mask & ~old_mask) !=3D 0) { cpu_abort(cpu, "Raised interrupt while not in I/O function"); } } diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index f579685a611..eb16a6bf6db 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -91,10 +91,8 @@ static void tcg_cpu_reset_hold(CPUState *cpu) } =20 /* mask must never be zero, except for A20 change call */ -void tcg_handle_interrupt(CPUState *cpu, int mask) +void tcg_handle_interrupt(CPUState *cpu, int old_mask, int new_mask) { - cpu->interrupt_request |=3D mask; - /* * If called from iothread context, wake the target cpu in * case its halted. diff --git a/system/cpus.c b/system/cpus.c index 4fb764ac880..13535a74e6f 100644 --- a/system/cpus.c +++ b/system/cpus.c @@ -246,10 +246,8 @@ int64_t cpus_get_elapsed_ticks(void) return cpu_get_ticks(); } =20 -static void generic_handle_interrupt(CPUState *cpu, int mask) +static void generic_handle_interrupt(CPUState *cpu, int old_mask, int new_= mask) { - cpu->interrupt_request |=3D mask; - if (!qemu_cpu_is_self(cpu)) { qemu_cpu_kick(cpu); } @@ -257,12 +255,16 @@ static void generic_handle_interrupt(CPUState *cpu, i= nt mask) =20 void cpu_interrupt(CPUState *cpu, int mask) { + int old_mask =3D cpu->interrupt_request; + g_assert(bql_locked()); =20 + cpu->interrupt_request |=3D mask; + if (cpus_accel->handle_interrupt) { - cpus_accel->handle_interrupt(cpu, mask); + cpus_accel->handle_interrupt(cpu, old_mask, cpu->interrupt_request= ); } else { - generic_handle_interrupt(cpu, mask); + generic_handle_interrupt(cpu, old_mask, cpu->interrupt_request); } } =20 --=20 2.49.0