github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 22:18:17 +00:00
Code Issues Projects Releases Wiki Activity

hv: vmcall_vmexit_handler should always return success

Browse Source 
Hypervisor shouldn't deal with errno return by hypercall.
The SOS should do this. Here just return the errno to SOS.

Signed-off-by: Li, Fei1 <fei1.li@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
Li, Fei1 2018-05-29 11:55:07 +08:00 committed by lijinxia
parent c2ee561c02
commit da662fae62
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/guest/vmcall.c
View File

@ -31,9 +31,14 @@
#include <hypervisor.h> #include <hypervisor.h>
#include <hypercall.h> #include <hypercall.h>
/*
* Pass return value to SOS by register rax.
* This function should always return 0 since we shouldn't
* deal with hypercall error in hypervisor.
*/
int vmcall_vmexit_handler(struct vcpu *vcpu) int vmcall_vmexit_handler(struct vcpu *vcpu)
{ {
int64_t ret = 0; int64_t ret = -EACCES;
struct vm *vm = vcpu->vm; struct vm *vm = vcpu->vm;
struct run_context *cur_context = struct run_context *cur_context =
&vcpu->arch_vcpu.contexts[vcpu->arch_vcpu.cur_context]; &vcpu->arch_vcpu.contexts[vcpu->arch_vcpu.cur_context];
@ -50,13 +55,13 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
if (!is_hypercall_from_ring0()) { if (!is_hypercall_from_ring0()) {
pr_err("hypercall is only allowed from RING-0!\n"); pr_err("hypercall is only allowed from RING-0!\n");
return -1; goto out;
} }
if (!is_vm0(vm) && hypcall_id != HC_WORLD_SWITCH && if (!is_vm0(vm) && hypcall_id != HC_WORLD_SWITCH &&
hypcall_id != HC_INITIALIZE_TRUSTY) { hypcall_id != HC_INITIALIZE_TRUSTY) {
pr_err("hypercall %d is only allowed from VM0!\n", hypcall_id); pr_err("hypercall %d is only allowed from VM0!\n", hypcall_id);
return -1; goto out;
} }
/* Dispatch the hypercall handler */ /* Dispatch the hypercall handler */
@ -163,10 +168,11 @@ int vmcall_vmexit_handler(struct vcpu *vcpu)
default: default:
pr_err("op %d: Invalid hypercall\n", hypcall_id); pr_err("op %d: Invalid hypercall\n", hypcall_id);
ret = -1; ret = -EPERM;
break; break;
} }
out:
cur_context->guest_cpu_regs.regs.rax = ret; cur_context->guest_cpu_regs.regs.rax = ret;
TRACE_2L(TRC_VMEXIT_VMCALL, vm->attr.id, hypcall_id); TRACE_2L(TRC_VMEXIT_VMCALL, vm->attr.id, hypcall_id);