From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
Li RongQing <lirongqing@baidu.com>
Subject: [PATCH 16/19] KVM: x86: Explicitly track all possibilities for APIC map's logical modes
Date: Wed, 31 Aug 2022 00:35:03 +0000 [thread overview]
Message-ID: <20220831003506.4117148-17-seanjc@google.com> (raw)
In-Reply-To: <20220831003506.4117148-1-seanjc@google.com>
Track all possibilities for the optimized APIC map's logical modes
instead of overloading the pseudo-bitmap and treating any "unknown" value
as "invalid".
As documented by the now-stale comment above the mode values, the values
did have meaning when the optimized map was originally added. That
dependent logical was removed by commit e45115b62f9a ("KVM: x86: use
physical LAPIC array for logical x2APIC"), but the obfuscated behavior
and its comment were left behind.
Opportunistically rename "mode" to "logical_mode", partly to make it
clear that the "disabled" case applies only to the logical map, but also
to prove that there is no lurking code that expects "mode" to be a bitmap.
Functionally, this is a glorified nop.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/include/asm/kvm_host.h | 21 ++++++++++--------
arch/x86/kvm/lapic.c | 38 ++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 1f51411f3112..0184e64ab555 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -955,19 +955,22 @@ struct kvm_arch_memory_slot {
};
/*
- * We use as the mode the number of bits allocated in the LDR for the
- * logical processor ID. It happens that these are all powers of two.
- * This makes it is very easy to detect cases where the APICs are
- * configured for multiple modes; in that case, we cannot use the map and
- * hence cannot use kvm_irq_delivery_to_apic_fast either.
+ * Track the mode of the optimized logical map, as the rules for decoding the
+ * destination vary per mode. Enabling the optimized logical map requires all
+ * software-enabled local APIs to be in the same mode, each addressable APIC to
+ * be mapped to only one MDA, and each MDA to map to at most one APIC.
*/
-#define KVM_APIC_MODE_XAPIC_CLUSTER 4
-#define KVM_APIC_MODE_XAPIC_FLAT 8
-#define KVM_APIC_MODE_X2APIC 16
+enum kvm_apic_logical_mode {
+ KVM_APIC_MODE_SW_DISABLED,
+ KVM_APIC_MODE_XAPIC_CLUSTER,
+ KVM_APIC_MODE_XAPIC_FLAT,
+ KVM_APIC_MODE_X2APIC,
+ KVM_APIC_MODE_MAP_DISABLED,
+};
struct kvm_apic_map {
struct rcu_head rcu;
- u8 mode;
+ enum kvm_apic_logical_mode logical_mode;
u32 max_apic_id;
union {
struct kvm_lapic *xapic_flat_map[8];
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 8209caffe3ab..3b6ef36b3963 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -168,7 +168,12 @@ static bool kvm_use_posted_timer_interrupt(struct kvm_vcpu *vcpu)
static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,
u32 dest_id, struct kvm_lapic ***cluster, u16 *mask) {
- switch (map->mode) {
+ switch (map->logical_mode) {
+ case KVM_APIC_MODE_SW_DISABLED:
+ /* Arbitrarily use the flat map so that @cluster isn't NULL. */
+ *cluster = map->xapic_flat_map;
+ *mask = 0;
+ return true;
case KVM_APIC_MODE_X2APIC: {
u32 offset = (dest_id >> 16) * 16;
u32 max_apic_id = map->max_apic_id;
@@ -193,8 +198,10 @@ static inline bool kvm_apic_map_get_logical_dest(struct kvm_apic_map *map,
*cluster = map->xapic_cluster_map[(dest_id >> 4) & 0xf];
*mask = dest_id & 0xf;
return true;
+ case KVM_APIC_MODE_MAP_DISABLED:
+ return false;
default:
- /* Not optimized. */
+ WARN_ON_ONCE(1);
return false;
}
}
@@ -256,10 +263,12 @@ void kvm_recalculate_apic_map(struct kvm *kvm)
goto out;
new->max_apic_id = max_id;
+ new->logical_mode = KVM_APIC_MODE_SW_DISABLED;
kvm_for_each_vcpu(i, vcpu, kvm) {
struct kvm_lapic *apic = vcpu->arch.apic;
struct kvm_lapic **cluster;
+ enum kvm_apic_logical_mode logical_mode;
u32 x2apic_id, physical_id;
u16 mask;
u32 ldr;
@@ -314,7 +323,8 @@ void kvm_recalculate_apic_map(struct kvm *kvm)
new->phys_map[physical_id] = apic;
}
- if (!kvm_apic_sw_enabled(apic))
+ if (new->logical_mode == KVM_APIC_MODE_MAP_DISABLED ||
+ !kvm_apic_sw_enabled(apic))
continue;
ldr = kvm_lapic_get_reg(apic, APIC_LDR);
@@ -322,25 +332,33 @@ void kvm_recalculate_apic_map(struct kvm *kvm)
continue;
if (apic_x2apic_mode(apic)) {
- new->mode |= KVM_APIC_MODE_X2APIC;
+ logical_mode = KVM_APIC_MODE_X2APIC;
} else {
ldr = GET_APIC_LOGICAL_ID(ldr);
if (kvm_lapic_get_reg(apic, APIC_DFR) == APIC_DFR_FLAT)
- new->mode |= KVM_APIC_MODE_XAPIC_FLAT;
+ logical_mode = KVM_APIC_MODE_XAPIC_FLAT;
else
- new->mode |= KVM_APIC_MODE_XAPIC_CLUSTER;
+ logical_mode = KVM_APIC_MODE_XAPIC_CLUSTER;
}
+ if (new->logical_mode != KVM_APIC_MODE_SW_DISABLED &&
+ new->logical_mode != logical_mode) {
+ new->logical_mode = KVM_APIC_MODE_MAP_DISABLED;
+ continue;
+ }
+ new->logical_mode = logical_mode;
- if (!kvm_apic_map_get_logical_dest(new, ldr, &cluster, &mask))
+ if (WARN_ON_ONCE(!kvm_apic_map_get_logical_dest(new, ldr,
+ &cluster, &mask))) {
+ new->logical_mode = KVM_APIC_MODE_MAP_DISABLED;
continue;
+ }
if (!mask)
continue;
ldr = ffs(mask) - 1;
if (!is_power_of_2(mask) || cluster[ldr]) {
- new->mode = KVM_APIC_MODE_XAPIC_FLAT |
- KVM_APIC_MODE_XAPIC_CLUSTER;
+ new->logical_mode = KVM_APIC_MODE_MAP_DISABLED;
continue;
}
cluster[ldr] = apic;
@@ -993,7 +1011,7 @@ static bool kvm_apic_is_broadcast_dest(struct kvm *kvm, struct kvm_lapic **src,
{
if (kvm->arch.x2apic_broadcast_quirk_disabled) {
if ((irq->dest_id == APIC_BROADCAST &&
- map->mode != KVM_APIC_MODE_X2APIC))
+ map->logical_mode != KVM_APIC_MODE_X2APIC))
return true;
if (irq->dest_id == X2APIC_BROADCAST)
return true;
--
2.37.2.672.g94769d06f0-goog
next prev parent reply other threads:[~2022-08-31 0:38 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 0:34 [PATCH 00/19] KVM: x86: AVIC and local APIC fixes+cleanups Sean Christopherson
2022-08-31 0:34 ` [PATCH 01/19] KVM: SVM: Process ICR on AVIC IPI delivery failure due to invalid target Sean Christopherson
2022-08-31 9:18 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 02/19] KVM: SVM: Don't put/load AVIC when setting virtual APIC mode Sean Christopherson
2022-08-31 9:24 ` Maxim Levitsky
2022-08-31 16:33 ` Sean Christopherson
2022-08-31 0:34 ` [PATCH 03/19] Revert "KVM: SVM: Introduce hybrid-AVIC mode" Sean Christopherson
2022-08-31 5:59 ` Maxim Levitsky
2022-08-31 6:45 ` Maxim Levitsky
2022-08-31 16:29 ` Sean Christopherson
2022-08-31 17:46 ` Maxim Levitsky
2022-08-31 17:58 ` Jim Mattson
2022-08-31 18:01 ` Maxim Levitsky
2022-08-31 19:12 ` Sean Christopherson
2022-09-01 10:25 ` Maxim Levitsky
2022-09-01 11:47 ` Jim Mattson
2022-09-01 13:29 ` Sean Christopherson
2022-09-01 13:53 ` Sean Christopherson
2022-09-01 15:08 ` Sean Christopherson
2022-08-31 16:19 ` Sean Christopherson
2022-08-31 17:47 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 04/19] KVM: SVM: Replace "avic_mode" enum with "x2avic_enabled" boolean Sean Christopherson
2022-08-31 9:36 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 05/19] KVM: SVM: Compute dest based on sender's x2APIC status for AVIC kick Sean Christopherson
2022-08-31 9:38 ` Maxim Levitsky
2022-09-01 2:56 ` Li,Rongqing
2022-08-31 0:34 ` [PATCH 06/19] KVM: SVM: Get x2APIC logical dest bitmap from ICRH[15:0], not ICHR[31:16] Sean Christopherson
2022-08-31 6:09 ` Maxim Levitsky
2022-08-31 9:43 ` Maxim Levitsky
2022-08-31 16:35 ` Sean Christopherson
2022-08-31 18:18 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 07/19] KVM: SVM: Drop buggy and redundant AVIC "single logical dest" check Sean Christopherson
2022-08-31 6:19 ` Maxim Levitsky
2022-08-31 16:37 ` Sean Christopherson
2022-08-31 18:10 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 08/19] KVM: SVM: Remove redundant cluster calculation that also creates a shadow Sean Christopherson
2022-08-31 10:19 ` Maxim Levitsky
2022-09-01 20:02 ` Sean Christopherson
2022-08-31 0:34 ` [PATCH 09/19] KVM: SVM: Drop duplicate calcuation of AVIC/x2AVIC "logical index" Sean Christopherson
2022-08-31 0:34 ` [PATCH 10/19] KVM: SVM: Document that vCPU ID == APIC ID in AVIC kick fastpatch Sean Christopherson
2022-08-31 10:22 ` Maxim Levitsky
2022-08-31 16:16 ` Sean Christopherson
2022-08-31 17:49 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 11/19] KVM: SVM: Add helper to perform final AVIC "kick" of single vCPU Sean Christopherson
2022-08-31 10:25 ` Maxim Levitsky
2022-08-31 15:08 ` Sean Christopherson
2022-08-31 18:12 ` Maxim Levitsky
2022-08-31 0:34 ` [PATCH 12/19] KVM: x86: Disable APIC logical map if logical ID covers multiple MDAs Sean Christopherson
2022-08-31 13:23 ` Maxim Levitsky
2022-08-31 0:35 ` [PATCH 13/19] KVM: x86: Disable APIC logical map if vCPUs are aliased in logical mode Sean Christopherson
2022-08-31 13:24 ` Maxim Levitsky
2022-08-31 0:35 ` [PATCH 14/19] KVM: x86: Honor architectural behavior for aliased 8-bit APIC IDs Sean Christopherson
2022-08-31 13:37 ` Maxim Levitsky
2022-08-31 16:41 ` Sean Christopherson
2022-08-31 17:51 ` Maxim Levitsky
2022-08-31 0:35 ` [PATCH 15/19] KVM: x86: Explicitly skip optimized logical map setup if vCPU's LDR==0 Sean Christopherson
2022-08-31 13:41 ` Maxim Levitsky
2022-08-31 16:47 ` Sean Christopherson
2022-08-31 0:35 ` Sean Christopherson [this message]
2022-08-31 13:43 ` [PATCH 16/19] KVM: x86: Explicitly track all possibilities for APIC map's logical modes Maxim Levitsky
2022-08-31 16:56 ` Sean Christopherson
2022-08-31 17:53 ` Maxim Levitsky
2022-09-16 18:58 ` Sean Christopherson
2022-08-31 18:42 ` Maxim Levitsky
2022-08-31 19:17 ` Sean Christopherson
2022-08-31 0:35 ` [PATCH 17/19] KVM: SVM: Handle multiple logical targets in AVIC kick fastpath Sean Christopherson
2022-08-31 13:57 ` Maxim Levitsky
2022-08-31 18:19 ` Sean Christopherson
2022-08-31 18:25 ` Maxim Levitsky
2022-08-31 0:35 ` [PATCH 18/19] KVM: SVM: Ignore writes to Remote Read Data on AVIC write traps Sean Christopherson
2022-08-31 10:40 ` Maxim Levitsky
2022-08-31 0:35 ` [PATCH 19/19] Revert "KVM: SVM: Do not throw warning when calling avic_vcpu_load on a running vcpu" Sean Christopherson
2022-08-31 6:07 ` Maxim Levitsky
2022-08-31 7:03 ` Maxim Levitsky
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=20220831003506.4117148-17-seanjc@google.com \
--to=seanjc@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lirongqing@baidu.com \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=suravee.suthikulpanit@amd.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).