From patchwork Mon Apr 29 19:31:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 13647610 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 D4F06C4345F for ; Mon, 29 Apr 2024 19:33:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D84C10E91A; Mon, 29 Apr 2024 19:33:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="M7eW899X"; dkim-atps=neutral Received: from mail-io1-f54.google.com (mail-io1-f54.google.com [209.85.166.54]) by gabe.freedesktop.org (Postfix) with ESMTPS id 295D910E4D6; Mon, 29 Apr 2024 19:32:29 +0000 (UTC) Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-7d9c2096c29so216612339f.0; Mon, 29 Apr 2024 12:32:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714419148; x=1715023948; 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=xKfAMNS/turac8Euh1DGMMYVBr0Lo7lNnqANki4j/jU=; b=M7eW899Xkog38sPgJ0nXahAoL/dBWDzRYCvJg7pqp8XTLZmcvc8oGhQvz3pTPkC3Ba Tp77Tp/4jFbKsiJxFRfCRGWyE3nZlxQTPzT9AjGMOb3uYmAKlyAB8JRDA0qIs4iTsPoR 4+NiuBJ7Qjx04oghcVoy8psvQJr3XFLJhxP0wexV80nX5I7g3hDCihd+ZqlHglk8dEx6 LVuPOy9WX7gJg5SD66Sq+XPqn9T+XYaxAe0bwyb/GYQ/Uo2PjmLf6fH+A/pYWCEPD6sh ooaTxms0HvZcYS2ZI5beauELTRPC9dA2YCLIUq/TQe1iGayXZCA+ke0z5KpcDGP8ouWW 47CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714419148; x=1715023948; 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=xKfAMNS/turac8Euh1DGMMYVBr0Lo7lNnqANki4j/jU=; b=qO0tymBgdzOf6ivD2LFuITMaJptn9/q2vvMBbYTKoRZ9FrTHeRmi9A99INfkjFzAR4 Hl1qIBiTfN81JrkPdnrsAa6V7KngfCjSt3gjIbAGXx0ib5fai+hjNygdbiaQxYuRBRrE L0La35sbVwmNv3Il+UGx5v7qsy2H9s8Zj9opyL83u3GYsFEyTjoxBfyA4G8VsK0UvMlZ 757UuF8Hs59hlfTtrxQboF+pTyOowU7GDgMK9WbVySFKJ27Ys3jHmWtpaLFW4Kryhv2V AA08JRMrBm4XAR7xci2N9mPqidFYUXLIK0SRWpx/tcZ5pckF2oq+laRuRlVGwMkjHZMX bj/Q== X-Forwarded-Encrypted: i=1; AJvYcCV0rUXhuMf1th1YtaV1JQWaLxfCf0cSHlC7jgPxD/2bz1u/f0l+7JzMOSW8rcnKlPRlPgj2xCaA06/Bauh7k024A4eBDD2jw2tN61MD7Ds9/bUtJ+HBaJdCIM862CCQJEQyrQtK3lwcOEkUtQ3HfVpjbSCHFKbyCtyUn7wItz013WxSO9nhTiwQYXcxkcgqzIaa57bEthx+Ds7TusIm0fSrdvfryJDdP/CKmYqw+ekoBkyRopo= X-Gm-Message-State: AOJu0YzsuJ5TJixhqJvDAvwrL7q9l3Crz7Ad+TU9kermMzXlQPiEGcM2 4E8H/bQcOPGIC4SxR7K0XvzQBKtF1+UyuT4Q2hD4Krw1OZGdoIPV X-Google-Smtp-Source: AGHT+IEth0HTnZ5OjESwCh2zXJmE39PxG7k0cYJbZH8j9ndGkh1CAoNC7wcLskVxQu1dIKAOj0Zcwg== X-Received: by 2002:a05:6602:1dc2:b0:7de:a849:688a with SMTP id hk2-20020a0566021dc200b007dea849688amr13589788iob.4.1714419148411; Mon, 29 Apr 2024 12:32:28 -0700 (PDT) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id dq18-20020a0566021b9200b007d5ec9b77aesm5988402iob.51.2024.04.29.12.32.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Apr 2024 12:32:27 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gvt-dev@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ukaszb@chromium.org, linux-doc@vger.kernel.org, daniel.vetter@ffwll.ch, tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, seanpaul@chromium.org, robdclark@gmail.com, groeck@google.com, yanivt@google.com, bleung@google.com, Jim Cromie Subject: [PATCH v8 13/35] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Mon, 29 Apr 2024 13:31:23 -0600 Message-ID: <20240429193145.66543-14-jim.cromie@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240429193145.66543-1-jim.cromie@gmail.com> References: <20240429193145.66543-1-jim.cromie@gmail.com> MIME-Version: 1.0 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. 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 882354e1e78f..d4a0ae31d059 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) /* 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 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], @@ -623,9 +624,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; } @@ -681,7 +682,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]); @@ -691,7 +692,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); @@ -745,7 +746,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, modnm ?: "*", KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits, modnm); + totct += ddebug_apply_class_bitmap(dcp, &inrep, *dcp->bits, modnm); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -758,7 +759,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, modnm); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, old_bits, modnm); *dcp->lvl = inrep; break; default: