From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C06D5ECD6FD for ; Thu, 12 Feb 2026 00:14:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C9A7110E681; Thu, 12 Feb 2026 00:14:35 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KKpvJmaI"; dkim-atps=neutral Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DF5410E675 for ; Thu, 12 Feb 2026 00:14:27 +0000 (UTC) Received: by mail-oi1-f194.google.com with SMTP id 5614622812f47-45f126d47b8so3634742b6e.2 for ; Wed, 11 Feb 2026 16:14:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770855266; x=1771460066; darn=lists.freedesktop.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=GcfD0NNAXOV5iB7XB/jZb6fkGdoFWNXPvWQQ9iDEfVQ=; b=KKpvJmaIXlvtDbSi7l6/S3BkyxJXB/ugG5XzA4q6XnR8b3M1fn5JgHASkphzYVxYj1 kvRjFNjCApMtydJgyURQmsxLZSBMRnrdJ0rsdtFQavnEyUje8VYaSDXC8cb1ZN0BF5vC J2Z4wAeyr80GuSwRZMnxxxJhb499/DxJ5ke9sLdYklXGSQHvm5CoiQnx3T+V79XCz3LM 5dIB7Hd2WMizxAoAEaFQ3HH9KO74eX1DmzKPRncP1mL1uYaY9ix32OmzH9t1Pb9Xm6z3 GmCyRWw2pZhYt1WiiHIU2RBbLaNBcf9qcDPLuoodBxYBHSxUkErDmbzeeAkO2ExT0STm cZ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770855266; x=1771460066; 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=GcfD0NNAXOV5iB7XB/jZb6fkGdoFWNXPvWQQ9iDEfVQ=; b=lU/U+GEzD+MsW36tZx39QrikJmCQnd7UTKRsSt22YDOIU9ClvyP2gpmtxpH1eCAf6w LJABnYhswDyStRdq9kjH5e5hel5zJO/4M3N+6Vg6qKUzPajlkqm72DVh7AXvHV4ncHHF 16B4THC/eOoLtQ4I72vjfjQqZzAzqAqc6EE6uilRE4qnp8VTYfLJDbc1QHLYGKLDyUb4 2BztVbZuDF/fXsKn3SLlZW+EXZAWip6fSI/9UH1IHSIntYBIyfKU1YeJJcZXLET+BGX7 r5wpRD1izG+s8UCkVyNRUgDHFISvxGv2ClhQaCw93XGxkFdkCprAnYBElrb2wvKEzY4/ xsbg== X-Gm-Message-State: AOJu0YxmScsqh6y0qZ/0ZyLrTovrzjWrhtz4B/pAeSE1IUS3VfLOzyvj 58//uVTt29M9ymH74F7gfEZIGX5tqUQQlyJalb0qAwUBOaBfTFqwkp0gOGalCstL X-Gm-Gg: AZuq6aLWpxPN/ieCY2lOaN/GiO827Pi/pvntMj8dYoo6rZyALj9q+ZbCKgN+rEvEWPq AxOyXukAym0S1psYsY+U/ct2/C556I7L7OuaqpSkaXSIyt743Vj6xkz4n4CElvqL2jt8bE3CdNu 9sZ0ZdXBuZVkjDKKYHppe/qxnizJn7MDx5I7/QBrtL+EZev8JkImLL1N211NnjKsa3CmWulXbmk esyegJuKAdj3k+6jE2YYHjkAWQ1PZxrYBL2fkNYjHKeyxZbT48AwJJddvsvOvFoByPKynd46nGA TeDQwOwif7dAj8Ey8e8JVLcvEOJX7/kqXtRNyCiv7kv/Iy6nnXvIgSv0BoDcqFzH64oyPmEeZEF MYfuuSGiBeSTFIT4ZOY2slySCisOqo0n65A/CHQa1m0lvw8/Cc0erfJF7qolmtGUDs3z0ckZV8N ii+mc9hwSCSsZbQKSmSSO7333jDPz5FHb3LN6x9ktRaCmvAYehjdh9 X-Received: by 2002:a05:6808:309c:b0:45e:fd68:3de4 with SMTP id 5614622812f47-4637b437a82mr641619b6e.0.1770855266350; Wed, 11 Feb 2026 16:14:26 -0800 (PST) Received: from godzilla (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-40eaf1062ffsm2331939fac.13.2026.02.11.16.14.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 16:14:25 -0800 (PST) From: Jim Cromie To: dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org Cc: Jim Cromie , Louis Chauvet Subject: [PATCH 13/61] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Wed, 11 Feb 2026 17:13:08 -0700 Message-ID: <20260212001359.97296-14-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260212001359.97296-13-jim.cromie@gmail.com> References: <20260212001359.97296-1-jim.cromie@gmail.com> <20260212001359.97296-2-jim.cromie@gmail.com> <20260212001359.97296-3-jim.cromie@gmail.com> <20260212001359.97296-4-jim.cromie@gmail.com> <20260212001359.97296-5-jim.cromie@gmail.com> <20260212001359.97296-6-jim.cromie@gmail.com> <20260212001359.97296-7-jim.cromie@gmail.com> <20260212001359.97296-8-jim.cromie@gmail.com> <20260212001359.97296-9-jim.cromie@gmail.com> <20260212001359.97296-10-jim.cromie@gmail.com> <20260212001359.97296-11-jim.cromie@gmail.com> <20260212001359.97296-12-jim.cromie@gmail.com> <20260212001359.97296-13-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. Reviewed-by: Louis Chauvet Signed-off-by: Jim Cromie --- 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 b6ee4d9cad86..c116a3d5e6b5 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -607,7 +607,8 @@ static int ddebug_exec_queries(char *query, const char *modname) /* 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 @@ -616,12 +617,12 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, int matches = 0; int bi, ct; - if (*new_bits != *old_bits) + if (*new_bits != old_bits) v2pr_info("apply bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); for (bi = 0; bi < map->length; bi++) { - if (test_bit(bi, new_bits) == test_bit(bi, old_bits)) + if (test_bit(bi, new_bits) == test_bit(bi, &old_bits)) continue; snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], @@ -633,9 +634,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_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 != *old_bits) + if (*new_bits != old_bits) v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, - *old_bits, query_modname ?: "'*'"); + old_bits, query_modname ?: "'*'"); return matches; } @@ -691,7 +692,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa continue; } curr_bits ^= BIT(cls_id); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, dcp->bits, NULL); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, *dcp->bits, NULL); *dcp->bits = curr_bits; v2pr_info("%s: changed bit %d:%s\n", KP_NAME(kp), cls_id, map->class_names[cls_id]); @@ -701,7 +702,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa old_bits = CLASSMAP_BITMASK(*dcp->lvl); curr_bits = CLASSMAP_BITMASK(cls_id + (wanted ? 1 : 0 )); - totct += ddebug_apply_class_bitmap(dcp, &curr_bits, &old_bits, NULL); + totct += ddebug_apply_class_bitmap(dcp, &curr_bits, old_bits, NULL); *dcp->lvl = (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); @@ -755,7 +756,7 @@ static int param_set_dyndbg_module_classes(const char *instr, inrep &= CLASSMAP_BITMASK(map->length); } v2pr_info("bits:0x%lx > %s.%s\n", inrep, mod_name ?: "*", KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, mod_name); + totct += ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, mod_name); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -768,7 +769,7 @@ static int param_set_dyndbg_module_classes(const char *instr, old_bits = CLASSMAP_BITMASK(*dcp->lvl); new_bits = CLASSMAP_BITMASK(inrep); v2pr_info("lvl:%ld bits:0x%lx > %s\n", inrep, new_bits, KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, mod_name); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, mod_name); *dcp->lvl = inrep; break; default: -- 2.53.0