Received-SPF: pass (google.com: domain of linux-kernel+bounces-128758-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <b1822884-cba3-4009-d685-81a36dbb4353@amd.com>
Date: Tue, 2 Apr 2024 17:09:44 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.15.1
Content-Language: en-US
To: Ashish Kalra <Ashish.Kalra@amd.com>, linux-tip-commits@vger.kernel.org
Cc: bp@alien8.de, michael.roth@amd.com, x86@kernel.org,
 linux-kernel@vger.kernel.org
References: <20240312184757.52699-1-Ashish.Kalra@amd.com>
From: Tom Lendacky <thomas.lendacky@amd.com>
Subject: Re: [PATCH] x86/sev: Apply RMP table fixups for kexec.
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?Y3UweTNiaWFwM012RzBucGJMWnByNzI2NXE5TmRQYmF3UUVRK29NRjZTbThG?=
 =?utf-8?B?L3lTM2FLclMrckNaRjZGc2hWbDU2bC9iV1dWcmVla1o1RUZtL2g2amZVNmlY?=
 =?utf-8?B?emRqRHFYMmYzSUlPdlpGQ3FUc3VTQ1g0VTNmRXJYY3hDdXFiRGE4Ykp0UW8y?=
 =?utf-8?B?VHZuMGM5Q28rZXFpeUQyVjJIVXZMV0NZU3JPbnI2ZkpWWWdjNktUejlYbmpV?=
 =?utf-8?B?S3FZcndSdkJsMklmNHp0bkFsN3pFdHUvNTZyWXpjUENJK2czMkw5bmJDZjJ0?=
 =?utf-8?B?d0E0YUpyRk5kYmNCTzlXUGN4T3phUlM1WlhuYzNRNE5uTmVuL09OUU9VVWlj?=
 =?utf-8?B?V0NvWk1xN3hzZjB2Mk5hK05JVTk0WnBsSGl6d3hGWHcwWE9OOXF3N3RkTVdH?=
 =?utf-8?B?UDdpaVlFck5zK29qbXlKbk1kdS9pSlFUTDhCOUppdE9ZcVJBcjRlb2NNMHVC?=
 =?utf-8?B?ODQwSWxxSVhiU0RvYVVEMTZQODBaajhwUkhVdC8xWVcreG4xOHoxQVNvNExX?=
 =?utf-8?B?dXZoMloycERPVW1QRlA4L0U1cmluUU11WHZRZ2R6MTFFVWl4R0RSQ3dKd2Jx?=
 =?utf-8?B?ZFltdXhZd1oyNGZCYUdXd2RScm82b05HOXh4eXZ5Uk1TbG1KQ28xWGgrOVRn?=
 =?utf-8?B?V3FKZklWVXVOMHNLaURianl4OGI5K1Y5RTRDNnpTWUE1NWZ4MmZUNXdGOUJ2?=
 =?utf-8?B?bjdqeVZVWEJqMkxSeW4zYytBQVdCUWlRM0l4NklhdW5iUWc1bk5yQkN0NTR3?=
 =?utf-8?B?aXV5bDJnQUx1Z2hseHRpS0EwWVIyT1R3Yy9GSU4rVjlCTHBPWkFuZEFiNFM2?=
 =?utf-8?B?c1ZtRDljblhhdlRGTmZjaVdCZE5sc2dodGFFK3I0dG9zWW9aYXJ4RG9lc2kz?=
 =?utf-8?B?NFFRUXVhMndsOEZFM1A5dmNHSlFvVEdxRVBlWUVYRXRvSjFVY3pORU9Jak9Y?=
 =?utf-8?B?K3lpMXhuc0dsMlNOWGNkZndFZmFFN0czMGwvZnhyUXA0dlN4N2M5aUxLaSti?=
 =?utf-8?B?TTNRSGxCalZZRVR4RFRRd0pkVFdvSlRISjBzNU1QdU1PNE9OQzVtRlRnVkV0?=
 =?utf-8?B?b0xiTkYzSjlTU2FwQVJ3VnlVRk1QaGVlSFlTeDBkajhaV0F6enhOMVlLcWUv?=
 =?utf-8?B?SzNDbHJoRkwxS3c2WlVaK1F4bldybG9FU3BPSUFXQmZORzRETWxuTjNLdlZB?=
 =?utf-8?B?QzFpYkJ2SmtIYjBTZ0xrUllYVFluMldYSjNLbVBhMFRmN1VObVRTcGh1MklV?=
 =?utf-8?B?UGxGcVA3bnlZSEF3QStZM0dLbVlsOVE4R01MMFU1QnFkQU8zK1QzUmNrTjVV?=
 =?utf-8?B?UEkxbWxpTE5hU25LOGlUNjY1Q2xLcDdHR0V4TFI3Vyt4dWtVWGtIL3dZUkxu?=
 =?utf-8?B?enR1RDFuSURRZkVPbnA0RTBGbWNRRmhzaThWWFc0eGZjNE9tdnh5cVVQQlJq?=
 =?utf-8?B?M1NjMFQ5cUdCRW5XeUZiLzRaSFYwQ3k5Z0hqZS9GVkliYmFxeEkvTVFweTJw?=
 =?utf-8?B?UERacWdRKzV4Q0xsZTZkdyt0Y1JtbUhKUGJLeGdxN0pkR0V6aE1BMzVJSVh2?=
 =?utf-8?B?SHg4M0J3Rmg2K1FFcjBYenk2TjdOdFhwMEkwcUFlTlczOVdOVlNDVFhRSG1H?=
 =?utf-8?B?QlpNbUw5YytJb0pxL2d6M1VUNi9rQmZmQzl3eEhqTVZSWFBUVUh2RW01cHdC?=
 =?utf-8?B?YzYvM2dvWDhqY0NNbUJpTzhFN1pHUGR3MGk5Q3JYSW02V2lKbzVmTEJ1d2Jj?=
 =?utf-8?B?L0JTYkNnWnIvclZoYWRMdnJaakEzZHhCTW1NV0JXbHE3UnFaMVdVOFFKOTkr?=
 =?utf-8?B?UjdFVGJkRWJ5VGR1YjVSUFBTQy9NSVVkbGVsTHB4cHFSNEV1RGxabGgxa1Vj?=
 =?utf-8?B?blVkKzJNMjJNaEthenI2Q0xNT2VlQ0xETUpZZzhMQkI1T2tlMlB2TlVPM3ov?=
 =?utf-8?B?akE4VEMvTjQ0UEVCNmUxYldWdVJYdHYrcHJ3UWJtaGE2YlA2N1ZVTjduM2E1?=
 =?utf-8?B?N1V4cHB0YlN6Q3ZUT09ld1MxVk9tRFhpcDVEdTRaaHM5Qk9KU2EvUFZ3MHZW?=
 =?utf-8?B?aFRaOHJ4czZrZWUrZjE0VDkyN2FFSi82ajZ4TlFHNEpDSmdUOFo4OFVBbHNy?=
 =?utf-8?Q?zFyYodq1Hm5S9rbNLJWYS2aD8?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ded3e391-619a-4fdb-74b1-08dc53619b82
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5732.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 22:09:46.7525
 (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: DyrhXZEg4rgz1J4Tlqw/GLpqMWP0bvtr98hzzWB2wR6Ufp4c8AgJ/FZ155qxKMOyz1YD/G+8NzRzNRsLdfs8kQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7327

On 3/12/24 13:47, 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;

This produces a build warning:

WARNING: modpost: vmlinux: section mismatch in reference: snp_probe_rmptable_info+0x95 (section: .text) -> x86_init (section: .init.data)
WARNING: modpost: vmlinux: section mismatch in reference: snp_probe_rmptable_info+0x99 (section: .text) -> snp_rmptable_e820_fixup (section: .init.text)

Thanks,
Tom

> +
>   	return true;
>   }