Received-SPF: pass (google.com: domain of linux-kernel+bounces-101378-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <f152da91-816e-4791-9afb-51f189acdbd6@amd.com>
Date: Wed, 13 Mar 2024 16:28:37 +0530
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] x86/sev: Apply RMP table fixups for kexec.
To: Ashish Kalra <Ashish.Kalra@amd.com>, linux-tip-commits@vger.kernel.org
Cc: bp@alien8.de, thomas.lendacky@amd.com, michael.roth@amd.com,
 x86@kernel.org, linux-kernel@vger.kernel.org
References: <20240312184757.52699-1-Ashish.Kalra@amd.com>
Content-Language: en-US
From: "Aithal, Srikanth" <sraithal@amd.com>
In-Reply-To: <20240312184757.52699-1-Ashish.Kalra@amd.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?ckpjaktJd21NK3RsWSt4ZkkraXZEMjNrbUtDK2wwZjJqcENvMVE0bWdNUWVP?=
 =?utf-8?B?eE9oQjBlbEpCTkNLd0tWbUMxQi9xMU10RHg3ckVCSjFRcEpFdS92dzljUzVR?=
 =?utf-8?B?dHhyOFhoNVRqTWlFR2RXWGhZM1ltZDRUV3VQTVdTUE5QQmZ3Q2I2MDd0eENQ?=
 =?utf-8?B?VkVoeHJ1a1R6dlJRM3JLY2YvR1gxN1J2U0dxWEVIZW56bnlHYkEybDZ6WVFU?=
 =?utf-8?B?TkROeEE3WXFsQm8wSFFXOWZSeDAzSXBLLzVUeGtSK2w2cGR5MVkwK1RacU81?=
 =?utf-8?B?blREa1I4N0M5VWFzVXl0WXEzd1R1UjZIL3NQQmhiL1dvZVlpMGdnUUE4Tkhy?=
 =?utf-8?B?V3ZDdkpJck5EblZUV0tRSUMrY1hWT2N0TE5RUkNwQ3VDTXNpTXhPbVFJSHVy?=
 =?utf-8?B?WW45emZHSUg5Q1hHcS91L3JZUURCbGdCaVNISlNmTWtWQ0hvQjJucVFjcnlI?=
 =?utf-8?B?Uk8wbytDdXBiT29FelVCa3JTcXl4bHcrN0Rlblp3MXh0L2hkNHFHWlNTTTlr?=
 =?utf-8?B?VFZMem5leVYvUEdobjRheHlLeDM3UHlweTlmSncyMlI3NklBbmkxdEtXRVlW?=
 =?utf-8?B?UXhacUZUSmlTTHFSNmtQeVplSUhyakZzcmIyV1dmekFucjV4eG42czUyQktZ?=
 =?utf-8?B?OTJwZ0oyelNaKzRZNldEcFJFZWk5M25MOGdMUkVoRyt4czJXc3p4a2p4KzJE?=
 =?utf-8?B?cy9kU3J1NEgzcWxXVTlZeXpyRTIrNVhZLzVFcnc1MjMxeXdobHpBWHJPejVy?=
 =?utf-8?B?eEU5dFh1dHo3NUlaVGZDYUVsZ2ZraENUY2JLVmJRdmphRGRyRFNuVWsrcmFj?=
 =?utf-8?B?M0JQNnByOWxQNnozbmFRaFJ2aXg0VEJaUzFGbjlMWnlmNGl6aHd6Vkhsd1lE?=
 =?utf-8?B?dUZKbFVqTGxXWWo1ZzcyTjZweTRpUExOT0ZTbHV0enNPdlRtcHpCRkpBNXZ3?=
 =?utf-8?B?ODNENjJqLzVSQzVFeDA4OWhJNHQvYUxvZTY3aEtsYmdYbGdKMW5PWDg1VE9H?=
 =?utf-8?B?QmJZSUxiNUJoTldqdHR2UWxCdE1xcWRYczNQWlZzWnFDVzRFdVpxVnNZQnl3?=
 =?utf-8?B?L2wvc05EcUQ1ZnloanJuSnBYYlltSWNyaTlVZlN2RjJKMjVRak5UazR2cEtT?=
 =?utf-8?B?ZjBISnZEczJ3YXpQdWpwbm9iSnp5MnpCZ2dxQzhmdm9CTG9CaURISzNRcUh1?=
 =?utf-8?B?dEtBU1BhVU5OVXIxZEczQVdYbnZDMGhTVXNodHl4TzNKOGltdmxab1p6STFu?=
 =?utf-8?B?WEFXSnFndkh3S09NaWdVa2FOOU1Ub1h5Q2tFa1hoUzdVb21OdFpxWTNPR2tC?=
 =?utf-8?B?Rm9NZmlnTXg1YlExTXZ1Z2ZuaHN0M1pwZ1V3dzZITkVWbnNqcWY2UFNvNEZk?=
 =?utf-8?B?UVluQldMWktwYU9jb3BZRnNaRUF1c2dwZzhIaVlmNFE1M2UyT29TTDFTL1da?=
 =?utf-8?B?L1hqTmdKeGROdDNQQzdZdzhVTGxhV00xQjJKcWtaenJGK2xmSHVzMmZXYkhY?=
 =?utf-8?B?dkUwclJJQWsvR2prSHNQbEhCYXpsSkhqeHRZeFpKRGRNRXo5Y2dEc05ab3Zk?=
 =?utf-8?B?S2JBd2V4TnRuYTN6NWg0WXk4SjhCTFg5WmU1MTRCVTQ5VTFrRXlwQ1FPcWg3?=
 =?utf-8?B?Wll2Q1NGUkFYU1NILytHQUdYY2M0eTR4TlJjRUsxQkJrUXU1cEhMV1Z1eUxZ?=
 =?utf-8?B?R3U0R0dGRDhaVExDMytiVDF1eXdaV2lyMlAzR0U4MmtmakJYaDdyT3Q2b0lF?=
 =?utf-8?B?Vk9EeDdVdFZna0IwSmR2TGFxcGR0OE9qb1p5TkxoRndPTlJTd1gwellpMHF0?=
 =?utf-8?B?a0hBeXZWRGltOHltQi96dmlYNklhSE5xN0g2cFBEVnJiOGNIUVc0elZWbnlP?=
 =?utf-8?B?enpXQ09JTjFQN3dhdjdFWkhrNTczM0ZkMElLTEVNcHpyZ0NQNEE0VGU2TjJ0?=
 =?utf-8?B?KzUxSGhzcnZZQ0JXVTNoZ1pzanN3bS9UcnhsaG5Ed1lHbDltaldmTlUxOHB6?=
 =?utf-8?B?eGdLQkw1bExCSXVSR3h3ZnJGWHZDUHlsbXJSZHdnTWYyS1FtM2g0V0htdUNz?=
 =?utf-8?B?MDZ1YzliMDRpNEhHUDh3aU5hdmpPNWUyTlp3Mmo1L2pLMmRZRXJGNnoweUo4?=
 =?utf-8?Q?lDilwIHMT371SpqPwXtkkl6KK?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ce1909c1-b74d-47df-5f83-08dc434c8d88
X-MS-Exchange-CrossTenant-AuthSource: IA1PR12MB6460.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 10:58:45.4285
 (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: mDQoTaxkTyZyxS8AC6vUNSdZTh7eMgCSUxk3+WnStVyM2R6qrApEYYgigaktJIlmQGEzem7MgogJi103a17rVg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4141

On 3/13/2024 12:17 AM, Ashish Kalra wrote:
> From: Ashish Kalra <ashish.kalra@amd.com>
> 
> RMP table start and end physical range may not be aligned to 2MB in
> the e820 tables causing fatal RMP page faults during kexec boot when
> new page allocations are done in the same 2MB page as the RMP table.
> Check if RMP table start and end physical range in e820_table is not
> aligned to 2MB and in that case use e820__range_update() to map this
> range to reserved.
> 
> Override e820__memory_setup_default() to check and apply these RMP table
> fixups in e820_table before e820_table is used to setup
> e280_table_firmware and e820_table_kexec.
> 
> Fixes: c3b86e61b756 ("x86/cpufeatures: Enable/unmask SEV-SNP CPU feature")
> Signed-off-by: Ashish Kalra <ashish.kalra@amd.com>
> ---
>   arch/x86/virt/svm/sev.c | 52 +++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 52 insertions(+)
> 
> diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c
> index cffe1157a90a..e0d7584df28f 100644
> --- a/arch/x86/virt/svm/sev.c
> +++ b/arch/x86/virt/svm/sev.c
> @@ -65,6 +65,8 @@ static u64 probed_rmp_base, probed_rmp_size;
>   static struct rmpentry *rmptable __ro_after_init;
>   static u64 rmptable_max_pfn __ro_after_init;
>   
> +static char *__init snp_rmptable_e820_fixup(void);
> +
>   static LIST_HEAD(snp_leaked_pages_list);
>   static DEFINE_SPINLOCK(snp_leaked_pages_list_lock);
>   
> @@ -160,9 +162,59 @@ bool snp_probe_rmptable_info(void)
>   	pr_info("RMP table physical range [0x%016llx - 0x%016llx]\n",
>   		probed_rmp_base, probed_rmp_base + probed_rmp_size - 1);
>   
> +	/*
> +	 * Override e820__memory_setup_default() to do any RMP table fixups
> +	 * for kexec if required.
> +	 */
> +	x86_init.resources.memory_setup = snp_rmptable_e820_fixup;
> +
>   	return true;
>   }
>   
> +/*
> + * Override e820__memory_setup_default() to do any RMP table fixups
> + * in e820_table before e820_table_firmware and e820_table_kexec
> + * are setup.
> + */
> +static char *__init snp_rmptable_e820_fixup(void)
> +{
> +	/* Populate e820_table from BIOS-supplied e820 map */
> +	char *p =  e820__memory_setup_default();
> +	u64 pa;
> +
> +	/*
> +	 * RMP table start & end physical range may not be aligned to 2MB in the
> +	 * e820 tables causing fatal RMP page faults during kexec boot when new
> +	 * page allocations are done in the same 2MB page as the RMP table.
> +	 * Check if RMP table start & end physical range in e820_table is not aligned
> +	 * to 2MB and in that case use e820__range_update() to map this range to reserved,
> +	 * e820__range_update() nicely handles partial range update and also
> +	 * merges any consecutive ranges of the same type.
> +	 * Need to override e820__memory_setup_default() to check and apply
> +	 * fixups in e820_table before e820_table is used to setup
> +	 * e280_table_firmware and e820_table_kexec.
> +	 */
> +	pa = probed_rmp_base;
> +	if (!IS_ALIGNED(pa, PMD_SIZE)) {
> +		pa = ALIGN_DOWN(pa, PMD_SIZE);
> +		if (e820__mapped_any(pa, pa + PMD_SIZE, E820_TYPE_RAM)) {
> +			pr_info("Reserving start of RMP table on a 2MB boundary [0x%016llx]\n", pa);
> +			e820__range_update(pa, PMD_SIZE, E820_TYPE_RAM, E820_TYPE_RESERVED);
> +		}
> +	}
> +
> +	pa = probed_rmp_base + probed_rmp_size;
> +	if (!IS_ALIGNED(pa, PMD_SIZE)) {
> +		pa = ALIGN_DOWN(pa, PMD_SIZE);
> +		if (e820__mapped_any(pa, pa + PMD_SIZE, E820_TYPE_RAM)) {
> +			pr_info("Reserving end of RMP table on a 2MB boundary [0x%016llx]\n", pa);
> +			e820__range_update(pa, PMD_SIZE, E820_TYPE_RAM, E820_TYPE_RESERVED);
> +		}
> +	}
> +
> +	return p;
> +}
> +
>   /*
>    * Do the necessary preparations which are verified by the firmware as
>    * described in the SNP_INIT_EX firmware command description in the SNP
Tested this patch, it fixes the kexec issue reported. Thank you.

Tested-by: Srikanth Aithal <sraithal@amd.com>