[PATCH 0/2] dm vdo logger: standardize logging

[PATCH 0/2] dm vdo logger: standardize logging

[Matthew Sakai]

Mike Snitzer (2):
  dm vdo logger: switch UDS_LOG_NOTICE to be alias for UDS_LOG_INFO
  dm vdo logger: update logging to start with "device-mapper: vdo"

 drivers/md/dm-vdo/index-session.c |  2 +-
 drivers/md/dm-vdo/logger.c        | 12 +++++-------
 drivers/md/dm-vdo/logger.h        | 13 +++----------
 3 files changed, 9 insertions(+), 18 deletions(-)

-- 
2.42.0

[PATCH 1/2] dm vdo logger: switch UDS_LOG_NOTICE to be alias for UDS_LOG_INFO

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Prepare to bring VDO's logging closer to DM's logging by eliminating
support for KERN_NOTICE log level (DM hasn't ever had a need for it).

Only one message in index-session.c used UDS_LOG_NOTICE, convert it to
log with uds_log_info().

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Bruce Johnston <bjohnsto@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/index-session.c | 2 +-
 drivers/md/dm-vdo/logger.c        | 2 --
 drivers/md/dm-vdo/logger.h        | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/drivers/md/dm-vdo/index-session.c b/drivers/md/dm-vdo/index-session.c
index 9b5d2cacfffd..7afc19748712 100644
--- a/drivers/md/dm-vdo/index-session.c
+++ b/drivers/md/dm-vdo/index-session.c
@@ -378,7 +378,7 @@ int uds_open_index(enum uds_open_index_type open_type,
 
 	session->parameters = *parameters;
 	format_dev_t(name, parameters->bdev->bd_dev);
-	uds_log_notice("%s: %s", get_open_type_string(open_type), name);
+	uds_log_info("%s: %s", get_open_type_string(open_type), name);
 
 	result = initialize_index_session(session, open_type);
 	if (result != UDS_SUCCESS)
diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c
index fe632f10b5d9..322224a07cf5 100644
--- a/drivers/md/dm-vdo/logger.c
+++ b/drivers/md/dm-vdo/logger.c
@@ -124,8 +124,6 @@ static void emit_log_message_to_kernel(int priority, const char *fmt, ...)
 		printk(KERN_WARNING "%pV", &vaf);
 		break;
 	case UDS_LOG_NOTICE:
-		printk(KERN_NOTICE "%pV", &vaf);
-		break;
 	case UDS_LOG_INFO:
 		printk(KERN_INFO "%pV", &vaf);
 		break;
diff --git a/drivers/md/dm-vdo/logger.h b/drivers/md/dm-vdo/logger.h
index 246aa43db9ee..09d448ff9ca9 100644
--- a/drivers/md/dm-vdo/logger.h
+++ b/drivers/md/dm-vdo/logger.h
@@ -74,9 +74,6 @@ int uds_vlog_strerror(int priority, int errnum, const char *module, const char *
 #define uds_log_info_strerror(errnum, ...) \
 	uds_log_strerror(UDS_LOG_INFO, errnum, __VA_ARGS__)
 
-#define uds_log_notice_strerror(errnum, ...) \
-	uds_log_strerror(UDS_LOG_NOTICE, errnum, __VA_ARGS__)
-
 #define uds_log_warning_strerror(errnum, ...) \
 	uds_log_strerror(UDS_LOG_WARNING, errnum, __VA_ARGS__)
 
@@ -93,8 +90,6 @@ void __uds_log_message(int priority, const char *module, const char *format, ...
 
 #define uds_log_info(...) uds_log_message(UDS_LOG_INFO, __VA_ARGS__)
 
-#define uds_log_notice(...) uds_log_message(UDS_LOG_NOTICE, __VA_ARGS__)
-
 #define uds_log_warning(...) uds_log_message(UDS_LOG_WARNING, __VA_ARGS__)
 
 #define uds_log_error(...) uds_log_message(UDS_LOG_ERR, __VA_ARGS__)
-- 
2.42.0

[PATCH 2/2] dm vdo logger: update logging to start with "device-mapper: vdo"

[Matthew Sakai]

From: Mike Snitzer <snitzer@kernel.org>

Stops short of actually using DM's various logging macros (e.g. DMERR,
DMINFO, etc) because VDO's logger isn't quite compatible with them.

Also switch emit_log_message_to_kernel() from open-coding printk with
log-level to using corresponding pr_ macro.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Bruce Johnston <bjohnsto@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
---
 drivers/md/dm-vdo/logger.c | 10 +++++-----
 drivers/md/dm-vdo/logger.h |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/md/dm-vdo/logger.c b/drivers/md/dm-vdo/logger.c
index 322224a07cf5..1efbf8d52f2c 100644
--- a/drivers/md/dm-vdo/logger.c
+++ b/drivers/md/dm-vdo/logger.c
@@ -115,20 +115,20 @@ static void emit_log_message_to_kernel(int priority, const char *fmt, ...)
 	case UDS_LOG_EMERG:
 	case UDS_LOG_ALERT:
 	case UDS_LOG_CRIT:
-		printk(KERN_CRIT "%pV", &vaf);
+		pr_crit("%pV", &vaf);
 		break;
 	case UDS_LOG_ERR:
-		printk(KERN_ERR "%pV", &vaf);
+		pr_err("%pV", &vaf);
 		break;
 	case UDS_LOG_WARNING:
-		printk(KERN_WARNING "%pV", &vaf);
+		pr_warn("%pV", &vaf);
 		break;
 	case UDS_LOG_NOTICE:
 	case UDS_LOG_INFO:
-		printk(KERN_INFO "%pV", &vaf);
+		pr_info("%pV", &vaf);
 		break;
 	case UDS_LOG_DEBUG:
-		printk(KERN_DEBUG "%pV", &vaf);
+		pr_debug("%pV", &vaf);
 		break;
 	default:
 		printk(KERN_DEFAULT "%pV", &vaf);
diff --git a/drivers/md/dm-vdo/logger.h b/drivers/md/dm-vdo/logger.h
index 09d448ff9ca9..4e2f18042ba7 100644
--- a/drivers/md/dm-vdo/logger.h
+++ b/drivers/md/dm-vdo/logger.h
@@ -8,6 +8,7 @@
 
 #include <linux/module.h>
 #include <linux/ratelimit.h>
+#include <linux/device-mapper.h>
 
 /* Custom logging utilities for UDS */
 
@@ -20,11 +21,8 @@
 #define UDS_LOG_INFO 6
 #define UDS_LOG_DEBUG 7
 
-#if defined(MODULE)
-#define UDS_LOGGING_MODULE_NAME THIS_MODULE->name
-#else /* compiled into the kernel */
-#define UDS_LOGGING_MODULE_NAME "vdo"
-#endif
+#define DM_MSG_PREFIX "vdo"
+#define UDS_LOGGING_MODULE_NAME DM_NAME ": " DM_MSG_PREFIX
 
 /* Apply a rate limiter to a log method call. */
 #define uds_log_ratelimit(log_fn, ...)                                    \
-- 
2.42.0