Generic: fix memory leak failure to create VM.
x86: fix MMU corner case with AMD nested paging disabled. -----BEGIN PGP SIGNATURE----- iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAl27ZC8UHHBib256aW5p QHJlZGhhdC5jb20ACgkQv/vSX3jHroNw/wf9EN2AQuyfkwMxLdh2VlyMg9SzRBgn SZt6EmC8Pbfqqri2pPlDh1e1rk5CdIKM3EtcnNYvbZddXuAiORLx62lQCKu9UWzJ mfVpahjFdx+6wFCI2IUB66Qat/E34uFP91h8cKxdwuTrgeT1V+HeFomwqmVQVkym urqEQSWJh6SLl3ZeeiuVaxQdcqq8dW+PChKwrLmgQ4Dz8aREHEbd9ukHAopcyE+T L8B29LtrBh2KCZeH7g91d5hGgGFeJCd1q+rXKOJLvpPJCZ0fnxtL9Va3h2y4TIbF utDAA17Hu5QmnAJw7Lh7nN0mHGPejbs763IaGrW2nrY70pVeO6bDMh8M2Q== =w2Y0 -----END PGP SIGNATURE----- Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Pull kvm fixes from Paolo Bonzini: "generic: - fix memory leak on failure to create VM x86: - fix MMU corner case with AMD nested paging disabled" * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: vmx, svm: always run with EFER.NXE=1 when shadow paging is active kvm: call kvm_arch_destroy_vm if vm creation fails kvm: Allocate memslots and buses before calling kvm_arch_init_vm
This commit is contained in:
commit
b88866b60d
|
@ -734,8 +734,14 @@ static int get_npt_level(struct kvm_vcpu *vcpu)
|
||||||
static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)
|
static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer)
|
||||||
{
|
{
|
||||||
vcpu->arch.efer = efer;
|
vcpu->arch.efer = efer;
|
||||||
if (!npt_enabled && !(efer & EFER_LMA))
|
|
||||||
efer &= ~EFER_LME;
|
if (!npt_enabled) {
|
||||||
|
/* Shadow paging assumes NX to be available. */
|
||||||
|
efer |= EFER_NX;
|
||||||
|
|
||||||
|
if (!(efer & EFER_LMA))
|
||||||
|
efer &= ~EFER_LME;
|
||||||
|
}
|
||||||
|
|
||||||
to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME;
|
to_svm(vcpu)->vmcb->save.efer = efer | EFER_SVME;
|
||||||
mark_dirty(to_svm(vcpu)->vmcb, VMCB_CR);
|
mark_dirty(to_svm(vcpu)->vmcb, VMCB_CR);
|
||||||
|
|
|
@ -969,17 +969,9 @@ static bool update_transition_efer(struct vcpu_vmx *vmx, int efer_offset)
|
||||||
u64 guest_efer = vmx->vcpu.arch.efer;
|
u64 guest_efer = vmx->vcpu.arch.efer;
|
||||||
u64 ignore_bits = 0;
|
u64 ignore_bits = 0;
|
||||||
|
|
||||||
if (!enable_ept) {
|
/* Shadow paging assumes NX to be available. */
|
||||||
/*
|
if (!enable_ept)
|
||||||
* NX is needed to handle CR0.WP=1, CR4.SMEP=1. Testing
|
guest_efer |= EFER_NX;
|
||||||
* host CPUID is more efficient than testing guest CPUID
|
|
||||||
* or CR4. Host SMEP is anyway a requirement for guest SMEP.
|
|
||||||
*/
|
|
||||||
if (boot_cpu_has(X86_FEATURE_SMEP))
|
|
||||||
guest_efer |= EFER_NX;
|
|
||||||
else if (!(guest_efer & EFER_NX))
|
|
||||||
ignore_bits |= EFER_NX;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* LMA and LME handled by hardware; SCE meaningless outside long mode.
|
* LMA and LME handled by hardware; SCE meaningless outside long mode.
|
||||||
|
|
|
@ -627,8 +627,9 @@ static int kvm_create_vm_debugfs(struct kvm *kvm, int fd)
|
||||||
|
|
||||||
static struct kvm *kvm_create_vm(unsigned long type)
|
static struct kvm *kvm_create_vm(unsigned long type)
|
||||||
{
|
{
|
||||||
int r, i;
|
|
||||||
struct kvm *kvm = kvm_arch_alloc_vm();
|
struct kvm *kvm = kvm_arch_alloc_vm();
|
||||||
|
int r = -ENOMEM;
|
||||||
|
int i;
|
||||||
|
|
||||||
if (!kvm)
|
if (!kvm)
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
|
@ -640,12 +641,31 @@ static struct kvm *kvm_create_vm(unsigned long type)
|
||||||
mutex_init(&kvm->lock);
|
mutex_init(&kvm->lock);
|
||||||
mutex_init(&kvm->irq_lock);
|
mutex_init(&kvm->irq_lock);
|
||||||
mutex_init(&kvm->slots_lock);
|
mutex_init(&kvm->slots_lock);
|
||||||
refcount_set(&kvm->users_count, 1);
|
|
||||||
INIT_LIST_HEAD(&kvm->devices);
|
INIT_LIST_HEAD(&kvm->devices);
|
||||||
|
|
||||||
|
BUILD_BUG_ON(KVM_MEM_SLOTS_NUM > SHRT_MAX);
|
||||||
|
|
||||||
|
for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
|
||||||
|
struct kvm_memslots *slots = kvm_alloc_memslots();
|
||||||
|
|
||||||
|
if (!slots)
|
||||||
|
goto out_err_no_arch_destroy_vm;
|
||||||
|
/* Generations must be different for each address space. */
|
||||||
|
slots->generation = i;
|
||||||
|
rcu_assign_pointer(kvm->memslots[i], slots);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < KVM_NR_BUSES; i++) {
|
||||||
|
rcu_assign_pointer(kvm->buses[i],
|
||||||
|
kzalloc(sizeof(struct kvm_io_bus), GFP_KERNEL_ACCOUNT));
|
||||||
|
if (!kvm->buses[i])
|
||||||
|
goto out_err_no_arch_destroy_vm;
|
||||||
|
}
|
||||||
|
|
||||||
|
refcount_set(&kvm->users_count, 1);
|
||||||
r = kvm_arch_init_vm(kvm, type);
|
r = kvm_arch_init_vm(kvm, type);
|
||||||
if (r)
|
if (r)
|
||||||
goto out_err_no_disable;
|
goto out_err_no_arch_destroy_vm;
|
||||||
|
|
||||||
r = hardware_enable_all();
|
r = hardware_enable_all();
|
||||||
if (r)
|
if (r)
|
||||||
|
@ -655,28 +675,10 @@ static struct kvm *kvm_create_vm(unsigned long type)
|
||||||
INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list);
|
INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
BUILD_BUG_ON(KVM_MEM_SLOTS_NUM > SHRT_MAX);
|
|
||||||
|
|
||||||
r = -ENOMEM;
|
|
||||||
for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++) {
|
|
||||||
struct kvm_memslots *slots = kvm_alloc_memslots();
|
|
||||||
if (!slots)
|
|
||||||
goto out_err_no_srcu;
|
|
||||||
/* Generations must be different for each address space. */
|
|
||||||
slots->generation = i;
|
|
||||||
rcu_assign_pointer(kvm->memslots[i], slots);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (init_srcu_struct(&kvm->srcu))
|
if (init_srcu_struct(&kvm->srcu))
|
||||||
goto out_err_no_srcu;
|
goto out_err_no_srcu;
|
||||||
if (init_srcu_struct(&kvm->irq_srcu))
|
if (init_srcu_struct(&kvm->irq_srcu))
|
||||||
goto out_err_no_irq_srcu;
|
goto out_err_no_irq_srcu;
|
||||||
for (i = 0; i < KVM_NR_BUSES; i++) {
|
|
||||||
rcu_assign_pointer(kvm->buses[i],
|
|
||||||
kzalloc(sizeof(struct kvm_io_bus), GFP_KERNEL_ACCOUNT));
|
|
||||||
if (!kvm->buses[i])
|
|
||||||
goto out_err;
|
|
||||||
}
|
|
||||||
|
|
||||||
r = kvm_init_mmu_notifier(kvm);
|
r = kvm_init_mmu_notifier(kvm);
|
||||||
if (r)
|
if (r)
|
||||||
|
@ -697,7 +699,9 @@ out_err_no_irq_srcu:
|
||||||
out_err_no_srcu:
|
out_err_no_srcu:
|
||||||
hardware_disable_all();
|
hardware_disable_all();
|
||||||
out_err_no_disable:
|
out_err_no_disable:
|
||||||
refcount_set(&kvm->users_count, 0);
|
kvm_arch_destroy_vm(kvm);
|
||||||
|
WARN_ON_ONCE(!refcount_dec_and_test(&kvm->users_count));
|
||||||
|
out_err_no_arch_destroy_vm:
|
||||||
for (i = 0; i < KVM_NR_BUSES; i++)
|
for (i = 0; i < KVM_NR_BUSES; i++)
|
||||||
kfree(kvm_get_bus(kvm, i));
|
kfree(kvm_get_bus(kvm, i));
|
||||||
for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++)
|
for (i = 0; i < KVM_ADDRESS_SPACE_NUM; i++)
|
||||||
|
|
Loading…
Reference in New Issue