From: Jim Cromie <jim.cromie@gmail.com>
To: airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com,
gregkh@linuxfoundation.org,
Maciej Falkowski <maciej.falkowski@linux.intel.com>,
Karol Wachowski <karol.wachowski@linux.intel.com>,
Oded Gabbay <ogabbay@kernel.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: Jim Cromie <jim.cromie@gmail.com>,
mripard@kernel.org, tzimmermann@suse.de,
maarten.lankhorst@linux.intel.com, jani.nikula@intel.com,
ville.syrjala@linux.intel.com, christian.koenig@amd.com,
matthew.auld@intel.com, arunpravin.paneerselvam@amd.com,
louis.chauvet@bootlin.com, skhan@linuxfoundation.org,
pmladek@suse.com, ukaszb@chromium.org,
intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org
Subject: [PATCH v11 59/65] accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap
Date: Fri, 13 Mar 2026 07:20:24 -0600 [thread overview]
Message-ID: <20260313132103.2529746-60-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260313132103.2529746-1-jim.cromie@gmail.com>
Invoke DRM_CLASSMAP_DEFINE to create a classmap of
class-ids/categories for ivpu_dbg().
This brings static-key optimized-off benefits to the ivpu_dbg()
callsites. DRM_CLASSMAP_PARAM_REF wires the sysfs kparam to the
classmap.
This is the 1st real-world example of a module avoiding another
module's classmap's class_id range reservation.
Its also something of an oddity: it "is" a DRM module only cuz
1. CONFIG_DRM_ACCEL_IVPU exists.
2. code therefore uses CONFIG_DRM_USE_DYNAMIC_DEBUG, so must also use
it's dependent wrappers: DRM_CLASSMAP_*
accel/amdxdna is already using drm.debug via dev_dbg(), so it is more
fully DRM but iirc its a single call.
Anyway, to play nice with DRM, we change all the constants, from
macros calling BIT(X), to an explicit "enum ivpu_dbg_category"
starting at 16 to avoid DRM_UT_CORE..RES. This is all in an indef to
avoid changing the constants for the non-dyndbg case.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
drivers/accel/ivpu/ivpu_drv.c | 27 +++++++++++++++++++--
drivers/accel/ivpu/ivpu_drv.h | 45 ++++++++++++++++++++++++++++++-----
2 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index dd3a486df5f1..2d7d290eb8bb 100644
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -3,6 +3,7 @@
* Copyright (C) 2020-2025 Intel Corporation
*/
+#include <linux/dynamic_debug.h>
#include <linux/firmware.h>
#include <linux/module.h>
#include <linux/pci.h>
@@ -37,8 +38,30 @@
#define DRIVER_VERSION_STR "1.0.0 " UTS_RELEASE
#endif
-int ivpu_dbg_mask;
-module_param_named(dbg_mask, ivpu_dbg_mask, int, 0644);
+unsigned long ivpu_dbg_mask;
+
+#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
+
+module_param_named(dbg_mask, ivpu_dbg_mask, ulong, 0644);
+#else
+DRM_CLASSMAP_DEFINE(ivpu_dbg_classes, DD_CLASS_TYPE_DISJOINT_BITS,
+ IVPU_DBG_REG,
+ "IVPU_DBG_REG",
+ "IVPU_DBG_IRQ",
+ "IVPU_DBG_MMU",
+ "IVPU_DBG_FILE",
+ "IVPU_DBG_MISC",
+ "IVPU_DBG_FW_BOOT",
+ "IVPU_DBG_PM",
+ "IVPU_DBG_IPC",
+ "IVPU_DBG_BO",
+ "IVPU_DBG_JOB",
+ "IVPU_DBG_JSM",
+ "IVPU_DBG_KREF",
+ "IVPU_DBG_RPM",
+ "IVPU_DBG_MMU_MAP");
+DRM_CLASSMAP_PARAM_REF(dbg_mask, ivpu_dbg_mask, ivpu_dbg_classes, p);
+#endif
MODULE_PARM_DESC(dbg_mask, "Driver debug mask. See IVPU_DBG_* macros.");
int ivpu_test_mode;
diff --git a/drivers/accel/ivpu/ivpu_drv.h b/drivers/accel/ivpu/ivpu_drv.h
index 6378e23e0c97..b59aa0759e26 100644
--- a/drivers/accel/ivpu/ivpu_drv.h
+++ b/drivers/accel/ivpu/ivpu_drv.h
@@ -63,6 +63,10 @@
#define IVPU_SCHED_MODE_AUTO -1
+extern unsigned long ivpu_dbg_mask;
+
+#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
+
#define IVPU_DBG_REG BIT(0)
#define IVPU_DBG_IRQ BIT(1)
#define IVPU_DBG_MMU BIT(2)
@@ -79,6 +83,41 @@
#define IVPU_DBG_MMU_MAP BIT(13)
#define IVPU_DBG_IOCTL BIT(14)
+#define ivpu_dbg(vdev, type, fmt, args...) do { \
+ if (unlikely(IVPU_DBG_##type & ivpu_dbg_mask)) \
+ dev_dbg((vdev)->drm.dev, "[%s] " fmt, #type, ##args); \
+} while (0)
+
+#else /* !!CONFIG_DRM_USE_DYNAMIC_DEBUG */
+
+enum ivpu_dbg_category {
+ /*
+ * since accels are drm-devices (CONFIG_DRM_ACCEL_*), adjust
+ * IVPU_DBG_* to avoid DRMs 0..10 class_id reservations.
+ */
+ IVPU_DBG_REG = 16,
+ IVPU_DBG_IRQ,
+ IVPU_DBG_MMU,
+ IVPU_DBG_FILE,
+ IVPU_DBG_MISC,
+ IVPU_DBG_FW_BOOT,
+ IVPU_DBG_PM,
+ IVPU_DBG_IPC,
+ IVPU_DBG_BO,
+ IVPU_DBG_JOB,
+ IVPU_DBG_JSM,
+ IVPU_DBG_KREF,
+ IVPU_DBG_RPM,
+ IVPU_DBG_MMU_MAP,
+ IVPU_DBG_IOCTL
+};
+
+#define ivpu_dbg(vdev, type, fmt, ...) \
+ _dynamic_func_call_cls(IVPU_DBG_##type, fmt, __dynamic_dev_dbg, \
+ (vdev)->drm.dev, fmt, ##__VA_ARGS__)
+
+#endif /* !!CONFIG_DRM_USE_DYNAMIC_DEBUG */
+
#define ivpu_err(vdev, fmt, ...) \
drm_err(&(vdev)->drm, "%s(): " fmt, __func__, ##__VA_ARGS__)
@@ -93,11 +132,6 @@
#define ivpu_info(vdev, fmt, ...) drm_info(&(vdev)->drm, fmt, ##__VA_ARGS__)
-#define ivpu_dbg(vdev, type, fmt, args...) do { \
- if (unlikely(IVPU_DBG_##type & ivpu_dbg_mask)) \
- dev_dbg((vdev)->drm.dev, "[%s] " fmt, #type, ##args); \
-} while (0)
-
#define IVPU_WA(wa_name) (vdev->wa.wa_name)
#define IVPU_PRINT_WA(wa_name) do { \
@@ -208,7 +242,6 @@ struct ivpu_file_priv {
bool aborted;
};
-extern int ivpu_dbg_mask;
extern u8 ivpu_pll_min_ratio;
extern u8 ivpu_pll_max_ratio;
extern int ivpu_sched_mode;
--
2.53.0
next prev parent reply other threads:[~2026-03-13 13:25 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-13 13:19 [PATCH v11 00/65] Fix DRM_USE_DYNAMIC_DEBUG=y Jim Cromie
2026-03-13 13:19 ` [PATCH v11 01/65] dyndbg: fix NULL ptr on i386 due to section alignment Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 02/65] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 03/65] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 04/65] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 05/65] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 06/65] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 07/65] dyndbg: reword "class unknown, " to "class:_UNKNOWN_" Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 08/65] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 09/65] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 10/65] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 11/65] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 12/65] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 13/65] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 14/65] dyndbg: replace classmap list with a vector Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 15/65] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 16/65] dyndbg, module: make proper substructs in _ddebug_info Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 17/65] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 18/65] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 19/65] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 20/65] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 21/65] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 22/65] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 23/65] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 24/65] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 25/65] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 26/65] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 27/65] dyndbg: treat comma as a token separator Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 28/65] dyndbg: split multi-query strings with % Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 29/65] selftests-dyndbg: add test_mod_submod Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 30/65] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 31/65] dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 32/65] dyndbg: Harden classmap and callsite validation Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 33/65] docs/dyndbg: add classmap info to howto Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:19 ` [PATCH v11 34/65] drm: use correct ccflags-y spelling Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 35/65] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 36/65] drm-dyndbg: adapt DRM to invoke DYNAMIC_DEBUG_CLASSMAP_PARAM Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 37/65] drm-print: modernize an archaic comment Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 38/65] drm-print: fix config-dependent unused variable Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 39/65] drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 40/65] drm-dyndbg: DRM_CLASSMAP_USE in i915 driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 41/65] drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper Jim Cromie
2026-03-13 13:20 ` [PATCH v11 42/65] drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper Jim Cromie
2026-03-13 13:20 ` [PATCH v11 43/65] drm-dyndbg: DRM_CLASSMAP_USE in nouveau Jim Cromie
2026-03-13 13:20 ` [PATCH v11 44/65] drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 45/65] drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu Jim Cromie
2026-03-13 13:20 ` [PATCH v11 46/65] drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm Jim Cromie
2026-03-13 13:20 ` [PATCH v11 47/65] drm-dyndbg: add DRM_CLASSMAP_USE to bochs Jim Cromie
2026-03-13 13:20 ` [PATCH v11 48/65] drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv Jim Cromie
2026-03-13 13:20 ` [PATCH v11 49/65] drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 50/65] drm-dyndbg: add DRM_CLASSMAP_USE to radeon Jim Cromie
2026-03-13 13:20 ` [PATCH v11 51/65] drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 52/65] drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 53/65] drm-dyndbg: add DRM_CLASSMAP_USE to udl driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 54/65] drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 55/65] drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 56/65] drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 57/65] drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver Jim Cromie
2026-03-13 13:20 ` [PATCH v11 58/65] accel: add -DDYNAMIC_DEBUG_MODULE to subdir-ccflags Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` Jim Cromie [this message]
2026-03-13 21:00 ` Claude review: accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 60/65] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 61/65] accel/ethosu: enable drm.debug control Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 62/65] accel/rocket: " Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 63/65] drm_buddy: fix 64-bit truncation in power-of-2 rounding Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 64/65] drm_print: fix drm_printer dynamic debug bypass Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 13:20 ` [PATCH v11 65/65] drm_vblank: use dyndbg's static-key to avoid flag-check Jim Cromie
2026-03-13 21:00 ` Claude review: " Claude Code Review Bot
2026-03-13 21:00 ` Claude review: Fix DRM_USE_DYNAMIC_DEBUG=y Claude Code Review Bot
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=20260313132103.2529746-60-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=airlied@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arunpravin.paneerselvam@amd.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jbaron@akamai.com \
--cc=karol.wachowski@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=maciej.falkowski@linux.intel.com \
--cc=matthew.auld@intel.com \
--cc=mripard@kernel.org \
--cc=ogabbay@kernel.org \
--cc=pmladek@suse.com \
--cc=simona@ffwll.ch \
--cc=skhan@linuxfoundation.org \
--cc=tzimmermann@suse.de \
--cc=ukaszb@chromium.org \
--cc=ville.syrjala@linux.intel.com \
/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