From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo2-f41.google.com (mail-oo2-f41.google.com [74.125.231.169]) (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 95EC958FD3F for ; Wed, 23 Sep 2026 22:35:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.231.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790202944; cv=none; b=nyoQObzHAtKcphJ0A+3hUBTUCc5gpXBmQzSa0wIRQLsazXzCPbBMyxChNhRIzsF976HsLKHSMWC+khpR0S6ZdhUeOZZOsIXyNp8fBv3V1OuggVx3B7iJxSHzk3A56CcyVv97XJrrhCSrTvyzclXZYzDmZUf5NB3tHRles4oCwh8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790202944; c=relaxed/simple; bh=XlwJxsMLoOEmQpSddsPPKLnRgIC9ISIuuOLCD/BSHY0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HvDzsB6YGZLsANMObQzjSk9kGmT041gYyHk8mafDmkxUsojwgUnSM4tbkdavO267NWQsatN154w4h6fnRprYYBfB6mOHUnk5OYoZdulwYK1RzX/QS6T+dCz0aCNEV96jsFxcbJizikzTzwLhPyZmeRqlVSyb2ZebOrAc8YdolRo= 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=rKZH8RMB; arc=none smtp.client-ip=74.125.231.169 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="rKZH8RMB" Received: by mail-oo2-f41.google.com with SMTP id 006d021491bc7-6b4bff33ceaso835041eaf.0 for ; Wed, 23 Sep 2026 15:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790202938; x=1790807738; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=txroU8tpb4AveGN1UplgKFnHMl0k756Ds3MugkCIGpA=; b=rKZH8RMBl5UXx5C1Qa/6reLphVljT0gOiJgfa1oVPArfkBaSb/5FmtvYhrFh05XZq3 0v5vn6+w+5yDX4q23k6GV7wB3oM3qSwKyi6xyduTDAn5/XkqwfwWrTMC9tRrDZtS0w13 bVNz3bUpkZ2g93ekQ6rjqRKE1PdH66vEBBTiFjOStzFt0E5e/7trbAHNCq9PoqK+OTUZ aO6Dmcny0tkLYrpIQxVICq0DJQPitE8fsXIAZBmHExR2RIJhWvugn6EYqn/TmTxQLKY0 utDSL77uuTFqnKX5V4XYNyCyAJSh3dbaSoMvKXG32PMwqtMspdhd8ZlgN0bCRyrCC6pY +UlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790202938; x=1790807738; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=txroU8tpb4AveGN1UplgKFnHMl0k756Ds3MugkCIGpA=; b=RjQd71QYIcB8I3n4fJ4VJhQ7T8s+LxT0VeI3Ck+DIz/1Aoge0Lg3GLmmpGjUkkgwu6 ai3sAA7NKGzWIa73sRQt+XgLbys9t+ryWHpSOjzQ+fOGHjlkwuf3vLFOVBOjQFQGaoun 0zkJ0Hm3c8sXF9Y31WLd54iZsEdgW7Xo0zuTfBt4qnqSc57IltQdwKvZR1H7yHDd3wDD DbI7i0KpmKN8r3DoKhRZmvQNJU1Ox0+dc5CUNjyfH/CnrtK+Iw+eLMhehXtNOJSE4B3X PRnsfuBFnc3JeDsLU4sGXJ3Oi+KgaL3XsoY1KAfIruxrNOqCii2xtYh6smmVBEcd+WT0 XZNA== X-Forwarded-Encrypted: i=1; AKwUvBwbdLV8rEGbReZunNcevAiXtERoZzC/yq45Vy4WidKoR6zQlEN177oGbIMoOzVFraGcQr+LZGTpDayo7IhmxXE=@vger.kernel.org X-Gm-Message-State: AFuF++lf0oU2kcADJjS6E7V9ji/xZ4QLq7hK1ASBVZdWUzFpATWMPcOY K+sR+V4DAkUiDDeNj1sR2LEO1CR0OKjyTRP+2XtHtf+yGLqJik7CkmIh X-Gm-Gg: AYBFou1zTwLzj90oo2RQVR5cBjfc72gWiZ51CVjqqVTDJD9qArYeCvhpJeJTmPJla51 50Wyt6GHLk3g57jut30v8ejnxdvkwVRDkyhQ2+odAbRnIjkgt2NZ+z1vdThj1ykLKlKdESpLc7F TroBSZNnnsUT/i5NwC4MtaRJE8fbsHOxtbC9OpXaHM0X5XEiAE67oCvYbH37rVxAgjLlHnTafbw 61YpZ86DLT2+1rRHxFP94uaJjDPdZYcLs6/zz1haKd/5W1A2JRsFra1GW9gzhreOL2SOrVK4gxV /e2tlYZpAkUNR9diVsKx0RjAFHsdHbN86V4JOKrL/fL9GIzKZtgxHH+ob0O6jkBKfK+wPEXk7Bb k5jjCpH1BU+ZJ987YmpUC7OFbl70yfWYywJQmfE7YfAh1emoCjXOSHrSkngLkVgtS+1MAhQK93W jDa09lO4IKyjUjXW5QFJS9Gm15yJ/dlXZyIqLZuCWNJ2NiVGypjjwYW7EcovuIY584E1dQxRvk/ vuEzluX4wCWarruz1+XqQaKoUKCc4Bxw3emtbheWySAoCfb8ZEU6T5Us8V7GZ/6QtjA+fRXfai2 1YV4f68cWmLcs7UOVRg= X-Received: by 2002:a4a:ee12:0:b0:6cd:3ffc:acf9 with SMTP id 006d021491bc7-6d441b8251amr657309eaf.73.1790202938243; Wed, 23 Sep 2026 15:35:38 -0700 (PDT) Received: from [100.82.231.29] (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-491ee1ac486sm559401fac.16.2026.09.23.15.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 15:35:37 -0700 (PDT) From: Jim Cromie Date: Wed, 23 Sep 2026 16:34:50 -0600 Subject: [PATCH v11 26/38] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_{DEFINE,USE_} args at compile-time Precedence: bulk X-Mailing-List: linux-kselftest@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: <20260923-dd-cmap-part2-clean-v11-26-9b6c217fdf2f@gmail.com> References: <20260923-dd-cmap-part2-clean-v11-0-9b6c217fdf2f@gmail.com> In-Reply-To: <20260923-dd-cmap-part2-clean-v11-0-9b6c217fdf2f@gmail.com> To: Jason Baron , Shuah Khan , Andrew Morton , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Arnd Bergmann , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Jonathan Corbet , Greg Kroah-Hartman , Nathan Chancellor , Nicolas Schier , Shuah Khan , Randy Dunlap , "Rafael J. Wysocki" , Pavel Machek , Len Brown , Jonathan Corbet , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-pm@vger.kernel.org, Jim Cromie X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1790202874; l=3976; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=XlwJxsMLoOEmQpSddsPPKLnRgIC9ISIuuOLCD/BSHY0=; b=EiptybYCzB6D9ZP87jAlknvFfrN1+LB91BbDMF60BOUBfjDrPvXh9+w10WbHf5H/XbP0syE/Y IJx5x2PY9QUCJnmB6hoFeKj+1H0mzvCzbpWlc8waCN4UItOiSWdLBUu X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= Add __DYNAMIC_DEBUG_CLASSMAP_CHECK to implement the following arg-checks at compile-time: 0 <= _base < 63 class_names is not empty class_names[0] is a string class_names.length <= 32 (class_names.length + _base) < 63 dd-map-type is known value These compile-time checks will prevent several simple misuses, issuing obvious errors if violated. Several bad examples are ifdef DD_MACRO_ARGCHECK qualified in test_dynamic_debug_submod.c and will fail compilation if enabled. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 16 +++++++++++++++- lib/test_dynamic_debug.c | 20 +++++++++++++++++--- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 61f9fd4aa7af..26c858588eb1 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -192,6 +192,19 @@ struct ddebug_class_param { * __pr_debug_cls(22, "no such class"); compiles but is not reachable */ +#define __DYNAMIC_DEBUG_CLASSMAP_CHECK(_clnames, _base, _mapty) \ + static_assert(((_base) >= 0 && (_base) < _DPRINTK_CLASS_DFLT), \ + "_base must be in 0..62"); \ + static_assert(__DDEBUG_ARRAY_SIZE(_clnames) > 0, \ + "classnames array size must be > 0"); \ + static_assert(__DDEBUG_ARRAY_SIZE(_clnames) <= 32, \ + "classnames array size must be <= 32"); \ + static_assert((__DDEBUG_ARRAY_SIZE(_clnames) + (_base)) <= _DPRINTK_CLASS_DFLT, \ + "_base + classnames.length must be <= 63"); \ + static_assert(((_mapty) >= DD_CLASS_TYPE_DISJOINT_BITS) && \ + ((_mapty) <= DD_CLASS_TYPE_LEVEL_NUM), \ + "unknown class_map_type") + /** * DYNAMIC_DEBUG_CLASSMAP_DEFINE - define debug classes used by a module. * @_var: name of the classmap, exported for other modules coordinated use. @@ -205,6 +218,7 @@ struct ddebug_class_param { */ #define DYNAMIC_DEBUG_CLASSMAP_DEFINE(_var, _mapty, _base, ...) \ static const char *_var##_classnames[] = { __VA_ARGS__ }; \ + __DYNAMIC_DEBUG_CLASSMAP_CHECK(_var##_classnames, (_base), (_mapty)); \ extern struct ddebug_class_map _var; \ struct ddebug_class_map __aligned(8) __used \ __section("__dyndbg_class_maps") _var = { \ @@ -212,7 +226,7 @@ struct ddebug_class_param { .mod_name = DDEBUG_MODNAME, \ .base = (_base), \ .map_type = (_mapty), \ - .length = ARRAY_SIZE(_var##_classnames), \ + .length = __DDEBUG_ARRAY_SIZE(_var##_classnames), \ .class_names = _var##_classnames, \ }; \ EXPORT_SYMBOL(_var) diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 3a69cc3cae6d..01ce07001d4c 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -148,12 +148,26 @@ DYNAMIC_DEBUG_CLASSMAP_USE_(map_level_num, 7); enum cat_level_offset { Vu1 = V1 + 7, Vu2, Vu3, Vu4, Vu5, Vu6, Vu7 }; -#endif - +#if defined(DD_MACRO_ARGCHECK) /* - * now add the sysfs-params + * Exersize compile-time arg-checks in DYNAMIC_DEBUG_CLASSMAP_DEFINE. + * These will break compilation. */ +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_neg, 0, -1, "NEGATIVE_BASE_ARG"); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_big, 0, 100, "TOOBIG_BASE_ARG"); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_str_type, 0, 0, 1 /* not a string */); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_emptyclass, 0, 0 /* ,empty */); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_maptype, 3, 10, "no such type"); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_len, 0, 60, + "base", "plus", "classes", "length", "too-big"); +DYNAMIC_DEBUG_CLASSMAP_USE_(fail_offset_big, 100); +#endif /* DD_MACRO_ARGCHECK */ + +#endif /* TEST_DYNAMIC_DEBUG_SUBMOD */ +/* + * now add the sysfs-params to both sub/super-mods + */ DYNAMIC_DEBUG_CLASSMAP_PARAM(disjoint_bits, p); DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); -- 2.55.0