From nobody Tue Feb 10 01:59:58 2026 Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) (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 494EE20B1E7 for ; Sat, 25 Jan 2025 06:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787625; cv=none; b=dediC5oE7MqjAOwEpkg+zIRVB0aHFdCeFu/pKArOp+bt+e0j6cdMKWVNg2WBPcMOqliaO4pCV5HFKPUSPSeZ55qvY6yA5ErX9NbDlv801l9LnbTktHQtHIx8ObpQGxc5CPrt6TvWhDM1kXR3xtu7u/3tU2FeEhKoy+1fGy9UtBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787625; c=relaxed/simple; bh=KWKuzEh31Lr9/5aB+dwEOd1fkt1V3QipxzGymfsqWTg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GsAraZ08GhBy3bwOavqfAJHPNBrI7meIaL74jLVWM2MwNHlBge57rx83Hy45QryI9EFQoTmFdZL/6IYPnsj9f3GyYRPJQ2DStB0hTFTtC53/g2p5l7eAGXRzqPZ0ANH3PqY/Ls4SCWDNlVx4XYwuSvA51aaawaXsBCC3IzWvtFA= 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=ROzJwxtN; arc=none smtp.client-ip=209.85.166.47 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="ROzJwxtN" Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-844de072603so202525339f.0 for ; Fri, 24 Jan 2025 22:47:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787622; x=1738392422; 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=Ay4skInVUyOhJHhfCYrUYPj/jftvwF5qPOXpqm+4U44=; b=ROzJwxtNE7b/eRs2EM1CaczP/umplqrPswFDoh5ONhci2Obd6xzGqTOUvh+6F4e3Su DVCijp0iaBGm2s80hqIX+3Oj8F/xXP3KT3KuGDCkZX0QyeD2tO7xJo/g33HQCfjVMgES ZmOifV1ls9xqb6+HIzYIZICLpaFUPJtnONLfITYrieRQWhSVHEL4DP7eVZ3jz/lqunD4 0bxIGXc2ofYVccj5LYH+0K+K6JWVOjwcGG83oBctijRgEbuPRVHewj4hUGDkjImjJApW tldKvwxvWMy6d1izoFLoGP/9IEWoTy7SBqA4otB4jb23EVH2j1Tx51i43afvaK+xNBsB Om9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787622; x=1738392422; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ay4skInVUyOhJHhfCYrUYPj/jftvwF5qPOXpqm+4U44=; b=OiKN60lysfVGHv5yOo4mfNMSX+3ddKFUvIWFmuJjy8RGUW//TIra5rbcL4axgCcKYH H0DBEfUDyHc0LXQuV1S0akqpshktJjhtFJT8E+RwqjINIoYpekkCLmwi+NM8p8/nDCrN 3v3qAftAGy6epL4iPXr6BddxgxWzNDXND4/SLsWJwVliyynKSMqUIWvOE+6L9rpLU/95 bKIfDC+kroLZ56c6nxYa+p6tDgsRsgmoSGsYN5JWar48O/YdhG0wxMZOgkp3f4/J7G6V hLedOQeu0C/+7Ecoa0NQf9QTWiaVIsLMmk4Rle+IBFMlnvhCcbyWeDnguEpyn0YV+cnC IfGw== X-Gm-Message-State: AOJu0YwyajenHOgKsrgfXjbHyX6vX0/AqftRk7Unmol0SwNh9XODdflF 0UWTdcgDOE6Kz04GMXnBz4ub5a082ykpVTuCZspSKTIDwbe+/I0sFxuxLQ== X-Gm-Gg: ASbGncu4F07lxEiPT+zKcDnwToiErvVv8prDmz6DO6KI8MmpnxxyV6TnATpyc/nzDLI JqGlsCzbMT4oR4P0m9BzRgC+eMukZQoIi9WCGGIl8ERwKD2djbgzKvQ9BMunYaZZ1KW4dxQcp+8 /sL45W+Y7gCmj4ZtUfS3yO1l7x8kn8NQl6+IenNXfDPk632PJYsRkiSEZ8nUUT+b2U+wdGkM5iX +hv+j5kpi62UanGjmz00oUGAkO0YTNyFH7AZ6+xZKS27eyzfZPi9DT9Vp9eamXWTyhcgrJbvXWx QtTflE/S1imLelwTbXQUgQJpLJxiD2w95kd6CA== X-Google-Smtp-Source: AGHT+IHwnJ59B7v8sJsE0jjHjZyiOHK16NDE06hCK0yvg1ng9VyLIvAL9ptQW3TlC08SLLFiwpxM3g== X-Received: by 2002:a05:6602:36cc:b0:844:c76a:354d with SMTP id ca18e2360f4ac-851b6162856mr2762621339f.2.1737787622215; Fri, 24 Jan 2025 22:47:02 -0800 (PST) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id 8926c6da1cb9f-4ec1da476fesm1174144173.58.2025.01.24.22.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:47:01 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org Cc: intel-gfx-trybot@lists.freedesktop.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, Jim Cromie Subject: [PATCH 23/63] dyndbg: fail modprobe on ddebug_class_range_overlap() Date: Fri, 24 Jan 2025 23:45:37 -0700 Message-ID: <20250125064619.8305-24-jim.cromie@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250125064619.8305-1-jim.cromie@gmail.com> References: <20250125064619.8305-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" 1. All classes used by a module (declared DYNDBG_CLASSMAP_{DEFINE,USE} by module code) must share 0..62 class-id space; ie their respective base,+length reservations shouldn't overlap. Overlaps would lead to unintended changes in ddebug enablements. Detecting these class-id range overlaps at compile-time would be ideal but is not obvious how; failing at modprobe at least insures that the developer sees and fixes the conflict. ddebug_class_range_overlap() implements the range check, accumulating the reserved-ids as it examines each class. It probably should use bitmaps. A previous commit reworked the modprobe callchain to allow failure, now call ddebug_class_range_overlap() to check when classid conflicts happen, and signal that failure. NB: this can only happen when a module defines+uses several classmaps, TBD: failing modprobe is kinda harsh, maybe warn and proceed ? test_dynamic_debug*.ko: If built with -DFORCE_CLASSID_CONFLICT_MODPROBE, the modules get 2 bad DYNDBG_CLASS_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 fail. TODO: do in submod only, since fail of parent prevents submod from ever trying. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- --- lib/dynamic_debug.c | 30 ++++++++++++++++++++++++------ lib/test_dynamic_debug.c | 11 ++++++++++- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 8afcd4111531..8e1e087e07c3 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1211,6 +1211,21 @@ static void ddebug_apply_params(const struct ddebug_= class_map *cm, const char *m } } =20 +static int 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; +} + /* * scan the named array: @_vec, ref'd from inside @_box, for the * start,len of the sub-array of elements matching on ->mod_name; @@ -1242,9 +1257,11 @@ static int ddebug_module_apply_class_maps(struct dde= bug_table *dt, struct ddebug_class_map *cm; int i; =20 - for_subvec(i, cm, &dt->info, maps) + for_subvec(i, cm, &dt->info, maps) { + if (ddebug_class_range_overlap(cm, reserved_ids)) + return -EINVAL; ddebug_apply_params(cm, cm->mod_name); - + } vpr_info("module:%s attached %d classmaps\n", dt->mod_name, dt->info.maps= .len); return 0; } @@ -1255,10 +1272,11 @@ static int ddebug_module_apply_class_users(struct d= debug_table *dt, struct ddebug_class_user *cli; int i; =20 - /* now iterate dt */ - for_subvec(i, cli, &dt->info, users) + for_subvec(i, cli, &dt->info, users) { + if (ddebug_class_range_overlap(cli->map, reserved_ids)) + return -EINVAL; ddebug_apply_params(cli->map, cli->mod_name); - + } vpr_info("module:%s attached %d classmap uses\n", dt->mod_name, dt->info.= users.len); return 0; } @@ -1311,11 +1329,11 @@ static int ddebug_add_module(struct _ddebug_info *d= i, const char *modname) return rc; } } + mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); =20 - if (dt->info.users.len) { rc =3D ddebug_module_apply_class_users(dt, &reserved_ids); if (rc) diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index b1555b0a2bb1..74b98adc4ed0 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -81,7 +81,7 @@ enum cat_disjoint_bits { D2_DRMRES }; =20 /* numeric verbosity, V2 > V1 related */ -enum cat_level_num { V0 =3D 14, V1, V2, V3, V4, V5, V6, V7 }; +enum cat_level_num { V0 =3D 16, V1, V2, V3, V4, V5, V6, V7 }; =20 /* recapitulate DRM's parent(drm.ko) <-- _submod(drivers,helpers) */ #if !defined(TEST_DYNAMIC_DEBUG_SUBMOD) @@ -90,6 +90,7 @@ enum cat_level_num { V0 =3D 14, V1, V2, V3, V4, V5, V6, V= 7 }; * classmaps on the client enums above, and then declares the PARAMS * ref'g the classmaps. Each is exported. */ + DYNDBG_CLASSMAP_DEFINE(map_disjoint_bits, DD_CLASS_TYPE_DISJOINT_BITS, D2_CORE, "D2_CORE", @@ -113,6 +114,14 @@ DYNDBG_CLASSMAP_DEFINE(map_level_num, DD_CLASS_TYPE_LE= VEL_NUM, DYNDBG_CLASSMAP_PARAM(disjoint_bits, p); DYNDBG_CLASSMAP_PARAM(level_num, p); =20 +#ifdef FORCE_CLASSID_CONFLICT_MODPROBE +/* + * Enable with -Dflag on compile to test overlapping class-id range + * detection. This should break on modprobe. + */ +DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE"); +#endif + #else /* TEST_DYNAMIC_DEBUG_SUBMOD */ =20 /* --=20 2.48.1