Messages in this thread Patch in this message | | | Date | Tue, 14 Jul 2009 18:22:40 +0300 | From | Sergey Senozhatsky <> | Subject | Re: kmemleak: Printing of the objects hex dump |
| |
On (07/14/09 15:17), Catalin Marinas wrote: > There is no hurry, sometime in the next few weeks :-) > > > Should I update Documentation/kmemeleak.txt either? > > I don't think this is needed as it doesn't say much about the format of > the debug/kmemleak file (and that's pretty clear, no need to explain > what a hex dump means). >
Fixed typo "The number on lines". -----------------------------------------------------------------------------
kmemleak: Printing of the objects hex dump
Introducing printing of the objects hex dump to the seq file. The number of lines to be printed is limited to HEX_MAX_LINES to prevent seq file spamming. The actual number of printed bytes is less than or equal to (HEX_MAX_LINES * HEX_ROW_SIZE).
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@mail.by> --- diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 5aabd41..f7b74ac 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -161,6 +161,15 @@ struct kmemleak_object { /* flag set on newly allocated objects */ #define OBJECT_NEW (1 << 3) +/* number of bytes to print per line; must be 16 or 32 */ +#define HEX_ROW_SIZE 16 +/* number of bytes to print at a time (1, 2, 4, 8) */ +#define HEX_GROUP_SIZE 1 +/* include ASCII after the hex output */ +#define HEX_ASCII 1 +/* max number of lines to be printed */ +#define HEX_MAX_LINES 2 + /* the list of all allocated objects */ static LIST_HEAD(object_list); /* the list of gray-colored objects (see color_gray comment below) */ @@ -254,6 +263,35 @@ static void kmemleak_disable(void); kmemleak_disable(); \ } while (0) + +/* + * Printing of the objects hex dump to the seq file. The number of lines + * to be printed is limited to HEX_MAX_LINES to prevent seq file spamming. + * The actual number of printed bytes depends on HEX_ROW_SIZE. + * It must be called with the object->lock held. + */ +static void hex_dump_object(struct seq_file *seq, + struct kmemleak_object *object) +{ + const u8 *ptr = (const u8 *)object->pointer; + /* Limit the number of lines to HEX_MAX_LINES. */ + int len = min(object->size, (size_t)(HEX_MAX_LINES * HEX_ROW_SIZE)); + int i, remaining = len; + unsigned char linebuf[200]; + + seq_printf(seq, " hex dump (first %d bytes):\n", len); + + for (i = 0; i < len; i += HEX_ROW_SIZE) { + int linelen = min(remaining, HEX_ROW_SIZE); + remaining -= HEX_ROW_SIZE; + hex_dump_to_buffer(ptr + i, linelen, HEX_ROW_SIZE, + HEX_GROUP_SIZE, linebuf, + sizeof(linebuf), HEX_ASCII); + + seq_printf(seq, " %s\n", linebuf); + } +} + /* * Object colors, encoded with count and min_count: * - white - orphan object, not enough references to it (count < min_count) @@ -304,6 +342,9 @@ static void print_unreferenced(struct seq_file *seq, object->pointer, object->size); seq_printf(seq, " comm \"%s\", pid %d, jiffies %lu\n", object->comm, object->pid, object->jiffies); + + hex_dump_object(seq, object); + seq_printf(seq, " backtrace:\n"); for (i = 0; i < object->trace_len; i++) {[unhandled content-type:application/pgp-signature] | |