* [PATCH v2 1/2] printk: Add function to return log buffer address and size @ 2014-07-31 15:35 Vasant Hegde 2014-07-31 15:36 ` [PATCH v2 2/2] powerpc/powernv: Interface to register/unregister opal dump region Vasant Hegde 2014-07-31 22:22 ` [PATCH v2 1/2] printk: Add function to return log buffer address and size Andrew Morton 0 siblings, 2 replies; 7+ messages in thread From: Vasant Hegde @ 2014-07-31 15:35 UTC (permalink / raw) To: linux-kernel Cc: linuxppc-dev, Andrew Morton, Linus Torvalds, Benjamin Herrenschmidt Platforms like IBM Power Systems supports service processor assisted dump. It provides interface to add memory region to be captured when system is crashed. During initialization/running we can add kernel memory region to be collected. Presently we don't have a way to get the log buffer base address and size. This patch adds support to return log buffer address and size. Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- Next patch extends arch specific code to add log buffer to platform dump. -Vasant include/linux/printk.h | 3 +++ kernel/printk/printk.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/printk.h b/include/linux/printk.h index 319ff7e..aae82c4 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -10,6 +10,9 @@ extern const char linux_banner[]; extern const char linux_proc_banner[]; +extern void *get_log_buf_addr(void); +extern u32 get_log_buf_len(void); + static inline int printk_get_level(const char *buffer) { if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13e839d..4049f7b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -270,6 +270,18 @@ static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); static char *log_buf = __log_buf; static u32 log_buf_len = __LOG_BUF_LEN; +/* Return log buffer address */ +void *get_log_buf_addr(void) +{ + return log_buf; +} + +/* Return log buffer size */ +u32 get_log_buf_len(void) +{ + return log_buf_len; +} + /* human readable text of the record */ static char *log_text(const struct printk_log *msg) { ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] powerpc/powernv: Interface to register/unregister opal dump region 2014-07-31 15:35 [PATCH v2 1/2] printk: Add function to return log buffer address and size Vasant Hegde @ 2014-07-31 15:36 ` Vasant Hegde 2014-07-31 22:22 ` [PATCH v2 1/2] printk: Add function to return log buffer address and size Andrew Morton 1 sibling, 0 replies; 7+ messages in thread From: Vasant Hegde @ 2014-07-31 15:36 UTC (permalink / raw) To: linux-kernel Cc: linuxppc-dev, Andrew Morton, Linus Torvalds, Benjamin Herrenschmidt PowerNV platform is capable of capturing host memory region when system crashes (because of host/firmware). We have new OPAL API to register/ unregister memory region to be captured when system crashes. This patch adds support for new API. Also during boot time we register kernel log buffer and unregister before doing kexec. Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- arch/powerpc/include/asm/opal.h | 15 +++++ arch/powerpc/platforms/powernv/Makefile | 2 - arch/powerpc/platforms/powernv/opal-dump-region.c | 64 +++++++++++++++++++++ arch/powerpc/platforms/powernv/opal-wrappers.S | 2 + arch/powerpc/platforms/powernv/opal.c | 2 + arch/powerpc/platforms/powernv/setup.c | 3 + 6 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 arch/powerpc/platforms/powernv/opal-dump-region.c diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h index 0da1dbd..f9261d7 100644 --- a/arch/powerpc/include/asm/opal.h +++ b/arch/powerpc/include/asm/opal.h @@ -147,6 +147,8 @@ struct opal_sg_list { #define OPAL_SET_PARAM 90 #define OPAL_DUMP_RESEND 91 #define OPAL_DUMP_INFO2 94 +#define OPAL_REGISTER_DUMP_REGION 101 +#define OPAL_UNREGISTER_DUMP_REGION 102 #ifndef __ASSEMBLY__ @@ -860,6 +862,8 @@ int64_t opal_get_param(uint64_t token, uint32_t param_id, uint64_t buffer, int64_t opal_set_param(uint64_t token, uint32_t param_id, uint64_t buffer, uint64_t length); int64_t opal_sensor_read(uint32_t sensor_hndl, int token, __be32 *sensor_data); +int64_t opal_register_dump_region(uint32_t id, uint64_t start, uint64_t end); +int64_t opal_unregister_dump_region(uint32_t id); /* Internal functions */ extern int early_init_dt_scan_opal(unsigned long node, const char *uname, @@ -899,6 +903,8 @@ extern int opal_elog_init(void); extern void opal_platform_dump_init(void); extern void opal_sys_param_init(void); extern void opal_msglog_init(void); +extern void opal_dump_region_init(void); +extern void opal_dump_kexec_callback(void); extern int opal_machine_check(struct pt_regs *regs); extern bool opal_mce_check_early_recovery(struct pt_regs *regs); @@ -912,6 +918,15 @@ struct opal_sg_list *opal_vmalloc_to_sg_list(void *vmalloc_addr, unsigned long vmalloc_size); void opal_free_sg_list(struct opal_sg_list *sg); +/* + * Dump regions ids + * 0x01 - 0x7F : OPAL + * 0x80 - 0xFF : Kernel + */ +#define DUMP_REGION_HOST_START 0x80 +#define DUMP_REGION_LOG_BUF 0x80 +#define DUMP_REGION_HOST_END 0xFF + #endif /* __ASSEMBLY__ */ #endif /* __OPAL_H */ diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile index 4ad227d..e2819aa 100644 --- a/arch/powerpc/platforms/powernv/Makefile +++ b/arch/powerpc/platforms/powernv/Makefile @@ -1,7 +1,7 @@ obj-y += setup.o opal-wrappers.o opal.o opal-async.o obj-y += opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o obj-y += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o -obj-y += opal-msglog.o +obj-y += opal-msglog.o opal-dump-region.o obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o obj-$(CONFIG_PCI) += pci.o pci-p5ioc2.o pci-ioda.o diff --git a/arch/powerpc/platforms/powernv/opal-dump-region.c b/arch/powerpc/platforms/powernv/opal-dump-region.c new file mode 100644 index 0000000..c3f1536 --- /dev/null +++ b/arch/powerpc/platforms/powernv/opal-dump-region.c @@ -0,0 +1,64 @@ +/* + * PowerNV OPAL dump memory region interface + * + * Copyright 2014 IBM Corp. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + +#include <linux/pagemap.h> +#include <linux/printk.h> +#include <asm/opal.h> + +/* + * Pass kernel address range (start, size) that will be included in + * system dump (collected by service processor whenever system crashes). + * + * @id : Memory region ID (see opal.h) + * @addr : Start address + * @size : size in bytes + */ +static int add_dump_region_entry(uint32_t id, void *addr, uint64_t size) +{ + __be32 be_id = cpu_to_be32(id); + __be64 be_addr = cpu_to_be64(__pa(addr)); + __be64 be_size = cpu_to_be64(size); + + return opal_register_dump_region(be_id, be_addr, be_size); +} + +static int remove_dump_region_entry(uint32_t id) +{ + __be32 be_id = cpu_to_be32(id); + + return opal_unregister_dump_region(be_id); +} + +/* This gets called just before kexec */ +void opal_dump_kexec_callback(void) +{ + int rc; + + rc = remove_dump_region_entry(DUMP_REGION_LOG_BUF); + if (rc) + pr_warn("DUMP: Failed to unregister kernel log buffer. " + "rc = %d\n", rc); +} + +void __init opal_dump_region_init(void) +{ + void *addr; + uint64_t size; + int rc; + + /* Register kernel log buffer */ + addr = get_log_buf_addr(); + size = get_log_buf_len(); + rc = add_dump_region_entry(DUMP_REGION_LOG_BUF, addr, size); + if (rc) + pr_warn("DUMP: Failed to register kernel log buffer. " + "rc = %d\n", rc); +} diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S index 4abbff2..0f016cb 100644 --- a/arch/powerpc/platforms/powernv/opal-wrappers.S +++ b/arch/powerpc/platforms/powernv/opal-wrappers.S @@ -146,3 +146,5 @@ OPAL_CALL(opal_sync_host_reboot, OPAL_SYNC_HOST_REBOOT); OPAL_CALL(opal_sensor_read, OPAL_SENSOR_READ); OPAL_CALL(opal_get_param, OPAL_GET_PARAM); OPAL_CALL(opal_set_param, OPAL_SET_PARAM); +OPAL_CALL(opal_register_dump_region, OPAL_REGISTER_DUMP_REGION); +OPAL_CALL(opal_unregister_dump_region, OPAL_UNREGISTER_DUMP_REGION); diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index 1999756..2834303 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -616,6 +616,8 @@ static int __init opal_init(void) /* Create "opal" kobject under /sys/firmware */ rc = opal_sysfs_init(); if (rc == 0) { + /* Setup dump region interface */ + opal_dump_region_init(); /* Setup error log interface */ rc = opal_elog_init(); /* Setup code update interface */ diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c index d9b88fa..644c9ba 100644 --- a/arch/powerpc/platforms/powernv/setup.c +++ b/arch/powerpc/platforms/powernv/setup.c @@ -184,6 +184,9 @@ static void pnv_shutdown(void) * DMA'ing ops are complete (such as dump retrieval). */ opal_shutdown(); + + /* Unregister memory dump region */ + opal_dump_kexec_callback(); } #ifdef CONFIG_KEXEC ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] printk: Add function to return log buffer address and size 2014-07-31 15:35 [PATCH v2 1/2] printk: Add function to return log buffer address and size Vasant Hegde 2014-07-31 15:36 ` [PATCH v2 2/2] powerpc/powernv: Interface to register/unregister opal dump region Vasant Hegde @ 2014-07-31 22:22 ` Andrew Morton 2014-08-01 0:40 ` Joe Perches 2014-08-01 8:15 ` Vasant Hegde 1 sibling, 2 replies; 7+ messages in thread From: Andrew Morton @ 2014-07-31 22:22 UTC (permalink / raw) To: Vasant Hegde Cc: linux-kernel, linuxppc-dev, Linus Torvalds, Benjamin Herrenschmidt On Thu, 31 Jul 2014 21:05:48 +0530 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> wrote: > Platforms like IBM Power Systems supports service processor > assisted dump. It provides interface to add memory region to > be captured when system is crashed. > > During initialization/running we can add kernel memory region > to be collected. > > Presently we don't have a way to get the log buffer base address > and size. This patch adds support to return log buffer address > and size. > > ... > > --- a/include/linux/printk.h > +++ b/include/linux/printk.h > @@ -10,6 +10,9 @@ > extern const char linux_banner[]; > extern const char linux_proc_banner[]; > > +extern void *get_log_buf_addr(void); > +extern u32 get_log_buf_len(void); > + > static inline int printk_get_level(const char *buffer) > { > if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index 13e839d..4049f7b 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -270,6 +270,18 @@ static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); > static char *log_buf = __log_buf; > static u32 log_buf_len = __LOG_BUF_LEN; > > +/* Return log buffer address */ > +void *get_log_buf_addr(void) > +{ > + return log_buf; > +} > + > +/* Return log buffer size */ > +u32 get_log_buf_len(void) > +{ > + return log_buf_len; > +} > + > /* human readable text of the record */ > static char *log_text(const struct printk_log *msg) > { Looks OK to me, although I think log_buf_addr_get() and log_buf_len_get() would be better names. The kernel uses some big-endian names and some little-endian-names and some middle-endian names. It's all rather a mess. These symbols are already big-endian (ie: decreasing significance): log_buf -> addr -> get log_buf -> len -> get The world wouldn't end if we simply made log_buf and log_buf_len global symbols. The pros and cons are all minor. It's probably better to make get_log_buf_addr() tell the truth and return a char *. Please include this in whatever tree carries "powerpc/powernv: Interface to register/unregister opal dump region". ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] printk: Add function to return log buffer address and size 2014-07-31 22:22 ` [PATCH v2 1/2] printk: Add function to return log buffer address and size Andrew Morton @ 2014-08-01 0:40 ` Joe Perches 2014-08-01 8:15 ` Vasant Hegde 1 sibling, 0 replies; 7+ messages in thread From: Joe Perches @ 2014-08-01 0:40 UTC (permalink / raw) To: Andrew Morton Cc: Vasant Hegde, linux-kernel, linuxppc-dev, Linus Torvalds, Benjamin Herrenschmidt On Thu, 2014-07-31 at 15:22 -0700, Andrew Morton wrote: > Please include this in whatever tree carries "powerpc/powernv: > Interface to register/unregister opal dump region". At some point, I'd like to redo the patch series that breaks up printk.c into more manageable blocks. https://lkml.org/lkml/2012/10/17/41 Any suggestion for timing? ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] printk: Add function to return log buffer address and size 2014-07-31 22:22 ` [PATCH v2 1/2] printk: Add function to return log buffer address and size Andrew Morton 2014-08-01 0:40 ` Joe Perches @ 2014-08-01 8:15 ` Vasant Hegde 1 sibling, 0 replies; 7+ messages in thread From: Vasant Hegde @ 2014-08-01 8:15 UTC (permalink / raw) To: Andrew Morton Cc: linux-kernel, linuxppc-dev, Linus Torvalds, Benjamin Herrenschmidt On 08/01/2014 03:52 AM, Andrew Morton wrote: > On Thu, 31 Jul 2014 21:05:48 +0530 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> wrote: > >> Platforms like IBM Power Systems supports service processor >> assisted dump. It provides interface to add memory region to >> be captured when system is crashed. >> >> During initialization/running we can add kernel memory region >> to be collected. >> >> Presently we don't have a way to get the log buffer base address >> and size. This patch adds support to return log buffer address >> and size. >> >> ... >> >> --- a/include/linux/printk.h >> +++ b/include/linux/printk.h >> @@ -10,6 +10,9 @@ >> extern const char linux_banner[]; >> extern const char linux_proc_banner[]; >> >> +extern void *get_log_buf_addr(void); >> +extern u32 get_log_buf_len(void); >> + >> static inline int printk_get_level(const char *buffer) >> { >> if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { >> diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c >> index 13e839d..4049f7b 100644 >> --- a/kernel/printk/printk.c >> +++ b/kernel/printk/printk.c >> @@ -270,6 +270,18 @@ static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); >> static char *log_buf = __log_buf; >> static u32 log_buf_len = __LOG_BUF_LEN; >> >> +/* Return log buffer address */ >> +void *get_log_buf_addr(void) >> +{ >> + return log_buf; >> +} >> + >> +/* Return log buffer size */ >> +u32 get_log_buf_len(void) >> +{ >> + return log_buf_len; >> +} >> + >> /* human readable text of the record */ >> static char *log_text(const struct printk_log *msg) >> { > Andrew, Thanks for the review.. Shall I add your Ack? > Looks OK to me, although I think log_buf_addr_get() and > log_buf_len_get() would be better names. The kernel uses some > big-endian names and some little-endian-names and some middle-endian > names. It's all rather a mess. These symbols are already big-endian > (ie: decreasing significance): > > log_buf -> addr -> get > log_buf -> len -> get Sure . Will rename function as above. > > > The world wouldn't end if we simply made log_buf and log_buf_len global > symbols. The pros and cons are all minor. > > It's probably better to make get_log_buf_addr() tell the truth and > return a char *. > > > Please include this in whatever tree carries "powerpc/powernv: > Interface to register/unregister opal dump region". Sure.. Will work with BenH. -Vasant ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] printk: Add function to return log buffer address and size @ 2014-07-31 10:30 Vasant Hegde 2014-08-01 20:54 ` Andrew Morton 0 siblings, 1 reply; 7+ messages in thread From: Vasant Hegde @ 2014-07-31 10:30 UTC (permalink / raw) To: linux-kernel Cc: linuxppc-dev, Andrew Morton, Linus Torvalds, Benjamin Herrenschmidt Platforms like IBM Power Systems supports service processor assisted dump. It provides interface to add memory region to be captured when system is crashed. During initialization/running we can add kernel memory region to be collected. Presently we don't have a way to get the log buffer base address and size. This patch adds support to return log buffer address and size. Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com> --- Next patch extends arch specific code to add log buffer to platform dump. -Vasant include/linux/printk.h | 3 +++ kernel/printk/printk.c | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/linux/printk.h b/include/linux/printk.h index 319ff7e..aae82c4 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -10,6 +10,9 @@ extern const char linux_banner[]; extern const char linux_proc_banner[]; +extern void *get_log_buf_addr(void); +extern u32 get_log_buf_len(void); + static inline int printk_get_level(const char *buffer) { if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13e839d..4049f7b 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -270,6 +270,18 @@ static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); static char *log_buf = __log_buf; static u32 log_buf_len = __LOG_BUF_LEN; +/* Return log buffer address */ +void *get_log_buf_addr(void) +{ + return log_buf; +} + +/* Return log buffer size */ +u32 get_log_buf_len(void) +{ + return log_buf_len; +} + /* human readable text of the record */ static char *log_text(const struct printk_log *msg) { ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] printk: Add function to return log buffer address and size 2014-07-31 10:30 Vasant Hegde @ 2014-08-01 20:54 ` Andrew Morton 0 siblings, 0 replies; 7+ messages in thread From: Andrew Morton @ 2014-08-01 20:54 UTC (permalink / raw) To: Vasant Hegde Cc: linux-kernel, linuxppc-dev, Linus Torvalds, Benjamin Herrenschmidt On Thu, 31 Jul 2014 16:00:06 +0530 Vasant Hegde <hegdevasant@linux.vnet.ibm.com> wrote: > Platforms like IBM Power Systems supports service processor > assisted dump. It provides interface to add memory region to > be captured when system is crashed. > > During initialization/running we can add kernel memory region > to be collected. > > Presently we don't have a way to get the log buffer base address > and size. This patch adds support to return log buffer address > and size. > > ... > > --- a/include/linux/printk.h > +++ b/include/linux/printk.h > @@ -10,6 +10,9 @@ > extern const char linux_banner[]; > extern const char linux_proc_banner[]; > > +extern void *get_log_buf_addr(void); > +extern u32 get_log_buf_len(void); > + > static inline int printk_get_level(const char *buffer) > { > if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index 13e839d..4049f7b 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -270,6 +270,18 @@ static char __log_buf[__LOG_BUF_LEN] __aligned(LOG_ALIGN); > static char *log_buf = __log_buf; > static u32 log_buf_len = __LOG_BUF_LEN; > > +/* Return log buffer address */ > +void *get_log_buf_addr(void) > +{ > + return log_buf; > +} > + > +/* Return log buffer size */ > +u32 get_log_buf_len(void) > +{ > + return log_buf_len; > +} > + This is the v1 patch. The names are the same and get_log_buf_addr() still returns void*. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-08-01 20:54 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-31 15:35 [PATCH v2 1/2] printk: Add function to return log buffer address and size Vasant Hegde 2014-07-31 15:36 ` [PATCH v2 2/2] powerpc/powernv: Interface to register/unregister opal dump region Vasant Hegde 2014-07-31 22:22 ` [PATCH v2 1/2] printk: Add function to return log buffer address and size Andrew Morton 2014-08-01 0:40 ` Joe Perches 2014-08-01 8:15 ` Vasant Hegde -- strict thread matches above, loose matches on Subject: below -- 2014-07-31 10:30 Vasant Hegde 2014-08-01 20:54 ` Andrew Morton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox