Re: [PATCH 3/3] KVM: x86: introduce complete_emulated_msr callback

[Paolo Bonzini]

On 14/12/20 21:55, Tom Lendacky wrote:
> On 12/14/20 12:32 PM, Paolo Bonzini wrote:
> > This will be used by SEV-ES to inject MSR failure via the GHCB.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
>
> Reviewed-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
>
> (Changed Sean's email on this reply, but missed the others...)

Thanks for the review, I pushed to kvm/queue now.

Paolo

> > ---
> >   arch/x86/include/asm/kvm_host.h | 1 +
> >   arch/x86/kvm/svm/svm.c          | 1 +
> >   arch/x86/kvm/vmx/vmx.c          | 1 +
> >   arch/x86/kvm/x86.c              | 8 ++++----
> >   4 files changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> > index 8cf6b0493d49..18aa15e6fadd 100644
> > --- a/arch/x86/include/asm/kvm_host.h
> > +++ b/arch/x86/include/asm/kvm_host.h
> > @@ -1285,6 +1285,7 @@ struct kvm_x86_ops {
> >   
> >   	void (*migrate_timers)(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 {
> > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> > index 801e0a641258..4067d511be08 100644
> > --- a/arch/x86/kvm/svm/svm.c
> > +++ b/arch/x86/kvm/svm/svm.c
> > @@ -4306,6 +4306,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
> >   	.apic_init_signal_blocked = svm_apic_init_signal_blocked,
> >   
> >   	.msr_filter_changed = svm_msr_filter_changed,
> > +	.complete_emulated_msr = kvm_complete_insn_gp,
> >   };
> >   
> >   static struct kvm_x86_init_ops svm_init_ops __initdata = {
> > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> > index 849be2a9f260..55fa51c0cd9d 100644
> > --- a/arch/x86/kvm/vmx/vmx.c
> > +++ b/arch/x86/kvm/vmx/vmx.c
> > @@ -7701,6 +7701,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {
> >   	.migrate_timers = vmx_migrate_timers,
> >   
> >   	.msr_filter_changed = vmx_msr_filter_changed,
> > +	.complete_emulated_msr = kvm_complete_insn_gp,
> >   	.cpu_dirty_log_size = vmx_cpu_dirty_log_size,
> >   };
> >   
> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > index 2f1bc52e70c0..6c4482b97c91 100644
> > --- a/arch/x86/kvm/x86.c
> > +++ b/arch/x86/kvm/x86.c
> > @@ -1642,12 +1642,12 @@ static int complete_emulated_rdmsr(struct kvm_vcpu *vcpu)
> >   		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)
> >   {
> > -	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)
> > @@ -1720,7 +1720,7 @@ int kvm_emulate_rdmsr(struct kvm_vcpu *vcpu)
> >   		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);
> >   
> > @@ -1747,7 +1747,7 @@ int kvm_emulate_wrmsr(struct kvm_vcpu *vcpu)
> >   	else
> >   		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);
> >