Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e2e1c555-603d-0834-c9c5-06b75c590ab6@oracle.com>
Date:   Tue, 1 Mar 2022 14:12:01 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.1
Subject: Re: [PATCH v4 09/10] crash hp: Add x86 crash hotplug support for
 kexec_file_load
Content-Language: en-US
To:     Baoquan He <bhe@redhat.com>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, vgoyal@redhat.com, tglx@linutronix.de,
        mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com,
        hpa@zytor.com, nramas@linux.microsoft.com, thomas.lendacky@amd.com,
        robh@kernel.org, efault@gmx.de, rppt@kernel.org,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com
References: <20220209195706.51522-1-eric.devolder@oracle.com>
 <20220209195706.51522-10-eric.devolder@oracle.com>
 <YhWzy87O4Y66LHH1@MiWiFi-R3L-srv>
From:   Eric DeVolder <eric.devolder@oracle.com>
In-Reply-To: <YhWzy87O4Y66LHH1@MiWiFi-R3L-srv>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aDdrZm5zSExsQk5WQnR5bUtyY3IrZENxZkRzbVdDMGZ2amdnemRMSHZTd0I1?=
 =?utf-8?B?STBZa3BLMldMU29TWjU5VlFKbDlRSGtKOWJZTDNZMXl0aEdtTnRnZDI3ek9o?=
 =?utf-8?B?dkdibXQ1ZHc5REF5cGhQY29uQTI3QUJhSVcxYWxZYVdGQUNRTU5uVHgyYkZV?=
 =?utf-8?B?Zjdta3dublcxeUUzM1JKUjc2a3JmenBpWVEvWURjVGNyTm1nbGhwUnFNVWk0?=
 =?utf-8?B?SkpBdEZHeHg3enZzS1F3SlNKU0pwb1dxWmhDM2U3MVFxVzEzZndKM2RqOEtu?=
 =?utf-8?B?dmh1bVVneDNTUkNuK0dnWnpBYjRsTXJZWFZERVd5NTdpM3VwOU9BbTZUL2V1?=
 =?utf-8?B?SjRqd2tvMWZwVm9IeXNlRDZ0THlmTUxZNkp4WlVZWDBteHppWjFCT3E1T3lX?=
 =?utf-8?B?NzFZY0JtZHA0L2R2VUtxeWY2WHdlOERkclk0K3lOUmR6dE44R1BvSmNuc0pn?=
 =?utf-8?B?WGNhbzNkRjhKYXU4V3pJZHVEbklYV1g2eHl6d3dFL1B1Vk00aFZPNVFHdlZv?=
 =?utf-8?B?L1BXWU8wZzFDcDZuUU5mMVZIWmNpK2NiaGFYcVUrdFFJRlc5ZU1Xa2JvaTRx?=
 =?utf-8?B?dWpHVjRkaGFMeXNSb3l1M2NFNjdmcmRGeVk3cnRydS9Cc1ZTY1VhSHRnK3ht?=
 =?utf-8?B?ZE5iZWwyTm0ydmZ0KzJZQUZaZ3NzU3pnVjBlRFh2UXNiTVBib3Y0UmJKbUV0?=
 =?utf-8?B?ZnluMmYxNE1wT0FzWGc5bFMxZ0NTSzMrNDNscUptZDJXbVlYak12eCtjWmdV?=
 =?utf-8?B?RFZ0SWdjSTVUSUpkRUFYQ1hZQ3plM2JwaWdFWHBWWDhTemF2TlFRMUZoT3lF?=
 =?utf-8?B?ZG9mN2FjNU4yRnRiTkNRQ09aSzNTRFRFc2haOTc5bUhHZmp2Sk1yRkFZbmI2?=
 =?utf-8?B?cXZWQU1BekRPS0pVMzNaT2Z2c3huN01MVjVwUGVSVWpmRGJoQWFXT2xIY01j?=
 =?utf-8?B?aVBxck1MYVd1aWlRbmhNZDNZQlRtTSsvS3dkQnlVa3pTV2VFQTRrNXFwbWhF?=
 =?utf-8?B?dE84OEZ6a3Y3R3RQNzlicTVYdEhMK1k3ZlFTMXVNVjl4SW1JRkNrVmJqQkVY?=
 =?utf-8?B?V2JwUTlramlwQWNUZ3U2TTBJQVZGTnk3aHRiUGdTU1lIalFLOHdPTm1teUor?=
 =?utf-8?B?eGJKTGd4cmJKMXN6amJsMkNVVTlyeW96czFWbENBWHF5a3lSVUtWVXd4Y0dB?=
 =?utf-8?B?bmNRZ25nZkdkNnR4bjJWamt4KzE5LzlVdjJnV3IvOXBwdS9HUU1xdHNiK3J2?=
 =?utf-8?B?bnBsOXdKRThxeHZlT1h2d3QyMlhZVjBRemhXWnNpd3pab2l5dThUZFpITTlu?=
 =?utf-8?B?aUdCWjlPaWRpSUtwdGNNWmVnejJqcDk0dzdGanIwQ2NIQmFWd1c2UFlvSFU3?=
 =?utf-8?B?OG9rbnF5VDc5OWNIeG5nNXlnbFF5YXBaaEp1WlpBMDQ2MGdzd2NIZ2gzeVcw?=
 =?utf-8?B?RWgyeUR3eDNxR2Q3bytXMjEwcUptTmNKZVVoWGZveFdKRWkxck9ldjVlWTJL?=
 =?utf-8?B?cDU0RGhWQStVaWpZdzQ0ZVpibE90aDJyemdUOHYwcFhUa2VnazF0N1pyTFRS?=
 =?utf-8?B?dmRFYStBL2VzUlpEdGRvdElNMFNncDNuQktlWHp4eUxNMEVpWHFsaFBkSGEv?=
 =?utf-8?B?enhmQXZxd3ZEYjFGR2R6ZHdzRWsvUVEzVnUzL1RiR1pDc25POE1qK1dJWDRy?=
 =?utf-8?B?RzhoZDVGTnFGSFU4dGN6STJNbmxqVGFFcUNtY2dld3ZWMGYzRzdjUDhZVmNL?=
 =?utf-8?B?UzEzcnM2dHFhUzZoSFJPZEZLTEhabnE3NGlqTGcwK0hvVE5jTDE2ZXRHTnY3?=
 =?utf-8?B?TmpoTTZWUjBBZkZlVHQxUTdGSkc2VXNpNUk4MXJSa1B4ZlBkSFpzNkRzTVNJ?=
 =?utf-8?B?U2VaWFFhQ0VaRFRCZjhFTWVQNEJZejlQK25NZTFCdFlvU3dCbHM2OFZxeC9u?=
 =?utf-8?B?YmJaeUxrcVEwVWluMXQvQ2hPK2lHNFRTUVpML3hhcnZhVksxT082OEhueDBY?=
 =?utf-8?B?WHYxOEIyVFBlcjVDT3VuNG4wNUJ0MWpRU1NtbmJBS01DRUg1Ry9rb0dDbkli?=
 =?utf-8?B?b09ld1VXcUVpZEVYWldpZWdTbFdDRXc2dUx5UEVxUFQ5VkJGSDNrdjlsU2VC?=
 =?utf-8?B?U3dOZUFLT3V1SkdJQm8xMHBOdVU3SHVXQnIyZUlLZGtDYW0xUHJkbnFSeWkv?=
 =?utf-8?B?U01NNmxsc1VYRFdlS1I5MllVUFowOWc4N0lUSDl6UHFCbVdEVzRiKzhwbXRa?=
 =?utf-8?B?bnFlV1IvZkROdHlZb1B3M3FCMHJhTkdhSUE1M1Vyc0JWNHRSUDh0OC95emxD?=
 =?utf-8?Q?kF2EOnPAL7eBWOaghR?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d675634e-2172-4338-c17f-08d9fbbfc35b
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 20:12:08.7031
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ztoi3/XFnRxRZ6c+myS8M1yzQQ8bo7xyc/VPdEBBmILMRYIGy+0FjIcLQefHiIPXP0ooFjYHdx3+3CWBAqYQ3x6lzjoNeoJfYU4q4fvaTUE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3399
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10273 signatures=685966
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 malwarescore=0
 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2203010101
X-Proofpoint-ORIG-GUID: AwB7gPVfw7A7iyQ7lVLeRKP_WGWQv93Q
X-Proofpoint-GUID: AwB7gPVfw7A7iyQ7lVLeRKP_WGWQv93Q
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2/22/22 22:10, Baoquan He wrote:
> On 02/09/22 at 02:57pm, Eric DeVolder wrote:
>> For x86_64, when CPU or memory is hot un/plugged, the crash
>> elfcorehdr, which describes the CPUs and memory in the system,
>> must also be updated.
> 
> Please mark the patch as X86 related by adding:
> 
> x86/kexec: Add x86 crash hotplug support for kexec_file_load
Done!
> 
> And also update other subject to reflect under which component the
> changes are made, crash hp is the feature name.
Here's what I have at the moment, is this matching expectation?

pick 891fcff41a8f crash: fix minor typo/bug in debug message
pick 8f44e0d695be crash hp: Introduce CRASH_HOTPLUG configuration options
pick bae60e9db6ad crash: prototype change for crash_prepare_elf64_headers
pick cb98d1d923c8 crash: generic crash hotplug support infrastructure
pick 40e4434abad4 kexec: exclude elfcorehdr from the segment digest
pick 75039922aedc kexec: exclude hot remove cpu from elfcorehdr notes
pick 0be483dadeb8 x86/kexec: Add x86 crash hotplug support for kexec_file_load
pick 388bb5e4bf9a x86/kexec: Add x86 crash hotplug support for kexec_load

> 
> Otherwise, this looks good to me.
Thanks!
eric

> 
>>
>> To update the elfcorehdr for x86_64, a new elfcorehdr must be
>> generated from the available CPUs and memory. The new elfcorehdr
>> is prepared into a buffer, and if no errors occur, it is
>> installed over the top of the existing elfcorehdr.
>>
>> In the patch 'crash hp: exclude elfcorehdr from the segment digest'
>> the need to update purgatory due to the change in elfcorehdr was
>> eliminated.  As a result, no changes to purgatory or boot_params
>> (as the elfcorehdr= kernel command line parameter pointer
>> remains unchanged and correct) are needed, just elfcorehdr.
>>
>> To accommodate a growing number of resources via hotplug, the
>> elfcorehdr segment must be sufficiently large enough to accommodate
>> changes, see the CRASH_HOTPLUG_ELFCOREHDR_SZ configure item.
>>
>> With this change, the kexec_file_load syscall (not kexec_load)
>> is supported. When loading the crash kernel via kexec_file_load,
>> the elfcorehdr is identified at load time in crash_load_segments().
>>
>> Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
>> ---
>>   arch/x86/kernel/crash.c | 92 +++++++++++++++++++++++++++++++++++++++++
>>   1 file changed, 92 insertions(+)
>>
>> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
>> index 9db41cce8d97..6215c51919db 100644
>> --- a/arch/x86/kernel/crash.c
>> +++ b/arch/x86/kernel/crash.c
>> @@ -25,6 +25,7 @@
>>   #include <linux/slab.h>
>>   #include <linux/vmalloc.h>
>>   #include <linux/memblock.h>
>> +#include <linux/highmem.h>
>>   
>>   #include <asm/processor.h>
>>   #include <asm/hardirq.h>
>> @@ -398,7 +399,17 @@ int crash_load_segments(struct kimage *image)
>>   	image->elf_headers = kbuf.buffer;
>>   	image->elf_headers_sz = kbuf.bufsz;
>>   
>> +#ifdef CONFIG_CRASH_HOTPLUG
>> +	/* Ensure elfcorehdr segment large enough for hotplug changes */
>> +	kbuf.memsz = CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ;
>> +	/* For marking as usable to crash kernel */
>> +	image->elf_headers_sz = kbuf.memsz;
>> +	/* Record the index of the elfcorehdr segment */
>> +	image->elf_index = image->nr_segments;
>> +	image->elf_index_valid = true;
>> +#else
>>   	kbuf.memsz = kbuf.bufsz;
>> +#endif
>>   	kbuf.buf_align = ELF_CORE_HEADER_ALIGN;
>>   	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
>>   	ret = kexec_add_buffer(&kbuf);
>> @@ -413,3 +424,84 @@ int crash_load_segments(struct kimage *image)
>>   	return ret;
>>   }
>>   #endif /* CONFIG_KEXEC_FILE */
>> +
>> +#ifdef CONFIG_CRASH_HOTPLUG
>> +/**
>> + * arch_crash_hotplug_handler() - Handle hotplug elfcorehdr changes
>> + * @image: the active struct kimage
>> + * @hp_action: the hot un/plug action being handled
>> + * @a: first parameter dependent upon hp_action
>> + * @b: first parameter dependent upon hp_action
>> + *
>> + * To accurately reflect hot un/plug changes, the elfcorehdr (which
>> + * is passed to the crash kernel via the elfcorehdr= parameter)
>> + * must be updated with the new list of CPUs and memories. The new
>> + * elfcorehdr is prepared in a kernel buffer, and if no errors,
>> + * then it is written on top of the existing/old elfcorehdr.
>> + *
>> + * For hotplug changes to elfcorehdr to work, two conditions are
>> + * needed:
>> + * First, the segment containing the elfcorehdr must be large enough
>> + * to permit a growing number of resources. See
>> + * CONFIG_CRASH_HOTPLUG_ELFCOREHDR_SZ.
>> + * Second, purgatory must explicitly exclude the elfcorehdr from the
>> + * list of segments it checks (since the elfcorehdr changes and thus
>> + * would require an update to purgatory itself to update the digest).
>> + *
>> + */
>> +void arch_crash_hotplug_handler(struct kimage *image,
>> +	unsigned int hp_action, unsigned long a, unsigned long b)
>> +{
>> +	struct kexec_segment *ksegment;
>> +	unsigned char *ptr = NULL;
>> +	unsigned long elfsz = 0;
>> +	void *elfbuf = NULL;
>> +	unsigned long mem, memsz;
>> +
>> +	/* Must have valid elfcorehdr index */
>> +	if (!image->elf_index_valid) {
>> +		pr_err("crash hp: unable to locate elfcorehdr segment");
>> +		goto out;
>> +	}
>> +
>> +	ksegment = &image->segment[image->elf_index];
>> +	mem = ksegment->mem;
>> +	memsz = ksegment->memsz;
>> +
>> +	/*
>> +	 * Create the new elfcorehdr reflecting the changes to CPU and/or
>> +	 * memory resources. The elfcorehdr segment memsz must be
>> +	 * sufficiently large to accommodate increases due to hotplug
>> +	 * activity. See CRASH_HOTPLUG_ELFCOREHDR_SZ.
>> +	 */
>> +	if (prepare_elf_headers(image, &elfbuf, &elfsz)) {
>> +		pr_err("crash hp: unable to prepare elfcore headers");
>> +		goto out;
>> +	}
>> +	if (elfsz > memsz) {
>> +		pr_err("crash hp: update elfcorehdr elfsz %lu > memsz %lu",
>> +			elfsz, memsz);
>> +		goto out;
>> +	}
>> +
>> +	/*
>> +	 * At this point, we are all but assured of success.
>> +	 * Copy new elfcorehdr into destination.
>> +	 */
>> +	ptr = map_crash_pages(mem, memsz);
>> +	if (ptr) {
>> +		/* Temporarily invalidate the crash image while it is replaced */
>> +		xchg(&kexec_crash_image, NULL);
>> +		/* Write the new elfcorehdr into memory */
>> +		memcpy_flushcache((void *)ptr, elfbuf, elfsz);
>> +		/* The crash image is now valid once again */
>> +		xchg(&kexec_crash_image, image);
>> +	}
>> +	unmap_crash_pages((void **)&ptr);
>> +	pr_debug("crash hp: re-loaded elfcorehdr at 0x%lx\n", mem);
>> +
>> +out:
>> +	if (elfbuf)
>> +		vfree(elfbuf);
>> +}
>> +#endif /* CONFIG_CRASH_HOTPLUG */
>> -- 
>> 2.27.0
>>
>