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: <526d44b2-0120-2d52-aac3-57155a2bf80b@oracle.com>
Date:   Wed, 25 May 2022 08:51:55 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.3.1
Subject: Re: [PATCH v8 6/7] x86/crash: Add x86 crash hotplug support for
 kexec_file_load
Content-Language: en-US
To:     Sourabh Jain <sourabhjain@linux.ibm.com>,
        linux-kernel@vger.kernel.org, x86@kernel.org,
        kexec@lists.infradead.org, ebiederm@xmission.com,
        dyoung@redhat.com, bhe@redhat.com, vgoyal@redhat.com
Cc:     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: <20220505184603.1548-1-eric.devolder@oracle.com>
 <20220505184603.1548-7-eric.devolder@oracle.com>
 <60bd09e4-91d6-d81c-3b97-1d5334efe6e7@linux.ibm.com>
From:   Eric DeVolder <eric.devolder@oracle.com>
In-Reply-To: <60bd09e4-91d6-d81c-3b97-1d5334efe6e7@linux.ibm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z2lMZEcxUjViTkE1a1NKR1ltam00K1NtUENrSEUrc2R6aStEVk9jemVSZ0xH?=
 =?utf-8?B?Y09ReHBoMDlGN2dtUmlzcnFVZkpKMnByYmNUQ3VlTGhWTEhodTF0c0hPSDJ3?=
 =?utf-8?B?ckFQN0pZalNDSGpHR2lJZE9ZeGFlWkFYMDI1Q2s4SnFveFd2ZHhVeXkvVXlR?=
 =?utf-8?B?R2RGellIUGpia2JFOTg5RWhGRVpFem5pYkU5RkljMEdST1FGZzY5TGFOQVZO?=
 =?utf-8?B?ZGtZalBtbXhSenNJZWZMNGRVRE42RnpxZHZ2ODVVUXRiTE9qejNPTEprSmV3?=
 =?utf-8?B?MWZaYXNnOFJ1aDNQTDU4Z1NHUEZCaHNuY0o2Q1N5b0o1d2dDYWlDbzRvUGhx?=
 =?utf-8?B?aHdReWY3eDlOWHJwYmZyWG1hbmROcWtCZVVNZlVVdDJsODlxT0JpWXVJQ1l1?=
 =?utf-8?B?QTFBMWE0TGkzRFBLanBMVU1VQ1ZXTTZmM1VRNTFJNi9ScHdEN1R5MnR5azFK?=
 =?utf-8?B?dERoNVg3STNXaG90a2wwYitPQjNvVEMzeUtSbWlvaDZaQWZLVk5uYlRSUWkz?=
 =?utf-8?B?VFBxWm94UHhhRnBlVzBDUWRDNllWenhQTnRBTko2Yk5lMUkzak9ZR1NSREdE?=
 =?utf-8?B?eWZyRUthVGlSZlVNU3g2SklScEhlRXVEUjd6eVFVQWxmTE5pT0RDbG12TGpV?=
 =?utf-8?B?b1RsYnd3dmF2TlVNRVFzWWNLUHQ5MWViWjJVRlBEbkJuWC9kaTkxOE5TbVJT?=
 =?utf-8?B?bUJOekFOaWV1Nk1IbjVkZkZhL2RleVJJbkFBdmJuSG5YcFBlclIwaFZmVGpU?=
 =?utf-8?B?dnh6ajZFaHErQUVTYUs3VHBFMS9ZbVYvZ2pma1F0Ny83VXJNcFZUZ2lUVFhL?=
 =?utf-8?B?QVlZN2xHVldaalY4NUpuQ1dEVGVjNjNaRy9YaEZHQU11aVplcnREMGczQzkw?=
 =?utf-8?B?bnkrT1N5TW9sT1pqRXh3MWJrblp1VjNOMU90NFl2WUN6dmNGQU5jOWFXWWY5?=
 =?utf-8?B?MUpkdkYrYStMd3MyOC9Jc2Z4ajBFOW44cUhjQ1g1aVBoai9GbGlxVHllL1pm?=
 =?utf-8?B?N1ZHWTl2UFR4bFZWdDFaZU9vTSt4TXB2WWhOTEozblB6cHpES3ZaYWNFNGJv?=
 =?utf-8?B?cTVrVjc2L202YkxId3FRdDdvL3JwVnRpN2JocnVrdHZOQ0FoK3ZEMWtBb1oy?=
 =?utf-8?B?T1VRczJLdmpKVXFnb25vOGhDRnpydE1YZWVsQUFUV1BpUEt1eFYwZEduVE83?=
 =?utf-8?B?TmcxUEZFWFNsNlhCZkJVcERsWFVnQ2J6V0dYS0U4WDZneVN1Rk9aenBZclRK?=
 =?utf-8?B?cjFMMjlkNXRhT1ZDT1RneDBscW5MNDZIZDFuVWZuWkk3NTBVRG9IbW55MmE0?=
 =?utf-8?B?T2pCMWxERk8xODhaczF3cG56TnpHczZWN2VtUTcvcHNQZUplcXhvQmpRUHhi?=
 =?utf-8?B?Z1JsekNXaHR4MzBrL09CZDcvU0t2TXFtd05OaEpDZ3FHci96SHlZdFZhYTFy?=
 =?utf-8?B?QXhHR3NpbnFjMTN3a3dNcVZGMXYxZEg2RzBZS1BoTjFhRWpnOU9lbFUxVEI3?=
 =?utf-8?B?cTl5eVFKM1NGUjIyK1U2bjIvd1lvTWZLbXpwN1B1d1NCVjl3dGxtMU5QSi9w?=
 =?utf-8?B?elZqNktlZFVDQ0MvQlY3eWNpOXdha0VsRGg0eENEZW8wdWV1dXRIWTU2aENC?=
 =?utf-8?B?dExySVQyaEJ5N2VKQ1NVSmU5TVZacExxVy9KR280b3hOZEREd0xIa1ZIR25V?=
 =?utf-8?B?eWtod1htMXRUTDJPS0NXL2hwUWpMbnJTalBtVzd3Zyt0SktLMm5JSzRhc2Zr?=
 =?utf-8?B?M0pFUmNCbEdzM2hZZ0QwV0E3aU5HcDlxL2sxNURNcUNGU2ZwUWNSVEFwak5r?=
 =?utf-8?B?UzBKUDZhZThYSFEzWFNPRTJpR2dYMFpPUUg5cm4yRnZYWUt5djVUS2RBdE9a?=
 =?utf-8?B?YldZeldRQjNDOU9ZU1Y2TU9FN1NjcHcvZk9BRWRCSlRyZWpwT3N4UTJySVpH?=
 =?utf-8?B?UjRJQUxldm8ySjM4ODB4STU0SmpIcjk0VmJ1T2RwWnd4WEJVaEE0MWRQWHJP?=
 =?utf-8?B?alMxU0plSkhCc2duRGlYbmdHbkMvdjMyWUJNTklkYmRSYUNBS0hHZFdINWQ4?=
 =?utf-8?B?Ykl0ZHhvaVNIb3lMUWxOMzk3cDl6Um4rRmNrRjY5UVBqSzRYQ2tld044YVRw?=
 =?utf-8?B?TVBOOXFZVXFKMTErSHQrQ0tZQWlxZlFyUWlWUFZTMC9ueFE5ZndXOGxOMXVt?=
 =?utf-8?B?SDF4YTNma3FhVUszTklLSzJLQ3lVNm5sNWpjLzdpVnowMllZcHp0Q1NNelV6?=
 =?utf-8?B?aEcyYUVpc2ZKZzRPWUo1VUlLR28vd1VxdUVDSlZiVFQyRCtzWVI4NVc4VGJI?=
 =?utf-8?B?ZmtXaCtJN2JUL0NwaTErdVFWMHlpajNiMUdrRGVEQWpTRXNZVUNxUGphNHpr?=
 =?utf-8?Q?xNaby1QqGj9v06uw2YYfg8tRDyibj/FS2iAsZ?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a264585d-d133-4d74-0f3b-08da3e55bebe
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2022 13:52:02.1958
 (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: j6UnPFpDYTx9syTMunM2nyjGzVsoMFS5Gl16xiQLa424/v3ZeX6C21Pr5qcE7hSpQPSg0QxspO2578gButJKeGNctm2fyp2qYGzn+JddjO0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1001MB2195
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.874
 definitions=2022-05-25_04:2022-05-25,2022-05-25 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 mlxlogscore=999
 spamscore=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2205250071
X-Proofpoint-GUID: 8UawQ6ElrM1XZk9xxgzIP6m8sbFBGXCZ
X-Proofpoint-ORIG-GUID: 8UawQ6ElrM1XZk9xxgzIP6m8sbFBGXCZ
X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        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 5/25/22 00:25, Sourabh Jain wrote:
> Hello Eric,
> 
> On 06/05/22 00:16, 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_MAX_MEMORY_RANGES 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/Kconfig        |  11 ++++
>>   arch/x86/kernel/crash.c | 117 ++++++++++++++++++++++++++++++++++++++++
>>   2 files changed, 128 insertions(+)
>>
>> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
>> index 4bed3abf444d..bf1201fe6981 100644
>> --- a/arch/x86/Kconfig
>> +++ b/arch/x86/Kconfig
>> @@ -2072,6 +2072,17 @@ config CRASH_DUMP
>>         (CONFIG_RELOCATABLE=y).
>>         For more details see Documentation/admin-guide/kdump/kdump.rst
>> +config CRASH_MAX_MEMORY_RANGES
>> +    depends on CRASH_DUMP && KEXEC_FILE && (HOTPLUG_CPU || MEMORY_HOTPLUG)
>> +    int
>> +    default 32768
>> +    help
>> +      For the kexec_file_load path, specify the maximum number of
>> +      memory regions, eg. as represented by the 'System RAM' entries
>> +      in /proc/iomem, that the elfcorehdr buffer/segment can accommodate.
>> +      This value is combined with NR_CPUS and multiplied by Elf64_Phdr
>> +      size to determine the final buffer size.
>> +
>>   config KEXEC_JUMP
>>       bool "kexec jump"
>>       depends on KEXEC && HIBERNATION
>> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
>> index 9db41cce8d97..951ef365f0a7 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;
>> +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
>> +    /* Ensure elfcorehdr segment large enough for hotplug changes */
>> +    kbuf.memsz = (CONFIG_NR_CPUS_DEFAULT + CONFIG_CRASH_MAX_MEMORY_RANGES) * sizeof(Elf64_Phdr);
>> +    /* 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 */
>> +
>> +#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_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_handle_hotplug_event() - Handle hotplug elfcorehdr changes
>> + * @image: the active struct kimage
>> + * @hp_action: the hot un/plug action being handled
>> + * @cpu: when KEXEC_CRASH_HP_ADD/REMOVE_CPU, the cpu affected
>> + *
>> + * 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 the
>> + * CONFIG_CRASH_MAX_MEMORY_RANGES description.
>> + * 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_handle_hotplug_event(struct kimage *image,
>> +    unsigned int hp_action, unsigned int cpu)
>> +{
>> +    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;
> 
> Prepare_elf_header uses crash_prepare_elf64_headers function to generate elfcorehdr.
> Since crash_prepare_elf64_headers is defined under CONFIG_KEXEC_FILE option we
> will have build issues if CONFIG_KEXEC is enabled and CONFIG_KEXEC_FILE is disabled.
> 
> How about moving crash_prepare_elf64_headers function to kernel/kexec_core.c?

Yes, of course. I originally protected against this scenario with having the
CRASH_HOTPLUG dependent on KEXEC_FILE, but as we eliminated CRASH_HOTPLUG, your
suggestion above is on point.

Thanks!
eric

> 
> Thanks,
> Sourabh Jain
>