Received-SPF: pass (google.com: domain of linux-kernel+bounces-128791-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <b2da0a15-c0f5-49a7-b34c-eb408e9aa293@amd.com>
Date: Tue, 2 Apr 2024 17:31:09 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] x86/sev: Apply RMP table fixups for kexec.
Content-Language: en-US
To: Tom Lendacky <thomas.lendacky@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>
 <b1822884-cba3-4009-d685-81a36dbb4353@amd.com>
From: "Kalra, Ashish" <ashish.kalra@amd.com>
In-Reply-To: <b1822884-cba3-4009-d685-81a36dbb4353@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?T1lrbmZYU1NNdUVYY3R4QTdjV2hxV2VwZGViS3BHMXJZK3FveUNoWEZ2SmFG?=
 =?utf-8?B?bStTeFY2OFV5bTVvbzBTbkcwZkZSMytxYWZlYlZyWkM4VEJHQ0ZFRWY0LzFJ?=
 =?utf-8?B?VGppVm1nYUtXSVl0TkhKLzZOdGluajJqYjZHdkFDb2owVmJqdURJcFhFQnBH?=
 =?utf-8?B?aS9uRURtckdLRjNuWGd5dTFOdkZpOWdReXZmMHFBR1B3cXo4R0VHcVV3N0Ns?=
 =?utf-8?B?dGI1ZUhOWnlnN3VYYkd1OXFZd3JmTFoyZHRvbzVueTJaVkVFNFVsdGN1TEsv?=
 =?utf-8?B?VzcrU1ZiWGxVUzhPNDg0RXFDRk1PL2txQ0g4elVjTUZ2NUk1QUdqVzFBbDAy?=
 =?utf-8?B?VGZ4RzNqQWdPZXRmUUQ1SHFQdzFiSDFtdm5hV2hwc0pubkRoK052RUFNQkNZ?=
 =?utf-8?B?NTd1WmJQeWVCRnVCaUdsdjZNL3lPU2tpNEN4cERyNkRFSjIrYlBqdEdxdGZD?=
 =?utf-8?B?c1VCNXFvZG5NL1h1NDJzQzFaK3pNSndqbUlLU2FBRUFmQ3pTeU52TGY3YjVG?=
 =?utf-8?B?L0FpRkhJVWVhK2tsNzdWc1k0RmFiV0hOWW1MWXNzeXIxZkR2clBJclFDZm91?=
 =?utf-8?B?eVlvRkd4RWhGMmk0T1I2ZG00TURiYXlSMUUzeFhMbnVyVUhYQVlZV3E3QWd3?=
 =?utf-8?B?ZGVkUStHb0ptM09KRFBzTTR1VmMwdTM1ZSs1TUdWUVdxYkp2anpab21pbm1M?=
 =?utf-8?B?VG9KcHVWdVh5OEJLYjFjRlkvb2tWeFJLa1F1czJtbWdmdTRtZUFYTzJvbFJP?=
 =?utf-8?B?UWQxdE4xNWs1QjNncmp3em5GNTZCM3pBclY1U2JyYmNTTXptWmtyZmxDd1Y3?=
 =?utf-8?B?UWxRL0Zsc085RHlERjlKbHo5ekdqT2dmL2ljMGxONWtKcEh1TDZSQlNnWlBr?=
 =?utf-8?B?bEJrN05wT280VEZ1allEWDhKQ2NvajViZitnK05Idkd0OHd2VW53V3loaE51?=
 =?utf-8?B?aHMzb2w2a2NLeEZOclltN0N0dytTQ2VBWC9ZbHdLZS9vcnU0UlYzN1NjWjhr?=
 =?utf-8?B?eTNGSWhSZmNoRXphbzJTbTMwcXZnWUt3T3N3SW9MVW1IcWlSUzUrb2RGMU1S?=
 =?utf-8?B?ZzZzbGtRb3BZYTIvU3Fqemw3dEZjVTJCSjJKRURxWE81TERXblFhV1dHSEE1?=
 =?utf-8?B?d0k0blpCblBxNkt4WVVvTnF1WGVrakx5VDNWSEUrdm96QTFRQ1Rqc0JzNkJN?=
 =?utf-8?B?VUM1NE5nQmpmR2kvSUFGZjU4VncydnRyUllrMmd4NEU1KzVvV2JaTk9zdU5j?=
 =?utf-8?B?dFcybm1hRG5uayt1ZHkxSkM0OXowL1I2NFhxT3pGdXRvR0k1VzB2djRNTjN3?=
 =?utf-8?B?aEFxRHZxTHdjVGpzUTdtVXpuQ01uM0hwWVV5Q1c4akw3Y2hCREJTbGozSkVU?=
 =?utf-8?B?KzhjeTRRTmgycUtueHgzcVZrc3BlckxYbXBKeWVzR0Z3RWh5dE00cnRodVpx?=
 =?utf-8?B?QTJMd3lNSmIwYTM0VktIVHdFUWptTURwc1pKUDJoWVRIelQ3TndqYy9XZjZV?=
 =?utf-8?B?WHllMTZQYUtZSDRTY1FsUkZuRnpsa2RqSVZ4M09oNkVqMDV1aVR0L0FZY1J0?=
 =?utf-8?B?RzVHTjhOZGJoZTBWeUVZRXNKaEh5Q1NGVWdPMklBV3NCS0M3ekFzSWhxVEZS?=
 =?utf-8?B?TFJnVDJvNStRS2FNcGlQZE1rK01Rbk1peGtvclhTYStDNkhSN25vTVlxQW55?=
 =?utf-8?B?QTVMa3JXWnRkdEY2TmlPN2ZQSXdFVldSYWUxNFpKMnJRUVBGaWc4ampaRUFs?=
 =?utf-8?B?NUtRRFhNYnNOZ2hXc2dWWjJZNUtDSWV5ek9OMER2T1N0b1B0SmFOaHZsWlIx?=
 =?utf-8?B?UWxORHdGMzh3STZwSmVNRGlSTGFCMDBMdGtXbzk3VVgvYTVDSmU4S2ZqVVcv?=
 =?utf-8?B?MW1UV0xETVJ5SytOVDI4VFZVVlhJRUZSdzVoRk9hUmN1ZHROVGV0b2h1bkNF?=
 =?utf-8?B?c3Facy9CRUpmSmlXcjVDNWM2eXpWRW1WUEtmbVpJSGllV0N5bllaS0k0ZkZH?=
 =?utf-8?B?eTVkNmEyY0R3NGxIT2dxSld0MGdJR203R0VQWDRha0xCVkJXWVUwQmRxY2h3?=
 =?utf-8?B?NDNMNzJJOUJtdkdNTUYvMzFjU2NZNEFrT21KTzYxMzhyQ0lKRWZvMnF0ZitE?=
 =?utf-8?Q?X3j9FKbx8WfQQYDS8fIs1A5wv?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6e66398f-25d9-4014-e267-08dc5364992e
X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Apr 2024 22:31:11.2666
 (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: d/57/GW2t2yyktjoijWki7VlQG+fiSCdyKUjfcNQRBbDsMqQpPhcJJpnkjCEz9fpjDQ/LVH6z++iLz7y35RFbg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4374


On 4/2/2024 5:09 PM, Tom Lendacky wrote:
> 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)
>
Oh, so this requires snp_probe_rmptable_info() to be fixed to use the 
__init macro.

I believe that snp_probe_rmptable_info() should be anyway using the 
__init macro and this fix for snp_probe_rmptable_info() needs to be sent 
as a separate patch and regardless of this patch getting merged or not.

Thanks, Ashish

> Thanks,
> Tom
>
>> +
>>       return true;
>>   }