kvm: Nested KVM MMUs need PAE root too
PATCH 1/1 kvm: Nested KVM MMUs need PAE root too
On AMD processors, in PAE 32bit mode, nested KVM instances don't work. The L0 host get a kernel OOPS, which is related to arch.mmu->pae_root being NULL.
The reason for this is that when setting up nested KVM instance, arch.mmu is set to &arch.guest_mmu (while normally, it would be &arch.root_mmu). However, the initialization and allocation of pae_root only creates it in root_mmu. KVM code (ie. in mmu_alloc_shadow_roots) then accesses arch.mmu->pae_root, which is the unallocated arch.guest_mmu->pae_root.
This fix just allocates (and frees) pae_root in both guest_mmu and root_mmu (and also lm_root if it was allocated). The allocation is subject to previous restrictions ie. it won't allocate anything on 64-bit and AFAIK not on Intel.
See bug 203923 for details.
--- arch/x86/kvm/mmu.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)
arch/x86/kvm/mmu.c +22 -8
@@ -5592,13 +5592,13 @@ slot_handle_leaf(struct kvm *kvm, struct kvm_memory_slot *memslot, PT_PAGE_TABLE_LEVEL, lock_flush_tlb); } -static void free_mmu_pages (struct kvm_vcpu *vcpu) +static void free_mmu_pages (struct kvm_mmu *mmu) { -free_page ((unsigned long )vcpu->arch.mmu->pae_root); -free_page ((unsigned long )vcpu->arch.mmu->lm_root); +free_page ((unsigned long )mmu->pae_root); +free_page ((unsigned long )mmu->lm_root); } -static int alloc_mmu_pages (struct kvm_vcpu *vcpu) +static int alloc_mmu_pages (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu) {struct page *page;int i;
@@ -5619,9 +5619,9 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)if (!page)return -ENOMEM ; - vcpu->arch.mmu->pae_root =page_address (page); + mmu->pae_root =page_address (page);for (i =0 ; i <4 ; ++i) - vcpu->arch.mmu->pae_root[i] =INVALID_PAGE ; + mmu->pae_root[i] =INVALID_PAGE ;return 0 ; }
@@ -5629,6 +5629,7 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)int kvm_mmu_create (struct kvm_vcpu *vcpu) {uint i; +int ret; vcpu->arch.mmu = &vcpu->arch.root_mmu; vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;
@@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) vcpu->arch.guest_mmu.prev_roots[i] =KVM_MMU_ROOT_INFO_INVALID ; vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa; -return alloc_mmu_pages (vcpu); + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.guest_mmu); +if (ret) +return ret; + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.root_mmu); +if (ret) + goto fail_allocate_root; + +return ret; + fail_allocate_root: +free_mmu_pages (&vcpu->arch.guest_mmu); +return ret; } static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,
@@ -6102,7 +6115,8 @@ unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)void kvm_mmu_destroy (struct kvm_vcpu *vcpu) {kvm_mmu_unload (vcpu); -free_mmu_pages (vcpu); +free_mmu_pages (&vcpu->arch.root_mmu); +free_mmu_pages (&vcpu->arch.guest_mmu);mmu_free_memory_caches (vcpu); }
--
2.23.0.rc1
Quoted 3 lines · Jiří Paleček
On AMD processors, in PAE 32bit mode, nested KVM instances don't work. The L0 host get a kernel OOPS, which is related to
arch.mmu->pae_rootbeing NULL.
The date on the message is "Date: Sat, 22 Jun 2019 19:42:04 +0200" and I got a bit confused at first.
Quoted 4 lines
The reason for this is that when setting up nested KVM instance, arch.mmu is set to &arch.guest_mmu (while normally, it would be &arch.root_mmu).
MMU switch to guest_mmu happens when we're about to start L2 guest - and we switch back to root_mmu when we want to execute L1 again (e.g. after vmexit) so this is not a one-time thing ('when setting up nested KVM instance' makes me think so).
Quoted 4 lines
However, the initialization and allocation of
pae_rootonly creates it inroot_mmu. KVM code (ie. inmmu_alloc_shadow_roots) then accessesarch.mmu->pae_root, which is the unallocatedarch.guest_mmu->pae_root.
Quoted 5 lines
This fix just allocates (and frees)
pae_rootin bothguest_mmuandroot_mmu(and alsolm_rootif it was allocated). The allocation is subject to previous restrictions ie. it won't allocate anything on 64-bit and AFAIK not on Intel.
Right, it is only NPT 32 bit which uses that (and it's definitely undertested).
Quoted 2 lines
See bug 203923 for details.
Personally, I'd prefer this to be full link
https://bugzilla.kernel.org/show_bug.cgi?id=203923
as there are multiple bugzillas out threre.
Quoted 3 lines
Signed-off-by Jiri Palecek <[email protected]>Tested-by Jiri Palecek <[email protected]>
This is weird. I always thought "Signed-off-by" implies some form of testing (unless stated otherwise) :-)
Quoted 50 lines
--- arch/x86/kvm/mmu.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)arch/x86/kvm/mmu.c +7
-6@@ -5592,13 +5592,13 @@ slot_handle_leaf(struct kvm *kvm, struct kvm_memory_slot *memslot, PT_PAGE_TABLE_LEVEL, lock_flush_tlb); } -static void free_mmu_pages (struct kvm_vcpu *vcpu) +static void free_mmu_pages (struct kvm_mmu *mmu) { -free_page ((unsigned long )vcpu->arch.mmu->pae_root); -free_page ((unsigned long )vcpu->arch.mmu->lm_root); +free_page ((unsigned long )mmu->pae_root); +free_page ((unsigned long )mmu->lm_root); } -static int alloc_mmu_pages (struct kvm_vcpu *vcpu) +static int alloc_mmu_pages (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu) {struct page *page;int i;@@ -5619,9 +5619,9 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)if (!page)return -ENOMEM ; - vcpu->arch.mmu->pae_root =page_address (page); + mmu->pae_root =page_address (page);for (i =0 ; i <4 ; ++i) - vcpu->arch.mmu->pae_root[i] =INVALID_PAGE ; + mmu->pae_root[i] =INVALID_PAGE ;return 0 ; }@@ -5629,6 +5629,7 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)int kvm_mmu_create (struct kvm_vcpu *vcpu) {uint i; +int ret; vcpu->arch.mmu = &vcpu->arch.root_mmu; vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;@@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) vcpu->arch.guest_mmu.prev_roots[i] =KVM_MMU_ROOT_INFO_INVALID ;
arch/x86/kvm/mmu.c int kvm_mmu_create(struct kvm_vcpu *vcpu) · line 5657
Quoted 10 lines
arch/x86/kvm/mmu.c +8
-1vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa; -return alloc_mmu_pages (vcpu); + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.guest_mmu); +if (ret) +return ret; + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.root_mmu); +if (ret) + goto fail_allocate_root;
(personal preference) here you're just jumping over 'return' so I'd prefer this to be written as:
ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu);
if (!ret)
return 0;
free_mmu_pages(&vcpu->arch.guest_mmu);
return ret;and no label/goto required.
Quoted 21 lines
arch/x86/kvm/mmu.c +7
-2+ +return ret; + fail_allocate_root: +free_mmu_pages (&vcpu->arch.guest_mmu); +return ret; } static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,@@ -6102,7 +6115,8 @@ unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)void kvm_mmu_destroy (struct kvm_vcpu *vcpu) {kvm_mmu_unload (vcpu); -free_mmu_pages (vcpu); +free_mmu_pages (&vcpu->arch.root_mmu); +free_mmu_pages (&vcpu->arch.guest_mmu);mmu_free_memory_caches (vcpu); } --2.23.0.rc1
Signature · 1 line
Vitaly
Quoted 18 lines · Vitaly Kuznetsov
arch/x86/kvm/mmu.c int kvm_mmu_create(struct kvm_vcpu *vcpu) · line 5657
Quoted 13 lines · Jiří Paleček
arch/x86/kvm/mmu.c +8
-1@@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) vcpu->arch.guest_mmu.prev_roots[i] =KVM_MMU_ROOT_INFO_INVALID ; vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa; -return alloc_mmu_pages (vcpu); + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.guest_mmu); +if (ret) +return ret; + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.root_mmu); +if (ret) + goto fail_allocate_root;(personal preference) here you're just jumping over 'return' so I'd prefer this to be written as:
Quoted 8 lines
ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu); if (!ret) return 0; free_mmu_pages(&vcpu->arch.guest_mmu); return ret;and no label/goto required.
Or alternatively:
ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu); if (ret) free_mmu_pages(&vcpu->arch.guest_mmu); return ret;
since error handling is usually *not* the fall through path.
Quoted 24 lines
Quoted 21 lines
arch/x86/kvm/mmu.c +7
-2+ +return ret; + fail_allocate_root: +free_mmu_pages (&vcpu->arch.guest_mmu); +return ret; } static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,@@ -6102,7 +6115,8 @@ unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)void kvm_mmu_destroy (struct kvm_vcpu *vcpu) {kvm_mmu_unload (vcpu); -free_mmu_pages (vcpu); +free_mmu_pages (&vcpu->arch.root_mmu); +free_mmu_pages (&vcpu->arch.guest_mmu);mmu_free_memory_caches (vcpu); } --2.23.0.rc1
Signature · 1 line
Vitaly
Hello
Quoted 10 lines · Vitaly Kuznetsov
Quoted 3 lines · Jiří Paleček
The reason for this is that when setting up nested KVM instance, arch.mmu is set to &arch.guest_mmu (while normally, it would be &arch.root_mmu).
MMU switch to
guest_mmuhappens when we're about to start L2 guest - and we switch back toroot_mmuwhen we want to execute L1 again (e.g. after vmexit) so this is not a one-time thing ('when setting up nested KVM instance' makes me think so).
OK I'll rephrase it.
Quoted 6 lines
Quoted 5 lines
However, the initialization and allocation of
pae_rootonly creates it inroot_mmu. KVM code (ie. inmmu_alloc_shadow_roots) then accessesarch.mmu->pae_root, which is the unallocatedarch.guest_mmu->pae_root.Fixes 14c07ad89f4d ("x86/kvm/mmu: introduce guest_mmu")
Thanks
Quoted 11 lines
Quoted 4 lines
This fix just allocates (and frees)
pae_rootin bothguest_mmuandroot_mmu(and alsolm_rootif it was allocated). The allocation is subject to previous restrictions ie. it won't allocate anything on 64-bit and AFAIK not on Intel.Right, it is only NPT 32 bit which uses that (and it's definitely undertested).
Quoted 1 line
See bug 203923 for details.
Personally, I'd prefer this to be full link
https://bugzilla.kernel.org/show_bug.cgi?id=203923
as there are multiple bugzillas out threre.
Will do
Quoted 4 lines
Quoted 2 lines
Signed-off-by Jiri Palecek <[email protected]>Tested-by Jiri Palecek <[email protected]>This is weird. I always thought "Signed-off-by" implies some form of testing (unless stated otherwise) :-)
Well, I thought it was quite common that someone authors a patch but doesn't have means to test it. Anyway, after reading Kernel Newbies, I added that to indicate that I did test it and if there's need to test anything reasonably sized on this particualr configuration, I'm open for it.
Quoted 26 lines
Quoted 13 lines
--- arch/x86/kvm/mmu.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)arch/x86/kvm/mmu.c +0
-0@@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) vcpu->arch.guest_mmu.prev_roots[i] =KVM_MMU_ROOT_INFO_INVALID ;arch/x86/kvm/mmu.c int kvm_mmu_create(struct kvm_vcpu *vcpu) · line 5657
Quoted 10 lines
arch/x86/kvm/mmu.c +8
-1vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa; -return alloc_mmu_pages (vcpu); + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.guest_mmu); +if (ret) +return ret; + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.root_mmu); +if (ret) + goto fail_allocate_root;(personal preference) here you're just jumping over 'return' so I'd prefer this to be written as:
Quoted 8 lines
ret = alloc_mmu_pages(vcpu, &vcpu->arch.root_mmu); if (!ret) return 0; free_mmu_pages(&vcpu->arch.guest_mmu); return ret;and no label/goto required.
OK I'll change it. However, I like the solution by Sean Christopherson more.
Regards
Jiri Palecek
Quoted 8 lines · Jiri Palecek
Quoted 4 lines
Quoted 2 lines
Signed-off-by Jiri Palecek <[email protected]>Tested-by Jiri Palecek <[email protected]>This is weird. I always thought "Signed-off-by" implies some form of testing (unless stated otherwise) :-)
Well, I thought it was quite common that someone authors a patch but doesn't have means to test it. Anyway, after reading Kernel Newbies, I added that to indicate that I did test it and if there's need to test anything reasonably sized on this particualr configuration, I'm open for it.
Not being able to test a patch isn't uncommon in the absolute sense, but it's certainly uncommon when viewed as a percentage of the total number of patches sent to LKML. A SoB is generally taken to imply basic functional testing unless otherwise stated, e.g. most folks add a note in the cover letter or patch comment when something has only been compile tested or not tested at all.
Quoted 99 lines · Jiří Paleček
On AMD processors, in PAE 32bit mode, nested KVM instances don't work. The L0 host get a kernel OOPS, which is related to
arch.mmu->pae_rootbeing NULL.The reason for this is that when setting up nested KVM instance, arch.mmu is set to &arch.guest_mmu (while normally, it would be &arch.root_mmu). However, the initialization and allocation of
pae_rootonly creates it inroot_mmu. KVM code (ie. inmmu_alloc_shadow_roots) then accessesarch.mmu->pae_root, which is the unallocatedarch.guest_mmu->pae_root.This fix just allocates (and frees)
pae_rootin bothguest_mmuandroot_mmu(and alsolm_rootif it was allocated). The allocation is subject to previous restrictions ie. it won't allocate anything on 64-bit and AFAIK not on Intel.See bug 203923 for details.
Signed-off-by Jiri Palecek <[email protected]>Tested-by Jiri Palecek <[email protected]>--- arch/x86/kvm/mmu.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-)arch/x86/kvm/mmu.c +22
-9@@ -5592,13 +5592,13 @@ slot_handle_leaf(struct kvm *kvm, struct kvm_memory_slot *memslot, PT_PAGE_TABLE_LEVEL, lock_flush_tlb); } -static void free_mmu_pages (struct kvm_vcpu *vcpu) +static void free_mmu_pages (struct kvm_mmu *mmu) { -free_page ((unsigned long )vcpu->arch.mmu->pae_root); -free_page ((unsigned long )vcpu->arch.mmu->lm_root); +free_page ((unsigned long )mmu->pae_root); +free_page ((unsigned long )mmu->lm_root); } -static int alloc_mmu_pages (struct kvm_vcpu *vcpu) +static int alloc_mmu_pages (struct kvm_vcpu *vcpu,struct kvm_mmu *mmu) {struct page *page;int i;@@ -5619,9 +5619,9 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)if (!page)return -ENOMEM ; - vcpu->arch.mmu->pae_root =page_address (page); + mmu->pae_root =page_address (page);for (i =0 ; i <4 ; ++i) - vcpu->arch.mmu->pae_root[i] =INVALID_PAGE ; + mmu->pae_root[i] =INVALID_PAGE ;return 0 ; }@@ -5629,6 +5629,7 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu)int kvm_mmu_create (struct kvm_vcpu *vcpu) {uint i; +int ret; vcpu->arch.mmu = &vcpu->arch.root_mmu; vcpu->arch.walk_mmu = &vcpu->arch.root_mmu;@@ -5646,7 +5647,19 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) vcpu->arch.guest_mmu.prev_roots[i] =KVM_MMU_ROOT_INFO_INVALID ; vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa; -return alloc_mmu_pages (vcpu); + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.guest_mmu); +if (ret) +return ret; + + ret =alloc_mmu_pages (vcpu, &vcpu->arch.root_mmu); +if (ret) + goto fail_allocate_root; + +return ret; + fail_allocate_root: +free_mmu_pages (&vcpu->arch.guest_mmu); +return ret; } static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,@@ -6102,7 +6115,8 @@ unsigned long kvm_mmu_calculate_default_mmu_pages(struct kvm *kvm)void kvm_mmu_destroy (struct kvm_vcpu *vcpu) {kvm_mmu_unload (vcpu); -free_mmu_pages (vcpu); +free_mmu_pages (&vcpu->arch.root_mmu); +free_mmu_pages (&vcpu->arch.guest_mmu);mmu_free_memory_caches (vcpu); } --
Quoted 2 lines
2.23.0.rc1
Queued, thanks. The goto usage is somewhat borderline, but not unheard of.
Paolo