* [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs
@ 2020-08-18 21:04 Sean Paul
2020-08-18 21:04 ` [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Sean Paul
` (14 more replies)
0 siblings, 15 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:04 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Mostly a rebase on drm-tip.
New changes:
- Use the new trace_array_init_printk() call init the global trace buffers.
- Add patch 13 to the set to pipe atomic state logging through trace
v5 is available here:
https://patchwork.freedesktop.org/series/78133/
Sean Paul (14):
drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER
drm/sil164: Convert dev_printk to drm_dev_dbg
drm/i915/utils: Replace dev_printk with drm helpers
drm/msm/dpu: Replace definitions for dpu debug macros
drm/print: rename drm_debug* to be more syslog-centric
drm/amd: Gate i2c transaction logs on drm_debug_syslog
drm/etnaviv: Change buffer dump checks to target syslog
drm/nouveau: Change debug checks to specifically target syslog
drm/i915: Change infoframe debug checks to specify syslog
drm/print: Add drm_debug_category_printer
drm/mst: Convert debug printers to debug category printers
drm/i915: Use debug category printer for welcome message
drm/atomic: Use debug category printer for atomic state printer
drm/print: Add tracefs support to the drm logging helpers
Documentation/gpu/drm-uapi.rst | 6 +
drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +-
drivers/gpu/drm/drm_atomic.c | 5 +-
drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
drivers/gpu/drm/drm_crtc_internal.h | 3 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 9 +-
drivers/gpu/drm/drm_drv.c | 3 +
drivers/gpu/drm/drm_mipi_dbi.c | 8 +-
drivers/gpu/drm/drm_print.c | 235 ++++++++++++++++---
drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +-
drivers/gpu/drm/i2c/sil164_drv.c | 12 +-
drivers/gpu/drm/i915/display/intel_display.c | 4 +-
drivers/gpu/drm/i915/i915_drv.c | 3 +-
drivers/gpu/drm/i915/i915_utils.c | 5 +-
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 +-
drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +-
include/drm/drm_print.h | 96 +++++++-
17 files changed, 329 insertions(+), 98 deletions(-)
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
@ 2020-08-18 21:04 ` Sean Paul
2020-08-18 21:04 ` [PATCH v6 02/14] drm/sil164: Convert dev_printk to drm_dev_dbg Sean Paul
` (13 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:04 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Use the drm logging helpers to output these messages to ensure they'll
be included by the drm tracefs instance.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-2-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/drm_mipi_dbi.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c
index 230c4fd7131c..e233b6da7cca 100644
--- a/drivers/gpu/drm/drm_mipi_dbi.c
+++ b/drivers/gpu/drm/drm_mipi_dbi.c
@@ -764,9 +764,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *dbi, int dc,
int i, ret;
u8 *dst;
- if (drm_debug_enabled(DRM_UT_DRIVER))
- pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
- __func__, dc, max_chunk);
+ DRM_DEBUG_DRIVER("dc=%d, max_chunk=%zu, transfers:\n", dc, max_chunk);
tr.speed_hz = mipi_dbi_spi_cmd_max_speed(spi, len);
spi_message_init_with_transfers(&m, &tr, 1);
@@ -888,9 +886,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *dbi, int dc,
max_chunk = dbi->tx_buf9_len;
dst16 = dbi->tx_buf9;
- if (drm_debug_enabled(DRM_UT_DRIVER))
- pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n",
- __func__, dc, max_chunk);
+ DRM_DEBUG_DRIVER("dc=%d, max_chunk=%zu, transfers:\n", dc, max_chunk);
max_chunk = min(max_chunk / 2, len);
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 02/14] drm/sil164: Convert dev_printk to drm_dev_dbg
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
2020-08-18 21:04 ` [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Sean Paul
@ 2020-08-18 21:04 ` Sean Paul
2020-08-18 21:04 ` [PATCH v6 03/14] drm/i915/utils: Replace dev_printk with drm helpers Sean Paul
` (12 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:04 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Use the drm debug helper instead of dev_printk in order to leverage the
upcoming tracefs support
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-3-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/i2c/sil164_drv.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c
index 741886b54419..b315a789fca2 100644
--- a/drivers/gpu/drm/i2c/sil164_drv.c
+++ b/drivers/gpu/drm/i2c/sil164_drv.c
@@ -43,11 +43,6 @@ struct sil164_priv {
#define to_sil164_priv(x) \
((struct sil164_priv *)to_encoder_slave(x)->slave_priv)
-#define sil164_dbg(client, format, ...) do { \
- if (drm_debug_enabled(DRM_UT_KMS)) \
- dev_printk(KERN_DEBUG, &client->dev, \
- "%s: " format, __func__, ## __VA_ARGS__); \
- } while (0)
#define sil164_info(client, format, ...) \
dev_info(&client->dev, format, __VA_ARGS__)
#define sil164_err(client, format, ...) \
@@ -359,8 +354,8 @@ sil164_probe(struct i2c_client *client, const struct i2c_device_id *id)
int rev = sil164_read(client, SIL164_REVISION);
if (vendor != 0x1 || device != 0x6) {
- sil164_dbg(client, "Unknown device %x:%x.%x\n",
- vendor, device, rev);
+ drm_dev_dbg(&client->dev, DRM_UT_KMS,
+ "Unknown device %x:%x.%x\n", vendor, device, rev);
return -ENODEV;
}
@@ -389,7 +384,8 @@ sil164_detect_slave(struct i2c_client *client)
};
if (i2c_transfer(adap, &msg, 1) != 1) {
- sil164_dbg(adap, "No dual-link slave found.");
+ drm_dev_dbg(&adap->dev, DRM_UT_KMS,
+ "No dual-link slave found.");
return NULL;
}
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 03/14] drm/i915/utils: Replace dev_printk with drm helpers
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
2020-08-18 21:04 ` [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Sean Paul
2020-08-18 21:04 ` [PATCH v6 02/14] drm/sil164: Convert dev_printk to drm_dev_dbg Sean Paul
@ 2020-08-18 21:04 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 04/14] drm/msm/dpu: Replace definitions for dpu debug macros Sean Paul
` (11 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:04 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Use drm logging helpers to add support for the upcoming tracefs
implementation.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-4-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/i915/i915_utils.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c
index 4c305d838016..f16a75b165a3 100644
--- a/drivers/gpu/drm/i915/i915_utils.c
+++ b/drivers/gpu/drm/i915/i915_utils.c
@@ -30,10 +30,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,
vaf.va = &args;
if (is_error)
- dev_printk(level, kdev, "%pV", &vaf);
+ drm_dev_printk(kdev, level, "%pV", &vaf);
else
- dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
+ drm_err(&dev_priv->drm, "%pV", &vaf);
va_end(args);
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 04/14] drm/msm/dpu: Replace definitions for dpu debug macros
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (2 preceding siblings ...)
2020-08-18 21:04 ` [PATCH v6 03/14] drm/i915/utils: Replace dev_printk with drm helpers Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 05/14] drm/print: rename drm_debug* to be more syslog-centric Sean Paul
` (10 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
The debug messages shouldn't be logged as errors when debug categories
are enabled. Use the drm logging helpers to do the right thing
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-5-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
index e140cd633071..b1e9c529d3b5 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
@@ -29,27 +29,15 @@
* DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs
* @fmt: Pointer to format string
*/
-#define DPU_DEBUG(fmt, ...) \
- do { \
- if (drm_debug_enabled(DRM_UT_KMS)) \
- DRM_DEBUG(fmt, ##__VA_ARGS__); \
- else \
- pr_debug(fmt, ##__VA_ARGS__); \
- } while (0)
+#define DPU_DEBUG(fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__)
/**
* DPU_DEBUG_DRIVER - macro for hardware driver logging
* @fmt: Pointer to format string
*/
-#define DPU_DEBUG_DRIVER(fmt, ...) \
- do { \
- if (drm_debug_enabled(DRM_UT_DRIVER)) \
- DRM_ERROR(fmt, ##__VA_ARGS__); \
- else \
- pr_debug(fmt, ##__VA_ARGS__); \
- } while (0)
-
-#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__)
+#define DPU_DEBUG_DRIVER(fmt, ...) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__)
+
+#define DPU_ERROR(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__)
/**
* ktime_compare_safe - compare two ktime structures
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 05/14] drm/print: rename drm_debug* to be more syslog-centric
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (3 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 04/14] drm/msm/dpu: Replace definitions for dpu debug macros Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 06/14] drm/amd: Gate i2c transaction logs on drm_debug_syslog Sean Paul
` (9 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
In preparation for tracefs support, rename drm_debug related functions
to reflect that it targets the syslog. This will allow us to selectively
target syslog and/or tracefs.
No functional changes here.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-6-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/drm_print.c | 12 ++++++------
include/drm/drm_print.h | 13 +++++++++----
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 111b932cf2a9..2ff7a6ecc632 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -37,11 +37,11 @@
#include <drm/drm_print.h>
/*
- * __drm_debug: Enable debug output.
+ * __drm_debug_syslog: Enable debug output to system logs
* Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
*/
-unsigned int __drm_debug;
-EXPORT_SYMBOL(__drm_debug);
+unsigned int __drm_debug_syslog;
+EXPORT_SYMBOL(__drm_debug_syslog);
MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
@@ -52,7 +52,7 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat
"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n"
"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n"
"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
-module_param_named(debug, __drm_debug, int, 0600);
+module_param_named(debug, __drm_debug_syslog, int, 0600);
void __drm_puts_coredump(struct drm_printer *p, const char *str)
{
@@ -160,11 +160,11 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
}
EXPORT_SYMBOL(__drm_printfn_info);
-void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf)
+void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf)
{
pr_debug("%s %pV", p->prefix, vaf);
}
-EXPORT_SYMBOL(__drm_printfn_debug);
+EXPORT_SYMBOL(__drm_printfn_debug_syslog);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf)
{
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 1c9417430d08..ce7675bf0d2b 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -35,7 +35,7 @@
#include <drm/drm.h>
/* Do *not* use outside of drm_print.[ch]! */
-extern unsigned int __drm_debug;
+extern unsigned int __drm_debug_syslog;
/**
* DOC: print
@@ -85,7 +85,7 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str);
void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
void __drm_puts_seq_file(struct drm_printer *p, const char *str);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
-void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
__printf(2, 3)
@@ -227,7 +227,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
static inline struct drm_printer drm_debug_printer(const char *prefix)
{
struct drm_printer p = {
- .printfn = __drm_printfn_debug,
+ .printfn = __drm_printfn_debug_syslog,
.prefix = prefix
};
return p;
@@ -319,9 +319,14 @@ enum drm_debug_category {
DRM_UT_DRMRES = 0x200,
};
+static inline bool drm_debug_syslog_enabled(enum drm_debug_category category)
+{
+ return unlikely(__drm_debug_syslog & category);
+}
+
static inline bool drm_debug_enabled(enum drm_debug_category category)
{
- return unlikely(__drm_debug & category);
+ return drm_debug_syslog_enabled(category);
}
/*
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 06/14] drm/amd: Gate i2c transaction logs on drm_debug_syslog
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (4 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 05/14] drm/print: rename drm_debug* to be more syslog-centric Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 07/14] drm/etnaviv: Change buffer dump checks to target syslog Sean Paul
` (8 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Since the logs protected by these checks specifically target syslog,
use the new drm_debug_syslog_enabled() call to avoid triggering
these prints when only trace is enabled.
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-7-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
index d55bf64770c4..1600a007344b 100644
--- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
+++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c
@@ -232,7 +232,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control,
DRM_DEBUG_DRIVER("I2C_Transmit(), address = %x, bytes = %d , data: ",
(uint16_t)address, numbytes);
- if (drm_debug_enabled(DRM_UT_DRIVER)) {
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) {
print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE,
16, 1, data, numbytes, false);
}
@@ -386,7 +386,7 @@ static uint32_t smu_v11_0_i2c_receive(struct i2c_adapter *control,
DRM_DEBUG_DRIVER("I2C_Receive(), address = %x, bytes = %d, data :",
(uint16_t)address, bytes_received);
- if (drm_debug_enabled(DRM_UT_DRIVER)) {
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) {
print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE,
16, 1, data, bytes_received, false);
}
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 07/14] drm/etnaviv: Change buffer dump checks to target syslog
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (5 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 06/14] drm/amd: Gate i2c transaction logs on drm_debug_syslog Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 08/14] drm/nouveau: Change debug checks to specifically " Sean Paul
` (7 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Since the logs protected by these checks specifically target syslog,
use the new drm_debug_syslog_enabled() call to avoid triggering
these prints when only trace is enabled.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-8-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
index 76d38561c910..7713474800e8 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c
@@ -353,7 +353,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
lockdep_assert_held(&gpu->lock);
- if (drm_debug_enabled(DRM_UT_DRIVER))
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER))
etnaviv_buffer_dump(gpu, buffer, 0, 0x50);
link_target = etnaviv_cmdbuf_get_va(cmdbuf,
@@ -509,13 +509,13 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping)
+ buffer->user_size - 4);
- if (drm_debug_enabled(DRM_UT_DRIVER))
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER))
pr_info("stream link to 0x%08x @ 0x%08x %p\n",
return_target,
etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping),
cmdbuf->vaddr);
- if (drm_debug_enabled(DRM_UT_DRIVER)) {
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) {
print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4,
cmdbuf->vaddr, cmdbuf->size, 0);
@@ -534,6 +534,6 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state,
VIV_FE_LINK_HEADER_PREFETCH(link_dwords),
link_target);
- if (drm_debug_enabled(DRM_UT_DRIVER))
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER))
etnaviv_buffer_dump(gpu, buffer, 0, 0x50);
}
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 08/14] drm/nouveau: Change debug checks to specifically target syslog
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (6 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 07/14] drm/etnaviv: Change buffer dump checks to target syslog Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 09/14] drm/i915: Change infoframe debug checks to specify syslog Sean Paul
` (6 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Since the logs protected by these checks specifically target syslog,
use the new drm_debug_syslog_enabled() call to avoid triggering
these prints when only trace is enabled.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-9-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-Rebased on drm-tip, changes in dispnv50/disp.h were rebased out
---
drivers/gpu/drm/nouveau/nouveau_drv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index f63ac72aa556..70be12038b0c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -258,11 +258,11 @@ void nouveau_drm_device_remove(struct drm_device *dev);
#define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a)
#define NV_DEBUG(drm,f,a...) do { \
- if (drm_debug_enabled(DRM_UT_DRIVER)) \
+ if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) \
NV_PRINTK(info, &(drm)->client, f, ##a); \
} while(0)
#define NV_ATOMIC(drm,f,a...) do { \
- if (drm_debug_enabled(DRM_UT_ATOMIC)) \
+ if (drm_debug_syslog_enabled(DRM_UT_ATOMIC)) \
NV_PRINTK(info, &(drm)->client, f, ##a); \
} while(0)
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 09/14] drm/i915: Change infoframe debug checks to specify syslog
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (7 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 08/14] drm/nouveau: Change debug checks to specifically " Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 10/14] drm/print: Add drm_debug_category_printer Sean Paul
` (5 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
Since the logs protected by these checks specifically target syslog,
use the new drm_debug_syslog_enabled() call to avoid triggering
these prints when only trace is enabled.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-10-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 2ddabf92adde..30dcc8a2daa7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -12908,7 +12908,7 @@ static void
intel_dump_infoframe(struct drm_i915_private *dev_priv,
const union hdmi_infoframe *frame)
{
- if (!drm_debug_enabled(DRM_UT_KMS))
+ if (!drm_debug_syslog_enabled(DRM_UT_KMS))
return;
hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, frame);
@@ -13551,7 +13551,7 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv,
const union hdmi_infoframe *b)
{
if (fastset) {
- if (!drm_debug_enabled(DRM_UT_KMS))
+ if (!drm_debug_syslog_enabled(DRM_UT_KMS))
return;
drm_dbg_kms(&dev_priv->drm,
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 10/14] drm/print: Add drm_debug_category_printer
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (8 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 09/14] drm/i915: Change infoframe debug checks to specify syslog Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers Sean Paul
` (4 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
This patch adds a new printer which will select the appropriate output
for a given debug category. Currently there is only one output target,
which is syslog. However in the future we'll have tracefs and it will be
useful to print to syslog, tracefs, or both. Drivers just need to create
the printer for the appropriate category and the printer will decide
where to send the output.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-11-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/drm_print.c | 5 +++++
include/drm/drm_print.h | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 2ff7a6ecc632..4d984a01b3a3 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -172,6 +172,11 @@ void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf)
}
EXPORT_SYMBOL(__drm_printfn_err);
+void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf)
+{
+}
+EXPORT_SYMBOL(__drm_printfn_noop);
+
/**
* drm_puts - print a const string to a &drm_printer stream
* @p: the &drm printer
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index ce7675bf0d2b..8987b98bbfda 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -87,6 +87,7 @@ void __drm_puts_seq_file(struct drm_printer *p, const char *str);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf);
__printf(2, 3)
void drm_printf(struct drm_printer *p, const char *f, ...);
@@ -329,6 +330,33 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
return drm_debug_syslog_enabled(category);
}
+/**
+ * drm_debug_category_printer - construct a &drm_printer that outputs to
+ * pr_debug() if enabled for the given category.
+ * @category: the DRM_UT_* message category this message belongs to
+ * @prefix: trace output prefix
+ *
+ * RETURNS:
+ * The &drm_printer object
+ */
+static inline struct drm_printer
+drm_debug_category_printer(enum drm_debug_category category,
+ const char *prefix)
+{
+ struct drm_printer p = {
+ .prefix = prefix
+ };
+
+ if (drm_debug_syslog_enabled(category)) {
+ p.printfn = __drm_printfn_debug_syslog;
+ } else {
+ WARN(1, "Debug category %d is inactive.", category);
+ p.printfn = __drm_printfn_noop;
+ }
+
+ return p;
+}
+
/*
* struct device based logging
*
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (9 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 10/14] drm/print: Add drm_debug_category_printer Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 22:59 ` Lyude Paul
2020-08-18 21:05 ` [PATCH v6 12/14] drm/i915: Use debug category printer for welcome message Sean Paul
` (3 subsequent siblings)
14 siblings, 1 reply; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
The printers in dp_mst are meant to be gated on DRM_UT_DP, so use the
debug category printer to avoid dumping mst transactions to the wrong
place.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-12-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/drm_dp_mst_topology.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 67dd72ea200e..127120b60580 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1242,7 +1242,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
}
out:
if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) {
- struct drm_printer p = drm_debug_printer(DBG_PREFIX);
+ struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+ DBG_PREFIX);
drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
}
@@ -2781,7 +2782,8 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr,
ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
if (unlikely(ret) && drm_debug_enabled(DRM_UT_DP)) {
- struct drm_printer p = drm_debug_printer(DBG_PREFIX);
+ struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+ DBG_PREFIX);
drm_printf(&p, "sideband msg failed to send\n");
drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
@@ -2825,7 +2827,8 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr,
list_add_tail(&txmsg->next, &mgr->tx_msg_downq);
if (drm_debug_enabled(DRM_UT_DP)) {
- struct drm_printer p = drm_debug_printer(DBG_PREFIX);
+ struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
+ DBG_PREFIX);
drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
}
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 12/14] drm/i915: Use debug category printer for welcome message
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (10 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 13/14] drm/atomic: Use debug category printer for atomic state printer Sean Paul
` (2 subsequent siblings)
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
The welcome printer is meant to be gated on DRM_UT_DRIVER, so use the
debug category printer to avoid dumping the message in the wrong
place.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-13-sean@poorly.run #v5
Changes in v5:
-Added to the set
Changes in v6:
-None
---
drivers/gpu/drm/i915/i915_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 00292a849c34..0206be123b28 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -872,7 +872,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv)
static void i915_welcome_messages(struct drm_i915_private *dev_priv)
{
if (drm_debug_enabled(DRM_UT_DRIVER)) {
- struct drm_printer p = drm_debug_printer("i915 device info:");
+ struct drm_printer p = drm_debug_category_printer(DRM_UT_DRIVER,
+ "i915 device info:");
drm_printf(&p, "pciid=0x%04x rev=0x%02x platform=%s (subplatform=0x%x) gen=%i\n",
INTEL_DEVID(dev_priv),
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 13/14] drm/atomic: Use debug category printer for atomic state printer
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (11 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 12/14] drm/i915: Use debug category printer for welcome message Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-18 21:05 ` [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Sean Paul
2020-09-08 18:53 ` [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter
From: Sean Paul <seanpaul@chromium.org>
The atomic state is printed if the DRM_UT_STATE is active, but it's
printed at INFO level. This patch converts it to use the debug
category printer so:
a- it's consistent with other DRM_UT_STATE logging
b- it's properly routed through drm_trace when introduced
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Changes in v6:
-Added to the set
---
drivers/gpu/drm/drm_atomic.c | 5 +++--
drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
drivers/gpu/drm/drm_crtc_internal.h | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 58527f151984..96b804e85903 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1543,9 +1543,10 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set,
}
EXPORT_SYMBOL(__drm_atomic_helper_set_config);
-void drm_atomic_print_state(const struct drm_atomic_state *state)
+void drm_atomic_print_state(const struct drm_atomic_state *state,
+ const char *prefix)
{
- struct drm_printer p = drm_info_printer(state->dev->dev);
+ struct drm_printer p = drm_debug_category_printer(DRM_UT_STATE, prefix);
struct drm_plane *plane;
struct drm_plane_state *plane_state;
struct drm_crtc *crtc;
diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c
index 25c269bc4681..c6f3c652f47c 100644
--- a/drivers/gpu/drm/drm_atomic_uapi.c
+++ b/drivers/gpu/drm/drm_atomic_uapi.c
@@ -1413,7 +1413,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev,
ret = drm_atomic_nonblocking_commit(state);
} else {
if (drm_debug_enabled(DRM_UT_STATE))
- drm_atomic_print_state(state);
+ drm_atomic_print_state(state, "commit_state");
ret = drm_atomic_commit(state);
}
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index da96b2f64d7e..077ea92fb12a 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -233,7 +233,8 @@ int __drm_atomic_helper_disable_plane(struct drm_plane *plane,
int __drm_atomic_helper_set_config(struct drm_mode_set *set,
struct drm_atomic_state *state);
-void drm_atomic_print_state(const struct drm_atomic_state *state);
+void drm_atomic_print_state(const struct drm_atomic_state *state,
+ const char *prefix);
/* drm_atomic_uapi.c */
int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state,
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (12 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 13/14] drm/atomic: Use debug category printer for atomic state printer Sean Paul
@ 2020-08-18 21:05 ` Sean Paul
2020-08-19 0:09 ` kernel test robot
2020-08-25 20:59 ` [PATCH v6.5 " Sean Paul
2020-09-08 18:53 ` [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
14 siblings, 2 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-18 21:05 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter, Steven Rostedt, Chris Wilson
From: Sean Paul <seanpaul@chromium.org>
This patch adds a new module parameter called drm.trace which accepts
the same mask as drm.debug. When a debug category is enabled, log
messages will be put in a new tracefs instance called drm for
consumption.
Using the new tracefs instance will allow distros to enable drm logging
in production without impacting performance or spamming the system
logs.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Pekka Paalanen <ppaalanen@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010204823.195540-1-sean@poorly.run #v1
Link: https://lists.freedesktop.org/archives/dri-devel/2019-November/243230.html #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20191212203301.142437-1-sean@poorly.run #v3
Link: https://patchwork.freedesktop.org/patch/msgid/20200114172155.215463-1-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-14-sean@poorly.run #v5
Changes in v5:
-Re-write to use trace_array and the tracefs instance support
Changes in v6:
-Use the new trace_array_init_printk() to initialize global trace
buffers
---
Documentation/gpu/drm-uapi.rst | 6 +
drivers/gpu/drm/drm_drv.c | 3 +
drivers/gpu/drm/drm_print.c | 216 ++++++++++++++++++++++++++++-----
include/drm/drm_print.h | 63 ++++++++--
4 files changed, 248 insertions(+), 40 deletions(-)
diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst
index 7dce175f6d75..0297ff71f8f8 100644
--- a/Documentation/gpu/drm-uapi.rst
+++ b/Documentation/gpu/drm-uapi.rst
@@ -424,6 +424,12 @@ Debugfs Support
.. kernel-doc:: drivers/gpu/drm/drm_debugfs.c
:export:
+DRM Tracing
+---------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_print.c
+ :doc: DRM Tracing
+
Sysfs Support
=============
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 13068fdf4331..555b40580497 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -1107,12 +1107,15 @@ static void drm_core_exit(void)
drm_sysfs_destroy();
idr_destroy(&drm_minors_idr);
drm_connector_ida_destroy();
+ drm_trace_cleanup();
}
static int __init drm_core_init(void)
{
int ret;
+ drm_trace_init();
+
drm_connector_ida_init();
idr_init(&drm_minors_idr);
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 4d984a01b3a3..6b11143d1ab2 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -31,6 +31,7 @@
#include <linux/moduleparam.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
+#include <linux/trace.h>
#include <drm/drm.h>
#include <drm/drm_drv.h>
@@ -43,17 +44,34 @@
unsigned int __drm_debug_syslog;
EXPORT_SYMBOL(__drm_debug_syslog);
-MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
-"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
-"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n"
-"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n"
-"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n"
-"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n"
-"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n"
-"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n"
-"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
+/*
+ * __drm_debug_trace: Enable debug output in drm tracing instance.
+ * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
+ */
+unsigned int __drm_debug_trace;
+EXPORT_SYMBOL(__drm_debug_trace);
+
+#define DEBUG_PARM_DESC(dst) \
+"Enable debug output to " dst ", where each bit enables a debug category.\n" \
+"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" \
+"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" \
+"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" \
+"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" \
+"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" \
+"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" \
+"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" \
+"\t\tBit 8 (0x100) will enable DP messages (displayport code)"
+
+MODULE_PARM_DESC(debug, DEBUG_PARM_DESC("syslog"));
module_param_named(debug, __drm_debug_syslog, int, 0600);
+MODULE_PARM_DESC(trace, DEBUG_PARM_DESC("tracefs"));
+module_param_named(trace, __drm_debug_trace, int, 0600);
+
+#ifdef CONFIG_TRACING
+struct trace_array *trace_arr;
+#endif
+
void __drm_puts_coredump(struct drm_printer *p, const char *str)
{
struct drm_print_iterator *iterator = p->arg;
@@ -166,6 +184,20 @@ void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf)
}
EXPORT_SYMBOL(__drm_printfn_debug_syslog);
+void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf)
+{
+ drm_trace_printf("%s %pV", p->prefix, vaf);
+}
+EXPORT_SYMBOL(__drm_printfn_trace);
+
+void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p,
+ struct va_format *vaf)
+{
+ pr_debug("%s %pV", p->prefix, vaf);
+ drm_trace_printf("%s %pV", p->prefix, vaf);
+}
+EXPORT_SYMBOL(__drm_printfn_debug_syslog_and_trace);
+
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf)
{
pr_err("*ERROR* %s %pV", p->prefix, vaf);
@@ -246,6 +278,14 @@ void drm_dev_printk(const struct device *dev, const char *level,
struct va_format vaf;
va_list args;
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV",
+ dev ? dev_name(dev) : "",dev ? " " : "",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+
va_start(args, format);
vaf.fmt = format;
vaf.va = &args;
@@ -267,21 +307,30 @@ void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
struct va_format vaf;
va_list args;
- if (!drm_debug_enabled(category))
- return;
+ if (drm_debug_syslog_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
- va_start(args, format);
- vaf.fmt = format;
- vaf.va = &args;
+ if (dev)
+ dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
+ else
+ printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
- if (dev)
- dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
- else
- printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
- va_end(args);
+ if (drm_debug_trace_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV",
+ dev ? dev_name(dev) : "", dev ? " " : "",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
}
EXPORT_SYMBOL(drm_dev_dbg);
@@ -290,17 +339,25 @@ void __drm_dbg(enum drm_debug_category category, const char *format, ...)
struct va_format vaf;
va_list args;
- if (!drm_debug_enabled(category))
- return;
+ if (drm_debug_syslog_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
- va_start(args, format);
- vaf.fmt = format;
- vaf.va = &args;
+ printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
- printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
- va_end(args);
+ if (drm_debug_trace_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
}
EXPORT_SYMBOL(__drm_dbg);
@@ -347,3 +404,104 @@ void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset)
}
}
EXPORT_SYMBOL(drm_print_regset32);
+
+
+/**
+ * DOC: DRM Tracing
+ *
+ * *tl;dr* DRM tracing is a lightweight alternative to traditional DRM debug
+ * logging.
+ *
+ * While DRM logging is quite convenient when reproducing a specific issue, it
+ * doesn't help when something goes wrong unexpectedly. There are a couple
+ * reasons why one does not want to enable DRM logging at all times:
+ *
+ * 1. We don't want to overwhelm syslog with drm spam, others have to use it too
+ * 2. Console logging is slow
+ *
+ * DRM tracing aims to solve both these problems.
+ *
+ * To use DRM tracing, set the drm.trace module parameter (via cmdline or sysfs)
+ * to a DRM debug category mask (this is a bitmask of &drm_debug_category
+ * values):
+ * ::
+ *
+ * eg: echo 0x106 > /sys/module/drm/parameters/trace
+ *
+ * Once active, all log messages in the specified categories will be written to
+ * the DRM trace. Once at capacity, the trace will overwrite old messages with
+ * new ones. At any point, one can read the trace file to extract the previous N
+ * DRM messages:
+ * ::
+ *
+ * eg: cat /sys/kernel/tracing/instances/drm/trace
+ *
+ * Considerations
+ * **************
+ * The trace is subsystem wide, so if you have multiple devices active, they
+ * will be adding logs to the same trace.
+ *
+ * The contents of the DRM Trace are **not** considered UABI. **DO NOT depend on
+ * the values of these traces in your userspace.** These traces are intended for
+ * entertainment purposes only. The contents of these logs carry no warranty,
+ * expressed or implied.
+ */
+
+
+#ifdef CONFIG_TRACING
+
+/**
+ * drm_trace_init - initializes the drm trace array
+ *
+ * This function fetches (or creates) the drm trace array. This should be called
+ * once on drm subsystem creation and matched with drm_trace_cleanup().
+ */
+void drm_trace_init()
+{
+ int ret;
+
+ trace_arr = trace_array_get_by_name("drm");
+ if (!trace_arr)
+ return;
+
+ ret = trace_array_init_printk(trace_arr);
+ if (ret)
+ drm_trace_cleanup();
+}
+EXPORT_SYMBOL(drm_trace_init);
+
+/**
+ * drm_trace_printf - adds an entry to the drm tracefs instance
+ * @format: printf format of the message to add to the trace
+ *
+ * This function adds a new entry in the drm tracefs instance
+ */
+void drm_trace_printf(const char *format, ...)
+{
+ struct va_format vaf;
+ va_list args;
+
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf);
+ va_end(args);
+}
+
+/**
+ * drm_trace_cleanup - destroys the drm trace array
+ *
+ * This function destroys the drm trace array created with drm_trace_init. This
+ * should be called once on drm subsystem close and matched with
+ * drm_trace_init().
+ */
+void drm_trace_cleanup()
+{
+ if (trace_arr) {
+ trace_array_put(trace_arr);
+ trace_array_destroy(trace_arr);
+ trace_arr = NULL;
+ }
+}
+EXPORT_SYMBOL(drm_trace_cleanup);
+#endif
\ No newline at end of file
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 8987b98bbfda..284f7d325056 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -36,12 +36,13 @@
/* Do *not* use outside of drm_print.[ch]! */
extern unsigned int __drm_debug_syslog;
+extern unsigned int __drm_debug_trace;
/**
* DOC: print
*
* A simple wrapper for dev_printk(), seq_printf(), etc. Allows same
- * debug code to be used for both debugfs and printk logging.
+ * debug code to be used for debugfs, printk and tracefs logging.
*
* For example::
*
@@ -86,6 +87,9 @@ void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
void __drm_puts_seq_file(struct drm_printer *p, const char *str);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p,
+ struct va_format *vaf);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf);
@@ -219,7 +223,8 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
}
/**
- * drm_debug_printer - construct a &drm_printer that outputs to pr_debug()
+ * drm_debug_printer - construct a &drm_printer that outputs to pr_debug() and
+ * drm tracefs
* @prefix: debug output prefix
*
* RETURNS:
@@ -228,7 +233,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
static inline struct drm_printer drm_debug_printer(const char *prefix)
{
struct drm_printer p = {
- .printfn = __drm_printfn_debug_syslog,
+ .printfn = __drm_printfn_debug_syslog_and_trace,
.prefix = prefix
};
return p;
@@ -254,14 +259,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix)
* enum drm_debug_category - The DRM debug categories
*
* Each of the DRM debug logging macros use a specific category, and the logging
- * is filtered by the drm.debug module parameter. This enum specifies the values
- * for the interface.
+ * is filtered by the drm.debug and drm.trace module parameters. This enum
+ * specifies the values for the interface.
*
* Each DRM_DEBUG_<CATEGORY> macro logs to DRM_UT_<CATEGORY> category, except
* DRM_DEBUG() logs to DRM_UT_CORE.
*
- * Enabling verbose debug messages is done through the drm.debug parameter, each
- * category being enabled by a bit:
+ * Enabling verbose debug messages is done through the drm.debug and drm.trace
+ * parameters, each category being enabled by a bit:
*
* - drm.debug=0x1 will enable CORE messages
* - drm.debug=0x2 will enable DRIVER messages
@@ -270,10 +275,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix)
* - drm.debug=0x1ff will enable all messages
*
* An interesting feature is that it's possible to enable verbose logging at
- * run-time by echoing the debug value in its sysfs node::
+ * run-time by echoing the debug category value in its sysfs node::
*
+ * # For syslog logging:
* # echo 0xf > /sys/module/drm/parameters/debug
*
+ * # For tracefs logging:
+ * # echo 0xf > /sys/module/drm/parameters/trace
+ *
*/
enum drm_debug_category {
/**
@@ -325,14 +334,20 @@ static inline bool drm_debug_syslog_enabled(enum drm_debug_category category)
return unlikely(__drm_debug_syslog & category);
}
+static inline bool drm_debug_trace_enabled(enum drm_debug_category category)
+{
+ return unlikely(__drm_debug_trace & category);
+}
+
static inline bool drm_debug_enabled(enum drm_debug_category category)
{
- return drm_debug_syslog_enabled(category);
+ return drm_debug_syslog_enabled(category) ||
+ drm_debug_trace_enabled(category);
}
/**
* drm_debug_category_printer - construct a &drm_printer that outputs to
- * pr_debug() if enabled for the given category.
+ * pr_debug() and/or the drm tracefs instance if enabled for the given category.
* @category: the DRM_UT_* message category this message belongs to
* @prefix: trace output prefix
*
@@ -347,8 +362,13 @@ drm_debug_category_printer(enum drm_debug_category category,
.prefix = prefix
};
- if (drm_debug_syslog_enabled(category)) {
+ if (drm_debug_syslog_enabled(category) &&
+ drm_debug_trace_enabled(category)) {
+ p.printfn = __drm_printfn_debug_syslog_and_trace;
+ } else if (drm_debug_syslog_enabled(category)) {
p.printfn = __drm_printfn_debug_syslog;
+ } else if (drm_debug_trace_enabled(category)) {
+ p.printfn = __drm_printfn_trace;
} else {
WARN(1, "Debug category %d is inactive.", category);
p.printfn = __drm_printfn_noop;
@@ -357,6 +377,27 @@ drm_debug_category_printer(enum drm_debug_category category,
return p;
}
+
+#ifdef CONFIG_TRACING
+void drm_trace_init(void);
+__printf(1, 2)
+void drm_trace_printf(const char *format, ...);
+void drm_trace_cleanup(void);
+#else
+static inline void drm_trace_init(void)
+{
+}
+
+__printf(1, 2)
+static inline void drm_trace_printf(const char *format, ...)
+{
+}
+
+static inline void drm_trace_cleanup(void)
+{
+}
+#endif
+
/*
* struct device based logging
*
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers
2020-08-18 21:05 ` [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers Sean Paul
@ 2020-08-18 22:59 ` Lyude Paul
0 siblings, 0 replies; 20+ messages in thread
From: Lyude Paul @ 2020-08-18 22:59 UTC (permalink / raw)
To: Sean Paul, dri-devel, ppaalanen, maarten.lankhorst, mripard,
tzimmermann, seanpaul, airlied
Cc: daniel.vetter
Reviewed-by: Lyude Paul <lyude@redhat.com>
On Tue, 2020-08-18 at 17:05 -0400, Sean Paul wrote:
> From: Sean Paul <seanpaul@chromium.org>
>
> The printers in dp_mst are meant to be gated on DRM_UT_DP, so use the
> debug category printer to avoid dumping mst transactions to the wrong
> place.
>
> Signed-off-by: Sean Paul <seanpaul@chromium.org>
> Link:
> https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-12-sean@poorly.run
> #v5
>
> Changes in v5:
> -Added to the set
> Changes in v6:
> -None
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 67dd72ea200e..127120b60580 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -1242,7 +1242,8 @@ static int drm_dp_mst_wait_tx_reply(struct
> drm_dp_mst_branch *mstb,
> }
> out:
> if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) {
> - struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
> + DBG_PREFIX);
>
> drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
> }
> @@ -2781,7 +2782,8 @@ static int process_single_tx_qlock(struct
> drm_dp_mst_topology_mgr *mgr,
>
> ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx);
> if (unlikely(ret) && drm_debug_enabled(DRM_UT_DP)) {
> - struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
> + DBG_PREFIX);
>
> drm_printf(&p, "sideband msg failed to send\n");
> drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
> @@ -2825,7 +2827,8 @@ static void drm_dp_queue_down_tx(struct
> drm_dp_mst_topology_mgr *mgr,
> list_add_tail(&txmsg->next, &mgr->tx_msg_downq);
>
> if (drm_debug_enabled(DRM_UT_DP)) {
> - struct drm_printer p = drm_debug_printer(DBG_PREFIX);
> + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP,
> + DBG_PREFIX);
>
> drm_dp_mst_dump_sideband_msg_tx(&p, txmsg);
> }
--
Sincerely,
Lyude Paul (she/her)
Software Engineer at Red Hat
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers
2020-08-18 21:05 ` [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Sean Paul
@ 2020-08-19 0:09 ` kernel test robot
2020-08-25 20:59 ` [PATCH v6.5 " Sean Paul
1 sibling, 0 replies; 20+ messages in thread
From: kernel test robot @ 2020-08-19 0:09 UTC (permalink / raw)
To: Sean Paul, dri-devel, ppaalanen, maarten.lankhorst, mripard,
tzimmermann, seanpaul, airlied
Cc: daniel.vetter, kbuild-all, Steven Rostedt, Chris Wilson
[-- Attachment #1: Type: text/plain, Size: 4161 bytes --]
Hi Sean,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on tegra-drm/drm/tegra/for-next drm-tip/drm-tip linus/master drm-exynos/exynos-drm-next v5.9-rc1 next-20200818]
[cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: openrisc-randconfig-s031-20200818 (attached as .config)
compiler: or1k-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.2-183-gaa6ede3b-dirty
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=openrisc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/drm_print.c:459:21: sparse: sparse: non-ANSI function declaration of function 'drm_trace_init'
>> drivers/gpu/drm/drm_print.c:498:24: sparse: sparse: non-ANSI function declaration of function 'drm_trace_cleanup'
drivers/gpu/drm/drm_print.c:467:15: sparse: sparse: undefined identifier 'trace_array_init_printk'
drivers/gpu/drm/drm_print.c: note: in included file (through arch/openrisc/include/asm/io.h, include/linux/io.h):
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
# https://github.com/0day-ci/linux/commit/fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745
git checkout fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
vim +/drm_trace_init +459 drivers/gpu/drm/drm_print.c
452
453 /**
454 * drm_trace_init - initializes the drm trace array
455 *
456 * This function fetches (or creates) the drm trace array. This should be called
457 * once on drm subsystem creation and matched with drm_trace_cleanup().
458 */
> 459 void drm_trace_init()
460 {
461 int ret;
462
463 trace_arr = trace_array_get_by_name("drm");
464 if (!trace_arr)
465 return;
466
467 ret = trace_array_init_printk(trace_arr);
468 if (ret)
469 drm_trace_cleanup();
470 }
471 EXPORT_SYMBOL(drm_trace_init);
472
473 /**
474 * drm_trace_printf - adds an entry to the drm tracefs instance
475 * @format: printf format of the message to add to the trace
476 *
477 * This function adds a new entry in the drm tracefs instance
478 */
479 void drm_trace_printf(const char *format, ...)
480 {
481 struct va_format vaf;
482 va_list args;
483
484 va_start(args, format);
485 vaf.fmt = format;
486 vaf.va = &args;
487 trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf);
488 va_end(args);
489 }
490
491 /**
492 * drm_trace_cleanup - destroys the drm trace array
493 *
494 * This function destroys the drm trace array created with drm_trace_init. This
495 * should be called once on drm subsystem close and matched with
496 * drm_trace_init().
497 */
> 498 void drm_trace_cleanup()
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 22704 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers
@ 2020-08-19 0:09 ` kernel test robot
0 siblings, 0 replies; 20+ messages in thread
From: kernel test robot @ 2020-08-19 0:09 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 4260 bytes --]
Hi Sean,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on tegra-drm/drm/tegra/for-next drm-tip/drm-tip linus/master drm-exynos/exynos-drm-next v5.9-rc1 next-20200818]
[cannot apply to drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745
base: git://anongit.freedesktop.org/drm-intel for-linux-next
config: openrisc-randconfig-s031-20200818 (attached as .config)
compiler: or1k-linux-gcc (GCC) 9.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.2-183-gaa6ede3b-dirty
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=openrisc
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
sparse warnings: (new ones prefixed by >>)
>> drivers/gpu/drm/drm_print.c:459:21: sparse: sparse: non-ANSI function declaration of function 'drm_trace_init'
>> drivers/gpu/drm/drm_print.c:498:24: sparse: sparse: non-ANSI function declaration of function 'drm_trace_cleanup'
drivers/gpu/drm/drm_print.c:467:15: sparse: sparse: undefined identifier 'trace_array_init_printk'
drivers/gpu/drm/drm_print.c: note: in included file (through arch/openrisc/include/asm/io.h, include/linux/io.h):
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
include/asm-generic/io.h:179:15: sparse: sparse: cast to restricted __le32
# https://github.com/0day-ci/linux/commit/fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Sean-Paul/drm-trace-Mirror-DRM-debug-logs-to-tracefs/20200819-050745
git checkout fe0a955028a2121ce9ab9acd1c2ab74d219cdc60
vim +/drm_trace_init +459 drivers/gpu/drm/drm_print.c
452
453 /**
454 * drm_trace_init - initializes the drm trace array
455 *
456 * This function fetches (or creates) the drm trace array. This should be called
457 * once on drm subsystem creation and matched with drm_trace_cleanup().
458 */
> 459 void drm_trace_init()
460 {
461 int ret;
462
463 trace_arr = trace_array_get_by_name("drm");
464 if (!trace_arr)
465 return;
466
467 ret = trace_array_init_printk(trace_arr);
468 if (ret)
469 drm_trace_cleanup();
470 }
471 EXPORT_SYMBOL(drm_trace_init);
472
473 /**
474 * drm_trace_printf - adds an entry to the drm tracefs instance
475 * @format: printf format of the message to add to the trace
476 *
477 * This function adds a new entry in the drm tracefs instance
478 */
479 void drm_trace_printf(const char *format, ...)
480 {
481 struct va_format vaf;
482 va_list args;
483
484 va_start(args, format);
485 vaf.fmt = format;
486 vaf.va = &args;
487 trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf);
488 va_end(args);
489 }
490
491 /**
492 * drm_trace_cleanup - destroys the drm trace array
493 *
494 * This function destroys the drm trace array created with drm_trace_init. This
495 * should be called once on drm subsystem close and matched with
496 * drm_trace_init().
497 */
> 498 void drm_trace_cleanup()
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 22704 bytes --]
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH v6.5 14/14] drm/print: Add tracefs support to the drm logging helpers
2020-08-18 21:05 ` [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Sean Paul
2020-08-19 0:09 ` kernel test robot
@ 2020-08-25 20:59 ` Sean Paul
1 sibling, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-08-25 20:59 UTC (permalink / raw)
To: dri-devel, ppaalanen, maarten.lankhorst, mripard, tzimmermann,
seanpaul, airlied
Cc: daniel.vetter, rostedt, chris
From: Sean Paul <seanpaul@chromium.org>
This patch adds a new module parameter called drm.trace which accepts
the same mask as drm.debug. When a debug category is enabled, log
messages will be put in a new tracefs instance called drm for
consumption.
Using the new tracefs instance will allow distros to enable drm logging
in production without impacting performance or spamming the system
logs.
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: David Airlie <airlied@gmail.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Pekka Paalanen <ppaalanen@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Reported-by: kernel test robot <lkp@intel.com> # warning reported in v6
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191010204823.195540-1-sean@poorly.run #v1
Link: https://lists.freedesktop.org/archives/dri-devel/2019-November/243230.html #v2
Link: https://patchwork.freedesktop.org/patch/msgid/20191212203301.142437-1-sean@poorly.run #v3
Link: https://patchwork.freedesktop.org/patch/msgid/20200114172155.215463-1-sean@poorly.run #v4
Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-14-sean@poorly.run #v5
Link: https://patchwork.freedesktop.org/patch/msgid/20200818210510.49730-15-sean@poorly.run #v6
Changes in v5:
-Re-write to use trace_array and the tracefs instance support
Changes in v6:
-Use the new trace_array_init_printk() to initialize global trace
buffers
Changes in v6.5:
-Fix kernel test robot warning
-Add a trace printf in __drm_err
---
Documentation/gpu/drm-uapi.rst | 6 +
drivers/gpu/drm/drm_drv.c | 3 +
drivers/gpu/drm/drm_print.c | 223 ++++++++++++++++++++++++++++-----
include/drm/drm_print.h | 63 ++++++++--
4 files changed, 255 insertions(+), 40 deletions(-)
diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst
index 7dce175f6d75..0297ff71f8f8 100644
--- a/Documentation/gpu/drm-uapi.rst
+++ b/Documentation/gpu/drm-uapi.rst
@@ -424,6 +424,12 @@ Debugfs Support
.. kernel-doc:: drivers/gpu/drm/drm_debugfs.c
:export:
+DRM Tracing
+---------------
+
+.. kernel-doc:: drivers/gpu/drm/drm_print.c
+ :doc: DRM Tracing
+
Sysfs Support
=============
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 13068fdf4331..555b40580497 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -1107,12 +1107,15 @@ static void drm_core_exit(void)
drm_sysfs_destroy();
idr_destroy(&drm_minors_idr);
drm_connector_ida_destroy();
+ drm_trace_cleanup();
}
static int __init drm_core_init(void)
{
int ret;
+ drm_trace_init();
+
drm_connector_ida_init();
idr_init(&drm_minors_idr);
diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
index 4d984a01b3a3..64d9a724c2df 100644
--- a/drivers/gpu/drm/drm_print.c
+++ b/drivers/gpu/drm/drm_print.c
@@ -31,6 +31,7 @@
#include <linux/moduleparam.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
+#include <linux/trace.h>
#include <drm/drm.h>
#include <drm/drm_drv.h>
@@ -43,17 +44,34 @@
unsigned int __drm_debug_syslog;
EXPORT_SYMBOL(__drm_debug_syslog);
-MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
-"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
-"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n"
-"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n"
-"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n"
-"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n"
-"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n"
-"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n"
-"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
+/*
+ * __drm_debug_trace: Enable debug output in drm tracing instance.
+ * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
+ */
+unsigned int __drm_debug_trace;
+EXPORT_SYMBOL(__drm_debug_trace);
+
+#define DEBUG_PARM_DESC(dst) \
+"Enable debug output to " dst ", where each bit enables a debug category.\n" \
+"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" \
+"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" \
+"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" \
+"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" \
+"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" \
+"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" \
+"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" \
+"\t\tBit 8 (0x100) will enable DP messages (displayport code)"
+
+MODULE_PARM_DESC(debug, DEBUG_PARM_DESC("syslog"));
module_param_named(debug, __drm_debug_syslog, int, 0600);
+MODULE_PARM_DESC(trace, DEBUG_PARM_DESC("tracefs"));
+module_param_named(trace, __drm_debug_trace, int, 0600);
+
+#ifdef CONFIG_TRACING
+struct trace_array *trace_arr;
+#endif
+
void __drm_puts_coredump(struct drm_printer *p, const char *str)
{
struct drm_print_iterator *iterator = p->arg;
@@ -166,6 +184,20 @@ void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf)
}
EXPORT_SYMBOL(__drm_printfn_debug_syslog);
+void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf)
+{
+ drm_trace_printf("%s %pV", p->prefix, vaf);
+}
+EXPORT_SYMBOL(__drm_printfn_trace);
+
+void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p,
+ struct va_format *vaf)
+{
+ pr_debug("%s %pV", p->prefix, vaf);
+ drm_trace_printf("%s %pV", p->prefix, vaf);
+}
+EXPORT_SYMBOL(__drm_printfn_debug_syslog_and_trace);
+
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf)
{
pr_err("*ERROR* %s %pV", p->prefix, vaf);
@@ -246,6 +278,14 @@ void drm_dev_printk(const struct device *dev, const char *level,
struct va_format vaf;
va_list args;
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV",
+ dev ? dev_name(dev) : "",dev ? " " : "",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+
va_start(args, format);
vaf.fmt = format;
vaf.va = &args;
@@ -267,21 +307,30 @@ void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
struct va_format vaf;
va_list args;
- if (!drm_debug_enabled(category))
- return;
+ if (drm_debug_syslog_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
- va_start(args, format);
- vaf.fmt = format;
- vaf.va = &args;
+ if (dev)
+ dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
+ else
+ printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
- if (dev)
- dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
- else
- printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
- va_end(args);
+ if (drm_debug_trace_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV",
+ dev ? dev_name(dev) : "", dev ? " " : "",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
}
EXPORT_SYMBOL(drm_dev_dbg);
@@ -290,17 +339,25 @@ void __drm_dbg(enum drm_debug_category category, const char *format, ...)
struct va_format vaf;
va_list args;
- if (!drm_debug_enabled(category))
- return;
+ if (drm_debug_syslog_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
- va_start(args, format);
- vaf.fmt = format;
- vaf.va = &args;
+ printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
- printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
- __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
- va_end(args);
+ if (drm_debug_trace_enabled(category)) {
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("[" DRM_NAME ":%ps] %pV",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
+ }
}
EXPORT_SYMBOL(__drm_dbg);
@@ -317,6 +374,13 @@ void __drm_err(const char *format, ...)
__builtin_return_address(0), &vaf);
va_end(args);
+
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ drm_trace_printf("[" DRM_NAME ":%ps] *ERROR* %pV",
+ __builtin_return_address(0), &vaf);
+ va_end(args);
}
EXPORT_SYMBOL(__drm_err);
@@ -347,3 +411,104 @@ void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset)
}
}
EXPORT_SYMBOL(drm_print_regset32);
+
+
+/**
+ * DOC: DRM Tracing
+ *
+ * *tl;dr* DRM tracing is a lightweight alternative to traditional DRM debug
+ * logging.
+ *
+ * While DRM logging is quite convenient when reproducing a specific issue, it
+ * doesn't help when something goes wrong unexpectedly. There are a couple
+ * reasons why one does not want to enable DRM logging at all times:
+ *
+ * 1. We don't want to overwhelm syslog with drm spam, others have to use it too
+ * 2. Console logging is slow
+ *
+ * DRM tracing aims to solve both these problems.
+ *
+ * To use DRM tracing, set the drm.trace module parameter (via cmdline or sysfs)
+ * to a DRM debug category mask (this is a bitmask of &drm_debug_category
+ * values):
+ * ::
+ *
+ * eg: echo 0x106 > /sys/module/drm/parameters/trace
+ *
+ * Once active, all log messages in the specified categories will be written to
+ * the DRM trace. Once at capacity, the trace will overwrite old messages with
+ * new ones. At any point, one can read the trace file to extract the previous N
+ * DRM messages:
+ * ::
+ *
+ * eg: cat /sys/kernel/tracing/instances/drm/trace
+ *
+ * Considerations
+ * **************
+ * The trace is subsystem wide, so if you have multiple devices active, they
+ * will be adding logs to the same trace.
+ *
+ * The contents of the DRM Trace are **not** considered UABI. **DO NOT depend on
+ * the values of these traces in your userspace.** These traces are intended for
+ * entertainment purposes only. The contents of these logs carry no warranty,
+ * expressed or implied.
+ */
+
+
+#ifdef CONFIG_TRACING
+
+/**
+ * drm_trace_init - initializes the drm trace array
+ *
+ * This function fetches (or creates) the drm trace array. This should be called
+ * once on drm subsystem creation and matched with drm_trace_cleanup().
+ */
+void drm_trace_init(void)
+{
+ int ret;
+
+ trace_arr = trace_array_get_by_name("drm");
+ if (!trace_arr)
+ return;
+
+ ret = trace_array_init_printk(trace_arr);
+ if (ret)
+ drm_trace_cleanup();
+}
+EXPORT_SYMBOL(drm_trace_init);
+
+/**
+ * drm_trace_printf - adds an entry to the drm tracefs instance
+ * @format: printf format of the message to add to the trace
+ *
+ * This function adds a new entry in the drm tracefs instance
+ */
+void drm_trace_printf(const char *format, ...)
+{
+ struct va_format vaf;
+ va_list args;
+
+ va_start(args, format);
+ vaf.fmt = format;
+ vaf.va = &args;
+ trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf);
+ va_end(args);
+}
+
+/**
+ * drm_trace_cleanup - destroys the drm trace array
+ *
+ * This function destroys the drm trace array created with drm_trace_init. This
+ * should be called once on drm subsystem close and matched with
+ * drm_trace_init().
+ */
+void drm_trace_cleanup(void)
+{
+ if (trace_arr) {
+ trace_array_put(trace_arr);
+ trace_array_destroy(trace_arr);
+ trace_arr = NULL;
+ }
+}
+EXPORT_SYMBOL(drm_trace_cleanup);
+#endif
\ No newline at end of file
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 8987b98bbfda..284f7d325056 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -36,12 +36,13 @@
/* Do *not* use outside of drm_print.[ch]! */
extern unsigned int __drm_debug_syslog;
+extern unsigned int __drm_debug_trace;
/**
* DOC: print
*
* A simple wrapper for dev_printk(), seq_printf(), etc. Allows same
- * debug code to be used for both debugfs and printk logging.
+ * debug code to be used for debugfs, printk and tracefs logging.
*
* For example::
*
@@ -86,6 +87,9 @@ void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
void __drm_puts_seq_file(struct drm_printer *p, const char *str);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf);
+void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p,
+ struct va_format *vaf);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf);
@@ -219,7 +223,8 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
}
/**
- * drm_debug_printer - construct a &drm_printer that outputs to pr_debug()
+ * drm_debug_printer - construct a &drm_printer that outputs to pr_debug() and
+ * drm tracefs
* @prefix: debug output prefix
*
* RETURNS:
@@ -228,7 +233,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
static inline struct drm_printer drm_debug_printer(const char *prefix)
{
struct drm_printer p = {
- .printfn = __drm_printfn_debug_syslog,
+ .printfn = __drm_printfn_debug_syslog_and_trace,
.prefix = prefix
};
return p;
@@ -254,14 +259,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix)
* enum drm_debug_category - The DRM debug categories
*
* Each of the DRM debug logging macros use a specific category, and the logging
- * is filtered by the drm.debug module parameter. This enum specifies the values
- * for the interface.
+ * is filtered by the drm.debug and drm.trace module parameters. This enum
+ * specifies the values for the interface.
*
* Each DRM_DEBUG_<CATEGORY> macro logs to DRM_UT_<CATEGORY> category, except
* DRM_DEBUG() logs to DRM_UT_CORE.
*
- * Enabling verbose debug messages is done through the drm.debug parameter, each
- * category being enabled by a bit:
+ * Enabling verbose debug messages is done through the drm.debug and drm.trace
+ * parameters, each category being enabled by a bit:
*
* - drm.debug=0x1 will enable CORE messages
* - drm.debug=0x2 will enable DRIVER messages
@@ -270,10 +275,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix)
* - drm.debug=0x1ff will enable all messages
*
* An interesting feature is that it's possible to enable verbose logging at
- * run-time by echoing the debug value in its sysfs node::
+ * run-time by echoing the debug category value in its sysfs node::
*
+ * # For syslog logging:
* # echo 0xf > /sys/module/drm/parameters/debug
*
+ * # For tracefs logging:
+ * # echo 0xf > /sys/module/drm/parameters/trace
+ *
*/
enum drm_debug_category {
/**
@@ -325,14 +334,20 @@ static inline bool drm_debug_syslog_enabled(enum drm_debug_category category)
return unlikely(__drm_debug_syslog & category);
}
+static inline bool drm_debug_trace_enabled(enum drm_debug_category category)
+{
+ return unlikely(__drm_debug_trace & category);
+}
+
static inline bool drm_debug_enabled(enum drm_debug_category category)
{
- return drm_debug_syslog_enabled(category);
+ return drm_debug_syslog_enabled(category) ||
+ drm_debug_trace_enabled(category);
}
/**
* drm_debug_category_printer - construct a &drm_printer that outputs to
- * pr_debug() if enabled for the given category.
+ * pr_debug() and/or the drm tracefs instance if enabled for the given category.
* @category: the DRM_UT_* message category this message belongs to
* @prefix: trace output prefix
*
@@ -347,8 +362,13 @@ drm_debug_category_printer(enum drm_debug_category category,
.prefix = prefix
};
- if (drm_debug_syslog_enabled(category)) {
+ if (drm_debug_syslog_enabled(category) &&
+ drm_debug_trace_enabled(category)) {
+ p.printfn = __drm_printfn_debug_syslog_and_trace;
+ } else if (drm_debug_syslog_enabled(category)) {
p.printfn = __drm_printfn_debug_syslog;
+ } else if (drm_debug_trace_enabled(category)) {
+ p.printfn = __drm_printfn_trace;
} else {
WARN(1, "Debug category %d is inactive.", category);
p.printfn = __drm_printfn_noop;
@@ -357,6 +377,27 @@ drm_debug_category_printer(enum drm_debug_category category,
return p;
}
+
+#ifdef CONFIG_TRACING
+void drm_trace_init(void);
+__printf(1, 2)
+void drm_trace_printf(const char *format, ...);
+void drm_trace_cleanup(void);
+#else
+static inline void drm_trace_init(void)
+{
+}
+
+__printf(1, 2)
+static inline void drm_trace_printf(const char *format, ...)
+{
+}
+
+static inline void drm_trace_cleanup(void)
+{
+}
+#endif
+
/*
* struct device based logging
*
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
` (13 preceding siblings ...)
2020-08-18 21:05 ` [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Sean Paul
@ 2020-09-08 18:53 ` Sean Paul
14 siblings, 0 replies; 20+ messages in thread
From: Sean Paul @ 2020-09-08 18:53 UTC (permalink / raw)
To: dri-devel, Pekka Paalanen, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, Sean Paul, Dave Airlie
Cc: Daniel Vetter
Friendly ping, does anyone care to review/comment?
On Tue, Aug 18, 2020 at 5:05 PM Sean Paul <sean@poorly.run> wrote:
>
> From: Sean Paul <seanpaul@chromium.org>
>
> Mostly a rebase on drm-tip.
>
> New changes:
> - Use the new trace_array_init_printk() call init the global trace buffers.
> - Add patch 13 to the set to pipe atomic state logging through trace
>
> v5 is available here:
> https://patchwork.freedesktop.org/series/78133/
>
> Sean Paul (14):
> drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER
> drm/sil164: Convert dev_printk to drm_dev_dbg
> drm/i915/utils: Replace dev_printk with drm helpers
> drm/msm/dpu: Replace definitions for dpu debug macros
> drm/print: rename drm_debug* to be more syslog-centric
> drm/amd: Gate i2c transaction logs on drm_debug_syslog
> drm/etnaviv: Change buffer dump checks to target syslog
> drm/nouveau: Change debug checks to specifically target syslog
> drm/i915: Change infoframe debug checks to specify syslog
> drm/print: Add drm_debug_category_printer
> drm/mst: Convert debug printers to debug category printers
> drm/i915: Use debug category printer for welcome message
> drm/atomic: Use debug category printer for atomic state printer
> drm/print: Add tracefs support to the drm logging helpers
>
> Documentation/gpu/drm-uapi.rst | 6 +
> drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 +-
> drivers/gpu/drm/drm_atomic.c | 5 +-
> drivers/gpu/drm/drm_atomic_uapi.c | 2 +-
> drivers/gpu/drm/drm_crtc_internal.h | 3 +-
> drivers/gpu/drm/drm_dp_mst_topology.c | 9 +-
> drivers/gpu/drm/drm_drv.c | 3 +
> drivers/gpu/drm/drm_mipi_dbi.c | 8 +-
> drivers/gpu/drm/drm_print.c | 235 ++++++++++++++++---
> drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 +-
> drivers/gpu/drm/i2c/sil164_drv.c | 12 +-
> drivers/gpu/drm/i915/display/intel_display.c | 4 +-
> drivers/gpu/drm/i915/i915_drv.c | 3 +-
> drivers/gpu/drm/i915/i915_utils.c | 5 +-
> drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 +-
> drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +-
> include/drm/drm_print.h | 96 +++++++-
> 17 files changed, 329 insertions(+), 98 deletions(-)
>
> --
> Sean Paul, Software Engineer, Google / Chromium OS
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2020-09-08 18:53 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-18 21:04 [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
2020-08-18 21:04 ` [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Sean Paul
2020-08-18 21:04 ` [PATCH v6 02/14] drm/sil164: Convert dev_printk to drm_dev_dbg Sean Paul
2020-08-18 21:04 ` [PATCH v6 03/14] drm/i915/utils: Replace dev_printk with drm helpers Sean Paul
2020-08-18 21:05 ` [PATCH v6 04/14] drm/msm/dpu: Replace definitions for dpu debug macros Sean Paul
2020-08-18 21:05 ` [PATCH v6 05/14] drm/print: rename drm_debug* to be more syslog-centric Sean Paul
2020-08-18 21:05 ` [PATCH v6 06/14] drm/amd: Gate i2c transaction logs on drm_debug_syslog Sean Paul
2020-08-18 21:05 ` [PATCH v6 07/14] drm/etnaviv: Change buffer dump checks to target syslog Sean Paul
2020-08-18 21:05 ` [PATCH v6 08/14] drm/nouveau: Change debug checks to specifically " Sean Paul
2020-08-18 21:05 ` [PATCH v6 09/14] drm/i915: Change infoframe debug checks to specify syslog Sean Paul
2020-08-18 21:05 ` [PATCH v6 10/14] drm/print: Add drm_debug_category_printer Sean Paul
2020-08-18 21:05 ` [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers Sean Paul
2020-08-18 22:59 ` Lyude Paul
2020-08-18 21:05 ` [PATCH v6 12/14] drm/i915: Use debug category printer for welcome message Sean Paul
2020-08-18 21:05 ` [PATCH v6 13/14] drm/atomic: Use debug category printer for atomic state printer Sean Paul
2020-08-18 21:05 ` [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Sean Paul
2020-08-19 0:09 ` kernel test robot
2020-08-19 0:09 ` kernel test robot
2020-08-25 20:59 ` [PATCH v6.5 " Sean Paul
2020-09-08 18:53 ` [PATCH v6 00/14] drm/trace: Mirror DRM debug logs to tracefs Sean Paul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.