From nobody Tue Feb 10 03:44:57 2026 Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 A4BCE20969A for ; Sat, 25 Jan 2025 06:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787612; cv=none; b=rGKaGSZIl0UMwPVZLyqp9rM2RAMaT5wTKpZ7ca4ZlIB1l42mH1YTbAzsqpk4gM+mqlIGTSy2Y5ZtCrCJmMxgNr5VKXKOguF4AXnfS4pVFlkTOFOcshPZeqTimnWmhP023op+N8jvfd6UPWOlHL4gMSmjKMoUQVZ0KyD/cdKSaHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737787612; c=relaxed/simple; bh=H6GcwM+BlpT+OJcceR6aSE9k56//OpwcMqIJNWBK8Uw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FQkeyM0mp4egOE8Zrt24d2+tdwBE8SttuOnJaUZrgWW7mfAri/pvAvw922qeksFTjfHuXV+86HbsT30LgfhfH91VfcteQH2/tr4odUmMmF6f9njxnCSGi0DMOaWyLrYNSjSzriVOW9Em4CsLhaJfZhCC1EgMXGs03A6rJpLzT/g= 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=NVEm+WVJ; arc=none smtp.client-ip=209.85.166.171 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="NVEm+WVJ" Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3a81324bbdcso21660875ab.1 for ; Fri, 24 Jan 2025 22:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737787609; x=1738392409; 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=urmnkuLrh5iZivbcnepwjXmHK5mBTPl4o7K5sFAjLFQ=; b=NVEm+WVJlDA3JsA1T5/wGjOkNvr8qM8t09gT75QA7qct3DweqQDWAhPtPxTzYpoDtb kNiRdqNMdjj7srN2nwSWsFAjd9+A5WZ0/zG7e8zcAxRZqtlAsKDDYGjE3SxKKPb7pjfC NF2KL/y2dhkFa0tiXN4ObuX0bVyyqvHJbsN9Ug9zsTBcne6GI/0NNTd7Jf40aVJT1oI6 OifjNoEyZuoxx0gvTkGpmHYfusruTwHJfBfRRram0EKkFdxek43Axk8kBx1c5mVHkUXj 8Bbg4Pf73YCVKGAeJz0+HhDCP3ACvuFQPmDRbF9WOtK66gtB3AKlkYiRuahnNG46Bv15 K23A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737787609; x=1738392409; 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=urmnkuLrh5iZivbcnepwjXmHK5mBTPl4o7K5sFAjLFQ=; b=Hz2wIIN+Cki2JNP6UkwX3p8iO4EWNCiQqWdn1TFWUyJv87qVVRG4HUvE69hgqw7JIp YDmkZ7Du/yHHCE+Tm71bWHPe4MWiBnnG3cXrdF+8EXlu1xYfd39KpT269OdW+R7hlBCX ZlnwJuERjBSnieW29qwiYvA+t3GgAsgPfPs9LSCo1JWmWar+PGoevigO/pZgp5xiIHuP PA2LUw1HABvSLJgRFRVLSkMZ5I7dhrJc0Mtq/ivL21O3ZZuz3CCUjQA/wCAZLoKD4RFA Jf+PkgtQJ/xpGusxLMrNjVaG5GUKezgXouaLQA0G+byijYioFqV5vQnAT51bC6H/RZAE uCgg== X-Gm-Message-State: AOJu0YzeCeyCKSBDN3IdCM6Gah7q/kji1Dgo0RBELlfUQAeu0GKgd8O7 oCdsVFEjSjiRSchDb8G/20uv19aQL+m2Q7R1R+jhYb9vOgnGI+75kclncg== X-Gm-Gg: ASbGnctjIMxwNM9SvXzArr46xJf3VdjEUnztfFX4VKYlMDzWFvn4Ddhb27neLtbzQTc AzzeBjPsCV/5SsLjwsvSH25r1QfDM/3lr2G+/rnSHOezm+xIoU9MWMW9cncVrU3YoOkKRyOAjY0 nxtYF8tpLMukN7jAyzwBgEm+2laMxLPP0NXWZVHmMaeNnswOn0/FHTSnD/r4yu1fI3ikuC3EBgv k8XzPOcFl/aSt462FVdZR9IVT7CTKpPDgdaPw7JKxVZKYYgvxi98BdW0/ZfNl1N1Z+4lZ33Oe0r i2G47BPwdtHE0OjwGnZDmedAWT3whDu2DxpfJQ== X-Google-Smtp-Source: AGHT+IEvmisYZlf1TfhlUiVyjFpSDJwdao+1WM75v1n/+Qb4/O1LfWsp2czciBXM069u/2UjUxgPMQ== X-Received: by 2002:a05:6e02:1f84:b0:3cf:b26f:ff7c with SMTP id e9e14a558f8ab-3cfb2700234mr145910675ab.5.1737787609593; Fri, 24 Jan 2025 22:46:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jan 2025 22:46:49 -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 12/63] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Fri, 24 Jan 2025 23:45:26 -0700 Message-ID: <20250125064619.8305-13-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" old_bits arg is currently a pointer to the input bits, but this could allow inadvertent changes to the input by the fn. Disallow this. And constify new_bits while here. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- lib/dynamic_debug.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index a3849ac3be23..fc9bf5d80aa9 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -597,7 +597,8 @@ static int ddebug_exec_queries(char *query, const char = *modname) =20 /* apply a new class-param setting */ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, - unsigned long *new_bits, unsigned long *old_bits, + const unsigned long *new_bits, + const unsigned long old_bits, const char *query_modname) { #define QUERY_SIZE 128 @@ -606,12 +607,12 @@ static int ddebug_apply_class_bitmap(const struct dde= bug_class_param *dcp, int matches =3D 0; int bi, ct; =20 - if (*new_bits !=3D *old_bits) + if (*new_bits !=3D old_bits) v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); =20 for (bi =3D 0; bi < map->length; bi++) { - if (test_bit(bi, new_bits) =3D=3D test_bit(bi, old_bits)) + if (test_bit(bi, new_bits) =3D=3D test_bit(bi, &old_bits)) continue; =20 snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], @@ -623,9 +624,9 @@ static int ddebug_apply_class_bitmap(const struct ddebu= g_class_param *dcp, v2pr_info("bit_%d: %d matches on class: %s -> 0x%lx\n", bi, ct, map->class_names[bi], *new_bits); } - if (*new_bits !=3D *old_bits) + if (*new_bits !=3D old_bits) v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); =20 return matches; } @@ -681,7 +682,7 @@ static int param_set_dyndbg_classnames(const char *inst= r, const struct kernel_pa continue; } curr_bits ^=3D BIT(cls_id); - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, *dcp->bits, NULL); *dcp->bits =3D curr_bits; v2pr_info("%s: changed bit %d:%s\n", KP_NAME(kp), cls_id, map->class_names[cls_id]); @@ -691,7 +692,7 @@ static int param_set_dyndbg_classnames(const char *inst= r, const struct kernel_pa old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); curr_bits =3D CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); =20 - totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); + totct +=3D ddebug_apply_class_bitmap(dcp, &curr_bits, old_bits, NULL); *dcp->lvl =3D (cls_id + (wanted ? 1 : 0)); v2pr_info("%s: changed bit-%d: \"%s\" %lx->%lx\n", KP_NAME(kp), cls_id, map->class_names[cls_id], old_bits, curr_bits); @@ -745,7 +746,7 @@ static int param_set_dyndbg_module_classes(const char *= instr, inrep &=3D CLASSMAP_BITMASK(map->length); } v2pr_info("bits:0x%lx > %s.%s\n", inrep, modnm ?: "*", KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, modnm); + totct +=3D ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, modnm); *dcp->bits =3D inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -758,7 +759,7 @@ static int param_set_dyndbg_module_classes(const char *= instr, old_bits =3D CLASSMAP_BITMASK(*dcp->lvl); new_bits =3D CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, modnm); + totct +=3D ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, modnm); *dcp->lvl =3D inrep; break; default: --=20 2.48.1