From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 002E33630AC for ; Sat, 23 May 2026 07:15:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779520539; cv=none; b=IRSKH38AGNMiPY2Bbt+8wpk7mbgw0acVBCag/coqMa3USRdHCLrhoCQPh6ZsTiNiZ3dyZvoRjIUOM4F5twzK3YfD9oR64YvSki1TfuWLNuo9lrRR3r4Ia1Tf0gB+z2ds/xJgVFIuqKYYF+VdFhojT5Wt4WQPU7TrYxJRVnQhCpk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779520539; c=relaxed/simple; bh=fPmKvI6NbniJByc2FBVS00QxE4c6I3lmAwyQxA2t6uk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sJfs/9ITUzbmhfCzowOD+q5y85ZZEqa68y6DSvB1+qaH8yvptCVnnP/OrGXAh7aMTtu1hX969sOQ2njuOxVHFGDiaUOuTXABVLkXZAx6XFGZOXh2BbDKsexC3MZDvWkB1vl4C9xfmy8mXQy/wuLP38crXCMy/B8rIp6YX3UaS4s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZGw0uzzX; arc=none smtp.client-ip=209.85.221.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZGw0uzzX" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-45297094718so6267690f8f.3 for ; Sat, 23 May 2026 00:15:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779520535; x=1780125335; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ISSGZRpyMR72C6f36Ix88YVeWGG0f7DiWTu+/JHvX5k=; b=ZGw0uzzXJseW9jWyEdl14KCvMkKWOu0kHtBlYOd+OKUuriIHGpHJglNlnnul4n7Uu8 cIKZjxXtIUJwOkrYs3UrtqIkPCVG3gAMoHIR8nNAatpiEg4hIZf5YemJ9qwlHL65SzhF 9DYNOsRp0QLQTmP/bbKOD6FXRSnLAp7QrYn9uZbyyuqe4KyfV5BHQn+J2hISdeAz7mBd /2KoTm8yYhKkviMc5GyTNjWvRFSFhsvb6PKcBZy1AUWz7HUNrSwxR9PpSXszWqmpt5ib s2UAVftaerAk8vkMKOTABsT22CmGpO7B9JuoijtAlLygAnN9LVcKPO3Mkegt9xBwL3Lf 5Acw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779520535; x=1780125335; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ISSGZRpyMR72C6f36Ix88YVeWGG0f7DiWTu+/JHvX5k=; b=f5f62Pn0tVat6eQwr+EfcsY+NiMNqxNruSDywXse/WlQL8p9nkBJ9Vkuro75ZtwcGD VUcEDoYSRe2xV3O2IsiRj2tQKNxu8iedf+BCDMGM3UJVQRnErTJfjXhV9iEl/2MGQ2cG CdgdKLjScXxCMeYDdvhtSjLfUacqeYpaw9PXBDkeLG0jtxz0s9+24ibE1V9qKqVKsqom MeDArPIGMprdD7AJaXgNT/NRgzQ/r9MSGUJx6p4M3TxWJKigAMXnwJMW+5x32uxXCf6z kDIVUd69hjeBelEmuxHrE5uPxton14JNRnAGVai2jnGFlxoAyjMTcWWhthzCQSt/UXrp yBCw== X-Forwarded-Encrypted: i=1; AFNElJ8s3NicQ65joVtp1qRWjNWzzMzXWBLQZNZWrg8qTXVT42zL71yBeysu0CzAu3DHQYT4Z4XA8xntBmKeQyc=@vger.kernel.org X-Gm-Message-State: AOJu0YyGQX24Quo755A9c3fgs+hcmH4g8G2DGOyHll9FRpnYNgKBesNZ RQ9ZEBZ66ge9/R1XUgVilEu8PE/S1o4itbdRSX4uc8Dzyr8Qc99zNRw+ X-Gm-Gg: Acq92OFNikSYPp3qyFIDVR3dPfQFrkKhPu931NVi8lpaTvw+kyXNTKd20Cu2qfEaeUg pyiMwr894SWL9a7Of8yOj8yBqL/eStzQj22zMqG/nVBEUpODvmoHvx7FHSox+yBJ3FTX2ju3SVe nkNuMzZVhp6qOoLJI/9VkHpANh4H4CkFWwge3jmeUn/ulONVGtbrEh7fo2w/GZ0Wq4ReBhGd+X6 hOOiGHT3UqELtIg8zGmlyT+VXYLuZz5yZ3G8Vrov3RtbsHuydmkON9ibQOF2Yl53r5grYDedYYK ROxVsgNUkbv0/konwX/9Fu2S9gQS75Sg8HX+i/j87rFIZpN52RBRNPzajc6BkJqbST+YSFqgohw C8fBVryYpnWMvKIs1LTtP5jyJz4dWMAFY8i9wOpXCXLjAPDT1uYlwjY9m8+6RSW1A4xnrRcgIpz C1fu/YzXIaiuAMgPJT8gG4pl7pZvFVt1NVHL8KdU4= X-Received: by 2002:a05:6000:4283:b0:43d:50c:6f33 with SMTP id ffacd0b85a97d-45eb38badbcmr11064502f8f.26.1779520535190; Sat, 23 May 2026 00:15:35 -0700 (PDT) Received: from [192.168.0.174] ([31.96.183.250]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-45eb6d5cb76sm8639838f8f.25.2026.05.23.00.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 May 2026 00:15:34 -0700 (PDT) From: Jim Cromie Date: Sat, 23 May 2026 01:14:53 -0600 Subject: [PATCH v2 20/24] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260523-dd-maint-2-v2-20-b937312aa083@gmail.com> References: <20260523-dd-maint-2-v2-0-b937312aa083@gmail.com> In-Reply-To: <20260523-dd-maint-2-v2-0-b937312aa083@gmail.com> To: Jonathan Corbet , Shuah Khan , Arnd Bergmann , Jason Baron , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Andrew Morton , Shuah Khan Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, linux-kselftest@vger.kernel.org, Jim Cromie , Louis Chauvet X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1779520485; l=7729; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=fPmKvI6NbniJByc2FBVS00QxE4c6I3lmAwyQxA2t6uk=; b=dj2YmW0Mwtnd1FmOtaz+swCbQ/Q8ZmY76fe/dXtWBD89JfjZBoBXvxghPtRegu3RSBtOwIC2z t0veVV7lCIWBMNZ5cNlRyM6eU3fkGnR+w7Xm4wxdt79YXFpDQmLmUPW X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= 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. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- v2: move RvB after SoB old-v12 . moved up 1 position in series, ahead of hoist... --- 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 001bc84eadca..11ec40f488f3 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -97,6 +97,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 169b94ff6f8e..4a9b9bc9efc5 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -47,7 +47,6 @@ extern struct _ddebug_class_map __stop___dyndbg_classes[]; struct ddebug_table { struct list_head link; - const char *mod_name; struct _ddebug_info info; }; @@ -246,10 +245,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) { @@ -261,8 +261,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; @@ -282,7 +282,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; @@ -1077,12 +1077,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]; @@ -1110,13 +1110,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 @@ -1177,7 +1177,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug * and length of the subrange at its edges. */ for_subvec(i, cm, di, maps) { - if (!strcmp(cm->mod_name, dt->mod_name)) { + if (!strcmp(cm->mod_name, dt->info.mod_name)) { if (!nc) { v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n", i, cm->mod_name, cm->base, cm->length, cm->map_type); @@ -1191,7 +1191,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug } if (nc) { dt->info.maps.len = nc; - vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); + vpr_info("module:%s attached %d classes\n", dt->info.mod_name, nc); } } @@ -1199,27 +1199,26 @@ 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; 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_obj(*dt); 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); @@ -1231,7 +1230,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; } @@ -1294,7 +1293,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; @@ -1314,7 +1313,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; @@ -1412,7 +1412,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; @@ -1423,7 +1424,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.54.0