Received-SPF: pass (google.com: domain of linux-kernel+bounces-199217-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <16622c3a-034e-9f78-3afa-b0c273ee4949@amd.com>
Date: Mon, 3 Jun 2024 08:30:26 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
To: Borislav Petkov <bp@kernel.org>, X86 ML <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>, David Kaplan <david.kaplan@amd.com>,
 Borislav Petkov <bp@alien8.de>
References: <20240603083036.637-1-bp@kernel.org>
Content-Language: en-US
From: Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [PATCH] x86/kexec: Fix bug with call depth tracking
In-Reply-To: <20240603083036.637-1-bp@kernel.org>
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?Rjk2WnpvamRlcEhORUNTUkh4TEVKaXZydGVmbGpmeitKS0VncDR0alVuNzFJ?=
 =?utf-8?B?TzFGYWZWTVFLc2tBeDRIOFZtWitUVTNzMzhLL3lDdFhpMkdXcmpZQm1FaUZm?=
 =?utf-8?B?SHA3M3p5bDI4RUtMSk90MzF4M3R6Z1VlUGMxTmpLdHV2S1hMN28vVkF5dzhK?=
 =?utf-8?B?NUxQY3JHWWswVUdwSVZXZGZjSWFEZWIrV1N6RWpMK3F6NEFvWkt0T1FOMTI1?=
 =?utf-8?B?ZUNIZG5NdjdkRllzRFFzNTNhSEsyc1N0bUl2NGJYM3VhYXQ2U2JKZitCdDdW?=
 =?utf-8?B?eGVWRnpFK3BqTFhKTHhlZFpKNjVrek9aV0RUMkxLZDgrOUNONVVUTmgzQjg0?=
 =?utf-8?B?YWx1MWZZVzhNeUhpM2xjUGNJaExacmc2V21LNzdmaGNLQkk4OEtyUjFEa3dW?=
 =?utf-8?B?Z05xNnIwR0J3WlhLS3p2WFBNdDFGeHBoQnBCZ1VTdFQ1U25JVzRNSzM0aDBL?=
 =?utf-8?B?dzhJMGI5VVVNOUY3OEtrTjFTUDBodFIrcjdHM3ltSUg0bGZ6aVNxOERUZFEz?=
 =?utf-8?B?R3U0RzlOdGM5R1A1WDZjSmFUTlltQnpHOEVWbWFYME04WnlmeDN5Z3k4dUVx?=
 =?utf-8?B?T0txL3lNa3BRdVZpU29RRFk0cE9YYzVCTEgvRFF6b2Y4L3IzcWQxNjYycVc5?=
 =?utf-8?B?bWhqNWk5a1pKc3pjc0ZtdTZHT1dJdTZ2VWxkTjk3VTUwVWI2TXQyd2FIOHRQ?=
 =?utf-8?B?Wk1OUnBBRGQvSVY0eWJ1akNYV1l6a2ZzV3h6ZHdLM1dIUDJyMWplQWR6VVcz?=
 =?utf-8?B?aE1GSjJESFlrNGtQNHNuNXludGtma3BQSHJpSngxc1M2YVJURk9mVWdPamcz?=
 =?utf-8?B?eE01bEtMSTRjR2FoZjlrKzA5dE9vSC9EUVZEYjRKdHAwVDFEdm4zRmhjQ1pR?=
 =?utf-8?B?SDR5bDZiQ0ZsZ1oxMktCeGhNRTFQQ0dHVUdmV3VQOEFJWEtOajN4TkxIYk42?=
 =?utf-8?B?ZityT2VkcXAyS3ltcThzV3FieHQyaEk0dXNzanVLZWFZZkRRVUpQQ3Ixejls?=
 =?utf-8?B?b2kwMXpEZVJkMHRWdmo2MlBicFgxY200cFVYYXhML25DcHNSNXZ1eXlOSFVO?=
 =?utf-8?B?RFBrWXdMVkIydVk4cGJvRDRJU2Yrb0dOSUlMcnR5Kzh1WUZBemxaK1MveGtp?=
 =?utf-8?B?T0dhLzM2UlNxZ25uNGNZdzF1eWdPbkFPNms2VHZOMG90cnFpV1dBYXNZTVRL?=
 =?utf-8?B?dEUrUFNGS01lTktGQmpNd2dkc2VSeWVnZWVkYnM1VU9DVGpCM0xUbU1PY1Vp?=
 =?utf-8?B?czFNZ3Y3dnZ3RDhlT2lmdjMrK0tNcmNXanI2ZWY0dHVsUTJ0TklwWEZ4NWxz?=
 =?utf-8?B?Y2FHQ2FUN0V4Q1lhd0lwRDlJN3R0Y0JBcUZpOHpldFVSbU1QMm5GekFyc1FG?=
 =?utf-8?B?bVljUEg5WGFLeEIzdStMTmM1SGZ1VTdnSWhiQWF0N0NLU1BJSEk0ZFhhRjdl?=
 =?utf-8?B?KzRLMFkwS1FNc1AvaEN2RmhlRnNqY2dlN2hwaG9CbGFnek9BNVp3cE1HRU84?=
 =?utf-8?B?SHBZRTJZR25rSnJVWjJxSndQd1MyeWZQcFl3N3lPWmlSNWE0L3B0czRTZTBS?=
 =?utf-8?B?RmNuN1NWcnM4VHR6Q1IvQW02eU1rU0lsTldUVm9JdlFnNTdocUpQR1FveVh6?=
 =?utf-8?B?Q1pwVG5YaVExUHkyam1TWVlkZGFxS1QwYjNhRENuelAvb0ljQzhHN2VSdFJp?=
 =?utf-8?B?ZGtFQlFRa2N1RzhWUHRBem5hOUVTdFZBUUxEL1NtK3RJUkhuVWxqR3pldS9H?=
 =?utf-8?B?cUJybm5EelpDNzdHelNuTCs5S0M4S2txbU5YWWNFMEhZR2hZanhMSUdaeVA4?=
 =?utf-8?B?VkZ0RmEyazZEc1cweXN2Mm1McmREUlhhUU1WSzdNTXA0dUl3TjFXbzgzUFF1?=
 =?utf-8?B?QTUyQllvMFpwSEJucTB3UmJUeVlUUEtpczcxdk14dzA2YzFNdnVNRFRTdEZJ?=
 =?utf-8?B?Vi8za2xVNytjTnJsbnFWQ1BIVTc0NDVsWWM1c2x5R0loRE55SmtxN3dMVDZD?=
 =?utf-8?B?d1pqWEFhaFpTY2ZIWDZtbmdWSTM5NUhsZDE4ZVpESDU2RXFhSVQ1SjJwSXVq?=
 =?utf-8?B?NDlVUkd6SVczUHBFbytwdjFhT2w0YkphOUY1bUw3YUF6NzhMQ2RESVBPNWVk?=
 =?utf-8?Q?XMaDW6PiS2EBKl/pc8Q9xfxA4?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e3315204-6339-40cc-5e33-08dc83d1553e
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 13:30:28.4484
 (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: r3FYgbdMMSvI6npFli4+C7RBMYPYSeIwup0EOwd52x0LEk5ZUiBA0nwP2gRRK9IJkjSdzhQlhjLQWg0rk5cn4A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8371

On 6/3/24 03:30, Borislav Petkov wrote:
> From: David Kaplan <david.kaplan@amd.com>
> 
> The call to cc_platform_has() triggers a fault and system crash if call depth
> tracking is active because the GS segment has been reset by load_segments() and
> GS_BASE is now 0 but call depth tracking uses per-CPU variables to operate.
> 
> Call cc_platform_has() earlier in the function when GS is still valid.
> 
>    [ bp: Massage. ]
> 
> Signed-off-by: David Kaplan <david.kaplan@amd.com>
> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>

Minor nit below, otherwise:

Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>

Does it need a Fixes: tag for call depth tracking (before the change to 
cc_platform_has() it was a call to sme_active())?

> ---
>   arch/x86/kernel/machine_kexec_64.c | 11 +++++++++--
>   1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
> index b180d8e497c3..90b1946c06e5 100644
> --- a/arch/x86/kernel/machine_kexec_64.c
> +++ b/arch/x86/kernel/machine_kexec_64.c
> @@ -295,8 +295,15 @@ void machine_kexec_cleanup(struct kimage *image)
>   void machine_kexec(struct kimage *image)
>   {
>   	unsigned long page_list[PAGES_NR];
> -	void *control_page;
> +        unsigned int host_mem_enc_active;

Looks like spaces used here instead of tabs.

Thanks,
Tom

>   	int save_ftrace_enabled;
> +	void *control_page;
> +
> +	/*
> +	 * This must be done before load_segments() since if call depth tracking
> +	 * is used then GS must be valid to make any function calls.
> +	 */
> +	host_mem_enc_active = cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT);
>   
>   #ifdef CONFIG_KEXEC_JUMP
>   	if (image->preserve_context)
> @@ -358,7 +365,7 @@ void machine_kexec(struct kimage *image)
>   				       (unsigned long)page_list,
>   				       image->start,
>   				       image->preserve_context,
> -				       cc_platform_has(CC_ATTR_HOST_MEM_ENCRYPT));
> +				       host_mem_enc_active);
>   
>   #ifdef CONFIG_KEXEC_JUMP
>   	if (image->preserve_context)