Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Eric DeVolder <eric.devolder@oracle.com>
To:     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,
        eric.devolder@oracle.com
Subject: [PATCH v8 3/7] crash: add generic infrastructure for crash hotplug support
Date:   Thu,  5 May 2022 14:45:59 -0400
Message-Id: <20220505184603.1548-4-eric.devolder@oracle.com>
In-Reply-To: <20220505184603.1548-1-eric.devolder@oracle.com>
References: <20220505184603.1548-1-eric.devolder@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+JfnBSje1kc1PfGrWxsglT06ciTqdwXfgFapkQimsulsp67Az7OTMlmxzXpK?=
 =?us-ascii?Q?ilhtMIF1NpiW84q5scPevK0ziHKu4QXyE1iTqENhtKQMcSzADFFGZQTtjw6G?=
 =?us-ascii?Q?tgsAyCAhSatS4jMyZuGTlRRd9+dV6eC1Ds39X2bS4UOMyPQdEWL+e3y5rqOn?=
 =?us-ascii?Q?vHiftWFlPO/3v+rUldiDrrVIR1BAh89G2JDUNp655Ms1FbWR5n3Las4Uo3R1?=
 =?us-ascii?Q?WF8zuEk7dLgD+CrpL3PW8kKKiv2NDp/Pb7/J1tfFqOco7dmVdacPEHtKkrSP?=
 =?us-ascii?Q?VYvb7xmzyKo49vONH1OOK6x/HTZBxpcAKBW2xVozOh7x6u7nwK1aRGrJlbIN?=
 =?us-ascii?Q?GPEo8fTanuEGw2tZ8pr+ornZbBUy6+DnzxoNeVV7XpBqpPG/PJUh1oh7M0Tf?=
 =?us-ascii?Q?2ceuFbsu0+HXQsQrPqvV4I6+xZ3Un9SCVYjdrYHGbGhX05kZtB9MG2yzS/Po?=
 =?us-ascii?Q?C1oTN03jTFAYUFTgRow58fzWbXsRjIeCXhUmxMmT69ZkigVTjbXZyJyWCRRb?=
 =?us-ascii?Q?SSnA27B/nhCMlZzhoCtMdAj/9LzOElUNxqfPp8xVY3EU1AgakDK6Jong2nXX?=
 =?us-ascii?Q?dlUVnsBbNAKzHtRgPuxaAWUT5qE+P9epw0AOckDFPT/5rPe30grcBOzOY0c8?=
 =?us-ascii?Q?F0KFXg/nCQpcf/ibqNI7sEs52LgwJNwdzXNRR6MCHL0kWo1egrPkxHboznwi?=
 =?us-ascii?Q?wr7IAOEjl5OT4FyqY2iGmAWXLRKh8QG9goGvRJjQFaHc8oqbGG6W+4HaMJfT?=
 =?us-ascii?Q?gAKKBbPx0pdEK5laskf4WxVHA70YUzCFAziqHcIVyiCm10WRh1r9fm9rHYww?=
 =?us-ascii?Q?BbwWLJhYN9o0dWpIbo0g3K6VqMUOy+YYyqXgFf0SGjBPT3+QiGypWTHRO7yC?=
 =?us-ascii?Q?n4s4iNo/jrhuou3p0zrErZzSgqi8R29OrHPCxIEXqX3b1+s3AfA9yadkUhua?=
 =?us-ascii?Q?tPx/YDn1YBfzXadHXoFyGmLIw9QwraBzqXTsaYgh/JpwU/DgD6KErB4cvwID?=
 =?us-ascii?Q?zLllB95Gjux9ivVDo0/8tj/M5GJ6N3JdlT7hVAHwu+wE0Uf/Dz7X1oaj2mFd?=
 =?us-ascii?Q?ReoCgxN2AhdkfWt5JeJD/YmY3JQ3lqTU6jZhZG+NMKX3q8kvm/lndq2RNkQJ?=
 =?us-ascii?Q?Q4Mazqmboi84L2pXczVjYyLysTnwhQDRoayJsqkMvOJ3bSH/65vRXaYaR7t/?=
 =?us-ascii?Q?QkG3tGrG8abkawtOHDig+NXhK18ETIKQKvAepMqb/JdayNZpxk59op8nPF89?=
 =?us-ascii?Q?ylmFBqBu4CEx+BzNIk5Qq36puaeKlfVuu3NESu7o3rPkKdXgLG0Zb6mA7nIa?=
 =?us-ascii?Q?hJ1frxFNWqEpatJIPwu1atcsK8sCIMNLL+50xLr9rZa7VWhc7u49IacITeLg?=
 =?us-ascii?Q?tdgeI0E8gpQB7TKvSwmo08TyhxxVKr3xk4FKuxRD09cyr58dn9OgunP+ADXh?=
 =?us-ascii?Q?Mr2c0qdbJIznbEphgjTDAc3pnVgLSbvlaMrzAkKpaXYeB0fVHY4EPX+MVOR/?=
 =?us-ascii?Q?nlltbFWFOqZO72WJD4StHqcAFWu/ZZ08qp7rLgNU8PzZwUggHNtQXhhkLixN?=
 =?us-ascii?Q?ArZy7hb5FqF5Ypwvjd+mpK2DlbSddyKn6Ldufy45GJ3Jk+dD9R+I+gdQAhc8?=
 =?us-ascii?Q?9Yrhs4i8DW6gfbfCQSYgo6qSq/c/2WFEJn7f3Sc7iesU7sp0k4g4xTVBz0DV?=
 =?us-ascii?Q?ZMBQ4lUibdM5lPl6RMvQ9YkD6QsGNtl5MFvnc3Ar2XM5SQJWC1xfOG7sdQZ/?=
 =?us-ascii?Q?9/Kv+9oHW+VPK5LUuBYzibDNwuFpp6Q=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a01f51cd-438c-4cd4-5913-08da2ec79283
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4542.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2022 18:46:32.0155
 (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: P7ysODUfQlMTyRDRn0SJ6a74voV7qKSi2u/Xw0LQ8ZrYZ7yRx+xRd0rOLyhNbzIJ3YBXt+J7fDzKi4OaGSffJPdiQ1xh6ZBzVoZU7f/8FQA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR10MB1875
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.486,18.0.858
 definitions=2022-05-05_08:2022-05-05,2022-05-05 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 adultscore=0
 bulkscore=0 suspectscore=0 mlxlogscore=999 malwarescore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000
 definitions=main-2205050126
X-Proofpoint-GUID: dHiZuK2pmXvGnMf77oqsfh459gzkSJhQ
X-Proofpoint-ORIG-GUID: dHiZuK2pmXvGnMf77oqsfh459gzkSJhQ
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no 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

CPU and memory change notifications are received in order to
regenerate the elfcorehdr.

To support cpu hotplug, a callback is registered to capture the
CPUHP_AP_ONLINE_DYN online and offline events via
cpuhp_setup_state_nocalls().

To support memory hotplug, a notifier is registered to capture the
MEM_ONLINE and MEM_OFFLINE events via register_memory_notifier().

The cpu callback and memory notifiers call handle_hotplug_event()
to handle the hot plug/unplug event. Then handle_hotplug_event()
dispatches the event to the architecture specific
arch_crash_handle_hotplug_event(). During the process, the
kexec_mutex is held.

Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
---
 include/linux/crash_core.h | 10 +++++
 include/linux/kexec.h      |  5 +++
 kernel/crash_core.c        | 92 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+)

diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index de62a722431e..a240f84348aa 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -84,4 +84,14 @@ int parse_crashkernel_high(char *cmdline, unsigned long long system_ram,
 int parse_crashkernel_low(char *cmdline, unsigned long long system_ram,
 		unsigned long long *crash_size, unsigned long long *crash_base);
 
+#define KEXEC_CRASH_HP_REMOVE_CPU		0
+#define KEXEC_CRASH_HP_ADD_CPU			1
+#define KEXEC_CRASH_HP_REMOVE_MEMORY	2
+#define KEXEC_CRASH_HP_ADD_MEMORY		3
+#define KEXEC_CRASH_HP_INVALID_CPU		-1U
+
+struct kimage;
+void arch_crash_handle_hotplug_event(struct kimage *image, unsigned int hp_action,
+									unsigned int cpu);
+
 #endif /* LINUX_CRASH_CORE_H */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index f93f2591fc1e..5935bc78ed7f 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -308,6 +308,11 @@ struct kimage {
 	struct purgatory_info purgatory_info;
 #endif
 
+	bool hotplug_event;
+	unsigned int offlinecpu;
+	bool elfcorehdr_index_valid;
+	int elfcorehdr_index;
+
 #ifdef CONFIG_IMA_KEXEC
 	/* Virtual address of IMA measurement buffer for kexec syscall */
 	void *ima_buffer;
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 256cf6db573c..f197af50def6 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -9,12 +9,17 @@
 #include <linux/init.h>
 #include <linux/utsname.h>
 #include <linux/vmalloc.h>
+#include <linux/highmem.h>
+#include <linux/memory.h>
+#include <linux/cpuhotplug.h>
 
 #include <asm/page.h>
 #include <asm/sections.h>
 
 #include <crypto/sha1.h>
 
+#include "kexec_internal.h"
+
 /* vmcoreinfo stuff */
 unsigned char *vmcoreinfo_data;
 size_t vmcoreinfo_size;
@@ -491,3 +496,90 @@ static int __init crash_save_vmcoreinfo_init(void)
 }
 
 subsys_initcall(crash_save_vmcoreinfo_init);
+
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+void __weak arch_crash_handle_hotplug_event(struct kimage *image,
+							unsigned int hp_action, unsigned int cpu)
+{
+	WARN(1, "crash hotplug handler not implemented");
+}
+
+static void handle_hotplug_event(unsigned int hp_action, unsigned int cpu)
+{
+	/* Obtain lock while changing crash information */
+	if (!mutex_trylock(&kexec_mutex))
+		return;
+
+	/* Check kdump is loaded */
+	if (kexec_crash_image) {
+		pr_debug("crash hp: hp_action %u, cpu %u", hp_action, cpu);
+
+		/* Needed in order for the segments to be updated */
+		arch_kexec_unprotect_crashkres();
+
+		/* Flag to differentiate between normal load and hotplug */
+		kexec_crash_image->hotplug_event = true;
+
+		/* Now invoke arch-specific update handler */
+		arch_crash_handle_hotplug_event(kexec_crash_image, hp_action, cpu);
+
+		/* No longer handling a hotplug event */
+		kexec_crash_image->hotplug_event = false;
+
+		/* Change back to read-only */
+		arch_kexec_protect_crashkres();
+	}
+
+	/* Release lock now that update complete */
+	mutex_unlock(&kexec_mutex);
+}
+
+static int crash_memhp_notifier(struct notifier_block *nb, unsigned long val, void *v)
+{
+	switch (val) {
+	case MEM_ONLINE:
+		handle_hotplug_event(KEXEC_CRASH_HP_ADD_MEMORY, 0);
+		break;
+
+	case MEM_OFFLINE:
+		handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_MEMORY, 0);
+		break;
+	}
+	return NOTIFY_OK;
+}
+
+static struct notifier_block crash_memhp_nb = {
+	.notifier_call = crash_memhp_notifier,
+	.priority = 0
+};
+
+static int crash_cpuhp_online(unsigned int cpu)
+{
+	handle_hotplug_event(KEXEC_CRASH_HP_ADD_CPU, cpu);
+	return 0;
+}
+
+static int crash_cpuhp_offline(unsigned int cpu)
+{
+	handle_hotplug_event(KEXEC_CRASH_HP_REMOVE_CPU, cpu);
+	return 0;
+}
+
+static int __init crash_hotplug_init(void)
+{
+	int result = 0;
+
+	if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG))
+		register_memory_notifier(&crash_memhp_nb);
+
+	if (IS_ENABLED(CONFIG_HOTPLUG_CPU))
+		result = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
+									"crash/cpuhp",
+									crash_cpuhp_online,
+									crash_cpuhp_offline);
+
+	return result;
+}
+
+subsys_initcall(crash_hotplug_init);
+#endif
-- 
2.27.0