SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/i386/kvm: Clean up error handling in kvm_arch_init()

Browse Source 
Currently, there're following incorrect error handling cases in
kvm_arch_init():
* Missed to handle failure of kvm_get_supported_feature_msrs().
* Missed to return when kvm_vm_enable_disable_exits() fails.
* MSR filter related cases called exit() directly instead of returning
  to kvm_init(). (The caller of kvm_arch_init() - kvm_init() - needs to
  know if kvm_arch_init() fails in order to perform cleanup).

Fix the above cases.

Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Zide Chen <zide.chen@intel.com>
Link: https://lore.kernel.org/r/20241106030728.553238-11-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Zhao Liu 2024-11-06 11:07:27 +08:00 committed by Paolo Bonzini
parent d7f895cb62
commit d2401a6eae
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/i386/kvm/kvm.c
View File

@ -3162,7 +3162,7 @@ static int kvm_vm_enable_userspace_msr(KVMState *s)
return 0; return 0;
} }
static void kvm_vm_enable_energy_msrs(KVMState *s) static int kvm_vm_enable_energy_msrs(KVMState *s)
{ {
int ret; int ret;
@ -3172,7 +3172,7 @@ static void kvm_vm_enable_energy_msrs(KVMState *s)
if (ret < 0) { if (ret < 0) {
error_report("Could not install MSR_RAPL_POWER_UNIT handler: %s", error_report("Could not install MSR_RAPL_POWER_UNIT handler: %s",
strerror(-ret)); strerror(-ret));
exit(1); return ret;
} }
ret = kvm_filter_msr(s, MSR_PKG_POWER_LIMIT, ret = kvm_filter_msr(s, MSR_PKG_POWER_LIMIT,
@ -3180,7 +3180,7 @@ static void kvm_vm_enable_energy_msrs(KVMState *s)
if (ret < 0) { if (ret < 0) {
error_report("Could not install MSR_PKG_POWER_LIMIT handler: %s", error_report("Could not install MSR_PKG_POWER_LIMIT handler: %s",
strerror(-ret)); strerror(-ret));
exit(1); return ret;
} }
ret = kvm_filter_msr(s, MSR_PKG_POWER_INFO, ret = kvm_filter_msr(s, MSR_PKG_POWER_INFO,
@ -3188,17 +3188,17 @@ static void kvm_vm_enable_energy_msrs(KVMState *s)
if (ret < 0) { if (ret < 0) {
error_report("Could not install MSR_PKG_POWER_INFO handler: %s", error_report("Could not install MSR_PKG_POWER_INFO handler: %s",
strerror(-ret)); strerror(-ret));
exit(1); return ret;
} }
ret = kvm_filter_msr(s, MSR_PKG_ENERGY_STATUS, ret = kvm_filter_msr(s, MSR_PKG_ENERGY_STATUS,
kvm_rdmsr_pkg_energy_status, NULL); kvm_rdmsr_pkg_energy_status, NULL);
if (ret < 0) { if (ret < 0) {
error_report("Could not install MSR_PKG_ENERGY_STATUS handler: %s", error_report("Could not install MSR_PKG_ENERGY_STATUS handler: %s",
strerror(-ret)); strerror(-ret));
exit(1); return ret;
} }
} }
return; return 0;
} }
int kvm_arch_init(MachineState *ms, KVMState *s) int kvm_arch_init(MachineState *ms, KVMState *s)
@ -3265,7 +3265,10 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
return ret; return ret;
} }
kvm_get_supported_feature_msrs(s); ret = kvm_get_supported_feature_msrs(s);
if (ret < 0) {
return ret;
}
uname(&utsname); uname(&utsname);
lm_capable_kernel = strcmp(utsname.machine, "x86_64") == 0; lm_capable_kernel = strcmp(utsname.machine, "x86_64") == 0;
@ -3301,6 +3304,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
if (ret < 0) { if (ret < 0) {
error_report("kvm: guest stopping CPU not supported: %s", error_report("kvm: guest stopping CPU not supported: %s",
strerror(-ret)); strerror(-ret));
return ret;
} }
} }
@ -3332,12 +3336,15 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
} }
if (s->msr_energy.enable == true) { if (s->msr_energy.enable == true) {
kvm_vm_enable_energy_msrs(s); ret = kvm_vm_enable_energy_msrs(s);
if (ret < 0) {
return ret;
}
ret = kvm_msr_energy_thread_init(s, ms); ret = kvm_msr_energy_thread_init(s, ms);
if (ret < 0) { if (ret < 0) {
error_report("kvm : error RAPL feature requirement not met"); error_report("kvm : error RAPL feature requirement not met");
exit(1); return ret;
} }
} }
} }