From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@akamai.com, gregkh@linuxfoundation.org,
linux@rasmusvillemoes.dk, rostedt@goodmis.org,
mathieu.desnoyers@efficios.com, daniel.vetter@ffwll.ch,
seanpaul@chromium.org, robdclark@gmail.com,
dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: quic_saipraka@quicinc.com, arnd@arndb.de, jim.cromie@gmail.com,
catalin.marinas@arm.com, linux-arm-msm@vger.kernel.org,
mingo@redhat.com, quic_psodagud@quicinc.com, maz@kernel.org,
will@kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [Intel-gfx] [PATCH v11 12/19] drm_print: wrap drm_dbg in _dynamic_func_call_no_desc
Date: Thu, 6 Jan 2022 22:29:35 -0700 [thread overview]
Message-ID: <20220107052942.1349447-13-jim.cromie@gmail.com> (raw)
In-Reply-To: <20220107052942.1349447-1-jim.cromie@gmail.com>
Change __drm_dbg() macro to be CONFIG_DRM_USE_DYNAMIC_DEBUG dependent:
N- keep straight mapping to exported ___drm_dbg()
Y- wrap ___drm_dbg() inside _dynamic_func_call_no_desc()
This patch places ~1/2 of drm.debug API messages behind dyndbg's
JUMP_LABEL/NOOP optimization.
The CONFIG_DRM_USE_DYNAMIC_DEBUG dependence is due to the .data
footprint cost of per-callsite control; 56 bytes/site * ~2k,3k
callsites (for i915, amdgpu), which is significant enough to make
optional.
bash-5.1# drms_load
[ 7.489844] dyndbg: 239 debug prints in module drm
[ 7.494010] ACPI: bus type drm_connector registered
[ 7.546076] dyndbg: 81 debug prints in module drm_kms_helper
[ 7.555723] dyndbg: 2 debug prints in module ttm
[ 7.558920] dyndbg: 8 debug prints in module video
[ 8.074699] dyndbg: 431 debug prints in module i915
[ 8.158682] AMD-Vi: AMD IOMMUv2 functionality not available on this system - This is not a bug.
[ 8.574456] dyndbg: 3817 debug prints in module amdgpu
[ 8.589962] [drm] amdgpu kernel modesetting enabled.
[ 8.590548] amdgpu: CRAT table not found
[ 8.590998] amdgpu: Virtual CRAT table created for CPU
[ 8.591634] amdgpu: Topology: Add CPU node
[ 8.636446] dyndbg: 3 debug prints in module wmi
[ 8.768667] dyndbg: 24 debug prints in module nouveau
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
include/drm/drm_print.h | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
index 1eef315a0a65..8d6b74270c50 100644
--- a/include/drm/drm_print.h
+++ b/include/drm/drm_print.h
@@ -319,10 +319,36 @@ enum drm_debug_category {
DRM_UT_DRMRES
};
+/*
+ * 3 name flavors of drm_debug_enabled:
+ * drm_debug_enabled - public/legacy, always checks bits
+ * _drm_debug_enabled - instrumented to observe call-rates, est overheads.
+ * __drm_debug_enabled - privileged - knows jump-label state, can short-circuit
+ */
static inline bool drm_debug_enabled(enum drm_debug_category category)
{
return unlikely(__drm_debug & BIT(category));
}
+/*
+ * Wrap fn in macro, so that the pr_debug sees the actual caller, not
+ * the inline fn. Using this name creates a callsite entry / control
+ * point in /proc/dynamic_debug/control.
+ */
+#define _drm_debug_enabled(category) \
+ ({ \
+ pr_debug("todo: maybe avoid via dyndbg\n"); \
+ drm_debug_enabled(category); \
+ })
+#if defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
+/*
+ * dyndbg is wrapping the drm.debug API, so as to avoid the runtime
+ * bit-test overheads of drm_debug_enabled() in those api calls.
+ * In this case, executed callsites are known enabled, so true.
+ */
+#define __drm_debug_enabled(category) true
+#else
+#define __drm_debug_enabled(category) drm_debug_enabled(category)
+#endif
/*
* struct device based logging
@@ -497,7 +523,13 @@ void ___drm_dbg(enum drm_debug_category category, const char *format, ...);
__printf(1, 2)
void __drm_err(const char *format, ...);
+#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
#define __drm_dbg(fmt, ...) ___drm_dbg(fmt, ##__VA_ARGS__)
+#else
+#define __drm_dbg(eCat, fmt, ...) \
+ _dynamic_func_call_no_desc(fmt, ___drm_dbg, \
+ eCat, fmt, ##__VA_ARGS__)
+#endif
/* Macros to make printk easier */
@@ -569,7 +601,7 @@ void __drm_err(const char *format, ...);
static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST);\
const struct drm_device *drm_ = (drm); \
\
- if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \
+ if (__drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \
drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__); \
})
--
2.33.1
next prev parent reply other threads:[~2022-01-07 5:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 5:29 [Intel-gfx] [PATCH v11 00/19] dyndbg & drm.debug to tracefs Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 01/19] dyndbg: add _DPRINTK_FLAGS_ENABLED Jim Cromie
2022-01-14 11:57 ` Vincent Whitchurch
2022-01-17 22:33 ` jim.cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 02/19] dyndbg: add _DPRINTK_FLAGS_TRACE Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 03/19] dyndbg: add write-to-tracefs code Jim Cromie
2022-01-14 11:46 ` Vincent Whitchurch
2022-01-18 19:18 ` jim.cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 04/19] dyndbg: add trace-events for pr_debug, dev_dbg Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 05/19] dyndbg: add desc, dev fields to event record Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 06/19] dyndbg: add class_id to callsites Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 07/19] drm_print: condense enum drm_debug_category Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 08/19] drm_print: add trace_drm_dbg, trace_drm_devdbg events Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 09/19] drm_print: add CONFIG_DRM_USE_DYNAMIC_DEBUG Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 10/19] drm_print: interpose drm_dev_dbg, __drm_dbg with forwarding macros Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 11/19] drm_print: wrap drm_dev_dbg in _dynamic_func_call_no_desc Jim Cromie
2022-01-07 5:29 ` Jim Cromie [this message]
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 13/19] drm_print: refine drm_debug_enabled for dyndbg+jump-label Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 14/19] drm_print: prefer bare printk KERN_DEBUG on generic fn Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 15/19] drm_print: use _dynamic_func_call_no_desc_cls Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 16/19] drm_print: add struct _ddebug desc to drm_*dbg Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 17/19] drm_print: add struct _ddebug *desc to trace-drm-*() params Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 18/19] dyndbg: add DEFINE_DYNAMIC_DEBUG_CLASSBITS macro and callbacks Jim Cromie
2022-01-07 5:29 ` [Intel-gfx] [PATCH v11 19/19] drm_print: use DEFINE_DYNAMIC_DEBUG_CLASSBITS for drm.debug Jim Cromie
2022-01-07 6:20 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for dyndbg & drm.debug to tracefs Patchwork
2022-01-07 6:23 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-01-07 6:50 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220107052942.1349447-13-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jbaron@akamai.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=mathieu.desnoyers@efficios.com \
--cc=maz@kernel.org \
--cc=mingo@redhat.com \
--cc=quic_psodagud@quicinc.com \
--cc=quic_saipraka@quicinc.com \
--cc=robdclark@gmail.com \
--cc=rostedt@goodmis.org \
--cc=seanpaul@chromium.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).