* [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run()
@ 2020-09-09 2:55 Wanpeng Li
2020-09-09 8:35 ` Vitaly Kuznetsov
0 siblings, 1 reply; 5+ messages in thread
From: Wanpeng Li @ 2020-09-09 2:55 UTC (permalink / raw)
To: linux-kernel, kvm
Cc: Paolo Bonzini, Sean Christopherson, Vitaly Kuznetsov, Wanpeng Li,
Jim Mattson, Joerg Roedel, Paul K .
From: Wanpeng Li <wanpengli@tencent.com>
Moving svm_complete_interrupts() into svm_vcpu_run() which can align VMX
and SVM with respect to completing interrupts.
Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Paul K. <kronenpj@kronenpj.dyndns.org>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
---
arch/x86/kvm/svm/svm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index c61bc3b..74bcf0a 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -2938,8 +2938,6 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
if (npt_enabled)
vcpu->arch.cr3 = svm->vmcb->save.cr3;
- svm_complete_interrupts(svm);
-
if (is_guest_mode(vcpu)) {
int vmexit;
@@ -3530,6 +3528,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
SVM_EXIT_EXCP_BASE + MC_VECTOR))
svm_handle_mce(svm);
+ svm_complete_interrupts(svm);
+
vmcb_mark_all_clean(svm->vmcb);
return exit_fastpath;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run()
2020-09-09 2:55 [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run() Wanpeng Li
@ 2020-09-09 8:35 ` Vitaly Kuznetsov
2020-09-09 8:47 ` Wanpeng Li
0 siblings, 1 reply; 5+ messages in thread
From: Vitaly Kuznetsov @ 2020-09-09 8:35 UTC (permalink / raw)
To: Wanpeng Li, linux-kernel, kvm
Cc: Paolo Bonzini, Sean Christopherson, Wanpeng Li, Jim Mattson,
Joerg Roedel, Paul K .
Wanpeng Li <kernellwp@gmail.com> writes:
> From: Wanpeng Li <wanpengli@tencent.com>
>
> Moving svm_complete_interrupts() into svm_vcpu_run() which can align VMX
> and SVM with respect to completing interrupts.
>
> Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
> Cc: Paul K. <kronenpj@kronenpj.dyndns.org>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
> arch/x86/kvm/svm/svm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> index c61bc3b..74bcf0a 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -2938,8 +2938,6 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
> if (npt_enabled)
> vcpu->arch.cr3 = svm->vmcb->save.cr3;
>
> - svm_complete_interrupts(svm);
> -
> if (is_guest_mode(vcpu)) {
> int vmexit;
>
> @@ -3530,6 +3528,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
> SVM_EXIT_EXCP_BASE + MC_VECTOR))
> svm_handle_mce(svm);
>
> + svm_complete_interrupts(svm);
> +
> vmcb_mark_all_clean(svm->vmcb);
> return exit_fastpath;
> }
This seems to be the right thing to do, however, the amount of code
between kvm_x86_ops.run() and kvm_x86_ops.handle_exit() is non-trivial,
hope it won't blow up in testing...
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
One more thing:
VMX version does
vmx_complete_interrupts(vmx);
if (is_guest_mode(vcpu))
return EXIT_FASTPATH_NONE;
and on SVM we analyze is_guest_mode() inside
svm_exit_handlers_fastpath() - should we also change that for
conformity?
--
Vitaly
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run()
2020-09-09 8:35 ` Vitaly Kuznetsov
@ 2020-09-09 8:47 ` Wanpeng Li
2020-09-12 6:20 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Wanpeng Li @ 2020-09-09 8:47 UTC (permalink / raw)
To: Vitaly Kuznetsov
Cc: LKML, kvm, Paolo Bonzini, Sean Christopherson, Wanpeng Li,
Jim Mattson, Joerg Roedel, Paul K .
On Wed, 9 Sep 2020 at 16:36, Vitaly Kuznetsov <vkuznets@redhat.com> wrote:
>
> Wanpeng Li <kernellwp@gmail.com> writes:
>
> > From: Wanpeng Li <wanpengli@tencent.com>
> >
> > Moving svm_complete_interrupts() into svm_vcpu_run() which can align VMX
> > and SVM with respect to completing interrupts.
> >
> > Suggested-by: Sean Christopherson <sean.j.christopherson@intel.com>
> > Cc: Paul K. <kronenpj@kronenpj.dyndns.org>
> > Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> > ---
> > arch/x86/kvm/svm/svm.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
> > index c61bc3b..74bcf0a 100644
> > --- a/arch/x86/kvm/svm/svm.c
> > +++ b/arch/x86/kvm/svm/svm.c
> > @@ -2938,8 +2938,6 @@ static int handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath)
> > if (npt_enabled)
> > vcpu->arch.cr3 = svm->vmcb->save.cr3;
> >
> > - svm_complete_interrupts(svm);
> > -
> > if (is_guest_mode(vcpu)) {
> > int vmexit;
> >
> > @@ -3530,6 +3528,8 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
> > SVM_EXIT_EXCP_BASE + MC_VECTOR))
> > svm_handle_mce(svm);
> >
> > + svm_complete_interrupts(svm);
> > +
> > vmcb_mark_all_clean(svm->vmcb);
> > return exit_fastpath;
> > }
>
> This seems to be the right thing to do, however, the amount of code
> between kvm_x86_ops.run() and kvm_x86_ops.handle_exit() is non-trivial,
> hope it won't blow up in testing...
>
> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> One more thing:
>
> VMX version does
>
> vmx_complete_interrupts(vmx);
> if (is_guest_mode(vcpu))
> return EXIT_FASTPATH_NONE;
>
> and on SVM we analyze is_guest_mode() inside
> svm_exit_handlers_fastpath() - should we also change that for
> conformity?
Agreed, will do in v2.
Wanpeng
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run()
2020-09-09 8:47 ` Wanpeng Li
@ 2020-09-12 6:20 ` Paolo Bonzini
2020-09-14 6:56 ` Wanpeng Li
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2020-09-12 6:20 UTC (permalink / raw)
To: Wanpeng Li, Vitaly Kuznetsov
Cc: LKML, kvm, Sean Christopherson, Wanpeng Li, Jim Mattson,
Joerg Roedel, Paul K .
On 09/09/20 10:47, Wanpeng Li wrote:
>> One more thing:
>>
>> VMX version does
>>
>> vmx_complete_interrupts(vmx);
>> if (is_guest_mode(vcpu))
>> return EXIT_FASTPATH_NONE;
>>
>> and on SVM we analyze is_guest_mode() inside
>> svm_exit_handlers_fastpath() - should we also change that for
>> conformity?
>
> Agreed, will do in v2.
Please just send an incremental patch. Thanks!
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run()
2020-09-12 6:20 ` Paolo Bonzini
@ 2020-09-14 6:56 ` Wanpeng Li
0 siblings, 0 replies; 5+ messages in thread
From: Wanpeng Li @ 2020-09-14 6:56 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Vitaly Kuznetsov, LKML, kvm, Sean Christopherson, Wanpeng Li,
Jim Mattson, Joerg Roedel, Paul K .
On Sat, 12 Sep 2020 at 14:20, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 09/09/20 10:47, Wanpeng Li wrote:
> >> One more thing:
> >>
> >> VMX version does
> >>
> >> vmx_complete_interrupts(vmx);
> >> if (is_guest_mode(vcpu))
> >> return EXIT_FASTPATH_NONE;
> >>
> >> and on SVM we analyze is_guest_mode() inside
> >> svm_exit_handlers_fastpath() - should we also change that for
> >> conformity?
> >
> > Agreed, will do in v2.
>
> Please just send an incremental patch. Thanks!
Just sent out a patch to do it. :)
Wanpeng
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-09-14 6:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-09 2:55 [PATCH 2/3] KVM: SVM: Move svm_complete_interrupts() into svm_vcpu_run() Wanpeng Li
2020-09-09 8:35 ` Vitaly Kuznetsov
2020-09-09 8:47 ` Wanpeng Li
2020-09-12 6:20 ` Paolo Bonzini
2020-09-14 6:56 ` Wanpeng Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).