From 124ca8a5a98a5e64e6a221b5f30c48361dac6f24 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 20 May 2009 15:30:13 -0700 Subject: [PATCH] SLES10 Fixes (part 7) - Initial SLES testing uncovered a long standing bug in the debug tracing. The tcd_for_each() macro expected a NULL to terminate the trace_data[i] array but this was only ever true due to luck. All trace_data[] iterators are now properly capped by TCD_TYPE_MAX. - SPLAT_MAJOR 229 conflicted with a 'hvc' device on my SLES system. Since this was always an arbitrary choice I picked something else. - The HAVE_PGDAT_LIST case should set pgdat_list_addr to the value stored at the address of the memory location returned by kallsyms_lookup_name(). --- include/splat-ctl.h | 2 +- include/sys/debug.h | 4 ++-- module/spl/spl-debug.c | 2 +- module/spl/spl-kmem.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/splat-ctl.h b/include/splat-ctl.h index 82d5c0b..05eb3e8 100644 --- a/include/splat-ctl.h +++ b/include/splat-ctl.h @@ -31,7 +31,7 @@ * and kernelspace portions of splat must agree on. */ -#define SPLAT_MAJOR 229 /* XXX - Arbitrary */ +#define SPLAT_MAJOR 225 /* XXX - Arbitrary */ #define SPLAT_MINORS 1 #define SPLAT_NAME "splatctl" #define SPLAT_DEV "/dev/splatctl" diff --git a/include/sys/debug.h b/include/sys/debug.h index 7ceb571..12226a0 100644 --- a/include/sys/debug.h +++ b/include/sys/debug.h @@ -173,12 +173,12 @@ union trace_data_union { extern union trace_data_union (*trace_data[TCD_TYPE_MAX])[NR_CPUS]; #define tcd_for_each(tcd, i, j) \ - for (i = 0; trace_data[i] != NULL; i++) \ + for (i = 0; i < TCD_TYPE_MAX; i++) \ for (j = 0, ((tcd) = &(*trace_data[i])[j].tcd); \ j < num_possible_cpus(); j++, (tcd) = &(*trace_data[i])[j].tcd) #define tcd_for_each_type_lock(tcd, i, cpu) \ - for (i = 0; trace_data[i] && \ + for (i = 0; i < TCD_TYPE_MAX && trace_data[i] && \ (tcd = &(*trace_data[i])[cpu].tcd) && \ trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++) diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c index d2b96b0..a607405 100644 --- a/module/spl/spl-debug.c +++ b/module/spl/spl-debug.c @@ -1261,7 +1261,7 @@ trace_fini(void) } } - for (i = 0; trace_data[i] != NULL; i++) { + for (i = 0; i < TCD_TYPE_MAX && trace_data[i] != NULL; i++) { kfree(trace_data[i]); trace_data[i] = NULL; } diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index 4009aa3..4edd3d7 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -1847,7 +1847,7 @@ spl_kmem_init_kallsyms_lookup(void) #else /* HAVE_PGDAT_HELPERS */ # ifndef HAVE_PGDAT_LIST - pgdat_list_addr = (struct pglist_data *) + pgdat_list_addr = *(struct pglist_data **) spl_kallsyms_lookup_name("pgdat_list"); if (!pgdat_list_addr) { printk(KERN_ERR "Error: Unknown symbol pgdat_list\n"); -- 2.40.0