From nobody Tue Feb 10 03:45:09 2026 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 2891120AF81 for ; Sat, 25 Jan 2025 06:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787623; cv=none; b=nRuPGw1RE5j7UEqq7D7wBiJEKnWf8PgpIoOYqSfE60hDpMAoDKIkB5cTQDkBInsllgzn0cHcKsVqJcai+ws+yU0bTSWQMIq63E8++IdQKbDcyHlGKhvntxR2Gn8OqpIFRJoY0fukwZ1igySpO2PB0mKfe41ouzb4w5Y005R8Alg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787623; c=relaxed/simple; bh=FMlJ+JzPn9xGOeHyTNTElXiVZaT9icUROFFv+NpRJlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fGqCphMDfBs6X9+WWhqPasgKCW90NhixUX9DwQ8vnKiaOn13NKpkakxvxxPzgsyQp0lBRBEW/33Cg799lykICc94DHoQ0VXLMwr+/XAN5uV9AicDHkG9o9Hhovp9+odDbHLcNdRPyQXnE6gNgPCdWB5gBffX4D8KnAqdapkOeiE= 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=Euttt2Cq; arc=none smtp.client-ip=209.85.166.49 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="Euttt2Cq" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-844de072603so202523739f.0 for ; Fri, 24 Jan 2025 22:47:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787620; x=1738392420; 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=Ytfh/zV61l1ce+ov8of55te3rHqgM7GRb4D7c2dE0nI=; b=Euttt2CqoLWbewiYeWgjIaxt7owHf6vph+D6IYDzahJKCPY87LWw9smW/JAt6FdiO7 ZAcK9mSynNFn5EN4tYAxhNOvIy/xjdTWnhZ7Cj5JmREiBPuVJD1jzX9H5FmM4mI58pFM dKX5z/WmHqXsxDRgBuD+86c4CgUTPrpd3kx5E5/WA3ZVAW3/2+kapCPUt0VC9gManYtf J3TjtDMc2rcoaeosxjzT4W5t/AuD+8MMsIgzkfKud56jyxQ62HMJ1miaps/Q8v8kB19Q 6sr8xMMakhb847gg27PYWdxsywWtCKn3PwMTRt6g4kMR0x/4MXA2gxaWKJkLUmbFvO+W Jdgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787620; x=1738392420; 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=Ytfh/zV61l1ce+ov8of55te3rHqgM7GRb4D7c2dE0nI=; b=j+bMDYSd+0LrjQgLWWk5H6Y2SfgDbzfBC3lkMpoAjZsdYsnDdr/IQJK8OWe1ennMkh EYOVRL0nWqOnkQOL0uyqD+vJ+nwiGmuzGKmwJ55dOxRu6Z6EOlvakLkFud84O7wQv8nj Ur7VbVzfL3bMy1X+tv73EDoPaExPuc9aSN895DC/kth6ONnr2Wp7jAD5aaVhEkm1l7rx Y6wB91Ky83ng6OuSpGkDS1bTHJp+oHUsBgWG6DA3NlmtD4nnbkl0I6nKuqDMbODHg06n coCGkjSrlQFvJxkcH1KP6qL6AaajHbUNZxf8umcCVaahFPhHEN655NwHA3zejHtmLv5v 0vPA== X-Gm-Message-State: AOJu0Yx9suU9W893yE6YHL/QIwJU5NbdJHkxVzlEXM68S6KdfYF4awTg YSZ1SQ/0Ypi5plOyGnCOupjezahMiO5Fnw1iv99cLyFP51RB7lN+sfQZog== X-Gm-Gg: ASbGncvFO6QyYmrOmN6TbnAXjTrIkjMlf51luSnrcxNfl7JAQ0bCg1buqTOK+aHb7/H eqgTIuUwsMjjojCFdW4RapA6OBbOhyLePi+i2yjkJNW+MUXfbmnQi2PJYA1pfPbacjYPPSUw0Vh 8sRBGL1oRq+lBL7sxDrAFLpYkvQ4DqkjiXv3ikJDhVJtuNrXoVsFwr+jFlgkEUTwvq2outHP2iK pvEKuJYn1dquFcSF1j7hKGNIfOedm5IOPoyMPqQq0WxqiFQLfsLXdhRahpo7b7b+NzzvQXvGkjp 7Q0Zmw5/wE+O07RqzvnnO0dw9ZvWGnF+7jglPw== X-Google-Smtp-Source: AGHT+IHZ0rdC7Vd9cUI1tPpIx5JlT8FFJWJY2x9dHWb5lEPIqHartZYwqQohH5tAwYTKxuzcgozcpw== X-Received: by 2002:a05:6602:26c5:b0:83b:5221:2a87 with SMTP id ca18e2360f4ac-851b616986dmr3118385239f.3.1737787619986; Fri, 24 Jan 2025 22:46:59 -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.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:46:59 -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 21/63] dyndbg: allow ddebug_add_module to fail Date: Fri, 24 Jan 2025 23:45:35 -0700 Message-ID: <20250125064619.8305-22-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" To prep for failing modprobe on classid conflicts, upgrade the call-chain around ddebug_add_module(), in 2 ways: 1. in ddebug_add_module() add local reserved_ids to accumulate reservations, pass it by ref to ddebug_attach_{,user_}module_classes() so they can examine the reservations as they work. 2. return int from both ddebug_attach_{,user_}module_classes(), up to ddebug_add_module(), then to ddebug_module_notify(). No conflicts are currently detected or returned. TBD: This is updated further by hoisting the reservation-check, which obsoletes part of 2, creating churn, maybe squash it away. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- lib/dynamic_debug.c | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 16c9b752822b..0ef243e30663 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1216,8 +1216,9 @@ static void ddebug_apply_params(const struct ddebug_c= lass_map *cm, const char *m * modular classmap vector/section. Save the start and length of the * subrange at its edges. */ -static void ddebug_attach_module_classes(struct ddebug_table *dt, - const struct _ddebug_info *di) +static int ddebug_attach_module_classes(struct ddebug_table *dt, + const struct _ddebug_info *di, + u64 *reserved_ids) { struct ddebug_class_map *cm; int i, nc =3D 0; @@ -1230,13 +1231,14 @@ static void ddebug_attach_module_classes(struct dde= bug_table *dt, } } if (!nc) - return; + return 0; =20 vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); dt->info.maps.len =3D nc; =20 for_subvec(i, cm, &dt->info, maps) ddebug_apply_params(cm, cm->mod_name); + return 0; } =20 /* @@ -1244,8 +1246,9 @@ static void ddebug_attach_module_classes(struct ddebu= g_table *dt, * means a query against the dt/module, which means it must be on the * list to be seen by ddebug_change. */ -static void ddebug_attach_user_module_classes(struct ddebug_table *dt, - const struct _ddebug_info *di) +static int ddebug_attach_user_module_classes(struct ddebug_table *dt, + const struct _ddebug_info *di, + u64 *reserved_ids) { struct ddebug_class_user *cli; int i, nc =3D 0; @@ -1266,7 +1269,7 @@ static void ddebug_attach_user_module_classes(struct = ddebug_table *dt, } } if (!nc) - return; + return 0; =20 dt->info.users.len =3D nc; =20 @@ -1275,6 +1278,7 @@ static void ddebug_attach_user_module_classes(struct = ddebug_table *dt, ddebug_apply_params(cli->map, cli->mod_name); =20 vpr_dt_info(dt, "attach-client-module: "); + return 0; } =20 /* @@ -1284,6 +1288,8 @@ static void ddebug_attach_user_module_classes(struct = ddebug_table *dt, static int ddebug_add_module(struct _ddebug_info *di, const char *modname) { struct ddebug_table *dt; + u64 reserved_ids =3D 0; + int rc; =20 if (!di->descs.len) return 0; @@ -1306,16 +1312,23 @@ static int ddebug_add_module(struct _ddebug_info *d= i, const char *modname) =20 INIT_LIST_HEAD(&dt->link); =20 - if (di->maps.len) - ddebug_attach_module_classes(dt, di); - + if (di->maps.len) { + rc =3D ddebug_attach_module_classes(dt, di, &reserved_ids); + if (rc) { + kfree(dt); + return rc; + } + } mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); =20 - if (di->users.len) - ddebug_attach_user_module_classes(dt, di); =20 + if (di->users.len) { + rc =3D ddebug_attach_user_module_classes(dt, di, &reserved_ids); + if (rc) + return rc; + } vpr_info("%3u debug prints in module %s\n", di->descs.len, modname); return 0; } @@ -1400,6 +1413,11 @@ static int ddebug_module_notify(struct notifier_bloc= k *self, unsigned long val, switch (val) { case MODULE_STATE_COMING: ret =3D ddebug_add_module(&mod->dyndbg_info, mod->name); + if (ret =3D=3D -EINVAL) { + pr_err("conflicting dyndbg-classmap reservations\n"); + ddebug_remove_module(mod->name); + break; + } if (ret) WARN(1, "Failed to allocate memory: dyndbg may not work properly.\n"); break; --=20 2.48.1