Re: [RFC PATCH v2 7/7] KVM: KVM: don't break vcpu 'halt' state due to apfs

[Marcelo Tosatti <mtosatti@redhat.com>]

On Wed, Nov 03, 2010 at 11:45:08AM +0200, Gleb Natapov wrote:
> On Wed, Nov 03, 2010 at 05:47:53PM +0800, Xiao Guangrong wrote:
> > On 11/01/2010 08:55 PM, Gleb Natapov wrote:
> > 
> > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > > index 2cfdf2d..f7aed95 100644
> > > --- a/arch/x86/kvm/x86.c
> > > +++ b/arch/x86/kvm/x86.c
> > > @@ -5295,8 +5295,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
> > >  			{
> > >  				switch(vcpu->arch.mp_state) {
> > >  				case KVM_MP_STATE_HALTED:
> > > -					vcpu->arch.mp_state =
> > > -						KVM_MP_STATE_RUNNABLE;
> > > +					if (list_empty_careful(&vcpu->async_pf.done))
> > > +						vcpu->arch.mp_state =
> > > +							KVM_MP_STATE_RUNNABLE;
> > >  				case KVM_MP_STATE_RUNNABLE:
> > >  					vcpu->arch.apf.halted = false;
> > >  					break;
> > > @@ -6279,6 +6280,7 @@ void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,
> > >  		vcpu->arch.fault.error_code = 0;
> > >  		vcpu->arch.fault.address = work->arch.token;
> > >  		kvm_inject_page_fault(vcpu);
> > > +		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
> > >  	}
> > >  }
> > >  
> > 
> > Tested with full virtualization guests, it works well for me. Thanks!
> Thank you. Will repost properly.

There is no need to optimize this. Current code is simpler, less
error-prone. Applied 1-6, thanks.