From nobody Tue Feb 10 01:59:49 2026 Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) (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 F37CF20CCD7 for ; Sat, 25 Jan 2025 06:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787628; cv=none; b=JiuWQsDxcU7Dvv6+HuikBamjtthmSKCWkAQv5i18ynRnMMyLjvF3Ua2KS3bHIvUdRPTwpbvKhk3jrp1cXRJk4FrmQspXO+9AKuRBbYuzzCy70r+ksC6SNm9EEl9f5NC8ZOLrH5QPjYYx5+Nhoc3FtHXAyeqBmlwZXjKvHiRy0z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787628; c=relaxed/simple; bh=G7hVGXinvTc923v5wyzdYt49ISwWgSCyH6IiGqz6K6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X3ERy8KlgnfnVfYOf2OJfaqjR4g52WmR2yadiR8fMCMsAxGmSJsdYnIOI14z2XwfemvtFfsMs+7o23uy9+CgPGk+6d0KyiFAVt6i8gyRlQNRj3id0LZTNiBDKmhdtTzGwfS/2W8u9O6IbCvYMZpsGstGUpmCU7BUGX75NcIezKs= 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=bQG5O78E; arc=none smtp.client-ip=209.85.166.51 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="bQG5O78E" Received: by mail-io1-f51.google.com with SMTP id ca18e2360f4ac-844e9b83aaaso218499339f.3 for ; Fri, 24 Jan 2025 22:47:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787626; x=1738392426; 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=z5ZcPXriLvyDxGd2w3FWLCNh742QlHcigDxyaXJyQ/k=; b=bQG5O78EgSPBNcm8fLtyvKvP0/4FxN7ADhLqm6D9UAc4jUWLPUTtRLeE8m1oBjGGt+ ofuXZgHO991wCLuQLj0IeQBfDcAz2k6HuM3qqAxxwlI9ar5oQpwb4viWGknFBNuS8xgJ pQELhaqT1ZVQCeFp3gqCIO/H2BgioI1swxk4a9fLQZXTLYQkRF7OpzCdpc7QgLNyVuvw sEU1dIv33wf73X7MFboOreB0XdIVP82ghAzs2182xS4U6AFsNiy/fdODUW4F5beUYIB8 g3Oh7KGH5R0zY7XnE/bdn1aTeSK3n/Z870IYyTP4UXsC+qg+d4MbqwcGLjmF6OSZqnlx TfRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787626; x=1738392426; 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=z5ZcPXriLvyDxGd2w3FWLCNh742QlHcigDxyaXJyQ/k=; b=vBxft3pF5dqS59zg+gWjkQDchykIuidji2R4yGk3iq0/6QRmjZKXpmL6lbORuOX+kB GTB9OrVoas550LSfJWj7izj4vgxCzHUk0kj0X8G3Mxp0xu75aq237/up0m6jdvmHvgQR plmKGFVZAY4cU1Jet6lMzifZnvOigGHU1T8U8/n+Q+DNq3pOzMfsuedVA/9EWD+7sOqt lA5VkyVGoiXmkFzV8kVn3aCN1vIcCesDDPjE9E0Op1IPfjHNIfcoacPtGhw8UEemfoyE yvDT294K5bQ8OFXHwRTQNe1+M+I84GJFd1+LA08l2R8Dya/quWe9B0Wu5B+Cs6DWHtGZ e1jA== X-Gm-Message-State: AOJu0Yze1CQ9RQzo/IdQSJKeDEocK7DHiKfxCIhP0ouXNF1CqXjr2wwV eU0VXHgi6yWGSNhPGMFmFG3YbHEM8DInHzP44Y364UIht4CQU3cE+uRTLQ== X-Gm-Gg: ASbGncvHKx26DX5CInzs7TUXmWd9RvEYqI688jVU+ZcEwwlH/qJVaBROJIdaFbABd+R pQ2IO5XEIJCWUPn7wkZWJGMVSCeOT/GBmYqKF2W8MqUDVv1+YqSZ/EewWXnXsk2M0tbn/1CBudI fkGBWWaPNxk6V5M2hn729HK0mDeFmaE++iPcrvrKWAho8pGcwOU05UrYRZYvKg2AtRkEIbeEEiC w7DTDs8x2cQuQ98jynpQ+XMH/IpkNg+yh7+6f87eWXkExTcmrEVUworx5kHqihuZau8RETebD4F 7/eVGm0V9cWutEreugzFVYQdftYOVsQidsqe8w== X-Google-Smtp-Source: AGHT+IH7EX0Zd8kOjmd85jq7cPnyZB2Gxoa5M/XhjJ0tRWUuoKl8IDet9J12UuSAPni2ukC5wYaBbw== X-Received: by 2002:a05:6602:418a:b0:84a:7906:21e3 with SMTP id ca18e2360f4ac-851b623c48bmr2846147139f.7.1737787624348; Fri, 24 Jan 2025 22:47:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:47:03 -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 25/63] ddebug: cleanup-range-overlap fails Date: Fri, 24 Jan 2025 23:45:39 -0700 Message-ID: <20250125064619.8305-26-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" add cleanup block, to handle kfree before dt is added to list. Once dt is on-list, do ddebug_remove_module to cleanup. tbd. review some more. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index e57c05c9fb0a..781781835094 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1277,6 +1277,7 @@ static int ddebug_module_apply_class_users(struct dde= bug_table *dt, return 0; } =20 +static int ddebug_remove_module(const char *mod_name); /* * Allocate a new ddebug_table for the given module * and add it to the global list. @@ -1318,32 +1319,37 @@ static int ddebug_add_module(struct _ddebug_info *d= i, const char *modname) dd_mark_vector_subrange(i, dt, cm, di, maps); dd_mark_vector_subrange(i, dt, cli, di, users); =20 - for_subvec(i, cm, &dt->info, maps) - if (ddebug_class_range_overlap(cm, &reserved_ids)) - return -EINVAL; - for_subvec(i, cli, &dt->info, users) - if (ddebug_class_range_overlap(cli->map, &reserved_ids)) - return -EINVAL; + for_subvec(i, cm, &dt->info, maps) { + rc =3D ddebug_class_range_overlap(cm, &reserved_ids); + if (rc) + goto cleanup; + } + for_subvec(i, cli, &dt->info, users) { + rc =3D ddebug_class_range_overlap(cli->map, &reserved_ids); + if (rc) + goto cleanup; + } =20 if (dt->info.maps.len) { rc =3D ddebug_module_apply_class_maps(dt, &reserved_ids); - if (rc) { - kfree(dt); - return rc; - } + if (rc) + goto cleanup; } - mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); =20 if (dt->info.users.len) { + /* this needs to find the ref'd class on the ddebug-tables list */ rc =3D ddebug_module_apply_class_users(dt, &reserved_ids); if (rc) - return rc; + return ddebug_remove_module(dt->mod_name); } vpr_info("%3u debug prints in module %s\n", di->descs.len, modname); return 0; +cleanup: + kfree(dt); + return rc; /* tbd might conflict w notify chain */ } =20 /* helper for ddebug_dyndbg_(boot|module)_param_cb */ --=20 2.48.1