From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) (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 552FC3AA517 for ; Thu, 2 Jul 2026 16:41:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010509; cv=none; b=WBo63E6omPdZhXLv5s/RiaR2qeWs0wS38miohe2mM66zS7Oy/oNYfvT/S5vM7euwiEtfxc06Nq6fkqrij5EZUpZgCxYPvJhOUC5dybD4WsdR+1UiGfDryU5eBrC6HuR5SgGJgMMFprN0seRrSXBteoEwR+rLB3yR8Ak/ShKi32E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783010509; c=relaxed/simple; bh=Q+GlU+k7b5DOi//BqRBfTakK1fGt0RvNMJQ5eSDbR/g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YoC6Gnr6Yv/6f+bhKtHsLs6l/NR3mbulio430pxzdOHIlIX6fjJwXYu0WXv5jmoCEk3QBOHewSkAqaqV8s+jH8PE1NRgR6GvaYYgWDeVKhOtBtL6XW74UND8k368Iz7FB9uETv555egXt+7x3g3jsqNwSykzVyZ97SsesoV80GQ= 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=dkuubhaG; arc=none smtp.client-ip=209.85.161.50 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="dkuubhaG" Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-6a31c05e092so96684eaf.0 for ; Thu, 02 Jul 2026 09:41:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783010500; x=1783615300; 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=ohhoTzQSG8OS6K4D/PO7jPPOwrBM058caScQKdaFQN0=; b=dkuubhaGXRfNPirE45u9nIqa/g1R2Y4OVTk4IG8Y4xTbt85516Tt0mlWh+stBDJuqT jP+q6TrFlfSI8BFoxkNDj7jHDtWkqSc4WuvZsdpn2Kx4PvvV894s/eB2g3pLpfs3uACD qdrO448TcvtAEt9lRvjE2BxATviRmeIRYjDtGzcrFRkHmIZdP0HL7KgPYVBJQiwuzRfO nuaZM0dIzL77ADJeg/0+ZXRg07juo0ZoSTTxbcZdFkGShZKaPmjHVtegQYo1jz4vLafr qH9M3+zqrPlNmto7nSy6W503ebI5N1OROt7U3Ya3qwzooSUysHMePBUfyBB1iJhMfEJ7 KYGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783010500; x=1783615300; 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=ohhoTzQSG8OS6K4D/PO7jPPOwrBM058caScQKdaFQN0=; b=qQ+D2+PscMrQtT/TkBAAL4uKXnuD8RRQjNhDdtxqlT2zis5RJLEQFYOyAQtDkMnODN /T37KGaQOaU5OwuxyEHTbqaXUufukYvI3twZfnsQZc5KunEnUmLWyAxTL7vbr7gAclKz 0PYdvmk/OyBiLd81fmLsf596eqBrFC66Lh9PIGVUGrHHADWOFeroXSY6Cvq2fKDAmnIP ht7D6mJIxtsrl+zi9WEWZTCjoDjNU9aW5q8rHn2wpjSikktgoto242+jFbAFQ5dJi1gk Y9Vv93yD/Wg3Ha2Vwfia18d+6ZChWH2CEbZz+dq3YIouRaWUO7Og0lkBo2tu/cyOV6wN evqQ== X-Forwarded-Encrypted: i=1; AFNElJ8NK2AEmSoAaxrLVgTSdV3wnvtQEFEbiITIGk/SfSVjCQhGE97jKw4zF+boD6OmvI68KA3/v/4g3ZmxLrVF@vger.kernel.org X-Gm-Message-State: AOJu0YxTDbb1Mv3AUqIekn0W7bJGXpeFo7WBpttB2o7IFjZqN2BZHK8R R4SbmCkiwUdjnNp3zcFaIQTvPdJh39+1KA3zyOESKqZz8U+omgcxhrp0 X-Gm-Gg: AfdE7cm0Yk2URlimVqnwEffskyCVYSp0myRp4WC2kcWAuCKahAng4aaSXDIgLOLVRNp HNKVqJ7wBroEkNNnY1bfgyfWY70CNheoTj8GRBuDiMWRfpe8PUwJEHYiixdE5TBCv3uOoU5QMJa nD/TEwZc4UE4Yn5q3LjfE8gDV7BbLmqC1yPwmi+EzSVfcK3dT7IbZ/JUlq4r64rqSFoHFw4bb5p oZvP/TxdQQAxfOZuGqbZx/WlpNr8MLKzYHDNLLdg50qXRNz0Axx47dk7b0oAL/2UhVawrjnFqL4 EuuUhnf2MGn38B4NXvd8gq9I/fC0ABw/kA6nXEnSUTnPt7ynoJ6Du6kzp0DaVqM63nw8PdXk8F5 bonPBPa9uodRRvbsAx11N0Ul49Ogl3r2lkozKrOUsmExfq9jV/5v25xWa63u+Ica3EAII9bwHPU QdohBDQiZOJl1msjAhXoI0DGeIpWPFAjzm6+Zhztn8B+MbS3VedQU= X-Received: by 2002:a05:6820:5706:10b0:6a3:d6d:1949 with SMTP id 006d021491bc7-6a30d6d1993mr2494084eaf.37.1783010499610; Thu, 02 Jul 2026 09:41:39 -0700 (PDT) Received: from [192.168.0.245] (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-44cbec93702sm3189652fac.12.2026.07.02.09.41.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 09:41:39 -0700 (PDT) From: Jim Cromie Date: Thu, 02 Jul 2026 10:41:09 -0600 Subject: [PATCH v5 17/18] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Precedence: bulk X-Mailing-List: linux-modules@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: <20260702-dd-maint-2-v5-17-24f22b052bf2@gmail.com> References: <20260702-dd-maint-2-v5-0-24f22b052bf2@gmail.com> In-Reply-To: <20260702-dd-maint-2-v5-0-24f22b052bf2@gmail.com> To: Andrew Morton , Jason Baron , Jim Cromie , Jonathan Corbet , Shuah Khan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Arnd Bergmann , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin Cc: linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, Louis Chauvet X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1783010473; l=5915; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=Q+GlU+k7b5DOi//BqRBfTakK1fGt0RvNMJQ5eSDbR/g=; b=rWO8qG1nvm+O3OCiXMMXYrje5bjKYgAW/mb+2+TU8eYDSDN4Zf3gyxcuqw4pWRwq17JhL7swy Ej+dZIcOKgzD5iJRQC4CCjIrT6eyECJD9HpltJlkWMNRlhbro6wo1X6 X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= The body of ddebug_attach_module_classes() is just a code-block that finds the contiguous subrange of classmaps matching on modname, and saves it into the ddebug_table's info record. Implement this block in a macro to accommodate different component vectors in the "box" (as named in the for_subvec macro). We will reuse this macro shortly. And hoist its invocation out of ddebug_attach_module_classes() up into ddebug_add_module(). This moves the filtering step up closer to dynamic_debug_init(), which already segments the builtin pr_debug descriptors on their mod_name boundaries. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- v3: expand block-comment in ddebug_add_module v2: move RvB after SoB finish hoist - drop old fn - ddebug_attach_module_classes the v1 rev left the old ddebug_attach_module_classes in place, but it is completely redundant now, since it already lost the list-linking job it was doing. It was being cut out later in the patchset (in the unsent API adaptation phase), but for cleaner review, lets excise it now. OLD all-in-1-series (pre split into reviewable chunks) v10?- reordered params to match kdoc v12- refactor/rename: s/dd_mark_vector_subrange/dd_set_module_subrange/ 1. Renamed the macro from dd_mark_vector_subrange to dd_set_module_subrange to better reflect its purpose of narrowing a vector to a module-specific subrange. 2. Simplified the arguments by removing the redundant _dst, as the _di pointer already provides access to the target _ddebug_info struct. 3. Refactored for Clarity: Instead of overwriting the struct's start pointer while the for_subvec loop is using it to iterate, I introduced a temporary __start variable. This avoids the "subtle" side effect and makes the logic easier to follow. 4. Updated Documentation: Improved the comment block to explicitly state that the macro scans for the first match and counts contiguous elements. fiuxp --- lib/dynamic_debug.c | 80 ++++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index a9965ec1807a..1d5b9f68791a 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1175,34 +1175,34 @@ static const struct proc_ops proc_fops = { .proc_write = ddebug_proc_write }; -static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) -{ - struct ddebug_class_map *cm; - int i, nc = 0; - - /* - * Find this module's classmaps in a subrange/wholerange of - * the builtin/modular classmap vector/section. Save the start - * and length of the subrange at its edges. - */ - for_subvec(i, cm, di, maps) { - 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); - dt->info.maps.start = cm; - } - nc++; - } else if (nc) { - /* end of matching classmaps */ - break; - } - } - if (nc) { - dt->info.maps.len = nc; - vpr_info("module:%s attached %d classes\n", dt->info.mod_name, nc); - } -} +/* + * dd_set_module_subrange - find matching subrange of classmaps + * @_i: caller-provided index var + * @_sp: cursor into @_vec + * @_di: pointer to the struct _ddebug_info to be narrowed + * @_vec: name of the vector member (must have .start and .len) + * + * Narrow a _ddebug_info's vector (@_vec) of classmaps to the + * contiguous subrange of elements where ->mod_name matches + * @__di->mod_name. This is primarily for builtins, loadable modules + * have only their classmaps, and dont need this sub-selection. + */ +#define dd_set_module_subrange(_i, _sp, _di, _vec) ({ \ + struct _ddebug_info *__di = (_di); \ + typeof(__di->_vec.start) __start = NULL; \ + int __nc = 0; \ + for_subvec(_i, _sp, __di, _vec) { \ + if (!strcmp((_sp)->mod_name, __di->mod_name)) { \ + if (!__nc++) \ + __start = (_sp); \ + } else if (__nc) { \ + break; /* end of consecutive matches */ \ + } \ + } \ + if (__nc) \ + __di->_vec.start = __start; \ + __di->_vec.len = __nc; \ +}) /* * Allocate a new ddebug_table for the given module @@ -1211,6 +1211,8 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug static int ddebug_add_module(struct _ddebug_info *di) { struct ddebug_table *dt; + struct ddebug_class_map *cm; + int i; if (!di->descs.len) return 0; @@ -1223,17 +1225,21 @@ static int ddebug_add_module(struct _ddebug_info *di) return -ENOMEM; } /* - * 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. + * For built-in modules, di is a partial cursor into the + * builtin dyndbg data; the descriptors are the subrange + * matching the modname, but the classmaps are the full set. + * We find and set the relevant subrange of classmaps here. + * + * The modname string is in .rodata, the descriptors and + * classmaps are in writable .data. All are immortal. + * + * For loaded modules, mod_name points at the name[] member + * of struct module, and the descriptors and classmaps point + * at the module's ELF sections; all have lifetimes matching + * the module's presence. */ dt->info = *di; - - INIT_LIST_HEAD(&dt->link); - - if (di->maps.len) - ddebug_attach_module_classes(dt, di); + dd_set_module_subrange(i, cm, &dt->info, maps); mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); -- 2.54.0