From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2B2BAECD6FC for ; Thu, 12 Feb 2026 00:14:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C48B10E683; Thu, 12 Feb 2026 00:14:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="IEO0prVH"; dkim-atps=neutral Received: from mail-oa1-f65.google.com (mail-oa1-f65.google.com [209.85.160.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 658B510E683 for ; Thu, 12 Feb 2026 00:14:32 +0000 (UTC) Received: by mail-oa1-f65.google.com with SMTP id 586e51a60fabf-408778a8ec4so2136104fac.0 for ; Wed, 11 Feb 2026 16:14:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770855271; x=1771460071; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VEBnRunXsCjl4bvme/TgZYLDCtPqOXrQ3imXhV6MLHw=; b=IEO0prVHHhdnuD/c+2AVz/jEVsEvIDy8asesgbHLZ9wq1W2BO0jrb0RmIIuQr0hcvL TAXDuh/TRQeJiRHg/AwN3Cu3OOKuuXcNDdlq9RRryrnog60Kw6t5NrHjBLU20tUnGWLC La7tfFc7at2YY1IUXrlYz4nKxW5s0Tz1w5wrftle9SXfOGA+umMpgldR2VZ3KAJ0CDS6 SWu/NSvqb2j1Fe6BksQuas/Yc9eBL8QDfzVWl/u39/IqlREkws5sADYN8UpUK/SaYKpi VEnVxLqy2pd2xunb3CP9EH/Xa1j7pqcaZ2i7JB4mT7DfigrLB4kml+kF6wmRd3QMF8m1 1w8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770855271; x=1771460071; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VEBnRunXsCjl4bvme/TgZYLDCtPqOXrQ3imXhV6MLHw=; b=sQNbZzbn1PjmBBjOR/6mBuBA5NauzoqeX2BjuLr5PqNuSN7e0qqxPu0R0LyI+wlCtJ WBApN5qspPCVMZKhZm7GsrltujNbZ9WCoLLNFmxlwWGcOHbgl8y2W5pUv6U44+Wosai3 qTzXRZPSXMvminjgWokBrYnKKV010jcHFenKZ63wZQ8K/kpD/xiETVSua0JkFf/b0Snl 94ayoWwyuWacxHINh1ErjIWz/MZI1PTVRKjg/Lrr+GodE2Yv1lrshncA/NtGa15mDvdj jZ1gWYoqo+gvc6SLHBETQFjShEQSHFRAd384NSULrum9XvPn1+bOoLqK6ijLwGbzuS6S xVEA== X-Gm-Message-State: AOJu0Yxig9+zXLdmeCS36HzL5rpJ6h3nVP4UNlpQxcreulfFAYs4ZABA GMgRqBMM5sWuEuWZmki5icv+N3g0BlE0yk9L+AsZGFAYdAcfNBclLAEMsSWLKsYT X-Gm-Gg: AZuq6aJPaEY/FhI8emJbP1QXbd0/kEFME6NPsnpFqeNolEKAcsO8cmFsgwyk6x0pgHz v410wRDN2Ye1PFBDdvkd22fZp7l3byuLeB8KJE4t0A1G31KP2Mq83lhr67TDHKcDPIhkx78HRZD db6w2LnQjAcT0Pc/rd9LWgAJ1SOu/M4IkP8sdBOU0n3k5NnG03WtWaw7+0BxzCjPlDjTUooraYn LPvChp9rSpPZ508JXYM14p5NgFrxq4L/oXjKguNNeQCxDgmiQvcw386KCMKXE4fDzN9di6LuXRc q/7bvoN2SySaoyoN/E0RyNIYzFMdhuvigJGEWARgucnU8pv8OR/0vZyRf0AG72/JNGf7LRwDluS gz1dRKczcwGU4+6aQKkdZRJteEWUHWGvv5mM4Cuccq4EYRh7iCBn3knjFrtYHP/NF/piESWlR9n kxZxWe5IQPSG8+6FqvcBDw0anUSJOu4pByCGnhoWJ3H6n+gfdJSbgT X-Received: by 2002:a05:6870:9504:b0:3ec:4bcc:b358 with SMTP id 586e51a60fabf-40eca2ff658mr338412fac.45.1770855271351; Wed, 11 Feb 2026 16:14:31 -0800 (PST) Received: from godzilla (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-40eaf1062ffsm2331939fac.13.2026.02.11.16.14.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 16:14:30 -0800 (PST) From: Jim Cromie To: dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org Cc: Jim Cromie , Louis Chauvet Subject: [PATCH 18/61] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Date: Wed, 11 Feb 2026 17:13:13 -0700 Message-ID: <20260212001359.97296-19-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260212001359.97296-18-jim.cromie@gmail.com> References: <20260212001359.97296-1-jim.cromie@gmail.com> <20260212001359.97296-2-jim.cromie@gmail.com> <20260212001359.97296-3-jim.cromie@gmail.com> <20260212001359.97296-4-jim.cromie@gmail.com> <20260212001359.97296-5-jim.cromie@gmail.com> <20260212001359.97296-6-jim.cromie@gmail.com> <20260212001359.97296-7-jim.cromie@gmail.com> <20260212001359.97296-8-jim.cromie@gmail.com> <20260212001359.97296-9-jim.cromie@gmail.com> <20260212001359.97296-10-jim.cromie@gmail.com> <20260212001359.97296-11-jim.cromie@gmail.com> <20260212001359.97296-12-jim.cromie@gmail.com> <20260212001359.97296-13-jim.cromie@gmail.com> <20260212001359.97296-14-jim.cromie@gmail.com> <20260212001359.97296-15-jim.cromie@gmail.com> <20260212001359.97296-16-jim.cromie@gmail.com> <20260212001359.97296-17-jim.cromie@gmail.com> <20260212001359.97296-18-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" struct _ddebug_info already has most of dyndbg's info for a module; push debug_table.mod_name down into it, finishing the encapsulation. This allows refactoring several callchains, passing &_ddebug_info instead of &ddebug_table, and hoisting the "&dt->info" deref up instead of repeating it thru the callchans ddebug_table contains a _ddebug_info member, so its users keep access to mod_name, just now with "->info." added in. In static ddebug_add_module(&di), reinforce the cursor-model by dropping the modname arg, and setting di->mod_name at each caller. Reviewed-by: Louis Chauvet Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 1 + lib/dynamic_debug.c | 50 ++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index b84518b70a6e..34dbca0beaf8 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -108,6 +108,7 @@ struct _ddebug_class_maps { }; struct _ddebug_info { + const char *mod_name; struct _ddebug_descs descs; struct _ddebug_class_maps maps; }; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c2c450e3daa3..eb33b6c8d765 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -46,7 +46,6 @@ extern struct _ddebug_class_map __stop___dyndbg_class_maps[]; struct ddebug_table { struct list_head link; - const char *mod_name; struct _ddebug_info info; }; @@ -254,10 +253,11 @@ static int ddebug_change(const struct ddebug_query *query, /* search for matching ddebugs */ mutex_lock(&ddebug_lock); list_for_each_entry(dt, &ddebug_tables, link) { + struct _ddebug_info *di = &dt->info; /* match against the module name */ if (query->module && - !match_wildcard(query->module, dt->mod_name)) + !match_wildcard(query->module, di->mod_name)) continue; if (query->class_string) { @@ -269,8 +269,8 @@ static int ddebug_change(const struct ddebug_query *query, valid_class = _DPRINTK_CLASS_DFLT; } - for (i = 0; i < dt->info.descs.len; i++) { - struct _ddebug *dp = &dt->info.descs.start[i]; + for (i = 0; i < di->descs.len; i++) { + struct _ddebug *dp = &di->descs.start[i]; if (!ddebug_match_desc(query, dp, valid_class)) continue; @@ -290,7 +290,7 @@ static int ddebug_change(const struct ddebug_query *query, #endif v4pr_info("changed %s:%d [%s]%s %s => %s\n", trim_prefix(dp->filename), dp->lineno, - dt->mod_name, dp->function, + di->mod_name, dp->function, ddebug_describe_flags(dp->flags, &fbuf), ddebug_describe_flags(newflags, &nbuf)); dp->flags = newflags; @@ -1157,12 +1157,12 @@ static bool ddebug_class_in_range(const int class_id, const struct _ddebug_class class_id < map->base + map->length); } -static const char *ddebug_class_name(struct ddebug_table *dt, struct _ddebug *dp) +static const char *ddebug_class_name(struct _ddebug_info *di, struct _ddebug *dp) { struct _ddebug_class_map *map; int i; - for_subvec(i, map, &dt->info, maps) + for_subvec(i, map, di, maps) if (ddebug_class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; @@ -1190,13 +1190,13 @@ static int ddebug_proc_show(struct seq_file *m, void *p) seq_printf(m, "%s:%u [%s]%s =%s \"", trim_prefix(dp->filename), dp->lineno, - iter->table->mod_name, dp->function, + iter->table->info.mod_name, dp->function, ddebug_describe_flags(dp->flags, &flags)); seq_escape_str(m, dp->format, ESCAPE_SPACE, "\t\r\n\""); seq_putc(m, '"'); if (dp->class_id != _DPRINTK_CLASS_DFLT) { - class = ddebug_class_name(iter->table, dp); + class = ddebug_class_name(&iter->table->info, dp); if (class) seq_printf(m, " class:%s", class); else @@ -1248,7 +1248,7 @@ static const struct proc_ops proc_fops = { static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) { - vpr_info("module:%s attached %d classes\n", dt->mod_name, dt->info.maps.len); + vpr_info("module:%s attached %d classes\n", dt->info.mod_name, dt->info.maps.len); } /* @@ -1266,7 +1266,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug typeof(_dst) __dst = (_dst); \ int __nc = 0; \ for_subvec(_i, _sp, _box, _vec) { \ - if (!strcmp((_sp)->mod_name, (_dst)->mod_name)) { \ + if (!strcmp((_sp)->mod_name, (__dst)->info.mod_name)) { \ if (!__nc++) \ (__dst)->info._vec.start = (_sp); \ } else { \ @@ -1281,7 +1281,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug * Allocate a new ddebug_table for the given module * and add it to the global list. */ -static int ddebug_add_module(struct _ddebug_info *di, const char *modname) +static int ddebug_add_module(struct _ddebug_info *di) { struct ddebug_table *dt; struct _ddebug_class_map *cm; @@ -1290,20 +1290,19 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) if (!di->descs.len) return 0; - v3pr_info("add-module: %s %d sites\n", modname, di->descs.len); + v3pr_info("add-module: %s %d sites\n", di->mod_name, di->descs.len); dt = kzalloc(sizeof(*dt), GFP_KERNEL); if (dt == NULL) { - pr_err("error adding module: %s\n", modname); + pr_err("error adding module: %s\n", di->mod_name); return -ENOMEM; } /* - * For built-in modules, name lives in .rodata and is - * immortal. For loaded modules, name points at the name[] - * member of struct module, which lives at least as long as - * this struct ddebug_table. + * For built-in modules, name (as supplied in di by its + * callers) lives in .rodata and is immortal. For loaded + * modules, name points at the name[] member of struct module, + * which lives at least as long as this struct ddebug_table. */ - dt->mod_name = modname; dt->info = *di; INIT_LIST_HEAD(&dt->link); @@ -1317,7 +1316,7 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); - vpr_info("%3u debug prints in module %s\n", di->descs.len, modname); + vpr_info("%3u debug prints in module %s\n", di->descs.len, di->mod_name); return 0; } @@ -1380,7 +1379,7 @@ static int ddebug_remove_module(const char *mod_name) mutex_lock(&ddebug_lock); list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) { - if (dt->mod_name == mod_name) { + if (dt->info.mod_name == mod_name) { ddebug_table_free(dt); ret = 0; break; @@ -1400,7 +1399,8 @@ static int ddebug_module_notify(struct notifier_block *self, unsigned long val, switch (val) { case MODULE_STATE_COMING: - ret = ddebug_add_module(&mod->dyndbg_info, mod->name); + mod->dyndbg_info.mod_name = mod->name; + ret = ddebug_add_module(&mod->dyndbg_info); if (ret) WARN(1, "Failed to allocate memory: dyndbg may not work properly.\n"); break; @@ -1498,7 +1498,8 @@ static int __init dynamic_debug_init(void) mod_ct++; di.descs.len = mod_sites; di.descs.start = iter_mod_start; - ret = ddebug_add_module(&di, modname); + di.mod_name = modname; + ret = ddebug_add_module(&di); if (ret) goto out_err; @@ -1509,7 +1510,8 @@ static int __init dynamic_debug_init(void) } di.descs.len = mod_sites; di.descs.start = iter_mod_start; - ret = ddebug_add_module(&di, modname); + di.mod_name = modname; + ret = ddebug_add_module(&di); if (ret) goto out_err; -- 2.53.0