From nobody Tue Dec 2 02:41:32 2025 Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) (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 41E013002C5 for ; Tue, 18 Nov 2025 20:19:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497156; cv=none; b=TvEr9eBHVNkCYPxW77Xs30a7P9zV4wZdZPQ1d2KphC6JTwDyVGfyInVDPywmzINLuXgrPPjcgn6Cxkv5k8c0IAhfdbr4p00wDrAhp+uG1pcCpPlwXcQKljF4Cc0GAg0aoUovaiootALLqOPZS7/2MI5Ov0qWlnQAtsTiae5I1QM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497156; c=relaxed/simple; bh=7mJiWoGmK0R4UXpo8WdCygyp32bwIoCu2s+Xmqg2nUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UCnaT6pM9ag+luO5QDhugdZxtbQHKys8tD20XBzND4XpgBzHHRTsu4O8lPoCJ9Txx2dONd48gRWedqtgQchjy19fE3f5N2RI0qFgKTEKfEHNPn/JVfT9AHUmzG8Ka/R2XUs7KWT5ySEkwwBNV7EM2Q1v5aawm5d1wx8qFgvB90o= 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=HNZ8PjqR; arc=none smtp.client-ip=209.85.166.41 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="HNZ8PjqR" Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-9486248f01bso211570539f.0 for ; Tue, 18 Nov 2025 12:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763497153; x=1764101953; 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=d0qqYdkZB9wZ4ghzz/46EdWtqxOuJ8xP/Sv3TkdVu1c=; b=HNZ8PjqRKwJd8HG9UV9wR1aaip9EU5+VyjdsaO8A3a8clT8x8glrxzWtpQaiWIiuGv T01kSkeeAeudnPkJqmfBnuBEXwkEWxMjgA6jyXf3L5jf224CPdVdX7DyEgxyhLqAqS5k jaqf/Qd3ZJ5aV+v5GEMrkVS7bxMDKDYyT7tej0r6sOmvAuh5GE32WWrrlrCJYmfEWFLH 0T3+9YF9Gf6L9m1rD132XJX+hBV6cY6HJaGcwMgTEvIEbNNyy9V5tjodYIWPI5KwMSaE 7hCescgcuPn1M3jpjnXWwttUxTe9Nw3/47bnEBL8ex8JrGOl+ttxZjVZhoPc2wSPkuVy 1PDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763497153; x=1764101953; 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=d0qqYdkZB9wZ4ghzz/46EdWtqxOuJ8xP/Sv3TkdVu1c=; b=PO7mXb9f+oOEfAY+ba63ZWXClUrpScgJHfiKy4Ho7aAVAXUtxRY46rIj89Gu1kLkVU GPvMC9D+NeYch/6p5w8XFDpLpcru26kfVXIUdrrjFXO71ihjBJDhy47UyA6BJgOpWWBk l0i6Wgz7IyoGwZvGue8mkFdg3RGcP0BnU6IyCgGRKddZIMVy/E9n/UVgru551x2Ped/M mdF0bVeRj2B92ICoGhlZX3OHY/mqxKoVB+yWRy3EkdzfLG+19w0eCiSEYettHcWjEEIS MpjUy8RDT2Iyu85OhzV3I9UpH+S1p7bPWlOmujREAtQGN2QjmUMB2H8GxzfiNDh/8Yn4 ch9g== X-Gm-Message-State: AOJu0YyOtYy2a5jvMmEnvzjxTuVeXloRQNfnmhrYfOK0rbc6lELuqRuC PZXtb8cbCaR7mcGIOOMpjjalLn2a4m6XK1FgARIebHZp6qUE0x/MKoK3T1zEu697 X-Gm-Gg: ASbGnctPz+r6rQBg/j7Ua6OXRVy4CumceOghbfsd1BySlqw/MlEV9EkzRaoaBmFtZf7 Iq4vfw865kxUTpVj4YQi5aQM/WZaqLbF3pfTJXOFl9yBrEn7km1x9ehouRjaiiluwRgN49X8Gr/ pdVo4tXM6W2iIEIozPb9cPdvumJqPoYu0oa0uzbxMzUniKdHwX0HxGXwqBMJ/0xuOaL5lnQrxDC 5E26lKDqAaG3EuEC20MP4PcOm2H6znSswVuVWQ4tWGKjNZCfra261gMNq+N2RE+j1udZgU4BaCO TrjzyJact/K+Z2oAlZzm4m2fAycK+LXQwnqSuPvom2McbeIZM6boNzxJg6wXCiAyvb189jCf5S0 Zjt66rkuWpxymGjJYRMBKrmBFsSxbPuQMVAU9TUfIzwWqGBy79qUOBltjJadx0DNaVMjNdAOHy3 /oFFUxm/vh1dwEBZ0xy8V5s16pfiYWcvcaAcatXdgDYu5DHtMZwKTrTqDNev6ELi9FP2ZPJQIvB NFiJA== X-Google-Smtp-Source: AGHT+IFTEGi1y6IuJVSQs/d8QnQHjbnNxjQ193vFOfgNUHQ9r/krOkNKWiS5MQFDaYbiiwFQugK9wg== X-Received: by 2002:a05:6602:6b07:b0:948:a762:d83c with SMTP id ca18e2360f4ac-948e0cc2c64mr1880924439f.3.1763497152725; Tue, 18 Nov 2025 12:19:12 -0800 (PST) Received: from godzilla.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id ca18e2360f4ac-948fd4c273bsm419823939f.18.2025.11.18.12.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 12:19:12 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, jbaron@akamai.com Cc: ukaszb@chromium.org, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v6 11/31] dyndbg: refactor param_set_dyndbg_classes and below Date: Tue, 18 Nov 2025 13:18:21 -0700 Message-ID: <20251118201842.1447666-12-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118201842.1447666-1-jim.cromie@gmail.com> References: <20251118201842.1447666-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- v3 s/modnm/mod_name/g --- 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 1db2f627237a..64d69f5cba1b 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -604,9 +604,10 @@ static int ddebug_exec_queries(char *query, const char= *modname) return nfound; } =20 -/* 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]; @@ -614,7 +615,9 @@ static int ddebug_apply_class_bitmap(const struct ddebu= g_class_param *dcp, int matches =3D 0; int bi, ct; =20 - v2pr_info("apply: 0x%lx to: 0x%lx\n", *new_bits, *old_bits); + if (*new_bits !=3D *old_bits) + v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, + *old_bits, query_modname ?: "'*'"); =20 for (bi =3D 0; bi < map->length; bi++) { if (test_bit(bi, new_bits) =3D=3D test_bit(bi, old_bits)) @@ -623,12 +626,16 @@ static int ddebug_apply_class_bitmap(const struct dde= bug_class_param *dcp, snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], test_bit(bi, new_bits) ? '+' : '-', dcp->flags); =20 - ct =3D ddebug_exec_queries(query, NULL); + ct =3D ddebug_exec_queries(query, query_modname); matches +=3D ct; =20 v2pr_info("bit_%d: %d matches on class: %s -> 0x%lx\n", bi, ct, map->class_names[bi], *new_bits); } + if (*new_bits !=3D *old_bits) + v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, + *old_bits, query_modname ?: "'*'"); + return matches; } =20 @@ -683,7 +690,7 @@ static int param_set_dyndbg_classnames(const char *inst= r, const struct kernel_pa continue; } curr_bits ^=3D BIT(cls_id); - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); *dcp->bits =3D curr_bits; v2pr_info("%s: changed bit %d:%s\n", KP_NAME(kp), cls_id, map->class_names[cls_id]); @@ -693,7 +700,7 @@ static int param_set_dyndbg_classnames(const char *inst= r, const struct kernel_pa old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); curr_bits =3D CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); =20 - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); *dcp->lvl =3D (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); @@ -707,18 +714,9 @@ static int param_set_dyndbg_classnames(const char *ins= tr, const struct kernel_pa return 0; } =20 -/** - * 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 =3D kp->arg; const struct ddebug_class_map *map =3D dcp->map; @@ -755,8 +753,8 @@ int param_set_dyndbg_classes(const char *instr, const s= truct kernel_param *kp) KP_NAME(kp), inrep, CLASSMAP_BITMASK(map->length)); inrep &=3D CLASSMAP_BITMASK(map->length); } - v2pr_info("bits:%lx > %s\n", inrep, KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits); + v2pr_info("bits:0x%lx > %s.%s\n", inrep, mod_name ?: "*", KP_NAME(kp)); + totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, mod_name); *dcp->bits =3D inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -769,7 +767,7 @@ int param_set_dyndbg_classes(const char *instr, const s= truct kernel_param *kp) old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); new_bits =3D CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits); + totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, mod_name= ); *dcp->lvl =3D inrep; break; default: @@ -778,16 +776,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); =20 /** - * 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) { --=20 2.51.1