From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) (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 7002E37AA96 for ; Wed, 8 Apr 2026 20:02:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678545; cv=none; b=cGUCW7vZ9JK8hqARpR/6NMctG7DpyCnUGm5vJObB5U4LZ+5HMiQCGdhIM5JSlNWjnX6Jujx3ZWnLiyGOisBddUYuMSm76oyQpj80NBElfZ1JP6HLkxcGBgBSN+7k2hbA7m5KmEoggKSn8twD3tX+JNPAnocCZE0YyPrCh7wEw/Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678545; c=relaxed/simple; bh=+qoPaqFMZANZ5GO9HKrP/DwHGbD+bYFDH9gWrXYcZT4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DsnE8TSSTiQ1xEeJjNNpndHbtmOw6e0LfclTCsXL9HgPC6HJ95DmYHNirrowhyx3cQbjLt/R8wcS9AbE4imirgEmPVaDQwKD1mqvqdRKxsmEXi3UjpsTn/qazRIJQhs+f82n7uQFGPBGk21fjPyx29OJVjgrv7b3gqeCgGuxvQo= 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=muxB8RFj; arc=none smtp.client-ip=209.85.161.51 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="muxB8RFj" Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-68470763896so83321eaf.1 for ; Wed, 08 Apr 2026 13:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775678543; x=1776283343; 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=AAl9+PvQAj0gWNHtBaTmlj5ZgTYMrxMbOjBXxAyMQwA=; b=muxB8RFjfKYt2iNSbS8ouAt0ZCBcl0ncjUR71WK9ndNtZpcUrT6ckQN4cD2G4sGvDT 0x23gEzJ7YZ0aiPk9ncBa8Wn+2fRk4coIL2GbYHTyFnFJlSEm5tgmS6K8wgVCf4wExCQ qvymbZixYf+dF5/2WiI88kp/HF77t4wZ9EoDTHZPNJDY6cYeIRgB6H+gdltCzSnT7hO9 5dqGo77cay7IPmSRMXR8eiRyqmWChSQbGXmrn5D2zFnvSJe5a0c8Pv3pZTOYpUI4Ap7u soz+tNdFeh6tAN0O1Hg9uIkjT/Bd1P4KqAYf0eMA43AKLUU9v1BVYl6DaX2npc8d1CXf pnPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775678543; x=1776283343; 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=AAl9+PvQAj0gWNHtBaTmlj5ZgTYMrxMbOjBXxAyMQwA=; b=QtjcVZZkPPuXecC0CZCnKbJGvhxp0mtGkJXqNWjJM7srbMVC7wwmkldT+SiP6RhBpq h78YZJ4D9hWw1+0xiVMOZh47zz6UsXPmKMRBay/tinl0GY0zf6ztYG9siqsDAVXmnPCV 0op1Pn7u+RVpubYfQqlSZ0GND2Isdt8KCqc1N9cDK+eLFj9qDyPcTerPWw+HZTynycCb qHpPyI5hXB/YhMfvhW0pQoda1fkytlBuQ3Kb01ClWNycLw8ue9WJANL874wjPPTFnw+3 DY4o5v9KSWt8RcH/ogwzdtE/J1w1ldLvjLJTgaplmQEGKrfVbDn5OFjreCB2xemuZZtP hERQ== X-Gm-Message-State: AOJu0Yw523RMhkK9oBp9uFkvInDUo9snqO1GieA+uBn1dxdLCYROxU66 QZohk1fsew2dTTQscV8um4gJxkPV85kBIGOqlMUpbn+n1v5zAhI9jtfegRl2iA== X-Gm-Gg: AeBDiesgSbyBr17ErqqWlzAY5Vkrocp+joYgeronzuZF7+hVoMAcN54QPS+b6Wd2x77 UUFF/TgInPbTimtPmYLcRdQ5gCvX1DSVmnjviz69fNmnVu0YJ9PfX8U87FAL9Svuc5USz6l2tnC Jdw1BMYXIUtlzSzXa4V1w4AGSW4UOkOVyS6dgKvzoBH+GV+KkJAJZz4koTSNi3Tv1CR9PCNjhqq tlYX+YV1heY0T+GdtLY5teiOiACgeMlmJ3JR3RHtw1yDEbuqM+3hUfXxptRVOF42gs4PTIt1OyE gHFisNoUHVy64sRM5KFxlXqnxGAW+90oAHwpjLMUQfD3LcNlxQNNueE7KXKv1YvZa/fpUF2gaCb Q+AUBKXJRc7RDOQ160Yyf9c0bv4sKqpg0wMrnzWqP7I9AGht7y+NogfzNu4mMgFEqfTnAICrOlN Rt9W9muXVp9VlAHX2sUGY/10Tmgf8KLUwmZ+XQGW4PK88OsUKuJpxu0QpGMFq3aQ69L9ZEsCJq/ 7E= X-Received: by 2002:a05:6820:16aa:b0:67e:1380:a046 with SMTP id 006d021491bc7-6821e261943mr12218146eaf.30.1775678542993; Wed, 08 Apr 2026 13:02:22 -0700 (PDT) Received: from frodo.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-680a63c7fd1sm12254208eaf.8.2026.04.08.13.02.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 13:02:22 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jbaron@akamai.com, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v13 06/36] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Date: Wed, 8 Apr 2026 14:01:41 -0600 Message-ID: <20260408200211.43821-7-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408200211.43821-1-jim.cromie@gmail.com> References: <20260408200211.43821-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 Add the stub macro for !DYNAMIC_DEBUG builds, after moving the original macro-defn down under the big ifdef. Do it now so future changes have a cleaner starting point. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 43 ++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 05743900a116..a10adac8e8f0 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -93,27 +93,6 @@ struct ddebug_class_map { enum class_map_type map_type; }; -/** - * DECLARE_DYNDBG_CLASSMAP - declare classnames known by a module - * @_var: a struct ddebug_class_map, passed to module_param_cb - * @_type: enum class_map_type, chooses bits/verbose, numeric/symbolic - * @_base: offset of 1st class-name. splits .class_id space - * @classes: class-names used to control class'd prdbgs - */ -#define DECLARE_DYNDBG_CLASSMAP(_var, _maptype, _base, ...) \ - static const char *_var##_classnames[] = { __VA_ARGS__ }; \ - static struct ddebug_class_map __aligned(8) __used \ - __section("__dyndbg_classes") _var = { \ - .mod = THIS_MODULE, \ - .mod_name = KBUILD_MODNAME, \ - .base = _base, \ - .map_type = _maptype, \ - .length = NUM_TYPE_ARGS(char*, __VA_ARGS__), \ - .class_names = _var##_classnames, \ - } -#define NUM_TYPE_ARGS(eltype, ...) \ - (sizeof((eltype[]){__VA_ARGS__}) / sizeof(eltype)) - /* encapsulate linker provided built-in (or module) dyndbg data */ struct _ddebug_info { struct _ddebug *descs; @@ -138,6 +117,27 @@ struct ddebug_class_param { #if defined(CONFIG_DYNAMIC_DEBUG) || \ (defined(CONFIG_DYNAMIC_DEBUG_CORE) && defined(DYNAMIC_DEBUG_MODULE)) +/** + * DECLARE_DYNDBG_CLASSMAP - declare classnames known by a module + * @_var: a struct ddebug_class_map, passed to module_param_cb + * @_type: enum class_map_type, chooses bits/verbose, numeric/symbolic + * @_base: offset of 1st class-name. splits .class_id space + * @classes: class-names used to control class'd prdbgs + */ +#define DECLARE_DYNDBG_CLASSMAP(_var, _maptype, _base, ...) \ + static const char *_var##_classnames[] = { __VA_ARGS__ }; \ + static struct ddebug_class_map __aligned(8) __used \ + __section("__dyndbg_classes") _var = { \ + .mod = THIS_MODULE, \ + .mod_name = KBUILD_MODNAME, \ + .base = _base, \ + .map_type = _maptype, \ + .length = NUM_TYPE_ARGS(char*, __VA_ARGS__), \ + .class_names = _var##_classnames, \ + } +#define NUM_TYPE_ARGS(eltype, ...) \ + (sizeof((eltype[]) {__VA_ARGS__}) / sizeof(eltype)) + extern __printf(2, 3) void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...); @@ -314,6 +314,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) #define DYNAMIC_DEBUG_BRANCH(descriptor) false +#define DECLARE_DYNDBG_CLASSMAP(...) #define dynamic_pr_debug(fmt, ...) \ no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) -- 2.53.0