| Message ID | 156630274313.8896.17475124195648859586.stgit@hbathini.in.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add FADump support on PowerNV platform | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch next (c9633332103e55bc73d80d07ead28b95a22a85a3) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 52 lines checked |
On 20/08/19 5:35 PM, Hari Bathini wrote: > During kexec boot, metadata address needs to be reset to avoid running > into errors interpreting stale metadata address, in case the kexec'ed > kernel crashes before metadata address could be setup again. > > Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> > --- > arch/powerpc/kernel/fadump-common.h | 1 + > arch/powerpc/kernel/fadump.c | 2 ++ > arch/powerpc/platforms/powernv/opal-fadump.c | 10 ++++++++++ > arch/powerpc/platforms/pseries/rtas-fadump.c | 3 +++ > 4 files changed, 16 insertions(+) > > diff --git a/arch/powerpc/kernel/fadump-common.h b/arch/powerpc/kernel/fadump-common.h > index 0acf412..d2dd117 100644 > --- a/arch/powerpc/kernel/fadump-common.h > +++ b/arch/powerpc/kernel/fadump-common.h > @@ -120,6 +120,7 @@ struct fadump_ops { > int (*fadump_register)(struct fw_dump *fadump_config); > int (*fadump_unregister)(struct fw_dump *fadump_config); > int (*fadump_invalidate)(struct fw_dump *fadump_config); > + void (*fadump_cleanup)(struct fw_dump *fadump_config); > int (*fadump_process)(struct fw_dump *fadump_config); > void (*fadump_region_show)(struct fw_dump *fadump_config, > struct seq_file *m); > diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c > index a086a09..b2d5ca6 100644 > --- a/arch/powerpc/kernel/fadump.c > +++ b/arch/powerpc/kernel/fadump.c > @@ -830,6 +830,8 @@ void fadump_cleanup(void) > fw_dump.ops->fadump_unregister(&fw_dump); > free_crash_memory_ranges(); > } > + > + fw_dump.ops->fadump_cleanup(&fw_dump); Actually, need to check if FADump is supported before proceeding with cleanup callbacks as fadump_cleanup() can be called outside FADump code in shutdown and kexec paths which could crash the system on machines that do not support FADump. Re-sent the patch adding the check in fadump_cleanup() function: https://patchwork.ozlabs.org/patch/1153806/ ("[RESEND,v5,13/31] powernv/fadump: reset metadata address during clean up") - Hari
diff --git a/arch/powerpc/kernel/fadump-common.h b/arch/powerpc/kernel/fadump-common.h index 0acf412..d2dd117 100644 --- a/arch/powerpc/kernel/fadump-common.h +++ b/arch/powerpc/kernel/fadump-common.h @@ -120,6 +120,7 @@ struct fadump_ops { int (*fadump_register)(struct fw_dump *fadump_config); int (*fadump_unregister)(struct fw_dump *fadump_config); int (*fadump_invalidate)(struct fw_dump *fadump_config); + void (*fadump_cleanup)(struct fw_dump *fadump_config); int (*fadump_process)(struct fw_dump *fadump_config); void (*fadump_region_show)(struct fw_dump *fadump_config, struct seq_file *m); diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index a086a09..b2d5ca6 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -830,6 +830,8 @@ void fadump_cleanup(void) fw_dump.ops->fadump_unregister(&fw_dump); free_crash_memory_ranges(); } + + fw_dump.ops->fadump_cleanup(&fw_dump); } static void fadump_free_reserved_memory(unsigned long start_pfn, diff --git a/arch/powerpc/platforms/powernv/opal-fadump.c b/arch/powerpc/platforms/powernv/opal-fadump.c index e5c4700..e466f7e 100644 --- a/arch/powerpc/platforms/powernv/opal-fadump.c +++ b/arch/powerpc/platforms/powernv/opal-fadump.c @@ -110,6 +110,15 @@ static int opal_fadump_invalidate(struct fw_dump *fadump_conf) return -EIO; } +static void opal_fadump_cleanup(struct fw_dump *fadump_conf) +{ + s64 ret; + + ret = opal_mpipl_register_tag(OPAL_MPIPL_TAG_KERNEL, 0); + if (ret != OPAL_SUCCESS) + pr_warn("Could not reset (%llu) kernel metadata tag!\n", ret); +} + static int __init opal_fadump_process(struct fw_dump *fadump_conf) { return -EINVAL; @@ -150,6 +159,7 @@ static struct fadump_ops opal_fadump_ops = { .fadump_register = opal_fadump_register, .fadump_unregister = opal_fadump_unregister, .fadump_invalidate = opal_fadump_invalidate, + .fadump_cleanup = opal_fadump_cleanup, .fadump_process = opal_fadump_process, .fadump_region_show = opal_fadump_region_show, .fadump_trigger = opal_fadump_trigger, diff --git a/arch/powerpc/platforms/pseries/rtas-fadump.c b/arch/powerpc/platforms/pseries/rtas-fadump.c index 4111ee9..6164c5a 100644 --- a/arch/powerpc/platforms/pseries/rtas-fadump.c +++ b/arch/powerpc/platforms/pseries/rtas-fadump.c @@ -235,6 +235,8 @@ static int rtas_fadump_invalidate(struct fw_dump *fadump_conf) return 0; } +static void rtas_fadump_cleanup(struct fw_dump *fadump_conf) { } + #define RTAS_FADUMP_GPR_MASK 0xffffff0000000000 static inline int rtas_fadump_gpr_index(u64 id) { @@ -508,6 +510,7 @@ static struct fadump_ops rtas_fadump_ops = { .fadump_register = rtas_fadump_register, .fadump_unregister = rtas_fadump_unregister, .fadump_invalidate = rtas_fadump_invalidate, + .fadump_cleanup = rtas_fadump_cleanup, .fadump_process = rtas_fadump_process, .fadump_region_show = rtas_fadump_region_show, .fadump_trigger = rtas_fadump_trigger,
During kexec boot, metadata address needs to be reset to avoid running into errors interpreting stale metadata address, in case the kexec'ed kernel crashes before metadata address could be setup again. Signed-off-by: Hari Bathini <hbathini@linux.ibm.com> --- arch/powerpc/kernel/fadump-common.h | 1 + arch/powerpc/kernel/fadump.c | 2 ++ arch/powerpc/platforms/powernv/opal-fadump.c | 10 ++++++++++ arch/powerpc/platforms/pseries/rtas-fadump.c | 3 +++ 4 files changed, 16 insertions(+)