From nobody Tue Dec 2 02:41:30 2025 Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) (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 2352036921D for ; Tue, 18 Nov 2025 20:19:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497169; cv=none; b=rY0wNuisBxz7mUAbERD4h4AVvJVEMUsd9dKrKsFLJAoke+xrvc9verSVpgOssTwvjkoy6ci9yxuRqyN7ynwKWJin/YpVu2gS1LEEa1uENhIWkX/cVEQp+pjP+mlR6B1QG7MQaTki9mWvrP+2sl0BLu1i3L6txj/U0ZpXnVzPvYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497169; c=relaxed/simple; bh=WfBFKyhLRyyzc7Dtwh5RArbJNXQPnwbENTz83sKaVq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ksjpGZjjAMp2a5cfyGH0YZhmkDoAsozyPY78AlXR9PtCaYZt5AbmnVL2LWLJYoq7A+1HMgtPJfRYNu8nbY5rNk0DMguxzmzW3cSirNOJ6kVKXWVgDhVyfbs/sDzChexVdwU+J8pfqw8C9mGVi9F+XMgq99WQq1qiQO5qF5/CSrI= 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=GPgwTO/z; arc=none smtp.client-ip=209.85.166.52 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="GPgwTO/z" Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-9486d008fdbso8786639f.1 for ; Tue, 18 Nov 2025 12:19:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763497165; x=1764101965; 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=Lf2KYKGZTZbOL5PiLrqZOpnGDaNeXmVBMrHOoH3mOwo=; b=GPgwTO/zBAstuEctCsgdW4DqI3iXChjugbfV+dRVyk0NnHghxWVRUA3w+bS3f7zghT BJOjmMcoZKvy+cD/6Cn6xpmUCjNOyUWVRMnxWEo3a0n4BkPAV88bpDyXB3bgqagTmRV0 kxbkZ1LQIKYJcWKdHXZY3K+RsQgUVj377FDensKQlc4OkFONNMZtf6bX9hjJCsxwANKR 4dHFt5n6nue/RkOJSSBMeUgZPGK6fpMMVH1UDBIBE5tWYGcW4Uzqu1yroqkHYg7ZMwqX MGdXuMDv24p4waLuHAD/Nl4++FuttiyUyHXHcpIZIHV/XMBoTPjmVojDU7kK4xCc3CqM u5jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763497165; x=1764101965; 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=Lf2KYKGZTZbOL5PiLrqZOpnGDaNeXmVBMrHOoH3mOwo=; b=NB850tyKoZKBChpI+lQnHAxVxgfYy3uKoM+D4mdDVI/E5o1bAjimvYD4uX79SLW4Wq vw80TpusAPlRKVKalZgL8CmLTx3p+GozMj583bHmO3Cg5ZWOei3+winrEW53k2jdL0yy gxZn5K/tzUcKuj1BlhBnRrt+MOjVAA8s1L4ZWBSbnxe11RJcK6ePb7C0lipIj85Tad6W 72QInMUF15OBYCV2aYA2Fx6vgwMlQWX1fSnBTHwXecWD8FEYJ4ojbPY5BVhhaB3U+Yta JaJQetoYFKgIlR448BZYZ2QFFPTZlnE8oSL5nYtgWY9PpsD3w9MMKJ2+d97otY2SI2Bc 1K2Q== X-Gm-Message-State: AOJu0YxBn5gmvKJImFNNl+azMkfWKsV1hmrwzVtZB/O7H4WDYqtKa58A f0rdOUd68DEP/F8DHSkGvVLvoXW5W8iPU/DNWv9YLU/9wC0DoSxnOdn7I6GTw7SB X-Gm-Gg: ASbGncstm3rcTB9+rvNOURMyE0ajirEpayp1QpYC8fN2GcbXdE052w0wJec20FTeLAM 5fZkP6yA1kAmPnEHSrG8sZ4bReq0Z3ybpaYNMr2U2Gx35W+KDfcoEy9ibDt/+m9RDpQXS5LmQgY Elrhh+78Og0TKK/ahkoXvdo9nv0Aj7NH0VJ07UCSJyn6zJp9p9kFftxYKkLc74Jam0C8fUgMv7a wZaAbtmfLANwsIyvykze5NUqdv9Z+q+cHAFbh+/BVsGAJKrSCcoHeSx45bCI9sVyvmel1+Qls4F Pta3Ef3kZEIUB3z4fwJJCK821ZVMMXbFC5GhiUlE0ZPANu/k1BCHtseC5bw7fLLenRi68c8d+wU LImNhwSEYcAx9TLvjtPX70cbOoBW0WRnDVemwKhrOFVlZMWSOOY8RgWgQT8dDASt1WaTaFLqc7j zkfgkp2cAtWBSfRIj3p/QQhJDMXPl90RNrSNFzdVDN/RVqp+cXnHfKNBd8VMVCXmrHZPhpbfQiO KTSMA== X-Google-Smtp-Source: AGHT+IGx1eNlZGV/xEbBO/tczptXELUHfkRxYaLx6Xv6FIVM3pmvNf0oeW2cq5nrxOsKyemhr0F/dw== X-Received: by 2002:a05:6602:3f93:b0:949:66a:4d77 with SMTP id ca18e2360f4ac-9492b8a1422mr16324939f.5.1763497165261; Tue, 18 Nov 2025 12:19:25 -0800 (PST) Received: from godzilla.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id ca18e2360f4ac-948fd4c273bsm419823939f.18.2025.11.18.12.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 12:19:24 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, jbaron@akamai.com Cc: ukaszb@chromium.org, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v6 22/31] dyndbg: detect class_id reservation conflicts Date: Tue, 18 Nov 2025 13:18:32 -0700 Message-ID: <20251118201842.1447666-23-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118201842.1447666-1-jim.cromie@gmail.com> References: <20251118201842.1447666-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" If a module _DEFINEs 2 or more classmaps, it must devise them to share the per-module 0..62 class-id space; ie their respective base,+length reservations cannot overlap. To detect conflicts at modprobe, add ddebug_class_range_overlap(), call it from ddebug_add_module(), and WARN and return -EINVAL when they're detected. This insures that class_id -> classname lookup has just 1 answer, so the 1st-found search in find-class-name works properly. test_dynamic_debug.c: If built with -DFORCE_CLASSID_CONFLICT, the test-modules invoke 2 conflicting DYNAMIC_DEBUG_CLASSMAP_DEFINE() declarations, into parent and the _submod. These conflict with one of the good ones in the parent (D2_CORE..etc), causing the modprobe(s) to warn Signed-off-by: Jim Cromie --- - USE doesnt need conflict test against DEFINE infact its wrong-headed - of course theyd overlap. --- lib/dynamic_debug.c | 40 +++++++++++++++++++++++++++++++++------- lib/test_dynamic_debug.c | 8 ++++++++ 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c6b983f2324b..25b3932891e0 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1292,6 +1292,22 @@ static void ddebug_apply_class_users(const struct _d= debug_info *di) (__dst)->info._vec.len =3D __nc; \ }) =20 +static int __maybe_unused +ddebug_class_range_overlap(struct _ddebug_class_map *cm, + u64 *reserved_ids) +{ + u64 range =3D (((1ULL << cm->length) - 1) << cm->base); + + if (range & *reserved_ids) { + pr_err("[%d..%d] on %s conflicts with %llx\n", cm->base, + cm->base + cm->length - 1, cm->class_names[0], + *reserved_ids); + return -EINVAL; + } + *reserved_ids |=3D range; + return 0; +} + /* * Allocate a new ddebug_table for the given module * and add it to the global list. @@ -1301,6 +1317,7 @@ static int ddebug_add_module(struct _ddebug_info *di) struct ddebug_table *dt; struct _ddebug_class_map *cm; struct _ddebug_class_user *cli; + u64 reserved_ids =3D 0; int i; =20 if (!di->descs.len) @@ -1315,15 +1332,20 @@ static int ddebug_add_module(struct _ddebug_info *d= i) } INIT_LIST_HEAD(&dt->link); /* - * For built-in modules, di-> referents live in .rodata and is - * are 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-> referents live in .*data and are + * immortal. For loaded modules, di points at the dyndbg_info + * member of its struct module, which lives at least as + * long as this struct ddebug_table. */ dt->info =3D *di; - dd_mark_vector_subrange(i, dt, cm, di, maps); - dd_mark_vector_subrange(i, dt, cli, di, users); - /* now di may be stale */ + dd_mark_vector_subrange(i, dt, cm, &dt->info, maps); + dd_mark_vector_subrange(i, dt, cli, &dt->info, users); + /* now di is stale */ + + /* insure 2+ classmaps share the per-module 0..62 class_id space */ + for_subvec(i, cm, &dt->info, maps) + if (ddebug_class_range_overlap(cm, &reserved_ids)) + goto cleanup; =20 mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); @@ -1337,6 +1359,10 @@ static int ddebug_add_module(struct _ddebug_info *di) vpr_info("%3u debug prints in module %s\n", dt->info.descs.len, dt->info.mod_name); return 0; +cleanup: + WARN_ONCE("dyndbg multi-classmap conflict in %s\n", di->mod_name); + kfree(dt); + return -EINVAL; } =20 /* helper for ddebug_dyndbg_(boot|module)_param_cb */ diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 6c4548f63512..1ba4be9a403a 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -128,6 +128,14 @@ DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_level_num, DD_CLASS_= TYPE_LEVEL_NUM, DYNAMIC_DEBUG_CLASSMAP_PARAM(disjoint_bits, p); DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); =20 +#ifdef FORCE_CLASSID_CONFLICT +/* + * 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"); +#endif + #else /* TEST_DYNAMIC_DEBUG_SUBMOD */ =20 /* --=20 2.51.1