From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f65.google.com (mail-oa1-f65.google.com [209.85.160.65]) (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 7A1A837AA6F for ; Thu, 29 Jan 2026 07:30:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769671836; cv=none; b=KtJaj0xSDc75qCYyqOLnhJhIrBE+o47cVikB2XYb4vwpgzaJYfk+IUP26a6zdeU7NJfMoqLdsmhXhzD1Wf/8AiaNpFUp+4AuLUgLpfTzd/ldO0QiWT/LamlhEHMtQz63K3G0QZssDhuoJs6/JMGWTKbAGZ8gCeLQoKPO2dEI5+E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769671836; c=relaxed/simple; bh=+noFMMeoVQTNCC20PtF7baeyfGXfEyE9U/3GJVWDCaE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oUd8yBcWHw2eiRnKAp6lZ82usxl1bqq2f/z4dOEV314ZTmBjhxz7e8cF6NYk2ipbhBUk2k5CmpDw6x+5A8eYc53p9EydMAf6ke9ed7nEJTazaIyk1Tldy3udwsvrxC3vBB5r+vD/UrjOH137SBVn0jT/yYeUaJEOeGlDHUfSQBQ= 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=QT95KnLi; arc=none smtp.client-ip=209.85.160.65 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="QT95KnLi" Received: by mail-oa1-f65.google.com with SMTP id 586e51a60fabf-40866608701so371263fac.1 for ; Wed, 28 Jan 2026 23:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769671833; x=1770276633; darn=vger.kernel.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=6XYGWEQDDpq1BPrO/cjHEBRzLH2VgSqU7+u/50KvOr8=; b=QT95KnLi4Khyy7cXvZtfYXmRcMfWJp+4SugctMHjutWKERrcRu0HvnsZq7NVttP8PT KTpfQl5B4Vs/YcKPse6SHUkJegMdCsqgdVIq8Ljt84lu2JP3EtBz80+XK/XLGj6k32pZ 0M8AZd7y6iEMS9vpcdIc4E3k5jf+aBl+/W4YITJQLH/iV5GJ/uI51df3Abm+hGhV0RuE JNvyrwrFkZ3ZiobRzBgAgj5A69kZAUMVpTWJo6fVqJBO5YqLjzTZnwC7C2ipMwhFB5kM hLimVUU0JLCubB8cw6df5ifbBQ4aKWlFB1UmBsd8+sjotIQf0OaMdvO1EMAarUoTMFfq Rq3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769671833; x=1770276633; 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=6XYGWEQDDpq1BPrO/cjHEBRzLH2VgSqU7+u/50KvOr8=; b=f8pDVZKE7e/WAHqnYlZtFNeP8dTFQZb6DfDilV2oh65OPgA4hxJT9Y+dv/y0tU7tco gCA4SbT4voq3sbpHQYVF8ba6p6r6n/8pfUjjH3ydZFIWn4PsBqBI96NwRPtOQrpWWZlN H4NFJ/F+UeznCasZiTom5XdeavuTFT2pTeANrQ154cFzaYjznVuF6OdGC22zEyzQh+Ry PXohL4meCuMUICbEYiUsRIatwWxeeAhvx9u0lbXAjG8zZ3qmomdIzho4tvI2LQne7ZFm /scqroYh0nwFDYGskB7UDuvbv18mpr54ldPGchYirpXJaVdsehiWtBG/krvKkDuMbR4W xJ4g== X-Forwarded-Encrypted: i=1; AJvYcCUoQVnvHWWyBng5zAek4F6jhKAH5eWhmxuxCM42L1wK60nXENcuavS3gBaWOjJcRMZ9A54QED2iXNYTFc0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy3nmLAYSjMY0t60A/msTJEadff5pqw8sJpta41dbZvoZ/hXrXg 76U2/FHun2AaktM/8KjSpzp1gBSpSCd+4rldqswmP3QjF2mox8fM0Flq X-Gm-Gg: AZuq6aKDP8oseHHjJf+fo/EF1o1f+3Cw714S256Im7qRrCH2eNBkH2GByY8zcQN3OHG R6CyCBegSQR4fPrkIElXJCTWmfFCq5TcyeYxARwP3u5UJ7JOxwcjnvShNbzmkPtoON5mL9UZB4P F7+ZxZnqsteBgm4uLk3okFPoMMY1KBxi1tnFnPSbrGwuzy+rWvJK8EfHen6J1kLCGwDbcHvY/M/ fJ5BuCiO/dRPQnQ8JmqKOsG3sO9Emhu5rQ7b92ATND50jq6f69r4nOqdjUJdktN4TJjN//4xhdv N/PiR3cWZe8p8+zz7+sKxfdd6Ox1U8ebyI8Ss/hch04vFsA27DyEt6q02QgtjOdB/7wfiiAq7JE BuROBir71ifGkNmS33KDDXHkeUGtIa1K+fIsYvmYpqEGjckT1y3KdRDOMxEY0wsSsWlbRyPou54 JJHv0NEjsV4Cl4xHAM2idgBQk/DUglIy3KRUOXDBHk/mC5vstdW9s= X-Received: by 2002:a05:6820:4812:b0:662:fb28:21ec with SMTP id 006d021491bc7-662fb28267amr2377879eaf.72.1769671833231; Wed, 28 Jan 2026 23:30:33 -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 006d021491bc7-662f9a1a876sm2793260eaf.10.2026.01.28.23.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 23:30:32 -0800 (PST) From: Jim Cromie To: gregkh@linuxfoundation.org Cc: Jim Cromie , Jason Baron , =?UTF-8?q?=C5=81ukasz=20Bartosik?= , Louis Chauvet , Bagas Sanjaya , Dave Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org, Petr Mladek , Shuah Khan , linux-doc@vger.kernel.org, Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH v9 12/32] dyndbg: refactor param_set_dyndbg_classes and below Date: Thu, 29 Jan 2026 00:28:58 -0700 Message-ID: <20260129072932.2190803-13-jim.cromie@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129072932.2190803-1-jim.cromie@gmail.com> References: <20260129072932.2190803-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Refactor callchain below param_set_dyndbg_classes(1) to allow mod-name specific settings. Split (1) into upper/lower fns, adding modname param to lower, and passing NULL in from upper. Below that, add the same param to ddebug_apply_class_bitmap(), and pass it thru to _ddebug_queries(), replacing NULL with the param. This allows the callchain to update the classmap in just one module, vs just all as currently done. While the sysfs param is unlikely to ever update just one module, the callchain will be used for modprobe handling, which should update only that just-probed module. In ddebug_apply_class_bitmap(), also check for actual changes to the bits before announcing them, to declutter logs. No functional change. Reviewed-by: Louis Chauvet Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index b5a3184288b0..b6ee4d9cad86 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -605,9 +605,10 @@ static int ddebug_exec_queries(char *query, const char *modname) return nfound; } -/* apply a new bitmap to the sys-knob's current bit-state */ +/* apply a new class-param setting */ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, - unsigned long *new_bits, unsigned long *old_bits) + unsigned long *new_bits, unsigned long *old_bits, + const char *query_modname) { #define QUERY_SIZE 128 char query[QUERY_SIZE]; @@ -615,7 +616,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, int matches = 0; int bi, ct; - v2pr_info("apply: 0x%lx to: 0x%lx\n", *new_bits, *old_bits); + if (*new_bits != *old_bits) + v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, + *old_bits, query_modname ?: "'*'"); for (bi = 0; bi < map->length; bi++) { if (test_bit(bi, new_bits) == test_bit(bi, old_bits)) @@ -624,12 +627,16 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], test_bit(bi, new_bits) ? '+' : '-', dcp->flags); - ct = ddebug_exec_queries(query, NULL); + ct = ddebug_exec_queries(query, query_modname); matches += ct; v2pr_info("bit_%d: %d matches on class: %s -> 0x%lx\n", bi, ct, map->class_names[bi], *new_bits); } + if (*new_bits != *old_bits) + v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, + *old_bits, query_modname ?: "'*'"); + return matches; } @@ -684,7 +691,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa continue; } curr_bits ^= BIT(cls_id); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); *dcp->bits = curr_bits; v2pr_info("%s: changed bit %d:%s\n", KP_NAME(kp), cls_id, map->class_names[cls_id]); @@ -694,7 +701,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa old_bits = CLASSMAP_BITMASK(*dcp->lvl); curr_bits = CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); *dcp->lvl = (cls_id + (wanted ? 1 : 0)); v2pr_info("%s: changed bit-%d: \"%s\" %lx->%lx\n", KP_NAME(kp), cls_id, map->class_names[cls_id], old_bits, curr_bits); @@ -708,18 +715,9 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa return 0; } -/** - * param_set_dyndbg_classes - class FOO >control - * @instr: string echo>d to sysfs, input depends on map_type - * @kp: kp->arg has state: bits/lvl, map, map_type - * - * Enable/disable prdbgs by their class, as given in the arguments to - * DECLARE_DYNDBG_CLASSMAP. For LEVEL map-types, enforce relative - * levels by bitpos. - * - * Returns: 0 or <0 if error. - */ -int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) +static int param_set_dyndbg_module_classes(const char *instr, + const struct kernel_param *kp, + const char *mod_name) { const struct ddebug_class_param *dcp = kp->arg; const struct ddebug_class_map *map = dcp->map; @@ -756,8 +754,8 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) KP_NAME(kp), inrep, CLASSMAP_BITMASK(map->length)); inrep &= CLASSMAP_BITMASK(map->length); } - v2pr_info("bits:%lx > %s\n", inrep, KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits); + v2pr_info("bits:0x%lx > %s.%s\n", inrep, mod_name ?: "*", KP_NAME(kp)); + totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, mod_name); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -770,7 +768,7 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) old_bits = CLASSMAP_BITMASK(*dcp->lvl); new_bits = CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, mod_name); *dcp->lvl = inrep; break; default: @@ -779,16 +777,33 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) vpr_info("%s: total matches: %d\n", KP_NAME(kp), totct); return 0; } + +/** + * param_set_dyndbg_classes - classmap kparam setter + * @instr: string echo>d to sysfs, input depends on map_type + * @kp: kp->arg has state: bits/lvl, map, map_type + * + * enable/disable all class'd pr_debugs in the classmap. For LEVEL + * map-types, enforce * relative levels by bitpos. + * + * Returns: 0 or <0 if error. + */ +int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) +{ + return param_set_dyndbg_module_classes(instr, kp, NULL); +} EXPORT_SYMBOL(param_set_dyndbg_classes); /** - * param_get_dyndbg_classes - classes reader + * param_get_dyndbg_classes - classmap kparam getter * @buffer: string description of controlled bits -> classes * @kp: kp->arg has state: bits, map * - * Reads last written state, underlying prdbg state may have been - * altered by direct >control. Displays 0x for DISJOINT, 0-N for - * LEVEL Returns: #chars written or <0 on error + * Reads last written state, underlying pr_debug states may have been + * altered by direct >control. Displays 0x for DISJOINT classmap + * types, 0-N for LEVEL types. + * + * Returns: ct of chars written or <0 on error */ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) { -- 2.52.0