Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-04 04:04:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KVM: x86: introduce complete_emulated_msr callback

Browse Source 
This will be used by SEV-ES to inject MSR failure via the GHCB.

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-12-14 10:26:51 -05:00
parent 8b474427cb
commit f9a4d62176
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/kvm_host.h
View File

@ -1285,6 +1285,7 @@ struct kvm_x86_ops {
void (*migrate_timers)(struct kvm_vcpu *vcpu); void (*migrate_timers)(struct kvm_vcpu *vcpu);
void (*msr_filter_changed)(struct kvm_vcpu *vcpu); void (*msr_filter_changed)(struct kvm_vcpu *vcpu);
int (*complete_emulated_msr)(struct kvm_vcpu *vcpu, int err);
}; };
struct kvm_x86_nested_ops { struct kvm_x86_nested_ops {

1
arch/x86/kvm/svm/svm.c
View File

@ -4306,6 +4306,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
.apic_init_signal_blocked = svm_apic_init_signal_blocked, .apic_init_signal_blocked = svm_apic_init_signal_blocked,
.msr_filter_changed = svm_msr_filter_changed, .msr_filter_changed = svm_msr_filter_changed,
.complete_emulated_msr = kvm_complete_insn_gp,
}; };
static struct kvm_x86_init_ops svm_init_ops __initdata = { static struct kvm_x86_init_ops svm_init_ops __initdata = {

1
arch/x86/kvm/vmx/vmx.c
View File

@ -7701,6 +7701,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
.migrate_timers = vmx_migrate_timers, .migrate_timers = vmx_migrate_timers,
.msr_filter_changed = vmx_msr_filter_changed, .msr_filter_changed = vmx_msr_filter_changed,
.complete_emulated_msr = kvm_complete_insn_gp,
.cpu_dirty_log_size = vmx_cpu_dirty_log_size, .cpu_dirty_log_size = vmx_cpu_dirty_log_size,
}; };

8
arch/x86/kvm/x86.c
View File

@ -1642,12 +1642,12 @@ static int complete_emulated_rdmsr(struct kvm_vcpu *vcpu)
kvm_rdx_write(vcpu, vcpu->run->msr.data >> 32); kvm_rdx_write(vcpu, vcpu->run->msr.data >> 32);
} }
return kvm_complete_insn_gp(vcpu, err); return kvm_x86_ops.complete_emulated_msr(vcpu, err);
} }
static int complete_emulated_wrmsr(struct kvm_vcpu *vcpu) static int complete_emulated_wrmsr(struct kvm_vcpu *vcpu)
{ {
return kvm_complete_insn_gp(vcpu, vcpu->run->msr.error); return kvm_x86_ops.complete_emulated_msr(vcpu, vcpu->run->msr.error);
} }
static u64 kvm_msr_reason(int r) static u64 kvm_msr_reason(int r)
@ -1719,7 +1719,7 @@ int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu)
trace_kvm_msr_read_ex(ecx); trace_kvm_msr_read_ex(ecx);
} }
return kvm_complete_insn_gp(vcpu, r); return kvm_x86_ops.complete_emulated_msr(vcpu, r);
} }
EXPORT_SYMBOL_GPL(kvm_emulate_rdmsr); EXPORT_SYMBOL_GPL(kvm_emulate_rdmsr);
@ -1745,7 +1745,7 @@ int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu)
else else
trace_kvm_msr_write_ex(ecx, data); trace_kvm_msr_write_ex(ecx, data);
return kvm_complete_insn_gp(vcpu, r); return kvm_x86_ops.complete_emulated_msr(vcpu, r);
} }
EXPORT_SYMBOL_GPL(kvm_emulate_wrmsr); EXPORT_SYMBOL_GPL(kvm_emulate_wrmsr);