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 v2 09/23] Revert "KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible"
Date: Sat, 3 Sep 2022 00:22:40 +0000 [thread overview]
Message-ID: <20220903002254.2411750-10-seanjc@google.com> (raw)
In-Reply-To: <20220903002254.2411750-1-seanjc@google.com>
Due to a likely mismerge of patches, KVM ended up with a superfluous
commit to "enable" AVIC's fast path for x2AVIC mode. Even worse, the
superfluous commit has several bugs and creates a nasty local shadow
variable.
Rather than fix the bugs piece-by-piece[*] to achieve the same end
result, revert the patch wholesale.
Opportunistically add a comment documenting the x2AVIC dependencies.
This reverts commit 8c9e639da435874fb845c4d296ce55664071ea7a.
[*] https://lore.kernel.org/all/YxEP7ZBRIuFWhnYJ@google.com
Fixes: 8c9e639da435 ("KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible")
Suggested-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/svm/avic.c | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c
index 163edc42f979..8259a64c99d6 100644
--- a/arch/x86/kvm/svm/avic.c
+++ b/arch/x86/kvm/svm/avic.c
@@ -405,7 +405,17 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source
logid_index = cluster + __ffs(bitmap);
- if (!apic_x2apic_mode(source)) {
+ if (apic_x2apic_mode(source)) {
+ /*
+ * For x2APIC, the logical APIC ID is a read-only value
+ * that is derived from the x2APIC ID, thus the x2APIC
+ * ID can be found by reversing the calculation (done
+ * above). Note, bits 31:20 of the x2APIC ID are not
+ * propagated to the logical ID, but KVM limits the
+ * x2APIC ID limited to KVM_MAX_VCPU_IDS.
+ */
+ l1_physical_id = logid_index;
+ } else {
u32 *avic_logical_id_table =
page_address(kvm_svm->avic_logical_id_table_page);
@@ -420,23 +430,6 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source
l1_physical_id = logid_entry &
AVIC_LOGICAL_ID_ENTRY_GUEST_PHYSICAL_ID_MASK;
- } else {
- /*
- * For x2APIC logical mode, cannot leverage the index.
- * Instead, calculate physical ID from logical ID in ICRH.
- */
- int cluster = (icrh & 0xffff0000) >> 16;
- int apic = ffs(icrh & 0xffff) - 1;
-
- /*
- * If the x2APIC logical ID sub-field (i.e. icrh[15:0])
- * contains anything but a single bit, we cannot use the
- * fast path, because it is limited to a single vCPU.
- */
- if (apic < 0 || icrh != (1 << apic))
- return -EINVAL;
-
- l1_physical_id = (cluster << 4) + apic;
}
}
--
2.37.2.789.g6183377224-goog
next prev parent reply other threads:[~2022-09-03 0:23 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-03 0:22 [PATCH v2 00/23] KVM: x86: AVIC and local APIC fixes+cleanups Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 01/23] KVM: x86: Purge "highest ISR" cache when updating APICv state Sean Christopherson
2022-09-05 21:58 ` Paolo Bonzini
2022-09-03 0:22 ` [PATCH v2 02/23] KVM: SVM: Flush the "current" TLB when activating AVIC Sean Christopherson
2022-09-05 21:58 ` Paolo Bonzini
2022-09-03 0:22 ` [PATCH v2 03/23] KVM: SVM: Process ICR on AVIC IPI delivery failure due to invalid target Sean Christopherson
2022-09-05 21:59 ` Paolo Bonzini
2022-09-03 0:22 ` [PATCH v2 04/23] KVM: x86: Inhibit AVIC SPTEs if any vCPU enables x2APIC Sean Christopherson
2022-09-05 22:02 ` Paolo Bonzini
2022-09-13 19:52 ` Suthikulpanit, Suravee
2022-09-14 7:39 ` Sean Christopherson
2022-09-14 17:41 ` Suthikulpanit, Suravee
2022-09-16 17:47 ` Sean Christopherson
2022-09-16 19:10 ` Sean Christopherson
2022-09-20 13:07 ` Maxim Levitsky
2022-09-20 15:46 ` Sean Christopherson
2022-09-20 16:50 ` Sean Christopherson
2022-09-23 10:18 ` Maxim Levitsky
2022-09-23 10:19 ` Maxim Levitsky
2022-09-03 0:22 ` [PATCH v2 05/23] KVM: SVM: Don't put/load AVIC when setting virtual APIC mode Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 06/23] KVM: SVM: Replace "avic_mode" enum with "x2avic_enabled" boolean Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 07/23] KVM: SVM: Compute dest based on sender's x2APIC status for AVIC kick Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 08/23] KVM: SVM: Fix x2APIC Logical ID calculation for avic_kick_target_vcpus_fast Sean Christopherson
2022-09-03 0:22 ` Sean Christopherson [this message]
2022-09-03 0:22 ` [PATCH v2 10/23] KVM: SVM: Document that vCPU ID == APIC ID in AVIC kick fastpatch Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 11/23] KVM: SVM: Add helper to perform final AVIC "kick" of single vCPU Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 12/23] KVM: x86: Disable APIC logical map if logical ID covers multiple MDAs Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 13/23] KVM: x86: Disable APIC logical map if vCPUs are aliased in logical mode Sean Christopherson
2022-09-13 23:32 ` Suthikulpanit, Suravee
2022-09-14 7:42 ` Sean Christopherson
2022-09-15 2:11 ` Suthikulpanit, Suravee
2022-09-16 18:52 ` Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 14/23] KVM: x86: Honor architectural behavior for aliased 8-bit APIC IDs Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 15/23] KVM: x86: Explicitly skip adding vCPU to optimized logical map if LDR==0 Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 16/23] KVM: x86: Explicitly track all possibilities for APIC map's logical modes Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 17/23] KVM: SVM: Inhibit AVIC if vCPUs are aliased in logical mode Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 18/23] KVM: SVM: Always update local APIC on writes to logical dest register Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 19/23] KVM: SVM: Update svm->ldr_reg cache even if LDR is "bad" Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 20/23] KVM: SVM: Require logical ID to be power-of-2 for AVIC entry Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 21/23] KVM: SVM: Handle multiple logical targets in AVIC kick fastpath Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 22/23] KVM: SVM: Ignore writes to Remote Read Data on AVIC write traps Sean Christopherson
2022-09-03 0:22 ` [PATCH v2 23/23] Revert "KVM: SVM: Do not throw warning when calling avic_vcpu_load on a running vcpu" Sean Christopherson
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=20220903002254.2411750-10-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).