diff --git a/kvm-e1000e-Prevent-crash-from-legacy-interrupt-firing-af.patch b/kvm-e1000e-Prevent-crash-from-legacy-interrupt-firing-af.patch new file mode 100644 index 0000000..d1e4d00 --- /dev/null +++ b/kvm-e1000e-Prevent-crash-from-legacy-interrupt-firing-af.patch @@ -0,0 +1,69 @@ +From a2f30bafa346ef50932c359eaf71574ed3c1239d Mon Sep 17 00:00:00 2001 +From: Laurent Vivier +Date: Thu, 7 Aug 2025 13:08:06 +0200 +Subject: [PATCH] e1000e: Prevent crash from legacy interrupt firing after + MSI-X enable +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Laurent Vivier +RH-MergeRequest: 403: e1000e: Prevent crash from legacy interrupt firing after MSI-X enable +RH-Jira: RHEL-112882 +RH-Acked-by: Cindy Lu +RH-Acked-by: Jason Wang +RH-Commit: [1/1] 8241a58b76307f27ad3d3b3b2106e00b153b7b53 (lvivier/qemu-kvm-centos) + +JIRA: https://issues.redhat.com/browse/RHEL-112882 + +A race condition between guest driver actions and QEMU timers can lead +to an assertion failure when the guest switches the e1000e from legacy +interrupt mode to MSI-X. If a legacy interrupt delay timer (TIDV or +RDTR) is active, but the guest enables MSI-X before the timer fires, +the pending interrupt cause can trigger an assert in +e1000e_intmgr_collect_delayed_causes(). + +This patch removes the assertion and executes the code that clears the +pending legacy causes. This change is safe and introduces no unintended +behavioral side effects, as it only alters a state that previously led +to termination. + +- when core->delayed_causes == 0 the function was already a no-op and + remains so. + +- when core->delayed_causes != 0 the function would previously + crash due to the assertion failure. The patch now defines a safe + outcome by clearing the cause and returning. Since behavior after + the assertion never existed, this simply corrects the crash. + +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1863 +Suggested-by: Akihiko Odaki +Signed-off-by: Laurent Vivier +Acked-by: Jason Wang +Reviewed-by: Akihiko Odaki +Message-ID: <20250807110806.409065-1-lvivier@redhat.com> +Signed-off-by: Philippe Mathieu-Daudé +(cherry picked from commit 8e4649cac9bcddc050d2df07908075e9e69bccc7) +--- + hw/net/e1000e_core.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c +index 2413858790..06657bb3ac 100644 +--- a/hw/net/e1000e_core.c ++++ b/hw/net/e1000e_core.c +@@ -341,11 +341,6 @@ e1000e_intmgr_collect_delayed_causes(E1000ECore *core) + { + uint32_t res; + +- if (msix_enabled(core->owner)) { +- assert(core->delayed_causes == 0); +- return 0; +- } +- + res = core->delayed_causes; + core->delayed_causes = 0; + +-- +2.47.3 + diff --git a/qemu-kvm.spec b/qemu-kvm.spec index cfb4c7d..ae196e6 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -143,7 +143,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 10.1.0 -Release: 1%{?rcrel}%{?dist}%{?cc_suffix} +Release: 2%{?rcrel}%{?dist}%{?cc_suffix} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch 15 used for RHEL 8 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) @@ -186,6 +186,8 @@ Patch0018: 0018-Add-support-statement-to-help-output.patch Patch0019: 0019-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch Patch0020: 0020-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch Patch0021: 0021-file-posix-Define-DM_MPATH_PROBE_PATHS.patch +# For RHEL-112882 - [DEV Task]: Assertion `core->delayed_causes == 0' failed with e1000e NIC +Patch22: kvm-e1000e-Prevent-crash-from-legacy-interrupt-firing-af.patch %if %{have_clang} BuildRequires: clang @@ -1265,6 +1267,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Mon Sep 15 2025 Miroslav Rezanina - 10.1.0-2 +- kvm-e1000e-Prevent-crash-from-legacy-interrupt-firing-af.patch [RHEL-112882] +- Resolves: RHEL-112882 + ([DEV Task]: Assertion `core->delayed_causes == 0' failed with e1000e NIC) + * Fri Aug 29 2025 Miroslav Rezanina - 10.1.0-1 - Rebase to QEMU 10.1.0 [RHEL-105035] - Resolves: RHEL-105035