From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 30 Sep 2025 17:32:27 +0000 (-0400)
Subject: Merge tag 'kvm-x86-mmu-6.18' of https://github.com/kvm-x86/linux into HEAD
X-Git-Tag: v6.18-rc1~55^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b0d0d85422df8dbfeb02fb248e61e4d60228842;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'kvm-x86-mmu-6.18' of https://github.com/kvm-x86/linux into HEAD

KVM x86 MMU changes for 6.18

 - Recover possible NX huge pages within the TDP MMU under read lock to
   reduce guest jitter when restoring NX huge pages.

 - Return -EAGAIN during prefault if userspace concurrently deletes/moves the
   relevant memslot to fix an issue where prefaulting could deadlock with the
   memslot update.

 - Don't retry in TDX's anti-zero-step mitigation if the target memslot is
   invalid, i.e. is being deleted or moved, to fix a deadlock scenario similar
   to the aforementioned prefaulting case.
---

5b0d0d85422df8dbfeb02fb248e61e4d60228842