| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 14 Jan 2011 09:43:52 +0100
From: Roman Fietze <roman.fietze@...emotive.de>
To: Joe Perches <joe@...ches.com>
Cc: Jason Baron <jbaron@...hat.com>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] Proposal to add dynamic debug feature for print_hex_dump
Hello Joe,
On Wednesday, 08.December.2010 16:39:18 Joe Perches wrote:
> The patches I made to printk are now in Andrew Morton's
> tree and should be in 2.6.38
This morning I got them. Due to the changes and optimizations you
added, I decided to collapse the two patches into one. I also modified
my code to use the no_ mechanism as you did it with no_printk, and I
added the devel-version.
This patch goes on top of linux-next/master and your latest patches.
Comments are again welcome.
>From b0881e9520eb7b670581a2046be733db82a9bb12 Mon Sep 17 00:00:00 2001
From: Roman Fietze <roman.fietze@...emotive.de>
Date: Fri, 14 Jan 2011 09:30:12 +0100
Subject: [PATCH] printk.h dynamic_debug.h: add pr_<level>_hex_dump macros
Add macros e.g. named pr_<level>_hex_dump calling print_hex_dump with
the approriate level, with level beeing emerg, alert, ..., debug. This
is similiar to the functions starting with "pr_".
The parameters for those macros are the same as for print_hex_dump
excluding the level.
Use dynamic printk wrapper to support turning pr_debug_hex_dump on and
off similar to pr_debug using the dynamic debug sysfs control file.
Signed-off-by: Roman Fietze <roman.fietze@...emotive.de>
---
include/linux/dynamic_debug.h | 20 ++++++++
include/linux/printk.h | 97 +++++++++++++++++++++++++++++++++++++---
2 files changed, 109 insertions(+), 8 deletions(-)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 1c70028..7f3778f 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -64,6 +64,20 @@ extern int ddebug_remove_module(const char *mod_name);
dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); \
} while (0)
+#define dynamic_pr_debug_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ do { \
+ static struct _ddebug descriptor \
+ __used \
+ __attribute__((section("__verbose"), aligned(8))) = { \
+ KBUILD_MODNAME, __func__, __FILE__, prefix_str, __LINE__, \
+ _DPRINTK_FLAGS_DEFAULT }; \
+ if (unlikely(descriptor.enabled)) \
+ print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \
+ rowsize, groupsize, buf, len, ascii); \
+ } while (0)
+
#else
static inline int ddebug_remove_module(const char *mod)
@@ -75,6 +89,12 @@ static inline int ddebug_remove_module(const char *mod)
do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
#define dynamic_dev_dbg(dev, fmt, ...) \
do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
+#define dynamic_pr_debug_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ no_print_hex_dump(KERN_DEBUG, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#endif
#endif
diff --git a/include/linux/printk.h b/include/linux/printk.h
index ee048e7..a802f0f 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -77,8 +77,8 @@ struct va_format {
#define HW_ERR "[Hardware Error]: "
/*
- * Dummy printk for disabled debugging statements to use whilst maintaining
- * gcc's format and side-effect checking.
+ * Dummy printk and print_hex_dump for disabled debugging statements to use
+ * whilst maintaining gcc's format and side-effect checking.
*/
static inline __attribute__ ((format (printf, 1, 2)))
int no_printk(const char *fmt, ...)
@@ -86,6 +86,13 @@ int no_printk(const char *fmt, ...)
return 0;
}
+static inline
+void no_print_hex_dump(const char *level, const char *prefix_str,
+ int prefix_type, int rowsize, int groupsize,
+ const void *buf, size_t len, bool ascii)
+{
+}
+
extern asmlinkage __attribute__ ((format (printf, 1, 2)))
void early_printk(const char *fmt, ...);
@@ -163,26 +170,104 @@ extern void dump_stack(void) __cold;
#define pr_cont(fmt, ...) \
printk(KERN_CONT fmt, ##__VA_ARGS__)
-/* pr_devel() should produce zero code unless DEBUG is defined */
+#define pr_emerg_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_EMERG, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_alert_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_ALERT, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_crit_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_CRIT, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_err_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_ERR, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_warn_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_WARNING, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_notice_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_NOTICE, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+#define pr_info_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_INFO, prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
+
+/* pr_devel() and pr_devel_hex_dump() should produce zero code unless DEBUG is
+ * defined */
#ifdef DEBUG
#define pr_devel(fmt, ...) \
printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_devel_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_DEBUG, \
+ pr_fmt(prefix_str), prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#else
#define pr_devel(fmt, ...) \
no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_devel_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ no_print_hex_dump(KERN_DEBUG, \
+ pr_fmt(prefix_str), prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#endif
/* If you are writing a driver, please use dev_dbg instead */
#if defined(DEBUG)
#define pr_debug(fmt, ...) \
printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_debug_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ print_hex_dump(KERN_DEBUG, \
+ pr_fmt(prefix_str), prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#elif defined(CONFIG_DYNAMIC_DEBUG)
/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
#define pr_debug(fmt, ...) \
dynamic_pr_debug(fmt, ##__VA_ARGS__)
+#define pr_debug_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ dynamic_pr_debug_hex_dump(pr_fmt(prefix_str), prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#else
#define pr_debug(fmt, ...) \
no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
+#define pr_debug_hex_dump(prefix_str, prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii) \
+ no_print_hex_dump(KERN_DEBUG, \
+ pr_fmt(prefix_str), prefix_type, \
+ rowsize, groupsize, \
+ buf, len, ascii)
#endif
/*
@@ -287,11 +372,7 @@ extern void print_hex_dump(const char *level, const char *prefix_str,
extern void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
const void *buf, size_t len);
#else
-static inline void print_hex_dump(const char *level, const char *prefix_str,
- int prefix_type, int rowsize, int groupsize,
- const void *buf, size_t len, bool ascii)
-{
-}
+#define print_hex_dump no_print_hex_dump
static inline void print_hex_dump_bytes(const char *prefix_str, int prefix_type,
const void *buf, size_t len)
{
--
1.7.3.4
Roman
--
Roman Fietze Telemotive AG Buero Muehlhausen
Breitwiesen 73347 Muehlhausen
Tel.: +49(0)7335/18493-45 http://www.telemotive.de
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists