From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758881AbbA2Vvs (ORCPT ); Thu, 29 Jan 2015 16:51:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50473 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758548AbbA2Vth (ORCPT ); Thu, 29 Jan 2015 16:49:37 -0500 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, Paolo Bonzini , Nadav Amit , Gleb Natapov Subject: [PATCH 4/8] KVM: x86: fix x2apic logical address matching Date: Thu, 29 Jan 2015 22:48:51 +0100 Message-Id: <1422568135-28402-5-git-send-email-rkrcmar@redhat.com> In-Reply-To: <1422568135-28402-1-git-send-email-rkrcmar@redhat.com> References: <1422568135-28402-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We cannot hit the bug now, but future patches will expose this path. Signed-off-by: Radim Krčmář --- arch/x86/kvm/lapic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 0ee743c6b4f1..aae043f38548 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -602,7 +602,8 @@ static bool kvm_apic_match_logical_addr(struct kvm_lapic *apic, u32 mda) logical_id = kvm_apic_get_reg(apic, APIC_LDR); if (apic_x2apic_mode(apic)) - return logical_id & mda; + return ((logical_id >> 16) == (mda >> 16)) + && (logical_id & mda & 0xffff); logical_id = GET_APIC_LOGICAL_ID(logical_id); -- 2.2.2