From: Sourabh Jain <sourabhjain@linux.ibm.com> To: linuxppc-dev@ozlabs.org, mpe@ellerman.id.au Cc: eric.devolder@oracle.com, bhe@redhat.com, kexec@lists.infradead.org, ldufour@linux.ibm.com, hbathini@linux.ibm.com Subject: [PATCH v9 3/6] powerpc/crash: add a new member to the kimage_arch struct Date: Sun, 12 Mar 2023 23:41:51 +0530 [thread overview] Message-ID: <20230312181154.278900-4-sourabhjain@linux.ibm.com> (raw) In-Reply-To: <20230312181154.278900-1-sourabhjain@linux.ibm.com> A new member "fdt_index" is added to the kimage_arch struct to hold the index of the FDT (Flattened Device Tree) segment from the kexec the segment array. fdt_index will provide direct access to the FDT segment in the kexec segment array after the kdump kernel is loaded. The new attribute will be used in the arch crash hotplug handler (added in upcoming patches) on every CPU and memory hotplug event. The fdt_index is populated for both kexec_load and kexec_file_load case. Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com> --- arch/powerpc/include/asm/kexec.h | 5 +++++ arch/powerpc/kexec/core_64.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 8090ad7d97d9d..348eb96e8ca67 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -103,6 +103,8 @@ void kexec_copy_flush(struct kimage *image); struct crash_mem; int update_cpus_node(void *fdt); int get_crash_memory_ranges(struct crash_mem **mem_ranges); +int machine_kexec_post_load(struct kimage *image); +#define machine_kexec_post_load machine_kexec_post_load #endif #if defined(CONFIG_CRASH_DUMP) && defined(CONFIG_PPC_RTAS) @@ -118,6 +120,9 @@ extern const struct kexec_file_ops kexec_elf64_ops; struct kimage_arch { struct crash_mem *exclude_ranges; +#if defined(CONFIG_CRASH_HOTPLUG) + int fdt_index; +#endif unsigned long backup_start; void *backup_buf; void *fdt; diff --git a/arch/powerpc/kexec/core_64.c b/arch/powerpc/kexec/core_64.c index 0b292f93a74cc..531486c973988 100644 --- a/arch/powerpc/kexec/core_64.c +++ b/arch/powerpc/kexec/core_64.c @@ -77,6 +77,37 @@ int machine_kexec_prepare(struct kimage *image) return 0; } +int machine_kexec_post_load(struct kimage *kimage) +{ +#if defined(CONFIG_CRASH_HOTPLUG) + int i; + void *ptr; + unsigned long mem; + + /* Mark fdt_index invalid */ + kimage->arch.fdt_index = -1; + + /* fdt_index remains invalid if it is not a crash kernel load */ + if (kimage->type != KEXEC_TYPE_CRASH) + return 0; + /* + * Find the FDT segment index in kexec segment array and + * assign it to kimage's member fdt_index to enable direct + * access to FDT segment later on. + */ + for (i = 0; i < kimage->nr_segments; i++) { + mem = kimage->segment[i].mem; + ptr = __va(mem); + + if (ptr && fdt_magic(ptr) == FDT_MAGIC) { + kimage->arch.fdt_index = i; + break; + } + } +#endif + return 0; +} + /* Called during kexec sequence with MMU off */ static notrace void copy_segments(unsigned long ind) { -- 2.39.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
From: Sourabh Jain <sourabhjain@linux.ibm.com> To: linuxppc-dev@ozlabs.org, mpe@ellerman.id.au Cc: eric.devolder@oracle.com, bhe@redhat.com, mahesh@linux.vnet.ibm.com, kexec@lists.infradead.org, ldufour@linux.ibm.com, hbathini@linux.ibm.com Subject: [PATCH v9 3/6] powerpc/crash: add a new member to the kimage_arch struct Date: Sun, 12 Mar 2023 23:41:51 +0530 [thread overview] Message-ID: <20230312181154.278900-4-sourabhjain@linux.ibm.com> (raw) In-Reply-To: <20230312181154.278900-1-sourabhjain@linux.ibm.com> A new member "fdt_index" is added to the kimage_arch struct to hold the index of the FDT (Flattened Device Tree) segment from the kexec the segment array. fdt_index will provide direct access to the FDT segment in the kexec segment array after the kdump kernel is loaded. The new attribute will be used in the arch crash hotplug handler (added in upcoming patches) on every CPU and memory hotplug event. The fdt_index is populated for both kexec_load and kexec_file_load case. Signed-off-by: Sourabh Jain <sourabhjain@linux.ibm.com> --- arch/powerpc/include/asm/kexec.h | 5 +++++ arch/powerpc/kexec/core_64.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h index 8090ad7d97d9d..348eb96e8ca67 100644 --- a/arch/powerpc/include/asm/kexec.h +++ b/arch/powerpc/include/asm/kexec.h @@ -103,6 +103,8 @@ void kexec_copy_flush(struct kimage *image); struct crash_mem; int update_cpus_node(void *fdt); int get_crash_memory_ranges(struct crash_mem **mem_ranges); +int machine_kexec_post_load(struct kimage *image); +#define machine_kexec_post_load machine_kexec_post_load #endif #if defined(CONFIG_CRASH_DUMP) && defined(CONFIG_PPC_RTAS) @@ -118,6 +120,9 @@ extern const struct kexec_file_ops kexec_elf64_ops; struct kimage_arch { struct crash_mem *exclude_ranges; +#if defined(CONFIG_CRASH_HOTPLUG) + int fdt_index; +#endif unsigned long backup_start; void *backup_buf; void *fdt; diff --git a/arch/powerpc/kexec/core_64.c b/arch/powerpc/kexec/core_64.c index 0b292f93a74cc..531486c973988 100644 --- a/arch/powerpc/kexec/core_64.c +++ b/arch/powerpc/kexec/core_64.c @@ -77,6 +77,37 @@ int machine_kexec_prepare(struct kimage *image) return 0; } +int machine_kexec_post_load(struct kimage *kimage) +{ +#if defined(CONFIG_CRASH_HOTPLUG) + int i; + void *ptr; + unsigned long mem; + + /* Mark fdt_index invalid */ + kimage->arch.fdt_index = -1; + + /* fdt_index remains invalid if it is not a crash kernel load */ + if (kimage->type != KEXEC_TYPE_CRASH) + return 0; + /* + * Find the FDT segment index in kexec segment array and + * assign it to kimage's member fdt_index to enable direct + * access to FDT segment later on. + */ + for (i = 0; i < kimage->nr_segments; i++) { + mem = kimage->segment[i].mem; + ptr = __va(mem); + + if (ptr && fdt_magic(ptr) == FDT_MAGIC) { + kimage->arch.fdt_index = i; + break; + } + } +#endif + return 0; +} + /* Called during kexec sequence with MMU off */ static notrace void copy_segments(unsigned long ind) { -- 2.39.1
next prev parent reply other threads:[~2023-03-12 18:13 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-12 18:11 [PATCH v9 0/6] PowerPC: in kernel handling of CPU hotplug events for crash kernel Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-12 18:11 ` [PATCH v9 1/6] powerpc/kexec: turn some static helper functions public Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-13 16:18 ` Laurent Dufour 2023-03-13 16:18 ` Laurent Dufour 2023-03-14 3:41 ` Sourabh Jain 2023-03-14 3:41 ` Sourabh Jain 2023-03-12 18:11 ` [PATCH v9 2/6] powerpc/crash: introduce a new config option CRASH_HOTPLUG Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-13 15:46 ` Eric DeVolder 2023-03-13 15:46 ` Eric DeVolder 2023-03-14 5:17 ` Sourabh Jain 2023-03-14 5:17 ` Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain [this message] 2023-03-12 18:11 ` [PATCH v9 3/6] powerpc/crash: add a new member to the kimage_arch struct Sourabh Jain 2023-03-13 16:25 ` Laurent Dufour 2023-03-13 16:25 ` Laurent Dufour 2023-03-14 5:01 ` Sourabh Jain 2023-03-14 5:01 ` Sourabh Jain 2023-03-12 18:11 ` [PATCH v9 4/6] powerpc/crash: add crash CPU hotplug support Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-12 18:11 ` [PATCH v9 5/6] crash: forward memory_notify args to arch crash hotplug handler Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-12 18:11 ` [PATCH v9 6/6] powerpc/kexec: add crash memory hotplug support Sourabh Jain 2023-03-12 18:11 ` Sourabh Jain 2023-03-13 15:42 ` [PATCH v9 0/6] PowerPC: in kernel handling of CPU hotplug events for crash kernel Eric DeVolder 2023-03-13 15:42 ` Eric DeVolder 2023-03-14 3:38 ` Sourabh Jain 2023-03-14 3:38 ` Sourabh Jain
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230312181154.278900-4-sourabhjain@linux.ibm.com \ --to=sourabhjain@linux.ibm.com \ --cc=bhe@redhat.com \ --cc=eric.devolder@oracle.com \ --cc=hbathini@linux.ibm.com \ --cc=kexec@lists.infradead.org \ --cc=ldufour@linux.ibm.com \ --cc=linuxppc-dev@ozlabs.org \ --cc=mpe@ellerman.id.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.