Received-SPF: pass (google.com: domain of linux-kernel+bounces-82364-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <229aaa22-5e69-4f18-b5f7-fec83109bb53@amd.com>
Date: Mon, 26 Feb 2024 15:37:54 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v6 05/10] x86/sme: Avoid SME/SVE related checks on
 non-SME/SVE platforms
Content-Language: en-US
To: Ard Biesheuvel <ardb+git@google.com>, linux-kernel@vger.kernel.org
Cc: Ard Biesheuvel <ardb@kernel.org>,
 Kevin Loughlin <kevinloughlin@google.com>,
 Dionna Glaze <dionnaglaze@google.com>, Thomas Gleixner <tglx@linutronix.de>,
 Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
 Dave Hansen <dave.hansen@linux.intel.com>, Andy Lutomirski
 <luto@kernel.org>, Brian Gerst <brgerst@gmail.com>
References: <20240226142952.64769-12-ardb+git@google.com>
 <20240226142952.64769-17-ardb+git@google.com>
From: Tom Lendacky <thomas.lendacky@amd.com>
Autocrypt: addr=thomas.lendacky@amd.com; keydata=
 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
 vFkWitqCJg==
In-Reply-To: <20240226142952.64769-17-ardb+git@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?bmROc0tGbVU3RnU5MEh0NzJFQnFpYVhTSzZlOWtLMDVBSXlVSzZ2WGo0VnV4?=
 =?utf-8?B?RitGRWFucUF5UXVHYnQ3eGhUNEJrTkhMaEZjRWRvMVpkbnVyVG50MEYzTmU0?=
 =?utf-8?B?TFVZcVltbWE3c2VwN0pvR0dSRE44K0hzaDMvWjhRWXkrcDVjWEJmV3FITHBG?=
 =?utf-8?B?R3QweGxzTkJjY2hrOWV3MGNsUGs2QTZ3b0ZYNThtdHEvbE1yNUJuSkhsZ3FT?=
 =?utf-8?B?UTJzVVZxT2U1cW03TzNveGlGQ0V4c1VNSThYOGtmOXNhZEt0dGFkRUlBNjFz?=
 =?utf-8?B?T0NzS3pORG1mTzNCUURpWXcrVUpYNW1yZlJLa1pPK2ZaSkJCcktua2VFYzQ5?=
 =?utf-8?B?T0RoVXJKOFcwZGt1UmkySzh6dHFCbGk1MzFiRkNjditUL3N3ZkE0MmNOK1pU?=
 =?utf-8?B?YUJJY2M0ZHFoQUM5OTZJZmU4WTJ4d0NSRm9WV3BSREt6L2VGbHFXUVdEampQ?=
 =?utf-8?B?NFA3Q0ZZSTA1eUxiMVc1bTZGbW5MSmFvVTV4NFJWTnJDaVpsM1dLQURwZEwy?=
 =?utf-8?B?bSs0QUl0YWloL1FqYU9jUGFYR1BrK2krMGwvOFZtZ0VwZG85S2RUdDVrYVc1?=
 =?utf-8?B?Q0h1eUZyT2FxaXgzS1R3U3ZtOFBGVCtsOWJaYVozZGNLQkpqSEZKYjdrTjdS?=
 =?utf-8?B?a2FCR25PSmxZcW5EYnVHaklCWGJXRHg2YmdEcld4SVAwa0QvZEgzcE4zRm1r?=
 =?utf-8?B?UE9hTGxjb0ljK2lTUnE4K2xnWm5pdUNRSmFLWm9ONmhVTE5BamY1R0xKMWJK?=
 =?utf-8?B?SFFVNGxZU2VyUUNtdGxkOHZtSUtsS1BPbEVJeloxSG5JSUV6UlZFeHBXTDZ2?=
 =?utf-8?B?aUJ1ekc0QUlTY1R2YXpWQlQxU3lKNW1YdDk1OEZCelpyVGtCTFFzNWtndXN2?=
 =?utf-8?B?dmQrTW01VkhhOUNwWlN1Qzk4VWhaaFh5T0lvYmh2Szh0WndHaWJVbVYyR2lp?=
 =?utf-8?B?QitHSnJXM2hxNTBtaXZJSDZPdEkvNFVKQUpiZGV5TlhnV0Foc1FTKzBjb3Fq?=
 =?utf-8?B?MGtSSkF3VFU4QnZBRzBSdzFPTE5ocE11VmhtSXJud0kyNWNVUDF4dEdoVzhM?=
 =?utf-8?B?dEFNMDBLc1ZjZmJOZElIVjM5dFQzRGtoMEFlWmxRUlA3SlVEeEh1TjdTZUkv?=
 =?utf-8?B?NThtZEFLNWkyQ01aMGI3a1VPMFB6VFpmSjhPV1VDWmt5dlRjQzFsZ2IyTjBZ?=
 =?utf-8?B?N0g5ZU41SGhPSzcydnl3SnpUSGpjL3hLVUg0ZzVOUUZmRW5TMjNOd1FiaFpL?=
 =?utf-8?B?OVlJV0dJNUZBTHJYTzEvbm9RZ1BZZDB4akliRHpUVTVtZDBrc2l6dTRuQTdN?=
 =?utf-8?B?REFKanhWY1hGV3pkUVR5clhnOTRpTWtXbUxMZmZnaGFCSEt4UVd2K2d5Ukpw?=
 =?utf-8?B?SGhHVEFLSk1BdzJiQWxFN0l0bnlMVUJKTXZ4L1ZnWGpwSTB6OGExNUlEa0Nr?=
 =?utf-8?B?Y1VqWDBNREpJd1ZtQzJVS3hLd3lJS2pYbkZhRFUzL2I4RngvY1Q4SnlqbUVT?=
 =?utf-8?B?S0hxaVBENTl2UW81N2ltMXMrZC93cjN4SEFuemlNM2ZoY1BLNVF5cXFySTA2?=
 =?utf-8?B?K0c2bVRXSmNHdVJWd0RPRXpYc2s0djFwVnJnUDc2b0g3WmxnZlRMRjBNME15?=
 =?utf-8?B?aStYV2kyQUZpOGl0NEoybFd5YUd0NHBXY2Y3RGhnVmVMQ3V4NHZ2d3E5eVFU?=
 =?utf-8?B?ZHRPZjNRV2VvWEZBd2paWXdPUHJkUVhhS2xpZWxyb2pmVENxNEcyZXdUZHI3?=
 =?utf-8?B?UmtIZVNHVWlFdUEvdlIydzA2WG01QU5kemJWVWtVVzlyNTVpSVIvSkdoeUd3?=
 =?utf-8?B?TWRVVjMwQmlkaFZST3hscVFlOFU4azQ0MlZTbzVXVitCQWc2c3dQWnRxcHRo?=
 =?utf-8?B?M2pkS2ViYXJpOW9QcW1RVkxKcms4Z3RDWGJUSk50a2dnSzhTa1RNYThMaFZt?=
 =?utf-8?B?M1d4Nkx0TC80T1JNNjZORWlVMHJQbkc1UE1VekNzS1BETnFsY3ZJRmxUclJx?=
 =?utf-8?B?aWpzWlorczBreElKMVBIZDdGWDVTcmlQOE5Wc3BOYlpYWlZFUHdnTFNPaXVY?=
 =?utf-8?B?UFNmNFpUdjlMcU1ER2FiaHZ5SnIvdW0rSmgvejQ2QWNHSkZOUms4UkhNMys4?=
 =?utf-8?Q?v/QWPE/rJzmHm1A3CsidL7bol?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4f2f2a01-82b1-4b94-887d-08dc37133270
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2024 21:37:57.1714
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: jGaFAAtbqBc2YMfPxPH0JveONXYFLp5iaPTtVVd1BeLINkT1GaVW1HKXWOzcCbtYL/bSBVlzj0pp/SsIoUI42w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4099

On 2/26/24 08:29, Ard Biesheuvel wrote:
> From: Ard Biesheuvel <ardb@kernel.org>
> 
> Reorganize the early SME/SVE init code so that SME/SVE related calls are

I'm assuming you mean SEV here and in the subject line.

> deferred until it has been determined that the platform actually
> supports this, and so those calls could actually make sense.
> 
> This removes logic from the early boot path that executes from the 1:1
> mapping when booting a CONFIG_AMD_MEM_ENCRYPT=y kernel on a system that
> does not implement that (i.e., 99% of distro kernels)

Maybe I'm missing something but I don't see how this has changed anything 
other than moving the call to sme_encrypt_kernel() within the if statement 
(which means the check at the beginning of sme_encrypt_kernel() could be 
changed do just check for SEV now).

> 
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
>   arch/x86/include/asm/mem_encrypt.h | 4 ++--
>   arch/x86/kernel/head64.c           | 6 +++---
>   arch/x86/mm/mem_encrypt_identity.c | 8 +++-----
>   3 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
> index b31eb9fd5954..b1437ba0b3b8 100644
> --- a/arch/x86/include/asm/mem_encrypt.h
> +++ b/arch/x86/include/asm/mem_encrypt.h
> @@ -48,7 +48,7 @@ void __init sme_unmap_bootdata(char *real_mode_data);
>   void __init sme_early_init(void);
>   
>   void __init sme_encrypt_kernel(struct boot_params *bp);
> -void __init sme_enable(struct boot_params *bp);
> +void sme_enable(struct boot_params *bp);
>   
>   int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size);
>   int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size);
> @@ -82,7 +82,7 @@ static inline void __init sme_unmap_bootdata(char *real_mode_data) { }
>   static inline void __init sme_early_init(void) { }
>   
>   static inline void __init sme_encrypt_kernel(struct boot_params *bp) { }
> -static inline void __init sme_enable(struct boot_params *bp) { }
> +static inline void sme_enable(struct boot_params *bp) { }
>   
>   static inline void sev_es_init_vc_handling(void) { }
>   
> diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
> index deaaea3280d9..f37278d1cf85 100644
> --- a/arch/x86/kernel/head64.c
> +++ b/arch/x86/kernel/head64.c
> @@ -98,9 +98,6 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdv
>   	unsigned long vaddr, vaddr_end;
>   	int i;
>   
> -	/* Encrypt the kernel and related (if SME is active) */
> -	sme_encrypt_kernel(bp);
> -
>   	/*
>   	 * Clear the memory encryption mask from the .bss..decrypted section.
>   	 * The bss section will be memset to zero later in the initialization so
> @@ -108,6 +105,9 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, pmdv
>   	 * attribute.
>   	 */

The comment above this if statement should now probably be moved into the 
if portion of the statement after the sme_encrypt_kernel() call, since now 
more than just bss_decrypted work is being done here.

>   	if (sme_get_me_mask()) {
> +		/* Encrypt the kernel and related */
> +		sme_encrypt_kernel(bp);
> +
>   		vaddr = (unsigned long)__start_bss_decrypted;
>   		vaddr_end = (unsigned long)__end_bss_decrypted;
>   
> diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c
> index 0166ab1780cc..7ddcf960e92a 100644
> --- a/arch/x86/mm/mem_encrypt_identity.c
> +++ b/arch/x86/mm/mem_encrypt_identity.c
> @@ -45,6 +45,7 @@
>   #include <asm/sections.h>
>   #include <asm/cmdline.h>
>   #include <asm/coco.h>
> +#include <asm/init.h>
>   #include <asm/sev.h>
>   
>   #include "mm_internal.h"
> @@ -502,18 +503,15 @@ void __init sme_encrypt_kernel(struct boot_params *bp)
>   	native_write_cr3(__native_read_cr3());
>   }
>   
> -void __init sme_enable(struct boot_params *bp)
> +void __head sme_enable(struct boot_params *bp)
>   {
>   	const char *cmdline_ptr, *cmdline_arg, *cmdline_on;
>   	unsigned int eax, ebx, ecx, edx;
>   	unsigned long feature_mask;
>   	unsigned long me_mask;
>   	char buffer[16];
> -	bool snp;
>   	u64 msr;
>   
> -	snp = snp_init(bp);

The snp_init() call is here because the SNP CPUID table needs to be 
established before the below CPUID instruction is executed. This can't be 
moved.

Thanks,
Tom

> -
>   	/* Check for the SME/SEV support leaf */
>   	eax = 0x80000000;
>   	ecx = 0;
> @@ -546,7 +544,7 @@ void __init sme_enable(struct boot_params *bp)
>   	feature_mask = (msr & MSR_AMD64_SEV_ENABLED) ? AMD_SEV_BIT : AMD_SME_BIT;
>   
>   	/* The SEV-SNP CC blob should never be present unless SEV-SNP is enabled. */
> -	if (snp && !(msr & MSR_AMD64_SEV_SNP_ENABLED))
> +	if (snp_init(bp) && !(msr & MSR_AMD64_SEV_SNP_ENABLED))
>   		snp_abort();
>   
>   	/* Check if memory encryption is enabled */