From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Tadeusz Struk <tadeusz.struk@intel.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Mauro Carvalho Chehab <m.chehab@samsung.com>,
Helge Deller <deller@gmx.de>,
Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>,
Alexander Viro <viro@zeniv.linux.org.uk>,
linux-kernel@vger.kernel.org, Joe Perches <joe@perches.com>,
Marek Vasut <marex@denx.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>,
Benjamin Romer <benjamin.romer@unisys.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Randy Dunlap <rdunlap@infradead.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v4 05/12] seq_file: provide an analogue of print_hex_dump()
Date: Thu, 4 Sep 2014 17:26:52 +0300 [thread overview]
Message-ID: <1409840819-18976-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1409840819-18976-1-git-send-email-andriy.shevchenko@linux.intel.com>
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
fs/seq_file.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/seq_file.h | 4 ++++
2 files changed, 54 insertions(+)
diff --git a/fs/seq_file.c b/fs/seq_file.c
index 3857b72..66c721f4 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -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>
@@ -794,6 +795,55 @@ void seq_pad(struct seq_file *m, char c)
}
EXPORT_SYMBOL(seq_pad);
+/* Analogue of print_hex_dump() */
+int 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; i += rowsize) {
+ linelen = min(remaining, rowsize);
+ remaining -= rowsize;
+
+ /* Prefix string */
+ ret = seq_printf(m, "%s", prefix_str);
+ if (ret < 0)
+ return ret;
+
+ /* Counter if asked */
+ if (prefix_type == DUMP_PREFIX_ADDRESS)
+ ret = seq_printf(m, "%p: ", ptr + i);
+ else if (prefix_type == DUMP_PREFIX_OFFSET)
+ ret = seq_printf(m, "%.8x: ", i);
+ if (ret < 0)
+ return ret;
+
+ /* Hex dump */
+ ret = hex_dump_to_buffer(ptr + i, linelen, rowsize, groupsize,
+ m->buf + m->count, m->size - m->count,
+ ascii);
+ if (m->count + ret >= m->size) {
+ seq_set_overflow(m);
+ return -1;
+ }
+ m->count += ret;
+
+ /* EOL */
+ ret = seq_putc(m, '\n');
+ if (ret < 0)
+ return ret;
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL(seq_hex_dump);
+
struct list_head *seq_list_start(struct list_head *head, loff_t pos)
{
struct list_head *lh;
diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 52e0097..5de290c 100644
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -107,6 +107,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);
+int 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_dentry(struct seq_file *, struct dentry *, const char *);
int seq_path_root(struct seq_file *m, const struct path *path,
--
2.1.0
next prev parent reply other threads:[~2014-09-04 14:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 14:26 [PATCH v4 00/12] fs/seq_file: introduce seq_hex_dump() helper Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 01/12] hexdump: introduce test suite Andy Shevchenko
2014-09-05 9:37 ` Geert Uytterhoeven
2014-09-05 12:39 ` Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 02/12] hexdump: fix ascii column for the tail of a dump Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 03/12] hexdump: do few calculations ahead Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 04/12] hexdump: makes it return amount of bytes placed in buffer Andy Shevchenko
2014-09-04 14:26 ` Andy Shevchenko [this message]
2014-09-16 7:11 ` [PATCH v4 05/12] seq_file: provide an analogue of print_hex_dump() Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 06/12] saa7164: convert to seq_hex_dump() Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 07/12] crypto: qat - use seq_hex_dump() to dump buffers Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 08/12] parisc: " Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 09/12] [S390] zcrypt: " Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 10/12] staging: unisys: " Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 11/12] kmemleak: " Andy Shevchenko
2014-09-04 14:26 ` [PATCH v4 12/12] wil6210: " Andy Shevchenko
2014-10-22 15:48 ` [PATCH v4 00/12] fs/seq_file: introduce seq_hex_dump() helper Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409840819-18976-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=benjamin.romer@unisys.com \
--cc=catalin.marinas@arm.com \
--cc=deller@gmx.de \
--cc=geert@linux-m68k.org \
--cc=herbert@gondor.apana.org.au \
--cc=ingo.tuchscherer@de.ibm.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=marex@denx.de \
--cc=qca_vkondrat@qca.qualcomm.com \
--cc=rdunlap@infradead.org \
--cc=tadeusz.struk@intel.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome