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;
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,
        sourabhjain@linux.ibm.com, konrad.wilk@oracle.com,
        boris.ostrovsky@oracle.com, eric.devolder@oracle.com
Subject: [PATCH v10 4/8] crash: add generic infrastructure for crash hotplug support
Date:   Thu, 21 Jul 2022 14:17:43 -0400
Message-Id: <20220721181747.1640-5-eric.devolder@oracle.com>
In-Reply-To: <20220721181747.1640-1-eric.devolder@oracle.com>
References: <20220721181747.1640-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?IIuLXXdQTtYLjKQU5DXSvTfKxBsrC0TRyicPBAbKZRzA1HBy7WgFwxSLjnef?=
 =?us-ascii?Q?mSqFpKS8Rgto6ZhYBHYYgjvFIqML7CGQnhjutmcOTlfrJ68829cDx+ITLVHJ?=
 =?us-ascii?Q?oqwQFvEv7juxG7uklHnCJJiGyS6cmi1Iz1S/TPYkPwpyGjIQe9PsA14G4bNk?=
 =?us-ascii?Q?I3HMvJ0ptnPKWj8Stkbmwp1aY/3hLtwD0odqlXUfZu/eFzLnY+vUUXxhCOJH?=
 =?us-ascii?Q?jnI0WBjg45PvcO0vH6rr5PpogxeQffBsUe4H+pwkP+nCNKpnPCowYZOD96/M?=
 =?us-ascii?Q?ztJc/7hDcDu2IjCh8PmEXgBDeB8CYsqIEgp4YGZAR9NwFeoOF/IIBlqb2pw0?=
 =?us-ascii?Q?wphrL3OkTHXKCuIXEISTImjeI6TTeG2IpfvwkTx1myq8ArOtHKpgXpNEbpaW?=
 =?us-ascii?Q?0g1gfm0OMJJHMKgZAcRorXlFQxOK/EgfKVLXdJlJJYwPZUI53Lca8MwybNG9?=
 =?us-ascii?Q?NPjtDDCYaFbXbK/Sfj0mPS4QU7+BzaHOuhtbLLZIwtmWKQQcvfaHwLsYwFnK?=
 =?us-ascii?Q?Nltx5uE7Z56H29cdg6jDX4AO8m+s+gcZuAVgTPpm3q0phy8dhepLJSSLfMKX?=
 =?us-ascii?Q?lOW0CAaUROCFOTQQz1X8qfBkMA0SR+azbbmO3p3xuN1f5rAbRuSBqDLC052o?=
 =?us-ascii?Q?6VDd7WrwSckc9Om0iq4dDtlUhDClogLAlkK5pYaYKPrQeQr0DN0cm7Rbluia?=
 =?us-ascii?Q?RWYVIFW13ZslUzuezbqTb5n5NfeOguoEXeuHG3RTIGajsr44MDr9DEcWGJMv?=
 =?us-ascii?Q?hdhNcHHwb9FTTwUuZSpKUgB1thkdW1juIVbFhcDgOMqUmncFDaALGU+gDikY?=
 =?us-ascii?Q?5nJPlliKZCdB/Ff2mhpTMInRmp53VPoVfuWiJhRSjGQ//64kMfyHpJ/CXgvi?=
 =?us-ascii?Q?PqmksJgrllWMIxs3XrVYXB4rsGISbdpnpJKY32vYT4ZAa7Uz5c6Cqd75zP3b?=
 =?us-ascii?Q?Hm5ujll40WALBXpB0V/D76bNYE+7AwiCfTcCjkZFyKYroYYaKpWE3sMFM1fY?=
 =?us-ascii?Q?aii9q8grSkzhfMLpD2ahfnJ6+ADcxm0jF3oDjjdLxBjG8i2My8dc6rUhx9n9?=
 =?us-ascii?Q?UxENAy2V1lGVQtbMbtHiIItGpata6Uvbxbiw3ZVMRJirHRPuGkGAK3Ome863?=
 =?us-ascii?Q?rnjRFHTiFFCCed5fvlt5+4U1PNDRGvlaQ8oDXYcvB+0QSvceWVEXr9pwQmsy?=
 =?us-ascii?Q?INCQIqrgeLBrmHmVwUx1q+RgLmCaU2ipyqtyV7s8bpSBQA1c1689WWeuw3UJ?=
 =?us-ascii?Q?hBb+5wCjkqoa93GVIaZ5fTV8hzvC3CGjt3Copj2mLnBrQQBvipsXbfzxjKvK?=
 =?us-ascii?Q?zJNUNSa5PQuQ777sUq+VvzYSXWS7LWNC4soYRzofE+OvJvj71foGD/gtWQDs?=
 =?us-ascii?Q?+pTRSw0OKZXvahgytY4EXG82YlVlgbBTjWUA5E/bg5Zcx1FE2pq7a5g1RE16?=
 =?us-ascii?Q?3b6fJVpWQsGuSMT+c/KQgqQuGFWZScq7PZMa3e3onO0fLyv14r9YVk009Y9n?=
 =?us-ascii?Q?5Q0pGsau6CWrsAvdVBWl/jVqWubaiELI05YST3yguIUwU7a9lgHMNS6D/+GM?=
 =?us-ascii?Q?i8HGbJWJI0lAlB1qCDUD5aUGym4SXC9kLNIagXm0JAah9YuikwqC5+iEl745?=
 =?us-ascii?Q?Og=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 902ad35b-8708-4bc0-bdb4-08da6b456315
X-MS-Exchange-CrossTenant-AuthSource: CO1PR10MB4531.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 18:18:18.7505
 (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: XW8DY4wZx/BmFV9hT6CttdCS76oT95OdaAKHUYbtRDWNrFf0ThRQdjlH6mLpCR6MzGwiJpgscufbac2kqfpvpOUx14FAMqRyAptveIdqcsU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3986
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1
 definitions=2022-07-21_25,2022-07-21_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207210074
X-Proofpoint-GUID: xIz57JN0y6BDx9C9QZ16jpqdlN5psdWo
X-Proofpoint-ORIG-GUID: xIz57JN0y6BDx9C9QZ16jpqdlN5psdWo
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE 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

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()
which performs needed tasks and then 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 |  24 ++++++++
 include/linux/kexec.h      |   7 +++
 kernel/crash_core.c        | 118 +++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+)

diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index cb0f1916fbf5..c9705b6872e7 100644
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -86,4 +86,28 @@ 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;
+#ifndef arch_map_crash_pages
+static inline void *arch_map_crash_pages(unsigned long paddr,
+		unsigned long size)
+{
+	return NULL;
+}
+#endif
+#ifndef arch_unmap_crash_pages
+static inline void arch_unmap_crash_pages(void **ptr) { }
+#endif
+#ifndef arch_crash_handle_hotplug_event
+static inline void arch_crash_handle_hotplug_event(struct kimage *image,
+		unsigned int hp_action, unsigned int cpu)
+{
+}
+#endif
+
 #endif /* LINUX_CRASH_CORE_H */
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 5f4969cf3f4e..7694aa77b92b 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -340,6 +340,13 @@ struct kimage {
 	struct purgatory_info purgatory_info;
 #endif
 
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+	bool hotplug_event;
+	unsigned int offlinecpu;
+	bool elfcorehdr_index_valid;
+	int elfcorehdr_index;
+#endif
+
 #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 212d4dad0ec7..154ef532d45a 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -10,12 +10,16 @@
 #include <linux/utsname.h>
 #include <linux/vmalloc.h>
 #include <linux/kexec.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;
@@ -587,3 +591,117 @@ static int __init crash_save_vmcoreinfo_init(void)
 }
 
 subsys_initcall(crash_save_vmcoreinfo_init);
+
+#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_MEMORY_HOTPLUG)
+static void handle_hotplug_event(unsigned int hp_action, unsigned int cpu)
+{
+	/* Obtain lock while changing crash information */
+	mutex_lock(&kexec_mutex);
+
+	/* Check kdump is loaded */
+	if (kexec_crash_image) {
+		struct kimage *image = kexec_crash_image;
+
+		pr_debug("crash hp: hp_action %u, cpu %u", hp_action, cpu);
+
+		/*
+		 * When the struct kimage is alloced, it is wiped to zero, so
+		 * the elfcorehdr_index_valid defaults to false. Find the
+		 * segment containing the elfcorehdr, if not already found.
+		 * This works for both the kexec_load and kexec_file_load paths.
+		 */
+		if (!image->elfcorehdr_index_valid) {
+			unsigned char *ptr;
+			unsigned long mem, memsz;
+			unsigned int n;
+
+			for (n = 0; n < image->nr_segments; n++) {
+				mem = image->segment[n].mem;
+				memsz = image->segment[n].memsz;
+				ptr = arch_map_crash_pages(mem, memsz);
+				if (ptr) {
+					/* The segment containing elfcorehdr */
+					if (memcmp(ptr, ELFMAG, SELFMAG) == 0) {
+						image->elfcorehdr_index = (int)n;
+						image->elfcorehdr_index_valid = true;
+					}
+				}
+				arch_unmap_crash_pages((void **)&ptr);
+			}
+		}
+
+		if (!image->elfcorehdr_index_valid) {
+			pr_err("crash hp: unable to locate elfcorehdr segment");
+			goto out;
+		}
+
+		/* Needed in order for the segments to be updated */
+		arch_kexec_unprotect_crashkres();
+
+		/* Flag to differentiate between normal load and hotplug */
+		image->hotplug_event = true;
+
+		/* Now invoke arch-specific update handler */
+		arch_crash_handle_hotplug_event(image, hp_action, cpu);
+
+		/* No longer handling a hotplug event */
+		image->hotplug_event = false;
+
+		/* Change back to read-only */
+		arch_kexec_protect_crashkres();
+	}
+
+out:
+	/* 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.31.1