From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5162C54E4A for ; Sat, 2 Mar 2024 13:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:Subject:From:MIME-Version:Date:Message-ID: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=D+h9wYxq10DZa98vxG4gw5YJYWpKhAkI3fnXhqj4MkM=; b=apeXDiM6mLkdvyjH1W46wYLLuS TDG0pDm0vv2MQYYhZECVktgvB36ueOhG+bZTbAS988wYPrxub5/0SNcmXwbTG0/SjArIytCXCtaWA XlqgPF23V1J9BS7CTrwXuwL6yjARMmFPhrzIXojdd/LA32XNskZ6Y//fT6F8JOJzLoX1Mm+xF2evs YJDzkR99+/NXfH9DP57DhGuiGkU69iwlnpQnefr+mNAw5lRVcAYNhbx6HJapamnIwgCp+vKkpKcDN je7FAm0f8VUwQ4PHLDQniVa+w+RbXp9hg5FUnuwp1EqQovevtyOKilciWXelUrVX0tjPy7qS9uD+9 Qfs25AXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rgPG1-00000003bKS-1uOF; Sat, 02 Mar 2024 13:18:29 +0000 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rgPFw-00000003bIp-3eSi for kexec@lists.infradead.org; Sat, 02 Mar 2024 13:18:26 +0000 Received: from pps.filterd (m0353722.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 422Am6q2028356; Sat, 2 Mar 2024 13:18:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : from : subject : to : cc : content-type : content-transfer-encoding; s=pp1; bh=+Tu7dLI6xVqq9AKNu+3YL1MJTaKwycghi0qS+HAiBQ4=; b=hwkZAcKnFovYYEG8o69xHouqcnyVgHKJz4b5wPHWbGy9k6G1JmeHG1VMhfeq1HCLwV6j JrYR+t5TCaZr6bfe0eIv150RqJBROhYcwY2G59HJA6wtzyp0EdHzK5q3IVFyADbI1aca mebnI2NObkEpo2aFG1kRu+Fq+/r/vN4rVM3a5H+DrlqlwCropKG3E+lJ103IMB+Neu11 fCQaId+FdGGIaKWxTE4C3H3IUML5iIlUczSmPLH0+rkNiJ2fM7woyQmTFn+tbnefXAy1 8XRBxz3XhH/k2lPScsUWpbXDiFfraSYjZxg1G2fwj6xoYtNyeEoRDpU6NSk33ts1kOGQ gA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wm2p0j5b8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 02 Mar 2024 13:18:11 +0000 Received: from m0353722.ppops.net (m0353722.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 422CuTpY027265; Sat, 2 Mar 2024 13:18:11 GMT Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wm2p0j5ax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 02 Mar 2024 13:18:11 +0000 Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 422C1TQh023910; Sat, 2 Mar 2024 13:18:10 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 3wfw0m2jch-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 02 Mar 2024 13:18:10 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 422DI4Rf19858162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 2 Mar 2024 13:18:07 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DC80920043; Sat, 2 Mar 2024 13:18:04 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AF5E120040; Sat, 2 Mar 2024 13:17:58 +0000 (GMT) Received: from [9.43.41.117] (unknown [9.43.41.117]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Sat, 2 Mar 2024 13:17:58 +0000 (GMT) Message-ID: <6a4c377c-990b-4a09-8974-01855e75dd6b@linux.ibm.com> Date: Sat, 2 Mar 2024 18:47:58 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Hari Bathini Subject: Re: [PATCH v17 2/6] crash: add a new kexec flag for hotplug support To: Sourabh Jain , linuxppc-dev@ozlabs.org Cc: David Hildenbrand , Dave Hansen , Mimi Zohar , Eric DeVolder , Boris Ostrovsky , Valentin Schneider , Baoquan He , x86@kernel.org, "Aneesh Kumar K . V" , Laurent Dufour , Dave Young , Vivek Goyal , Naveen N Rao , Borislav Petkov , Thomas Gleixner , Oscar Salvador , Greg Kroah-Hartman , kexec@lists.infradead.org, Mahesh Salgaonkar , Akhil Raj , Andrew Morton Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: RyOFzzIQApHoQF744qnMM0dGrn0BTyN1 X-Proofpoint-GUID: 49zy1IaSQx3uZeQdz1HLotVAJWb4ZdKQ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-02_04,2024-03-01_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 clxscore=1011 priorityscore=1501 malwarescore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 impostorscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403020115 X-Bad-Reply: 'Re:' in Subject but no References or In-Reply-To headers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240302_051825_066250_30CEF366 X-CRM114-Status: GOOD ( 45.97 ) X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org On 26/02/24 2:11 pm, Sourabh Jain wrote: > Commit a72bbec70da2 ("crash: hotplug support for kexec_load()") > introduced a new kexec flag, `KEXEC_UPDATE_ELFCOREHDR`. Kexec tool uses > this flag to indicate to the kernel that it is safe to modify the > elfcorehdr of the kdump image loaded using the kexec_load system call. > > However, it is possible that architectures may need to update kexec > segments other then elfcorehdr. For example, FDT (Flatten Device Tree) > on PowerPC. Introducing a new kexec flag for every new kexec segment > may not be a good solution. Hence, a generic kexec flag bit, > `KEXEC_CRASH_HOTPLUG_SUPPORT`, is introduced to share the CPU/Memory > hotplug support intent between the kexec tool and the kernel for the > kexec_load system call. > > Now, if the kexec tool sends KEXEC_CRASH_HOTPLUG_SUPPORT kexec flag to > the kernel, it indicates to the kernel that all the required kexec > segment is skipped from SHA calculation and it is safe to update kdump > image loaded using the kexec_load syscall. > > While loading the kdump image using the kexec_load syscall, the > @update_elfcorehdr member of struct kimage is set if the kexec tool > sends the KEXEC_UPDATE_ELFCOREHDR kexec flag. This member is later used > to determine whether it is safe to update elfcorehdr on hotplug events. > However, with the introduction of the KEXEC_CRASH_HOTPLUG_SUPPORT kexec > flag, the kexec tool could mark all the required kexec segments on an > architecture as safe to update. So rename the @update_elfcorehdr to > @hotplug_support. If @hotplug_support is set, the kernel can safely > update all the required kexec segments of the kdump image during > CPU/Memory hotplug events. > > Introduce an architecture-specific function to process kexec flags for > determining hotplug support. Set the @hotplug_support member of struct > kimage for both kexec_load and kexec_file_load system calls. This > simplifies kernel checks to identify hotplug support for the currently > loaded kdump image by just examining the value of @hotplug_support. > Couple of minor nits. See comments below. Otherwise, looks good to me. Acked-by: Hari Bathini > Signed-off-by: Sourabh Jain > Cc: Akhil Raj > Cc: Andrew Morton > Cc: Aneesh Kumar K.V > Cc: Baoquan He > Cc: Borislav Petkov (AMD) > Cc: Boris Ostrovsky > Cc: Christophe Leroy > Cc: Dave Hansen > Cc: Dave Young > Cc: David Hildenbrand > Cc: Eric DeVolder > Cc: Greg Kroah-Hartman > Cc: Hari Bathini > Cc: Laurent Dufour > Cc: Mahesh Salgaonkar > Cc: Michael Ellerman > Cc: Mimi Zohar > Cc: Naveen N Rao > Cc: Oscar Salvador > Cc: Thomas Gleixner > Cc: Valentin Schneider > Cc: Vivek Goyal > Cc: kexec@lists.infradead.org > Cc: x86@kernel.org > --- > arch/x86/include/asm/kexec.h | 11 ++--------- > arch/x86/kernel/crash.c | 28 +++++++++++++++++----------- > drivers/base/cpu.c | 2 +- > drivers/base/memory.c | 2 +- > include/linux/crash_core.h | 13 ++++++------- > include/linux/kexec.h | 11 +++++++---- > include/uapi/linux/kexec.h | 1 + > kernel/crash_core.c | 11 ++++------- > kernel/kexec.c | 4 ++-- > kernel/kexec_file.c | 5 +++++ > 10 files changed, 46 insertions(+), 42 deletions(-) > > diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h > index cb1320ebbc23..ae5482a2f0ca 100644 > --- a/arch/x86/include/asm/kexec.h > +++ b/arch/x86/include/asm/kexec.h > @@ -210,15 +210,8 @@ extern void kdump_nmi_shootdown_cpus(void); > void arch_crash_handle_hotplug_event(struct kimage *image, void *arg); > #define arch_crash_handle_hotplug_event arch_crash_handle_hotplug_event > > -#ifdef CONFIG_HOTPLUG_CPU > -int arch_crash_hotplug_cpu_support(void); > -#define crash_hotplug_cpu_support arch_crash_hotplug_cpu_support > -#endif > - > -#ifdef CONFIG_MEMORY_HOTPLUG > -int arch_crash_hotplug_memory_support(void); > -#define crash_hotplug_memory_support arch_crash_hotplug_memory_support > -#endif > +int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags); > +#define arch_crash_hotplug_support arch_crash_hotplug_support > > unsigned int arch_crash_get_elfcorehdr_size(void); > #define crash_get_elfcorehdr_size arch_crash_get_elfcorehdr_size > diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c > index 2a682fe86352..f06501445cd9 100644 > --- a/arch/x86/kernel/crash.c > +++ b/arch/x86/kernel/crash.c > @@ -402,20 +402,26 @@ int crash_load_segments(struct kimage *image) > #undef pr_fmt > #define pr_fmt(fmt) "crash hp: " fmt > > -/* These functions provide the value for the sysfs crash_hotplug nodes */ > -#ifdef CONFIG_HOTPLUG_CPU > -int arch_crash_hotplug_cpu_support(void) > +int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags) > { > - return crash_check_update_elfcorehdr(); > -} > -#endif > > -#ifdef CONFIG_MEMORY_HOTPLUG > -int arch_crash_hotplug_memory_support(void) > -{ > - return crash_check_update_elfcorehdr(); > -} > +#ifdef CONFIG_KEXEC_FILE > + if (image->file_mode) > + return 1; > #endif > + /* > + * Initially, crash hotplug support for kexec_load was added > + * with the KEXEC_UPDATE_ELFCOREHDR flag. Later, this > + * functionality was expanded to accommodate multiple kexec > + * segment updates, leading to the introduction of the > + * KEXEC_CRASH_HOTPLUG_SUPPORT kexec flag bit. Consequently, > + * when the kexec tool sends either of these flags, it indicates > + * that the required kexec segment (elfcorehdr) is excluded from > + * the SHA calculation. > + */ > + return (kexec_flags & KEXEC_UPDATE_ELFCOREHDR || > + kexec_flags & KEXEC_CRASH_HOTPLUG_SUPPORT); > +} Introduction of the flag KEXEC_CRASH_HOTPLUG_SUPPORT warranted a bit of cleanup in x86 code. I think the changelog should call that out too. > > unsigned int arch_crash_get_elfcorehdr_size(void) > { > diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c > index 5ae1496ccc06..a23489b8c8f0 100644 > --- a/drivers/base/cpu.c > +++ b/drivers/base/cpu.c > @@ -306,7 +306,7 @@ static ssize_t crash_hotplug_show(struct device *dev, > struct device_attribute *attr, > char *buf) > { > - return sysfs_emit(buf, "%d\n", crash_hotplug_cpu_support()); > + return sysfs_emit(buf, "%d\n", crash_check_hotplug_support()); > } > static DEVICE_ATTR_ADMIN_RO(crash_hotplug); > #endif > diff --git a/drivers/base/memory.c b/drivers/base/memory.c > index c0436f46cfb7..67858eeb92ed 100644 > --- a/drivers/base/memory.c > +++ b/drivers/base/memory.c > @@ -535,7 +535,7 @@ static DEVICE_ATTR_RW(auto_online_blocks); > static ssize_t crash_hotplug_show(struct device *dev, > struct device_attribute *attr, char *buf) > { > - return sysfs_emit(buf, "%d\n", crash_hotplug_memory_support()); > + return sysfs_emit(buf, "%d\n", crash_check_hotplug_support()); > } > static DEVICE_ATTR_RO(crash_hotplug); > #endif > diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h > index 647e928efee8..44305336314e 100644 > --- a/include/linux/crash_core.h > +++ b/include/linux/crash_core.h > @@ -40,14 +40,13 @@ static inline void arch_kexec_unprotect_crashkres(void) { } > static inline void arch_crash_handle_hotplug_event(struct kimage *image, void *arg) { } > #endif > > -int crash_check_update_elfcorehdr(void); > +int crash_check_hotplug_support(void); > > -#ifndef crash_hotplug_cpu_support > -static inline int crash_hotplug_cpu_support(void) { return 0; } > -#endif > - > -#ifndef crash_hotplug_memory_support > -static inline int crash_hotplug_memory_support(void) { return 0; } > +#ifndef arch_crash_hotplug_support > +static inline int arch_crash_hotplug_support(struct kimage *image, unsigned long kexec_flags) > +{ > + return 0; > +} > #endif > > #ifndef crash_get_elfcorehdr_size > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index 060835bb82d5..5b93a5767413 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -319,8 +319,10 @@ struct kimage { > /* If set, we are using file mode kexec syscall */ > unsigned int file_mode:1; > #ifdef CONFIG_CRASH_HOTPLUG > - /* If set, allow changes to elfcorehdr of kexec_load'd image */ > - unsigned int update_elfcorehdr:1; > + /* If set, it is safe to update kexec segments that are > + * excluded from SHA calculation. > + */ > + unsigned int hotplug_support:1; > #endif > > #ifdef ARCH_HAS_KIMAGE_ARCH > @@ -391,9 +393,10 @@ bool kexec_load_permitted(int kexec_image_type); > > /* List of defined/legal kexec flags */ > #ifndef CONFIG_KEXEC_JUMP > -#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_UPDATE_ELFCOREHDR) > +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_UPDATE_ELFCOREHDR | KEXEC_CRASH_HOTPLUG_SUPPORT) > #else > -#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT | KEXEC_UPDATE_ELFCOREHDR) > +#define KEXEC_FLAGS (KEXEC_ON_CRASH | KEXEC_PRESERVE_CONTEXT | KEXEC_UPDATE_ELFCOREHDR | \ > + KEXEC_CRASH_HOTPLUG_SUPPORT) > #endif > > /* List of defined/legal kexec file flags */ > diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h > index c17bb096ea68..5ae1741ea8ea 100644 > --- a/include/uapi/linux/kexec.h > +++ b/include/uapi/linux/kexec.h > @@ -13,6 +13,7 @@ > #define KEXEC_ON_CRASH 0x00000001 > #define KEXEC_PRESERVE_CONTEXT 0x00000002 > #define KEXEC_UPDATE_ELFCOREHDR 0x00000004 > +#define KEXEC_CRASH_HOTPLUG_SUPPORT 0x00000008 > #define KEXEC_ARCH_MASK 0xffff0000 > > /* > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 70fa8111a9d6..630c4fd7ea39 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -496,7 +496,7 @@ static DEFINE_MUTEX(__crash_hotplug_lock); > * It reflects the kernel's ability/permission to update the crash > * elfcorehdr directly. Also, this comment needs update as pointed out by Baoquan already. Thanks Hari > */ > -int crash_check_update_elfcorehdr(void) > +int crash_check_hotplug_support(void) > { > int rc = 0; > > @@ -508,10 +508,7 @@ int crash_check_update_elfcorehdr(void) > return 0; > } > if (kexec_crash_image) { > - if (kexec_crash_image->file_mode) > - rc = 1; > - else > - rc = kexec_crash_image->update_elfcorehdr; > + rc = kexec_crash_image->hotplug_support; > } > /* Release lock now that update complete */ > kexec_unlock(); > @@ -552,8 +549,8 @@ static void crash_handle_hotplug_event(unsigned int hp_action, unsigned int cpu, > > image = kexec_crash_image; > > - /* Check that updating elfcorehdr is permitted */ > - if (!(image->file_mode || image->update_elfcorehdr)) > + /* Check that kexec segments update is permitted */ > + if (!image->hotplug_support) > goto out; > > if (hp_action == KEXEC_CRASH_HP_ADD_CPU || > diff --git a/kernel/kexec.c b/kernel/kexec.c > index bab542fc1463..a6b3f96bb50c 100644 > --- a/kernel/kexec.c > +++ b/kernel/kexec.c > @@ -135,8 +135,8 @@ static int do_kexec_load(unsigned long entry, unsigned long nr_segments, > image->preserve_context = 1; > > #ifdef CONFIG_CRASH_HOTPLUG > - if (flags & KEXEC_UPDATE_ELFCOREHDR) > - image->update_elfcorehdr = 1; > + if ((flags & KEXEC_ON_CRASH) && arch_crash_hotplug_support(image, flags)) > + image->hotplug_support = 1; > #endif > > ret = machine_kexec_prepare(image); > diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c > index 2d1db05fbf04..3d64290d24c9 100644 > --- a/kernel/kexec_file.c > +++ b/kernel/kexec_file.c > @@ -376,6 +376,11 @@ SYSCALL_DEFINE5(kexec_file_load, int, kernel_fd, int, initrd_fd, > if (ret) > goto out; > > +#ifdef CONFIG_CRASH_HOTPLUG > + if ((flags & KEXEC_FILE_ON_CRASH) && arch_crash_hotplug_support(image, flags)) > + image->hotplug_support = 1; > +#endif > + > ret = machine_kexec_prepare(image); > if (ret) > goto out; _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec