Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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().
This commit is contained in:
Brian Behlendorf 2009-05-20 15:30:13 -07:00
parent 5232d256b4
commit 124ca8a5a9
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/splat-ctl.h
View File

@ -31,7 +31,7 @@
* and kernelspace portions of splat must agree on. * 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_MINORS 1
#define SPLAT_NAME "splatctl" #define SPLAT_NAME "splatctl"
#define SPLAT_DEV "/dev/splatctl" #define SPLAT_DEV "/dev/splatctl"

4
include/sys/debug.h
View File

@ -173,12 +173,12 @@ union trace_data_union {
extern union trace_data_union (*trace_data[TCD_TYPE_MAX])[NR_CPUS]; extern union trace_data_union (*trace_data[TCD_TYPE_MAX])[NR_CPUS];
#define tcd_for_each(tcd, i, j) \ #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); \ for (j = 0, ((tcd) = &(*trace_data[i])[j].tcd); \
j < num_possible_cpus(); j++, (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) \ #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) && \ (tcd = &(*trace_data[i])[cpu].tcd) && \
trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++) trace_lock_tcd(tcd); trace_unlock_tcd(tcd), i++)

2
module/spl/spl-debug.c
View File

@ -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]); kfree(trace_data[i]);
trace_data[i] = NULL; trace_data[i] = NULL;
} }

2
module/spl/spl-kmem.c
View File

@ -1847,7 +1847,7 @@ spl_kmem_init_kallsyms_lookup(void)
#else /* HAVE_PGDAT_HELPERS */ #else /* HAVE_PGDAT_HELPERS */
# ifndef HAVE_PGDAT_LIST # ifndef HAVE_PGDAT_LIST
pgdat_list_addr = (struct pglist_data *) pgdat_list_addr = *(struct pglist_data **)
spl_kallsyms_lookup_name("pgdat_list"); spl_kallsyms_lookup_name("pgdat_list");
if (!pgdat_list_addr) { if (!pgdat_list_addr) {
printk(KERN_ERR "Error: Unknown symbol pgdat_list\n"); printk(KERN_ERR "Error: Unknown symbol pgdat_list\n");