From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [PATCHv4 3/5] kvm: host side for eoi optimization
Date: Thu, 17 May 2012 10:49:47 +0300
Message-ID: <20120517074946.GA27995@redhat.com>
References: <20120516154940.GA20549@amt.cnet>
 <20120516162247.GA10676@redhat.com>
 <20120516172058.GA22861@amt.cnet>
 <20120516175856.GD10769@redhat.com>
 <20120516181500.GA23791@amt.cnet>
 <20120516182520.GH28798@redhat.com>
 <20120516182948.GF10769@redhat.com>
 <20120516183822.GI28798@redhat.com>
 <20120516190757.GA12113@redhat.com>
 <20120517072841.GW32036@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Marcelo Tosatti <mtosatti@redhat.com>, x86@kernel.org,
	kvm@vger.kernel.org, Ingo Molnar <mingo@redhat.com>,
	"H. Peter Anvin" <hpa@zytor.com>, Avi Kivity <avi@redhat.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-kernel@vger.kernel.org
To: Gleb Natapov <gleb@redhat.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <20120517072841.GW32036@redhat.com>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Thu, May 17, 2012 at 10:28:41AM +0300, Gleb Natapov wrote:
> On Wed, May 16, 2012 at 10:07:58PM +0300, Michael S. Tsirkin wrote:
> > > This code is reached from kvm_cpu_get_interrupt(), but this function will
> > > not be called in above scenario.
> > 
> > I think I see. So this shall fix it also makes code cleaner
> > (no -2 hack). Right? kvm_apic_has_interrupt is called correct?
> > 
> > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> > index b4f7013..5a38e34 100644
> > --- a/arch/x86/kvm/lapic.c
> > +++ b/arch/x86/kvm/lapic.c
> > @@ -1273,8 +1273,12 @@ int kvm_apic_has_interrupt(struct kvm_vcpu *vcpu)
> >  	highest_irr = apic_find_highest_irr(apic);
> >  	if (highest_irr == -1)
> >  		return -1;
> > -	if (((highest_irr & 0xF0) <= apic_get_reg(apic, APIC_PROCPRI)))
> > -		return -2;
> > +	/* Detect interrupt nesting and disable EOI optimization */
> > +	if ((highest_irr & 0xF0) <= apic_get_reg(apic, APIC_PROCPRI)) {
> > +		if (pv_eoi_enabled(vcpu))
> > +			pv_eoi_clr_pending(vcpu);
> > +		return -1;
> > +	}
> >  	return highest_irr;
> >  }
> >  
> I do not like it. kvm_apic_has_interrupt() does not suppose to mutate
> state.

OK, so let's rename it so it's clear it can mutate state?

> > @@ -1306,10 +1310,6 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu)
> >  	int vector = kvm_apic_has_interrupt(vcpu);
> >  	struct kvm_lapic *apic = vcpu->arch.apic;
> >  
> > -	/* Detect interrupt nesting and disable EOI optimization */
> > -	if (pv_eoi_enabled(vcpu) && vector == -2)
> > -		pv_eoi_clr_pending(vcpu);
> > -
> >  	if (vector < 0)
> >  		return -1;
> >  
> 
> --
> 			Gleb.