Re: [PATCH 2/6] nvram: Capture oops/panic reports in ibm, oops-log partition

[Benjamin Herrenschmidt <benh@kernel.crashing.org>]

On Sat, 2010-11-13 at 20:15 -0800, Jim Keniston wrote:
> Create the ibm,oops-log NVRAM partition, and capture the end of the printk
> buffer in it when there's an oops or panic.  If we can't create the
> ibm,oops-log partition, capture the oops/panic report in ibm,rtas-log.

Won't the parsing tools choke on the oops log in the RTAS log
partition ?

Also, maybe remove the "ibm," prefix on the nvram partition, make it
"lnx," instead.

Then, if you move the rest of the code out of pseries, you can move that
out too, just make pseries platform code call the init code for it, that
way other platforms can re-use that as-is.

But that later part can wait a separate patch series, just make sure you
change the partition name now.

Cheers,
Ben.

> Signed-off-by: Jim Keniston <jkenisto@us.ibm.com>
> ---
> 
>  arch/powerpc/platforms/pseries/nvram.c |   89 ++++++++++++++++++++++++++++++++
>  1 files changed, 88 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
> index 43d5c52..6c88cda 100644
> --- a/arch/powerpc/platforms/pseries/nvram.c
> +++ b/arch/powerpc/platforms/pseries/nvram.c
> @@ -16,6 +16,8 @@
>  #include <linux/errno.h>
>  #include <linux/init.h>
>  #include <linux/spinlock.h>
> +#include <linux/slab.h>
> +#include <linux/kmsg_dump.h>
>  #include <asm/uaccess.h>
>  #include <asm/nvram.h>
>  #include <asm/rtas.h>
> @@ -50,11 +52,32 @@ static struct os_partition rtas_log_partition = {
>  	.index = -1
>  };
>  
> +static struct os_partition oops_log_partition = {
> +	.name = "ibm,oops-log",
> +	.req_size = 4000,
> +	.min_size = 2000,
> +	.index = -1
> +};
> +
>  static const char *valid_os_partitions[] = {
>  	"ibm,rtas-log",
> +	"ibm,oops-log",
>  	NULL
>  };
>  
> +static void oops_to_nvram(struct kmsg_dumper *dumper,
> +		enum kmsg_dump_reason reason,
> +		const char *old_msgs, unsigned long old_len,
> +		const char *new_msgs, unsigned long new_len);
> +
> +static struct kmsg_dumper nvram_kmsg_dumper = {
> +	.dump = oops_to_nvram
> +};
> +
> +/* We preallocate oops_buf during init to avoid kmalloc during oops/panic. */
> +static size_t oops_buf_sz;
> +static char *oops_buf;
> +
>  static ssize_t pSeries_nvram_read(char *buf, size_t count, loff_t *index)
>  {
>  	unsigned int i;
> @@ -337,9 +360,36 @@ static int __init pseries_nvram_init_os_partition(struct os_partition *part)
>  	return 0;
>  }
>  
> +static void __init nvram_init_oops_partition(int rtas_partition_exists)
> +{
> +	int rc;
> +
> +	rc = pseries_nvram_init_os_partition(&oops_log_partition);
> +	if (rc != 0) {
> +		if (!rtas_partition_exists)
> +			return;
> +		pr_notice("nvram: Using %s partition to log both"
> +			" RTAS errors and oops/panic reports\n",
> +			rtas_log_partition.name);
> +		memcpy(&oops_log_partition, &rtas_log_partition,
> +						sizeof(rtas_log_partition));
> +	}
> +	oops_buf_sz = oops_log_partition.size - sizeof(struct err_log_info);
> +	oops_buf = kmalloc(oops_buf_sz, GFP_KERNEL);
> +	rc = kmsg_dump_register(&nvram_kmsg_dumper);
> +	if (rc != 0) {
> +		pr_err("nvram: kmsg_dump_register() failed; returned %d\n", rc);
> +		kfree(oops_buf);
> +		return;
> +	}
> +}
> +
>  static int __init pseries_nvram_init_log_partitions(void)
>  {
> -	(void) pseries_nvram_init_os_partition(&rtas_log_partition);
> +	int rc;
> +
> +	rc = pseries_nvram_init_os_partition(&rtas_log_partition);
> +	nvram_init_oops_partition(rc == 0);
>  	return 0;
>  }
>  machine_late_initcall(pseries, pseries_nvram_init_log_partitions);
> @@ -373,3 +423,40 @@ int __init pSeries_nvram_init(void)
>  
>  	return 0;
>  }
> +
> +/*
> + * Try to capture the last capture_len bytes of the printk buffer.  Return
> + * the amount actually captured.
> + */
> +static size_t capture_last_msgs(const char *old_msgs, size_t old_len,
> +				const char *new_msgs, size_t new_len,
> +				char *captured, size_t capture_len)
> +{
> +	if (new_len >= capture_len) {
> +		memcpy(captured, new_msgs + (new_len - capture_len),
> +								capture_len);
> +		return capture_len;
> +	} else {
> +		/* Grab the end of old_msgs. */
> +		size_t old_tail_len = min(old_len, capture_len - new_len);
> +		memcpy(captured, old_msgs + (old_len - old_tail_len),
> +								old_tail_len);
> +		memcpy(captured + old_tail_len, new_msgs, new_len);
> +		return old_tail_len + new_len;
> +	}
> +}
> +
> +/* our kmsg_dump callback */
> +static void oops_to_nvram(struct kmsg_dumper *dumper,
> +		enum kmsg_dump_reason reason,
> +		const char *old_msgs, unsigned long old_len,
> +		const char *new_msgs, unsigned long new_len)
> +{
> +	static unsigned int oops_count = 0;
> +	size_t text_len;
> +
> +	text_len = capture_last_msgs(old_msgs, old_len, new_msgs, new_len,
> +						oops_buf, oops_buf_sz);
> +	(void) nvram_write_os_partition(&oops_log_partition, oops_buf,
> +		(int) text_len, ERR_TYPE_KERNEL_PANIC, ++oops_count);
> +}
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev