mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jim Cromie <jim.cromie@gmail.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Cc: "Jim Cromie" <jim.cromie@gmail.com>,
	"Jason Baron" <jbaron@akamai.com>,
	"Łukasz Bartosik" <ukaszb@chromium.org>,
	"Louis Chauvet" <louis.chauvet@bootlin.com>,
	"Bagas Sanjaya" <bagasdotme@gmail.com>,
	"Dave Airlie" <airlied@gmail.com>,
	"Daniel Vetter" <daniel@ffwll.ch>,
	"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
	"Maxime Ripard" <mripard@kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse.de>,
	dri-devel@lists.freedesktop.org, "Petr Mladek" <pmladek@suse.com>,
	"Shuah Khan" <skhan@linuxfoundation.org>,
	linux-doc@vger.kernel.org, "Steven Rostedt" <rostedt@goodmis.org>,
	"Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v8 30/31] dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset)
Date: Tue, 13 Jan 2026 18:57:46 -0700	[thread overview]
Message-ID: <20260114015815.1565725-31-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260114015815.1565725-1-jim.cromie@gmail.com>

Allow a module to use 2 classmaps together that would otherwise have a
class_id range conflict.

Suppose a drm-driver does:

  DYNAMIC_DEBUG_CLASSMAP_USE(drm_debug_classes);
  DYNAMIC_DEBUG_CLASSMAP_USE(drm_accel_xfer_debug);

If (for some reason) drm-accel will not define their constants to
avoid DRM's 0..10 reservations, we have a reserved-ids conflict.  This
seems unlikely.

I don't think this potential conflict would become an issue until we
have at least a 3-X-3 of classmap-defns X classmap-users.

This is an untested interface extension, so drop this patch if it
feels too speculative, knowing theres at least a notional solution
should the situation arise.

Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
 include/linux/dynamic_debug.h | 27 ++++++++++++++++++++++-----
 lib/dynamic_debug.c           | 19 ++++++++++++-------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 315050507fd3..1ec5d8a44deb 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -87,7 +87,7 @@ struct _ddebug_class_map {
 struct _ddebug_class_user {
 	char *mod_name;
 	struct _ddebug_class_map *map;
-	const int offset;	/* user offset to re-number the used map */
+	const int offset;	/* offset from map->base */
 };
 
 /*
@@ -238,11 +238,28 @@ struct _ddebug_class_param {
  *
  * This tells dyndbg that the module has prdbgs with classids defined
  * in the named classmap.  This qualifies "class NAME" >controls on
- * the user module, and ignores unknown names.
+ * the user module, and ignores unknown names. This is a wrapper for
+ * DYNAMIC_DEBUG_CLASSMAP_USE_() with a base offset of 0.
  */
-#define DYNAMIC_DEBUG_CLASSMAP_USE(_var)				\
-	DYNAMIC_DEBUG_CLASSMAP_USE_(_var, 0, __UNIQUE_ID(_ddebug_class_user))
-#define DYNAMIC_DEBUG_CLASSMAP_USE_(_var, _offset, _uname)		\
+#define DYNAMIC_DEBUG_CLASSMAP_USE(_var) \
+	DYNAMIC_DEBUG_CLASSMAP_USE_(_var, 0)
+
+/**
+ * DYNAMIC_DEBUG_CLASSMAP_USE_ - refer to a classmap with a manual offset.
+ * @_var:   name of the exported classmap var to use.
+ * @_offset:  an integer offset to add to the class IDs of the used map.
+ *
+ * This is an extended version of DYNAMIC_DEBUG_CLASSMAP_USE(). It should
+ * only be used to resolve class ID conflicts when a module uses multiple
+ * classmaps that have overlapping ID ranges.
+ *
+ * The final class IDs for the used map will be calculated as:
+ * original_map_base + class_index + @_offset.
+ */
+#define DYNAMIC_DEBUG_CLASSMAP_USE_(_var, _offset)			\
+	__DYNAMIC_DEBUG_CLASSMAP_USE(_var, _offset, __UNIQUE_ID(_ddebug_class_user))
+
+#define __DYNAMIC_DEBUG_CLASSMAP_USE(_var, _offset, _uname)		\
 	extern struct _ddebug_class_map _var;				\
 	static struct _ddebug_class_user __aligned(8) __used		\
 	__section("__dyndbg_class_users") _uname = {			\
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index f60a723a441b..b0da3dd4ac44 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -198,7 +198,7 @@ ddebug_find_valid_class(struct _ddebug_info const *di, const char *query_class,
 		if (idx >= 0) {
 			vpr_di_info(di, "class-ref: %s -> %s.%s ",
 				    cli->mod_name, cli->map->mod_name, query_class);
-			*class_id = idx + cli->map->base;
+			*class_id = idx + cli->map->base - cli->offset;
 			return cli->map;
 		}
 	}
@@ -206,12 +206,17 @@ ddebug_find_valid_class(struct _ddebug_info const *di, const char *query_class,
 	return NULL;
 }
 
-static bool ddebug_class_in_range(const int class_id, const struct _ddebug_class_map *map)
+static bool ddebug_class_map_in_range(const int class_id, const struct _ddebug_class_map *map)
 {
 	return (class_id >= map->base &&
 		class_id < map->base + map->length);
 }
 
+static bool ddebug_class_user_in_range(const int class_id, const struct _ddebug_class_user *user)
+{
+	return ddebug_class_map_in_range(class_id - user->offset, user->map);
+}
+
 static struct _ddebug_class_map *
 ddebug_find_map_by_class_id(struct _ddebug_info *di, int class_id)
 {
@@ -220,11 +225,11 @@ ddebug_find_map_by_class_id(struct _ddebug_info *di, int class_id)
 	int i;
 
 	for_subvec(i, map, di, maps)
-		if (ddebug_class_in_range(class_id, map))
+		if (ddebug_class_map_in_range(class_id, map))
 			return map;
 
 	for_subvec(i, cli, di, users)
-		if (ddebug_class_in_range(class_id, cli->map))
+		if (ddebug_class_user_in_range(class_id, cli))
 			return cli->map;
 
 	return NULL;
@@ -1177,12 +1182,12 @@ static const char *ddebug_class_name(struct _ddebug_info *di, struct _ddebug *dp
 	int i;
 
 	for_subvec(i, map, di, maps)
-		if (ddebug_class_in_range(dp->class_id, map))
+		if (ddebug_class_map_in_range(dp->class_id, map))
 			return map->class_names[dp->class_id - map->base];
 
 	for_subvec(i, cli, di, users)
-		if (ddebug_class_in_range(dp->class_id, cli->map))
-			return cli->map->class_names[dp->class_id - cli->map->base];
+		if (ddebug_class_user_in_range(dp->class_id, cli))
+			return cli->map->class_names[dp->class_id - cli->map->base - cli->offset];
 
 	return NULL;
 }
-- 
2.52.0


  parent reply	other threads:[~2026-01-14  2:00 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-01-14  1:57 [PATCH v8 00/31] dyndbg: fix dynamic-debug regression in DRM Jim Cromie
2026-01-14  1:57 ` [PATCH v8 01/31] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-01-14  1:57 ` [PATCH v8 02/31] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-01-14  1:57 ` [PATCH v8 03/31] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-01-14  1:57 ` [PATCH v8 04/31] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-01-14  1:57 ` [PATCH v8 05/31] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-01-14  1:57 ` [PATCH v8 06/31] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-01-14  1:57 ` [PATCH v8 07/31] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-01-14  1:57 ` [PATCH v8 08/31] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-01-14  1:57 ` [PATCH v8 09/31] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-01-14  1:57 ` [PATCH v8 10/31] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-01-14  1:57 ` [PATCH v8 11/31] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-01-14  1:57 ` [PATCH v8 12/31] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-01-14  1:57 ` [PATCH v8 13/31] dyndbg: replace classmap list with a vector Jim Cromie
2026-01-14  1:57 ` [PATCH v8 14/31] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-01-14  1:57 ` [PATCH v8 15/31] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-01-14  1:57 ` [PATCH v8 16/31] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-01-14  1:57 ` [PATCH v8 17/31] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-01-14  1:57 ` [PATCH v8 18/31] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-01-14  1:57 ` [PATCH v8 19/31] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-01-14  1:57 ` [PATCH v8 20/31] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-01-14  1:57 ` [PATCH v8 21/31] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-01-14  1:57 ` [PATCH v8 22/31] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-01-14  1:57 ` [PATCH v8 23/31] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2026-01-14  1:57 ` [PATCH v8 24/31] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-01-14  1:57 ` [PATCH v8 25/31] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-01-14  1:57 ` [PATCH v8 26/31] dyndbg: treat comma as a token separator Jim Cromie
2026-01-14  1:57 ` [PATCH v8 27/31] dyndbg: split multi-query strings with % Jim Cromie
2026-01-14  1:57 ` [PATCH v8 28/31] selftests-dyndbg: add test_mod_submod Jim Cromie
2026-01-14  1:57 ` [PATCH v8 29/31] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-01-14  1:57 ` Jim Cromie [this message]
2026-01-14  1:57 ` [PATCH v8 31/31] docs/dyndbg: add classmap info to howto Jim Cromie

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=20260114015815.1565725-31-jim.cromie@gmail.com \
    --to=jim.cromie@gmail.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=airlied@gmail.com \
    --cc=bagasdotme@gmail.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jbaron@akamai.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=louis.chauvet@bootlin.com \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=pmladek@suse.com \
    --cc=rostedt@goodmis.org \
    --cc=skhan@linuxfoundation.org \
    --cc=tzimmermann@suse.de \
    --cc=ukaszb@chromium.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

all inboxes | Powered by JetHome®