mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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>
Subject: [PATCH v3 04/17] x86/apic: Initialize APIC ID for Secure AVIC
Date: Tue, 1 Apr 2025 17:06:03 +0530	[thread overview]
Message-ID: <20250401113616.204203-5-Neeraj.Upadhyay@amd.com> (raw)
In-Reply-To: <20250401113616.204203-1-Neeraj.Upadhyay@amd.com>

Initialize the APIC ID in the Secure AVIC APIC backing page with
the APIC_ID msr value read from Hypervisor. CPU topology evaluation
later during boot would catch and report any duplicate APIC ID for
two CPUs.

Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@amd.com>
---
Changes since v2:
 - Drop duplicate APIC ID checks.

 arch/x86/kernel/apic/x2apic_savic.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2apic_savic.c
index f1dd74724769..21f7c055995e 100644
--- a/arch/x86/kernel/apic/x2apic_savic.c
+++ b/arch/x86/kernel/apic/x2apic_savic.c
@@ -185,12 +185,25 @@ static void x2apic_savic_send_ipi_mask_allbutself(const struct cpumask *mask, in
 	__send_ipi_mask(mask, vector, true);
 }
 
+static void init_apic_page(void)
+{
+	u32 apic_id;
+
+	/*
+	 * Before Secure AVIC is enabled, APIC msr reads are intercepted.
+	 * APIC_ID msr read returns the value from the Hypervisor.
+	 */
+	apic_id = native_apic_msr_read(APIC_ID);
+	set_reg(APIC_ID, apic_id);
+}
+
 static void x2apic_savic_setup(void)
 {
 	void *backing_page;
 	enum es_result ret;
 	unsigned long gpa;
 
+	init_apic_page();
 	backing_page = this_cpu_ptr(apic_page);
 	gpa = __pa(backing_page);
 
-- 
2.34.1


  parent reply	other threads:[~2025-04-01 11:37 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-01 11:35 [PATCH v3 00/17] AMD: Add Secure AVIC Guest Support Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 01/17] x86/apic: Add new driver for Secure AVIC Neeraj Upadhyay
2025-04-03 11:34   ` Thomas Gleixner
2025-04-03 11:42     ` Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 02/17] x86/apic: Initialize Secure AVIC APIC backing page Neeraj Upadhyay
2025-04-03 11:37   ` Thomas Gleixner
2025-04-03 11:44     ` Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 03/17] x86/apic: Populate .read()/.write() callbacks of Secure AVIC driver Neeraj Upadhyay
2025-04-01 11:36 ` Neeraj Upadhyay [this message]
2025-04-01 11:36 ` [PATCH v3 05/17] x86/apic: Add update_vector callback for Secure AVIC Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 06/17] x86/apic: Add support to send IPI " Neeraj Upadhyay
2025-04-03 11:45   ` Thomas Gleixner
2025-04-03 11:58     ` Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 07/17] x86/apic: Support LAPIC timer " Neeraj Upadhyay
2025-04-03 12:13   ` Thomas Gleixner
2025-04-03 12:36     ` Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 08/17] x86/sev: Initialize VGIF for secondary VCPUs " Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 09/17] x86/apic: Add support to send NMI IPI " Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 10/17] x86/apic: Allow NMI to be injected from hypervisor " Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 11/17] x86/sev: Enable NMI support " Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 12/17] x86/apic: Read and write LVT* APIC registers from HV for SAVIC guests Neeraj Upadhyay
2025-04-14 23:57   ` Liz Jordan
2025-04-01 11:36 ` [PATCH v3 13/17] x86/apic: Handle EOI writes " Neeraj Upadhyay
2025-04-07 15:45   ` Sean Christopherson
2025-04-07 16:19     ` Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 14/17] x86/apic: Add kexec support for Secure AVIC Neeraj Upadhyay
2025-04-11 17:01   ` Francesco Lavra
2025-04-01 11:36 ` [PATCH v3 15/17] x86/apic: Enable Secure AVIC in Control MSR Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 16/17] x86/sev: Prevent SECURE_AVIC_CONTROL MSR interception for Secure AVIC guests Neeraj Upadhyay
2025-04-01 11:36 ` [PATCH v3 17/17] 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=20250401113616.204203-5-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=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

all inboxes | Powered by JetHome®