Commit 37607102 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Torvalds
Browse files

seq_file: provide an analogue of print_hex_dump() 



This introduces a new helper and switches current users to use it.  All
patches are compiled tested. kmemleak is tested via its own test suite.

This patch (of 6):

The new seq_hex_dump() is a complete analogue of print_hex_dump().

We have few users of this functionality already. It allows to reduce their
codebase.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Joe Perches <joe@perches.com>
Cc: Tadeusz Struk <tadeusz.struk@intel.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40f705a7

fs/seq_file.c

+42 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/slab.h>

#include <linux/cred.h>

#include <linux/mm.h>

#include <linux/printk.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -773,6 +774,47 @@ void seq_pad(struct seq_file *m, char c) 
}

EXPORT_SYMBOL(seq_pad);



/* A complete analogue of print_hex_dump() */

void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,

		  int rowsize, int groupsize, const void *buf, size_t len,

		  bool ascii)

{

	const u8 *ptr = buf;

	int i, linelen, remaining = len;

	int ret;



	if (rowsize != 16 && rowsize != 32)

		rowsize = 16;



	for (i = 0; i < len && !seq_has_overflowed(m); i += rowsize) {

		linelen = min(remaining, rowsize);

		remaining -= rowsize;



		switch (prefix_type) {

		case DUMP_PREFIX_ADDRESS:

			seq_printf(m, "%s%p: ", prefix_str, ptr + i);

			break;

		case DUMP_PREFIX_OFFSET:

			seq_printf(m, "%s%.8x: ", prefix_str, i);

			break;

		default:

			seq_printf(m, "%s", prefix_str);

			break;

		}



		ret = hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize,

					 m->buf + m->count, m->size - m->count,

					 ascii);

		if (ret >= m->size - m->count) {

			seq_set_overflow(m);

		} else {

			m->count += ret;

			seq_putc(m, '\n');

		}

	}

}

EXPORT_SYMBOL(seq_hex_dump);



struct list_head *seq_list_start(struct list_head *head, loff_t pos)

{

	struct list_head *lh;

include/linux/seq_file.h

+4 −0
Original line number Diff line number Diff line
@@ -122,6 +122,10 @@ int seq_write(struct seq_file *seq, const void *data, size_t len); 
__printf(2, 3) int seq_printf(struct seq_file *, const char *, ...);

__printf(2, 0) int seq_vprintf(struct seq_file *, const char *, va_list args);



void seq_hex_dump(struct seq_file *m, const char *prefix_str, int prefix_type,

		  int rowsize, int groupsize, const void *buf, size_t len,

		  bool ascii);



int seq_path(struct seq_file *, const struct path *, const char *);

int seq_file_path(struct seq_file *, struct file *, const char *);

int seq_dentry(struct seq_file *, struct dentry *, const char *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE