* [GIT PULL] KVM patches for Linux 5.4-rc8
@ 2019-11-12 21:10 Paolo Bonzini
2019-11-12 21:26 ` Linus Torvalds
2019-11-12 21:30 ` pr-tracker-bot
0 siblings, 2 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-11-12 21:10 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, rkrcmar, kvm
Linus,
The following changes since commit 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c:
Linux 5.4-rc7 (2019-11-10 16:17:15 -0800)
are available in the git repository at:
https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
for you to fetch changes up to a78986aae9b2988f8493f9f65a587ee433e83bc3:
KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved (2019-11-12 10:17:42 +0100)
----------------------------------------------------------------
Bugfixes: unwinding of KVM_CREATE_VM failure,
VT-d posted interrupts, DAX/ZONE_DEVICE,
module unload/reload.
----------------------------------------------------------------
I delayed sending this until today, because there is a conflict between
today's processor vulnerability mitigations and commit 8a44119a98be from
this pull request ("KVM: Fix NULL-ptr deref after kvm_create_vm fails"),
and I didn't want to mess up your processing of Thomas's pull request.
It's not a particularly hard conflict, but I'm including anyway a
resolution at the end of this email.
Paolo
Chenyi Qiang (1):
KVM: X86: Fix initialization of MSR lists
Joao Martins (3):
KVM: VMX: Consider PID.PIR to determine if vCPU has pending interrupts
KVM: VMX: Do not change PID.NDST when loading a blocked vCPU
KVM: VMX: Introduce pi_is_pir_empty() helper
Liran Alon (1):
KVM: VMX: Fix comment to specify PID.ON instead of PIR.ON
Paolo Bonzini (2):
KVM: Fix NULL-ptr deref after kvm_create_vm fails
KVM: fix placement of refcount initialization
Sean Christopherson (1):
KVM: MMU: Do not treat ZONE_DEVICE pages as being reserved
arch/x86/kvm/mmu.c | 8 +++----
arch/x86/kvm/vmx/vmx.c | 23 +++++++++++++++++---
arch/x86/kvm/vmx/vmx.h | 11 ++++++++++
arch/x86/kvm/x86.c | 56 ++++++++++++++++++++++--------------------------
include/linux/kvm_host.h | 1 +
virt/kvm/kvm_main.c | 48 +++++++++++++++++++++++++++++------------
6 files changed, 96 insertions(+), 51 deletions(-)
diff --cc virt/kvm/kvm_main.c
index 4aab3547a165,0dac149ead16..000000000000
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -715,15 -713,6 +735,11 @@@
return kvm;
out_err:
+#if defined(CONFIG_MMU_NOTIFIER) && defined(KVM_ARCH_WANT_MMU_NOTIFIER)
+ if (kvm->mmu_notifier.ops)
+ mmu_notifier_unregister(&kvm->mmu_notifier, current->mm);
+#endif
+out_err_no_mmu_notifier:
- cleanup_srcu_struct(&kvm->irq_srcu);
- out_err_no_irq_srcu:
- cleanup_srcu_struct(&kvm->srcu);
- out_err_no_srcu:
hardware_disable_all();
out_err_no_disable:
kvm_arch_destroy_vm(kvm);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] KVM patches for Linux 5.4-rc8
2019-11-12 21:10 [GIT PULL] KVM patches for Linux 5.4-rc8 Paolo Bonzini
@ 2019-11-12 21:26 ` Linus Torvalds
2019-11-12 21:33 ` Paolo Bonzini
2019-11-12 21:30 ` pr-tracker-bot
1 sibling, 1 reply; 4+ messages in thread
From: Linus Torvalds @ 2019-11-12 21:26 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Linux Kernel Mailing List, Radim Krčmář, KVM list
On Tue, Nov 12, 2019 at 1:10 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> It's not a particularly hard conflict, but I'm including anyway a
> resolution at the end of this email.
Hmm. My resolution has a slightly different conflict diff, that shows
another earlier part (that git ended up sorting out itself - maybe you
edited it out for that reason).
I think I did the right conflict resolution, but the difference in
diffs makes me just slightly nervous. Mind checking it?
Linus
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] KVM patches for Linux 5.4-rc8
2019-11-12 21:10 [GIT PULL] KVM patches for Linux 5.4-rc8 Paolo Bonzini
2019-11-12 21:26 ` Linus Torvalds
@ 2019-11-12 21:30 ` pr-tracker-bot
1 sibling, 0 replies; 4+ messages in thread
From: pr-tracker-bot @ 2019-11-12 21:30 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: torvalds, linux-kernel, rkrcmar, kvm
The pull request you sent on Tue, 12 Nov 2019 22:10:36 +0100:
> https://git.kernel.org/pub/scm/virt/kvm/kvm.git tags/for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8c5bd25bf42effd194d4b0b43895c42b374e620b
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] KVM patches for Linux 5.4-rc8
2019-11-12 21:26 ` Linus Torvalds
@ 2019-11-12 21:33 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2019-11-12 21:33 UTC (permalink / raw)
To: Linus Torvalds
Cc: Linux Kernel Mailing List, Radim Krčmář, KVM list
On 12/11/19 22:26, Linus Torvalds wrote:
>> It's not a particularly hard conflict, but I'm including anyway a
>> resolution at the end of this email.
> Hmm. My resolution has a slightly different conflict diff, that shows
> another earlier part (that git ended up sorting out itself - maybe you
> edited it out for that reason).
Yes, I edited it out to point out the one that matters. Sorry for the
confusion.
Paolo
> I think I did the right conflict resolution, but the difference in
> diffs makes me just slightly nervous. Mind checking it?
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-11-12 21:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-12 21:10 [GIT PULL] KVM patches for Linux 5.4-rc8 Paolo Bonzini
2019-11-12 21:26 ` Linus Torvalds
2019-11-12 21:33 ` Paolo Bonzini
2019-11-12 21:30 ` pr-tracker-bot
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).