From nobody Tue Apr 7 12:55:29 2026 Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (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 1C379398903 for ; Fri, 13 Mar 2026 13:23:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408231; cv=none; b=GSdNh0tfMsxOXB5QvYJw7fZDWjPUPJMiQcillHdhFhq2rsz1CF3nmlLN44dtNOoJff0ngoLafKmiY2MccG3D99o2BdPDTS720gxIzgOOtSUs2VrT6NcWd154KWvRbbl5Z4gbhV33Qr/M5MlVTt05e3wKxN63UrH8WEOny/M/2UU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773408231; c=relaxed/simple; bh=w5QdxPIetOuaGsRy91KWMP3/BGWkuj6SOGrMCM2jKJs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DScmD5Y8+4LhGsbzaQVryxcg7bEusNXa4SqJoKj+ni3hWBw/LCxHv2UVsZ9nTmzp92CpVqli7cHFo1HCEJ39SNRjGdXi+pUv9yUXgMcuHldS/LGK2sJN27FxLFKAxK8hBqGJCfDoz5k65lPK4pNb4gSVYFGm4QfzdoV7X9ntc/g= 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=BBDKG0Gg; arc=none smtp.client-ip=209.85.167.180 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="BBDKG0Gg" Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-466f935a82fso1463921b6e.0 for ; Fri, 13 Mar 2026 06:23:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773408229; x=1774013029; 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=j2MYJzJHADFhmDlQmMQlbImDYfLHhfEQ7IriPsfmok0=; b=BBDKG0GgBJ2fAt2oOTM3o2cq6d5FdfY80+Aq9vVAf1RNN+kyOouq9V+I3ZHiVfjsnG 3bwoQjsVfFKS3Y6vGjx4LkYZ2meEImAnw3VHSKlHLLD6hdJrJ8lsXrliwqtqYjRNL3+x FPKt6YSc/IF/6Dslc3gKxXnPoVeSkPfkP3CQC3oW8eLd9BhvNJFAwimQc/y4HqMA1keD sE4612p7Qo0yDWTMUTzayEwZ279cJx8IZLFx+YoY+ju2Yni++rNkzr903ln7SKgEsJKv mhZZu8hHH5m1r41ls/Dc//dMxkx3ayhQTBQCrb8JjYd0rQ1s1l+/Dv3I6Afj241nG8yl TfmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408229; x=1774013029; 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=j2MYJzJHADFhmDlQmMQlbImDYfLHhfEQ7IriPsfmok0=; b=MQS4Rt3KFQPwrXHtLtGBoyZU+oezULKG+976cFjozIYpnUOrd4J3wiU5Ud/lyI0Auc VyhiEf0f/OLYGsQo4mfWLQKLOzY5U09dAeItHcN8QD/sLW57e1EvDIBnUg8kcQRG3h9+ t83j20pLMplEwLtXQBezerFr52oaWYfIke6zdD2OtSut+OxkXlAECOdPYy0wrxksyOHb o4k4grcDZv/DRpiSjpIo5T71jMLOQkxotu3bBFhmaAPlxSPxElCqXbfZkihYPsi5XH2D ghlOYWSO1eQgYfKUN0/ELVbZuQsRaLR6rfiW6JSM0utLYB9XLmaCbOIH66hHu13+KDAM /iHQ== X-Forwarded-Encrypted: i=1; AJvYcCW4qcD2Y0qx6Sjo0N1wIkCLffqiqOL4LxXGf7SVywoDukhFus7KApL2jglHbW2mZ1DjR6uGBFEpjOAMvdw=@vger.kernel.org X-Gm-Message-State: AOJu0YzaZzA8G6OPCqrHWh04PvAMwVQT11t9ZJgiWzhXJEfYsRbpkOFh orgVywsz7WPOJH8uPKzTutmww5nurLRBE+IOru8Ei7R8B6yK0v0n4JAr X-Gm-Gg: ATEYQzylWOehOoZN8Ke3MD/tvc15CVyitIls7SwEXNnBrv6kfy1lam6NTRj1j/Kfh69 iPAcc1DcpQUSjO8lRiFtQ0TLLjTEu5vCeOeLPfSj7qY1DofKrRUkXcWNr3dD1wGqmioBUvoUhEY 3Uv/qA0XyP7Z6iESws8BIYTdbkAtpqyblT1wLsLFI3EaUBihK3g10moTtJnO3vvobhXFUcd6Jc4 jK9QlyXSoY8d0IapA6MZVGMIFqskSTsTEvl9ZVRm7J6AG9yQ/TJz8BuWgRCnpOxO3yOFJBer6Fs r5fD0OES3QqGQcnMx2x8fGC/tKdS+YNnu0LwznzB8OWiP2us2ExQkoK58R0C6b39Pt5mv0Kcj9y dlUlH8DiT/7UX9QZfsrb3dWOB4EfNMkc2gEPrPT4FI12TKUttKnCj+UabWMKaWHkjLFhZJn7AdJ T07doK379Lkq/DB80lR8TlRybTLhvHd/Qwg4WImW5NokOJGcyw X-Received: by 2002:a05:6808:c2d1:b0:467:26e4:728e with SMTP id 5614622812f47-467575c42d6mr1645259b6e.49.1773408228837; Fri, 13 Mar 2026 06:23:48 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 5614622812f47-4673434a35csm4795987b6e.20.2026.03.13.06.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:23:48 -0700 (PDT) From: Jim Cromie To: airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org, Jim Cromie , Andrew Morton , linux-kernel@vger.kernel.org Cc: mripard@kernel.org, tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, christian.koenig@amd.com, matthew.auld@intel.com, arunpravin.paneerselvam@amd.com, louis.chauvet@bootlin.com, skhan@linuxfoundation.org, pmladek@suse.com, ukaszb@chromium.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH v11 24/65] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Date: Fri, 13 Mar 2026 07:19:49 -0600 Message-ID: <20260313132103.2529746-25-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313132103.2529746-1-jim.cromie@gmail.com> References: <20260313132103.2529746-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" Add __DYNAMIC_DEBUG_CLASSMAP_CHECK to implement the following arg-checks at compile-time: 0 <=3D _base < 63 class_names is not empty class_names[0] is a string (class_names.length + _base) < 63 These compile-time checks will prevent several simple misuses, and will issue obvious errors if violated. 4 such examples are added to test_dynamic_debug_submod.ko, and will fail compilation if -DDD_MACRO_ARGCHECK is added to cflags. This wouldn't be a useful CONFIG_ item, since it breaks the build. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 9 +++++++++ lib/test_dynamic_debug.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 74ed18a038bd..d3889173abf3 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -181,6 +181,14 @@ struct _ddebug_class_param { * __pr_debug_cls(22, "no such class"); compiles but is not reachable */ =20 +#define __DYNAMIC_DEBUG_CLASSMAP_CHECK(_clnames, _base) \ + static_assert(((_base) >=3D 0 && (_base) < _DPRINTK_CLASS_DFLT), \ + "_base must be in 0..62"); \ + static_assert(ARRAY_SIZE(_clnames) > 0, \ + "classnames array size must be > 0"); \ + static_assert((ARRAY_SIZE(_clnames) + (_base)) < _DPRINTK_CLASS_DFLT, \ + "_base + classnames.length exceeds range") + /** * DYNAMIC_DEBUG_CLASSMAP_DEFINE - define debug classes used by a module. * @_var: name of the classmap, exported for other modules coordinated u= se. @@ -194,6 +202,7 @@ struct _ddebug_class_param { */ #define DYNAMIC_DEBUG_CLASSMAP_DEFINE(_var, _mapty, _base, ...) \ static const char *_var##_classnames[] =3D { __VA_ARGS__ }; \ + __DYNAMIC_DEBUG_CLASSMAP_CHECK(_var##_classnames, (_base)); \ extern struct _ddebug_class_map _var; \ struct _ddebug_class_map __aligned(8) __used \ __section("__dyndbg_class_maps") _var =3D { \ diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 1ba4be9a403a..b2bdfdfb6ba1 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -133,7 +133,7 @@ DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); * Enable with -Dflag on compile to test overlapping class-id range * detection. This should warn on modprobes. */ -DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE"); +DYNAMIC_DEBUG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_= CORE"); #endif =20 #else /* TEST_DYNAMIC_DEBUG_SUBMOD */ @@ -146,8 +146,19 @@ DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_C= ORE + 1, "D3_CORE"); DYNAMIC_DEBUG_CLASSMAP_USE(map_disjoint_bits); DYNAMIC_DEBUG_CLASSMAP_USE(map_level_num); =20 +#if defined(DD_MACRO_ARGCHECK) +/* + * 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 */); #endif =20 +#endif /* TEST_DYNAMIC_DEBUG_SUBMOD */ + /* stand-in for all pr_debug etc */ #define prdbg(SYM) __pr_debug_cls(SYM, #SYM " msg\n") =20 --=20 2.53.0