diff --git a/.qubesbuilder b/.qubesbuilder index 7d396354..0bec5ac9 100644 --- a/.qubesbuilder +++ b/.qubesbuilder @@ -9,13 +9,13 @@ source: - dummy-backlight - v4l2loopback files: - - url: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.xz - signature: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.sign - uncompress: true +# - url: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.xz +# signature: https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-@VERSION@.tar.sign +# uncompress: true ## for -rc kernels, use this: -# - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git -# git-basename: linux-@VERSION@ -# tag: v@VERSION@ + - git-url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git + git-basename: linux-@VERSION@ + tag: v@VERSION@ pubkeys: - kernel.org-2-key.asc - kernel.org-1-key.asc diff --git a/20260508_jgross_x86_xen_tolerate_nested_xen_lazy_mmu_entering_leaving.patch b/20260508_jgross_x86_xen_tolerate_nested_xen_lazy_mmu_entering_leaving.patch deleted file mode 100644 index d17c0c6c..00000000 --- a/20260508_jgross_x86_xen_tolerate_nested_xen_lazy_mmu_entering_leaving.patch +++ /dev/null @@ -1,57 +0,0 @@ -From git@z Thu Jan 1 00:00:00 1970 -Subject: [PATCH] x86/xen: Tolerate nested XEN_LAZY_MMU entering/leaving -From: Juergen Gross -Date: Fri, 08 May 2026 16:39:33 +0200 -Message-Id: <20260508143933.493013-1-jgross@suse.com> -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -With the support of nested lazy mmu sections it can happen that -arch_enter_lazy_mmu_mode() is being called twice without a call of -arch_leave_lazy_mmu_mode() in between, as the lazy_mmu_*() helpers -are not disabling preemption when checking for nested lazy mmu -sections. - -This is a problem when running as a Xen PV guest, as -xen_enter_lazy_mmu() and xen_leave_lazy_mmu() don't tolerate this -case. - -Fix that in xen_enter_lazy_mmu() and xen_leave_lazy_mmu() in order -not to hurt all other lazy mmu mode users. - -Fixes: 291b3abed657 ("x86/xen: use lazy_mmu_state when context-switching") -Signed-off-by: Juergen Gross ---- - arch/x86/xen/mmu_pv.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c -index c80d0058efd1..3eee5f84f8a7 100644 ---- a/arch/x86/xen/mmu_pv.c -+++ b/arch/x86/xen/mmu_pv.c -@@ -2145,7 +2145,10 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot) - - static void xen_enter_lazy_mmu(void) - { -- enter_lazy(XEN_LAZY_MMU); -+ preempt_disable(); -+ if (xen_get_lazy_mode() != XEN_LAZY_MMU) -+ enter_lazy(XEN_LAZY_MMU); -+ preempt_enable(); - } - - static void xen_flush_lazy_mmu(void) -@@ -2182,7 +2185,8 @@ static void xen_leave_lazy_mmu(void) - { - preempt_disable(); - xen_mc_flush(); -- leave_lazy(XEN_LAZY_MMU); -+ if (xen_get_lazy_mode() != XEN_LAZY_NONE) -+ leave_lazy(XEN_LAZY_MMU); - preempt_enable(); - } - --- -2.54.0 - diff --git a/kernel.spec.in b/kernel.spec.in index 40f1c21a..1be8d8a7 100644 --- a/kernel.spec.in +++ b/kernel.spec.in @@ -156,7 +156,6 @@ Patch27: 0001-amdgpu-timeout.patch Patch30: 0004-pvops-respect-removable-xenstore-flag-for-block-devi.patch Patch31: 0001-PCI-add-a-reset-quirk-for-Intel-I219LM-ethernet-adap.patch Patch34: 0001-rust-fixup.patch -Patch35: 20260508_jgross_x86_xen_tolerate_nested_xen_lazy_mmu_entering_leaving.patch # S0ix support: Patch61: xen-events-Add-wakeup-support-to-xen-pirq.patch diff --git a/version b/version index 024b4b9b..584895bb 100644 --- a/version +++ b/version @@ -1 +1 @@ -7.0.6 +7.1-rc4