KVM: fix error paths for failed gfn_to_page() calls (4484141a) · Commits · 戴 / test

This bug was triggered: [ 4220.198458] BUG: unable to handle kernel paging request at fffffffffffffffe [ 4220.203907] IP: [<ffffffff81104d85>] put_page+0xf/0x34 ...... [ 4220.237326] Call Trace: [ 4220.237361] [<ffffffffa03830d0>] kvm_arch_destroy_vm+0xf9/0x101 [kvm] [ 4220.237382] [<ffffffffa036fe53>] kvm_put_kvm+0xcc/0x127 [kvm] [ 4220.237401] [<ffffffffa03702bc>] kvm_vcpu_release+0x18/0x1c [kvm] [ 4220.237407] [<ffffffff81145425>] __fput+0x111/0x1ed [ 4220.237411] [<ffffffff8114550f>] ____fput+0xe/0x10 [ 4220.237418] [<ffffffff81063511>] task_work_run+0x5d/0x88 [ 4220.237424] [<ffffffff8104c3f7>] do_exit+0x2bf/0x7ca The test case: printf(fmt, ##args); \ exit(-1);} while (0) static int create_vm(void) { int sys_fd, vm_fd; sys_fd = open("/dev/kvm", O_RDWR); if (sys_fd < 0) die("open /dev/kvm fail.\n"); vm_fd = ioctl(sys_fd, KVM_CREATE_VM, 0); if (vm_fd < 0) die("KVM_CREATE_VM fail.\n"); return vm_fd; } static int create_vcpu(int vm_fd) { int vcpu_fd; vcpu_fd = ioctl(vm_fd, KVM_CREATE_VCPU, 0); if (vcpu_fd < 0) die("KVM_CREATE_VCPU ioctl.\n"); printf("Create vcpu.\n"); return vcpu_fd; } static void *vcpu_thread(void *arg) { int vm_fd = (int)(long)arg; create_vcpu(vm_fd); return NULL; } int main(int argc, char *argv[]) { pthread_t thread; int vm_fd; (void)argc; (void)argv; vm_fd = create_vm(); pthread_create(&thread, NULL, vcpu_thread, (void *)(long)vm_fd); printf("Exit.\n"); return 0; } It caused by release kvm->arch.ept_identity_map_addr which is the error page. The parent thread can send KILL signal to the vcpu thread when it was exiting which stops faulting pages and potentially allocating memory. So gfn_to_pfn/gfn_to_page may fail at this time Fixed by checking the page before it is used Signed-off-by:

Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> Signed-off-by:

Avi Kivity <avi@redhat.com>

arch/x86/kvm/vmx.c

+16 −3

Original line number	Diff line number	Diff line
		@@ -3619,6 +3619,7 @@ static void seg_setup(int seg)

		static int alloc_apic_access_page(struct kvm *kvm)
		{
		struct page *page;
		struct kvm_userspace_memory_region kvm_userspace_mem;
		int r = 0;

		@@ -3633,7 +3634,13 @@ static int alloc_apic_access_page(struct kvm *kvm)
		if (r)
		goto out;

		kvm->arch.apic_access_page = gfn_to_page(kvm, 0xfee00);
		page = gfn_to_page(kvm, 0xfee00);
		if (is_error_page(page)) {
		r = -EFAULT;
		goto out;
		}

		kvm->arch.apic_access_page = page;
		out:
		mutex_unlock(&kvm->slots_lock);
		return r;
		@@ -3641,6 +3648,7 @@ out:

		static int alloc_identity_pagetable(struct kvm *kvm)
		{
		struct page *page;
		struct kvm_userspace_memory_region kvm_userspace_mem;
		int r = 0;

		@@ -3656,8 +3664,13 @@ static int alloc_identity_pagetable(struct kvm *kvm)
		if (r)
		goto out;

		kvm->arch.ept_identity_pagetable = gfn_to_page(kvm,
		kvm->arch.ept_identity_map_addr >> PAGE_SHIFT);
		page = gfn_to_page(kvm, kvm->arch.ept_identity_map_addr >> PAGE_SHIFT);
		if (is_error_page(page)) {
		r = -EFAULT;
		goto out;
		}

		kvm->arch.ept_identity_pagetable = page;
		out:
		mutex_unlock(&kvm->slots_lock);
		return r;

arch/x86/kvm/x86.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -5113,17 +5113,20 @@ static void post_kvm_run_save(struct kvm_vcpu *vcpu)
		!kvm_event_needs_reinjection(vcpu);
		}

		static void vapic_enter(struct kvm_vcpu *vcpu)
		static int vapic_enter(struct kvm_vcpu *vcpu)
		{
		struct kvm_lapic *apic = vcpu->arch.apic;
		struct page *page;

		if (!apic \|\| !apic->vapic_addr)
		return;
		return 0;

		page = gfn_to_page(vcpu->kvm, apic->vapic_addr >> PAGE_SHIFT);
		if (is_error_page(page))
		return -EFAULT;

		vcpu->arch.apic->vapic_page = page;
		return 0;
		}

		static void vapic_exit(struct kvm_vcpu *vcpu)
		@@ -5430,7 +5433,11 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
		}

		vcpu->srcu_idx = srcu_read_lock(&kvm->srcu);
		vapic_enter(vcpu);
		r = vapic_enter(vcpu);
		if (r) {
		srcu_read_unlock(&kvm->srcu, vcpu->srcu_idx);
		return r;
		}

		r = 1;
		while (r > 0) {

Admin message