From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8553E105F7AD for ; Fri, 13 Mar 2026 13:24:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 57DF310EC0E; Fri, 13 Mar 2026 13:24:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mOzDWYib"; dkim-atps=neutral Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B99710EC0E for ; Fri, 13 Mar 2026 13:24:07 +0000 (UTC) Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-46726528f1cso1546631b6e.0 for ; Fri, 13 Mar 2026 06:24:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773408247; x=1774013047; darn=lists.freedesktop.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=RUFWI26wJ3+Z57HFFsxefXkK3D/1IEaVOdGJ9g+Mjso=; b=mOzDWYib02hXz1WqVhevQUL1cUUyaHw9mW8uuFIQNJ0pxV10YFg5xUlkI0rTlZC8ev WO8PCVox27kfG7WBjflCfF/6e8W0pAN1sSvPdgbBH9mrPDpnJm8K2bLTLBszrL0yKBow FEiGVv6k5IKFaFzX0MWdobEKnz3cbstJBDnIy8p/8hZPh0SBnXIKw2OxWSSjjpp4PhOd qcn8tPFoYpOxEdsBjEN6J+NgCeT9Rr/tNDjGyEZHldRKL+0LLLRKqwERv9rjPHLd5yN0 nNOvJpZtHmz7zbJndEMQP8DC0kJc1nsmcCtJ9FXq5sOBXk4A6uvRUAmzt47lp0DZJneg ZA1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773408247; x=1774013047; 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=RUFWI26wJ3+Z57HFFsxefXkK3D/1IEaVOdGJ9g+Mjso=; b=ZQQJHVyh1HgYRZszYqpORS3Rj1ncDkJtJbYb5NH8q7SGGo/gzStU7vNu2HeMlrqL6Y FH1M1qZYMzAxC1E2CzLledlqP3XOaN51k3CDOlxgKzXSwmqVreEmbA5xLm6Ygtp0SLv8 DuTZ39uyTRo6FhvpuhpSmpEc3f74xnw6C3SPHc8wKZ5SyuMzlAFkQ65rGjxw0GH2sg5K cY1SVRfsqvZlyaEDMvqbWDStrbWTBYzgoLZazOME7YdPtwwQey9/KL5djlYBLiNUgEnc mF76znt7Y8xj3rKShkmkhh7b3MFD32MAphf7Pq37XbUg1akcpb3hUGUdW9OIoaQDzqUP 5fjw== X-Forwarded-Encrypted: i=1; AJvYcCUfdz1qzSlNskJUaHXJGeqMkR+gq3yYlGQe+OxOnuCX/7QXKyDB3Mwiaae0cNci1tmUYuddF4hemHA=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwYkysxeIg9Z6OSWhgUEbFjTgItoodJkToXIkCzd2nyiPZpr5KR L0OuCT4f72FP6mf+GuvVpxV0iYO7PQJVQXsA1aKm4wkKXsufXMyrsCga X-Gm-Gg: ATEYQzxc8NWqaXFu1ugwgBiqrABd8YYD2x1QERRSjygOtXTKnqZppl7blafu6Bcemxd 20FXJmfE8HNcdsooJ+JgAV0PrCP8ltxgShdAxNIHBYob3F3TBiSuI7l2ANzX/JSX8LKaB/NDikv +DIeN8253JTJXw3UbmoeCpAEwDuaf0wMKHvh+3rGwzquDvUJBdLKekpdg5i51KMi0U2aFYciblR SIYQKs0B1tvzVShXZVzPTURCuZNak/vCGwL5VXC/Oe2XMByIgKHoHLunYvPriysirxX6orNF74B Yy8N3PvPBrUT65FZnHu3LPIrasmCBF899paHMkbVYqCWqwM5j60rYIDXWbSLZNIpiB/rcYkhybP akEZ764JUOQqvcBbe2WikJEEpCnqRufpq+i0PRx8yys5erO4mLcAsKb0TE8zLOBlKlLGGR9zOgj sNTgI5vvXizWIBPLHx4NGjs3ELPM0lR3D6vCp96pEBV80WXQ3ir7XM94n9vws= X-Received: by 2002:a05:6808:2385:b0:450:bcc7:18d7 with SMTP id 5614622812f47-4675704dfa8mr1712441b6e.2.1773408246581; Fri, 13 Mar 2026 06:24:06 -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.24.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2026 06:24:06 -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 32/65] dyndbg: Harden classmap and callsite validation Date: Fri, 13 Mar 2026 07:19:57 -0600 Message-ID: <20260313132103.2529746-33-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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Dynamic debug classmaps allow modules to _DEFINE or _USE classmaps, which map classnames to a range of class-IDs (0..62) that they are using. This names => IDs mapping allows many modules to use 0..N independently, and even allows (carefully) shared classnames. Previously, class validation only caught some violations in _DEFINEd classmaps; 0..62 range checks, overlaps among _DEFINEd classmaps, but left blind spots in _USEs, for out of bounds manual offsets, overlapping _USEd classmaps, unknown map types, and orphaned callsite IDs. These oversights could lead to ambiguous routing or spammy warnings during control query execution. This commit hardens classmap and descriptor validation: - Mirror the compile-time limits of _DEFINE by adding a static_assert to validate the _offset value passed to DYNAMIC_DEBUG_CLASSMAP_USE_. - Add run-time overlap checks for _USEd classmaps in ddebug_add_module() to prevent collisions between private maps and imported APIs. - Validate that module classmaps use known enum map types. - Scan module descriptors at load time to print a single warning per missing class_id, rather than waiting for a user query to trip over it. - Downgrade the global WARN_ONCE in ddebug_match_desc() to a pr_warn_ratelimited, since orphaned class IDs are now tracked and warned about early at module load. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 2 ++ lib/dynamic_debug.c | 52 +++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 0d1245aefc69..28684cfc0937 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -262,6 +262,8 @@ struct _ddebug_class_param { #define __DYNAMIC_DEBUG_CLASSMAP_USE(_var, _offset, _uname) \ extern struct _ddebug_class_map _var; \ + static_assert((_offset) >= 0 && (_offset) < _DPRINTK_CLASS_DFLT, \ + "classmap use offset must be in 0..62"); \ static struct _ddebug_class_user __aligned(8) __used \ __section("__dyndbg_class_users") _uname = { \ .mod_name = KBUILD_MODNAME, \ diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 2083a8546460..635df6edb4cf 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -320,7 +320,7 @@ static bool ddebug_match_desc(const struct ddebug_query *query, /* site is class'd */ site_map = ddebug_find_map_by_class_id(di, dp->class_id); if (!site_map) { - WARN_ONCE(1, "unknown class_id %d, check %s's CLASSMAP definitions", + pr_warn_ratelimited("unknown class_id %d, check %s's CLASSMAP definitions\n", dp->class_id, di->mod_name); return false; } @@ -1404,9 +1404,8 @@ static void ddebug_apply_class_users(const struct _ddebug_info *di) (__dst)->info._vec.len = __nc; \ }) -static int __maybe_unused -ddebug_class_range_overlap(struct _ddebug_class_map *cm, - u64 *reserved_ids) +static int ddebug_class_range_overlap(struct _ddebug_class_map *cm, + u64 *reserved_ids) { u64 range = (((1ULL << cm->length) - 1) << cm->base); @@ -1420,6 +1419,23 @@ ddebug_class_range_overlap(struct _ddebug_class_map *cm, return 0; } +static int ddebug_class_user_overlap(struct _ddebug_class_user *cli, + u64 *reserved_ids) +{ + struct _ddebug_class_map *cm = cli->map; + int base = cm->base + cli->offset; + u64 range = (((1ULL << cm->length) - 1) << base); + + if (range & *reserved_ids) { + pr_err("[%d..%d] (from %s) conflicts with %llx\n", base, + base + cm->length - 1, cm->class_names[0], + *reserved_ids); + return -EINVAL; + } + *reserved_ids |= range; + return 0; +} + /* * Allocate a new ddebug_table for the given module * and add it to the global list. @@ -1430,6 +1446,7 @@ static int ddebug_add_module(struct _ddebug_info *di) struct _ddebug_class_map *cm; struct _ddebug_class_user *cli; u64 reserved_ids = 0; + u64 bad_ids = 0; int i; if (!di->descs.len) @@ -1454,10 +1471,33 @@ static int ddebug_add_module(struct _ddebug_info *di) dd_mark_vector_subrange(i, cli, &dt->info, users, dt); /* now di is stale */ - /* insure 2+ classmaps share the per-module 0..62 class_id space */ - for_subvec(i, cm, &dt->info, maps) + /* validate class map types and the per-module 0..62 class_id space */ + for_subvec(i, cm, &dt->info, maps) { + if (cm->map_type > DD_CLASS_TYPE_LEVEL_NUM) { + pr_err("module %s has unknown classmap type %d\n", dt->info.mod_name, cm->map_type); + goto cleanup; + } if (ddebug_class_range_overlap(cm, &reserved_ids)) goto cleanup; + } + + for_subvec(i, cli, &dt->info, users) + if (ddebug_class_user_overlap(cli, &reserved_ids)) + goto cleanup; + + /* validate all class_ids against module's classmaps/users */ + for (i = 0; i < dt->info.descs.len; i++) { + struct _ddebug *dp = &dt->info.descs.start[i]; + + if (dp->class_id == _DPRINTK_CLASS_DFLT) + continue; + if (bad_ids & (1ULL << dp->class_id)) + continue; + if (!ddebug_find_map_by_class_id(&dt->info, dp->class_id)) { + pr_warn("module %s uses unknown class_id %d\n", dt->info.mod_name, dp->class_id); + bad_ids |= (1ULL << dp->class_id); + } + } mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); -- 2.53.0