From: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
To: <linux-kernel@vger.kernel.org>
Cc: <bp@alien8.de>, <tglx@linutronix.de>, <mingo@redhat.com>,
<dave.hansen@linux.intel.com>, <Thomas.Lendacky@amd.com>,
<nikunj@amd.com>, <Santosh.Shukla@amd.com>,
<Vasant.Hegde@amd.com>, <Suravee.Suthikulpanit@amd.com>,
<David.Kaplan@amd.com>, <x86@kernel.org>, <hpa@zytor.com>,
<peterz@infradead.org>, <seanjc@google.com>,
<pbonzini@redhat.com>, <kvm@vger.kernel.org>,
<kirill.shutemov@linux.intel.com>, <huibo.wang@amd.com>,
<naveen.rao@amd.com>, <francescolavra.fl@gmail.com>,
<tiala@microsoft.com>
Subject: [RFC PATCH v7 22/37] x86/apic: Populate .read()/.write() callbacks of Secure AVIC driver
Date: Tue, 10 Jun 2025 23:24:09 +0530 [thread overview]
Message-ID: <20250610175424.209796-23-Neeraj.Upadhyay@amd.com> (raw)
In-Reply-To: <20250610175424.209796-1-Neeraj.Upadhyay@amd.com>
Add read() and write() APIC callback functions to read and write x2APIC
registers directly from the guest APIC backing page of a vCPU.
The x2APIC registers are mapped at an offset within the guest APIC
backing page which is same as their x2APIC MMIO offset. Secure AVIC
adds new registers such as ALLOWED_IRRs (which are at 4-byte offset
within the IRR register offset range) and NMI_REQ to the APIC register
space.
When Secure AVIC is enabled, guest's rdmsr/wrmsr of APIC registers
result in VC exception (for non-accelerated register accesses) with
error code VMEXIT_AVIC_NOACCEL. The VC exception handler can read/write
the x2APIC register in the guest APIC backing page to complete the
rdmsr/wrmsr. Since doing this would increase the latency of accessing
x2APIC registers, instead of doing rdmsr/wrmsr based reg accesses
and handling reads/writes in VC exception, directly read/write APIC
registers from/to the guest APIC backing page of the vCPU in read()
and write() callbacks of the Secure AVIC APIC driver.
Co-developed-by: Kishon Vijay Abraham I <kvijayab@amd.com>
Signed-off-by: Kishon Vijay Abraham I <kvijayab@amd.com>
Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
---
Changes since v6:
- No change.
arch/x86/include/asm/apicdef.h | 2 +
arch/x86/kernel/apic/x2apic_savic.c | 113 +++++++++++++++++++++++++++-
2 files changed, 113 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h
index 094106b6a538..be39a543fbe5 100644
--- a/arch/x86/include/asm/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
@@ -135,6 +135,8 @@
#define APIC_TDR_DIV_128 0xA
#define APIC_EFEAT 0x400
#define APIC_ECTRL 0x410
+#define APIC_SEOI 0x420
+#define APIC_IER 0x480
#define APIC_EILVTn(n) (0x500 + 0x10 * n)
#define APIC_EILVT_NR_AMD_K8 1 /* # of extended interrupts */
#define APIC_EILVT_NR_AMD_10H 4
diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2apic_savic.c
index a2747ab9200a..186e69a5e169 100644
--- a/arch/x86/kernel/apic/x2apic_savic.c
+++ b/arch/x86/kernel/apic/x2apic_savic.c
@@ -9,6 +9,7 @@
#include <linux/cc_platform.h>
#include <linux/percpu-defs.h>
+#include <linux/align.h>
#include <asm/apic.h>
#include <asm/sev.h>
@@ -22,6 +23,114 @@ static int savic_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return x2apic_enabled() && cc_platform_has(CC_ATTR_SNP_SECURE_AVIC);
}
+#define SAVIC_ALLOWED_IRR 0x204
+
+static u32 savic_read(u32 reg)
+{
+ struct apic_page *ap = this_cpu_ptr(apic_page);
+
+ /*
+ * When Secure AVIC is enabled, rdmsr/wrmsr of APIC registers
+ * result in VC exception (for non-accelerated register accesses)
+ * with VMEXIT_AVIC_NOACCEL error code. The VC exception handler
+ * can read/write the x2APIC register in the guest APIC backing page.
+ * Since doing this would increase the latency of accessing x2APIC
+ * registers, instead of doing rdmsr/wrmsr based accesses and
+ * handling apic register reads/writes in VC exception, the read()
+ * and write() callbacks directly read/write APIC register from/to
+ * the vCPU APIC backing page.
+ */
+ switch (reg) {
+ case APIC_LVTT:
+ case APIC_TMICT:
+ case APIC_TMCCT:
+ case APIC_TDCR:
+ case APIC_ID:
+ case APIC_LVR:
+ case APIC_TASKPRI:
+ case APIC_ARBPRI:
+ case APIC_PROCPRI:
+ case APIC_LDR:
+ case APIC_SPIV:
+ case APIC_ESR:
+ case APIC_LVTTHMR:
+ case APIC_LVTPC:
+ case APIC_LVT0:
+ case APIC_LVT1:
+ case APIC_LVTERR:
+ case APIC_EFEAT:
+ case APIC_ECTRL:
+ case APIC_SEOI:
+ case APIC_IER:
+ case APIC_EILVTn(0) ... APIC_EILVTn(3):
+ return apic_get_reg(ap, reg);
+ case APIC_ICR:
+ return (u32) apic_get_reg64(ap, reg);
+ case APIC_ISR ... APIC_ISR + 0x70:
+ case APIC_TMR ... APIC_TMR + 0x70:
+ if (WARN_ONCE(!IS_ALIGNED(reg, 16),
+ "APIC reg read offset 0x%x not aligned at 16 bytes", reg))
+ return 0;
+ return apic_get_reg(ap, reg);
+ /* IRR and ALLOWED_IRR offset range */
+ case APIC_IRR ... APIC_IRR + 0x74:
+ /*
+ * Either aligned at 16 bytes for valid IRR reg offset or a
+ * valid Secure AVIC ALLOWED_IRR offset.
+ */
+ if (WARN_ONCE(!(IS_ALIGNED(reg, 16) ||
+ IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)),
+ "Misaligned IRR/ALLOWED_IRR APIC reg read offset 0x%x", reg))
+ return 0;
+ return apic_get_reg(ap, reg);
+ default:
+ pr_err("Permission denied: read of Secure AVIC reg offset 0x%x\n", reg);
+ return 0;
+ }
+}
+
+#define SAVIC_NMI_REQ 0x278
+
+static void savic_write(u32 reg, u32 data)
+{
+ struct apic_page *ap = this_cpu_ptr(apic_page);
+
+ switch (reg) {
+ case APIC_LVTT:
+ case APIC_LVT0:
+ case APIC_LVT1:
+ case APIC_TMICT:
+ case APIC_TDCR:
+ case APIC_SELF_IPI:
+ case APIC_TASKPRI:
+ case APIC_EOI:
+ case APIC_SPIV:
+ case SAVIC_NMI_REQ:
+ case APIC_ESR:
+ case APIC_LVTTHMR:
+ case APIC_LVTPC:
+ case APIC_LVTERR:
+ case APIC_ECTRL:
+ case APIC_SEOI:
+ case APIC_IER:
+ case APIC_EILVTn(0) ... APIC_EILVTn(3):
+ apic_set_reg(ap, reg, data);
+ break;
+ case APIC_ICR:
+ apic_set_reg64(ap, reg, (u64) data);
+ break;
+ /* ALLOWED_IRR offsets are writable */
+ case SAVIC_ALLOWED_IRR ... SAVIC_ALLOWED_IRR + 0x70:
+ if (IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)) {
+ apic_set_reg(ap, reg, data);
+ break;
+ }
+ fallthrough;
+ default:
+ pr_err("Permission denied: write to Secure AVIC reg offset 0x%x\n", reg);
+ }
+}
+
static void savic_setup(void)
{
void *backing_page;
@@ -85,8 +194,8 @@ static struct apic apic_x2apic_savic __ro_after_init = {
.nmi_to_offline_cpu = true,
- .read = native_apic_msr_read,
- .write = native_apic_msr_write,
+ .read = savic_read,
+ .write = savic_write,
.eoi = native_apic_msr_eoi,
.icr_read = native_x2apic_icr_read,
.icr_write = native_x2apic_icr_write,
--
2.34.1
next prev parent reply other threads:[~2025-06-10 18:02 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-10 17:53 [RFC PATCH v7 00/37] AMD: Add Secure AVIC Guest Support Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 01/37] KVM: lapic: Remove __apic_test_and_{set|clear}_vector() Neeraj Upadhyay
2025-06-23 11:26 ` Borislav Petkov
2025-06-25 1:18 ` Neeraj Upadhyay
2025-06-25 12:53 ` Sean Christopherson
2025-06-10 17:53 ` [RFC PATCH v7 02/37] KVM: lapic: Remove redundant parentheses around 'bitmap' Neeraj Upadhyay
2025-06-23 11:41 ` Borislav Petkov
2025-06-25 1:19 ` Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 03/37] x86/apic: KVM: Deduplicate APIC vector => register+bit math Neeraj Upadhyay
2025-06-23 11:49 ` Borislav Petkov
2025-06-25 1:21 ` Neeraj Upadhyay
2025-06-25 12:59 ` Sean Christopherson
2025-06-10 17:53 ` [RFC PATCH v7 04/37] KVM: lapic: Rename VEC_POS/REG_POS macro usages Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 05/37] KVM: lapic: Change lapic regs base address to void pointer Neeraj Upadhyay
2025-07-01 15:47 ` Borislav Petkov
2025-06-10 17:53 ` [RFC PATCH v7 06/37] KVM: lapic: Rename find_highest_vector() Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 07/37] KVM: lapic: Rename lapic get/set_reg() helpers Neeraj Upadhyay
2025-06-25 13:56 ` Sean Christopherson
2025-06-10 17:53 ` [RFC PATCH v7 08/37] KVM: lapic: Rename lapic get/set_reg64() helpers Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 09/37] KVM: lapic: Rename lapic set/clear vector helpers Neeraj Upadhyay
2025-06-10 17:53 ` [RFC PATCH v7 10/37] KVM: lapic: Mark apic_find_highest_vector() inline Neeraj Upadhyay
2025-06-25 13:58 ` Sean Christopherson
2025-06-10 17:53 ` [RFC PATCH v7 11/37] x86/apic: KVM: Move apic_find_highest_vector() to a common header Neeraj Upadhyay
2025-06-25 13:59 ` Sean Christopherson
2025-06-10 17:53 ` [RFC PATCH v7 12/37] x86/apic: KVM: Move lapic get/set_reg() helpers to common code Neeraj Upadhyay
2025-06-25 14:03 ` Sean Christopherson
2025-06-10 17:54 ` [RFC PATCH v7 13/37] KVM: x86: Move lapic get/set_reg64() " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 14/37] KVM: x86: Move lapic set/clear_vector() " Neeraj Upadhyay
2025-06-25 14:04 ` Sean Christopherson
2025-06-10 17:54 ` [RFC PATCH v7 15/37] KVM: x86: apic_test_vector() " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 16/37] x86/apic: Rename 'reg_off' to 'reg' Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 17/37] x86/apic: Unionize apic regs for 32bit/64bit access w/o type casting Neeraj Upadhyay
2025-06-24 10:28 ` Huang, Kai
2025-06-25 1:15 ` Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 18/37] x86/apic: Simplify bitwise operations on apic bitmap Neeraj Upadhyay
2025-06-24 10:37 ` Huang, Kai
2025-06-25 1:18 ` Neeraj Upadhyay
2025-06-25 14:05 ` Sean Christopherson
2025-06-10 17:54 ` [RFC PATCH v7 19/37] x86/apic: Move apic_update_irq_cfg() calls to apic_update_vector() Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 20/37] x86/apic: Add new driver for Secure AVIC Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 21/37] x86/apic: Initialize Secure AVIC APIC backing page Neeraj Upadhyay
2025-06-10 17:54 ` Neeraj Upadhyay [this message]
2025-06-10 17:54 ` [RFC PATCH v7 23/37] x86/apic: Initialize APIC ID for Secure AVIC Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 24/37] x86/apic: Add update_vector() callback for apic drivers Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 25/37] x86/apic: Add update_vector() callback for Secure AVIC Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 26/37] x86/apic: Add support to send IPI " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 27/37] x86/apic: Support LAPIC timer " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 28/37] x86/sev: Initialize VGIF for secondary VCPUs " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 29/37] x86/apic: Add support to send NMI IPI " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 30/37] x86/apic: Allow NMI to be injected from hypervisor " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 31/37] x86/sev: Enable NMI support " Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 32/37] x86/apic: Read and write LVT* APIC registers from HV for SAVIC guests Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 33/37] x86/apic: Handle EOI writes for Secure AVIC guests Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 34/37] x86/apic: Add kexec support for Secure AVIC Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 35/37] x86/apic: Enable Secure AVIC in Control MSR Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 36/37] x86/sev: Prevent SECURE_AVIC_CONTROL MSR interception for Secure AVIC guests Neeraj Upadhyay
2025-06-10 17:54 ` [RFC PATCH v7 37/37] x86/sev: Indicate SEV-SNP guest supports Secure AVIC Neeraj Upadhyay
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=20250610175424.209796-23-Neeraj.Upadhyay@amd.com \
--to=neeraj.upadhyay@amd.com \
--cc=David.Kaplan@amd.com \
--cc=Santosh.Shukla@amd.com \
--cc=Suravee.Suthikulpanit@amd.com \
--cc=Thomas.Lendacky@amd.com \
--cc=Vasant.Hegde@amd.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=francescolavra.fl@gmail.com \
--cc=hpa@zytor.com \
--cc=huibo.wang@amd.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=naveen.rao@amd.com \
--cc=nikunj@amd.com \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=tiala@microsoft.com \
--cc=x86@kernel.org \
/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