From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buggr-0007y7-0f for qemu-devel@nongnu.org; Thu, 13 Oct 2016 10:08:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buggj-0005Tx-Mj for qemu-devel@nongnu.org; Thu, 13 Oct 2016 10:08:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buggj-0005Tr-HS for qemu-devel@nongnu.org; Thu, 13 Oct 2016 10:08:49 -0400 Date: Thu, 13 Oct 2016 16:08:44 +0200 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Message-ID: <20161013140844.GC15008@potion> References: <1476352367-69400-1-git-send-email-imammedo@redhat.com> <1476352367-69400-10-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1476352367-69400-10-git-send-email-imammedo@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 09/13] pc: kvm_apic: pass APIC ID depending on xAPIC/x2APIC mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: qemu-devel@nongnu.org, ehabkost@redhat.com, liuxiaojian6@huawei.com, mst@redhat.com, peterx@redhat.com, kevin@koconnor.net, kraxel@redhat.com, pbonzini@redhat.com, lersek@redhat.com, chao.gao@intel.com 2016-10-13 11:52+0200, Igor Mammedov: > Signed-off-by: Igor Mammedov > --- > v4: > - drop kvm_has_x2apic_api() and reuse kvm_enable_x2apic() instead > --- Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > hw/i386/kvm/apic.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c > index be55102..9a7dd03 100644 > --- a/hw/i386/kvm/apic.c > +++ b/hw/i386/kvm/apic.c > @@ -34,7 +34,11 @@ static void kvm_put_apic_state(APICCommonState *s, s= truct kvm_lapic_state *kapic > int i; > =20 > memset(kapic, 0, sizeof(*kapic)); > - kvm_apic_set_reg(kapic, 0x2, s->id << 24); > + if (kvm_enable_x2apic() && s->apicbase & MSR_IA32_APICBASE_EXTD) { This will enable x2apic broadcast quirk even if a machine has no way of using the standard x2APIC mode, so we'd change behavior if an OS configured a device for broadcast. I think Linux is the only user of the paravirtual x2APIC mode and it doesn't configure devices for broadcast, so I think we're safe with it. Thinking back, I could have just given it a non-controllable capability in KVM ... > + kvm_apic_set_reg(kapic, 0x2, s->initial_apic_id); > + } else { > + kvm_apic_set_reg(kapic, 0x2, s->id << 24); > + } > kvm_apic_set_reg(kapic, 0x8, s->tpr); > kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24); > kvm_apic_set_reg(kapic, 0xe, s->dest_mode << 28 | 0x0fffffff); > @@ -59,7 +63,11 @@ void kvm_get_apic_state(DeviceState *dev, struct kvm= _lapic_state *kapic) > APICCommonState *s =3D APIC_COMMON(dev); > int i, v; > =20 > - s->id =3D kvm_apic_get_reg(kapic, 0x2) >> 24; > + if (kvm_enable_x2apic() && s->apicbase & MSR_IA32_APICBASE_EXTD) { > + assert(kvm_apic_get_reg(kapic, 0x2) =3D=3D s->initial_apic_id)= ; > + } else { > + s->id =3D kvm_apic_get_reg(kapic, 0x2) >> 24; > + } > s->tpr =3D kvm_apic_get_reg(kapic, 0x8); > s->arb_id =3D kvm_apic_get_reg(kapic, 0x9); > s->log_dest =3D kvm_apic_get_reg(kapic, 0xd) >> 24; > --=20 > 2.7.4 >=20 >=20