Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp1448881pxb; Thu, 14 Apr 2022 06:32:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwj2M9VIhanGxXEQ9ljhqoUfsfWNBqwj7GsYcB56visIvZUVpcWBpicq0SSIrNEmp38fZXK X-Received: by 2002:a17:902:e415:b0:158:8e4c:72af with SMTP id m21-20020a170902e41500b001588e4c72afmr11764976ple.168.1649943121302; Thu, 14 Apr 2022 06:32:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649943121; cv=none; d=google.com; s=arc-20160816; b=XslmNvIGvW2BFP1c48l9yuIqn8yIWW50Q9N4FbAXnvECoIyQ0csgFIzy3eGyBLFQuf YTvO9SWEOqMuUw7cbs6ZsYvZ38ODP4PwaIP+oI9rRbjXP1gOpOKh6ZOMfsRFXtVHoVuK Y3W3QXxtcoypZFdso2TV83oWtXkRNcIgxfK0oTHi11ebwRH+uICDUZ97FvE6L6ASUI2l +/bomljRr+bwlNS/zFzMndvV/TjFvCPeooLVqkJ7FgODx/84HuMAnQfYvGY3KUYsD3j4 QvqfIeAOSNLKu95kksAJgiKh4LWzg3fI6ydOIgCNk56/5r3QFXqy8fVcDSoi1ydQBMRB 8Fgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=6mzrefq+dbY6K76BFGUJH8li2RwYS4ytTBHcBNer0T8=; b=XokWmVO0/6u5HnahAxTIab+2fATwbhFb1pk0p7Isny7NK7+t+RrHIExw5mvqE772F9 cq/CQALiacCXqApC7coGs4E+IkGyd+WDnKVUxtsVGkLY3PZpKs+Uh+0K56bVooLxYlTJ GsCYYYoEfl4OfEtnph+coVAuSMWQthPlYEfqrDnB61BEWphbTDqOWA44JV+OmICl6x/0 hbQdJowsY+F6F2Blqs3qs8Y4Z3UZvZGtRD278UyUvL21zxpCNCMzZzUunMv0/wtZfXZg Y+CSqG45PLzlZPKiqFfl/rBikB0VTIjjUEZbWIiWAZTTlzFRd3S+aTBNzEbettJllG+s OOhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QXYX7r6B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id on2-20020a17090b1d0200b001cd5316d236si1937072pjb.35.2022.04.14.06.31.43; Thu, 14 Apr 2022 06:32:01 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QXYX7r6B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239619AbiDNCsX (ORCPT + 99 others); Wed, 13 Apr 2022 22:48:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233483AbiDNCsV (ORCPT ); Wed, 13 Apr 2022 22:48:21 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DDAD41FA68 for ; Wed, 13 Apr 2022 19:45:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649904357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6mzrefq+dbY6K76BFGUJH8li2RwYS4ytTBHcBNer0T8=; b=QXYX7r6B9welT5fosTGB+xpkmA4eVdsHwoe+eP+nkib8uzGxImCBj9azAJ6JPe7AP/pmbV yoxOABjbFnt/1nusikThuNxGUXmSKYlipHJgSYp0K/H35y7zXXa015y5M3AupctkcD+aeD EvCnKdu8ByAatpck/5TrI7mnCwmO4x8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-342-F1oRM1dUPOqs29tHapmbZQ-1; Wed, 13 Apr 2022 22:45:53 -0400 X-MC-Unique: F1oRM1dUPOqs29tHapmbZQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7E594811E76; Thu, 14 Apr 2022 02:45:52 +0000 (UTC) Received: from localhost (ovpn-13-186.pek2.redhat.com [10.72.13.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 155C81457F13; Thu, 14 Apr 2022 02:45:50 +0000 (UTC) Date: Thu, 14 Apr 2022 10:45:48 +0800 From: Baoquan He To: Eric DeVolder 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 Subject: Re: [PATCH v7 4/8] crash: add generic infrastructure for crash hotplug support Message-ID: References: <20220413164237.20845-1-eric.devolder@oracle.com> <20220413164237.20845-5-eric.devolder@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220413164237.20845-5-eric.devolder@oracle.com> X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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: X-Mailing-List: linux-kernel@vger.kernel.org On 04/13/22 at 12:42pm, Eric DeVolder wrote: > Upon CPU and memory changes, a generic crash_hotplug_handler() > dispatches the hot plug/unplug event to the architecture specific > arch_crash_hotplug_handler(). During the process, the kexec_mutex > is held. > > To support cpu hotplug, a callback is registered to capture the > CPUHP_AP_ONLINE_DYN online and ofline 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 notifier then call crash_hotplug_handler() > to handle the hot plug/unplug event. > > Signed-off-by: Eric DeVolder > --- > include/linux/kexec.h | 16 +++++++ > kernel/crash_core.c | 101 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 117 insertions(+) > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index f93f2591fc1e..02daff1f47dd 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -306,6 +306,13 @@ struct kimage { > > /* Information for loading purgatory */ > struct purgatory_info purgatory_info; > + > +#ifdef CONFIG_CRASH_HOTPLUG > + bool hotplug_event; > + unsigned int offlinecpu; > + bool elfcorehdr_index_valid; > + int elfcorehdr_index; > +#endif > #endif > > #ifdef CONFIG_IMA_KEXEC > @@ -322,6 +329,15 @@ struct kimage { > unsigned long elf_load_addr; > }; > > +#ifdef CONFIG_CRASH_HOTPLUG > +void arch_crash_hotplug_handler(struct kimage *image, > + unsigned int hp_action, unsigned int cpu); > +#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 > +#endif /* CONFIG_CRASH_HOTPLUG */ > + > /* kexec interface functions */ > extern void machine_kexec(struct kimage *image); > extern int machine_kexec_prepare(struct kimage *image); > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 256cf6db573c..ecf746243ab2 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -9,12 +9,17 @@ > #include > #include > #include > +#include > +#include > +#include > > #include > #include > > #include > > +#include "kexec_internal.h" > + > /* vmcoreinfo stuff */ > unsigned char *vmcoreinfo_data; > size_t vmcoreinfo_size; > @@ -491,3 +496,99 @@ static int __init crash_save_vmcoreinfo_init(void) > } > > subsys_initcall(crash_save_vmcoreinfo_init); > + > +#ifdef CONFIG_CRASH_HOTPLUG > +void __weak arch_crash_hotplug_handler(struct kimage *image, > + unsigned int hp_action, unsigned int cpu) > +{ > + pr_warn("crash hp: %s not implemented", __func__); > +} > + > +static void crash_hotplug_handler(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_hotplug_handler(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); > +} > + > +#if defined(CONFIG_MEMORY_HOTPLUG) > +static int crash_memhp_notifier(struct notifier_block *nb, > + unsigned long val, void *v) > +{ > + struct memory_notify *mhp = v; > + > + switch (val) { > + case MEM_ONLINE: > + crash_hotplug_handler(KEXEC_CRASH_HP_ADD_MEMORY, -1U); We don't differentiate the memory add/remove, cpu add, except of cpu remove. Means the hp_action only differentiate cpu remove from the other action. Maybe only making two types? #define KEXEC_CRASH_HP_REMOVE_CPU 0 #define KEXEC_CRASH_HP_UPDATE_OTHER 1 And define a new macro to replace the magic number? #define KEXEC_CRASH_HP_INVALID_CPU -1U > + break; > + > + case MEM_OFFLINE: > + crash_hotplug_handler(KEXEC_CRASH_HP_REMOVE_MEMORY, -1U); > + break; > + } > + return NOTIFY_OK; > +} > + > +static struct notifier_block crash_memhp_nb = { > + .notifier_call = crash_memhp_notifier, > + .priority = 0 > +}; > +#endif > + > +#if defined(CONFIG_HOTPLUG_CPU) > +static int crash_cpuhp_online(unsigned int cpu) > +{ > + crash_hotplug_handler(KEXEC_CRASH_HP_ADD_CPU, cpu); Should making the cpu as -1U? crash_hotplug_handler(KEXEC_CRASH_HP_ADD_CPU, -1U); > + return 0; > +} > + > +static int crash_cpuhp_offline(unsigned int cpu) > +{ > + crash_hotplug_handler(KEXEC_CRASH_HP_REMOVE_CPU, cpu); > + return 0; > +} > +#endif > + > +static int __init crash_hotplug_init(void) > +{ > + int result = 0; > + > +#if defined(CONFIG_MEMORY_HOTPLUG) > + register_memory_notifier(&crash_memhp_nb); > +#endif > + > +#if defined(CONFIG_HOTPLUG_CPU) > + result = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, > + "crash/cpuhp", > + crash_cpuhp_online, crash_cpuhp_offline); > +#endif > + > + return result; > +} > + > +subsys_initcall(crash_hotplug_init); > +#endif /* CONFIG_CRASH_HOTPLUG */ > -- > 2.27.0 >