From: "Radim Krčmář" <rkrcmar@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Nadav Amit <namit@cs.technion.ac.il>,
Gleb Natapov <gleb@kernel.org>
Subject: [PATCH 4/8] KVM: x86: fix x2apic logical address matching
Date: Thu, 29 Jan 2015 22:48:51 +0100 [thread overview]
Message-ID: <1422568135-28402-5-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <1422568135-28402-1-git-send-email-rkrcmar@redhat.com>
We cannot hit the bug now, but future patches will expose this path.
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
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
next prev parent reply other threads:[~2015-01-29 21:51 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-29 21:48 [PATCH 0/8] KVM: minor APIC fixes and cleanups Radim Krčmář
2015-01-29 21:48 ` [PATCH 1/8] KVM: x86: return bool from kvm_apic_match*() Radim Krčmář
2015-01-29 22:10 ` Joe Perches
2015-01-30 8:50 ` Paolo Bonzini
2015-01-29 21:48 ` [PATCH 2/8] KVM: x86: cleanup kvm_apic_match_*() Radim Krčmář
2015-01-30 8:52 ` Paolo Bonzini
2015-01-30 13:06 ` Radim Krčmář
2015-02-02 14:26 ` Radim Krčmář
2015-02-02 14:28 ` Paolo Bonzini
2015-02-02 14:30 ` Radim Krčmář
2015-02-02 14:29 ` Radim Krčmář
2015-01-29 21:48 ` [PATCH 3/8] KVM: x86: replace 0 with APIC_DEST_PHYSICAL Radim Krčmář
2015-01-29 21:48 ` Radim Krčmář [this message]
2015-01-29 21:48 ` [PATCH 5/8] KVM: x86: use MDA for interrupt matching Radim Krčmář
2015-01-30 9:03 ` Paolo Bonzini
2015-01-30 13:09 ` Radim Krčmář
2015-01-29 21:48 ` [PATCH 6/8] KVM: x86: allow mixed APIC mode broadcast Radim Krčmář
2015-01-29 21:48 ` [PATCH 7/8] KVM: x86: avoid logical_map when it is invalid Radim Krčmář
2015-01-30 9:19 ` Paolo Bonzini
2015-01-30 14:21 ` Radim Krčmář
2015-01-30 14:21 ` Paolo Bonzini
2015-01-30 9:38 ` Paolo Bonzini
2015-01-30 14:56 ` Radim Krčmář
2015-01-30 15:10 ` Paolo Bonzini
2015-01-30 17:09 ` Radim Krčmář
2015-01-29 21:48 ` [PATCH 8/8] KVM: x86: simplify kvm_apic_map Radim Krčmář
2015-01-30 9:18 ` Paolo Bonzini
2015-01-30 15:14 ` Radim Krčmář
2015-01-30 15:23 ` Paolo Bonzini
2015-01-30 16:57 ` Radim Krčmář
2015-01-30 21:15 ` Paolo Bonzini
2015-01-30 9:22 ` [PATCH 0/8] KVM: minor APIC fixes and cleanups Paolo Bonzini
2015-01-30 15:20 ` Radim Krčmář
2015-01-30 15:24 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422568135-28402-5-git-send-email-rkrcmar@redhat.com \
--to=rkrcmar@redhat.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=namit@cs.technion.ac.il \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.