Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <ab1145d9-acca-4c2b-deb7-e954a174e15a@oracle.com>
Date:   Thu, 14 Apr 2022 17:32:26 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.1
Subject: Re: [PATCH v7 7/8] x86/crash: 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, david@redhat.com,
        konrad.wilk@oracle.com, boris.ostrovsky@oracle.com
References: <20220413164237.20845-1-eric.devolder@oracle.com>
 <20220413164237.20845-8-eric.devolder@oracle.com>
 <YleMbVq5XcSX+mWZ@MiWiFi-R3L-srv>
From:   Eric DeVolder <eric.devolder@oracle.com>
In-Reply-To: <YleMbVq5XcSX+mWZ@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: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bTVjYXhwVCsvbGcwVGV1dVhiSVZFQUtncTNyRjIydTVJWVRnRkMra3NuNXA0?=
 =?utf-8?B?ZzI1UmQrdzlyaEVoS3N1aXJ3cmMzdUdUUHZYcE00dXhZQ0c0TlpSYVRuYW1p?=
 =?utf-8?B?QWpIRzZjZTREUDN1Y2hycUo5STZ1Szh5R3NOUTVWZFk2REdBL205bUQ5bm1P?=
 =?utf-8?B?RkNQQlc1TWp2aitMWlFHcVUvcGIwRzlmdm41ckdKWHlDblBubTNYK0xndEl5?=
 =?utf-8?B?OW5BYWJhc1dQbE85cCtwU1NOR2pWdlZsYXBZWUV6bFdJS1NBdGdNWjNuNkNj?=
 =?utf-8?B?ckduSmtyUWhUd2NVb2xXcDlDWE1yVFlPbWxkQm1kaEZZYkpaSVpmVWJNaldz?=
 =?utf-8?B?K05aUXMwYm1sS0xFQUk0OFJVOEpnMmpOT0t0OVNybTBZUDhZTzBaYnVKaUQ5?=
 =?utf-8?B?VlFMWDBLUEMxQjFqN0VNRGh4R1pxS2NtZjlObkkwT1h3YXA1ck9vWlF2cmtJ?=
 =?utf-8?B?U1NYMEF5RDM2dHAxdFhRd09YZEV4UVcwbURQWVVZR3M1aFlGTXFtc3VpeFdh?=
 =?utf-8?B?Ynd2WDgvai9UQnhsLzJjOVhraXRHOWZVMjhrUUZSSU01aGs1NC9rSUUwUDRK?=
 =?utf-8?B?dFhsYSttUkI0TUJDZHh5Wnh2UHB4YjdXV21IRE1XTGNwa1kwSS9iZVR3OUhB?=
 =?utf-8?B?NCtRUEtuQkd5UVE3bWZyekRDZHVWQmF0TDVpYUJ6Wk4yWmZOTmJCS05IQ0t3?=
 =?utf-8?B?bHpEWlZNU3R6RGozZXQvb0ZpN2k1WTdROGFHOUgzUFdhZzhRMitsdmdvaGVj?=
 =?utf-8?B?Z2JZOE9TbnZuWUEyRytDbGJRZEdTVTBHTXlqRitQcnkyRGMxZTRZdmVqV2hV?=
 =?utf-8?B?ZTRreWNBbWNPNzN0NXRZdjNkUVBhdHNKdWhnQURyMWpzbFYyWUJDTFdEVDN0?=
 =?utf-8?B?Mm1uVnY4UEVpdWhvZTlmaDhaYmNZV3l6QTdpdTFLUytoalorL1J6NlZWU1J6?=
 =?utf-8?B?L2FXMk5maUJiSU43aTNMRDFrcmJadS9raUtNRDYralB5MGErTWFFM0tpcTY3?=
 =?utf-8?B?YW9VY1pOTnU0Y0lzUVlRTXJyT0NFMktRS29aVEpDZ3d3aTgyV25SSmxGemkz?=
 =?utf-8?B?czY1MXloV284SXRlNVBaTzZYdmVLTWJzbytRcjFGdW4xT0JtMDYzenJtTEFG?=
 =?utf-8?B?alBZSDlNK2dTRExGN0xtcXZ1QUp5d1M3UzlOUnc3Nkx4Mi9zOHYrMmVreEt2?=
 =?utf-8?B?WTlkK1pEYlNDbktnRXJhSGRadlRjQ0dlRXpyejlEL1dIRzBhV0lrTnJKaWox?=
 =?utf-8?B?Ty95R3dsSFdzWWRYZk9ReDAzTDFxTUNES0Zod1BXM2xhRjdNL2hxejdHeHhI?=
 =?utf-8?B?Mjc5V01qUExXbmZKNXpDa24raWZTOE5ZR3lWcFJaL0l0STJqdnlFMlorM0Rj?=
 =?utf-8?B?WkJDU3ZvbHFUS2dkUEhDMFhpSTVSb3NDR2kvcERBK2UyVWo3M2todkt1RDRx?=
 =?utf-8?B?bWxsRGhFcjhIbkV1QmJHM2FkeEhWQXB5UjJORU5BMU5pV2NydkJOeXVBKzE5?=
 =?utf-8?B?MXg1ZWhkQWMrT25Dd0hWWk5OeWI3blZOR2N2MGJVWjQyZk5NeTd4TUtvRlEz?=
 =?utf-8?B?WTUxbXJTaXpnTXplT1ZmY24yekpZN25HSndJY3FwclN5dWFRS0dJdFpzZ2xv?=
 =?utf-8?B?bm1mU1l4VzlHYzVQQU9IVDVxcUp6UGdybXNaZjdUKy8xQzB1bDhaaVFteHAw?=
 =?utf-8?B?a2ljbzB1ZEFFSkF5SEt3bDZrTTFDM0MvVm5mamh4RGJUWDZ0Sy9mdm90Z2tr?=
 =?utf-8?B?Ylc5RTVjQkJXUTVCM0FoSWZHNytxWHJJemdJR2MxRDBieWtMamNvRksxQ3hC?=
 =?utf-8?B?WUVPejZLMWJWNGtia3Evd3pNbmVyNDNyRk9tS1krSmNoUFhSMFlGeWdzUGJR?=
 =?utf-8?B?SlV3VCt1eHkraFRPMmUwSnJZTzNEWG5qN2liZllRWlFWSFJwQytrRjI5czFm?=
 =?utf-8?B?eHdWemlsMWtudzRLVE1BSjNoeU9iNE1tQzZFNEE3alBmNnN4UTAvbndpcDNw?=
 =?utf-8?B?NVc1K2VKb3FEQ2p4Q3lFaUp6YWhpa0U3YjhyVjF4SlEzM0Njbks3cXVkT1Bj?=
 =?utf-8?B?TGZYS3drMjNLQU9nRnI3alBsazFZRXlCa0hieG9NTDRnSUlXbGs5WTkwVllN?=
 =?utf-8?B?dlBZWk0zV3o3TWJvbUtrWk1MNmZ5OG9YUnUyclpzWFhINUhvOFRzekFXOW4y?=
 =?utf-8?B?YUt4N1M4QmRtdENCcHh6b0IvMGU0aVcrVGx1OFpZTXd0RlJpcnk1K2J6R0Q3?=
 =?utf-8?B?WjYvUUNOallxN3JmQ2RZYTlDRHJESlpQUjgwK3g2dEp4M29NTHJWU2RyR0lp?=
 =?utf-8?B?NEV6UGVmMUt0bVY3dEdlK2Y3ZnU1UWJ5Njl0OFU0MlZwQmRjNHBqRU0vTzRM?=
 =?utf-8?Q?/hrycvd8UJW/zCdI8N7Igl/C19gg6nwk/5un+N3p3RvIv?=
X-MS-Exchange-AntiSpam-MessageData-1: wwjCxBgZ3eFw0w==
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 30643b88-226b-4e60-d388-08da1e66aa9d
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2022 22:32:32.5876
 (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: cghNj0DR7gTZmUOawk0x2J+jl4o+8stgAH2npu9I2M+OozA5+lNeja4SZ6hPZnAmiFtAgtSfiOA2qRnIYM5z8LacfY6ReqME3v5jYHTlIBU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3757
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-04-14_07:2022-04-14,2022-04-14 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 mlxscore=0
 bulkscore=0 phishscore=0 spamscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2204140117
X-Proofpoint-GUID: UGkdOONnt2saI7cITwD_XeroiZjU1aQw
X-Proofpoint-ORIG-GUID: UGkdOONnt2saI7cITwD_XeroiZjU1aQw
X-Spam-Status: No, score=-5.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 4/13/22 21:52, Baoquan He wrote:
> On 04/13/22 at 12:42pm, 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.
>>
>> 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 then installed over the top of
>> the existing elfcorehdr.
>>
>> In the patch 'kexec: 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, crash hotplug for kexec_file_load syscall
>> 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 | 117 ++++++++++++++++++++++++++++++++++++++++
>>   1 file changed, 117 insertions(+)
>>
>> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
>> index 9db41cce8d97..47adf69c9f71 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->elfcorehdr_index = image->nr_segments;
>> +	image->elfcorehdr_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,109 @@ int crash_load_segments(struct kimage *image)
>>   	return ret;
>>   }
>>   #endif /* CONFIG_KEXEC_FILE */
>> +
>> +#ifdef CONFIG_CRASH_HOTPLUG
>> +static void *map_crash_pages(unsigned long paddr, unsigned long size)
>> +{
>> +	/*
>> +	 * NOTE: The addresses and sizes passed to this routine have
>> +	 * already been fully aligned on page boundaries. There is no
>> +	 * need for massaging the address or size.
>> +	 */
>> +	void *ptr = NULL;
>> +
>> +	/* NOTE: requires arch_kexec_[un]protect_crashkres() for write access */
>> +	if (size > 0) {
>> +		struct page *page = pfn_to_page(paddr >> PAGE_SHIFT);
>> +
>> +		ptr = kmap(page);
>> +	}
>> +
>> +	return ptr;
>> +}
>> +
>> +static void unmap_crash_pages(void **ptr)
>> +{
>> +	if (ptr) {
>> +		if (*ptr)
>> +			kunmap(*ptr);
>> +		*ptr = NULL;
>> +	}
>> +}
>> +
>> +/**
>> + * arch_crash_hotplug_handler() - Handle hotplug elfcorehdr changes
>> + * @image: the active struct kimage
>> + * @hp_action: the hot un/plug action being handled
>> + * @cpu: when hp_action is KEXEC_CRASH_HP_ADD|REMOVE_CPU, the affected cpu
>> + *
>> + * 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 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 int cpu)
> 
> We have stored the necessary information into kimage, e.g image->hotplug_event,
> image->offlinecpu, do we still need to pass down the hp_action and cpu
> in arch_crash_hotplug_handler()? Do you foresee it will be used in other
> architectures?

Sourabh Jain's work with PPC is using in fact using hp_action and checking its value.
eric

> 
>> +{
>> +	struct kexec_segment *ksegment;
>> +	unsigned char *ptr = NULL;
>> +	unsigned long elfsz = 0;
>> +	void *elfbuf = NULL;
>> +	unsigned long mem, memsz;
>> +
>> +	if (!image->elfcorehdr_index_valid) {
>> +		pr_err("crash hp: unable to locate elfcorehdr segment");
>> +		goto out;
>> +	}
>> +
>> +	ksegment = &image->segment[image->elfcorehdr_index];
>> +	mem = ksegment->mem;
>> +	memsz = ksegment->memsz;
>> +
>> +	/*
>> +	 * Create the new elfcorehdr reflecting the changes to CPU and/or
>> +	 * memory resources.
>> +	 */
>> +	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 the
>> +		 * elfcorehdr is updated.
>> +		 */
>> +		xchg(&kexec_crash_image, NULL);
>> +		memcpy_flushcache((void *)ptr, elfbuf, elfsz);
>> +		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
>>
>