mm/slub.c: Use print_hex_dump and remove unnecessary cast
Subsystems (2)
PATCH 1/1 mm/slub.c: Use print_hex_dump and remove unnecessary cast
--- mm/slub.c | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-)
mm/slub.c +4 -30
@@ -328,36 +328,10 @@ static char *slub_debug_slabs;/* * Object debugging */ -static void print_section (char *text,u8 *addr,unsigned int length) +static void print_section (const char *text,u8 *addr,unsigned int length) { -int i, offset; -int newline =1 ; -char ascii[17 ]; - - ascii[16 ] =0 ; - -for (i =0 ; i < length; i++) { -if (newline) { -printk (KERN_ERR "%8s 0x%p: " , text, addr + i); - newline =0 ; - } -printk (KERN_CONT " %02x" , addr[i]); - offset = i %16 ; - ascii[offset] =isgraph (addr[i]) ? addr[i] :'.' ; -if (offset ==15 ) { -printk (KERN_CONT " %s\n" , ascii); - newline =1 ; - } - } -if (!newline) { - i %=16 ; -while (i <16 ) { -printk (KERN_CONT " " ); - ascii[i] =' ' ; - i++; - } -printk (KERN_CONT " %s\n" , ascii); - } +print_hex_dump (KERN_ERR , text,DUMP_PREFIX_ADDRESS ,16 ,1 , + addr, length, true); } static struct track *get_track(struct kmem_cache *s, void *object,
@@ -794,7 +768,7 @@ static void trace(struct kmem_cache *s, struct page *page, void *object, page->freelist);if (!alloc) -print_section ("Object" , (void *)object, s->objsize); +print_section ("Object" , object, s->objsize);dump_stack (); }
Signature · 7 lines
1.6.3.1.10.g659a0.dirty -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
This was discussed before.
http://lkml.indiana.edu/hypermail/linux/kernel/0705.3/2671.html
Was hexdump changed? How does the output look after this change?
Quoted 51 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- mm/slub.c | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-)mm/slub.c +3
-29@@ -328,36 +328,10 @@ static char *slub_debug_slabs;/* * Object debugging */ -static void print_section (char *text,u8 *addr,unsigned int length) +static void print_section (const char *text,u8 *addr,unsigned int length) { -int i, offset; -int newline =1 ; -char ascii[17 ]; - - ascii[16 ] =0 ; - -for (i =0 ; i < length; i++) { -if (newline) { -printk (KERN_ERR "%8s 0x%p: " , text, addr + i); - newline =0 ; - } -printk (KERN_CONT " %02x" , addr[i]); - offset = i %16 ; - ascii[offset] =isgraph (addr[i]) ? addr[i] :'.' ; -if (offset ==15 ) { -printk (KERN_CONT " %s\n" , ascii); - newline =1 ; - } - } -if (!newline) { - i %=16 ; -while (i <16 ) { -printk (KERN_CONT " " ); - ascii[i] =' ' ; - i++; - } -printk (KERN_CONT " %s\n" , ascii); - } +print_hex_dump (KERN_ERR , text,DUMP_PREFIX_ADDRESS ,16 ,1 , + addr, length, true); } static struct track *get_track(struct kmem_cache *s, void *object,
mm/slub.c static void trace(struct kmem_cache *s, struct page *page, void *object, · line 774
Quoted 8 lines
mm/slub.c +1
-1@@ -794,7 +768,7 @@ static void trace(struct kmem_cache *s, struct page *page, void *object, page->freelist);if (!alloc) -print_section ("Object" , (void *)object, s->objsize); +print_section ("Object" , object, s->objsize);dump_stack (); }
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 2 lines · Christoph Lameter
This was discussed before.
http://lkml.indiana.edu/hypermail/linux/kernel/0705.3/2671.html
You've got a good memory.
Quoted 1 line
Was hexdump changed?
It seems not.
Quoted 3 lines
How does the output look after this change?
From reading the code, the last column is unaligned.
I did submit a patch to fix hexdump once.
http://lkml.org/lkml/2007/12/6/304
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 10 lines · Joe Perches
Quoted 2 lines · Christoph Lameter
This was discussed before.
http://lkml.indiana.edu/hypermail/linux/kernel/0705.3/2671.htmlYou've got a good memory.
Quoted 1 line
Was hexdump changed?
It seems not.
Quoted 8 lines
Quoted 3 lines
How does the output look after this change?
From reading the code, the last column is unaligned.
I did submit a patch to fix hexdump once.
http://lkml.org/lkml/2007/12/6/304From what I can tell the current code does properly align the
ascii output.
I just chopped the necessary functions out of the kernel and created a test program. If I pass the string:
"This is a sample buffer"
I get the following output:
prefix_type = DUMP_PREFIX_NONE
<7>buffer: 54 68 69 73 20 69 73 20 61 20 73 61 6d 70 6c 65 This is a sample
<7>buffer: 20 62 75 66 66 65 72 buffer
prefix_type = DUMP_PREFIX_ADDRESS
<7>buffer: 0x804a008: 54 68 69 73 20 69 73 20 61 20 73 61 6d 70 6c 65 This is a sample
<7>buffer: 0x804a018: 20 62 75 66 66 65 72 buffer
prefix_type = DUMP_PREFIX_OFFSET
<7>buffer: 00000000: 54 68 69 73 20 69 73 20 61 20 73 61 6d 70 6c 65 This is a sample
<7>buffer: 00000010: 20 62 75 66 66 65 72 buffer
Regards,
Hartley
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 4 lines · Joe Perches
Signed-off-by Joe Perches <[email protected]>--- mm/slub.c | 34 ++++------------------------------ 1 files changed, 4 insertions(+), 30 deletions(-)
I am more than happy to merge this patch if the hexdump issues are resolved.
Pekka
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>