From nobody Fri Sep 5 07:35:09 2025 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C5BB288C9D for ; Wed, 16 Jul 2025 03:22:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752636164; cv=none; b=uNPWpuMhkUJTpVUuhSXTFK+GuiFXf++Y/1xV9eGHZbFqbYX6/cy5Qx0g1eZ/W9/sTcC7+iO55fSpef3WTpOModbHf1vhpY9jMWeW/l7l90sT8/MXXjr4QiiRTSgj2Zxh27aShftrXq79NpeBDOj4Y8Z4L0YtWE6zeKOP8NI/XwE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752636164; c=relaxed/simple; bh=VEmHl5eiHKjwgdYjJ41tk7HeKba97yajAex44kETR3w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=EIKM3eGkocW6JR+SZ8XEgvk4rM41o/dpJi0S4GgS/lSVnVhihlUfqLgi4IxxIGgqS+3swZ7BcVm0so3V+QELNiDUAmK8Q4aKTbsvvL12v7XMySquv9Tz0lhkVs81P/L6RXmi6P2BWaQI1beW5YMbIHhyVh8c3PIBV2UTjsh8Wm4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=1Dle8e/v; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="1Dle8e/v" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-451d2037f1eso39193565e9.0 for ; Tue, 15 Jul 2025 20:22:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1752636161; x=1753240961; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=7boTv+di5Ys4QdIKdCT0u82t02k9U3NlxmHSylt/GQM=; b=1Dle8e/vafGySLS0GVnlCsesX6lXi3yjUM7lxUJ9ocIapW5Vp12xBOvc6fYJCPgSUK oiAsUDCBD4rci4IQxma/nPqr6c42EizYsaft0/Sw12GlFCVlxepKSglG9piNCI33+J0+ 3cj3ohTPy6jDlc1ktuNj9slQgI2gBwzG+mq6af6SsX/cYk7REPDeG+nWab/LnUNOg1Bu Mv/cUUEk6Y6qgboCSYAfS45jl59ONNW1f2HrSqrWmvZnHJoCZvmqrwMw++Uns+aSEjpC LCOtMFpre2Mo3Xye8A6cPKgw7OemVuwWABQq+7yoNekRVSFV5u3e22YAXw9Mt5+v98YC 0HDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752636161; x=1753240961; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7boTv+di5Ys4QdIKdCT0u82t02k9U3NlxmHSylt/GQM=; b=M9l+2jCGKl1Unvdp2nvlNqSllBWS0fihRINhg6CgVZCcBbp0UyfRFgzsxTv3sOO+Vb ubnqx8jdi4qdATr4Angjj3Ip2W68VzJFLzV91/t4EI3ubpxDLjUR0FkG1DQUF9V1rv1R XJZOyQbkLDDn6Np6O/UMB0nzMm1jwhpztOTXZIUWiOI+7Q0hVYISaLd6nayxQ7X0A0K7 u729hxZAphcm2hslZKBgCTDOJZHVZkrc68EF0Z7zTt/ZKUqu7W//Q4qguGqEU73dy4F4 gA3aMJRf5QjlsX4Z3uDd7f3MFzDnd4vKtwl7Jfx2TMNfh6VhVmd5uFcT3HNkhHqGPU1P hR8g== X-Gm-Message-State: AOJu0YwFnc0Q6OKAAM+RNouiKBTxGLMAlmBfAPN4QjBTY8TWi0/fxdL+ XZjsIDhY+kBLlsyYb9QvPcKm7bnEVTUnbBmbZmEUTWITfVwoQDvyUzlE33q89oMRHLOP5tJaK3I 19i8GI96a3+aPgCgX6lDpW6GwidKDM9eyT+mlfjeRRBqSB7mzjh+6Kqt3ttoRHGGxDh8qZw8XVR KZF0ZrTuLtJnJu75RustJoh+9faUQNvS+4OA== X-Google-Smtp-Source: AGHT+IH77E+ebL2o5oHmwxdvizom2S9q1B2UD3+cGjn1cupv6iIWwMw6UXkcZvT1rxmNQEZ8YngR9wJI X-Received: from wmbgz1.prod.google.com ([2002:a05:600c:8881:b0:456:506:259c]) (user=ardb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:8b2f:b0:456:27a4:50ad with SMTP id 5b1f17b1804b1-4562e3a222cmr6986065e9.33.1752636160825; Tue, 15 Jul 2025 20:22:40 -0700 (PDT) Date: Wed, 16 Jul 2025 05:18:27 +0200 In-Reply-To: <20250716031814.2096113-24-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250716031814.2096113-24-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=5030; i=ardb@kernel.org; h=from:subject; bh=5/30+kFJeHe02LNM3vgGQ9Nc+FkodkG4zNIUYg/FT98=; b=owGbwMvMwCVmkMcZplerG8N4Wi2JIaNcyorVfn2neu8KznZ2e6vVm+WEs02NtU/wvb8XeNWWK 233pJKOUhYGMS4GWTFFFoHZf9/tPD1RqtZ5lizMHFYmkCEMXJwCMBGRJwz/NNza1/godJxaXf36 +MzMpAA3tQdfSg49l1FibD4m76fXysiwTJCrgqeCye7cCtk6txTFrT0ccf99FMPnzD/Kn3Kp0YI BAA== X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250716031814.2096113-36-ardb+git@google.com> Subject: [PATCH v5 12/22] x86/sev: Provide PIC aliases for SEV related data objects From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, x86@kernel.org, Ard Biesheuvel , Borislav Petkov , Ingo Molnar , Kevin Loughlin , Tom Lendacky , Josh Poimboeuf , Peter Zijlstra , Nikunj A Dadhania Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ard Biesheuvel Provide PIC aliases for data objects that are shared between the SEV startup code and the SEV code that executes later. This is needed so that the confined startup code is permitted to access them. This requires some of these variables to be moved into a source file that is not part of the startup code, as the PIC alias is already implied, and exporting variables in the opposite direction is not supported. Move ghcb_version as well, but don't provide a PIC alias as it is not actually needed. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/sev.c | 3 ++ arch/x86/boot/startup/sev-shared.c | 19 ----------- arch/x86/boot/startup/sev-startup.c | 9 ------ arch/x86/coco/sev/core.c | 34 ++++++++++++++++++++ 4 files changed, 37 insertions(+), 28 deletions(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index d62722dd2de1..faa6cc2f9990 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -38,6 +38,9 @@ struct ghcb *boot_ghcb; #define __BOOT_COMPRESSED =20 u8 snp_vmpl; +u16 ghcb_version; + +u64 boot_svsm_caa_pa; =20 /* Include code for early handlers */ #include "../../boot/startup/sev-shared.c" diff --git a/arch/x86/boot/startup/sev-shared.c b/arch/x86/boot/startup/sev= -shared.c index 83ca97df0808..cc14daf816e8 100644 --- a/arch/x86/boot/startup/sev-shared.c +++ b/arch/x86/boot/startup/sev-shared.c @@ -18,25 +18,6 @@ #define WARN(condition, format...) (!!(condition)) #endif =20 -/* - * SVSM related information: - * During boot, the page tables are set up as identity mapped and later - * changed to use kernel virtual addresses. Maintain separate virtual and - * physical addresses for the CAA to allow SVSM functions to be used dur= ing - * early boot, both with identity mapped virtual addresses and proper ke= rnel - * virtual addresses. - */ -u64 boot_svsm_caa_pa __ro_after_init; - -/* - * Since feature negotiation related variables are set early in the boot - * process they must reside in the .data section so as not to be zeroed - * out when the .bss section is later cleared. - * - * GHCB protocol version negotiated with the hypervisor. - */ -u16 ghcb_version __ro_after_init; - /* Copy of the SNP firmware's CPUID page. */ static struct snp_cpuid_table cpuid_table_copy __ro_after_init; =20 diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/se= v-startup.c index 8e804369cc60..733491482cbb 100644 --- a/arch/x86/boot/startup/sev-startup.c +++ b/arch/x86/boot/startup/sev-startup.c @@ -41,15 +41,6 @@ #include #include =20 -/* Bitmap of SEV features supported by the hypervisor */ -u64 sev_hv_features __ro_after_init; - -/* Secrets page physical address from the CC blob */ -u64 sev_secrets_pa __ro_after_init; - -/* For early boot SVSM communication */ -struct svsm_ca boot_svsm_ca_page __aligned(PAGE_SIZE); - /* * Nothing shall interrupt this code path while holding the per-CPU * GHCB. The backup GHCB is only for NMIs interrupting this path. diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 4fe0928bc0ad..be89f0a4a28f 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -46,6 +46,29 @@ #include #include =20 +/* Bitmap of SEV features supported by the hypervisor */ +u64 sev_hv_features __ro_after_init; +SYM_PIC_ALIAS(sev_hv_features); + +/* Secrets page physical address from the CC blob */ +u64 sev_secrets_pa __ro_after_init; +SYM_PIC_ALIAS(sev_secrets_pa); + +/* For early boot SVSM communication */ +struct svsm_ca boot_svsm_ca_page __aligned(PAGE_SIZE); +SYM_PIC_ALIAS(boot_svsm_ca_page); + +/* + * SVSM related information: + * During boot, the page tables are set up as identity mapped and later + * changed to use kernel virtual addresses. Maintain separate virtual and + * physical addresses for the CAA to allow SVSM functions to be used dur= ing + * early boot, both with identity mapped virtual addresses and proper ke= rnel + * virtual addresses. + */ +u64 boot_svsm_caa_pa __ro_after_init; +SYM_PIC_ALIAS(boot_svsm_caa_pa); + DEFINE_PER_CPU(struct svsm_ca *, svsm_caa); DEFINE_PER_CPU(u64, svsm_caa_pa); =20 @@ -119,6 +142,17 @@ DEFINE_PER_CPU(struct sev_es_save_area *, sev_vmsa); */ u8 snp_vmpl __ro_after_init; EXPORT_SYMBOL_GPL(snp_vmpl); +SYM_PIC_ALIAS(snp_vmpl); + +/* + * Since feature negotiation related variables are set early in the boot + * process they must reside in the .data section so as not to be zeroed + * out when the .bss section is later cleared. + * + * GHCB protocol version negotiated with the hypervisor. + */ +u16 ghcb_version __ro_after_init; +SYM_PIC_ALIAS(ghcb_version); =20 /* For early boot hypervisor communication in SEV-ES enabled guests */ static struct ghcb boot_ghcb_page __bss_decrypted __aligned(PAGE_SIZE); --=20 2.50.0.727.gbf7dc18ff4-goog