Received-SPF: pass (google.com: domain of linux-kernel+bounces-22818-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <8d443374-1b3b-4099-a306-5f9e0fac7851@amd.com>
Date: Wed, 10 Jan 2024 15:33:13 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] x86/mm: Fix memory encryption features advertisement
Content-Language: en-US
To: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
 Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>,
 Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>
Cc: x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
 linux-kernel@vger.kernel.org, Dexuan Cui <decui@microsoft.com>,
 Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>
References: <20240110193514.15620-1-kirill.shutemov@linux.intel.com>
From: Tom Lendacky <thomas.lendacky@amd.com>
Autocrypt: addr=thomas.lendacky@amd.com; keydata=
 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
 vFkWitqCJg==
In-Reply-To: <20240110193514.15620-1-kirill.shutemov@linux.intel.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?aWNXK3RXWnJLK2RrLzBxV0hnK1QydXJVc3RIRjhjQ3hkNCt1U0NKSWp6dFJs?=
 =?utf-8?B?R01OQ2N2L29aT04zUFl2bStVS3Z2SEJsZkVhN3NlSjdEYm1IUG5qaVB3QWc1?=
 =?utf-8?B?aHhQK25jRXFxWEVDSUkyeGxEekxYKzNGb3Z5ZXBCc2NjNlRyZ2NXNXJCbVo4?=
 =?utf-8?B?TVRZeEs0NHdHd1ZjQkR3NW8vQVNIc0pzT3poYTRRdkxxWk83MWlaZUJISDRV?=
 =?utf-8?B?dTZWN242TGxMcStYdGIxZkRUWFlXRG5pTE9rTnFUaDkwUUVwejBGc0Rubk02?=
 =?utf-8?B?ejY5ZGdSaDRKQXZkT1U5NHdZby9EMHJBRVhHdUQvamZSbnNodExOazI5SmVL?=
 =?utf-8?B?V0pmd0NxeG1TYmV6VzZDbjYySjBtZUtmZUg4bXJnbGYrdGgxZjdRZTlnMGZk?=
 =?utf-8?B?bWNPS2dEOGlWL1QvNlR2RzVzbk84dkRCRlMyd0J4NEI0UllLcmg0NWtBdlNm?=
 =?utf-8?B?THN3U04wSHNleERuOThIa05GMjJYeUU2L2pDeDhHSFhIdE4zU25YenFEOEt4?=
 =?utf-8?B?ajhnWjB1OXNnWm83bTRzV2Z6ZzF5c3RUUEFDNW51V0hNZEMvMDB5OFNzWXlB?=
 =?utf-8?B?d3oyOXZ2WFZhREZuSDQ2ZnpnMVR3dkF6c3plYnBhUGpTS0ZHa0RLTmhvQ0d6?=
 =?utf-8?B?WEFkQWRxaHEycHozT2RrbmNwWEcxUUtNUzJxbUdkNGpOTjZXMEpmazFmRnZF?=
 =?utf-8?B?cW9ROS9Zcm1iaWtyaGVwb1g0WldPdWZuZVpnY050aFdKL1RpS0cxSTNRU2Qv?=
 =?utf-8?B?azRGUWpjSWtPUjRzcDFSOEgxaHdqcFRRTWVhUVk2SUVnQW4xSFNvUks5c1o0?=
 =?utf-8?B?OFlSWExVN2RrV2VuWmhNb0d0M0hJaTMrZURXS0NBcDhseDVHMEZ2Rk5xcExC?=
 =?utf-8?B?NEhZWmk1QXA4cWZPcTIwMllwSnZYODVIMkRYNmhjN0JubUFEZHRGQWsxVEVN?=
 =?utf-8?B?SmJFT242bzZrdjFXU2E3SkJsMUoyZnU4dGRvZlBJK3hadjZHWFZLSmpIbERG?=
 =?utf-8?B?bHFPb1A0RjZLTHVvM2dNenc5R0t4d1ZDUUMrOXZ3Szl3NUgxSVJZTFc2TnZV?=
 =?utf-8?B?Zyt1cXFabXhXZk04ZG5iSU5DSFNYdEZzdHpkSWovUHJQTGRySWFBOEgwV0F0?=
 =?utf-8?B?R09DdnZHc0xFVmtXMk5nNlM3czRMQkdXOWpXcVYzTndHMWlBZm5aY2JPcGpN?=
 =?utf-8?B?L0ZrVjNLM29MTTJQeDA2YnpEdUozMW8wbjA3OWUvTjIvMFg4OE5MMFd0N25u?=
 =?utf-8?B?bC91Rm1Bem4yVUhHRFo1Qlh5YXVaSWJ3Uk5KYXBWSnRYbHhud0VlOUxrS3Zn?=
 =?utf-8?B?aXN4elNyTXFmdVFYYXhpcGVwSmZrR1VVL2hUR1h4NEt2SWowVGVaUDl5dTYv?=
 =?utf-8?B?Qm5uWEtJelJ2VUZxaTJUL0dDb3dtY0tGamxHdWZBMCswV21FV3Q4TmYrb1FB?=
 =?utf-8?B?Zm9vSHdtSXpKNXZyU0hxSlY1d0FuQ3FjYjU2d20vVTFjQ3FEQzlWNWFmZ3lX?=
 =?utf-8?B?QlZmU3ZoREdIRldwd2hkRXZkNGVEMzg5Rk40ZnhkQ3QydWE5SHVkMWZVNWZt?=
 =?utf-8?B?R0RjSFAxRDNkRldLSjBtemxTRVpRQ3owWGNlQSsyK1ZTa1g1WUY5Q1V5ZGYv?=
 =?utf-8?B?ODgyYzViSzhkYWdISnMrYTRtZUtZalJnT2FFb2xZcUJrZUJuQjFWZEZHcUNa?=
 =?utf-8?B?eUtiL1NtTGFkbVZkMzdET0NnbUpheXBSSkg1c21uaDduMlhTVUNabHpWL3VL?=
 =?utf-8?B?T3RYbVZLYjZxd3VuaW9FL05XcGYzM01GaHRPTTNpc0lER3ZGZkRRUWFmdHR0?=
 =?utf-8?B?L004M1BTQkNUbWkrOXROZEd3SDVPU0F4a3FVbG9KQ2RBZXI5UVNpMnRUSWFz?=
 =?utf-8?B?YjIzQ3VVMkFQd1J3UTJSTUR4TmEwakZadkw2M1UyM1g0YzB6ZXZnTG5hbHlt?=
 =?utf-8?B?Kys0Y1piMDdnUTRPNEo0a3pqd3ppenF5RWdlRUt2aHZ6V1NWWWdUQWJzanV4?=
 =?utf-8?B?Z1U4MkhKSVcwSW5PVU90b1pZejhwU21jeTRTZVd3NG05d0RocUhGMnROTzRM?=
 =?utf-8?B?NVYvZVpCbkFBQjhOUU5ER3hja2RTdjFpVFloNjlQbitGMXBjVGg4aUV1eEJQ?=
 =?utf-8?Q?Zva5pHbhgin7yGMyXF28ARYlS?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7d66f9b2-fc3b-4a68-7eb5-08dc1223c111
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2024 21:33:15.3403
 (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: +4T9KztKN5KULTsERTQVTAO6Vz4qL40IBbJxsS/+JzqIC++3qRuiwYIZWSv8s4oateMOLssGi8PchyLxtlA7dg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7569

On 1/10/24 13:35, Kirill A. Shutemov wrote:
> When memory encryption is enabled, the kernel prints the encryption
> flavor that the system supports.
> 
> The check assumes that everything is AMD SME/SEV if it has the TDX CPU

s/if it has/if it doesn't have/

> feature set.
> 
> To avoid confusion, check the cc_vendor directly.

Is this because of the setting of cc_vendor in hv_vtom_init() without 
setting the TDX feature and so "Intel TDX" isn't printed and instead "AMD" 
is printed?

If so, the commit message should really have some info about how this 
relates to Hyper-V isolation VMs.

Thanks,
Tom

> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> Cc: Dexuan Cui <decui@microsoft.com>
> Cc: Jeremi Piotrowski <jpiotrowski@linux.microsoft.com>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
>   arch/x86/mm/mem_encrypt.c | 56 +++++++++++++++++++++------------------
>   1 file changed, 30 insertions(+), 26 deletions(-)
> 
> diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
> index c290c55b632b..d035bce3a2b0 100644
> --- a/arch/x86/mm/mem_encrypt.c
> +++ b/arch/x86/mm/mem_encrypt.c
> @@ -42,38 +42,42 @@ bool force_dma_unencrypted(struct device *dev)
>   
>   static void print_mem_encrypt_feature_info(void)
>   {
> -	pr_info("Memory Encryption Features active:");
> +	pr_info("Memory Encryption Features active: ");
>   
> -	if (cpu_feature_enabled(X86_FEATURE_TDX_GUEST)) {
> -		pr_cont(" Intel TDX\n");
> -		return;
> -	}
> +	switch (cc_vendor) {
> +	case CC_VENDOR_INTEL:
> +		pr_cont("Intel TDX\n");
> +		break;
> +	case CC_VENDOR_AMD:
> +		pr_cont("AMD");
>   
> -	pr_cont(" AMD");
> -
> -	/* Secure Memory Encryption */
> -	if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT)) {
> +		/* Secure Memory Encryption */
> +		if (cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT)) {
>   		/*
>   		 * SME is mutually exclusive with any of the SEV
>   		 * features below.
> -		 */
> -		pr_cont(" SME\n");
> -		return;
> +		*/
> +			pr_cont(" SME\n");
> +			return;
> +		}
> +
> +		/* Secure Encrypted Virtualization */
> +		if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT))
> +			pr_cont(" SEV");
> +
> +		/* Encrypted Register State */
> +		if (cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))
> +			pr_cont(" SEV-ES");
> +
> +		/* Secure Nested Paging */
> +		if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP))
> +			pr_cont(" SEV-SNP");
> +
> +		pr_cont("\n");
> +		break;
> +	default:
> +		pr_cont("Unknown\n");
>   	}
> -
> -	/* Secure Encrypted Virtualization */
> -	if (cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT))
> -		pr_cont(" SEV");
> -
> -	/* Encrypted Register State */
> -	if (cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT))
> -		pr_cont(" SEV-ES");
> -
> -	/* Secure Nested Paging */
> -	if (cc_platform_has(CC_ATTR_GUEST_SEV_SNP))
> -		pr_cont(" SEV-SNP");
> -
> -	pr_cont("\n");
>   }
>   
>   /* Architecture __weak replacement functions */