From patchwork Wed Apr 2 17:41:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036280 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 6939EC28B20 for ; Wed, 2 Apr 2025 17:42:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC6FB10E877; Wed, 2 Apr 2025 17:42:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l9ZLuySY"; dkim-atps=neutral Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E13810E878; Wed, 2 Apr 2025 17:42:11 +0000 (UTC) Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-3cf82bd380bso909965ab.0; Wed, 02 Apr 2025 10:42:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615730; x=1744220530; 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=GcpeXIgBKTB5NFbofa9/asJwSsA0oVZhqq9QNH8OPg4=; b=l9ZLuySYV87vlRxbEwyi25618qiqtlUz9S7E8CGPPaGmVlBOxgqMws9v1ix1mn7P42 T/KkKZ4dVghZllG+a1qavQKRtT090TbuP7+wvp86NIimKcLL8rn7a/DSx3iaQycwdo9T +BVSmu5zqnuUwOqc89pmIXv/zXsKBekooeV19akoN2cwvmwIF5EwVYe/Q5zitmKGG+3N VJx6W3pgep0koYFQJVlOrGWHLNbOn2sODu9S1fWxWFTVvhHvzpeT7Auh68vJODrKE/ec bbhErU1eBXuQUrE/3jgDFT7aD5a1i4oor3cRI6mL/1JZvUBDLTr1EeEwRmKXXlAf5Nl1 y5Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615730; x=1744220530; 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=GcpeXIgBKTB5NFbofa9/asJwSsA0oVZhqq9QNH8OPg4=; b=ljxMiX/ecDdQq9CUkN+jxSdxmyLC7xt2hzrXVOQH/SYtWrfALbF1Nym/IAoOcRkCP1 BQ/WgjCcyFcPQ8ftzDmGILlE6ApJzpMuSdke0gOY3F49OfW+SVSwNDMkP5+jAuQSF1/C Z8fC4MJCCPCT6sbm6D7ZMOknT6+Zn3qVH8UOXvKUTizfJbphP3M1VxYhLZtY67fziQ/+ UNXrExZQrDRPdMKwMq4lv7OuMH6vQMxFS3zlsora5ihZGmjwtTOBxGL0zxHy9c0W67z2 9bqCSvFBClAcDXmX5l6DdhFoT4ZvWDNYKdEC58TZ5RDGEsUDytK6/BI+3C4vsC8TSdGs WH7w== X-Forwarded-Encrypted: i=1; AJvYcCUIK3ry8YrD8Mw10czPTeGgTWImRAcxeQldTey0uz2iwOIwdATaFbI2yY/7ZzSdHsaTh8tXO3iz7VMv7jsLIA==@lists.freedesktop.org, AJvYcCXYxcEO7ZOvBGR01iFHyEox4CCi01pSfVuZ40Jg/lITbWJEDrY46xieRiXGMkkqvSR9rtdisqXy@lists.freedesktop.org, AJvYcCXoP8eBBClivlbqvMV2uI96hPPSFBXSMaO8rMusFx9tvEUHc+fsxwIDUg9hUnZDbBbK7qm+6osyHBhp@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywt8/2axpOOmyfqQWKraoO75KtsclATeGD30nA56gdICUrOG3pS UXCc5f/hfHjVeeOu9w0O7+cXZEFKp5vHHA8kHt4AtJgp9qH2FiN2 X-Gm-Gg: ASbGncs1PArIdycwTXo4etVguJXNHfR+4KtBXUw8zJiKJZ+GAv01udillZEPoeFbmXS keb/pBRyV2W7A5fqOyM+wZGlrZrG4O269y8aXBwuMf95f3QquqAczC3W9sywGhaGukeAKJqLuDC nU4MtwB0DIwGLCb5heK7RxUYj4e9jes1dVodNw/wXKuf3fMMMbWyTGBrTqpIsqK+DQxgKp8Dan/ VkjYOkAZ2ElVx6LqGuvjFqrK4i+2XRYCJCEgsjTZR074yKNaa+mO9wGH+a41eiq7B3dSHgn3sql wu6sQPznvoQU8UGeTZUGwrvOj0+1UluhsiRo4jPbE1IALGinrzSaemJT37wbVYoxdKLtvIKXkf1 3Uw== X-Google-Smtp-Source: AGHT+IG7YC+Vg8rHRD/pZ45k6AmgmMsM50hI2xsY+GPn38wgc2sLRnIWJcTpkNONdPZL6YQH7t5jCQ== X-Received: by 2002:a05:6e02:3006:b0:3d0:4c9c:965f with SMTP id e9e14a558f8ab-3d6d55761b0mr45283835ab.20.1743615730610; Wed, 02 Apr 2025 10:42:10 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:10 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 01/54] vmlinux.lds.h: fixup HEADERED_SECTION{,_BY} macros Date: Wed, 2 Apr 2025 11:41:03 -0600 Message-ID: <20250402174156.1246171-2-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" commit 1d926e259d8f ("vmlinux.lds.h: add HEADERED_SECTION_* macros") I flubbed the defn of the outer 2 macros; they missed the extra arg needed: _front/_hdr. Fix it now, before anyone notices. Signed-off-by: Jim Cromie --- include/asm-generic/vmlinux.lds.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0d5b186abee8..c9c66089ea2f 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -219,10 +219,11 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) KEEP(*(.gnu.linkonce.##_sec_)) \ BOUNDED_SECTION_POST_LABEL(_sec_, _label_, _BEGIN_, _END_) -#define HEADERED_SECTION_BY(_sec_, _label_) \ - HEADERED_SECTION_PRE_LABEL(_sec_, _label_, __start, __stop) +#define HEADERED_SECTION_BY(_sec_, _label_, _front) \ + HEADERED_SECTION_PRE_LABEL(_sec_, _label_, __start, __stop, _front) -#define HEADERED_SECTION(_sec) HEADERED_SECTION_BY(_sec, _sec) +#define HEADERED_SECTION(_sec, _front) \ + HEADERED_SECTION_BY(_sec, _sec, _front) #ifdef CONFIG_TRACE_BRANCH_PROFILING #define LIKELY_PROFILE() \ From patchwork Wed Apr 2 17:41:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036281 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 7A579C36014 for ; Wed, 2 Apr 2025 17:42:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E230B10E879; Wed, 2 Apr 2025 17:42:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X3OGWk92"; dkim-atps=neutral Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id A9D5610E878; Wed, 2 Apr 2025 17:42:15 +0000 (UTC) Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-3d5e68418b5so835435ab.2; Wed, 02 Apr 2025 10:42:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615735; x=1744220535; 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=d8krvmT3hXiuiccuxDpOYGdDtTsrrIwxKLxWjX0uKEg=; b=X3OGWk92xzn9CfwiU3AakSpr9ZQ5mijF7Ewz8AmnovMBlRF2dMVyJTGpi+GNH2Kom1 5hFxoDJ4IVMrsTyvXFh9Te8LS2YH7MAfi3iowh19HPs9onK/XNlWrfrUMhKK5s7xp6Hd RflqZxaYDzzxmk4AYZ8A9K5a8RTtgWgBR8NBlaC3/JlF7SKvp5sXx8LdCrriv/SYOW2W pZ3toVDO9zWCJUfaXiNAQ/T2+0ttZ2doRmgHlhaQGZk85Ftp7iAdozMhJXNuLFlcGfgj X2ZBH/TQaRn4THgSWS53/Rr8YdEjR5SNYEhPq+VBRaxUEwTM3qy4pg1yJzmUKaysB6DG M8vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615735; x=1744220535; 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=d8krvmT3hXiuiccuxDpOYGdDtTsrrIwxKLxWjX0uKEg=; b=a94HlMHbI9yW4/K9TBPUC1qHplGEnNh9lbllN7A3EMLkhq08I2RLkTufFTvg95J4Lj K0ZkKGqYn73uBJ8T6tYifR/Mt1RkMMwq+F/zOTXsfprlq+zxJThAbWx0lJZ/sIT7iMF1 gYkEGqc5pseTJWLmrxfuKkVHLkpt/Vv1u6B3ocKvThOGVj4KDdejy3UoI4mlHPlKUvQi jpnbNzhyv7mfr2bnMZdpCZHrGx6szmtjMoszr0vIabNCmrdabRsntj0sHtoTJoiaqBSi unvFLOrn2ZB/m0ePWu+mm2Yo1cM0F3ETMo3IxFQb810sHisiftjJDEqXNKy5yZiJam8j qFPg== X-Forwarded-Encrypted: i=1; AJvYcCU96+EdrzmUJ3vj1bvWufbif8Rys5mdMTnXo95i/2MM9d8y3C2HGKs/yTgT8h0zd4Pq3R0h9sHE@lists.freedesktop.org, AJvYcCV+f9GpBtzb7UoQ0Wfko02NlgpB3As6EW32ROlYSmuL86p3r2WpwPrHpJYxUEyr4H3lEkJbGEYE9T6i@lists.freedesktop.org, AJvYcCWLl+HpxspaulygOH0wuhwPXUxhQ0HI7lA/DeUYStR6CSloOXyljm8YS2FS8eylAb8765XbKXvRlMPVL9ogmQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0YwXIW7xte8FOPrTne/Dc6kYmUksivatLJMmro1TKGM07JuU7gvy WWFFXp1TZ7q8A7IqzNac7n35wv2tAg7QMaYdXEE1o7oQDU8gELp9 X-Gm-Gg: ASbGnculEuxuobNAp0obMM2yoOsJeIw5BG1DVUkz29LhaNUVu0p4/MsjZgXBhwv6QEg mm2A68CXEleB/a08hZ9h+4PxQ9YuKKJgbHCKrZXGi0tRN7tx+R058hytW/3oAix70E9xKUcdJe/ KbxientdYs1pncgTeiGaUfV4pGDp4NaQziKoeTGiY1LHZvWSaU+BM384hAsFj5s4OhOnqQVPURm CotTvYonj9BYV5jaPBX5K5nnUhyl5ZPVq01XT4J+QPXjhiMgVcalhaw6M7f14/EaVFFNC0L4aw9 m7UuR1kD82zYG/fq8upwzgX89kY0Iz2re4cBeRh1qBwsPxBzFp7VyJf1leAZ8Osjg4fTIxeVLDt O1C2VIrX6hFgz X-Google-Smtp-Source: AGHT+IFfosceATDKvJJ46yRHWVuAnvPMdP3MQ3uyX0/XQ3xbrKDap7g3FuGUZOEfht1KRhM3yUM73Q== X-Received: by 2002:a05:6e02:1a09:b0:3d4:3c21:ba71 with SMTP id e9e14a558f8ab-3d6d5543888mr41235455ab.18.1743615734827; Wed, 02 Apr 2025 10:42:14 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:14 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 02/54] docs/dyndbg: update examples \012 to \n Date: Wed, 2 Apr 2025 11:41:04 -0600 Message-ID: <20250402174156.1246171-3-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" commit 47ea6f99d06e ("dyndbg: use ESCAPE_SPACE for cat control") changed the control-file to display format strings with "\n" rather than "\012". Update the docs to match the new reality. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet Tested-by: Louis Chauvet --- -v2 fix missed \012's --- .../admin-guide/dynamic-debug-howto.rst | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 7c036590cd07..4ac18c0a1d95 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -38,12 +38,12 @@ You can view the currently configured behaviour in the *prdbg* catalog:: :#> head -n7 /proc/dynamic_debug/control # filename:lineno [module]function flags format - init/main.c:1179 [main]initcall_blacklist =_ "blacklisting initcall %s\012 - init/main.c:1218 [main]initcall_blacklisted =_ "initcall %s blacklisted\012" - init/main.c:1424 [main]run_init_process =_ " with arguments:\012" - init/main.c:1426 [main]run_init_process =_ " %s\012" - init/main.c:1427 [main]run_init_process =_ " with environment:\012" - init/main.c:1429 [main]run_init_process =_ " %s\012" + init/main.c:1179 [main]initcall_blacklist =_ "blacklisting initcall %s\n" + init/main.c:1218 [main]initcall_blacklisted =_ "initcall %s blacklisted\n" + init/main.c:1424 [main]run_init_process =_ " with arguments:\n" + init/main.c:1426 [main]run_init_process =_ " %s\n" + init/main.c:1427 [main]run_init_process =_ " with environment:\n" + init/main.c:1429 [main]run_init_process =_ " %s\n" The 3rd space-delimited column shows the current flags, preceded by a ``=`` for easy use with grep/cut. ``=p`` shows enabled callsites. @@ -59,10 +59,10 @@ query/commands to the control file. Example:: :#> ddcmd '-p; module main func run* +p' :#> grep =p /proc/dynamic_debug/control - init/main.c:1424 [main]run_init_process =p " with arguments:\012" - init/main.c:1426 [main]run_init_process =p " %s\012" - init/main.c:1427 [main]run_init_process =p " with environment:\012" - init/main.c:1429 [main]run_init_process =p " %s\012" + init/main.c:1424 [main]run_init_process =p " with arguments:\n" + init/main.c:1426 [main]run_init_process =p " %s\n" + init/main.c:1427 [main]run_init_process =p " with environment:\n" + init/main.c:1429 [main]run_init_process =p " %s\n" Error messages go to console/syslog:: From patchwork Wed Apr 2 17:41:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036287 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 5E874C36014 for ; Wed, 2 Apr 2025 17:42:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 297D010E884; Wed, 2 Apr 2025 17:42:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XuSIj1dN"; dkim-atps=neutral Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F44210E878; Wed, 2 Apr 2025 17:42:16 +0000 (UTC) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3cfce97a3d9so562555ab.2; Wed, 02 Apr 2025 10:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615736; x=1744220536; 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=td1hbocEroQ+eFWd3dryN89mziTxSjQWv4lhLkRyiDg=; b=XuSIj1dNG/TuJXM1rUN1BkmzVaFQu22iIm3PfY0iqBbPnZUIrVNvO7GsTm9KwMXumQ +pTXYOI3ek21FqRBtNzYVlhOihvSEVDe3oXPGfuYjeNTvuFq+1rvvacvfrwh7dVjSzFN +eNVYA6Y7ftLL3t2y061xeUAkTsxT5R7IpaoSWGqpSZOpB7+0mm22UAuQvgRDFuVb4zt 85QCs+WDIVgzvdp7ImLPqlzfWp1Di6McvE7TSX0eIJN3LsOFSuI2FjcyFo0GKjB3vgph UOWFE7GNxlyzf8YBYNh254BA6aGq7FqoMB8NrCKig5yGGgUhNUzs7TM16FejMButUyG4 GauA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615736; x=1744220536; 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=td1hbocEroQ+eFWd3dryN89mziTxSjQWv4lhLkRyiDg=; b=VUpPaos32g05UtjSgdYdUDh+50C2lqxnci1uWGu7Nt+zm0al/0xVnQwd+PIQNGHG9j 2tpQiMg6IWTVCFCvnk7dpyI98dKf0wOZmCnvFkxyT9r6glbLRxMr53jUgXcmLaYbpgMz 0ol0DOrKkSne+7e75BTmRtFACOUBoacQG9CLWIt9sLwcNPhSiMdcVXx/hK6AOb5TMFe/ CDFLFvhH1d7QUkF4xfzZhxAmxQ7JKy/kILMctqtgKhV+1W+tay+tmCtCjsDUQwzUSdkz FR8UIRZ4w1Idhg45AIefiOmRAeBuMJHPhWWB6p8qxPrgxAwmeqWOl2I1ZVuEefA5Zana djbg== X-Forwarded-Encrypted: i=1; AJvYcCVsezR0e921hYB+uzyj+MRYoAb+nZhwBqMAlcyj89kQQLH6ZBFwxbx6MXREfLThrgjYBv+iPTizyrpMYKRA5A==@lists.freedesktop.org, AJvYcCWL7x6DXE6CjkKi+YwYRGObCMOtlM5eLm/J3sjsOiMVdGPVh86osQHbVcBGmlKLDnfIteUM1JY72b//@lists.freedesktop.org, AJvYcCXDdV3TMw/VFz5gc7+uQiFdmLnxKmxwBEoO6e6i9hwmiWea53EArxK4bH9HHhxcjUB+VtRY+Tuh@lists.freedesktop.org X-Gm-Message-State: AOJu0YzlsUQ4CmtjtgfNTla+2Yo3gOXt9LssYtHFyw7So2fZ4fMg/bGc t+hAzxCmypk2JMghX/X+kTTn5QfUHU9xRYbxTaASdJDjETrGQYzk X-Gm-Gg: ASbGncvhkBHVCL6n3i4bCcLdCWz8nhuRn2LzPu1cWctY6hlLiYO3l7kKxDg/8zDD6kk 0yiU6Gr1Rih7HiLWkuC2xjsYllCNEwpu+IxsWFgQpJYgoOviha716tLzu+3UkITNvZPgm2YDRYi HHHvV4jDc3Nn/RL+Q9ygGvsmPxa6POVsDOhfBYbNFODpnKvzjZoKas/uksQhfSy91qSqe15YWsl ofanTr7gBWrdPnRvgge3Dj+f2SoOh/dTJj5x7W/+teSOe7NfYuCmVAbKCaXiccvI8ySML6+5M8Y ZmDTWnxpbABLgx629RdzCmb9gjD57Ri0GKy6Dzzzs7JC6GvarYkyAM+pbD+6gEGLOT1p65RRau/ tPfq/a2Uxw21A X-Google-Smtp-Source: AGHT+IFoghihjH4MYpOsA0qp+LY0KBRJDcJg5fZDrmZZoUA3dpTLzhFFCuTnSVLmEdCyPs5O9yahhg== X-Received: by 2002:a05:6e02:378c:b0:3d4:276:9a1b with SMTP id e9e14a558f8ab-3d5e09cda1bmr184969825ab.16.1743615735764; Wed, 02 Apr 2025 10:42:15 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:15 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 , linux-doc@vger.kernel.org Subject: [PATCH v3 03/54] docs/dyndbg: explain flags parse 1st Date: Wed, 2 Apr 2025 11:41:05 -0600 Message-ID: <20250402174156.1246171-4-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" When writing queries to >control, flags are parsed 1st, since they are the only required field, and they require specific compositions. So if the flags draw an error (on those specifics), then keyword errors aren't reported. This can be mildly confusing/annoying, so explain it instead. cc: linux-doc@vger.kernel.org Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- Documentation/admin-guide/dynamic-debug-howto.rst | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 4ac18c0a1d95..63a511f2337b 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -109,9 +109,18 @@ The match-spec's select *prdbgs* from the catalog, upon which to apply the flags-spec, all constraints are ANDed together. An absent keyword is the same as keyword "*". - -A match specification is a keyword, which selects the attribute of -the callsite to be compared, and a value to compare against. Possible +Note: because the match-spec can be empty, the flags are checked 1st, +then the pairs of keyword values. Flag errs will hide keyword errs: + + bash-5.2# ddcmd mod bar +foo + dyndbg: read 13 bytes from userspace + dyndbg: query 0: "mod bar +foo" mod:* + dyndbg: unknown flag 'o' + dyndbg: flags parse failed + dyndbg: processed 1 queries, with 0 matches, 1 errs + +So a match-spec is a keyword, which selects the attribute of the +callsite to be compared, and a value to compare against. Possible keywords are::: match-spec ::= 'func' string | From patchwork Wed Apr 2 17:41:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036282 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 DD655C28B20 for ; Wed, 2 Apr 2025 17:42:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21D1610E87C; Wed, 2 Apr 2025 17:42:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="JcXdTw5n"; dkim-atps=neutral Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id 80E1510E87A; Wed, 2 Apr 2025 17:42:17 +0000 (UTC) Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-85db3475637so36356239f.1; Wed, 02 Apr 2025 10:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615737; x=1744220537; 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=H1TeeGBRsVeJpwNeUJAZV2+uEOIfDic0oDGxOSg3WSs=; b=JcXdTw5nnNdtqpqY2CFKNKz5aVZShVQSrYsnzqm85CKPCmtH29i18EBVSzI4GdTLTq 6MD+XUydXguUuxK16MknRGU5tf3fNCi8vOZ+kKFo2tFg4nimr3BCUG0wcKHmeaQKoDrm ZE3lGqASJ/Jpr8HuC4yMLdH3QZuuKjOekPM9AdGz9FydvDEg/Xz1bPB7z6gIC3gjYpmC ejKaYMHSQClptmnB+xixMZeL/Yn47mjJXPPyMQ5iUA1AdjhExXdY59wx8eCaZ6myVPYL oS7kphqAzkrufZY3wnYs+4IgcKc2+kvbxw2WTDqirmGUttLXqbVj9aeNP746es6vHMIm MqGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615737; x=1744220537; 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=H1TeeGBRsVeJpwNeUJAZV2+uEOIfDic0oDGxOSg3WSs=; b=AoYZRixIdYAlp3zsRXT/8Rhan1RZKzihkKAOwRuQPhTYq4+Fb/Pto3DcHIDeXiN7qJ 1PO9n/7fzrIQMeq4m4P2mUGsdg4u5xBwkz6thT1SQjzfNbwx/D22KZw0Ak/YKVaOPCDr 3gHLRRqDDEFw1kzbltpYh3RoQ7v0nkoGLJMTzVQucxFyP03u6sjq3hOKiYLTri+stsRj wS7jPOBRRhDJjiTWGPgtcFMqXHk7o/5tIeReEmP6i96qkQHntdNlsUK70PsaAyJKU2IC /kF6BthSFlmsXWaqdveeNmTEUsAfNFk2WoOkaHVzvbez6MW/sJA0XESbYv6e0KAPzmRd j24Q== X-Forwarded-Encrypted: i=1; AJvYcCVPHqR4Kan+4qI1CrYC/ikK8Hwfd2lwdJGUskjw/Heq69BNeeB9D89VHOXFh5YpET5WgPK/QIexIVHk@lists.freedesktop.org, AJvYcCXCunYbZLfUC/0sveylFWz8ReuuoAqvmYQiTHF7JBhzerrdt8HG++bIf71I/KR2mDkK+drJevl+@lists.freedesktop.org, AJvYcCXVefMrc6Vi+t1GLwtMRAkYYoZOru/3uw4Fd6eSBkQgV2o4S7mEOnYcTCBcpEPpErFx06zU4QbVDuuaZGu/3w==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yw9IE1KHTqZPxsGLCtCvpBsQ8MITXVBcUyTXyum0ygHoXAaJtma xJ9vNOCKJGxrRiyR3x4f1RgYZYgRjodfhZSCRW0IunSXgA7wgaDS X-Gm-Gg: ASbGncv0IbkC5J9Wcyat9s2hcUsFZLEdFwB5Q+Eh3HKnrkwfYRYXfNTaI0wTHV0t9aZ b3eEGwaNJmk7Mhge9uTL/kj8Yyyfb9nvMEIl0kFguhzxRSzI+I2rYXwr3dxdThIkEqTKL7Qs/V5 9Y51R99fr0fY+T3NIDqnVxUk+2zsi2gd4/yUGP8bYDCoHfd/8PrA/A9yxnHA966ILenwxDkt8gw 6Z0SoHQ6HDXUdGS6vRr/FLBJsZUuq5wDtDJtN6Vcm2raFmlVOYYi4nE08D2XVW9TYauznG+1PU9 MM2gwbaI1OKX/NVTGEXzI0At3oEhkxkA4QUyijI0aM4Bu7oWjPhsy2/hjSXN5F6+5SqiimHCQcn 7Pg== X-Google-Smtp-Source: AGHT+IHivBONAricuMwjJKELjLZ3cw6bOgdRVYxu5GWLbo1Ajc6qDwx3gLg2XMoo3ny+fW96GOp9Jg== X-Received: by 2002:a05:6e02:1d9d:b0:3d4:2acc:81fa with SMTP id e9e14a558f8ab-3d6dcb49685mr7330155ab.2.1743615736716; Wed, 02 Apr 2025 10:42:16 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:16 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 04/54] test-dyndbg: fixup CLASSMAP usage error Date: Wed, 2 Apr 2025 11:41:06 -0600 Message-ID: <20250402174156.1246171-5-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" commit 6ea3bf466ac6 ("dyndbg: test DECLARE_DYNDBG_CLASSMAP, sysfs nodes") A closer look at test_dynamic_debug.ko logging output reveals a macro usage error: lib/test_dynamic_debug.c:105 [test_dynamic_debug]do_cats =p "LOW msg\n" class:MID lib/test_dynamic_debug.c:106 [test_dynamic_debug]do_cats =p "MID msg\n" class:HI lib/test_dynamic_debug.c:107 [test_dynamic_debug]do_cats =_ "HI msg\n" class unknown, _id:13 107 says: HI is unknown, and 105,106 have a LOW/MID and MID/HI skew. DECLARE_DYNDBG_CLASSMAP() _base arg must equal the enum's 1st value, in this case it was _base + 1. This leaves HI class un-selectable. NB: the macro could better validate its arguments. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet Tested-by: Louis Chauvet --- lib/test_dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 77c2a669b6af..396144cf351b 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -75,7 +75,7 @@ DD_SYS_WRAP(disjoint_bits, p); DD_SYS_WRAP(disjoint_bits, T); /* symbolic input, independent bits */ -enum cat_disjoint_names { LOW = 11, MID, HI }; +enum cat_disjoint_names { LOW = 10, MID, HI }; DECLARE_DYNDBG_CLASSMAP(map_disjoint_names, DD_CLASS_TYPE_DISJOINT_NAMES, 10, "LOW", "MID", "HI"); DD_SYS_WRAP(disjoint_names, p); From patchwork Wed Apr 2 17:41:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036283 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 98477C36017 for ; Wed, 2 Apr 2025 17:42:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9B1310E878; Wed, 2 Apr 2025 17:42:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OBGGiWH9"; dkim-atps=neutral Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id C79BD10E87F; Wed, 2 Apr 2025 17:42:18 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3ce868498d3so417875ab.3; Wed, 02 Apr 2025 10:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615738; x=1744220538; 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=MlpyI1Cbu0G4E1iYQnKaYcyXlhpWchDiOL6/URF3toQ=; b=OBGGiWH9RNgLsJgIhvInu8yYXz5d3U6Hpbjz5hcK6Ndcok/YZNBnKy4BKut8r6f5yk lcqTux1HKyd9Hel3lmiqdKp/k9C8xq2+1qHFhEJ55yVNVC+doS5ZnMC1KU5L+8+zyPJK IYbcYzIsSAp3wLyAFvlxH0pgylHowinjXnvW+dk0+AaebNyZcLR0cWbRtSl+ffGJPPLr D5PrXzTvzqMt06t3+kwj7+CK3OdpxfQy4/MOyrLwC1mI9+HPindi8shDCQWmrUgYkjFM 6uZTApAfWuMpzn5JPMmo/IUnwa6naaFSA95dwOqdkJb5eZ55O30JXBQPS/lGUCoMUGgZ Chhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615738; x=1744220538; 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=MlpyI1Cbu0G4E1iYQnKaYcyXlhpWchDiOL6/URF3toQ=; b=xA6yZOVecQis2HpQi/e2kobAUjdeOvfq5G5Zx7l33PMOOElkjGBm6GK9aXcEz8u/VA znpuDTngaSYP0fUo0b1+nNx09zW8PmlUeYOimDx9WnnKMj2MYbQnXGl6sQ4bfr7iIL5r j75WLU9Dtsmv2UI6ipi9bDd10hor9kRyxVwQ83tduzERtcw2eKlO1djeXemZBiKuTFED NlG98ez5m/7VPZN46n4dxnpYGfIJpIWsOnxDQ+9yJW+Hee0WffY26c+tHj0xwy7OcGm8 E7lJ/DgL3W0naGnb2f4rKUpBcS6/1Tl7jcEX9KYc1N5zgRko4EXcUJij1DQMrlOcjujQ aBjw== X-Forwarded-Encrypted: i=1; AJvYcCVNt0zTOmYYre6yVBRRk/4skArhcH9jrwiebBcG27DEXRvhGYIxecLhmXyasRDbjaQjmiaE5oO7Xntd@lists.freedesktop.org, AJvYcCX1dgIuS+yqWT1hxgpTssrIZjeJPQTVett1LRmwoPeGxAJOhE1rn7FdrYL/H38zKIFRMqy+HanV@lists.freedesktop.org, AJvYcCXtwfDYwNC4CMhW2bwho8lsAPqHsepTqAkRAjBdjz1Wx+QOwjIkvW6Hy99YSOWIZRL/1hmUYWWVCn4qx/nlfg==@lists.freedesktop.org X-Gm-Message-State: AOJu0YxiWO0NsfNnfiexDn9TVInzHTAmUvB0uL17nmdxGmmDYkHRqlun ggRcoZveoljaPPVglh69+7cZBaQaL7uhXUsao10Q+/ojDHl4ivXB X-Gm-Gg: ASbGnctnkxu6AZPYKfuaVJ1pj7AH3z0IQq/zbUZiLnJCa5xiXLiEOyADGFhRXBGC+Zs JQb45pdehh2XVFnpgc7q8vSAREJwTKJ2ekb1u514sfRPDEr2QpNqixfD+LhjUawf3B2CTT+kIPK bH55jd29V6NxNtxq6XV8C/Gd7o5tfhrUscENCpg+ShqO2wlAxs1SUcSb/dDGbenKk/wQlQGcF5E lXVUnBkqWBz3kUPgtJH1a9qJmEmUDOcqdkc3Gi4gy1dSFMF9oBFYls3rNVTHOcKOn0YC7/rxA+B z059z4zQiMHdeArosoN8BgUtSXjO4XcGYxpIbekZlILz5mwYbMrUBm2pga24OiDxEcAEa1tArHf 8Ts2bufTkl3qH X-Google-Smtp-Source: AGHT+IHHjhRDu+SE+n8jz0Z3ClAuEczfqEXMN4CVftbZdgfRPuFKsZB0dnMkVBgAMrRiDsGR5bLubQ== X-Received: by 2002:a05:6e02:2703:b0:3d5:d743:8089 with SMTP id e9e14a558f8ab-3d6d548b160mr32428905ab.7.1743615738025; Wed, 02 Apr 2025 10:42:18 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:17 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 05/54] dyndbg: reword "class unknown, " to "class:_UNKNOWN_" Date: Wed, 2 Apr 2025 11:41:07 -0600 Message-ID: <20250402174156.1246171-6-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" When a dyndbg classname is unknown to a kernel module (as before previous patch), the callsite is un-addressable via >control queries. The control-file displays this condition as "class unknown," currently. That spelling is sub-optimal/too-generic, so change it to "class:_UNKNOWN_" to loudly announce the erroneous situation, and to make it uniquely greppable. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- lib/dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 5a007952f7f2..147540c57154 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1154,7 +1154,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p) if (class) seq_printf(m, " class:%s", class); else - seq_printf(m, " class unknown, _id:%d", dp->class_id); + seq_printf(m, " class:_UNKNOWN_ _id:%d", dp->class_id); } seq_putc(m, '\n'); From patchwork Wed Apr 2 17:41:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036284 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 D0AB2C28B20 for ; Wed, 2 Apr 2025 17:42:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1738C10E880; Wed, 2 Apr 2025 17:42:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BxN21pRm"; dkim-atps=neutral Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id E9E2510E87F; Wed, 2 Apr 2025 17:42:19 +0000 (UTC) Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so489185ab.0; Wed, 02 Apr 2025 10:42:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615739; x=1744220539; 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=F1MDFYF/EJ2a7UGqvWTU6dzs01F9Q8UeZTgbtP6X+58=; b=BxN21pRma2WZp9aAqof2t010+vWvW6lH31NiaFn/AjPhLgRCvJ3tf43EUNX1puaPjC vpa2Vea4To3T6FMdowmevW+cCCIZ6NoN9AWXfabvgVK3afdWxKZ0YOQtwYpP6+ayg40N 9QEMj4W2wGamP+JP+DyrsMMCOoosSSpAUfXE1SnOUPL157KSFlHEmwljxZoZtNsEZ374 GfQRtTSyOPUHwdH/wTcN/3jjf5fzYoTiauExnENwtqtMbxSP84zUHX57BElKhjl02yiM Cab2AnvMMnyrRV++ummBYNzfM2euMZ9r6OzOLCSKtu0vKyGX9/KN9KLr905nmjn6X4OT qbSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615739; x=1744220539; 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=F1MDFYF/EJ2a7UGqvWTU6dzs01F9Q8UeZTgbtP6X+58=; b=aDd9HK9p6MT05BUJyrQLB2cOHoh/rws73MWE851rZWTU9XqFzwrrZDBIRCXellZcX5 aixPwniGmJfEQuLUQ7JU12ARbnt9bVlVcxQdCsuQsVexrCt/zIhzSuoJmkLHgHdqqx4Q h7A76DprgnRkpzKdSRcaPo0QvOHGKsD+W99idkOLDC+4c7LjpwDd93D1+AhC9noGOppj av5sFjV9ap0ZZ89D5sKqzDjKez7/0905rj8ngwQcNEcxu0Z1wgOqJR5lK6NsGyHoZ+Rr OnOJAuZCTHz7rl7w7bwZrje0lwenkJz3QoZRX4xnd4MKvfyYko1qmnAkBMivJMkGH7jf Sm6Q== X-Forwarded-Encrypted: i=1; AJvYcCWEW32N0Ua/kJLZbAhqYqfQg+qHH6uWM0325tOQHlMzAZcJ0QJ4K+uFB8yDPGIpJwTCRMBLxHVN@lists.freedesktop.org, AJvYcCWzNZn8b6GODe4fHXoC7452wlK/6UUG4385ewR/sLZSkn+SIKfkkYXgV4eWpKLxrV6K4df6SlbcxBSc@lists.freedesktop.org, AJvYcCXBs3p4TeoAzUPkpTABJdvX0TfC1XUFVX4ijHWbnMhxQuO1+ufzCZfE71Iv7vKXlNLrMiAzpshJLPYuZk+Z0g==@lists.freedesktop.org X-Gm-Message-State: AOJu0YwRtyZW5f93O6NlVo1ts//8TD949btAFEbkGJW2D9TrS/XI0n1W Rs2dWXf6OzOLsZGe+fvGANEtOQePJTVGJWZ4iGBlYDnFWJ9CwPUT X-Gm-Gg: ASbGncsAThcACy+sOHazvfo+d1M5f1mBXdVF1HAa5X2JjgXbdhc3KGW1KJ9FNxKzYZe jiAAdVZ8/UWmON7cW2RPAqVwcwa8nYTYQvwR14choIcuSqidJ+Kt6mLVOTshR0SVf+3HQLpf1Kv AzxA2632RDxNP08IpSKG2mSnbxdptYPVjqd2LOe+L5u+eurS/XOH4G32mZGwLdLZCVlKS6V4/SQ dd2LhyMgFV4nArVqqAOc1u9SE/h92Kpm4fDEDQpRGvOucC8iD+abMsuXjMf/FKivaRwebMZgpuJ EEN/UUfoJaL6iN6KceC4V0XVEMaghDgE1dUhjJP7icPx3q2PHW7g0rynQKmG7Lch6QzohhVKgms BVw== X-Google-Smtp-Source: AGHT+IFVWQtukqjbox+/BI8jH/gu5QsbtgxbaxR6JpDzTl89/ZDWJ5DbXCocb+GVCPq2mu6sIVRlLQ== X-Received: by 2002:a05:6e02:1c26:b0:3d4:414c:6073 with SMTP id e9e14a558f8ab-3d6d548b68cmr40322985ab.8.1743615739132; Wed, 02 Apr 2025 10:42:19 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:18 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 06/54] dyndbg: make ddebug_class_param union members same size Date: Wed, 2 Apr 2025 11:41:08 -0600 Message-ID: <20250402174156.1246171-7-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" struct ddebug_class_param keeps a ref to the state-storage of the param; make both class-types use the same unsigned long storage type. ISTM this is simpler and safer; it avoids an irrelevant difference, and if 2 users somehow get class-type mixed up (or refer to the wrong union member), at least they will both see the same value. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- include/linux/dynamic_debug.h | 2 +- lib/dynamic_debug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index ff44ec346162..b9afc7731b7c 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -124,7 +124,7 @@ struct _ddebug_info { struct ddebug_class_param { union { unsigned long *bits; - unsigned int *lvl; + unsigned long *lvl; }; char flags[8]; const struct ddebug_class_map *map; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 147540c57154..55df35df093b 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -799,7 +799,7 @@ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) case DD_CLASS_TYPE_LEVEL_NAMES: case DD_CLASS_TYPE_LEVEL_NUM: - return scnprintf(buffer, PAGE_SIZE, "%d\n", *dcp->lvl); + return scnprintf(buffer, PAGE_SIZE, "%ld\n", *dcp->lvl); default: return -1; } From patchwork Wed Apr 2 17:41:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036285 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 33A28C36017 for ; Wed, 2 Apr 2025 17:42:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D3B810E87D; Wed, 2 Apr 2025 17:42:22 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EECV0Ntr"; dkim-atps=neutral Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7D01C10E881; Wed, 2 Apr 2025 17:42:21 +0000 (UTC) Received: by mail-io1-f44.google.com with SMTP id ca18e2360f4ac-85b3f92c8dfso526839f.2; Wed, 02 Apr 2025 10:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615741; x=1744220541; 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=+AN9v4KQ0PiEc7jM3vE8QrHxAiVUi2zmd1sx7ARoRMg=; b=EECV0NtrPoq97nYEtYhexUVFl4DxZPI9pmKlZAZni0LFxbNd97Lqv5KURHZXnlmlqg OV8OCiO0gZ4WApk+qntbLnEqf7cPEzKnVc7Bq94km1ucqNnObagy99NIxGkrAKKBs1Va l85pC/2/HhSF5vdApkxkDm03fOL74hhWK9aqhNfK5XxM0QDnpL3EF+QEaNGKG2CxZ2xv SntWJLKtFBjiJ9kFq4WreJY+PG1rCqZwxZCuLaG3us2oLAd8mBnABREWouCzVzdeMXM3 uuoE4szWho5KSsjLb8WRNR+l2GwWiMZFshom9LJX56+lDoy+pRz2KIBcpG7abvQ1kMis MQrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615741; x=1744220541; 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=+AN9v4KQ0PiEc7jM3vE8QrHxAiVUi2zmd1sx7ARoRMg=; b=FVtLhAb24Djwb7HoScA8Q6ITKPqCDEdsTOg9y1BJj+FWAehGo9GG9BEpNjMZAO58I+ VbYt8ilcV5GCNd6FZcXuMnK81JmNeVm/Mx8ZNUA+wz/3nRWFKiJMy+HmDHp2xS4+rdXk opxjxWq1WqYtkcxwHGDrEW/qmpyw3MJnpVy7L7541yWqbA/XhIIgTFgP6StHNPdf+Ll/ sdS7iI9hHxIiHQuiQdbAl5zCyfwz7FV/aI5YBPhiMNrI2koGdugL3wwL5+vrEFrzAV5p V2pl1a0189XClyf8ciMpGcK8Q7p6cG53Zj6NvHrL04bg9y9lrQ4zAGIVChRNMLR6BgHk 0m+Q== X-Forwarded-Encrypted: i=1; AJvYcCVvjEHa9Ce2iw5AkDJ0kUm+LBElDQECrV7yYe4qnrqg8KhyD3Af51Ar9onitAa/dLMjkSDQeHOdi/zx+7M20Q==@lists.freedesktop.org, AJvYcCWWwK7+ONoZFydScgZbAHa66xrZ4rsLBYPkIDCcwAvbizc2KIX3mBYPw7CXsv4vxERQnqBBdd7Q@lists.freedesktop.org, AJvYcCXDhhgsH9NtVwvQ6FmmSEs7kYleiVmIbpEN5c4y0jt0RBZw1c66ATLhkZ0Z0YTSCZcvs5loL+KN3Yl5@lists.freedesktop.org X-Gm-Message-State: AOJu0YxPgSTXdP2opqROgIuvSnhoQsD2fD++7SKTYHh6mkVUhZnwpPnz OOb9W46MV0qvKeRfu9p4URKEiuU+WD5uikwhUwKGolBvDGijc8Mb X-Gm-Gg: ASbGncsvPOYVhSK9ACj83SEjWY14X8KC9r+LziFPVftkE1uW9Kd1TVe7yuVK1q+e51w VdGEhf4BEvsuuHban8LgdTcuyX+3hOkgHG5ftG1FeeY2fUPtW0Rz5Fm1A37rjOgt3yYblCFo8kz kpV6id2oT7xzHBJf2O+PH6fNUvv8msqJjvw9hvDUsdHERzeUla07hVKRC0B3YYjVJwpIEgK3taA E2l4MsZ3LI6jXvgygqTQf6E0/QS/Hl6c38rS1KgJrotc/4MPbCjX25ecAHes3dFEqKUxZJ8HAFZ kWrRtZa0KRcnLoAwlVAGknP1FJtIiPpW2wHKv0v3BSB3Ry54GZ0oecFG519KnltaCShTbSekuxp hlQ== X-Google-Smtp-Source: AGHT+IH4Y0UWSmgU+NCi7WHRrVlXFXoekgCq0dMBYgztyw3Hpw5BNtpfhLC0O0dU/4LF+BFX2wTffA== X-Received: by 2002:a05:6e02:152d:b0:3d3:f64a:38b9 with SMTP id e9e14a558f8ab-3d5e09e4828mr192342365ab.15.1743615740615; Wed, 02 Apr 2025 10:42:20 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:19 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 07/54] dyndbg: drop NUM_TYPE_ARRAY Date: Wed, 2 Apr 2025 11:41:09 -0600 Message-ID: <20250402174156.1246171-8-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" ARRAY_SIZE works here, since array decl is complete. no functional change Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- include/linux/dynamic_debug.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index b9afc7731b7c..ac199293d203 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -107,11 +107,9 @@ struct ddebug_class_map { .mod_name = KBUILD_MODNAME, \ .base = _base, \ .map_type = _maptype, \ - .length = NUM_TYPE_ARGS(char*, __VA_ARGS__), \ + .length = ARRAY_SIZE(_var##_classnames), \ .class_names = _var##_classnames, \ } -#define NUM_TYPE_ARGS(eltype, ...) \ - (sizeof((eltype[]){__VA_ARGS__}) / sizeof(eltype)) /* encapsulate linker provided built-in (or module) dyndbg data */ struct _ddebug_info { From patchwork Wed Apr 2 17:41:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036288 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 6C192C3601B for ; Wed, 2 Apr 2025 17:42:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0D15210E887; Wed, 2 Apr 2025 17:42:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b3sLMge6"; dkim-atps=neutral Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 743E810E881; Wed, 2 Apr 2025 17:42:22 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-85b4277d0fbso1642039f.0; Wed, 02 Apr 2025 10:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615741; x=1744220541; 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=0gFevukveSt7PbWkbUevQGA0uvSXu+LT7vaKBaZctmY=; b=b3sLMge6PF/u/40OnvL/Vt1pviufzM4XfFMeaZBFwEk8ezVFmk5jhs1Pq1n221Q1Dn n0vRjxW/TT5H9HgpBLxhjBU9Q/QFpg3wZRxQlp1MYRxv1sxywfuzMKlcXwEQjTiQ4OG5 tT+O46NdzsanSmxOQzHvprZ/OhdaPD+yNqK4OKMFwRbPwtLEhdfqr1sKklts/KluyubW PgDdMtz57jrZzpRei+eFKcACwWbBR8bsR86smO+2uuhO8W5apQn1WSDlYwc5XS/psTPO a2k9J428JzHPkaMYzPWWzhLEzN093evmzog5Fx0X7+LkxxaoXGCCUAHx0UysaD+ci+dP xWIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615741; x=1744220541; 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=0gFevukveSt7PbWkbUevQGA0uvSXu+LT7vaKBaZctmY=; b=QSbc8glT3WSgzrdsweJLFx6mYwP6O4RgwqGl6UZY+SRd7qdO2VTYfOyP98GAxTO6gy 7n1fMPNunOIVyJ7rjQYvCRX0sEiWFjfFELExHZXRLctSoZtXBW72Xep0d1eDwIvWsYIA 6ucaCxjVCE8bVBUx6d3atbl/81qbos1Stv/O6dpdRKjnVJ6u/XDlM5/XqXIBlKOpSneJ TOJWCJTV8GhvlClLEQ66pjQ5+30Za29SeMRii0fdoAypMnVp8rZc2OBnp1mlCLuHWqko xzIF0miWbDJtNAN8YQIu5Mp2o6cFG+W3HFniEtbXnf4rhEvFIpHM6pDVa1AXh0cvjsff T5kg== X-Forwarded-Encrypted: i=1; AJvYcCUunmf0ZmsJEXsWZd3NX45lEYpPvKJIuW6nppEXt1fzcJg4/BXQPu1KKR8o9CR/omN8AjFs0B1R@lists.freedesktop.org, AJvYcCVv3you8wdqejjIgM9F/XPm5lbog6IpOaFBhToNzig2uEQpO0k9mR5OQAvfE+pWL2O14izxtMk3LHoz8ksMjQ==@lists.freedesktop.org, AJvYcCWB9MPE5ELrI4WqlYP2bj/w5SV1QyRQhzQMgipYZVVSq8yE71FTgl9iEkOqbPckBJQem+DwuhcBGy8A@lists.freedesktop.org X-Gm-Message-State: AOJu0YwvwbMGNVNz0cxXxSpsEbKasp74l5AkT3+MzPtbnf/EL5jnzFCy TgnKkU9LFE2qtiu99XYdfMAIV6kx/piGLTq/cZlHbouSfdvnozWs X-Gm-Gg: ASbGncvkJGt2MRYpdeHAf22uK9H2EMTZyKyJ5QxIRKGXWfN82G7h0o7Aiy0hiNZmDlJ ZBM8qkTcmGkakc2/6yKMY+MUNSnX487qbUGtsShYaFQIAKSLyBHn5ToB4FhuBJ2oqnLroG8lnL+ BEybBil19x+fSutyXpPw5WxMrzoK3yniHPVXgZPb1fn67/3/K68pUyb4lS/+6WyqH6rgDABD+EH b6S9Zq8m7QzvZi4mbZwc6I8vOwjNM5tKtFVlm3pN4sEii8eL/DPzW5JeMiynQ0+O9rpMbk+njeC 0mnLxX+p4V8z78niXiKQTgCdgWIxOceKBrCpOOn81YJEtxe6AtTVYfJp9jF05iDibzGL/ILxFys gtA== X-Google-Smtp-Source: AGHT+IEV2XIR0LN/wAE2n62Y1VoOctpEVbSfU4OWKQUPEpcCeuWBTEhGGJZ77uLyoEnBh82Q9kZt3g== X-Received: by 2002:a05:6e02:3c85:b0:3d3:d994:e92e with SMTP id e9e14a558f8ab-3d5e09db5d3mr173946165ab.17.1743615741560; Wed, 02 Apr 2025 10:42:21 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:21 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 08/54] dyndbg: reduce verbose/debug clutter Date: Wed, 2 Apr 2025 11:41:10 -0600 Message-ID: <20250402174156.1246171-9-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" currently, for verbose=3, these are logged (blank lines for clarity): dyndbg: query 0: "class DRM_UT_CORE +p" mod:* dyndbg: split into words: "class" "DRM_UT_CORE" "+p" dyndbg: op='+' dyndbg: flags=0x1 dyndbg: *flagsp=0x1 *maskp=0xffffffff dyndbg: parsed: func="" file="" module="" format="" lineno=0-0 class=... dyndbg: no matches for query dyndbg: no-match: func="" file="" module="" format="" lineno=0-0 class=... dyndbg: processed 1 queries, with 0 matches, 0 errs That is excessive, so this patch: - shrinks 3 lines of 2nd stanza to single line - drops 1st 2 lines of 3rd stanza 3rd line is like 1st, with result, not procedure. 2nd line is just status, retold in 4th, with more info. New output: dyndbg: query 0: "class DRM_UT_CORE +p" mod:* dyndbg: split into words: "class" "DRM_UT_CORE" "+p" dyndbg: op='+' flags=0x1 *flagsp=0x1 *maskp=0xffffffff dyndbg: no-match: func="" file="" module="" format="" lineno=0-0 class=... dyndbg: processed 1 queries, with 0 matches, 0 errs Also reduce verbose=3 messages in ddebug_add_module When modprobing a module, dyndbg currently logs/says "add-module", and then "skipping" if the module has no prdbgs. Instead just check 1st and return quietly. no functional change Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- -v2 squash several verbose cleanups together --- lib/dynamic_debug.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 55df35df093b..c609ff873224 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -264,9 +264,6 @@ static int ddebug_change(const struct ddebug_query *query, } mutex_unlock(&ddebug_lock); - if (!nfound && verbose) - pr_info("no matches for query\n"); - return nfound; } @@ -499,7 +496,6 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers) pr_err("bad flag-op %c, at start of %s\n", *str, str); return -EINVAL; } - v3pr_info("op='%c'\n", op); for (; *str ; ++str) { for (i = ARRAY_SIZE(opt_array) - 1; i >= 0; i--) { @@ -513,7 +509,6 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers) return -EINVAL; } } - v3pr_info("flags=0x%x\n", modifiers->flags); /* calculate final flags, mask based upon op */ switch (op) { @@ -529,7 +524,7 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers) modifiers->flags = 0; break; } - v3pr_info("*flagsp=0x%x *maskp=0x%x\n", modifiers->flags, modifiers->mask); + v3pr_info("op='%c' flags=0x%x maskp=0x%x\n", op, modifiers->flags, modifiers->mask); return 0; } @@ -539,7 +534,7 @@ static int ddebug_exec_query(char *query_string, const char *modname) struct flag_settings modifiers = {}; struct ddebug_query query = {}; #define MAXWORDS 9 - int nwords, nfound; + int nwords; char *words[MAXWORDS]; nwords = ddebug_tokenize(query_string, words, MAXWORDS); @@ -557,10 +552,7 @@ static int ddebug_exec_query(char *query_string, const char *modname) return -EINVAL; } /* actually go and implement the change */ - nfound = ddebug_change(&query, &modifiers); - vpr_info_dq(&query, nfound ? "applied" : "no-match"); - - return nfound; + return ddebug_change(&query, &modifiers); } /* handle multiple queries in query string, continue on error, return @@ -1234,11 +1226,10 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) { struct ddebug_table *dt; - v3pr_info("add-module: %s.%d sites\n", modname, di->num_descs); - if (!di->num_descs) { - v3pr_info(" skip %s\n", modname); + if (!di->num_descs) return 0; - } + + v3pr_info("add-module: %s %d sites\n", modname, di->num_descs); dt = kzalloc(sizeof(*dt), GFP_KERNEL); if (dt == NULL) { From patchwork Wed Apr 2 17:41:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036286 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 D4988C28B20 for ; Wed, 2 Apr 2025 17:42:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1254F10E883; Wed, 2 Apr 2025 17:42:24 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZwfP22DK"; dkim-atps=neutral Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FF4910E87A; Wed, 2 Apr 2025 17:42:23 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-85db7a3da71so1821039f.1; Wed, 02 Apr 2025 10:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615742; x=1744220542; 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=M14gZKfhH3KugOXUlz//RUWXY3n2mU5NyLnRML1fEas=; b=ZwfP22DK2HxAhraJPTKfg9vKc5nCmjIeF61eM3ae3bdLhQLf4tgOZ/cuBuIzgcMRky MUqJ+hpnrwNNshdsE9gEJ5CxwHWYr3jgY0lvnTT9ZjXzqR1FAVz08ExGz3uVafEy5681 3JmiR9DZrAv3cZt3owVbBs7Pq694tvCQ65sKFU/7iPHm9c3P3HcWzPPZewBzSHE1gXBh 0rf3qrZN9oq9/lu1p3TiuV5cVM1pam3WnZ8s3q51trOo+dTRF/yykAGMBYfMsMHv4JNR EqDAi4IlCkK2/B59pJlnhS9zZxwvxOireVKxae4U7BNI20sbebOfKvgFIH1cSUMQhJiS hm0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615742; x=1744220542; 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=M14gZKfhH3KugOXUlz//RUWXY3n2mU5NyLnRML1fEas=; b=XgWLYZMB44XJx4cFgoyDyRnz3s3P9Ao7fj3rXewriSyQ6tzS6TKffIjiHentdt1Srs etU/lPs9G9GaB0cuNwVbBSROu5MxT3zwlYN+e7CHhldAyj0mIRLADWnJuQBsDWRXFrWh HHhRfmkMTO7W5tqHNrRQxyyBMBrjymx6wURfgUJyHu8eB+9esAIqF5qr9thl/RX960zS zu2/0Zd4FdXcppLr5ORzTI6SltqrrWCx2A9VZkAlao25Jwk6sdU2Oh9zyfIJWyrXXf5f iaFskkFkYGhoccKi/tWh2WQrGvB/tkjuc/ociUyHm93X8VYDUEDRKKWaExOnHuS1pwa2 L5rQ== X-Forwarded-Encrypted: i=1; AJvYcCUGUAP44rO0CSk6OwsQ61mDuVDXxl5gE2RVsd//fQMTPmVXbEvTbQS8uueuJioaBwN2PhSLtp9mZHi2@lists.freedesktop.org, AJvYcCWDtvvoeLv4ATu3bzlnN2fmfQKvGSBQez0NzNq/Pv+rVXfCVYGHo3+oR7u4p36/5Fj4YZEdcMNK@lists.freedesktop.org, AJvYcCWs5s5P/ECyJzW2bctWBnaHb1yh26G3u2ag4KgQMgL2Z1Iw9a6UAlpZnX5LYYspX2CT/1gdFKtYNUBG/6pmIQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0YzEIsoCE4Eohz1HjhI4/zTlZZIRliEmhGqTIRDuG5B/xtSpXXky 5IJJKx6Hfk6N8IkB6N3AIqM/YG4fW4XNCRAk9xfzlCEcLHec81/k X-Gm-Gg: ASbGncvwZRbaVd9ZPMLBrvE1PDyBYOsVUD6QlEX3fCLHGhtFDwDWBqDIzhBITAzQc+Y meh5YonxE4YIpj+bW4QQMDPTfK+5wfrLL8UCE1V5M7sk9vwF5UsW5LuEhmeSU4HrIa8n0PMnzx7 TSQpV6eELFGoY9XYR4LEm5Kj+Edt50HYIkg5I57k5mxJZI3xigALXsnQ5Nwt9wxYil8TLI2pPOn nnRcQOdvQ/KdLm6KmIdG5R2voOEWKDBDZN1a9raKHpFN01rKaXAuSCyXREuw6L/tc9QRtiFh4/Y 2qrXa4bqEnorYmoMoL+fGYLUgtvPjJ1MwYygWiVCUvTh4GSuzauXYmZuetPINduAzeQERcqX99y HDw== X-Google-Smtp-Source: AGHT+IEHyX3rih30b1ivp2/YdoiUvkQ7tiETAKcxWC1uHIaX7eknjSc/IG5d+B4mXjukEeK8ZBu1iA== X-Received: by 2002:a05:6e02:98c:b0:3d6:d3f7:8827 with SMTP id e9e14a558f8ab-3d6d3f7c864mr38169645ab.22.1743615742512; Wed, 02 Apr 2025 10:42:22 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:22 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 09/54] dyndbg: refactor param_set_dyndbg_classes and below Date: Wed, 2 Apr 2025 11:41:11 -0600 Message-ID: <20250402174156.1246171-10-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Refactor callchain below param_set_dyndbg_classes(1) to allow mod-name specific settings. Split (1) into upper/lower fns, adding modname param to lower, and passing NULL in from upper. Below that, add the same param to ddebug_apply_class_bitmap(), and pass it thru to _ddebug_queries(), replacing NULL with the param. This allows the callchain to update the classmap in just one module, vs just all as currently done. While the sysfs param is unlikely to ever update just one module, the callchain will be used for modprobe handling, which should update only that just-probed module. In ddebug_apply_class_bitmap(), also check for actual changes to the bits before announcing them, to declutter logs. No functional change. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- v3 s/modnm/mod_name/g --- lib/dynamic_debug.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c609ff873224..3ad2e38c9ae2 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -593,9 +593,10 @@ static int ddebug_exec_queries(char *query, const char *modname) return nfound; } -/* apply a new bitmap to the sys-knob's current bit-state */ +/* 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) + unsigned long *new_bits, unsigned long *old_bits, + const char *query_modname) { #define QUERY_SIZE 128 char query[QUERY_SIZE]; @@ -603,7 +604,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, int matches = 0; int bi, ct; - v2pr_info("apply: 0x%lx to: 0x%lx\n", *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 ?: "'*'"); for (bi = 0; bi < map->length; bi++) { if (test_bit(bi, new_bits) == test_bit(bi, old_bits)) @@ -612,12 +615,16 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi], test_bit(bi, new_bits) ? '+' : '-', dcp->flags); - ct = ddebug_exec_queries(query, NULL); + ct = ddebug_exec_queries(query, query_modname); matches += ct; 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) + v2pr_info("applied bitmap: 0x%lx to: 0x%lx for %s\n", *new_bits, + *old_bits, query_modname ?: "'*'"); + return matches; } @@ -672,7 +679,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); + 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]); @@ -682,7 +689,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); + 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); @@ -696,18 +703,9 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa return 0; } -/** - * param_set_dyndbg_classes - class FOO >control - * @instr: string echo>d to sysfs, input depends on map_type - * @kp: kp->arg has state: bits/lvl, map, map_type - * - * Enable/disable prdbgs by their class, as given in the arguments to - * DECLARE_DYNDBG_CLASSMAP. For LEVEL map-types, enforce relative - * levels by bitpos. - * - * Returns: 0 or <0 if error. - */ -int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) +static int param_set_dyndbg_module_classes(const char *instr, + const struct kernel_param *kp, + const char *mod_name) { const struct ddebug_class_param *dcp = kp->arg; const struct ddebug_class_map *map = dcp->map; @@ -744,8 +742,8 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) KP_NAME(kp), inrep, CLASSMAP_BITMASK(map->length)); inrep &= CLASSMAP_BITMASK(map->length); } - v2pr_info("bits:%lx > %s\n", inrep, KP_NAME(kp)); - totct += ddebug_apply_class_bitmap(dcp, &inrep, dcp->bits); + 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); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: @@ -758,7 +756,7 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) 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); + totct += ddebug_apply_class_bitmap(dcp, &new_bits, &old_bits, mod_name); *dcp->lvl = inrep; break; default: @@ -767,16 +765,33 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) vpr_info("%s: total matches: %d\n", KP_NAME(kp), totct); return 0; } + +/** + * param_set_dyndbg_classes - classmap kparam setter + * @instr: string echo>d to sysfs, input depends on map_type + * @kp: kp->arg has state: bits/lvl, map, map_type + * + * enable/disable all class'd pr_debugs in the classmap. For LEVEL + * map-types, enforce * relative levels by bitpos. + * + * Returns: 0 or <0 if error. + */ +int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) +{ + return param_set_dyndbg_module_classes(instr, kp, NULL); +} EXPORT_SYMBOL(param_set_dyndbg_classes); /** - * param_get_dyndbg_classes - classes reader + * param_get_dyndbg_classes - classmap kparam getter * @buffer: string description of controlled bits -> classes * @kp: kp->arg has state: bits, map * - * Reads last written state, underlying prdbg state may have been - * altered by direct >control. Displays 0x for DISJOINT, 0-N for - * LEVEL Returns: #chars written or <0 on error + * Reads last written state, underlying pr_debug states may have been + * altered by direct >control. Displays 0x for DISJOINT classmap + * types, 0-N for LEVEL types. + * + * Returns: ct of chars written or <0 on error */ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) { From patchwork Wed Apr 2 17:41:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036289 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 54BE6C28B20 for ; Wed, 2 Apr 2025 17:42:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 810A010E87A; Wed, 2 Apr 2025 17:42:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="c/4WyQr5"; dkim-atps=neutral Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F96410E886; Wed, 2 Apr 2025 17:42:24 +0000 (UTC) Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-85de3e8d0adso680539f.1; Wed, 02 Apr 2025 10:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615743; x=1744220543; 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=TvjbELtWnV/6RRAeJjKQ44+/OjVwNVd4yFNXgDDBNwA=; b=c/4WyQr5kJUvUgEoeicmhl7UNPjQ/jZNff/dBeGbOwuTRjl+vtvYlK1uvLQ2rJaT9a MLlkpxERFO6nwbLGjFEMcJNnu8svsDYDUdLRSx++Jj7eCAdSU2SLdiYrM9GgFGm8lqs2 E/U/S7Cd1ei/1EsY4uz3O7cHscvWTolua9Z59jS8fb+SrxonMMKD2Ra/+9tCwbpxeE4k 0/FSmtSN3I+YKLIT9k410QSjcB+SGj0eDP1YOScqpzckmq7oIEgCv2G3gYZLpQ5O2VZK PgKXa0LACW5D2v9aACMJ527rTiBQ6n18i1WTd305R0WrRBow+Vjq/sjcqHjGlgSiztTO TlsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615743; x=1744220543; 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=TvjbELtWnV/6RRAeJjKQ44+/OjVwNVd4yFNXgDDBNwA=; b=tTUTKjxk6dlAQcPxCQoqfhTovDuummNpUzeflr4P3IJZIuqIHGtESiIWnCHPQLzbSY ybrW9+ItsgWa9t7UUvTegWy6X2gwfGLY2f0nRJR5Y/k7eZspGoK3N2MrdYhf5+MfcSJu Yj4TCQgCy2H64Qvn6Jy6vTjmGEdccKjBb+xmTX4sPror56d6OTEnZGV/xGe9gTyO1uXj jLaAKh91FcPFpmWS+ouWDpe9aJQAKbLctnUkGjg09XVsP22USZbtXdT7vvGejjjfXv8S L5SvVknRwVj5dei/nfrHOXkqtmRfscZNzrgAZkHeVFKXAcJB92mc1N5o+muCKKjpeoM4 JrMw== X-Forwarded-Encrypted: i=1; AJvYcCVI97ckknC2cg5PqFbiQ+MLkZ2NSplaBFcZwo7MhrBj4i07UC7fEY04wXuLubMzuNdgyzHFmbnujOHm@lists.freedesktop.org, AJvYcCWTtoHITdrBTDBQe3v7/IEbm/ETjJklImpOKzvJrJS3Aw/+06/lUyYJmwkq2HKyyGsoiwF92pHtGgw5qz/6og==@lists.freedesktop.org, AJvYcCXcYeq1fcZisEaM78sduTFSkJ7yQwXrGSz7mzwzdstREEBM/fX/QFp54fkAvT/zFHrX693pxECB@lists.freedesktop.org X-Gm-Message-State: AOJu0YzaAKeB5gdtD6QFHvE+bbe3ODebZKe96msNi4iPd1Er4WPnG3pP tOXqoawpJqKkc08KW0PmsXdyoBImLV8L3Wf5s0AiVAxC0CkBerCj X-Gm-Gg: ASbGncvX4ZMsqyvMfFoZAiAtP2RYcTg99g/rU8MrGpI2PI911prPmj1mWIdKBbe+ZXf 2tL0aQndTiaJPjh+0DtNLZWf0V4BRhksg29l69dJBE1t1gcUw9Mj+4zjtmEgkMtuumgKH14CkH/ 3sXsHcTlM7CVWJdoesSPdU/a63IBSqtgo2i1xCkC0cwlHwAg84x4uzkdlYwqilkFrzNWnVWXIbt rW0j2sZi1XC5H10Q0ni6lkpLKsXVEF5frVpe/UTdqF8xbgwbD4nmhOJQZoABqCm+Sr0I3CC6J/i dmg9FTPesxV2Bs8+8pOyWNmPV1EUt6/ZbUrhKxCy5akgwWcjXIqVAaKTgAGugw7GTTuJxcu2ddc qLA== X-Google-Smtp-Source: AGHT+IGs85dZsLuENhKJMhd+4RgG2Mp0KjLcFlPdCM0oKKyQhvn0ta0pOjzD/VWsfZGf5qORX7r3hg== X-Received: by 2002:a05:6e02:1b0c:b0:3d6:d3f7:8826 with SMTP id e9e14a558f8ab-3d6d3f7c548mr56059025ab.20.1743615743459; Wed, 02 Apr 2025 10:42:23 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:23 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 10/54] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Date: Wed, 2 Apr 2025 11:41:12 -0600 Message-ID: <20250402174156.1246171-11-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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 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 3ad2e38c9ae2..621e04b1f28c 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -595,7 +595,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 @@ -604,12 +605,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], @@ -621,9 +622,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; } @@ -679,7 +680,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]); @@ -689,7 +690,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); @@ -743,7 +744,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: @@ -756,7 +757,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: From patchwork Wed Apr 2 17:41:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036290 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 04B7DC36017 for ; Wed, 2 Apr 2025 17:42:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A9E8610E888; Wed, 2 Apr 2025 17:42:26 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gul6b28O"; dkim-atps=neutral Received: from mail-il1-f179.google.com (mail-il1-f179.google.com [209.85.166.179]) by gabe.freedesktop.org (Postfix) with ESMTPS id 33AB010E87F; Wed, 2 Apr 2025 17:42:25 +0000 (UTC) Received: by mail-il1-f179.google.com with SMTP id e9e14a558f8ab-3d589227978so261355ab.1; Wed, 02 Apr 2025 10:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615744; x=1744220544; 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=d71I99XtVy4797+iIGr5U+qSA7ZenkLyXc4Q7GcfPmk=; b=gul6b28OkrxpnLUYliQCqmvwCZyMHPsCFaS/WclAi6ayqByibZUi3xQ/rLNiFoAOvo jcN30jndmP+6LyHnfKmMGO6Ydu9ZcwHoZQOaL3L980Z1P1H953t2vX8WMudh3EOi2A8Y hJTum13kI2gOctbcLBCntSfarVPpYOmztqXP7CQZ6IpNv2+0e/rQprsjzbIcIW1ytjCA M2uHrrnzX55BEl8wz3PbHUB5bOLd9onum4QRWTugXJed5uHs6oGJDfYFjAG1mNbMeFUP d4SqvH14/t9JLW5iG6bGG/Pij67V5vO/C9FxKHziyORyVvU2yc77RiBeykovhgTTErBt pOgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615744; x=1744220544; 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=d71I99XtVy4797+iIGr5U+qSA7ZenkLyXc4Q7GcfPmk=; b=UZUCsdiVGZvEFe515283l8P/7f1A5bnbs/DEVP+cu/JoolbReVHwEURbryzNfweixJ Mjj1PY74kqLWFIkjs9fO8QOCoLdptWK1py4uZgFB2oJLqXMyjJ4gFdeFRV1XyUKc0La4 PrH0SSLU/D1BhS3HWp2SltaDtylCubyfgInBfdySSyEBgb2LN9MP0xEpvHxwWnuoV1sD wbYXYVNKda6zBUeGDE2Zz5aDKt2PRmrXbLKDP87fgUkMFwn3aJqfBWqSEtcA+dsDs1vF +0pRBa1PGR0AzRIlS2/ct0qP31CaLOAQDcz4LVgh/WmwYmxiY77PE2zDPeUAHaE7vG2W iACw== X-Forwarded-Encrypted: i=1; AJvYcCUBC5vQPHF5CmIOq8BHDE0+VNGOikvWcsBdTHjIwLrM1co+CDfxlfWGMiEfp4zye4RUV+xDWsqhRoT/UAlVeQ==@lists.freedesktop.org, AJvYcCUUK144vITOaGIbR6xH9gS4qI20cNYiYg5r48kCEKDLdlHIencPCJz3vw2xFmLkmu/vEcNCsxqk@lists.freedesktop.org, AJvYcCWOCXBkBWXC7We8YTCssfMFhh5ZoaOKWNpfUj1Byn1Lsh9l/ri07D/2j2rSjF0UnkQ1QyvNuWXKkVng@lists.freedesktop.org X-Gm-Message-State: AOJu0Yz9yfKclq9p/TQhPJ+KQSO7vb49Z0T5rW0qvWbvy1tBFaZlKmZx MRyhgPFZunc1GW/zcaSavJDKH5uF5crOYeLabqgkePlKlZBp54T4 X-Gm-Gg: ASbGnctH7ASZuw8ekqxOSf+ZXju4a9M+sAiTNJbB1dHi3D3a6hfJhKi1bj3FAPNMhNs hMz20NfzjBhUdqCjsB2aGIDRUKMJU8Niqe0cFot8uiBkZbE4ZrAP8H8g/EFEDNyhlwUWLTfIDQp D70nZn0Jh4CJUCcT7PzFDzJQt2K669hRVX4u92OjYmOnqrrFR39Cs5HRy9+EhGT0koZjXFQtOtJ i0Z6id2xpajAYtEtTWsd31ENQu6Whv22N3uXVufzc2o6rXq/DglckqKVQbKBuI2IjWTEGYiEE18 R0MOrIXFz0erZ9wJm9DXLdckDTsxsjrKKeUxtu7qNUxLGXbVF3SXI5pPQ/MOllLwKQeqDxioPRJ OYQ== X-Google-Smtp-Source: AGHT+IG+gSa1soX7/vjnYhv/X0CCHTfdsDvGdVc4Ac6El3VHxHpzKXqSuveJpX56mj/w47JbZdEjVQ== X-Received: by 2002:a05:6e02:2148:b0:3d3:f15e:8e23 with SMTP id e9e14a558f8ab-3d6dcbc59d4mr6812745ab.10.1743615744434; Wed, 02 Apr 2025 10:42:24 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:24 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 11/54] dyndbg: replace classmap list with a vector Date: Wed, 2 Apr 2025 11:41:13 -0600 Message-ID: <20250402174156.1246171-12-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Classmaps are stored in an elf section/array, but currently are individually list-linked onto dyndbg's per-module ddebug_table for operation. This is unnecessary. Just like dyndbg's descriptors, classes are packed in compile order; so even with many builtin modules employing multiple classmaps, each modules' maps are packed contiguously, and can be treated as a array-start-address & array-length. So this drops the whole list building operation done in ddebug_attach_module_classes(), and removes the list-head members. The "select-by-modname" condition is reused to find the start,end of the subrange. NOTE: This "filter-by-modname" on classmaps should really be done in ddebug_add_module(1); ie at least one step closer to ddebug_init(2), which already splits up pr-debug descriptors into subranges by modname, then calls (1) on each. (2) knows nothing of classmaps currently, and doesn't need to. For now, just add comment. Signed-off-by: Jim Cromie --- v3- drop __outvar as promising magic it doesnt have --- include/linux/dynamic_debug.h | 1 - lib/dynamic_debug.c | 62 ++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 31 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index ac199293d203..e458d4b838ac 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -83,7 +83,6 @@ enum class_map_type { }; struct ddebug_class_map { - struct list_head link; struct module *mod; const char *mod_name; /* needed for builtins */ const char **class_names; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 621e04b1f28c..85b8d32742ec 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -45,10 +45,11 @@ extern struct ddebug_class_map __start___dyndbg_classes[]; extern struct ddebug_class_map __stop___dyndbg_classes[]; struct ddebug_table { - struct list_head link, maps; + struct list_head link; const char *mod_name; - unsigned int num_ddebugs; struct _ddebug *ddebugs; + struct ddebug_class_map *classes; + unsigned int num_ddebugs, num_classes; }; struct ddebug_query { @@ -148,12 +149,13 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) } static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, - const char *class_string, int *class_id) + const char *class_string, + int *class_id) { struct ddebug_class_map *map; - int idx; + int i, idx; - list_for_each_entry(map, &dt->maps, link) { + for (map = dt->classes, i = 0; i < dt->num_classes; i++, map++) { idx = match_string(map->class_names, map->length, class_string); if (idx >= 0) { *class_id = idx + map->base; @@ -164,7 +166,6 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons return NULL; } -#define __outvar /* filled by callee */ /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -180,7 +181,7 @@ static int ddebug_change(const struct ddebug_query *query, unsigned int nfound = 0; struct flagsbuf fbuf, nbuf; struct ddebug_class_map *map = NULL; - int __outvar valid_class; + int valid_class; /* search for matching ddebugs */ mutex_lock(&ddebug_lock); @@ -1122,9 +1123,10 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos) static const char *ddebug_class_name(struct ddebug_iter *iter, struct _ddebug *dp) { - struct ddebug_class_map *map; + struct ddebug_class_map *map = iter->table->classes; + int i, nc = iter->table->num_classes; - list_for_each_entry(map, &iter->table->maps, link) + for (i = 0; i < nc; i++, map++) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; @@ -1208,30 +1210,31 @@ static const struct proc_ops proc_fops = { .proc_write = ddebug_proc_write }; -static void ddebug_attach_module_classes(struct ddebug_table *dt, - struct ddebug_class_map *classes, - int num_classes) +static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) { struct ddebug_class_map *cm; - int i, j, ct = 0; + int i, nc = 0; - for (cm = classes, i = 0; i < num_classes; i++, cm++) { + /* + * Find this module's classmaps in a subrange/wholerange of + * the builtin/modular classmap vector/section. Save the start + * and length of the subrange at its edges. + */ + for (cm = di->classes, i = 0; i < di->num_classes; i++, cm++) { if (!strcmp(cm->mod_name, dt->mod_name)) { - - v2pr_info("class[%d]: module:%s base:%d len:%d ty:%d\n", i, - cm->mod_name, cm->base, cm->length, cm->map_type); - - for (j = 0; j < cm->length; j++) - v3pr_info(" %d: %d %s\n", j + cm->base, j, - cm->class_names[j]); - - list_add(&cm->link, &dt->maps); - ct++; + if (!nc) { + v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n", + i, cm->mod_name, cm->base, cm->length, cm->map_type); + dt->classes = cm; + } + nc++; } } - if (ct) - vpr_info("module:%s attached %d classes\n", dt->mod_name, ct); + if (nc) { + dt->num_classes = nc; + vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); + } } /* @@ -1263,10 +1266,9 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) dt->num_ddebugs = di->num_descs; INIT_LIST_HEAD(&dt->link); - INIT_LIST_HEAD(&dt->maps); if (di->classes && di->num_classes) - ddebug_attach_module_classes(dt, di->classes, di->num_classes); + ddebug_attach_module_classes(dt, di); mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); @@ -1379,8 +1381,8 @@ static void ddebug_remove_all_tables(void) mutex_lock(&ddebug_lock); while (!list_empty(&ddebug_tables)) { struct ddebug_table *dt = list_entry(ddebug_tables.next, - struct ddebug_table, - link); + struct ddebug_table, + link); ddebug_table_free(dt); } mutex_unlock(&ddebug_lock); From patchwork Wed Apr 2 17:41:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036291 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 F34DBC36014 for ; Wed, 2 Apr 2025 17:42:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 04AC910E882; Wed, 2 Apr 2025 17:42:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Qn1nIFBh"; dkim-atps=neutral Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1332010E888; Wed, 2 Apr 2025 17:42:26 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so489545ab.0; Wed, 02 Apr 2025 10:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615745; x=1744220545; 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=c83dBzoIbcIM0DNfA5gVIyrKxy+OBEXIBjZPEG9Pdjo=; b=Qn1nIFBhgv+lBXQgCI34cdH8eO30+ViuDZFozjEtiDyUaVWpojH6jdYVuwi9ARhG0Z Vj8o6h6cQQIINSTeiibgXg5bmb4Lztk777/MgrEGkokKkiqML+QGB0a8z69Q44uM3/5+ XfXMOEn9M7umzBW6EsPiozjQqQIYqKbYszi6h43BTIIbjOhd4q0N7cPp643BlZULfW1b UR+8T0oJt5RtibDngUrsUGkn8gY+P2BPRWF4NdOhbnEsLyZlWR7W1qkzrAcD7PUQCWVa 1YqCi3WJ8N/djRnHWBtSuodVuwvII+1WrGdDGA5lMSa/u3VIf5AXvKdj9s2DF7yGPUnw MJNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615745; x=1744220545; 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=c83dBzoIbcIM0DNfA5gVIyrKxy+OBEXIBjZPEG9Pdjo=; b=aMdbKKWm0fPby2wHuu5SHsf5Ul3uESg8YD6ewlljlQ3+mV9h6LaRhBEIHuxTNU71TM w3ScQvtaCCFf4l9WJ9DZZOlOrXIy4TqS5/bt57WknKyeGFfRZktEhh04k1l7IzrgLKEx 1sbFPwDd0IsXyDzrlJRQ00pISYjd+c29zBbgwnNcbmPrvVBFMtzhVklTpzchU1ghTk4k cmFybYfqJiJBtAAy6N4lA+Kl/Y0ajgucSDMBPH55OR2VzsNAdU48455tDFIxJvhAMTfO kA+XFLD2KMLjVKNgrYznNamWQ0pj/7d9PWI2fy9bdZ0H0UKiHaaGY1r4eII/S8j21Wko Lizw== X-Forwarded-Encrypted: i=1; AJvYcCUob73jBe/JbYz5tRX/3MMxHKeQXtc2UlddXSlgQdB7QNJJKFUi8+pxuYepqR5e4ELhiYZnkYYOackM@lists.freedesktop.org, AJvYcCVaJbxc//lY7VDOfbtJsatdI3APkEems5mhLZWrgbCeAYaZ/9a6Yc1zwgqTHrdpVw8RnkkiHbWKkoxBguUQ2w==@lists.freedesktop.org, AJvYcCWmBXMcYxzPWL1vkC8tePlIM/6u7UBnC4iAaR8DfJPP1dIqAnxnGOKnfrvVC+HGIDDUmBNJv7Yz@lists.freedesktop.org X-Gm-Message-State: AOJu0YysvAc0VsjkZCBKjTImI3uyn6qoKeSicTv9KtA21dCXgosjSx5v FVpPr5SUO7HBuJuo5REh5cQzbk36WNkWk259BRHMFeihRaW3RxyY X-Gm-Gg: ASbGnct8c8k7GesgKdOL8xtTl0ETs3EKz20XCOqt+qNLkudungmIXoeYM50rnQWudM3 OhbaAeDETLyxcur3PfEvzFR10NtWXN0dev++ZEoBdlZDuRiD1hrM6OCN4PE5NiZ3otn2sBJ7I/M ouarTRpBWoSElbUbgsCnhuvWcZKGHS+oCrbq8mn4wMyaVt0lj7tZgjWuSGVtfTsxuXIz6TBTfnB mWW8+VimYSGvB86kLu1hFeAJi8aiKRu79WYpAs2xbGHxY/s9Jybo5xLwurIJ4CsHljlc5BevZcD tYdv9F+dqIfQiW5SIiDBMjLaa3tJNnURnIfjKLr28XegIJXFLnrNtqB6gVe4GCkS63Mc3OwGnZ8 57w== X-Google-Smtp-Source: AGHT+IG4VkEFZ5GxM5DWtdCptwmL6vD+yFvCbb5TkjAwVoCHsiKcA6mXmOduxT46XIJtI0tZSFL2lA== X-Received: by 2002:a05:6e02:1848:b0:3d0:443d:a5c3 with SMTP id e9e14a558f8ab-3d6d546a3e6mr38861015ab.3.1743615745299; Wed, 02 Apr 2025 10:42:25 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:24 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 12/54] dyndbg: macrofy a 2-index for-loop pattern Date: Wed, 2 Apr 2025 11:41:14 -0600 Message-ID: <20250402174156.1246171-13-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" dynamic-debug has several __sections, each with , num_, and it iterates over these with a 2-index for-loop. These loops are fiddly with the 2 names. We have only 2 such loops now, but are getting more soon; lets embed/abstract the fiddlyness in the for_subvec() macro, and avoid repeating it going forward. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- lib/dynamic_debug.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 85b8d32742ec..253eaf0a9bd6 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -128,6 +128,21 @@ do { \ #define v3pr_info(fmt, ...) vnpr_info(3, fmt, ##__VA_ARGS__) #define v4pr_info(fmt, ...) vnpr_info(4, fmt, ##__VA_ARGS__) + +/* + * simplify a repeated for-loop pattern walking N steps in a T _vec + * member inside a struct _box. It expects int i and T *_sp to be + * declared in the caller. + * @_i: caller provided counter. + * @_sp: cursor into _vec, to examine each item. + * @_box: ptr to a struct containing @_vec member + * @_vec: name of a sub-struct member in _box, with array-ref and length + */ +#define for_subvec(_i, _sp, _box, _vec) \ + for ((_i) = 0, (_sp) = (_box)->_vec; \ + (_i) < (_box)->num_##_vec; \ + (_i)++, (_sp)++) + static void vpr_info_dq(const struct ddebug_query *query, const char *msg) { /* trim any trailing newlines */ @@ -155,7 +170,7 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons struct ddebug_class_map *map; int i, idx; - for (map = dt->classes, i = 0; i < dt->num_classes; i++, map++) { + for_subvec(i, map, dt, classes) { idx = match_string(map->class_names, map->length, class_string); if (idx >= 0) { *class_id = idx + map->base; @@ -1220,8 +1235,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug * the builtin/modular classmap vector/section. Save the start * and length of the subrange at its edges. */ - for (cm = di->classes, i = 0; i < di->num_classes; i++, cm++) { - + for_subvec(i, cm, di, classes) { if (!strcmp(cm->mod_name, dt->mod_name)) { if (!nc) { v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n", From patchwork Wed Apr 2 17:41:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036292 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 318FDC3601C for ; Wed, 2 Apr 2025 17:42:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2967F10E87F; Wed, 2 Apr 2025 17:42:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HUyoC+No"; dkim-atps=neutral Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 47DF110E886; Wed, 2 Apr 2025 17:42:27 +0000 (UTC) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3d46fddf357so511045ab.2; Wed, 02 Apr 2025 10:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615746; x=1744220546; 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=iMdCRBeIUaLomxj7l8ds1vlIX+t+0425kepvKlXHPa4=; b=HUyoC+NoFPDIJqf09vntpiZp78oVE/lP+51ZL9bvhOKOnI3d16x5HCyFc5hjjFPw3A EsuOGut1JN8CbmfkqcVbIquUzaerX0segQ+GANg416DneVmffLRUD+UZqpvVNm+GfTcr az3WPs5seBT084m90DmoWLXYXTwndhhQuZTIFDWXC5A1L1qKWgwEaqzJ+RmkYEQdWBs6 XFuFXG3Qom925qE1NCX2rXj+tCl/2bk65RxxANHJlesRX1MrV/HNzAqDfBgfqxhDo/Ac 5DaFUzyud1K6lGkTu9BqwMD5kZPDGfBRWujI8/9a5jnsBrQR8vTMtIup+13U7EVXNAuH Zptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615746; x=1744220546; 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=iMdCRBeIUaLomxj7l8ds1vlIX+t+0425kepvKlXHPa4=; b=WK8r4MgBo+4+mE2TAH+BPKUz/aPiWabK6BW6YTCHfYRMor0W9SmTbLNN5/8ORJvHuX cHXm6qQahnb/5QAEGaVsI3GgU4HVhtU3SN83ZsYVKqEimcmUL4vObbpehRZB7YDr6edI /iYTYgA3RosvPp+XIU9pHJ8yvESemCX36CZmSjUX5Gk+UkF5VSQjiiYY8CcwEHGFUr78 dXycNI8ac9aZAygMqKc2LQ74+3f9FNR4yw6oI3P6RwF9J3q+ylSkH4uPZ9ZVp3hFbBUP t/O/M5cNn4+iBH7ToOY0FUlutwkkoVCr8yaLj3T4SfceYI/1x1FFtzIVxr5LvbRVeHVs wISg== X-Forwarded-Encrypted: i=1; AJvYcCVe+IIKhpxRoUQa2hvG+T+yi+0TIH1fPNzR4MmSJu64pgamkdo2vo93miNQQq7ZX4knQstyA5xO+wuN@lists.freedesktop.org, AJvYcCX1LvoX2B1zdISa58w5IEOajHFPyx1nK9nZFCkjbxUjx578dq2OHphkPHwpegc990N7+QJOtUjOLNbMfAUNgw==@lists.freedesktop.org, AJvYcCXtWXmZAwLSEpFe0o2IgQXV0bXeBCq/6XZGBPoUisWCLKYyyh5u0nXf6qtgCixrq+WhttoXxOcR@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywz5Tya80Vw2UE2cQQ2m5+16wjT4ltpffOGyN5tFQDWETciFHi3 GIt+q4nml2oHylWZj0qEDXn4UeASkj4RP67sHzAhqXy7fzRnRmG5 X-Gm-Gg: ASbGncvyhuI8P23Ht3Ae32YTMwxozCFG97M5frNkz+ALubUn3k/5VZAWHFmXdVQvYIR 0iuZd/gqrpLmQIeRiNEFUuf32jDQ9K69jk22TM0yejssDlGpnL12kZbuUYSfZaAmuoIkWCF0qyr 9VGHlg/+Y/EByfMR61bZdgbV/xniX+WvAuWWXQTRG6uv0AUY2u3kIhjXXXIEkDEgfS5Kebj+qul 4khtvAepXNCeyBkVz8Emo2DU330fmmRE43ixgIm0Iak03XHFY9w5q2y6llDP/sYxiCxEmsxyq9F /MXKIDNzRAOjnVYaZiCX55ErkKucEs7phWlbgVeQcWAQho7M8q01+aKZKRZfPTGVdgGUk/oEKA2 6gA== X-Google-Smtp-Source: AGHT+IHUY9S3HF46t+ndEfA8P1+IRpDjHWzuWWnXUC+mhYdnqetWUUFeVMyyGMwbn03VeqZ1Z8+QOQ== X-Received: by 2002:a05:6e02:12cf:b0:3d5:8937:f419 with SMTP id e9e14a558f8ab-3d5e093c0e0mr170498575ab.13.1743615746299; Wed, 02 Apr 2025 10:42:26 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:25 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 13/54] dyndbg, module: make proper substructs in _ddebug_info Date: Wed, 2 Apr 2025 11:41:15 -0600 Message-ID: <20250402174156.1246171-14-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" recompose struct _ddebug_info, inserting proper sub-structs. The struct currently has 2 pairs of fields: descs, num_descs and classes, num_classes. Several for-loops operate on these field pairs, soon many more will be added. Looping over these blocks by respective field-pairs is repetitive and fiddly, differing only by the field-names. Before adding a 3rd section and compounding the fiddly details problem, make proper substructs of each section, with the same named fields. So this patch does: Adds 3 "vector" structs, each with { *start, int len; } components, for _ddebug_descriptors, _ddebug_class_maps, and _ddebug_class_users respectively. Invariant: These vectors ref a contiguous subrange of __section memory in builtin/DATA or in loadable modules via mod->dyndbg_info; with guaranteed life-time for us. Bundles these 3 vectors (subrange-refs) struct (reformed) _ddebug_info, where they're __packed to close the paholes introduced otherwise. The common fields allow improving the for_subvec() macro by dropping the ugly num_## paste-up. Also recompose struct ddebug_table to contain a _ddebug_info. This reinforces its use as a cursor into relevant data for a builtin module, and access to the full _ddebug state for modules. NOTES: Fixup names: section names improved, struct names normalized to _ddebug_* struct module contains a _ddebug_info field and module/main.c sets it up, so that gets adjusted. The __packed attribute on _ddebug_info and the 3 contained structs closes the holes otherwise created by the structification (which was my excuse for not doing it originally). Signed-off-by: Jim Cromie --- -v2 rework towards front of series --- include/asm-generic/vmlinux.lds.h | 4 +- include/linux/dynamic_debug.h | 42 +++++++----- kernel/module/main.c | 12 ++-- lib/dynamic_debug.c | 108 ++++++++++++++---------------- lib/test_dynamic_debug.c | 2 +- 5 files changed, 88 insertions(+), 80 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index c9c66089ea2f..f834ad1fb8c4 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -366,8 +366,8 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) *(__tracepoints) \ /* implement dynamic printk debug */ \ . = ALIGN(8); \ - BOUNDED_SECTION_BY(__dyndbg_classes, ___dyndbg_classes) \ - BOUNDED_SECTION_BY(__dyndbg, ___dyndbg) \ + BOUNDED_SECTION_BY(__dyndbg_class_maps, ___dyndbg_class_maps) \ + BOUNDED_SECTION_BY(__dyndbg_descriptors, ___dyndbg_descs) \ CODETAG_SECTIONS() \ LIKELY_PROFILE() \ BRANCH_PROFILE() \ diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index e458d4b838ac..9d282e2444e1 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -82,7 +82,7 @@ enum class_map_type { */ }; -struct ddebug_class_map { +struct _ddebug_class_map { struct module *mod; const char *mod_name; /* needed for builtins */ const char **class_names; @@ -93,15 +93,15 @@ struct ddebug_class_map { /** * DECLARE_DYNDBG_CLASSMAP - declare classnames known by a module - * @_var: a struct ddebug_class_map, passed to module_param_cb + * @_var: a struct _ddebug_class_map, passed to module_param_cb * @_type: enum class_map_type, chooses bits/verbose, numeric/symbolic * @_base: offset of 1st class-name. splits .class_id space * @classes: class-names used to control class'd prdbgs */ #define DECLARE_DYNDBG_CLASSMAP(_var, _maptype, _base, ...) \ static const char *_var##_classnames[] = { __VA_ARGS__ }; \ - static struct ddebug_class_map __aligned(8) __used \ - __section("__dyndbg_classes") _var = { \ + static struct _ddebug_class_map __aligned(8) __used \ + __section("__dyndbg_class_maps") _var = { \ .mod = THIS_MODULE, \ .mod_name = KBUILD_MODNAME, \ .base = _base, \ @@ -110,21 +110,33 @@ struct ddebug_class_map { .class_names = _var##_classnames, \ } -/* encapsulate linker provided built-in (or module) dyndbg data */ +/* + * @_ddebug_info: gathers module/builtin dyndbg_* __sections together. + * For builtins, it is used as a cursor, with the inner structs + * marking sub-vectors of the builtin __sections in DATA. + */ +struct _ddebug_descs { + struct _ddebug *start; + int len; +} __packed; + +struct _ddebug_class_maps { + struct _ddebug_class_map *start; + int len; +} __packed; + struct _ddebug_info { - struct _ddebug *descs; - struct ddebug_class_map *classes; - unsigned int num_descs; - unsigned int num_classes; -}; + struct _ddebug_descs descs; + struct _ddebug_class_maps maps; +} __packed; -struct ddebug_class_param { +struct _ddebug_class_param { union { unsigned long *bits; unsigned long *lvl; }; char flags[8]; - const struct ddebug_class_map *map; + const struct _ddebug_class_map *map; }; /* @@ -159,7 +171,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \ static struct _ddebug __aligned(8) \ - __section("__dyndbg") name = { \ + __section("__dyndbg_descriptors") name = { \ .modname = KBUILD_MODNAME, \ .function = __func__, \ .filename = __FILE__, \ @@ -242,7 +254,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, * macro. */ #define _dynamic_func_call_cls(cls, fmt, func, ...) \ - __dynamic_func_call_cls(__UNIQUE_ID(ddebug), cls, fmt, func, ##__VA_ARGS__) + __dynamic_func_call_cls(__UNIQUE_ID(_ddebug), cls, fmt, func, ##__VA_ARGS__) #define _dynamic_func_call(fmt, func, ...) \ _dynamic_func_call_cls(_DPRINTK_CLASS_DFLT, fmt, func, ##__VA_ARGS__) @@ -252,7 +264,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, * with precisely the macro's varargs. */ #define _dynamic_func_call_cls_no_desc(cls, fmt, func, ...) \ - __dynamic_func_call_cls_no_desc(__UNIQUE_ID(ddebug), cls, fmt, \ + __dynamic_func_call_cls_no_desc(__UNIQUE_ID(_ddebug), cls, fmt, \ func, ##__VA_ARGS__) #define _dynamic_func_call_no_desc(fmt, func, ...) \ _dynamic_func_call_cls_no_desc(_DPRINTK_CLASS_DFLT, fmt, \ diff --git a/kernel/module/main.c b/kernel/module/main.c index 1fb9ad289a6f..b60f728e36ac 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2621,12 +2621,12 @@ static int find_module_sections(struct module *mod, struct load_info *info) pr_warn("%s: Ignoring obsolete parameters\n", mod->name); #ifdef CONFIG_DYNAMIC_DEBUG_CORE - mod->dyndbg_info.descs = section_objs(info, "__dyndbg", - sizeof(*mod->dyndbg_info.descs), - &mod->dyndbg_info.num_descs); - mod->dyndbg_info.classes = section_objs(info, "__dyndbg_classes", - sizeof(*mod->dyndbg_info.classes), - &mod->dyndbg_info.num_classes); + mod->dyndbg_info.descs.start = section_objs(info, "__dyndbg_descriptors", + sizeof(*mod->dyndbg_info.descs.start), + &mod->dyndbg_info.descs.len); + mod->dyndbg_info.maps.start = section_objs(info, "__dyndbg_class_maps", + sizeof(*mod->dyndbg_info.maps.start), + &mod->dyndbg_info.maps.len); #endif return 0; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 253eaf0a9bd6..104cf8abdf33 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -39,17 +39,15 @@ #include -extern struct _ddebug __start___dyndbg[]; -extern struct _ddebug __stop___dyndbg[]; -extern struct ddebug_class_map __start___dyndbg_classes[]; -extern struct ddebug_class_map __stop___dyndbg_classes[]; +extern struct _ddebug __start___dyndbg_descs[]; +extern struct _ddebug __stop___dyndbg_descs[]; +extern struct _ddebug_class_map __start___dyndbg_class_maps[]; +extern struct _ddebug_class_map __stop___dyndbg_class_maps[]; struct ddebug_table { struct list_head link; const char *mod_name; - struct _ddebug *ddebugs; - struct ddebug_class_map *classes; - unsigned int num_ddebugs, num_classes; + struct _ddebug_info info; }; struct ddebug_query { @@ -128,7 +126,6 @@ do { \ #define v3pr_info(fmt, ...) vnpr_info(3, fmt, ##__VA_ARGS__) #define v4pr_info(fmt, ...) vnpr_info(4, fmt, ##__VA_ARGS__) - /* * simplify a repeated for-loop pattern walking N steps in a T _vec * member inside a struct _box. It expects int i and T *_sp to be @@ -139,8 +136,8 @@ do { \ * @_vec: name of a sub-struct member in _box, with array-ref and length */ #define for_subvec(_i, _sp, _box, _vec) \ - for ((_i) = 0, (_sp) = (_box)->_vec; \ - (_i) < (_box)->num_##_vec; \ + for ((_i) = 0, (_sp) = (_box)->_vec.start; \ + (_i) < (_box)->_vec.len; \ (_i)++, (_sp)++) static void vpr_info_dq(const struct ddebug_query *query, const char *msg) @@ -163,14 +160,14 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) query->first_lineno, query->last_lineno, query->class_string); } -static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, +static struct _ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, const char *class_string, int *class_id) { - struct ddebug_class_map *map; + struct _ddebug_class_map *map; int i, idx; - for_subvec(i, map, dt, classes) { + for_subvec(i, map, &dt->info, maps) { idx = match_string(map->class_names, map->length, class_string); if (idx >= 0) { *class_id = idx + map->base; @@ -195,7 +192,7 @@ static int ddebug_change(const struct ddebug_query *query, unsigned int newflags; unsigned int nfound = 0; struct flagsbuf fbuf, nbuf; - struct ddebug_class_map *map = NULL; + struct _ddebug_class_map *map = NULL; int valid_class; /* search for matching ddebugs */ @@ -216,8 +213,8 @@ static int ddebug_change(const struct ddebug_query *query, valid_class = _DPRINTK_CLASS_DFLT; } - for (i = 0; i < dt->num_ddebugs; i++) { - struct _ddebug *dp = &dt->ddebugs[i]; + for (i = 0; i < dt->info.descs.len; i++) { + struct _ddebug *dp = &dt->info.descs.start[i]; /* match site against query-class */ if (dp->class_id != valid_class) @@ -610,14 +607,14 @@ 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, +static int ddebug_apply_class_bitmap(const struct _ddebug_class_param *dcp, const unsigned long *new_bits, const unsigned long old_bits, const char *query_modname) { #define QUERY_SIZE 128 char query[QUERY_SIZE]; - const struct ddebug_class_map *map = dcp->map; + const struct _ddebug_class_map *map = dcp->map; int matches = 0; int bi, ct; @@ -653,8 +650,8 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp, /* accept comma-separated-list of [+-] classnames */ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_param *kp) { - const struct ddebug_class_param *dcp = kp->arg; - const struct ddebug_class_map *map = dcp->map; + const struct _ddebug_class_param *dcp = kp->arg; + const struct _ddebug_class_map *map = dcp->map; unsigned long curr_bits, old_bits; char *cl_str, *p, *tmp; int cls_id, totct = 0; @@ -724,8 +721,8 @@ static int param_set_dyndbg_module_classes(const char *instr, const struct kernel_param *kp, const char *mod_name) { - const struct ddebug_class_param *dcp = kp->arg; - const struct ddebug_class_map *map = dcp->map; + const struct _ddebug_class_param *dcp = kp->arg; + const struct _ddebug_class_map *map = dcp->map; unsigned long inrep, new_bits, old_bits; int rc, totct = 0; @@ -812,8 +809,8 @@ EXPORT_SYMBOL(param_set_dyndbg_classes); */ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) { - const struct ddebug_class_param *dcp = kp->arg; - const struct ddebug_class_map *map = dcp->map; + const struct _ddebug_class_param *dcp = kp->arg; + const struct _ddebug_class_map *map = dcp->map; switch (map->map_type) { @@ -1064,8 +1061,8 @@ static struct _ddebug *ddebug_iter_first(struct ddebug_iter *iter) } iter->table = list_entry(ddebug_tables.next, struct ddebug_table, link); - iter->idx = iter->table->num_ddebugs; - return &iter->table->ddebugs[--iter->idx]; + iter->idx = iter->table->info.descs.len; + return &iter->table->info.descs.start[--iter->idx]; } /* @@ -1086,10 +1083,10 @@ static struct _ddebug *ddebug_iter_next(struct ddebug_iter *iter) } iter->table = list_entry(iter->table->link.next, struct ddebug_table, link); - iter->idx = iter->table->num_ddebugs; + iter->idx = iter->table->info.descs.len; --iter->idx; } - return &iter->table->ddebugs[iter->idx]; + return &iter->table->info.descs.start[iter->idx]; } /* @@ -1136,12 +1133,12 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos) #define class_in_range(class_id, map) \ (class_id >= map->base && class_id < map->base + map->length) -static const char *ddebug_class_name(struct ddebug_iter *iter, struct _ddebug *dp) +static const char *ddebug_class_name(struct ddebug_table *dt, struct _ddebug *dp) { - struct ddebug_class_map *map = iter->table->classes; - int i, nc = iter->table->num_classes; + struct _ddebug_class_map *map; + int i; - for (i = 0; i < nc; i++, map++) + for_subvec(i, map, &dt->info, maps) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; @@ -1175,7 +1172,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p) seq_putc(m, '"'); if (dp->class_id != _DPRINTK_CLASS_DFLT) { - class = ddebug_class_name(iter, dp); + class = ddebug_class_name(iter->table, dp); if (class) seq_printf(m, " class:%s", class); else @@ -1227,7 +1224,7 @@ static const struct proc_ops proc_fops = { static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) { - struct ddebug_class_map *cm; + struct _ddebug_class_map *cm; int i, nc = 0; /* @@ -1235,18 +1232,18 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug * the builtin/modular classmap vector/section. Save the start * and length of the subrange at its edges. */ - for_subvec(i, cm, di, classes) { + for_subvec(i, cm, di, maps) { if (!strcmp(cm->mod_name, dt->mod_name)) { if (!nc) { v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n", i, cm->mod_name, cm->base, cm->length, cm->map_type); - dt->classes = cm; + dt->info.maps.start = cm; } nc++; } } if (nc) { - dt->num_classes = nc; + dt->info.maps.len = nc; vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); } } @@ -1259,10 +1256,10 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) { struct ddebug_table *dt; - if (!di->num_descs) + if (!di->descs.len) return 0; - v3pr_info("add-module: %s %d sites\n", modname, di->num_descs); + v3pr_info("add-module: %s %d sites\n", modname, di->descs.len); dt = kzalloc(sizeof(*dt), GFP_KERNEL); if (dt == NULL) { @@ -1276,19 +1273,18 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) * this struct ddebug_table. */ dt->mod_name = modname; - dt->ddebugs = di->descs; - dt->num_ddebugs = di->num_descs; + dt->info = *di; INIT_LIST_HEAD(&dt->link); - if (di->classes && di->num_classes) + if (di->maps.len) ddebug_attach_module_classes(dt, di); mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); - vpr_info("%3u debug prints in module %s\n", di->num_descs, modname); + vpr_info("%3u debug prints in module %s\n", di->descs.len, modname); return 0; } @@ -1435,10 +1431,10 @@ static int __init dynamic_debug_init(void) char *cmdline; struct _ddebug_info di = { - .descs = __start___dyndbg, - .classes = __start___dyndbg_classes, - .num_descs = __stop___dyndbg - __start___dyndbg, - .num_classes = __stop___dyndbg_classes - __start___dyndbg_classes, + .descs.start = __start___dyndbg_descs, + .maps.start = __start___dyndbg_class_maps, + .descs.len = __stop___dyndbg_descs - __start___dyndbg_descs, + .maps.len = __stop___dyndbg_class_maps - __start___dyndbg_class_maps, }; #ifdef CONFIG_MODULES @@ -1449,7 +1445,7 @@ static int __init dynamic_debug_init(void) } #endif /* CONFIG_MODULES */ - if (&__start___dyndbg == &__stop___dyndbg) { + if (&__start___dyndbg_descs == &__stop___dyndbg_descs) { if (IS_ENABLED(CONFIG_DYNAMIC_DEBUG)) { pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n"); return 1; @@ -1459,16 +1455,16 @@ static int __init dynamic_debug_init(void) return 0; } - iter = iter_mod_start = __start___dyndbg; + iter = iter_mod_start = __start___dyndbg_descs; modname = iter->modname; i = mod_sites = mod_ct = 0; - for (; iter < __stop___dyndbg; iter++, i++, mod_sites++) { + for (; iter < __stop___dyndbg_descs; iter++, i++, mod_sites++) { if (strcmp(modname, iter->modname)) { mod_ct++; - di.num_descs = mod_sites; - di.descs = iter_mod_start; + di.descs.len = mod_sites; + di.descs.start = iter_mod_start; ret = ddebug_add_module(&di, modname); if (ret) goto out_err; @@ -1478,8 +1474,8 @@ static int __init dynamic_debug_init(void) iter_mod_start = iter; } } - di.num_descs = mod_sites; - di.descs = iter_mod_start; + di.descs.len = mod_sites; + di.descs.start = iter_mod_start; ret = ddebug_add_module(&di, modname); if (ret) goto out_err; @@ -1489,8 +1485,8 @@ static int __init dynamic_debug_init(void) i, mod_ct, (int)((mod_ct * sizeof(struct ddebug_table)) >> 10), (int)((i * sizeof(struct _ddebug)) >> 10)); - if (di.num_classes) - v2pr_info(" %d builtin ddebug class-maps\n", di.num_classes); + if (di.maps.len) + v2pr_info(" %d builtin ddebug class-maps\n", di.maps.len); /* now that ddebug tables are loaded, process all boot args * again to find and activate queries given in dyndbg params. diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 396144cf351b..8434f70b51bb 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -41,7 +41,7 @@ module_param_cb(do_prints, ¶m_ops_do_prints, NULL, 0600); */ #define DD_SYS_WRAP(_model, _flags) \ static unsigned long bits_##_model; \ - static struct ddebug_class_param _flags##_model = { \ + static struct _ddebug_class_param _flags##_model = { \ .bits = &bits_##_model, \ .flags = #_flags, \ .map = &map_##_model, \ From patchwork Wed Apr 2 17:41:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036293 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 D3ABCC36017 for ; Wed, 2 Apr 2025 17:42:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8382010E88C; Wed, 2 Apr 2025 17:42:29 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i9sMANgy"; dkim-atps=neutral Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3CD1110E87F; Wed, 2 Apr 2025 17:42:28 +0000 (UTC) Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-85b3f92c8dfso528739f.2; Wed, 02 Apr 2025 10:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615747; x=1744220547; 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=1HVCxpeKRFzeSI1AhmlyvBuPBqCCJEuta9afFF5qwQI=; b=i9sMANgyVawnzvrGjLqJPRGhs70gYkBi3JzhvTanyLeyoafr/ZnrScrAvW55vsYQIE OxjBofEUizXY09mVfYTJ0W1B4hjmJ3w/oxo/O8qDsXsyzjul7eOXfum903jB47pVM06g /U5kIATMnmHj0Dr520kpGSKoTKS92g8Z9nvTdNcGY0Zc/5bQqCh8TX8lgxWXFY6ZOrjo gid+43N7xWNYaLPuk5V9gWtmmMwfWu7oLJlmF/IBnUkDEuPRng5WCts4i0CSiR5B3HF/ 9x/QIdhPq39yGmP7D3YdYIA3t42mOFOXKSWUEmqxQwgU/IEpsaR29huUKqZoMQeewxb4 FRlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615747; x=1744220547; 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=1HVCxpeKRFzeSI1AhmlyvBuPBqCCJEuta9afFF5qwQI=; b=KJAnAO5GgFarUjLz93tXRL47xXzlXFuEfmOjCbYu29NmQ7pmJRjJfoXLEbywDvUoh5 yiW6xiYbqoBHaXYMMywNhqUFluDxPZKvrIam2Gcr/hwvGVxoXCARHmfoRCV/9cP+SUU6 4/5aDXNKyqR0hE/2oE9WPZ532P7FXsEybPXkfWPb6QcIE9ooBiK68zAO6PPNaWsURRtV I+RWtcyPdy1hF8bIkhhf05tnnMWjtNhBgSVeBJK6WN5cglw7+pOkcaedDZwOeeH2CKgq p4EeQ9eEgHKVK9W3N0/2GVJPrk70OmA+urEDTMmGdGjs01w5bba8+a0MHnnaowyEUxgz IKXg== X-Forwarded-Encrypted: i=1; AJvYcCV5bWSGRJL9kYHl781wII5MLwivP1bJ1iucwlyoLK0gT04pGcx1biEo+xyLqaBJa5O3y9Y9F5gfcuqnYDxx9Q==@lists.freedesktop.org, AJvYcCVFPKCdiuu27Gw83FnLiiDMwu9ICvcgvUQ6JDIqnf/vuQn7D4EyEtuJcyE+nZiV/uwH0c+pkFRZ@lists.freedesktop.org, AJvYcCXpF9GdD9DqFUkmZ/uijTixd2yD8y6/6yAGvpddnkSQ+6Z2tLAYvLH4E8qjrX7rSttmjK6HOE+nN0m9@lists.freedesktop.org X-Gm-Message-State: AOJu0YwRLtsJ9T61eeF6+P1K2CPlTt770VY9WaicQ5qom+/g2ud+mPtR P1HNYibyC3KGWFM9vaKqZbgc4EkgGv8eJQXOypOv92VgijIJ+aJa X-Gm-Gg: ASbGncvotkdih/uHx2LV0o1lDRmrITeJL7hZ/FT6wEo8BhoUuDnLifd+qXNX0FADVkw w2td+cMsiZf2IEtXwivPZFaWT0APirjYaYKJYzHBOCwrmxUIkO7n4BvAV8zQBhO0GWuyQtxKE1t T0nBpoAF5JUGVjx7GTb6OiGo0oPm+puQ1ZBizWIZ2w5gZ5fPPHNi4Nqjg+MATwQWA2OqOsxzRUd 0vj4TB2+Rzoris6ZvblomlCrD2B37bR7HcySNGl2ZBt7GpiGmuX9BdWUBTZcyWjz8yXTUPcmZ7t iyptTP6+6StkNyUN18VvK3CuoErzzJWtoFXiYhqnNWoe4B6t8WbiRz6FtRryuLNb9S/Ejb01Ror 1Yg== X-Google-Smtp-Source: AGHT+IGlzPv/lWLR6oQjYV5JPNtW8nNh4plsjoqpQBkDo3jtIwkHZqjbr7e+0JVOkoajzQcuo3mWrg== X-Received: by 2002:a05:6e02:3c85:b0:3d3:d994:e92e with SMTP id e9e14a558f8ab-3d5e09db5d3mr173949595ab.17.1743615747396; Wed, 02 Apr 2025 10:42:27 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:26 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 14/54] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Date: Wed, 2 Apr 2025 11:41:16 -0600 Message-ID: <20250402174156.1246171-15-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The body of ddebug_attach_module_classes() is dominated by a code-block that finds the contiguous subrange of classmaps matching on modname, and saves it into the ddebug_table's info record. Implement this block in a macro to accommodate different component vectors in the "box" (as named in the for_subvec macro). And hoist its invocation out of ddebug_attach_module_classes() up into ddebug_add_module(). This moves the filtering step up closer to dynamic_debug_init(), which effectively does the same for builtin pr_debug descriptors; segmenting them into subranges by modname. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 56 ++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 104cf8abdf33..046c4ffb38f8 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -161,8 +161,8 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) } static struct _ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, - const char *class_string, - int *class_id) + const char *class_string, + int *class_id) { struct _ddebug_class_map *map; int i, idx; @@ -1224,30 +1224,34 @@ static const struct proc_ops proc_fops = { static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) { - struct _ddebug_class_map *cm; - int i, nc = 0; - - /* - * Find this module's classmaps in a subrange/wholerange of - * the builtin/modular classmap vector/section. Save the start - * and length of the subrange at its edges. - */ - for_subvec(i, cm, di, maps) { - if (!strcmp(cm->mod_name, dt->mod_name)) { - if (!nc) { - v2pr_info("start subrange, class[%d]: module:%s base:%d len:%d ty:%d\n", - i, cm->mod_name, cm->base, cm->length, cm->map_type); - dt->info.maps.start = cm; - } - nc++; - } - } - if (nc) { - dt->info.maps.len = nc; - vpr_info("module:%s attached %d classes\n", dt->mod_name, nc); - } + vpr_info("module:%s attached %d classes\n", dt->mod_name, dt->info.maps.len); } +/* + * Walk the @_box->@_vec member, over @_vec.start[0..len], and find + * the contiguous subrange of elements matching on ->mod_name. Copy + * the subrange into @_dst. This depends on vars defd by caller. + * + * @_i: caller provided counter var, init'd by macro + * @_sp: cursor into @_vec. + * @_box: contains member named @_vec + * @_vec: an array-ref, with: .start .len fields. + * @_dst: an array-ref: to remember the module's subrange + */ +#define dd_mark_vector_subrange(_i, _dst, _sp, _box, _vec) ({ \ + int nc = 0; \ + for_subvec(_i, _sp, _box, _vec) { \ + if (!strcmp((_sp)->mod_name, (_dst)->mod_name)) { \ + if (!nc++) \ + (_dst)->info._vec.start = (_sp); \ + } else { \ + if (nc) \ + break; /* end of consecutive matches */ \ + } \ + } \ + (_dst)->info._vec.len = nc; \ +}) + /* * Allocate a new ddebug_table for the given module * and add it to the global list. @@ -1255,6 +1259,8 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug static int ddebug_add_module(struct _ddebug_info *di, const char *modname) { struct ddebug_table *dt; + struct _ddebug_class_map *cm; + int i; if (!di->descs.len) return 0; @@ -1277,6 +1283,8 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) INIT_LIST_HEAD(&dt->link); + dd_mark_vector_subrange(i, dt, cm, di, maps); + if (di->maps.len) ddebug_attach_module_classes(dt, di); From patchwork Wed Apr 2 17:41:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036294 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 D540CC28B20 for ; Wed, 2 Apr 2025 17:42:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1368310E87B; Wed, 2 Apr 2025 17:42:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="frob+g80"; dkim-atps=neutral Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 361F310E88A; Wed, 2 Apr 2025 17:42:29 +0000 (UTC) Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-85b3f92c8dfso529439f.2; Wed, 02 Apr 2025 10:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615748; x=1744220548; 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=zBPCp4iUxXvE3TA/4gPCbhy4jLrWUE5M6DM69pi7RG8=; b=frob+g80W+kLakBFbhBYojSDe3YGyhZCJKrO2gDAevTcfK1h8NFk+h7ktW6xMxmGOa bwb1l0w0NwpjKh3EOyodMvFRba9gSqEnszhPeAQoLX8enM/HldAh2wldIFQY7g/Irslw H2YTFh+ysEpPZ5bqac/KKoQ5HA2iJzVWbl/VB7b7vVZ19dIduqMFAT9k2J9uQY9Dy7UX WcDPLQ9fixVrz1CrrRWiWGWyOcYSLvE8kSF7ajrO7/Y80u8ZIwrnocoWjd3uJWHDX5pX 92nX0YoMjJ1MzdG0c2nZYBEtTvzlEG6ovPwPtK8aXR+fnxaz2Bz/vFKIRHM/6zyusLgN vMkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615748; x=1744220548; 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=zBPCp4iUxXvE3TA/4gPCbhy4jLrWUE5M6DM69pi7RG8=; b=RkVxDStb8E5LrwUawCpT5TEjL2KKXFVD/tQpM47ahlwRE2qJltf1hHPVwltCB34ax7 P82OF7yw8kpQzGOM/VLl4EeTDPMRTUek0v0B5lkuQnjAzfeesJKomDNxvghPKQ8pYIms YSjVKDbvND60r9ZR/8UWbzUs6uCnckpRgkbQTsEshGTvdnC+OHnlsL/xYYxCWYCB5nMT 0GjFDk/uJM8MSsjJ+IR6dbkND1e5Jt2OFL1TX5RmXiB2beOOCwoOl2tA1MmAXfyUSFDP YFOy13ZBGcX8Ry1A+d6kJGHMPK9RqCA6R1f1UCBmWmFBOyXHScCbK+ceNW0wY3gmL0EF hE8A== X-Forwarded-Encrypted: i=1; AJvYcCVX46S0TsRSatuFAyQTUntR3mur5QxAJmjw5XDA7fi2dphKbEMqyjx4X1mP/G1wLVng15REJoWucddP@lists.freedesktop.org, AJvYcCVg9eEGExL1zr2qaX3wH2d38dW5+Di7IwGNCVc+AxYcL+Mlm2Yb6lFMu6xXj4HQ0qjWEU2wZR9YuI23jz6Ceg==@lists.freedesktop.org, AJvYcCXNZ1HJH4a3Fr5XlMZUp1uDeYPOJY3P29qqmaJWxLx3RzmyRhVNdYWZRJt5QtGHhSj4BDQJ+k5z@lists.freedesktop.org X-Gm-Message-State: AOJu0Yy0OYHhW0ZeqSk17fUcLUuskgQy4aISrZjOxRm2a99GKtyoqD67 ZeuPaTmQ4MF1ds/k7aLJ8GweKmkhYM+eX+FIcEk68mdbX7Nus/gW X-Gm-Gg: ASbGncs5pKaTIzt3LO4wsrIj2aG3dYJG4Ku2CMZVU+nT/qqbLQk9L+P51+oG4P253oL LkV1Y1jgwDlKJUPHXN7mY6viVJ+lk8PvWw8ptRSUyg1/kIepY2IPWnN7cev1Ylqpd5bgmgOe2Qh Vq8Hu7GPbm9lGZtjHGRk4zTolTv9f7gmMIsAwxcnEKkhH/pIrpHpX4vIo2t1uOQd3BGEK+HRMAw I+FzJu5X8Fmj+BN3zyiHzhZs6FsZwWTfubxJZtZLQi0oOkhkW+ir8ObDoazrmvcRZ+leadEPHjb nkdc8Kz7Ol+DQwJrwqFbu4jg22uT9aflUhOBwFB4g43DPl6GskpE/i+S2hwELWrxhw1/ChWdz1B /lw== X-Google-Smtp-Source: AGHT+IFHChRxUe/CFyGHCRhXSPTcNQNWMaUOrrxlaidGh2Iwl93M3Pr4TEsfbA6/T4Q/FDzWSFKJ3g== X-Received: by 2002:a05:6e02:1a67:b0:3d0:21aa:a752 with SMTP id e9e14a558f8ab-3d5e08eaf0emr82482825ab.2.1743615748358; Wed, 02 Apr 2025 10:42:28 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:28 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 15/54] dyndbg: ddebug_table.mod_name down to _ddebug_info Date: Wed, 2 Apr 2025 11:41:17 -0600 Message-ID: <20250402174156.1246171-16-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" struct _ddebug_info already has most of dyndbg's info for a module; push debug_table.mod_name down into it, finishing the encapsulation. This allows refactoring several callchains, passing &_ddebug_info instead of &ddebug_table, and hoisting the "&dt->info" deref up. ddebug_table contains a _ddebug_info member, so its users keep access to mod_name, just now with "->info." added in. In static ddebug_add_module(&di), reinforce the cursor-model by dropping the modname arg, and setting di->mod_name at each caller. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- -v3 more s/dt/di/ internal interface changes --- include/linux/dynamic_debug.h | 1 + lib/dynamic_debug.c | 45 ++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 9d282e2444e1..f4d1d08cd5a7 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -126,6 +126,7 @@ struct _ddebug_class_maps { } __packed; struct _ddebug_info { + const char *mod_name; struct _ddebug_descs descs; struct _ddebug_class_maps maps; } __packed; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 046c4ffb38f8..aff254d39c36 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -46,7 +46,6 @@ extern struct _ddebug_class_map __stop___dyndbg_class_maps[]; struct ddebug_table { struct list_head link; - const char *mod_name; struct _ddebug_info info; }; @@ -201,7 +200,7 @@ static int ddebug_change(const struct ddebug_query *query, /* match against the module name */ if (query->module && - !match_wildcard(query->module, dt->mod_name)) + !match_wildcard(query->module, dt->info.mod_name)) continue; if (query->class_string) { @@ -269,7 +268,7 @@ static int ddebug_change(const struct ddebug_query *query, #endif v4pr_info("changed %s:%d [%s]%s %s => %s\n", trim_prefix(dp->filename), dp->lineno, - dt->mod_name, dp->function, + dt->info.mod_name, dp->function, ddebug_describe_flags(dp->flags, &fbuf), ddebug_describe_flags(newflags, &nbuf)); dp->flags = newflags; @@ -1133,12 +1132,12 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos) #define class_in_range(class_id, map) \ (class_id >= map->base && class_id < map->base + map->length) -static const char *ddebug_class_name(struct ddebug_table *dt, struct _ddebug *dp) +static const char *ddebug_class_name(struct _ddebug_info *di, struct _ddebug *dp) { struct _ddebug_class_map *map; int i; - for_subvec(i, map, &dt->info, maps) + for_subvec(i, map, di, maps) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; @@ -1166,13 +1165,13 @@ static int ddebug_proc_show(struct seq_file *m, void *p) seq_printf(m, "%s:%u [%s]%s =%s \"", trim_prefix(dp->filename), dp->lineno, - iter->table->mod_name, dp->function, + iter->table->info.mod_name, dp->function, ddebug_describe_flags(dp->flags, &flags)); seq_escape_str(m, dp->format, ESCAPE_SPACE, "\t\r\n\""); seq_putc(m, '"'); if (dp->class_id != _DPRINTK_CLASS_DFLT) { - class = ddebug_class_name(iter->table, dp); + class = ddebug_class_name(&iter->table->info, dp); if (class) seq_printf(m, " class:%s", class); else @@ -1224,7 +1223,7 @@ static const struct proc_ops proc_fops = { static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) { - vpr_info("module:%s attached %d classes\n", dt->mod_name, dt->info.maps.len); + vpr_info("module:%s attached %d classes\n", dt->info.mod_name, dt->info.maps.len); } /* @@ -1241,7 +1240,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug #define dd_mark_vector_subrange(_i, _dst, _sp, _box, _vec) ({ \ int nc = 0; \ for_subvec(_i, _sp, _box, _vec) { \ - if (!strcmp((_sp)->mod_name, (_dst)->mod_name)) { \ + if (!strcmp((_sp)->mod_name, (_dst)->info.mod_name)) { \ if (!nc++) \ (_dst)->info._vec.start = (_sp); \ } else { \ @@ -1256,7 +1255,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug * Allocate a new ddebug_table for the given module * and add it to the global list. */ -static int ddebug_add_module(struct _ddebug_info *di, const char *modname) +static int ddebug_add_module(struct _ddebug_info *di) { struct ddebug_table *dt; struct _ddebug_class_map *cm; @@ -1265,20 +1264,19 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) if (!di->descs.len) return 0; - v3pr_info("add-module: %s %d sites\n", modname, di->descs.len); + v3pr_info("add-module: %s %d sites\n", di->mod_name, di->descs.len); dt = kzalloc(sizeof(*dt), GFP_KERNEL); if (dt == NULL) { - pr_err("error adding module: %s\n", modname); + pr_err("error adding module: %s\n", di->mod_name); return -ENOMEM; } /* - * For built-in modules, name lives in .rodata and is - * immortal. For loaded modules, name points at the name[] - * member of struct module, which lives at least as long as - * this struct ddebug_table. + * For built-in modules, name (as supplied in di by its + * callers) lives in .rodata and is immortal. For loaded + * modules, name points at the name[] member of struct module, + * which lives at least as long as this struct ddebug_table. */ - dt->mod_name = modname; dt->info = *di; INIT_LIST_HEAD(&dt->link); @@ -1292,7 +1290,7 @@ static int ddebug_add_module(struct _ddebug_info *di, const char *modname) list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); - vpr_info("%3u debug prints in module %s\n", di->descs.len, modname); + vpr_info("%3u debug prints in module %s\n", di->descs.len, di->mod_name); return 0; } @@ -1355,7 +1353,7 @@ static int ddebug_remove_module(const char *mod_name) mutex_lock(&ddebug_lock); list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) { - if (dt->mod_name == mod_name) { + if (dt->info.mod_name == mod_name) { ddebug_table_free(dt); ret = 0; break; @@ -1375,7 +1373,8 @@ static int ddebug_module_notify(struct notifier_block *self, unsigned long val, switch (val) { case MODULE_STATE_COMING: - ret = ddebug_add_module(&mod->dyndbg_info, mod->name); + mod->dyndbg_info.mod_name = mod->name; + ret = ddebug_add_module(&mod->dyndbg_info); if (ret) WARN(1, "Failed to allocate memory: dyndbg may not work properly.\n"); break; @@ -1473,7 +1472,8 @@ static int __init dynamic_debug_init(void) mod_ct++; di.descs.len = mod_sites; di.descs.start = iter_mod_start; - ret = ddebug_add_module(&di, modname); + di.mod_name = modname; + ret = ddebug_add_module(&di); if (ret) goto out_err; @@ -1484,7 +1484,8 @@ static int __init dynamic_debug_init(void) } di.descs.len = mod_sites; di.descs.start = iter_mod_start; - ret = ddebug_add_module(&di, modname); + di.mod_name = modname; + ret = ddebug_add_module(&di); if (ret) goto out_err; From patchwork Wed Apr 2 17:41:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036305 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 1D7FFC36017 for ; Wed, 2 Apr 2025 17:42:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E21B510E89A; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mkfajnme"; dkim-atps=neutral Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id C01E010E89B; Wed, 2 Apr 2025 17:42:40 +0000 (UTC) Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-476a720e806so22901cf.0; Wed, 02 Apr 2025 10:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615760; x=1744220560; 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=R3MHjWRzkrQ/A+DOE1tFjDQAS2Rp32FGDBMVfKoq9dk=; b=mkfajnmegRFi7lyGWKlah8O4AaOSMCu2xFzYcZq69S/6BtXPtJ+Pfyumy04OWL8BsN HXJeybvjYxmfNheWbFQjVGVgS9Gk0F+Cvaug4SK/KLHJ/a7t+dggkTfA0xmZjsfsWgOi 61qS7vFzmdty9uS6LRjLoJTDd8kjCzBD9oaGQiTUiWV6bDyYJS8iXOj7x/6xfVh6lyWM y3dHgwmn/HmWciZekLJ1H7I6PuY4Hkbdr5vSzkMbxbqf8hzaAQDAbM0LOgsBI2PnOGw/ CtdbC0qTLeq9LLFSSOFmeDpW6Z6EoElVtoKu0lOP0SlR3ZUjU83Jm2i0sdSx7twdxm65 XESA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615760; x=1744220560; 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=R3MHjWRzkrQ/A+DOE1tFjDQAS2Rp32FGDBMVfKoq9dk=; b=BBRD7r+s5f+CsDpU92Tuo4iyX7x0oBmodeZO+LY/kP/XvCH+4d2MEay1ZxNWnPtsvo f1hZUvddsRUvnidwob5YVmdBPB74Xv13PnDoVo8hBznSWzFZ7KQkFfUYDGP6mK3RzRtk D6v/mV1akj/kz1AZFPOxdPjupOB1IksjrvaBXpDDfm38I3nbhn+XA+nTtTNbkHm3LzhL VhRXtXDSWHcU9VcZOTRn6neVlawoQ92GL0Lnpn0dYF3jcub2ES0M1ibGUgjocLInosOQ 78AsfYe8Bqt0UwLsT/jekRcepgDMxi3YpvEhXbZqjXJJUAgj/7oRVzsb1oU3GmSXQk3U FKyg== X-Forwarded-Encrypted: i=1; AJvYcCUrHMQ7C66Zm9634ijhiOCcmXrPjKyZx+3Qo5gxkgkAUcMLo5q/x4Ih9/PdMRxKpAxJsNNmbxCX@lists.freedesktop.org, AJvYcCWKOYvdjkjOW7ae50rrvXlB6pX1nBbvjgT8ciRLpPgeohJOj6/uvdLisyYV4bMhXCs2+f++tKnH0S7IJI2LCA==@lists.freedesktop.org, AJvYcCWx9MdkbWFy+RWH22FIkw84fHQhnHhJeFKzMo0Lptzywv1YdnF/+l9K2xnF4f1KX0ksGV4BOkwSfXfn@lists.freedesktop.org X-Gm-Message-State: AOJu0YwpI9/hVSeIbVobWMwT4s3buUxD4ryavQixbFXpv6jpOBxwxqQI HKAmI3EX8v2LXSZw+aYiQaLx3u4/PDwUQr0uiSqpD8kLY76zJUJKaXe5QMTa X-Gm-Gg: ASbGncsRxCQyCGDHJLNRC56fyToqsYC5WiP1tco0dcTmoFt4xLuEUgmm5ULQXgOEKSq XPIgVeazyqaRU8MpLNo9sn3xN0q/QzzU5LMVdW/6kLqoXGHcBSJUCgl5yhRW9DkSqkDd5Szbnno vKeVDt3dk0ZTj5WbIYcbEA8uPABry/7oRIi6tXWQiLBJBB5ZgMlTFTICqB3crlLrtPDE1xdOk3v lH5pgIWGe7deLbTWLlbJduOhYlw3JdWKjLZkyGAGmoZjhBCF0b2lsub+lFy+e0Q07KrhvW41GQg e1QFKyzLU9YwIsDmN1cmqJbG6Y1VVQ00YlamiOVbmpNRBPd4dRiCtZXIwLKVSnedqwrB56dTLaC rUw== X-Google-Smtp-Source: AGHT+IEj53zMTFLLxkXC52KmI6AGH86T4ZHdqCZQEtgg/JAmk4tO1QeXLUin+LF2UhNQvjKH7/sXoQ== X-Received: by 2002:a05:6e02:2703:b0:3d3:d28e:eae9 with SMTP id e9e14a558f8ab-3d6ca5d16efmr104709935ab.7.1743615749446; Wed, 02 Apr 2025 10:42:29 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:29 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 16/54] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Date: Wed, 2 Apr 2025 11:41:18 -0600 Message-ID: <20250402174156.1246171-17-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Remove the DD_CLASS_TYPE_*_NAMES classmap types and code. These 2 classmap types accept class names at the PARAM interface, for example: echo +DRM_UT_CORE,-DRM_UT_KMS > /sys/module/drm/parameters/debug_names The code works, but its only used by test-dynamic-debug, and wasn't asked for by anyone else, so reduce LOC & test-surface; simplify things. Also rename enum class_map_type to enum ddebug_class_map_type. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 23 ++------ lib/dynamic_debug.c | 102 +++------------------------------- lib/test_dynamic_debug.c | 26 --------- 3 files changed, 14 insertions(+), 137 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index f4d1d08cd5a7..769f02456c8e 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -58,27 +58,16 @@ struct _ddebug { #endif } __attribute__((aligned(8))); -enum class_map_type { +enum ddebug_class_map_type { DD_CLASS_TYPE_DISJOINT_BITS, /** - * DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, one per bit. - * expecting hex input. Built for drm.debug, basis for other types. + * DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, mapped to bits[0..N]. + * Expects hex input. Built for drm.debug, basis for other types. */ DD_CLASS_TYPE_LEVEL_NUM, /** - * DD_CLASS_TYPE_LEVEL_NUM: input is numeric level, 0-N. - * N turns on just bits N-1 .. 0, so N=0 turns all bits off. - */ - DD_CLASS_TYPE_DISJOINT_NAMES, - /** - * DD_CLASS_TYPE_DISJOINT_NAMES: input is a CSV of [+-]CLASS_NAMES, - * classes are independent, like _DISJOINT_BITS. - */ - DD_CLASS_TYPE_LEVEL_NAMES, - /** - * DD_CLASS_TYPE_LEVEL_NAMES: input is a CSV of [+-]CLASS_NAMES, - * intended for names like: INFO,DEBUG,TRACE, with a module prefix - * avoid EMERG,ALERT,CRIT,ERR,WARNING: they're not debug + * DD_CLASS_TYPE_LEVEL_NUM: input is numeric level, 0..N. + * Input N turns on bits 0..N-1 */ }; @@ -88,7 +77,7 @@ struct _ddebug_class_map { const char **class_names; const int length; const int base; /* index of 1st .class_id, allows split/shared space */ - enum class_map_type map_type; + enum ddebug_class_map_type map_type; }; /** diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index aff254d39c36..a7e1dbb6ead0 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -646,76 +646,6 @@ static int ddebug_apply_class_bitmap(const struct _ddebug_class_param *dcp, #define CLASSMAP_BITMASK(width) ((1UL << (width)) - 1) -/* accept comma-separated-list of [+-] classnames */ -static int param_set_dyndbg_classnames(const char *instr, const struct kernel_param *kp) -{ - const struct _ddebug_class_param *dcp = kp->arg; - const struct _ddebug_class_map *map = dcp->map; - unsigned long curr_bits, old_bits; - char *cl_str, *p, *tmp; - int cls_id, totct = 0; - bool wanted; - - cl_str = tmp = kstrdup_and_replace(instr, '\n', '\0', GFP_KERNEL); - if (!tmp) - return -ENOMEM; - - /* start with previously set state-bits, then modify */ - curr_bits = old_bits = *dcp->bits; - vpr_info("\"%s\" > %s:0x%lx\n", cl_str, KP_NAME(kp), curr_bits); - - for (; cl_str; cl_str = p) { - p = strchr(cl_str, ','); - if (p) - *p++ = '\0'; - - if (*cl_str == '-') { - wanted = false; - cl_str++; - } else { - wanted = true; - if (*cl_str == '+') - cl_str++; - } - cls_id = match_string(map->class_names, map->length, cl_str); - if (cls_id < 0) { - pr_err("%s unknown to %s\n", cl_str, KP_NAME(kp)); - continue; - } - - /* have one or more valid class_ids of one *_NAMES type */ - switch (map->map_type) { - case DD_CLASS_TYPE_DISJOINT_NAMES: - /* the +/- pertains to a single bit */ - if (test_bit(cls_id, &curr_bits) == wanted) { - v3pr_info("no change on %s\n", cl_str); - continue; - } - curr_bits ^= BIT(cls_id); - 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]); - break; - case DD_CLASS_TYPE_LEVEL_NAMES: - /* cls_id = N in 0..max. wanted +/- determines N or N-1 */ - 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); - *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); - break; - default: - pr_err("illegal map-type value %d\n", map->map_type); - } - } - kfree(tmp); - vpr_info("total matches: %d\n", totct); - return 0; -} - static int param_set_dyndbg_module_classes(const char *instr, const struct kernel_param *kp, const char *mod_name) @@ -724,29 +654,17 @@ static int param_set_dyndbg_module_classes(const char *instr, const struct _ddebug_class_map *map = dcp->map; unsigned long inrep, new_bits, old_bits; int rc, totct = 0; - - switch (map->map_type) { - - case DD_CLASS_TYPE_DISJOINT_NAMES: - case DD_CLASS_TYPE_LEVEL_NAMES: - /* handle [+-]classnames list separately, we are done here */ - return param_set_dyndbg_classnames(instr, kp); - - case DD_CLASS_TYPE_DISJOINT_BITS: - case DD_CLASS_TYPE_LEVEL_NUM: - /* numeric input, accept and fall-thru */ - rc = kstrtoul(instr, 0, &inrep); - if (rc) { - pr_err("expecting numeric input: %s > %s\n", instr, KP_NAME(kp)); - return -EINVAL; - } - break; - default: - pr_err("%s: bad map type: %d\n", KP_NAME(kp), map->map_type); + char *nl; + + rc = kstrtoul(instr, 0, &inrep); + if (rc) { + nl = strchr(instr, '\n'); + if (nl) + *nl = '\0'; + pr_err("expecting numeric input, not: %s > %s\n", instr, KP_NAME(kp)); return -EINVAL; } - /* only _BITS,_NUM (numeric) map-types get here */ switch (map->map_type) { case DD_CLASS_TYPE_DISJOINT_BITS: /* expect bits. mask and warn if too many */ @@ -812,12 +730,8 @@ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) const struct _ddebug_class_map *map = dcp->map; switch (map->map_type) { - - case DD_CLASS_TYPE_DISJOINT_NAMES: case DD_CLASS_TYPE_DISJOINT_BITS: return scnprintf(buffer, PAGE_SIZE, "0x%lx\n", *dcp->bits); - - case DD_CLASS_TYPE_LEVEL_NAMES: case DD_CLASS_TYPE_LEVEL_NUM: return scnprintf(buffer, PAGE_SIZE, "%ld\n", *dcp->lvl); default: diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 8434f70b51bb..9c3e53cd26bd 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -74,13 +74,6 @@ DECLARE_DYNDBG_CLASSMAP(map_disjoint_bits, DD_CLASS_TYPE_DISJOINT_BITS, 0, DD_SYS_WRAP(disjoint_bits, p); DD_SYS_WRAP(disjoint_bits, T); -/* symbolic input, independent bits */ -enum cat_disjoint_names { LOW = 10, MID, HI }; -DECLARE_DYNDBG_CLASSMAP(map_disjoint_names, DD_CLASS_TYPE_DISJOINT_NAMES, 10, - "LOW", "MID", "HI"); -DD_SYS_WRAP(disjoint_names, p); -DD_SYS_WRAP(disjoint_names, T); - /* numeric verbosity, V2 > V1 related */ enum cat_level_num { V0 = 14, V1, V2, V3, V4, V5, V6, V7 }; DECLARE_DYNDBG_CLASSMAP(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, 14, @@ -88,13 +81,6 @@ DECLARE_DYNDBG_CLASSMAP(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, 14, DD_SYS_WRAP(level_num, p); DD_SYS_WRAP(level_num, T); -/* symbolic verbosity */ -enum cat_level_names { L0 = 22, L1, L2, L3, L4, L5, L6, L7 }; -DECLARE_DYNDBG_CLASSMAP(map_level_names, DD_CLASS_TYPE_LEVEL_NAMES, 22, - "L0", "L1", "L2", "L3", "L4", "L5", "L6", "L7"); -DD_SYS_WRAP(level_names, p); -DD_SYS_WRAP(level_names, T); - /* stand-in for all pr_debug etc */ #define prdbg(SYM) __pr_debug_cls(SYM, #SYM " msg\n") @@ -102,10 +88,6 @@ static void do_cats(void) { pr_debug("doing categories\n"); - prdbg(LOW); - prdbg(MID); - prdbg(HI); - prdbg(D2_CORE); prdbg(D2_DRIVER); prdbg(D2_KMS); @@ -129,14 +111,6 @@ static void do_levels(void) prdbg(V5); prdbg(V6); prdbg(V7); - - prdbg(L1); - prdbg(L2); - prdbg(L3); - prdbg(L4); - prdbg(L5); - prdbg(L6); - prdbg(L7); } static void do_prints(void) From patchwork Wed Apr 2 17:41:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036295 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 5DBEEC3601B for ; Wed, 2 Apr 2025 17:42:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88A4110E889; Wed, 2 Apr 2025 17:42:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RXhElQW1"; dkim-atps=neutral Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id A5A8A10E886; Wed, 2 Apr 2025 17:42:31 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-85b58d26336so1126539f.2; Wed, 02 Apr 2025 10:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615751; x=1744220551; 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=4tJY1DDUkQNjkUwg1wD9+v+fTMYBZ/tdDYVV/Hca3Y0=; b=RXhElQW1IgPHaYlgWwwlVA/WQVKNjN3Dv6FAbuwpqrJm3s5o/M0BOL/1tOaEz9iO6i Q++Aedy4bCMyU5XIrZWFbATLt+L0T825c7TqHMW365F4hDS9iU1W6k7Q/x9D4dx6lyfa Q0HQ9OeBj7QnZ3Qi3M03yFdsVVYxR7VDMcEHUxb39Q7VA9kub3O4+xooLYQ/eG0vnit6 TKlWYlr9gNkLoXyDChR/BIzfxkqFskVKfi9YfyrHbLZTy5bL6+4hDXSrrFWpr+zgRHRd 4EkdfVCsF+fX4UPeG3jDUdYNNqw18E6zFOX5sYHw3Bs4SEOpiaSKCGmdq/Cq8DVmMEXG 8wpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615751; x=1744220551; 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=4tJY1DDUkQNjkUwg1wD9+v+fTMYBZ/tdDYVV/Hca3Y0=; b=pwYKhG6i/x94aeRUEZj9AXz/1oYrQujl+n2e4ZmfAqYU3WIbBBDFti/0O65bpcdG/9 js6AMwSJtsQsTa/IRD3pRXzSSaNhUVr2HzCvAWx3GGxxhcQ4VGc9ZEZXQCsnMGOvhUJ3 h2jltYyiY+pzCltB6/YzjHT0XLy4kJJCmKjwNYzCHYmvXppUTMew8TjDKWUoLs2bNjrJ Tyz6q8WY3hN8Q5yXbzE+zctkDJz6tO+Ret94KCoTOEL26OZCMT6ncd+iNFYpQWle3F0O att+rfOYaMgPWX498g/ZjRpiaBzj+v4WJHw4C73Cs/3OjAlh4AqIjgr+z1Dht+LZTAV5 zhFQ== X-Forwarded-Encrypted: i=1; AJvYcCVrt9WBNffaQNR2Qz5mw0zumINSVB5lDRIXfva7f+GJ+AjHNxMxhmDb5784QF5IjZSVnojBWWMk@lists.freedesktop.org, AJvYcCW6G4KxnIZHtlFkYUzfcD47a5P1AW9jm9jjV546WLwgv0ptgSI9ywOXcGvpt5uZEGw4fl0mU78EtWks@lists.freedesktop.org, AJvYcCWJNgsMFk5bHOAWt1Y+ayXzMGi4ZPW6qnC5F5SFcykAO+/STyi6qUKeHXUjoKYk/zClQTj25NHTwX2Tgxk/0A==@lists.freedesktop.org X-Gm-Message-State: AOJu0YwLj6x5UW+SzAxttAaO9XOFbh5uPw7bZBwqlG4UkUNUx/r/GnyY CqezU2aU70/PTkGAEGe0s82zYWbTksqTJVKe0H9h+FAk5KP96v5Z X-Gm-Gg: ASbGnctdSFRCBA5+4iENRX6BncVATLwfGuvcHPXIK++WDzyY4y0mVzZZKEUjfjE5T/I zCHI/Za0wEXZlGuG8kKGepqkOkHSBzS36GUuflOV0iaeoEKh3LPTu5ceYtxXHfRJmIHV6ICyomT KNgqJigFjcchL1EGTtvJT3uwurGXSuyyY60HeMapXJE271WHX5mHSuApyl3v6MwMj/Cw68gSS7q h9SdWlfjPPg/JQoG0YAU2BkU/X6twOmSW0Sq+2PilI4NNzDLcwtBkEKbCjutnNcsgThmddX1T+m fWcCkyArVqiTL7lzLzeZcA5zFsJ1GnV0G0rlIN+4NhIFLK9spE0sCAmp6ZLzDh318XmCZQLnZNc 74w== X-Google-Smtp-Source: AGHT+IHo/6HCB0U6tQ+mr8AHNrH1ynuf7YdCl4CRrifZBjkKnXYVRImavR2toyBOykynzBDVV7DFIg== X-Received: by 2002:a05:6e02:3304:b0:3d3:dfc2:912f with SMTP id e9e14a558f8ab-3d5e0908ffemr200276395ab.7.1743615750631; Wed, 02 Apr 2025 10:42:30 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:30 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 , linux-doc@vger.kernel.org Subject: [PATCH v3 17/54] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Date: Wed, 2 Apr 2025 11:41:19 -0600 Message-ID: <20250402174156.1246171-18-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" DECLARE_DYNDBG_CLASSMAP() has a design error; its usage fails a basic K&R rule: "define once, refer many times". When DRM_USE_DYNAMIC_DEBUG=y, it is used across DRM core & drivers; each invocation allocates/inits the classmap understood by that module. All must match for the modules to respond together when DRM.debug categories are enabled. This is brittle; a maintenance foot-gun. Further, its culpable in the CONFIG_DRM_USE_DYNAMIC_DEBUG=Y regression; its use in both core & drivers obfuscates the 2 roles, that caused incomplete initialization when modprobing drivers: 1st drm.ko loads, and dyndbg initializes its DRM.debug callsites, then a drm-driver loads, but too late for the DRM.debug enablement. So retire it, replace with 2 macros: DYNAMIC_DEBUG_CLASSMAP_DEFINE - invoked once from core - drm.ko DYNAMIC_DEBUG_CLASSMAP_USE - from all drm drivers and helpers. DYNAMIC_DEBUG_CLASSMAP_DEFINE: this reworks DECLARE_DYNDBG_CLASSMAP, by dropping the static qualifier on the classmap, and exporting it instead. DYNAMIC_DEBUG_CLASSMAP_USE: then refers to the exported var by name: used from drivers, helper-mods lets us drop the repetitive "classname" declarations fixes 2nd-defn problem creates a ddebug_class_user record in new __dyndbg_class_users section new section is scanned "differently" DECLARE_DYNDBG_CLASSMAP is preserved temporarily, to decouple DRM adaptation work and avoid compile-errs before its done. IOW, DRM gets these fixes when they commit the adopt-new-api patches. The DEFINE,USE distinction, and the separate classmap-use record, allows dyndbg to initialize the driver's & helper's DRM.debug callsites separately after each is modprobed. Basically, the classmap init-scan is repeated for classmap-users. To review, dyndbg's existing __dyndbg_classes[] section does: . catalogs the module's classmaps . tells dyndbg about them, allowing >control . DYNAMIC_DEBUG_CLASSMAP_DEFINE creates section records. . we rename it to: __dyndbg_class_maps[] Then this patch adds __dyndbg_class_users[] section: . catalogs users of classmap definitions elsewhere . authorizes dyndbg to >control user's class'd prdbgs . DYNAMIC_DEBUG_CLASSMAP_USE() creates section records. Now ddebug_add_module(etal) can handle classmap-uses similar to (and after) classmaps; when a dependent module is loaded, if it has classmap-uses (to a classmap-def in another module), that module's kernel params are scanned to find if it has a kparam that is wired to dyndbg's param-ops, and whose classmap is the one being ref'd. To support this, theres a few data/header changes: new struct ddebug_class_user contains: user-module-name, &classmap-defn it records drm-driver's use of a classmap in the section, allowing lookup struct ddebug_info gets 2 new fields for the new sections: class_users, num_class_users. set by dynamic_debug_init() for builtins. or by kernel/module/main:load_info() for loadable modules. vmlinux.lds.h: new BOUNDED_SECTION for __dyndbg_class_users dynamic_debug.c has 2 changes in ddebug_add_module(), ddebug_change(): ddebug_add_module() called ddebug_attach_module_classes() now calls ddebug_apply_class_maps() & ddebug_apply_class_users() these both call ddebug_apply_params(). ddebug_apply_params(new fn): It scans module's/builtin kernel-params, calls ddebug_match_apply_kparam for each to find any params/sysfs-nodes which may be wired to a classmap. ddebug_match_apply_kparam(new fn): 1st, it tests the kernel-param.ops is dyndbg's; this guarantees that the attached arg is a struct ddebug_class_param, which has a ref to the param's state, and to the classmap defining the param's handling. 2nd, it requires that the classmap ref'd by the kparam is the one we're called for; modules can use many separate classmaps (as test_dynamic_debug does). Then apply the "parent" kparam's setting to the dependent module, using ddebug_apply_class_bitmap(). ddebug_change(and callees) also gets adjustments: ddebug_find_valid_class(): This does a search over the module's classmaps, looking for the class FOO echo'd to >control. So now it searches over __dyndbg_class_users[] after __dyndbg_classes[]. ddebug_class_name(): return class-names for defined AND used classes. test_dynamic_debug.c, test_dynamic_debug_submod.c: This demonstrates the 2 types of classmaps & sysfs-params, following the 4-part recipe: 1. define an enum for the classmap: DRM.debug has DRM_UT_{CORE,KMS,...} multiple classes must share 0-62 classid space. 2. DYNAMIC_DEBUG_CLASSMAP_DEFINE(.. DRM_UT_{CORE,KMS,...}) 3. DYNAMIC_DEBUG_CLASSMAP_PARAM* (classmap) 4. DYNAMIC_DEBUG_CLASSMAP_USE() by _submod only, skipping 2,3 Move all the enum declarations together, to better explain how they share the 0..62 class-id space available to a module (non-overlapping subranges). reorg macros 2,3 by name. This gives a tabular format, making it easy to see the pattern of repetition, and the points of change. And extend the test to replicate the 2-module (parent & dependent) scenario which caused the CONFIG_DRM_USE_DYNAMIC_DEBUG=y regression seen in drm & drivers. The _submod.c is a 2-line file: #define _SUBMOD, #include parent. This gives identical complements of prdbgs in parent & _submod, and thus identical print behavior when all of: >control, >params, and parent->_submod propagation are working correctly. It also puts all the parent/_submod declarations together in the same source, with the new ifdef _SUBMOD block invoking DYNAMIC_DEBUG_CLASSMAP_USE for the 2 test-interfaces. I think this is clearer. These 2 modules are both tristate, allowing 3 super/sub combos: Y/Y, Y/M, M/M (not N/Y, since this is disallowed by dependence). Y/Y testing exposed a missing __align(8) in the _METADATA macro, which M/M didn't see because the module-loader memory placement constrains it instead. Fixes: aad0214f3026 ("dyndbg: add DECLARE_DYNDBG_CLASSMAP macro") cc: linux-doc@vger.kernel.org Signed-off-by: Jim Cromie --- v3- undo 1.9 simplification of ddebug_find_valid_class() ddebug_change needs map to see its controlling param change internal callchains to pass di, not dt v2 a. building 2 .ko's from 1 source file is weird; add a clear comment at the top to justify it (basically cloning) ln 138+ in commit-msg is insufficient. b. retire "DYNDBG_" name shortening b4 adding _CLASSMAP_* macros. c. s/dd_class/_ddebug_class/ d. s/\bddebug\b/_$1/g in header: chgs 1 struct and UNIQUE_ID bases v1.9 - commit-msg tweaks DRM:CHECK warnings on macros: add parens extern DEFINEd _var, static classnames change ddebug_class_user.user_mod_name to .mod_name simplify ddebug_find_valid_class return val improve vpr_cm_info msg format wrap (base) in macro body move __DYNDBG_CLASSMAP_CHECK above kdoc for DYNDBG_CLASSMAP_DEFINE v1.8 - split drm parts to separate commits. preserve DECLARE_DYNDBG_CLASSMAP to decouple DRM, no flag day. fixup block comment v1.7 - previous submission-blocking bug: missing __align(8) in DYNAMIC_DEBUG_DECLARE_METADATA on ddebug_class_user caused corrupt records, but only for builtin modules; module loader code probably pinned allocations to the right alignment naturally, hiding the bug for typical builds. v6- get rid of WARN_ON_ONCE v?- fix _var expanded 2x in macro dyndbg: This fn formerly returned the map which contained the class (thus validating it), and as a side-effect set the class-id in an outvar. But the caller didn't use the map (after checking its not null), only the valid class-id. So simplify the fn to return the class-id of the validated classname, or -ENOENT when the queried classname is not found. Convey more useful info in the debug-msg: print class-names[0,last], and [base,+len] instead of the class-type printout, which is almost always "type:DISJOINT_BITS". And drop ddebug_classmap_typenames, which is now unused. [root@v6 b0-dd]# modprobe test_dynamic_debug_submod [ 18.864962] dyndbg: loaded classmap: test_dynamic_debug [16..24] V0..V7 [ 18.865046] dyndbg: found kp:p_level_num =0x0 [ 18.865048] dyndbg: mapped to: test_dynamic_debug [16..24] V0..V7 [ 18.865164] dyndbg: p_level_num: lvl:0 bits:0x0 [ 18.865217] dyndbg: loaded classmap: test_dynamic_debug [0..10] D2_CORE..D2_DRMRES [ 18.865297] dyndbg: found kp:p_disjoint_bits =0x0 [ 18.865298] dyndbg: mapped to: test_dynamic_debug [0..10] D2_CORE..D2_DRMRES [ 18.865424] dyndbg: p_disjoint_bits: classbits: 0x0 [ 18.865472] dyndbg: module:test_dynamic_debug attached 2 classmaps [ 18.865533] dyndbg: 23 debug prints in module test_dynamic_debug [ 18.866558] dyndbg: loaded classmap: test_dynamic_debug_submod [16..24] V0..V7 [ 18.866698] dyndbg: found kp:p_level_num =0x0 [ 18.866699] dyndbg: mapped to: test_dynamic_debug_submod [16..24] V0..V7 [ 18.866865] dyndbg: p_level_num: lvl:0 bits:0x0 [ 18.866926] dyndbg: loaded classmap: test_dynamic_debug_submod [0..10] D2_CORE..D2_DRMRES [ 18.867026] dyndbg: found kp:p_disjoint_bits =0x0 [ 18.867027] dyndbg: mapped to: test_dynamic_debug_submod [0..10] D2_CORE..D2_DRMRES [ 18.867193] dyndbg: p_disjoint_bits: classbits: 0x0 [ 18.867255] dyndbg: module:test_dynamic_debug_submod attached 2 classmap uses [ 18.867351] dyndbg: 23 debug prints in module test_dynamic_debug_submod fixup-test-submod fixup-test Signed-off-by: Jim Cromie --- MAINTAINERS | 2 +- include/asm-generic/vmlinux.lds.h | 1 + include/linux/dynamic_debug.h | 93 +++++++++++++++++--- kernel/module/main.c | 3 + lib/Kconfig.debug | 24 ++++-- lib/Makefile | 3 + lib/dynamic_debug.c | 137 +++++++++++++++++++++++++++--- lib/test_dynamic_debug.c | 132 ++++++++++++++++++++-------- lib/test_dynamic_debug_submod.c | 14 +++ 9 files changed, 343 insertions(+), 66 deletions(-) create mode 100644 lib/test_dynamic_debug_submod.c diff --git a/MAINTAINERS b/MAINTAINERS index 00e94bec401e..1c5fcbd9e408 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8139,7 +8139,7 @@ M: Jim Cromie S: Maintained F: include/linux/dynamic_debug.h F: lib/dynamic_debug.c -F: lib/test_dynamic_debug.c +F: lib/test_dynamic_debug*.c DYNAMIC INTERRUPT MODERATION M: Tal Gilboa diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f834ad1fb8c4..fa382caf2ae2 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -367,6 +367,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) /* implement dynamic printk debug */ \ . = ALIGN(8); \ BOUNDED_SECTION_BY(__dyndbg_class_maps, ___dyndbg_class_maps) \ + BOUNDED_SECTION_BY(__dyndbg_class_users, ___dyndbg_class_users) \ BOUNDED_SECTION_BY(__dyndbg_descriptors, ___dyndbg_descs) \ CODETAG_SECTIONS() \ LIKELY_PROFILE() \ diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 769f02456c8e..9af825c84e70 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -71,9 +71,28 @@ enum ddebug_class_map_type { */ }; +/* + * dyndbg-classmaps are devised to support DRM.debug directly: + * 10 enum-vals: DRM_UT_* define the categories + * ~23 categorized *_dbg() macros, each passing a DRM_UT_* val as 1st arg + * 2 macros below them: drm_dev_dbg, __drm_dbg + * ~5000 calls to the categorized macros, across all of drivers/gpu/drm/ + * + * When CONFIG_DRM_USE_DYNAMIC_DEBUG=y, the 2 low macros are redefined + * to invoke _dynamic_func_call_cls(). This compiles the category + * into each callsite's class_id field, where dyndbg can select on it + * and alter a callsite's patch-state, avoiding repeated __drm_debug + * checks. + * + * To make the callsites manageable from the >control file, authors + * provide a "classmap" of names to class_ids in use by the module(s), + * usually by stringifying the enum-vals. Modules with multiple + * classmaps must arrange to share the 0..62 class_id space. + */ + struct _ddebug_class_map { - struct module *mod; - const char *mod_name; /* needed for builtins */ + const struct module *mod; /* NULL for builtins */ + const char *mod_name; const char **class_names; const int length; const int base; /* index of 1st .class_id, allows split/shared space */ @@ -81,11 +100,34 @@ struct _ddebug_class_map { }; /** - * DECLARE_DYNDBG_CLASSMAP - declare classnames known by a module - * @_var: a struct _ddebug_class_map, passed to module_param_cb - * @_type: enum class_map_type, chooses bits/verbose, numeric/symbolic - * @_base: offset of 1st class-name. splits .class_id space - * @classes: class-names used to control class'd prdbgs + * DYNAMIC_DEBUG_CLASSMAP_DEFINE - define debug classes used by a module. + * @_var: name of the classmap, exported for other modules coordinated use. + * @_mapty: enum ddebug_class_map_type: 0:DISJOINT - independent, 1:LEVEL - v2>v1 + * @_base: reserve N classids starting at _base, to split 0..62 classid space + * @classes: names of the N classes. + * + * This tells dyndbg what class_ids the module is using: _base..+N, by + * mapping names onto them. This qualifies "class NAME" >controls on + * the defining module, ignoring unknown names. + */ +#define DYNAMIC_DEBUG_CLASSMAP_DEFINE(_var, _mapty, _base, ...) \ + static const char *_var##_classnames[] = { __VA_ARGS__ }; \ + extern struct _ddebug_class_map _var; \ + struct _ddebug_class_map __aligned(8) __used \ + __section("__dyndbg_class_maps") _var = { \ + .mod = THIS_MODULE, \ + .mod_name = KBUILD_MODNAME, \ + .base = (_base), \ + .map_type = (_mapty), \ + .length = ARRAY_SIZE(_var##_classnames), \ + .class_names = _var##_classnames, \ + }; \ + EXPORT_SYMBOL(_var) + +/* + * XXX: keep this until DRM adapts to use the DEFINE/USE api, it + * differs from DYNAMIC_DEBUG_CLASSMAP_DEFINE by the lack of the + * extern/EXPORT on the struct init, and cascading thinkos. */ #define DECLARE_DYNDBG_CLASSMAP(_var, _maptype, _base, ...) \ static const char *_var##_classnames[] = { __VA_ARGS__ }; \ @@ -99,10 +141,35 @@ struct _ddebug_class_map { .class_names = _var##_classnames, \ } +struct _ddebug_class_user { + char *mod_name; + struct _ddebug_class_map *map; +}; + +/** + * DYNAMIC_DEBUG_CLASSMAP_USE - refer to a classmap, DEFINEd elsewhere. + * @_var: name of the exported classmap var + * + * This tells dyndbg that the module has prdbgs with classids defined + * in the named classmap. This qualifies "class NAME" >controls on + * the user module, ignoring unknown names. + */ +#define DYNAMIC_DEBUG_CLASSMAP_USE(_var) \ + DYNAMIC_DEBUG_CLASSMAP_USE_(_var, __UNIQUE_ID(_ddebug_class_user)) +#define DYNAMIC_DEBUG_CLASSMAP_USE_(_var, _uname) \ + extern struct _ddebug_class_map _var; \ + static struct _ddebug_class_user __aligned(8) __used \ + __section("__dyndbg_class_users") _uname = { \ + .mod_name = KBUILD_MODNAME, \ + .map = &(_var), \ + } + /* - * @_ddebug_info: gathers module/builtin dyndbg_* __sections together. + * @_ddebug_info: gathers module/builtin __dyndbg_ __sections + * together, each is a vector: a struct { *addr, int len }. + * * For builtins, it is used as a cursor, with the inner structs - * marking sub-vectors of the builtin __sections in DATA. + * marking sub-vectors of the builtin __sections in DATA_DATA */ struct _ddebug_descs { struct _ddebug *start; @@ -114,10 +181,16 @@ struct _ddebug_class_maps { int len; } __packed; +struct _ddebug_class_users { + struct _ddebug_class_user *start; + int len; +} __packed; + struct _ddebug_info { const char *mod_name; struct _ddebug_descs descs; struct _ddebug_class_maps maps; + struct _ddebug_class_users users; } __packed; struct _ddebug_class_param { @@ -218,7 +291,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, * (|_no_desc): former gets callsite descriptor as 1st arg (for prdbgs) */ #define __dynamic_func_call_cls(id, cls, fmt, func, ...) do { \ - DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt); \ + DEFINE_DYNAMIC_DEBUG_METADATA_CLS((id), cls, fmt); \ if (DYNAMIC_DEBUG_BRANCH(id)) \ func(&id, ##__VA_ARGS__); \ } while (0) diff --git a/kernel/module/main.c b/kernel/module/main.c index b60f728e36ac..c203b0694f7e 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2627,6 +2627,9 @@ static int find_module_sections(struct module *mod, struct load_info *info) mod->dyndbg_info.maps.start = section_objs(info, "__dyndbg_class_maps", sizeof(*mod->dyndbg_info.maps.start), &mod->dyndbg_info.maps.len); + mod->dyndbg_info.users.start = section_objs(info, "__dyndbg_class_users", + sizeof(*mod->dyndbg_info.users.start), + &mod->dyndbg_info.users.len); #endif return 0; diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 35796c290ca3..91a75f724c1a 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2905,12 +2905,26 @@ config TEST_STATIC_KEYS If unsure, say N. config TEST_DYNAMIC_DEBUG - tristate "Test DYNAMIC_DEBUG" - depends on DYNAMIC_DEBUG + tristate "Build test-dynamic-debug module" + depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE help - This module registers a tracer callback to count enabled - pr_debugs in a 'do_debugging' function, then alters their - enablements, calls the function, and compares counts. + This module exercises/demonstrates dyndbg's classmap API, by + creating 2 classes: a DISJOINT classmap (supporting DRM.debug) + and a LEVELS/VERBOSE classmap (like verbose2 > verbose1). + + If unsure, say N. + +config TEST_DYNAMIC_DEBUG_SUBMOD + tristate "Build test-dynamic-debug submodule" + default m + depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE + depends on TEST_DYNAMIC_DEBUG + help + This sub-module uses a classmap defined and exported by the + parent module, recapitulating drm & driver's shared use of + drm.debug to control enabled debug-categories. + It is tristate, independent of parent, to allow testing all + proper combinations of parent=y/m submod=y/m. If unsure, say N. diff --git a/lib/Makefile b/lib/Makefile index d5cfc7afbbb8..2c344138d990 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -84,6 +84,7 @@ obj-$(CONFIG_TEST_SORT) += test_sort.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o +obj-$(CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD) += test_dynamic_debug_submod.o obj-$(CONFIG_TEST_PRINTF) += test_printf.o obj-$(CONFIG_TEST_SCANF) += test_scanf.o @@ -226,6 +227,8 @@ obj-$(CONFIG_ARCH_NEED_CMPXCHG_1_EMU) += cmpxchg-emu.o obj-$(CONFIG_DYNAMIC_DEBUG_CORE) += dynamic_debug.o #ensure exported functions have prototypes CFLAGS_dynamic_debug.o := -DDYNAMIC_DEBUG_MODULE +CFLAGS_test_dynamic_debug.o := -DDYNAMIC_DEBUG_MODULE +CFLAGS_test_dynamic_debug_submod.o := -DDYNAMIC_DEBUG_MODULE obj-$(CONFIG_SYMBOLIC_ERRNAME) += errname.o diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index a7e1dbb6ead0..53e261dbf81e 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -29,6 +29,7 @@ #include #include #include + #include #include #include @@ -43,6 +44,8 @@ extern struct _ddebug __start___dyndbg_descs[]; extern struct _ddebug __stop___dyndbg_descs[]; extern struct _ddebug_class_map __start___dyndbg_class_maps[]; extern struct _ddebug_class_map __stop___dyndbg_class_maps[]; +extern struct _ddebug_class_user __start___dyndbg_class_users[]; +extern struct _ddebug_class_user __stop___dyndbg_class_users[]; struct ddebug_table { struct list_head link; @@ -159,20 +162,37 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) query->first_lineno, query->last_lineno, query->class_string); } -static struct _ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, - const char *class_string, - int *class_id) +#define vpr_di_info(di_p, msg_p, ...) ({ \ + struct _ddebug_info const *_di = di_p; \ + v2pr_info(msg_p " module:%s nd:%d nc:%d nu:%d\n", ##__VA_ARGS__, \ + _di->mod_name, _di->descs.len, _di->maps.len, \ + _di->users.len); \ + }) + +static struct _ddebug_class_map * +ddebug_find_valid_class(struct _ddebug_info const *di, const char *query_class, int *class_id) { struct _ddebug_class_map *map; + struct _ddebug_class_user *cli; int i, idx; - for_subvec(i, map, &dt->info, maps) { - idx = match_string(map->class_names, map->length, class_string); + for_subvec(i, map, di, maps) { + idx = match_string(map->class_names, map->length, query_class); if (idx >= 0) { + vpr_di_info(di, "good-class: %s.%s ", map->mod_name, query_class); *class_id = idx + map->base; return map; } } + for_subvec(i, cli, di, users) { + idx = match_string(cli->map->class_names, cli->map->length, query_class); + if (idx >= 0) { + vpr_di_info(di, "class-ref: %s -> %s.%s ", + cli->mod_name, cli->map->mod_name, query_class); + *class_id = idx + cli->map->base; + return cli->map; + } + } *class_id = -ENOENT; return NULL; } @@ -183,8 +203,7 @@ static struct _ddebug_class_map *ddebug_find_valid_class(struct ddebug_table con * callsites, normally the same as number of changes. If verbose, * logs the changes. Takes ddebug_lock. */ -static int ddebug_change(const struct ddebug_query *query, - struct flag_settings *modifiers) +static int ddebug_change(const struct ddebug_query *query, struct flag_settings *modifiers) { int i; struct ddebug_table *dt; @@ -204,7 +223,8 @@ static int ddebug_change(const struct ddebug_query *query, continue; if (query->class_string) { - map = ddebug_find_valid_class(dt, query->class_string, &valid_class); + map = ddebug_find_valid_class(&dt->info, query->class_string, + &valid_class); if (!map) continue; } else { @@ -569,7 +589,7 @@ static int ddebug_exec_query(char *query_string, const char *modname) /* handle multiple queries in query string, continue on error, return last error or number of matching callsites. Module name is either - in param (for boot arg) or perhaps in query string. + in the modname arg (for boot args) or perhaps in query string. */ static int ddebug_exec_queries(char *query, const char *modname) { @@ -700,7 +720,7 @@ static int param_set_dyndbg_module_classes(const char *instr, /** * param_set_dyndbg_classes - classmap kparam setter * @instr: string echo>d to sysfs, input depends on map_type - * @kp: kp->arg has state: bits/lvl, map, map_type + * @kp: kp->arg has state: bits/lvl, classmap, map_type * * enable/disable all class'd pr_debugs in the classmap. For LEVEL * map-types, enforce * relative levels by bitpos. @@ -737,6 +757,7 @@ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp) default: return -1; } + return 0; } EXPORT_SYMBOL(param_get_dyndbg_classes); @@ -1049,12 +1070,17 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos) static const char *ddebug_class_name(struct _ddebug_info *di, struct _ddebug *dp) { struct _ddebug_class_map *map; + struct _ddebug_class_user *cli; int i; for_subvec(i, map, di, maps) if (class_in_range(dp->class_id, map)) return map->class_names[dp->class_id - map->base]; + for_subvec(i, cli, di, users) + if (class_in_range(dp->class_id, cli->map)) + return cli->map->class_names[dp->class_id - cli->map->base]; + return NULL; } @@ -1135,9 +1161,85 @@ static const struct proc_ops proc_fops = { .proc_write = ddebug_proc_write }; -static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebug_info *di) +#define vpr_cm_info(cm_p, msg_fmt, ...) ({ \ + struct _ddebug_class_map const *_cm = cm_p; \ + v2pr_info(msg_fmt " %s [%d..%d] %s..%s\n", ##__VA_ARGS__, \ + _cm->mod_name, _cm->base, _cm->base + _cm->length, \ + _cm->class_names[0], _cm->class_names[_cm->length - 1]); \ + }) + +static void ddebug_sync_classbits(const struct kernel_param *kp, const char *modname) +{ + const struct _ddebug_class_param *dcp = kp->arg; + + /* clamp initial bitvec, mask off hi-bits */ + if (*dcp->bits & ~CLASSMAP_BITMASK(dcp->map->length)) { + *dcp->bits &= CLASSMAP_BITMASK(dcp->map->length); + v2pr_info("preset classbits: %lx\n", *dcp->bits); + } + /* force class'd prdbgs (in USEr module) to match (DEFINEr module) class-param */ + ddebug_apply_class_bitmap(dcp, dcp->bits, ~0, modname); + ddebug_apply_class_bitmap(dcp, dcp->bits, 0, modname); +} + +static void ddebug_match_apply_kparam(const struct kernel_param *kp, + const struct _ddebug_class_map *map, + const char *mod_name) +{ + struct _ddebug_class_param *dcp; + + if (kp->ops != ¶m_ops_dyndbg_classes) + return; + + dcp = (struct _ddebug_class_param *)kp->arg; + + if (map == dcp->map) { + v2pr_info(" kp:%s.%s =0x%lx", mod_name, kp->name, *dcp->bits); + vpr_cm_info(map, " %s mapped to: ", mod_name); + ddebug_sync_classbits(kp, mod_name); + } +} + +static void ddebug_apply_params(const struct _ddebug_class_map *cm, const char *mod_name) +{ + const struct kernel_param *kp; +#if IS_ENABLED(CONFIG_MODULES) + int i; + + if (cm->mod) { + vpr_cm_info(cm, "loaded classmap: %s", mod_name); + /* ifdef protects the cm->mod->kp deref */ + for (i = 0, kp = cm->mod->kp; i < cm->mod->num_kp; i++, kp++) + ddebug_match_apply_kparam(kp, cm, mod_name); + } +#endif + if (!cm->mod) { + vpr_cm_info(cm, "builtin classmap: %s", mod_name); + for (kp = __start___param; kp < __stop___param; kp++) + ddebug_match_apply_kparam(kp, cm, mod_name); + } +} + +static void ddebug_apply_class_maps(const struct _ddebug_info *di) +{ + struct _ddebug_class_map *cm; + int i; + + for_subvec(i, cm, di, maps) + ddebug_apply_params(cm, cm->mod_name); + + vpr_di_info(di, "attached %d classmaps to module: %s ", i, cm->mod_name); +} + +static void ddebug_apply_class_users(const struct _ddebug_info *di) { - vpr_info("module:%s attached %d classes\n", dt->info.mod_name, dt->info.maps.len); + struct _ddebug_class_user *cli; + int i; + + for_subvec(i, cli, di, users) + ddebug_apply_params(cli->map, cli->mod_name); + + vpr_di_info(di, "attached %d class-users to module: %s ", i, cli->mod_name); } /* @@ -1173,6 +1275,7 @@ static int ddebug_add_module(struct _ddebug_info *di) { struct ddebug_table *dt; struct _ddebug_class_map *cm; + struct _ddebug_class_user *cli; int i; if (!di->descs.len) @@ -1196,14 +1299,18 @@ static int ddebug_add_module(struct _ddebug_info *di) INIT_LIST_HEAD(&dt->link); dd_mark_vector_subrange(i, dt, cm, di, maps); + dd_mark_vector_subrange(i, dt, cli, di, users); - if (di->maps.len) - ddebug_attach_module_classes(dt, di); + if (dt->info.maps.len) + ddebug_apply_class_maps(&dt->info); mutex_lock(&ddebug_lock); list_add_tail(&dt->link, &ddebug_tables); mutex_unlock(&ddebug_lock); + if (dt->info.users.len) + ddebug_apply_class_users(&dt->info); + vpr_info("%3u debug prints in module %s\n", di->descs.len, di->mod_name); return 0; } @@ -1354,8 +1461,10 @@ static int __init dynamic_debug_init(void) struct _ddebug_info di = { .descs.start = __start___dyndbg_descs, .maps.start = __start___dyndbg_class_maps, + .users.start = __start___dyndbg_class_users, .descs.len = __stop___dyndbg_descs - __start___dyndbg_descs, .maps.len = __stop___dyndbg_class_maps - __start___dyndbg_class_maps, + .users.len = __stop___dyndbg_class_users - __start___dyndbg_class_users, }; #ifdef CONFIG_MODULES diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 9c3e53cd26bd..1070107f74f1 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -6,11 +6,30 @@ * Jim Cromie */ -#define pr_fmt(fmt) "test_dd: " fmt +/* + * This file is built 2x, also making test_dynamic_debug_submod.ko, + * whose 2-line src file #includes this file. This gives us a _submod + * clone with identical pr_debugs, without further maintenance. + * + * If things are working properly, they should operate identically + * when printed or adjusted by >control. This eases visual perusal of + * the logs, and simplifies testing, by easing the proper accounting + * of expectations. + * + * It also puts both halves of the subsystem _DEFINE & _USE use case + * together, and integrates the common ENUM providing both class_ids + * and class-names to both _DEFINErs and _USERs. I think this makes + * the usage clearer. + */ +#if defined(TEST_DYNAMIC_DEBUG_SUBMOD) + #define pr_fmt(fmt) "test_dd_submod: " fmt +#else + #define pr_fmt(fmt) "test_dd: " fmt +#endif #include -/* run tests by reading or writing sysfs node: do_prints */ +/* re-gen output by reading or writing sysfs node: do_prints */ static void do_prints(void); /* device under test */ static int param_set_do_prints(const char *instr, const struct kernel_param *kp) @@ -29,24 +48,39 @@ static const struct kernel_param_ops param_ops_do_prints = { }; module_param_cb(do_prints, ¶m_ops_do_prints, NULL, 0600); -/* - * Using the CLASSMAP api: - * - classmaps must have corresponding enum - * - enum symbols must match/correlate with class-name strings in the map. - * - base must equal enum's 1st value - * - multiple maps must set their base to share the 0-30 class_id space !! - * (build-bug-on tips welcome) - * Additionally, here: - * - tie together sysname, mapname, bitsname, flagsname - */ -#define DD_SYS_WRAP(_model, _flags) \ - static unsigned long bits_##_model; \ - static struct _ddebug_class_param _flags##_model = { \ +#define CLASSMAP_BITMASK(width, base) (((1UL << (width)) - 1) << (base)) + +/* sysfs param wrapper, proto-API */ +#define DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, _init) \ + static unsigned long bits_##_model = _init; \ + static struct _ddebug_class_param _flags##_##_model = { \ .bits = &bits_##_model, \ .flags = #_flags, \ .map = &map_##_model, \ }; \ - module_param_cb(_flags##_##_model, ¶m_ops_dyndbg_classes, &_flags##_model, 0600) + module_param_cb(_flags##_##_model, ¶m_ops_dyndbg_classes, \ + &_flags##_##_model, 0600) +#ifdef DEBUG +#define DYNAMIC_DEBUG_CLASSMAP_PARAM(_model, _flags) \ + DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, ~0) +#else +#define DYNAMIC_DEBUG_CLASSMAP_PARAM(_model, _flags) \ + DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, 0) +#endif + +/* + * Demonstrate/test DISJOINT & LEVEL typed classmaps with a sys-param. + * + * To comport with DRM debug-category (an int), classmaps map names to + * ids (also an int). So a classmap starts with an enum; DRM has enum + * debug_category: with DRM_UT_. We use the enum + * values as class-ids, and stringified enum-symbols as classnames. + * + * Modules with multiple CLASSMAPS must have enums with distinct + * value-ranges, as arranged below with explicit enum_sym = X inits. + * To clarify this sharing, declare the 2 enums now, for the 2 + * different classmap types + */ /* numeric input, independent bits */ enum cat_disjoint_bits { @@ -60,26 +94,51 @@ enum cat_disjoint_bits { D2_LEASE, D2_DP, D2_DRMRES }; -DECLARE_DYNDBG_CLASSMAP(map_disjoint_bits, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "D2_CORE", - "D2_DRIVER", - "D2_KMS", - "D2_PRIME", - "D2_ATOMIC", - "D2_VBL", - "D2_STATE", - "D2_LEASE", - "D2_DP", - "D2_DRMRES"); -DD_SYS_WRAP(disjoint_bits, p); -DD_SYS_WRAP(disjoint_bits, T); - -/* numeric verbosity, V2 > V1 related */ -enum cat_level_num { V0 = 14, V1, V2, V3, V4, V5, V6, V7 }; -DECLARE_DYNDBG_CLASSMAP(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, 14, - "V0", "V1", "V2", "V3", "V4", "V5", "V6", "V7"); -DD_SYS_WRAP(level_num, p); -DD_SYS_WRAP(level_num, T); + +/* numeric verbosity, V2 > V1 related. V0 is > D2_DRM_RES */ +enum cat_level_num { V0 = 16, V1, V2, V3, V4, V5, V6, V7 }; + +/* recapitulate DRM's multi-classmap setup */ +#if !defined(TEST_DYNAMIC_DEBUG_SUBMOD) +/* + * In single user, or parent / coordinator (drm.ko) modules, define + * classmaps on the client enums above, and then declares the PARAMS + * ref'g the classmaps. Each is exported. + */ +DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_disjoint_bits, DD_CLASS_TYPE_DISJOINT_BITS, + D2_CORE, + "D2_CORE", + "D2_DRIVER", + "D2_KMS", + "D2_PRIME", + "D2_ATOMIC", + "D2_VBL", + "D2_STATE", + "D2_LEASE", + "D2_DP", + "D2_DRMRES"); + +DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, + V0, "V0", "V1", "V2", "V3", "V4", "V5", "V6", "V7"); + +/* + * now add the sysfs-params + */ + +DYNAMIC_DEBUG_CLASSMAP_PARAM(disjoint_bits, p); +DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); + +#else /* TEST_DYNAMIC_DEBUG_SUBMOD */ + +/* + * in submod/drm-drivers, use the classmaps defined in top/parent + * module above. + */ + +DYNAMIC_DEBUG_CLASSMAP_USE(map_disjoint_bits); +DYNAMIC_DEBUG_CLASSMAP_USE(map_level_num); + +#endif /* stand-in for all pr_debug etc */ #define prdbg(SYM) __pr_debug_cls(SYM, #SYM " msg\n") @@ -115,6 +174,7 @@ static void do_levels(void) static void do_prints(void) { + pr_debug("do_prints:\n"); do_cats(); do_levels(); } diff --git a/lib/test_dynamic_debug_submod.c b/lib/test_dynamic_debug_submod.c new file mode 100644 index 000000000000..672aabf40160 --- /dev/null +++ b/lib/test_dynamic_debug_submod.c @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Kernel module for testing dynamic_debug + * + * Authors: + * Jim Cromie + */ + +/* + * clone the parent, inherit all the properties, for consistency and + * simpler accounting in test expectations. + */ +#define TEST_DYNAMIC_DEBUG_SUBMOD +#include "test_dynamic_debug.c" From patchwork Wed Apr 2 17:41:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036296 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 8FF52C36014 for ; Wed, 2 Apr 2025 17:42:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AAE6210E892; Wed, 2 Apr 2025 17:42:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l9pxzhcP"; dkim-atps=neutral Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id E193F10E88D; Wed, 2 Apr 2025 17:42:32 +0000 (UTC) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3d4496a34cdso523325ab.1; Wed, 02 Apr 2025 10:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615752; x=1744220552; 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=YCIt9tYIDEGpxvCFrjrEJ4lAt8KNuZmfjyIc/WC7B0Q=; b=l9pxzhcPJTvdLjLCaJbeetyc7tOugngyORF33f3S7f9SHGbt7E8L7MNfWv3yZaQg4B RJJfb2PDlacHZF2slTb8Sjbp88ExxHXReIGU+IRiOOZ9C43+Y3agFPjFbMm8Rh3moARM hDup0n2jCrIF9t9ICc4S7xOwSRwyT5KZqYLqh2y4AbCaKhl0LZehZ9CDbrKzyAnP5/Io h0V8j5/6r7ChWmyUKJDz233ilAI6qva0sQZpqu2qo5Yqm2p6NpUZrD8CZtsHCExxOuQy 6ZdhjKnkuSuURdN+MlxSQadYOMitpRzHQcAV5zvsjsjx6FA4Sa5b6HOaN5QLyWyLdV7N I3Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615752; x=1744220552; 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=YCIt9tYIDEGpxvCFrjrEJ4lAt8KNuZmfjyIc/WC7B0Q=; b=NJ48taL1esNNrhL7wZkqtX8GENYt4PU34aua9oWaGxrhRiVbcWDz+MrZhspewNW9nr iKCLD6k1FW5mSYpDm5RWiAhAAnK09f7QfmFv+RAa6T/P717KcVxoOnDTBAG0UMZ1Rirb MS4lKjAZN/u+X31wsPDvBWGDgpWDKq+QwCiW/3NcuXKWuwKR5Mnzk+xbIw19i4rAjPrb GcS2FB4An7hTCKpllikHE/Svf/H+O7DNs832CRnG+dJN+v8DcPWiEO85DA7qYXU++eOA TTo9QBdzK7PL3bkRIeIJGRqNZset37jqUq+ZdZVirx2TUlJ2pHO0zWZsTt+LZH3G2JPd z4+A== X-Forwarded-Encrypted: i=1; AJvYcCU6UH1HK7WQVNO4LzpRmrRT7ZlLmP2eB2sFvL/RLtC47aVYczMG0pWPD2G0sMe9i1HAYe5FZLDI@lists.freedesktop.org, AJvYcCUqmbok2S6AkxKCmhFp3mm6N2xPsZizelAezWvv0y8aXYdUur3eY6+77Pn2m67K+6FXa0F6jkcwbC5Z@lists.freedesktop.org, AJvYcCVPpANPIkmuLF5EfbWXB3W/E0U3hhVbHj5YK51BuFoIQauNtGWfc2Jwt45dMGBB/GvG2FLP6NvMHLyESJfJbA==@lists.freedesktop.org X-Gm-Message-State: AOJu0YyccAhUvQ7mHNMIgV0Xaz/5paQzt48kfdj/XNEUztzBor0sE91b U4CIoqwnujGgfxvJ+thr0ZwXHfxyCPfc2tsXxOGzKuzzdNQrZay/ X-Gm-Gg: ASbGncsPaaWRdWY1/6Pav4tezTuOD4zmVOlRR8td5s5VeEcuP0Y0gDgI0//nsoPhGqt lxZeu16yoczG5xZ3ad4qxV4PpntZqOO8Uc3Kqy06lCEwY+1Wow0vGAWE96vfJ21FKZ1xCtNY4Kw LWpf08oqJIEu2Q0ZiyZiwwm0VIpYk+SIbWkCH4SGWq+K5KRKnvuSYzDgxKfgVbZQuy4J2tByGTp Q7BbTKeND171fQvseCyk4fOKvZTaHtQWGIfSGPf7XaSQ2yI1VCCFVmTKcyfziC7jzkln53o2zxN rt+gSOd/3/XeXGihD3b96/0xZQ3EXIEkc7g9jGqdfo0EKV7FbuzQnlTHHyz5LcBsbCu4PlNsui2 XMqNcXIob88yY X-Google-Smtp-Source: AGHT+IFfGtZPni22y+0xW+8U0Khw+cTygsnRaXQqfaDRuRmQ1klihTpldlBe8ndlWy3frQCWeXYYiQ== X-Received: by 2002:a05:6e02:3713:b0:3d5:8922:77a0 with SMTP id e9e14a558f8ab-3d5e09c89a5mr234397865ab.18.1743615751996; Wed, 02 Apr 2025 10:42:31 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:31 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 18/54] selftests-dyndbg: add tools/testing/selftests/dynamic_debug/* Date: Wed, 2 Apr 2025 11:41:20 -0600 Message-ID: <20250402174156.1246171-19-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Add a selftest script for dynamic-debug. The config requires CONFIG_TEST_DYNAMIC_DEBUG=m and CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m, which tacitly requires either CONFIG_DYNAMIC_DEBUG=y or CONFIG_DYNAMIC_DEBUG_CORE=y ATM this has just basic_tests(), which modify pr_debug() flags in the builtin params module. This means they're available to manipulate and observe the effects in "cat control". This is backported from another feature branch; the support-fns (thx Lukas) have unused features at the moment, they'll get used shortly. The script enables simple virtme-ng testing: [jimc@gandalf b0-ftrace]$ vrun_t virtme-ng 1.32+115.g07b109d doing: vng --name v6.14-rc4-60-gd5f48427de0c \ --user root -v -p 4 -a dynamic_debug.verbose=3 V=1 \ -- ../tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh virtme: waiting for virtiofsd to start .. And add dynamic_debug to TARGETS, so `make run_tests` sees it properly For the impatient, set TARGETS explicitly: bash-5.2# make TARGETS=dynamic_debug run_tests make[1]: ... TAP version 13 1..1 [ 35.552922] dyndbg: read 3 bytes from userspace [ 35.553099] dyndbg: query 0: "=_" mod:* [ 35.553544] dyndbg: processed 1 queries, with 1778 matches, 0 errs Signed-off-by: Jim Cromie Co-developed-by: Łukasz Bartosik Signed-off-by: Łukasz Bartosik --- -r3 turn off green at end drop config dep on TEST_DYNAMIC_DEBUG, since basic-test uses builtin params - check KCONFIG_CONFIG to avoid silly fails Several tests are dependent upon config choices. Lets avoid failing where that is noise. The KCONFIG_CONFIG var exists to convey the config-file around. If the var names a file, read it and extract the relevant CONFIG items, and use them to skip the dependent tests, thus avoiding the fails that would follow, and the disruption to whatever CI is running these selftests. If the envar doesn't name a config-file, ".config" is assumed. CONFIG_DYNAMIC_DEBUG=y: basic-tests() and comma-terminator-tests() test for the presence of the builtin pr_debugs in module/main.c, which I deemed stable and therefore safe to count. That said, the test fails if only CONFIG_DYNAMIC_DEBUG_CORE=y is set. It could be rewritten to test against test-dynamic-debug.ko, but that just trades one config dependence for another. CONFIG_TEST_DYNAMIC_DEBUG=m As written, test_percent_splitting() modprobes test_dynamic_debug, enables several classes, and count them. It could be re-written to work for the builtin module also, but builtin test modules are not a common or desirable build/config. CONFIG_TEST_DYNAMIC_DEBUG=m && CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m test_mod_submod() recaps the bug found in DRM-CI where drivers werent enabled by drm.debug=. It modprobes both test_dynamic_debug & test_dynamic_debug_submod, so it depends on a loadable modules config. It could be rewritten to work in a builtin parent config; DRM=y is common enough to be pertinent, but testing that config also wouldn't really test anything more fully than all-loadable modules, since they default together. generalize-test-env --- MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + .../testing/selftests/dynamic_debug/Makefile | 9 + tools/testing/selftests/dynamic_debug/config | 7 + .../dynamic_debug/dyndbg_selftest.sh | 257 ++++++++++++++++++ 5 files changed, 275 insertions(+) create mode 100644 tools/testing/selftests/dynamic_debug/Makefile create mode 100644 tools/testing/selftests/dynamic_debug/config create mode 100755 tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh diff --git a/MAINTAINERS b/MAINTAINERS index 1c5fcbd9e408..1192ad6c65c1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8140,6 +8140,7 @@ S: Maintained F: include/linux/dynamic_debug.h F: lib/dynamic_debug.c F: lib/test_dynamic_debug*.c +F: tools/testing/selftests/dynamic_debug/* DYNAMIC INTERRUPT MODERATION M: Tal Gilboa diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 8daac70c2f9d..b6a323c7f986 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -26,6 +26,7 @@ TARGETS += drivers/net/team TARGETS += drivers/net/virtio_net TARGETS += drivers/platform/x86/intel/ifs TARGETS += dt +TARGETS += dynamic_debug TARGETS += efivarfs TARGETS += exec TARGETS += fchmodat2 diff --git a/tools/testing/selftests/dynamic_debug/Makefile b/tools/testing/selftests/dynamic_debug/Makefile new file mode 100644 index 000000000000..6d06fa7f1040 --- /dev/null +++ b/tools/testing/selftests/dynamic_debug/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# borrowed from Makefile for user memory selftests + +# No binaries, but make sure arg-less "make" doesn't trigger "run_tests" +all: + +TEST_PROGS := dyndbg_selftest.sh + +include ../lib.mk diff --git a/tools/testing/selftests/dynamic_debug/config b/tools/testing/selftests/dynamic_debug/config new file mode 100644 index 000000000000..0f906ff53908 --- /dev/null +++ b/tools/testing/selftests/dynamic_debug/config @@ -0,0 +1,7 @@ + +# basic tests ref the builtin params module +CONFIG_DYNAMIC_DEBUG=m + +# more testing is possible with these +# CONFIG_TEST_DYNAMIC_DEBUG=m +# CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh new file mode 100755 index 000000000000..465fad3f392c --- /dev/null +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -0,0 +1,257 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0-only + +V=${V:=0} # invoke as V=1 $0 for global verbose +RED="\033[0;31m" +GREEN="\033[0;32m" +YELLOW="\033[0;33m" +BLUE="\033[0;34m" +MAGENTA="\033[0;35m" +CYAN="\033[0;36m" +NC="\033[0;0m" +error_msg="" + +[ -e /proc/dynamic_debug/control ] || { + echo -e "${RED}: this test requires CONFIG_DYNAMIC_DEBUG=y ${NC}" + exit 0 # nothing to test here, no good reason to fail. +} + +# need info to avoid failures due to untestable configs + +[ -f "$KCONFIG_CONFIG" ] || KCONFIG_CONFIG=".config" +if [ -f "$KCONFIG_CONFIG" ]; then + echo "# consulting KCONFIG_CONFIG: $KCONFIG_CONFIG" + grep -q "CONFIG_DYNAMIC_DEBUG=y" $KCONFIG_CONFIG ; LACK_DD_BUILTIN=$? + grep -q "CONFIG_TEST_DYNAMIC_DEBUG=m" $KCONFIG_CONFIG ; LACK_TMOD=$? + grep -q "CONFIG_TEST_DYNAMIC_DEBUG_SUBMOD=m" $KCONFIG_CONFIG ; LACK_TMOD_SUBMOD=$? + if [ $V -eq 1 ]; then + echo LACK_DD_BUILTIN: $LACK_DD_BUILTIN + echo LACK_TMOD: $LACK_TMOD + echo LACK_TMOD_SUBMOD: $LACK_TMOD_SUBMOD + fi +else + LACK_DD_BUILTIN=0 + LACK_TMOD=0 + LACK_TMOD_SUBMOD=0 +fi + +function vx () { + echo $1 > /sys/module/dynamic_debug/parameters/verbose +} + +function ddgrep () { + grep $1 /proc/dynamic_debug/control +} + +function doprints () { + cat /sys/module/test_dynamic_debug/parameters/do_prints +} + +function ddcmd () { + exp_exit_code=0 + num_args=$# + if [ "${@:$#}" = "pass" ]; then + num_args=$#-1 + elif [ "${@:$#}" = "fail" ]; then + num_args=$#-1 + exp_exit_code=1 + fi + args=${@:1:$num_args} + output=$((echo "$args" > /proc/dynamic_debug/control) 2>&1) + exit_code=$? + error_msg=$(echo $output | cut -d ":" -f 5 | sed -e 's/^[[:space:]]*//') + handle_exit_code $BASH_LINENO $FUNCNAME $exit_code $exp_exit_code +} + +function handle_exit_code() { + local exp_exit_code=0 + [ $# == 4 ] && exp_exit_code=$4 + if [ $3 -ne $exp_exit_code ]; then + echo -e "${RED}: $BASH_SOURCE:$1 $2() expected to exit with code $exp_exit_code" + [ $3 == 1 ] && echo "Error: '$error_msg'" + exit + fi +} + +# $1 - pattern to match, pattern in $1 is enclosed by spaces for a match ""\s$1\s" +# $2 - number of times the pattern passed in $1 is expected to match +# $3 - optional can be set either to "-r" or "-v" +# "-r" means relaxed matching in this case pattern provided in $1 is passed +# as is without enclosing it with spaces +# "-v" prints matching lines +# $4 - optional when $3 is set to "-r" then $4 can be used to pass "-v" +function check_match_ct { + pattern="\s$1\s" + exp_cnt=0 + + [ "$3" == "-r" ] && pattern="$1" + let cnt=$(ddgrep "$pattern" | wc -l) + if [ $V -eq 1 ] || [ "$3" == "-v" ] || [ "$4" == "-v" ]; then + echo -ne "${BLUE}" && ddgrep $pattern && echo -ne "${NC}" + fi + [ $# -gt 1 ] && exp_cnt=$2 + if [ $cnt -ne $exp_cnt ]; then + echo -e "${RED}: $BASH_SOURCE:$BASH_LINENO check failed expected $exp_cnt on $1, got $cnt" + exit + else + echo ": $cnt matches on $1" + fi +} + +# $1 - trace instance name +# #2 - if > 0 then directory is expected to exist, if <= 0 then otherwise +# $3 - "-v" for verbose +function check_trace_instance_dir { + if [ -e /sys/kernel/tracing/instances/$1 ]; then + if [ "$3" == "-v" ] ; then + echo "ls -l /sys/kernel/tracing/instances/$1: " + ls -l /sys/kernel/tracing/instances/$1 + fi + if [ $2 -le 0 ]; then + echo -e "${RED}: $BASH_SOURCE:$BASH_LINENO error trace instance \ + '/sys/kernel/tracing/instances/$1' does exist" + exit + fi + else + if [ $2 -gt 0 ]; then + echo -e "${RED}: $BASH_SOURCE:$BASH_LINENO error trace instance \ + '/sys/kernel/tracing/instances/$1' does not exist" + exit + fi + fi +} + +function tmark { + echo $* > /sys/kernel/tracing/trace_marker +} + +# $1 - trace instance name +# $2 - line number +# $3 - if > 0 then the instance is expected to be opened, otherwise +# the instance is expected to be closed +function check_trace_instance { + output=$(tail -n9 /proc/dynamic_debug/control | grep ": Opened trace instances" \ + | xargs -n1 | grep $1) + if [ "$output" != $1 ] && [ $3 -gt 0 ]; then + echo -e "${RED}: $BASH_SOURCE:$2 trace instance $1 is not opened" + exit + fi + if [ "$output" == $1 ] && [ $3 -le 0 ]; then + echo -e "${RED}: $BASH_SOURCE:$2 trace instance $1 is not closed" + exit + fi +} + +function is_trace_instance_opened { + check_trace_instance $1 $BASH_LINENO 1 +} + +function is_trace_instance_closed { + check_trace_instance $1 $BASH_LINENO 0 +} + +# $1 - trace instance directory to delete +# $2 - if > 0 then directory is expected to be deleted successfully, if <= 0 then otherwise +function del_trace_instance_dir() { + exp_exit_code=1 + [ $2 -gt 0 ] && exp_exit_code=0 + output=$((rmdir /sys/kernel/debug/tracing/instances/$1) 2>&1) + exit_code=$? + error_msg=$(echo $output | cut -d ":" -f 3 | sed -e 's/^[[:space:]]*//') + handle_exit_code $BASH_LINENO $FUNCNAME $exit_code $exp_exit_code +} + +function error_log_ref { + # to show what I got + : echo "# error-log-ref: $1" + : echo cat \$2 +} + +function ifrmmod { + lsmod | grep $1 2>&1>/dev/null && rmmod $1 +} + +# $1 - text to search for +function search_trace() { + search_trace_name 0 1 $1 +} + +# $1 - trace instance name, 0 for global event trace +# $2 - line number counting from the bottom +# $3 - text to search for +function search_trace_name() { + if [ "$1" = "0" ]; then + buf=$(cat /sys/kernel/debug/tracing/trace) + line=$(tail -$2 /sys/kernel/debug/tracing/trace | head -1 | sed -e 's/^[[:space:]]*//') + else + buf=$(cat /sys/kernel/debug/tracing/instances/$1/trace) + line=$(tail -$2 /sys/kernel/debug/tracing/instances/$1/trace | head -1 | \ + sed -e 's/^[[:space:]]*//') + fi + if [ $2 = 0 ]; then + # whole-buf check + output=$(echo $buf | grep "$3") + else + output=$(echo $line | grep "$3") + fi + if [ "$output" = "" ]; then + echo -e "${RED}: $BASH_SOURCE:$BASH_LINENO search for '$3' failed \ + in line '$line' or '$buf'" + exit + fi + if [ $V = 1 ]; then + echo -e "${MAGENTA}: search_trace_name in $1 found: \n$output \nin:${BLUE} $buf ${NC}" + fi +} + +# $1 - error message to check +function check_err_msg() { + if [ "$error_msg" != "$1" ]; then + echo -e "${RED}: $BASH_SOURCE:$BASH_LINENO error message '$error_msg' \ + does not match with '$1'" + exit + fi +} + +function basic_tests { + echo -e "${GREEN}# BASIC_TESTS ${NC}" + if [ $LACK_DD_BUILTIN -eq 1 ]; then + echo "SKIP" + return + fi + ddcmd =_ # zero everything + check_match_ct =p 0 + + # module params are builtin to handle boot args + check_match_ct '\[params\]' 4 -r + ddcmd module params +mpf + check_match_ct =pmf 4 + + # multi-cmd input, newline separated, with embedded comments + cat <<"EOF" > /proc/dynamic_debug/control + module params =_ # clear params + module params +mf # set flags + module params func parse_args +sl # other flags +EOF + check_match_ct =mf 3 + check_match_ct =mfsl 1 + ddcmd =_ +} + +tests_list=( + basic_tests +) + +# Run tests + +ifrmmod test_dynamic_debug_submod +ifrmmod test_dynamic_debug + +for test in "${tests_list[@]}" +do + $test + echo "" +done +echo -en "${GREEN}# Done on: " +date +echo -en "${NC}" From patchwork Wed Apr 2 17:41:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036297 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 A3E2BC36017 for ; Wed, 2 Apr 2025 17:42:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1149F10E891; Wed, 2 Apr 2025 17:42:36 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MQgdNu3I"; dkim-atps=neutral Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFB5810E88D; Wed, 2 Apr 2025 17:42:33 +0000 (UTC) Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-3cda56e1dffso521415ab.1; Wed, 02 Apr 2025 10:42:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615753; x=1744220553; 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=KeKTBGUd8WybmXrxvv7lQQBEsMgzjZkVTc12353wK+U=; b=MQgdNu3Ih5ntRcVdvtnXrLsZ44Wwv/Meiyyf2pfPZdsqvELar3LttChlt71sprduWf iY2mfgWz+c9vxmCoePbre+7MPb5djgmsHv1jvLcJRKfji0LMh5rac65vGeWL3vEJOdrY Q/CirkqGvxN/oTiOQ8EvB24qAP6oRZ9t+0t4f/TXyiwkiEJCVNFR7yOpklCdjdCcjNV6 8qoqEUx+sn6dxndl3oCGRLRvJuORCPoaV0F7O3COxwmhQ8OoabrCN8zIUGxXum8Yvpr7 3B9RWtefnX/K3OPNysjlRYxNE2lPzvWoSF2bqhnk2R471oKDCGyaTLMNsewLOBbgs8wh YKSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615753; x=1744220553; 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=KeKTBGUd8WybmXrxvv7lQQBEsMgzjZkVTc12353wK+U=; b=Edz/szfVm9l3CHv8lKRkkWTQxMb+ZXVwYdj5G0dhIhhPlwRxXIMNfYxA9NBD0FO3TU jLzttqqmv9BtuPgahrPIei8yKtg415kF9z7T5m2tuiVs28rWHH8KvdRXVzOEcidpL6bB Q4B5JtUJ60NVUbWQxRMmEfuI++fB6cinddMN3Uao7bbA5FvZHXEGQrggcxVySlu+YSK2 e6+gxVFvY2xr4gbu0XRx7PReNisKSx3s2Xf/jDCHmx+JmjTBz4cO0tnbuobBrQsccfUN LW57yngOzwysvoPT6oqZkJ1SZhgmoC8kAO51zjcIJ5yL7x2xyEuNE69XChE2KA6+vNA3 Wnhw== X-Forwarded-Encrypted: i=1; AJvYcCVd/cGyxxn8TpxkuEydjMz8Th2nxo81RLbweQtDQPN7cKMLZn9Ww+WoockvbLbxZsf4h2Dtf0AK@lists.freedesktop.org, AJvYcCWlgA6xbL98wTTpsAC4YfsAIoVX0vOkc5dBCOeMfb/ExzLl1ECa1L4QbeM4xXhQOIMiMKmuYUZ6LtFmmwt7Pg==@lists.freedesktop.org, AJvYcCXkSDVFFAcl3RyFbyvybrwRaARelt30rnTIR1hi+rzzTayaMPLo0tTn5JSKpZ7D6DlOB51byLsnGVwI@lists.freedesktop.org X-Gm-Message-State: AOJu0YwsKeTZIxltIZMuy2rQYjruYspsdvDBewnoI5eWKBIb3CHmPWu3 16u+Z53Y9RFxaE7mK3N5HrgUV4Kp4WkSOmBw6rkB2rZCfI0X9iVs X-Gm-Gg: ASbGnctfMomIpqk+/XXUbb9Zzkefq/QBFpWyE2vp5yX83J5R/yxb9OY7qY5TiflDMuf bguleI+auwfMUsBOTmNpzRO8VuYJROWpJFzBjxBjUQYa8pK7eDYPGA5YZBETqxajfjRTfibq7Ct DyD8H7K+h2TJD+yFXFsAZ8ubq6wAtmecawXP1tkbqPhfE16nFZ/KzohF3Q/ERCq6HXqIw6796UJ MUz/iTvwSL2LcL7VA47Y81G6UnJliBSWeOQTDy7lSe5S8oPmV6wAMNZ+OdFd/QAjCRZ0F5ZSv7M 0BrqpKYqMkMXqXJc8I+odbvHZfoa1JAGilxZnoq6u+SU0RilIfB2VShxKJv9sp19gc6T9fniRA2 6GQ== X-Google-Smtp-Source: AGHT+IFaC1YYyq2aq/rDOr7nftMb5mtnPTvXusfBx4cINuze69wt5nZYDtolFZPQAPv6upZ4KaK1zw== X-Received: by 2002:a05:6e02:3c82:b0:3cf:c7d3:e4b with SMTP id e9e14a558f8ab-3d5e0a09a11mr204507425ab.21.1743615753003; Wed, 02 Apr 2025 10:42:33 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:32 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 19/54] dyndbg: detect class_id reservation conflicts Date: Wed, 2 Apr 2025 11:41:21 -0600 Message-ID: <20250402174156.1246171-20-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" If a module _DEFINEs + _USEs 2 or more classmaps, it must devise them to share the per-module 0..62 class-id space; ie their respective base,+length reservations cannot overlap. To detect conflicts at modprobe, add ddebug_class_range_overlap(), call it from ddebug_add_module(), and WARN and return -EINVAL when they're detected. test_dynamic_debug.c: If built with -DFORCE_CLASSID_CONFLICT, the test-modules get 2 bad DYNDBG_CLASS_DEFINE declarations, into parent and the _submod. These conflict with one of the good ones in the parent (D2_CORE..etc), causing the modprobe(s) to warn Signed-off-by: Jim Cromie --- --- lib/dynamic_debug.c | 29 +++++++++++++++++++++++++++++ lib/test_dynamic_debug.c | 8 ++++++++ 2 files changed, 37 insertions(+) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 53e261dbf81e..56b503af0b31 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -1267,6 +1267,22 @@ static void ddebug_apply_class_users(const struct _ddebug_info *di) (_dst)->info._vec.len = nc; \ }) +static int __maybe_unused +ddebug_class_range_overlap(struct _ddebug_class_map *cm, + u64 *reserved_ids) +{ + u64 range = (((1ULL << cm->length) - 1) << cm->base); + + if (range & *reserved_ids) { + pr_err("[%d..%d] on %s conflicts with %llx\n", cm->base, + cm->base + cm->length - 1, cm->class_names[0], + *reserved_ids); + return -EINVAL; + } + *reserved_ids |= range; + return 0; +} + /* * Allocate a new ddebug_table for the given module * and add it to the global list. @@ -1276,6 +1292,7 @@ static int ddebug_add_module(struct _ddebug_info *di) struct ddebug_table *dt; struct _ddebug_class_map *cm; struct _ddebug_class_user *cli; + u64 reserved_ids = 0; int i; if (!di->descs.len) @@ -1301,6 +1318,13 @@ static int ddebug_add_module(struct _ddebug_info *di) dd_mark_vector_subrange(i, dt, cm, di, maps); dd_mark_vector_subrange(i, dt, cli, di, users); + for_subvec(i, cm, &dt->info, maps) + if (ddebug_class_range_overlap(cm, &reserved_ids)) + goto cleanup; + for_subvec(i, cli, &dt->info, users) + if (ddebug_class_range_overlap(cli->map, &reserved_ids)) + goto cleanup; + if (dt->info.maps.len) ddebug_apply_class_maps(&dt->info); @@ -1313,6 +1337,11 @@ static int ddebug_add_module(struct _ddebug_info *di) vpr_info("%3u debug prints in module %s\n", di->descs.len, di->mod_name); return 0; +cleanup: + WARN_ONCE("dyndbg multi-classmap conflict in %s\n", di->mod_name); + kfree(dt); + return -EINVAL; + } /* helper for ddebug_dyndbg_(boot|module)_param_cb */ diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 1070107f74f1..e42916b08fd4 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -128,6 +128,14 @@ DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, DYNAMIC_DEBUG_CLASSMAP_PARAM(disjoint_bits, p); DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); +#ifdef FORCE_CLASSID_CONFLICT +/* + * Enable with -Dflag on compile to test overlapping class-id range + * detection. This should warn on modprobes. + */ +DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE"); +#endif + #else /* TEST_DYNAMIC_DEBUG_SUBMOD */ /* From patchwork Wed Apr 2 17:41:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036300 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 C50F0C36014 for ; Wed, 2 Apr 2025 17:42:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 918EA10E88D; Wed, 2 Apr 2025 17:42:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XLQhbPEj"; dkim-atps=neutral Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by gabe.freedesktop.org (Postfix) with ESMTPS id 127AB10E886; Wed, 2 Apr 2025 17:42:35 +0000 (UTC) Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-85dac9729c3so992139f.2; Wed, 02 Apr 2025 10:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615754; x=1744220554; 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=hYc+j5mBJIrHD3rqV3hAaVU76cL8/yuTOYYx1NhhgTg=; b=XLQhbPEjdZ0Q0DpRpQ7guXRYhAp12moS5Nha8jm6XQCdt6l2tvb91Xg/7PtNJsUBe6 z8DFLmc0WPN6RU04FHQSd9Qjuk1PlSz/xp2SB3WVQW1XQMEA0gRn4VyJtw6pUVO6wJ/h K23R/lUn3fjOx6VZwJpKG4qE+LM993uyHSKN968nntbEBU5R8lt/2hw4rTzMTX0d00oc MVvXwBZsxnJlK+8Zu8ZDEuKIYqn/3h5Sa99rODKF3bJ8d7fwkIYoCUFK9aQBFw+yNxuD TA794REWU7Npppk156tL/H2GU95p2aC2RemUQzbM51sWnURGidTRHbzINISe2gUX7mYv +HGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615754; x=1744220554; 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=hYc+j5mBJIrHD3rqV3hAaVU76cL8/yuTOYYx1NhhgTg=; b=lZhfz2mJ4Lqa5JChCW1gqSuu0Sey5JR/TnUK0ajYI1Kn291gLGm9U+xlJZaiwzeSjm QcTfpA4kBRTLiwwU0RYka2xJhLr5xKmWkc05Ua+HN09d+R9Mj5V0UvlNXD895cERYlGl iJmnwyaBANHqk4Dwwynthn/0crpbTzV/VqrzPJ3f0r8LyO6ZNSz+ZXZ1CvRkdplteZ8O xPC/zlDIt5Kvgfr/Zoc+pNVic0oDfk/cyQFoj2keNOMfX/nTOHN45H/KHb1smuRAC2M5 J7WNET/3aiw0rheWT59MF87HysZlP96OvaQA6NkhIKXLsSouXsBwtLpobVSZG4qlwx/U MDqQ== X-Forwarded-Encrypted: i=1; AJvYcCV2mPKBP8aY0xZVzsSG3AkAt7xBxKP2UVLcXXT18hPespNxq+Rqc4+vC3+LsCcGvDa+gXSBqW6P+XGXV/v0xA==@lists.freedesktop.org, AJvYcCWBToh3YmVpNXhHIJWJ+r6bY7yumUnIvnNVPEx1YKvXpAvNInntFYR+J4/EdCTNB2IPGJ02NAVj8cM2@lists.freedesktop.org, AJvYcCXPOzF1ht3SYP+36OpPA3B5jlsUN63aUR81BzJCkFwG5MoS0slEsJnxKmSzD851cR553wwMuGbO@lists.freedesktop.org X-Gm-Message-State: AOJu0YwjhdMiijpEeWaXHvWTlCSkvcn6m1M+0KXgro9qPlzykhye/Vcc NPC9dgBLH2u4wCNhlrLuDo7C393l6Mfe7TUEHvf0LdxOL4Gf1n6C X-Gm-Gg: ASbGnculPL9FJ9XT5pkUVGOoDYbynZDN/s+XVHebo/BIv1MBwyvPHs3aiKNXsSY5YFP 4m3AAq+zvxhhWm52WlsM41s2KpdVtZarMeI8laiGEGBtQkH8/wOAe3wDMrsJ/67ah27W0JryYQ5 eUw1Qvo/LQ3CFlixLzhkg4wutnX98rj+qJXHHCsB1VQFyVrMMC6DhYK1XaAiQgG500DvDl2eezw oRpGwStHgRraFqaNK2vroXCmzSGJadY4DSAxQGMerCRwWC+SPkpAls+4x10ODvUABtKolh3gK+K XHs+3dkQOVGhAg/BjxhwHzP/GsRAA+UlM4llYQuiaE9xHcv/gePs8gX/TOITtAh/fozHVazhk0E PMf3/ng3T16Zs X-Google-Smtp-Source: AGHT+IEVAbHMnIO9dfNIpvtNs8ZLp2t2qagN4qTEja9BzZoYvl4a7Bc0A3a/xIEdjKgwP/E1I/zqhA== X-Received: by 2002:a05:6e02:2606:b0:3d4:6e2f:b493 with SMTP id e9e14a558f8ab-3d6d54cde77mr38291795ab.11.1743615753974; Wed, 02 Apr 2025 10:42:33 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:33 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 20/54] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Date: Wed, 2 Apr 2025 11:41:22 -0600 Message-ID: <20250402174156.1246171-21-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Add __DYNAMIC_DEBUG_CLASSMAP_CHECK to implement the following arg-checks at compile-time: 0 <= _base < 63 class_names is not empty class_names[0] is a string (class_names.length + _base) < 63 These compile-time checks will prevent several misuses; 4 such examples are added to test_dynamic_debug_submod.ko, and will fail compilation if -DDD_MACRO_ARGCHECK is added to cflags. This wouldn't be a useful CONFIG_ item, since it breaks the build. Signed-off-by: Jim Cromie --- v3- $macro_name =~ s/DYNDBG/DYNAMIC_DEBUG/ prev- - split static-asserts to __DYNDBG_CLASSMAP_CHECK - move __DYNDBG_CLASSMAP_CHECK above kdoc for DYNDBG_CLASSMAP_DEFINE silences kernel-doc warnings --- include/linux/dynamic_debug.h | 9 +++++++++ lib/test_dynamic_debug.c | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 9af825c84e70..4941ef2adb46 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -99,6 +99,14 @@ struct _ddebug_class_map { enum ddebug_class_map_type map_type; }; +#define __DYNAMIC_DEBUG_CLASSMAP_CHECK(_clnames, _base) \ + static_assert(((_base) >= 0 && (_base) < _DPRINTK_CLASS_DFLT), \ + "_base must be in 0..62"); \ + static_assert(ARRAY_SIZE(_clnames) > 0, \ + "classnames array size must be > 0"); \ + static_assert((ARRAY_SIZE(_clnames) + (_base)) < _DPRINTK_CLASS_DFLT, \ + "_base + classnames.length exceeds range") + /** * DYNAMIC_DEBUG_CLASSMAP_DEFINE - define debug classes used by a module. * @_var: name of the classmap, exported for other modules coordinated use. @@ -112,6 +120,7 @@ struct _ddebug_class_map { */ #define DYNAMIC_DEBUG_CLASSMAP_DEFINE(_var, _mapty, _base, ...) \ static const char *_var##_classnames[] = { __VA_ARGS__ }; \ + __DYNAMIC_DEBUG_CLASSMAP_CHECK(_var##_classnames, (_base)); \ extern struct _ddebug_class_map _var; \ struct _ddebug_class_map __aligned(8) __used \ __section("__dyndbg_class_maps") _var = { \ diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index e42916b08fd4..9f9e3fddd7e6 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -146,8 +146,19 @@ DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE"); DYNAMIC_DEBUG_CLASSMAP_USE(map_disjoint_bits); DYNAMIC_DEBUG_CLASSMAP_USE(map_level_num); +#if defined(DD_MACRO_ARGCHECK) +/* + * Exersize compile-time arg-checks in DYNDBG_CLASSMAP_DEFINE. + * These will break compilation. + */ +DYNDBG_CLASSMAP_DEFINE(fail_base_neg, 0, -1, "NEGATIVE_BASE_ARG"); +DYNDBG_CLASSMAP_DEFINE(fail_base_big, 0, 100, "TOOBIG_BASE_ARG"); +DYNDBG_CLASSMAP_DEFINE(fail_str_type, 0, 0, 1 /* not a string */); +DYNDBG_CLASSMAP_DEFINE(fail_emptyclass, 0, 0 /* ,empty */); #endif +#endif /* TEST_DYNAMIC_DEBUG_SUBMOD */ + /* stand-in for all pr_debug etc */ #define prdbg(SYM) __pr_debug_cls(SYM, #SYM " msg\n") From patchwork Wed Apr 2 17:41:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036299 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 65538C36017 for ; Wed, 2 Apr 2025 17:42:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7DBD010E88B; Wed, 2 Apr 2025 17:42:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mdGUy1ip"; dkim-atps=neutral Received: from mail-il1-f172.google.com (mail-il1-f172.google.com [209.85.166.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC27610E891; Wed, 2 Apr 2025 17:42:35 +0000 (UTC) Received: by mail-il1-f172.google.com with SMTP id e9e14a558f8ab-3d59c8f0979so3699155ab.0; Wed, 02 Apr 2025 10:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615755; x=1744220555; 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=9crVnbk3XjpJrHsY0dIqQRNI8E7oyjJ17chOf0dhmBE=; b=mdGUy1ip1oNTrQl82mWfnAxzjQw2EyDhm0tsnS5Aj2CgXsRFAo1nHA7A8OWeAP6QvK Fjazu6NBE5+vu7vQygBw5+MS0sBr/fbXLANjUSw+Y7MId39OZFRTE+iB/h5Xko8kxqNF soD1TQ+mWJ03uZ+IlvEMA6e7YOULeUxGz68b6i0O0vft6dx8R4QC+6BWYtVvgk2RxnUr nFNU1En1XxCnfcTc61A3i9087fEZjKo6sU0vQvjUunLSXsG8xmqmWD96bX4weMYj8Wt5 Ccn4kFHLTCsibRFfE0E3PymOePQqz3SmKKBoFTtArXAHV5Pvo8aTsAcReMKCSQDCCHrq XI/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615755; x=1744220555; 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=9crVnbk3XjpJrHsY0dIqQRNI8E7oyjJ17chOf0dhmBE=; b=pDOYVwcUCqMnmT3a2/nbC92I56X9rUZ4q+tRhhXmdOVkyUujzesGJdwnTYlXGgJ8zC wTZaVAXoC/I1oLaNHTWaNqTG8cQUYhEN4YoXpHiTi+p9AqmFAIOI6Ez13UMxwop/blZL l64QzIVtmh8e1CjAr5QZz/IYxiT9IyvuSLZqFkT7iGmDkLQJGg9/mONvoBvDeGTA6mmb gRsK0yr50ha2yqDG4uzNgfygqHeuefCl2vdcdJggjnpuMmFrz59AEXPdvrcKvNtIvGI4 wLMJQHa1U609xoPbiU6zvc2g9+Xt06tmfWq/HojaKfcKLtche6O2bkl96VI2EsvZ0oeK s1fQ== X-Forwarded-Encrypted: i=1; AJvYcCUxg29/yfSBAa4kWa3KS6tvQme1ClVxjmsuvdPUDWc8XDbnpX3me4MogBsMRHCrkfPdxN7Z+QkHwz0c9JW06w==@lists.freedesktop.org, AJvYcCVbYGpHTlUpSZeCE1c0KvRzUn6aA4Ex/VlCkpa0QOWF5kjze89dxrGyf01bpnO9pSxgTh3GgEPYpHM3@lists.freedesktop.org, AJvYcCX+N8uYhT1jzUeEjFZ+MUuxpqAWtnKjZuGUp6VRbsAZWwZXFQkbwafYqtegz+7wJpKaGxEDjY9D@lists.freedesktop.org X-Gm-Message-State: AOJu0YyD/ZimlTuGARbyJftll0f5TZ1hIaI757vQgIK4BcrHp4pwQo80 v0IxV1gxkRb2HkeIMz559K8uKDNogJOd/52awzB6ggsJu2EMzkWx X-Gm-Gg: ASbGncuN0B7TNG3FG5LMiuXx2mN4O2fAf1wFwzHyhNsee4py0tlqM+ZDxIC4nRDgKB5 As9VYBE8iooioONKfjcCTqzPmZSpSpdV/AkpMrgY9pgqDAGyR8wZyQUt4r/PtX6MVb92GkKGd9N R+RADglkhcr6rpNaqTBkJlweXTpzrzPPR6bfrZXSl3LZRkptCzMZbNmj8o+UemakLyH7JXZuYbk J5Eyum1tUmI7IECZnQjLpkfcz95nQfxRGYv6NORVolU9F0iWnJ6Ux+1SjJ4NpAQK4TsYKgluG54 H9uSxjSVwayb5kvUU2jTw8AnfzUQrEnv7ALAoSaZiEt/Y3EKvyX43GNL2IkJrC8b+deroKq2cKo bdQ== X-Google-Smtp-Source: AGHT+IExGVMuJtN5hKLJ003ECDmgVw47CrV9YfzVs9KN7730OBh4HexWxFYIN3TSQJH5oTzEZWr1LA== X-Received: by 2002:a05:6e02:4406:10b0:3d3:de5f:af25 with SMTP id e9e14a558f8ab-3d6dca86dfemr5222605ab.0.1743615755159; Wed, 02 Apr 2025 10:42:35 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:34 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 21/54] dyndbg-test: change do_prints testpoint to accept a loopct Date: Wed, 2 Apr 2025 11:41:23 -0600 Message-ID: <20250402174156.1246171-22-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" echo 1000 > /sys/module/test_dynamic_debug/parameters/do_prints This allows its use as a scriptable load generator, to generate dynamic-prefix-emits for flag combinations vs undecorated messages. This will make it easy to assess the cost of the prefixing. Reading the ./do_prints node also prints messages (once) to the-log. NB: the count is clamped to 10000, chosen to be notice able, but not annoying, and not enough to accidentally flood the logs. Signed-off-by: Jim Cromie --- lib/test_dynamic_debug.c | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 9f9e3fddd7e6..4a3d2612ef60 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -29,18 +29,30 @@ #include -/* re-gen output by reading or writing sysfs node: do_prints */ - -static void do_prints(void); /* device under test */ +/* re-trigger debug output by reading or writing sysfs node: do_prints */ +#define PRINT_CLAMP 10000 +static void do_prints(unsigned int); /* device under test */ static int param_set_do_prints(const char *instr, const struct kernel_param *kp) { - do_prints(); + int rc; + unsigned int ct; + + rc = kstrtouint(instr, 0, &ct); + if (rc) { + pr_err("expecting numeric input, using 1 instead\n"); + ct = 1; + } + if (ct > PRINT_CLAMP) { + ct = PRINT_CLAMP; + pr_info("clamping print-count to %d\n", ct); + } + do_prints(ct); return 0; } static int param_get_do_prints(char *buffer, const struct kernel_param *kp) { - do_prints(); - return scnprintf(buffer, PAGE_SIZE, "did do_prints\n"); + do_prints(1); + return scnprintf(buffer, PAGE_SIZE, "did 1 do_prints\n"); } static const struct kernel_param_ops param_ops_do_prints = { .set = param_set_do_prints, @@ -191,17 +203,20 @@ static void do_levels(void) prdbg(V7); } -static void do_prints(void) +static void do_prints(unsigned int ct) { - pr_debug("do_prints:\n"); - do_cats(); - do_levels(); + /* maybe clamp this */ + pr_debug("do-prints %d times:\n", ct); + for (; ct; ct--) { + do_cats(); + do_levels(); + } } static int __init test_dynamic_debug_init(void) { pr_debug("init start\n"); - do_prints(); + do_prints(1); pr_debug("init done\n"); return 0; } From patchwork Wed Apr 2 17:41:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036298 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 9495DC28B20 for ; Wed, 2 Apr 2025 17:42:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DE67410E886; Wed, 2 Apr 2025 17:42:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D5QbYq4V"; dkim-atps=neutral Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id DFC7610E88B; Wed, 2 Apr 2025 17:42:36 +0000 (UTC) Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3ce886a2d5bso1036225ab.1; Wed, 02 Apr 2025 10:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615756; x=1744220556; 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=UQGLHVjI88a07yAcVp1fF8AgBymHOsN5Q+DW04b0Y4E=; b=D5QbYq4VgvFahLD42z05NRhuNLAQKs7hoyFMOVYSfGVKnQdJqA69RZt9JffUSvO2Nc CluLYvfqyJE32/W11Yb7UZm4CubcelZE1FWST+dFzMuH8OlSgaIFu7A0wECrygHFQjMB gYrHgdKaB2vIiv7N+p64r4woy2BYIlCEsgF+QBFytA0PXDxWiRNXF+VCkylKIT5TAzel S1X6CWlotTfgVPNwrow1egfVM0Q4zR2MJA17RAq9mAaHUU1e89hCOezuzGC+0JeXctwX NKuElFeOUQu+zkcO0VFW7oVz0Hjflqfx8977pM07V8hlgeDWTye1EVUJB+Tg3IiKrVBi 4/CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615756; x=1744220556; 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=UQGLHVjI88a07yAcVp1fF8AgBymHOsN5Q+DW04b0Y4E=; b=GAvN29kLSVx2e4UGGovn6op/bup0HlKV8aycWr33S1dfFdUc+igN4cQgYcgLcdkWqM A1/73uhqx5weR/eSKjE+SlXdHPTcaxriy8RGTOBc8O5aZtxpgl4m+8xu6HVEdYupIRb4 sUHHQkYnTxJi4eqvDKAiFxxDJw9emljj30MX7EjgNGUdONYzlzHdSJDtYDzeva14YFvk VW5IXK533UItijf6IzfWHepiGv+OrYtfUFIokYuaKWA8JLeGk9qQng+DTg5d1emThtXf 9vOKysa1UqSJTDtL0sIdfvGz5OqDqbRLHXe3RueHKygXLBC0gIcZGdIbCpB1GUZf5+5n N92w== X-Forwarded-Encrypted: i=1; AJvYcCUmSRvrzkX0XKoYIo8u5R/DIYg/eEP2sbhP4opLLwIhSQIkRrH9IUmr1YObayW3CLDP1IOfpRRXXme3@lists.freedesktop.org, AJvYcCVWJoqRzb+ImeoRoFOiquvZEGr5+cNYsL0Veh8eFoxqe/ROMV8lfHlLXpqnUnXajaora496U6dM@lists.freedesktop.org, AJvYcCWtiW58TBglL7onr11G30PMLs/7noWbsQyQLf6ujvku+qC8CFp+OYgHR6mefJhmffF5jYp8irxJf8rpcQPmvw==@lists.freedesktop.org X-Gm-Message-State: AOJu0YwkoPykVEg5kBug81G+u8B5zoSKl9uol6XOdkHJySZXb1cDZ3fm KqLmoR1zvUf4tNN3UOT0+69pmX7f3WhAYli3YQjQ+uju8vN5KEZc X-Gm-Gg: ASbGncuO6AGzFGmA0xYSZDJl1f3bGrQHkJVhqDRMYHLtph85PpBK1XIFdv0Kxqy7wJL MFC/XUX0/zFg35ZKyWnFnzk3JOcJrIBofReuNvYqS4bWjmDhIlF+2XIgLmyh+lIsmzaV/yNGIAK Zl0GB0CY2JEjwRChh6QQNGepo7Pm4C6pvziCAm5E+XG9UiwgFCOQ07ra9pz2Hoc1mF8d+0K+lCH gjHXQf/fHiHkCcFOXzRW5wu14oWk8ftrRRZJmLYefxAq+nDm1Dg6g9bvF5raAt+rKApE+K5+krf ypBedBV6pTTGSzT+r5GOMZlNbc8/IUpKOMseXR0lV695cX7imTWEgXPblyaTOQVDHHXAGcly1ye DVw== X-Google-Smtp-Source: AGHT+IGg2nO72mRBabW+fR6wte152C7ysM+DnzAttS5d7C7TncYYuHpSkTrIvw9MuJ6wmrNNEvVwNQ== X-Received: by 2002:a05:6e02:1f0c:b0:3d4:e6:d872 with SMTP id e9e14a558f8ab-3d5e0908ce4mr198618635ab.9.1743615756093; Wed, 02 Apr 2025 10:42:36 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:35 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 , linux-doc@vger.kernel.org Subject: [PATCH v3 22/54] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Date: Wed, 2 Apr 2025 11:41:24 -0600 Message-ID: <20250402174156.1246171-23-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" move the DYNAMIC_DEBUG_CLASSMAP_PARAM macro from test-dynamic-debug.c into the header, and refine it, by distinguishing the 2 use cases: 1.DYNAMIC_DEBUG_CLASSMAP_PARAM_REF for DRM, to pass in extern __drm_debug by name. dyndbg keeps bits in it, so drm can still use it as before 2.DYNAMIC_DEBUG_CLASSMAP_PARAM new user (test_dynamic_debug) doesn't need to share state, decls a static long unsigned int to store the bitvec. __DYNAMIC_DEBUG_CLASSMAP_PARAM bottom layer - allocate,init a ddebug-class-param, module-param-cb. Modify ddebug_sync_classbits() argtype deref inside the fn, to give access to all kp members. Also clean up and improve comments in test-code, and add MODULE_DESCRIPTIONs. cc: linux-doc@vger.kernel.org Signed-off-by: Jim Cromie --- -v9 - fixup drm-print.h add PARAM_REF forwarding macros with DYNAMIC_DEBUG_CLASSMAP_PARAM_REF in the API, add DRM_ variant --- include/linux/dynamic_debug.h | 38 +++++++++++++++++++++ lib/dynamic_debug.c | 60 ++++++++++++++++++++++----------- lib/test_dynamic_debug.c | 47 ++++++++++---------------- lib/test_dynamic_debug_submod.c | 9 ++++- 4 files changed, 104 insertions(+), 50 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 4941ef2adb46..ce221a702f84 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -211,6 +211,44 @@ struct _ddebug_class_param { const struct _ddebug_class_map *map; }; +/** + * DYNAMIC_DEBUG_CLASSMAP_PARAM - control a ddebug-classmap from a sys-param + * @_name: sysfs node name + * @_var: name of the classmap var defining the controlled classes/bits + * @_flags: flags to be toggled, typically just 'p' + * + * Creates a sysfs-param to control the classes defined by the + * exported classmap, with bits 0..N-1 mapped to the classes named. + * This version keeps class-state in a private long int. + */ +#define DYNAMIC_DEBUG_CLASSMAP_PARAM(_name, _var, _flags) \ + static unsigned long _name##_bvec; \ + __DYNAMIC_DEBUG_CLASSMAP_PARAM(_name, _name##_bvec, _var, _flags) + +/** + * DYNAMIC_DEBUG_CLASSMAP_PARAM_REF - wrap a classmap with a controlling sys-param + * @_name: sysfs node name + * @_bits: name of the module's unsigned long bit-vector, ex: __drm_debug + * @_var: name of the (exported) classmap var defining the classes/bits + * @_flags: flags to be toggled, typically just 'p' + * + * Creates a sysfs-param to control the classes defined by the + * exported clasmap, with bits 0..N-1 mapped to the classes named. + * This version keeps class-state in user @_bits. This lets drm check + * __drm_debug elsewhere too. + */ +#define DYNAMIC_DEBUG_CLASSMAP_PARAM_REF(_name, _bits, _var, _flags) \ + __DYNAMIC_DEBUG_CLASSMAP_PARAM(_name, _bits, _var, _flags) + +#define __DYNAMIC_DEBUG_CLASSMAP_PARAM(_name, _bits, _var, _flags) \ + static struct _ddebug_class_param _name##_##_flags = { \ + .bits = &(_bits), \ + .flags = #_flags, \ + .map = &(_var), \ + }; \ + module_param_cb(_name, ¶m_ops_dyndbg_classes, \ + &_name##_##_flags, 0600) + /* * pr_debug() and friends are globally enabled or modules have selectively * enabled them. diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 56b503af0b31..0d603caadef8 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -666,6 +666,30 @@ static int ddebug_apply_class_bitmap(const struct _ddebug_class_param *dcp, #define CLASSMAP_BITMASK(width) ((1UL << (width)) - 1) +static void ddebug_class_param_clamp_input(unsigned long *inrep, const struct kernel_param *kp) +{ + const struct _ddebug_class_param *dcp = kp->arg; + const struct _ddebug_class_map *map = dcp->map; + + switch (map->map_type) { + case DD_CLASS_TYPE_DISJOINT_BITS: + /* expect bits. mask and warn if too many */ + if (*inrep & ~CLASSMAP_BITMASK(map->length)) { + pr_warn("%s: input: 0x%lx exceeds mask: 0x%lx, masking\n", + KP_NAME(kp), *inrep, CLASSMAP_BITMASK(map->length)); + *inrep &= CLASSMAP_BITMASK(map->length); + } + break; + case DD_CLASS_TYPE_LEVEL_NUM: + /* input is bitpos, of highest verbosity to be enabled */ + if (*inrep > map->length) { + pr_warn("%s: level:%ld exceeds max:%d, clamping\n", + KP_NAME(kp), *inrep, map->length); + *inrep = map->length; + } + break; + } +} static int param_set_dyndbg_module_classes(const char *instr, const struct kernel_param *kp, const char *mod_name) @@ -684,26 +708,15 @@ static int param_set_dyndbg_module_classes(const char *instr, pr_err("expecting numeric input, not: %s > %s\n", instr, KP_NAME(kp)); return -EINVAL; } + ddebug_class_param_clamp_input(&inrep, kp); switch (map->map_type) { case DD_CLASS_TYPE_DISJOINT_BITS: - /* expect bits. mask and warn if too many */ - if (inrep & ~CLASSMAP_BITMASK(map->length)) { - pr_warn("%s: input: 0x%lx exceeds mask: 0x%lx, masking\n", - KP_NAME(kp), inrep, CLASSMAP_BITMASK(map->length)); - 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); *dcp->bits = inrep; break; case DD_CLASS_TYPE_LEVEL_NUM: - /* input is bitpos, of highest verbosity to be enabled */ - if (inrep > map->length) { - pr_warn("%s: level:%ld exceeds max:%d, clamping\n", - KP_NAME(kp), inrep, map->length); - inrep = map->length; - } 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)); @@ -1171,15 +1184,24 @@ static const struct proc_ops proc_fops = { static void ddebug_sync_classbits(const struct kernel_param *kp, const char *modname) { const struct _ddebug_class_param *dcp = kp->arg; + unsigned long new_bits; - /* clamp initial bitvec, mask off hi-bits */ - if (*dcp->bits & ~CLASSMAP_BITMASK(dcp->map->length)) { - *dcp->bits &= CLASSMAP_BITMASK(dcp->map->length); - v2pr_info("preset classbits: %lx\n", *dcp->bits); + ddebug_class_param_clamp_input(dcp->bits, kp); + + switch (dcp->map->map_type) { + case DD_CLASS_TYPE_DISJOINT_BITS: + v2pr_info(" %s: classbits: 0x%lx\n", KP_NAME(kp), *dcp->bits); + ddebug_apply_class_bitmap(dcp, dcp->bits, 0UL, modname); + break; + case DD_CLASS_TYPE_LEVEL_NUM: + new_bits = CLASSMAP_BITMASK(*dcp->lvl); + v2pr_info(" %s: lvl:%ld bits:0x%lx\n", KP_NAME(kp), *dcp->lvl, new_bits); + ddebug_apply_class_bitmap(dcp, &new_bits, 0UL, modname); + break; + default: + pr_err("bad map type %d\n", dcp->map->map_type); + return; } - /* force class'd prdbgs (in USEr module) to match (DEFINEr module) class-param */ - ddebug_apply_class_bitmap(dcp, dcp->bits, ~0, modname); - ddebug_apply_class_bitmap(dcp, dcp->bits, 0, modname); } static void ddebug_match_apply_kparam(const struct kernel_param *kp, diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c index 4a3d2612ef60..78cf5420770a 100644 --- a/lib/test_dynamic_debug.c +++ b/lib/test_dynamic_debug.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Kernel module for testing dynamic_debug + * Kernel module to test/demonstrate dynamic_debug features, + * particularly classmaps and their support for subsystems like DRM. * * Authors: * Jim Cromie @@ -62,24 +63,6 @@ module_param_cb(do_prints, ¶m_ops_do_prints, NULL, 0600); #define CLASSMAP_BITMASK(width, base) (((1UL << (width)) - 1) << (base)) -/* sysfs param wrapper, proto-API */ -#define DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, _init) \ - static unsigned long bits_##_model = _init; \ - static struct _ddebug_class_param _flags##_##_model = { \ - .bits = &bits_##_model, \ - .flags = #_flags, \ - .map = &map_##_model, \ - }; \ - module_param_cb(_flags##_##_model, ¶m_ops_dyndbg_classes, \ - &_flags##_##_model, 0600) -#ifdef DEBUG -#define DYNAMIC_DEBUG_CLASSMAP_PARAM(_model, _flags) \ - DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, ~0) -#else -#define DYNAMIC_DEBUG_CLASSMAP_PARAM(_model, _flags) \ - DYNAMIC_DEBUG_CLASSMAP_PARAM_(_model, _flags, 0) -#endif - /* * Demonstrate/test DISJOINT & LEVEL typed classmaps with a sys-param. * @@ -110,12 +93,15 @@ enum cat_disjoint_bits { /* numeric verbosity, V2 > V1 related. V0 is > D2_DRM_RES */ enum cat_level_num { V0 = 16, V1, V2, V3, V4, V5, V6, V7 }; -/* recapitulate DRM's multi-classmap setup */ +/* + * use/demonstrate multi-module-group classmaps, as for DRM + */ #if !defined(TEST_DYNAMIC_DEBUG_SUBMOD) /* - * In single user, or parent / coordinator (drm.ko) modules, define - * classmaps on the client enums above, and then declares the PARAMS - * ref'g the classmaps. Each is exported. + * For module-groups of 1+, define classmaps with names (stringified + * enum-symbols) copied from above. 1-to-1 mapping is recommended. + * The classmap is exported, so that other modules in the group can + * link to it and control their prdbgs. */ DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_disjoint_bits, DD_CLASS_TYPE_DISJOINT_BITS, D2_CORE, @@ -134,11 +120,13 @@ DYNAMIC_DEBUG_CLASSMAP_DEFINE(map_level_num, DD_CLASS_TYPE_LEVEL_NUM, V0, "V0", "V1", "V2", "V3", "V4", "V5", "V6", "V7"); /* - * now add the sysfs-params + * for use-cases that want it, provide a sysfs-param to set the + * classes in the classmap. It is at this interface where the + * "v3>v2" property is applied to DD_CLASS_TYPE_LEVEL_NUM inputs. */ -DYNAMIC_DEBUG_CLASSMAP_PARAM(disjoint_bits, p); -DYNAMIC_DEBUG_CLASSMAP_PARAM(level_num, p); +DYNAMIC_DEBUG_CLASSMAP_PARAM(p_disjoint_bits, map_disjoint_bits, p); +DYNAMIC_DEBUG_CLASSMAP_PARAM(p_level_num, map_level_num, p); #ifdef FORCE_CLASSID_CONFLICT /* @@ -149,12 +137,10 @@ DYNDBG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE"); #endif #else /* TEST_DYNAMIC_DEBUG_SUBMOD */ - /* - * in submod/drm-drivers, use the classmaps defined in top/parent - * module above. + * the +1 members of a multi-module group refer to the classmap + * DEFINEd (and exported) above. */ - DYNAMIC_DEBUG_CLASSMAP_USE(map_disjoint_bits); DYNAMIC_DEBUG_CLASSMAP_USE(map_level_num); @@ -229,6 +215,7 @@ static void __exit test_dynamic_debug_exit(void) module_init(test_dynamic_debug_init); module_exit(test_dynamic_debug_exit); +MODULE_DESCRIPTION("test/demonstrate dynamic-debug features"); MODULE_AUTHOR("Jim Cromie "); MODULE_DESCRIPTION("Kernel module for testing dynamic_debug"); MODULE_LICENSE("GPL"); diff --git a/lib/test_dynamic_debug_submod.c b/lib/test_dynamic_debug_submod.c index 672aabf40160..3adf3925fb86 100644 --- a/lib/test_dynamic_debug_submod.c +++ b/lib/test_dynamic_debug_submod.c @@ -1,6 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Kernel module for testing dynamic_debug + * Kernel module to test/demonstrate dynamic_debug features, + * particularly classmaps and their support for subsystems, like DRM, + * which defines its drm_debug classmap in drm module, and uses it in + * helpers & drivers. * * Authors: * Jim Cromie @@ -12,3 +15,7 @@ */ #define TEST_DYNAMIC_DEBUG_SUBMOD #include "test_dynamic_debug.c" + +MODULE_DESCRIPTION("test/demonstrate dynamic-debug subsystem support"); +MODULE_AUTHOR("Jim Cromie "); +MODULE_LICENSE("GPL"); From patchwork Wed Apr 2 17:41:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036301 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 05343C3601B for ; Wed, 2 Apr 2025 17:42:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 573CA10E895; Wed, 2 Apr 2025 17:42:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aB0kE5rM"; dkim-atps=neutral Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id F2BD010E88B; Wed, 2 Apr 2025 17:42:37 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3ce87d31480so492435ab.2; Wed, 02 Apr 2025 10:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615757; x=1744220557; 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=eURkwPwKw4vTaVpJGMjl6Mz91xCr+xlab1qXSWsbeFY=; b=aB0kE5rM7oMRtRdCP0OCHuR3l4OmBwZKB8JXaY5ct3e1Flg15E3yHqrc+oI+tYm9ox I3ebkgBD/xuZRfUZ74wipdMOwiCvE48ZinjtKoYhJkExQ7aZQkqWen+7x8DedLu3rzru lrqNtnjn4jXXO5fYVpxtOLQpYUOi1DnqTIUcdL1EU88YfJXrvFO6GIIQJiJgvdV091Eu 7OTmsFFRJ8haW1+oOAnqgf3povuUizAX/kRYr2vJl/rOBPfz/nTkiRsjIsAMDLIqIajx 8TmAtzmnxiadibLoat1F0pK9PULDZvCqK0tuwplTBV0y1jJPnK5n+cmRthbAz5M0D03g Ffww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615757; x=1744220557; 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=eURkwPwKw4vTaVpJGMjl6Mz91xCr+xlab1qXSWsbeFY=; b=fyKlKXUJeX06cI8luiWJ0+WEFmTuGocQwXnXFcSCXMkqp5l/AAe8Z18ZUcVM1tqfOS y1HStuzVmTrLVyyNQQkbJ/JLjpT5TBJC/0Tj8FjZAZYcIpMOgoxwqQFmZFBnD4pn2moi cxtYQz2WxZO98PcEBvDoRgzudl3L9wDLY/00dkya0O/bWXXhhUpHBTOUfMglpilQ2Cyu nXbnvcOGLPEoDg5nHiQxVKCq+fVP9mpyv8KvJjXUORXxEPK5XxbbuDbyOCn06/VUl3ap DYuaMWw72bSUTBCDzX1Pl1syyYYUbvSS9dnSXlUBV7rsisVneWI+uO8o3ZNitEKp8hdf 4C1g== X-Forwarded-Encrypted: i=1; AJvYcCUP9+3bPHUuSjCRly265IlTo032eCgSc/abJKwnKwShp5oLKsJURLqbweiu/R5Oa7xfmJE0ZJ7It9TXoK7ZHA==@lists.freedesktop.org, AJvYcCVcfwi1nb3pimDs1HVRLrBglWT0R9E2k40ukXxhMmpjVQxBHH9mFwcoMgO77hM3GxN78SsWZYqrfvSV@lists.freedesktop.org, AJvYcCXLXf+7FCWr0OPT7lYJtRdbGmnN0mfxyCnZHVaPSfMol0wg2hfBiRA1fQORYV0pUMHqe5jdxtsa@lists.freedesktop.org X-Gm-Message-State: AOJu0YzXlqfC4v19pdUgH1cQYxF8yEaqs9AqBx8RFiU6+AOiexQECC72 RZvzTBD7hk8sShf7cAkc+KDfN9/LfNW40pGyZxjonmJucUsg3daN X-Gm-Gg: ASbGncsfe8n4Gdp2+FA9nhnRKRqm3lkjAu5sCiBxyWeBz44TQwHtygRkfgsIPXGyck8 PKNAuFhX0DjZ4StZi5cxC5fMZ2cMRjYCShDlW/iKLhDynRXFJfJEJDuzOBTMZP+3b2IoTQ416iC qtHjwvmCMk2krIW1ry6WIjkbdPa9raXfO+0VlR7VrWzDxatZRRho5rku7XXdSAYVAe+MqWj2iF5 IZ4y9oeC1FSRh6VPyNkFSz6C5O5Ej3TEAhDfOUxspErnke3jypJ9blRA+0cd2A0hXWS+Xg8CSzr W+hEI7WpvZAewKUw3eoA/8aZpEC+LcBaVHA1a21FwxK0qCsglfmHqJ8JpfTwTrLtKtGRLiJPE96 aDQ== X-Google-Smtp-Source: AGHT+IFOwJqxt3+Bc5BjTaI4wehPC3f7tDSqG024LF0DEkHz1iw3TJJMpnglnawcz+3wXnO3Ge6iQQ== X-Received: by 2002:a05:6e02:c:b0:3d1:a34b:4d01 with SMTP id e9e14a558f8ab-3d5e09090famr201375295ab.8.1743615757146; Wed, 02 Apr 2025 10:42:37 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:36 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 23/54] dyndbg: treat comma as a token separator Date: Wed, 2 Apr 2025 11:41:25 -0600 Message-ID: <20250402174156.1246171-24-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Treat comma as a token terminator, just like a space. This allows a user to avoid quoting hassles when spaces are otherwise needed: :#> modprobe drm dyndbg=class,DRM_UT_CORE,+p\;class,DRM_UT_KMS,+p or as a boot arg: drm.dyndbg=class,DRM_UT_CORE,+p # todo: support multi-query here Given the many ways a boot-line +args can be assembled and then passed in/down/around shell based tools, this may allow side-stepping all sorts of quoting hassles thru those layers. existing query format: modprobe test_dynamic_debug dyndbg="class D2_CORE +p" new format: modprobe test_dynamic_debug dyndbg=class,D2_CORE,+p ALSO selftests-dyndbg: add comma_terminator_tests New fn validates parsing and effect of queries using combinations of commas and spaces to delimit the tokens. It manipulates pr-debugs in builtin module/params, so might have deps I havent foreseen on odd configurations. Signed-off-by: Jim Cromie Co-developed-by: Łukasz Bartosik Signed-off-by: Łukasz Bartosik --- - skip comma tests if no builtins -v3 squash in tests and doc --- .../admin-guide/dynamic-debug-howto.rst | 9 +++++--- lib/dynamic_debug.c | 17 +++++++++++---- .../dynamic_debug/dyndbg_selftest.sh | 21 ++++++++++++++++++- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 63a511f2337b..e2dbb5d9b314 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -78,11 +78,12 @@ Command Language Reference ========================== At the basic lexical level, a command is a sequence of words separated -by spaces or tabs. So these are all equivalent:: +by spaces, tabs, or commas. So these are all equivalent:: :#> ddcmd file svcsock.c line 1603 +p :#> ddcmd "file svcsock.c line 1603 +p" :#> ddcmd ' file svcsock.c line 1603 +p ' + :#> ddcmd file,svcsock.c,line,1603,+p Command submissions are bounded by a write() system call. Multiple commands can be written together, separated by ``;`` or ``\n``:: @@ -167,9 +168,11 @@ module The given string is compared against the module name of each callsite. The module name is the string as seen in ``lsmod``, i.e. without the directory or the ``.ko`` - suffix and with ``-`` changed to ``_``. Examples:: + suffix and with ``-`` changed to ``_``. - module sunrpc + Examples:: + + module,sunrpc # with ',' as token separator module nfsd module drm* # both drm, drm_kms_helper diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 0d603caadef8..5737f1b4eba8 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -299,6 +299,14 @@ static int ddebug_change(const struct ddebug_query *query, struct flag_settings return nfound; } +static char *skip_spaces_and_commas(const char *str) +{ + str = skip_spaces(str); + while (*str == ',') + str = skip_spaces(++str); + return (char *)str; +} + /* * Split the buffer `buf' into space-separated words. * Handles simple " and ' quoting, i.e. without nested, @@ -312,8 +320,8 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords) while (*buf) { char *end; - /* Skip leading whitespace */ - buf = skip_spaces(buf); + /* Skip leading whitespace and comma */ + buf = skip_spaces_and_commas(buf); if (!*buf) break; /* oh, it was trailing whitespace */ if (*buf == '#') @@ -329,7 +337,7 @@ static int ddebug_tokenize(char *buf, char *words[], int maxwords) return -EINVAL; /* unclosed quote */ } } else { - for (end = buf; *end && !isspace(*end); end++) + for (end = buf; *end && !isspace(*end) && *end != ','; end++) ; if (end == buf) { pr_err("parse err after word:%d=%s\n", nwords, @@ -601,7 +609,8 @@ static int ddebug_exec_queries(char *query, const char *modname) if (split) *split++ = '\0'; - query = skip_spaces(query); + query = skip_spaces_and_commas(query); + if (!query || !*query || *query == '#') continue; diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index 465fad3f392c..c7bf521f36ee 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -216,7 +216,7 @@ function check_err_msg() { function basic_tests { echo -e "${GREEN}# BASIC_TESTS ${NC}" if [ $LACK_DD_BUILTIN -eq 1 ]; then - echo "SKIP" + echo "SKIP - test requires params, which is a builtin module" return fi ddcmd =_ # zero everything @@ -238,8 +238,27 @@ EOF ddcmd =_ } +function comma_terminator_tests { + echo -e "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}" + if [ $LACK_DD_BUILTIN -eq 1 ]; then + echo "SKIP - test requires params, which is a builtin module" + return + fi + # try combos of spaces & commas + check_match_ct '\[params\]' 4 -r + ddcmd module,params,=_ # commas as spaces + ddcmd module,params,+mpf # turn on module's pr-debugs + check_match_ct =pmf 4 + ddcmd ,module ,, , params, -p + check_match_ct =mf 4 + ddcmd " , module ,,, , params, -m" # + check_match_ct =f 4 + ddcmd =_ +} + tests_list=( basic_tests + comma_terminator_tests ) # Run tests From patchwork Wed Apr 2 17:41:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036303 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 E0DEFC36014 for ; Wed, 2 Apr 2025 17:42:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7AD2510E885; Wed, 2 Apr 2025 17:42:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gqmz/LOp"; dkim-atps=neutral Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id D726310E897; Wed, 2 Apr 2025 17:42:38 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3d46ef71b6cso823455ab.3; Wed, 02 Apr 2025 10:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615758; x=1744220558; 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=ucC/m8VvNwawJ172sGBJnoV5QJtRGG6wMlODfeStmbw=; b=gqmz/LOpzHxy1oUVIYW1IxA8xQA7oob/4O7lgcFsnz6bTseHRpVyoIHimY1H4V+i0u Yodlntj7Ly+4HBOl06Z+afAzsPBEORKjXDHpyqGvSLvz76Sj5Z/XJoIYD61L0pOWwhjI nqscb3uL65yiMn0zptuF9obs0FCcU8ttPoTzMduVjbbbOUxxHVoBbNGs/HQhi4pLCFTR pnO0WuX9I7zKFiCCk2Cy7kqIEJUbUg0ty0E8qVCEpm9vPrcRDqFnEohhr/bBt6OiXQDD dTVPRXdEQoWa0UrMm/YAVJU1X50oD5ZZsO1hjgr/e+0l/3lZGSIm2tIAtroGG8k/p5IQ shZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615758; x=1744220558; 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=ucC/m8VvNwawJ172sGBJnoV5QJtRGG6wMlODfeStmbw=; b=h4UY101u//9FZhuEtVWiZTZSNTuTsx7ptHRR2MFYxjvhUL57qvqMXICam11GSvLt5q dRb36OGpfKLSsNqDy++9C/KJyRUu3GX4qek5RK8iIBchkKW9MzdhdkEyceiJwi40bhT7 Y9J7hgYbFy41wpZMhmirl/Rf4QjxFBWhMKLaK6Q8D26dnsaQaDIZ5hUqSn+BSTaRrNRU /4SUFJbvmPEQry49Zq13NvwMtH8fC2z4mAs2U8ijM4CgNbtb4UYRhp4aZB/IoL/fFkUO DTdPbJ239+alu+aPCDJp6zWbC+FKPuTwkb2NSMav/JCEpTxBj6n5T769P8zO2Pip3W0F Oj1Q== X-Forwarded-Encrypted: i=1; AJvYcCU37lO5kv4ZSGoy0IldQs/qKz391707lhTFtZtWkklQkLa1suXjoL9010aS8rrVJgnsof/yBaS4@lists.freedesktop.org, AJvYcCVp6Qb401umOJ3G0z+9FK4YJaP/cS6mbEF8Y1wlB/4xrc6RRKjq9nIo5h7WgBnvesGWFvCAuzfdXkftoXRU2Q==@lists.freedesktop.org, AJvYcCW+iEOLMcKqNL7fm/bpKs7D0dDqQ9WpqhR6vGV8sjQGaY041HREdWzgUaHNbZToRcY9AibHIqrtX7LF@lists.freedesktop.org X-Gm-Message-State: AOJu0YyU/rP/r9gz/q0YokP9wy9ubnriQkOk40l4OZvOuSoX5yVja91F ZVTf+GNo/eQvSHHUR1E+eY5bkLJU3oX8pFDOfhF9y223yePHSCms X-Gm-Gg: ASbGncsNSZqASOaeJN35UtWadoJe16pd73ClodibJSFGB2YJGNZlEBINeH3uqDtc/Ej axu/xqEEMLIx4bs4L3YIlCkgaL9786FOpjyyyXNaS6la8BueyI+3dVyRJyoxEDmcungXoo1itGL O7JUHb8cH2T74hTa/41fqHyfwFukbiNLYC7OsAZu6kcT0Ylqbf0Rr/XahnDLdDCLgiY1jjomr8v Kx/cROT8izy+NvTIBUCHAcyBNf5rHDPY2JMJkbGr4l2aPGgEzN1dLahm6IvwWG6wfOM1LeERFz3 JBrhcLTc/A7O9fdD0ovQysmvfZqocTCswNZIprsTYJb3Tfa4HgvXlmK/3eNybwFf5A9KCMR764F iUw== X-Google-Smtp-Source: AGHT+IF/XWq8cu039JozjszDLRHZIQvsUr2yI7oC7chl8Xer0eG1cUzokFxTUnVEktkBv7Bfp+A18w== X-Received: by 2002:a05:6e02:1849:b0:3d0:19c6:c9e1 with SMTP id e9e14a558f8ab-3d6ca5f84eemr79178055ab.13.1743615758138; Wed, 02 Apr 2025 10:42:38 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:37 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 24/54] dyndbg: split multi-query strings with % Date: Wed, 2 Apr 2025 11:41:26 -0600 Message-ID: <20250402174156.1246171-25-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Since commit 85f7f6c0edb8 ("dynamic_debug: process multiple debug-queries on a line") Multi-query commands have been allowed: modprobe drm dyndbg="class DRM_UT_CORE +p; class DRM_UT_KMS +p" modprobe drm dyndbg=< [ 203.902703] dyndbg: query parse failed [ 203.902871] dyndbg: processed 2 queries, with 0 matches, 2 errs bash: echo: write error: Invalid argument The '%' splits the input into 2 queries, and both fail. Given the limited utility of matching against the working parts of a format string "foo: %d bar %s", nothing is actually lost here. selftests-dyndbg: test_percent_splitting This does basic testing of classmaps using '%' separated multi-queries. It modprobes test_dynamic_debug with several classes enabled, and counts to verify that the expected sites show the enablement in the control file. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- -v3 squash feature, test, doc together gate new test, which needs test-dynamic-debug.ko test-percent-escape --- .../admin-guide/dynamic-debug-howto.rst | 8 ++++--- lib/dynamic_debug.c | 2 +- .../dynamic_debug/dyndbg_selftest.sh | 24 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index e2dbb5d9b314..1ceadf4f28f9 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -85,10 +85,12 @@ by spaces, tabs, or commas. So these are all equivalent:: :#> ddcmd ' file svcsock.c line 1603 +p ' :#> ddcmd file,svcsock.c,line,1603,+p -Command submissions are bounded by a write() system call. -Multiple commands can be written together, separated by ``;`` or ``\n``:: +Command submissions are bounded by a write() system call. Multiple +commands can be written together, separated by ``%``, ``;`` or ``\n``:: - :#> ddcmd "func pnpacpi_get_resources +p; func pnp_assign_mem +p" + :#> ddcmd func foo +p % func bar +p + :#> ddcmd func foo +p \; func bar +p + :#> ddcmd "func foo +p ; func bar +p" :#> ddcmd <<"EOC" func pnpacpi_get_resources +p func pnp_assign_mem +p diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 5737f1b4eba8..7a60088a1b5c 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -605,7 +605,7 @@ static int ddebug_exec_queries(char *query, const char *modname) int i, errs = 0, exitcode = 0, rc, nfound = 0; for (i = 0; query; query = split) { - split = strpbrk(query, ";\n"); + split = strpbrk(query, "%;\n"); if (split) *split++ = '\0'; diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index c7bf521f36ee..513f6cb1db1d 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -256,9 +256,33 @@ function comma_terminator_tests { ddcmd =_ } +function test_percent_splitting { + echo -e "${GREEN}# TEST_PERCENT_SPLITTING - multi-command splitting on % ${NC}" + if [ $LACK_TMOD -eq 1 ]; then + echo "SKIP - test requires test-dynamic-debug.ko" + return + fi + ifrmmod test_dynamic_debug_submod + ifrmmod test_dynamic_debug + ddcmd =_ + modprobe test_dynamic_debug dyndbg=class,D2_CORE,+pf%class,D2_KMS,+pt%class,D2_ATOMIC,+pm + check_match_ct =pf 1 + check_match_ct =pt 1 + check_match_ct =pm 1 + check_match_ct test_dynamic_debug 23 -r + # add flags to those callsites + ddcmd class,D2_CORE,+mf%class,D2_KMS,+lt%class,D2_ATOMIC,+ml + check_match_ct =pmf 1 + check_match_ct =plt 1 + check_match_ct =pml 1 + check_match_ct test_dynamic_debug 23 -r + ifrmmod test_dynamic_debug +} + tests_list=( basic_tests comma_terminator_tests + test_percent_splitting ) # Run tests From patchwork Wed Apr 2 17:41:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036304 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 EF243C3601B for ; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 359AD10E89E; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AApOTstJ"; dkim-atps=neutral Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id ED25210E89A; Wed, 2 Apr 2025 17:42:39 +0000 (UTC) Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-3d589ed2b47so469735ab.2; Wed, 02 Apr 2025 10:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615759; x=1744220559; 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=ImilXtuxs5UykdZVkLyjXnRTikwvIK4nE+zQcHkVhFU=; b=AApOTstJYiQ4ikZwvKVFDAFN4sXepwVFN9WDXycBRjLgTHsFO69avOJl1zEiW9ZA4h gMAT08tOuP+Hk5gIUI9FF18TKLWlGGMdUYwZzQY4uSzUw8/YaMw6lgSf4SOleGobuSGs 8quoy+S/3gXD8DGRZih2AJoviHTWibh+bVA+Dq0Av2MoM5zhLz510Duqy4kUm1SIzCIg Hlh42m8p7Cx2VaM4BhVC09fmiD65ux/qFk6LrJTqqmN4M7bGcdQ44e9OtbpJylf3Drik As9OyLBntc205HkXtYGtx2ldvd02WMc3CbU/NDzmWCEq8uG5jbhUji+3r8Hmx+f2jlyV YyrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615759; x=1744220559; 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=ImilXtuxs5UykdZVkLyjXnRTikwvIK4nE+zQcHkVhFU=; b=X9XkXRt4uCwz/oEXNxLJOKInnbwJ9KS3/b1W6fYY3KUqfbaJiTuQ14NElecmUvGcmg Zou5mxZIjMFP1cLrufwk+jk+mVyUOxS/zKq6ZJ2LxChYfl54Xdv8qmVLbmyuAztHAL/i tK8w1bM7zH09451lkCRhXbdcb5BWtVrG/c/FvxztotM8soF89e5hxkO1K7kchKC84Ddm CTK4ARgCLyDnr/QyCbimrkS2lmbZCVkOjgcedGLw4sTOXvuMKjBaXvQ0zuIHgS1N3X1K dKxgnzPtX7qHE1WNJiqJCs9qDqWWW5UEI0oMthmbGoBEnAskvA+KdGnq+wSYH7SkGtRT V3GQ== X-Forwarded-Encrypted: i=1; AJvYcCUEleRphmezL5hUWIjUsNMVh1uy0v8p9ZamUK2h7qMy51I/nLRIuLO7767mNsIJuCBktnYHpzcW@lists.freedesktop.org, AJvYcCXC5F0Au4n6PfLbKczsa0fpqu8mjOpMang0KOw78bPE/dl1PleW79YZtr/Afzpd4d9zGE/q/4BHTa5r@lists.freedesktop.org, AJvYcCXCx9PHCgu3ho9wwMw8wUtSJPox14jIlPDze+pmcG7eTVJkK3phn1KPHUVAqf6TVHADMU1qRDvAC9FuB7dnPw==@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywqri2S4iBO9iqrYvKhfZeu5IR3KPRLw6T6OIDq67P8dWYye3iq oJrmvOYdzngD65CcHiYbX9dhCMwsub+RtgO+0Ri0ojRf18+nR3Aj X-Gm-Gg: ASbGncsjYRbEQgakjkwX+ITOxC2sXF7Xlk+ibK+b8hi71tr1d/UiQCsuDIiJML1rEU2 +jb1UYru4jlPo4G6hqIdMfyhC8mEEkemi2KfB42Uc4/NeD7LnbPHXBXQxQoLqM2X77C0GbW1Jcn jVhJp4UDRvKFct3B86PkjXPxJgujBs93xB4LoH+vRCU0xjzjQigKjXOLPTfb2EMg80bUNhWCoWa 0jKIAhHE9SKseRktGtIEedD4kw2tqWaIhErtqye+6WQPVIQpSmNC672EIjzKxyFjISvPjVeIBHr AcvCgj7j7wX5MCL6pgxn7PqPtPoZBYwnffEnDz4gZ3Di2pUHFtKB+l5jqcTKrc2V4PPcnWCv2Af 1pw== X-Google-Smtp-Source: AGHT+IE0+XTb679NRDlwHvBKShIbNYwOqIHu3Kb2Ud4uaIbrPaynJg2DfA762m7J7fFxbGsQC+M3Yw== X-Received: by 2002:a05:6e02:4401:20b0:3d6:d838:8ba9 with SMTP id e9e14a558f8ab-3d6d8389342mr21563885ab.1.1743615759159; Wed, 02 Apr 2025 10:42:39 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:38 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 25/54] selftests-dyndbg: add test_mod_submod Date: Wed, 2 Apr 2025 11:41:27 -0600 Message-ID: <20250402174156.1246171-26-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" This new test-fn runs 3 module/submodule modprobe scenarios, variously using both the generic dyndbg= modprobe arg, and the test-module's classmap-params to manipulate the test-mod*'s pr_debugs. In all cases, the current flag-settings are counted and tested vs expectations. The 3rd scenario recapitulates the DRM_USE_DYNAMIC_DEBUG=y failure. 1. 2 modprobes (super then sub), with separate dyndbg=class-settings check module specific flag settings 2. modprobe submod, supermod is auto-loaded set supermod class-params check expected enablements in super & submod 3. modprobe super, with param=setting (like drm.debug=0x1ef) modprobe submod validate submod's class'd pr_debugs get properly enabled The test uses multi-queries, with both commas and percents (to avoid spaces and quoting). This is the main reason the test wasn't earlier in the patchset, closer to the classmap patches its validating. With some tedium, the tests could be refactored to split out early tests which avoid multi-cmds, and test only the class-params. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- r3 - skip test if LACK_TMOD older drop -v used in test_mod_submod(). V=1 does it for whole test ifrmmod at test end (Lukasz) test-mod-tmod --- .../dynamic_debug/dyndbg_selftest.sh | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index 513f6cb1db1d..09937dca3056 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -279,10 +279,83 @@ function test_percent_splitting { ifrmmod test_dynamic_debug } +function test_mod_submod { + echo -e "${GREEN}# TEST_MOD_SUBMOD ${NC}" + if [ $LACK_TMOD -eq 1 ]; then + echo "SKIP - test requires test-dynamic-debug.ko" + return + fi + ifrmmod test_dynamic_debug_submod + ifrmmod test_dynamic_debug + ddcmd =_ + + # modprobe with class enablements + modprobe test_dynamic_debug \ + dyndbg=class,D2_CORE,+pf%class,D2_KMS,+pt%class,D2_ATOMIC,+pm + + check_match_ct '\[test_dynamic_debug\]' 23 -r + check_match_ct =pf 1 + check_match_ct =pt 1 + check_match_ct =pm 1 + + modprobe test_dynamic_debug_submod + check_match_ct test_dynamic_debug_submod 23 -r + check_match_ct '\[test_dynamic_debug\]' 23 -r + check_match_ct test_dynamic_debug 46 -r + + # no enablements propagate here + check_match_ct =pf 1 + check_match_ct =pt 1 + check_match_ct =pm 1 + + # change classes again, this time submod too + ddcmd class,D2_CORE,+mf%class,D2_KMS,+lt%class,D2_ATOMIC,+ml "# add some prefixes" + check_match_ct =pmf 1 + check_match_ct =plt 1 + check_match_ct =pml 1 + # submod changed too + check_match_ct =mf 1 + check_match_ct =lt 1 + check_match_ct =ml 1 + + # now work the classmap-params + # fresh start, to clear all above flags (test-fn limits) + ifrmmod test_dynamic_debug_submod + ifrmmod test_dynamic_debug + modprobe test_dynamic_debug_submod # get supermod too + + echo 1 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits + echo 4 > /sys/module/test_dynamic_debug/parameters/p_level_num + # 2 mods * ( V1-3 + D2_CORE ) + check_match_ct =p 8 + echo 3 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits + echo 0 > /sys/module/test_dynamic_debug/parameters/p_level_num + # 2 mods * ( D2_CORE, D2_DRIVER ) + check_match_ct =p 4 + echo 0x16 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits + echo 0 > /sys/module/test_dynamic_debug/parameters/p_level_num + # 2 mods * ( D2_DRIVER, D2_KMS, D2_ATOMIC ) + check_match_ct =p 6 + + # recap DRM_USE_DYNAMIC_DEBUG regression + ifrmmod test_dynamic_debug_submod + ifrmmod test_dynamic_debug + # set super-mod params + modprobe test_dynamic_debug p_disjoint_bits=0x16 p_level_num=5 + check_match_ct =p 7 + modprobe test_dynamic_debug_submod + # see them picked up by submod + check_match_ct =p 14 + ifrmmod test_dynamic_debug_submod + ifrmmod test_dynamic_debug +} + tests_list=( basic_tests + # these require test_dynamic_debug*.ko comma_terminator_tests test_percent_splitting + test_mod_submod ) # Run tests From patchwork Wed Apr 2 17:41:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036302 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 073F0C28B20 for ; Wed, 2 Apr 2025 17:42:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 223DE10E89B; Wed, 2 Apr 2025 17:42:41 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="C/0/R564"; dkim-atps=neutral Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id B766910E89A; Wed, 2 Apr 2025 17:42:40 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3cf82bd380bso913535ab.0; Wed, 02 Apr 2025 10:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615760; x=1744220560; 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=/waPSOuN2eIL+7EriTAVG2KiDua5Tq+VfuPCwO/f/0I=; b=C/0/R564LtFNdJgVG/ZITVYPGKXTUfYz74VquCW5G6vzNzGmgxMeUj9foApCGFEfud XXlFzp0NvdAYKHwR2BhLaPwTyaNsk6jq92woS0of97njn3xQanG5J4KqoTQTY7qN1L48 OZi+HBGAxmWITPbZkSR4K7D4VSc6qh19qYGVng9VVLLTNydmVhvyExoATazRS8bhwLWm kCgmqvGpgrh3WcLmJkq2WNtJD1oGVyvYJevEswf0Huy5uvpFK+a8yKrpVBVXgrRJrXm2 BPJMJGnhQSaOB4vW1OnS18aiz+NgBZWlZM2grYwzBL2Y0Brsd7CprU/NkfX2B8zOE2Eu YR/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615760; x=1744220560; 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=/waPSOuN2eIL+7EriTAVG2KiDua5Tq+VfuPCwO/f/0I=; b=g7Qmi/QIxxTExIg9Z12fSvK3imBl02lKUn5G0Jl7EPgds6uJ9/eUiTDB/08vv7XppU t5U9uZBEd2bwkvGegqR7HywjFlej0YYNeQDn78iALZq/4NZmqU1MLwroexCadDRaGD3W lfv2iQTy88QeqrwTfh2/rT8Bc0SobHjqiLaTz2JY2IrB7FY7PLf1Z7lKUOzaRpl/wdDJ rLEXVDGw9yQR5LRoqsD+6R1BawAKTXoB21Msroq7h9iG7akQsAAhv5rHUX9GYflkbfpp a5W60j+g/hvUK62i2/+5x/LyBK54uhZk/k1h3U65pYzyHEhV7CN8Hhj4JCq73cTodBZF 87+g== X-Forwarded-Encrypted: i=1; AJvYcCXE32awE8decYqxKW/ji7fE00/9CNoKvnpnzrpy8ogkF9f3MFjL/crObENSbv3/5sDwBlV5aI5C0q5K@lists.freedesktop.org, AJvYcCXLnBc2MY/ffllXzcZGp+UPbUY9rM2cPS4Uq4xUovBtpMqBr5ZeY1abxzzLJVxcZd8frLBm8W0g@lists.freedesktop.org, AJvYcCXlFsBdysFrFwdz6Ac/b9u6snIv8X0qGTKtPFx5aGRF+2OeIYCIa2PN1AR9Ny4nmj7pQleckIUMDmv+C1LnvA==@lists.freedesktop.org X-Gm-Message-State: AOJu0YzZuEi4RTy7Y0Zwz4Zn+D+FbsmSlDmWIbUX5iu2vBoMb5SmNhd6 yBppSEpT0M9BTXcmW0+NZjUCe/xTOnZNsvDEZ+dP5A8TyXvDZ/O9 X-Gm-Gg: ASbGncvISMYPf53l7B2Vibkl5xSQL+ca0wfAVVpoL/fzYpio/AD2TD3FiKIVocQuwqq +aW3E0xbMQ0JjjLTyLhl4pB+9hN8js6OU136cZq2I4C9nUgmz3GGnm4+f0/VzJzpjbBr4cvQAjU kMFTGPRVi+nNKCUuiutHy22DI3MKfKj5c5xR/4unic+4p+QF8d8veq2QSjHVIqOq2/hgWr6Jis9 lAcjw9N+yLVQGJ2tEWBOu29rTApA0bjDqaQrpp6Pe6B27Ic1xaI8srGkp3ISoppfk7zLNCKs3t1 F+73AxnKGXpDKjiBtUAoPn7wGUaRxYQkbIP/AkU9YazRKdEM7n3lpAzbFnPXfoXySTiSbj+amCS L2JQV4AwrbpCm X-Google-Smtp-Source: AGHT+IG19in7YD9+mh+jCwJ3JHA6ycW6ni6Gib0Ldr3L9sgEpAkmq214gUIhXmK9w5BqErQZ9ZspIw== X-Received: by 2002:a05:6e02:2587:b0:3d4:337f:121b with SMTP id e9e14a558f8ab-3d6d54a305amr33630345ab.8.1743615759986; Wed, 02 Apr 2025 10:42:39 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:39 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 26/54] dyndbg: change __dynamic_func_call_cls* macros into expressions Date: Wed, 2 Apr 2025 11:41:28 -0600 Message-ID: <20250402174156.1246171-27-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The Xe driver's XE_IOCTL_DBG macro calls drm_dbg() from inside an if (expression). This breaks when CONFIG_DRM_USE_DYNAMIC_DEBUG=y because the invoked macro has a do-while-0 wrapper. if (cond && (drm_dbg("expr-form"),1)) { ... do some more stuff } Fix for this usage by changing __dynamic_func_call_cls{,_no_desc} macros into expressions, by replacing the do-while-0s with a ({ }) wrapper. In the common usage, the trailing ';' converts the expression into a statement. drm_dbg("statement form"); Signed-off-by: Jim Cromie --- --- include/linux/dynamic_debug.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index ce221a702f84..2d87cca27544 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -337,20 +337,20 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, * (|_cls): adds in _DPRINT_CLASS_DFLT as needed * (|_no_desc): former gets callsite descriptor as 1st arg (for prdbgs) */ -#define __dynamic_func_call_cls(id, cls, fmt, func, ...) do { \ - DEFINE_DYNAMIC_DEBUG_METADATA_CLS((id), cls, fmt); \ +#define __dynamic_func_call_cls(id, cls, fmt, func, ...) ({ \ + DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt); \ if (DYNAMIC_DEBUG_BRANCH(id)) \ - func(&id, ##__VA_ARGS__); \ -} while (0) + func(&(id), ##__VA_ARGS__); \ +}) #define __dynamic_func_call(id, fmt, func, ...) \ __dynamic_func_call_cls(id, _DPRINTK_CLASS_DFLT, fmt, \ func, ##__VA_ARGS__) -#define __dynamic_func_call_cls_no_desc(id, cls, fmt, func, ...) do { \ +#define __dynamic_func_call_cls_no_desc(id, cls, fmt, func, ...) ({ \ DEFINE_DYNAMIC_DEBUG_METADATA_CLS(id, cls, fmt); \ if (DYNAMIC_DEBUG_BRANCH(id)) \ func(__VA_ARGS__); \ -} while (0) +}) #define __dynamic_func_call_no_desc(id, fmt, func, ...) \ __dynamic_func_call_cls_no_desc(id, _DPRINTK_CLASS_DFLT, \ fmt, func, ##__VA_ARGS__) From patchwork Wed Apr 2 17:41:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036306 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 0D2E6C28B20 for ; Wed, 2 Apr 2025 17:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 040DD10E8A0; Wed, 2 Apr 2025 17:42:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LYdf/z2p"; dkim-atps=neutral Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1CED810E899; Wed, 2 Apr 2025 17:42:42 +0000 (UTC) Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-85b3f92c8dfso533639f.2; Wed, 02 Apr 2025 10:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615761; x=1744220561; 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=Ce6nXKcnJlQ1Sg4GeG36JJhoy7m7R7t/PayJp4ReXBg=; b=LYdf/z2prAwntsNrDjU7v/5e1jaxKm4G0Y3G3SxP7+dnIGpY08IZ18zcXncBTF1zwA A81gfoAYbGJCPcGm05SEytGHHBebYruM9PD4xD0oO83vkzOhhZX1DiPTwKvTuCMviU/I FHfxypOmLBGqHoy/KR1iIHynq0E/44WeSLRoZegPxEGKLd6k6wWwYu72xMEAvEPP5L7+ TjZa+IeuDScwpiFjccDX0Y0KsOOP2PZLwDipZ7dfdg0so6WsDihHn/iJ+8L+OHsl7iLW ytx4C4DKNSKumeYuD/4PEdpipJKtufSJ4Rk4Vqul+og0WEoFSP37ECbnEE7JSXY2dTEz 8bEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615761; x=1744220561; 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=Ce6nXKcnJlQ1Sg4GeG36JJhoy7m7R7t/PayJp4ReXBg=; b=S8j/99R2804Ijw4TFh/PPVTSTauXuMYPnjjxUjbxDlQa8b+pmK9L7r6jDw/jgXE58y ZAr4gszgYEOxx6SP+VKashvScHBmiGSxsqlSep5bkn2DNQyCBTikhN95J5YA/UAyaqMS yMinOr3MrZDvSyy5wZE2AuIJon8vPuZfcUF2C4VJp3wPVqcSSHygfHuwrDuMIxuBmj4/ 0lhAjJSppGyGu/ev/SMc2Pla02hiHbSdBmL5HeNgfI0DkL4i0oMe+SG1BeFB6JVAVbtI ve9OavHOfjmWCA5J6qjQJIIOdqrEueN4m7APMb8ON9P/NHK0iIh+htoC4aftTaN9lX3R tPzw== X-Forwarded-Encrypted: i=1; AJvYcCV2rfXvdsgOhG/YKcGjrjAY3kJ6P4mfYFwwKmHESJLPusSNEokgESFqsXbX7+GfXZKOV7krKn08@lists.freedesktop.org, AJvYcCXgOSOe50D/4hKPMCjsVk3V1brxmaApv7XJX0Ri3R/aCghHLjvsUKDXgepBS/0v9nU0JSnd405YSlxeEgXeeg==@lists.freedesktop.org, AJvYcCXr8myHrKGcgBXbxnAdYK/MUaJHz4m4BUctVR5Pprrq2ddfvIq1QqrtBLA7ZLdFoiFdTm1dcYDcVvln@lists.freedesktop.org X-Gm-Message-State: AOJu0YxqR5opq6JtIB/BZr7DCATJ84rDYZpZ6NFdtksfCB+lQSXxBIXf 6CRQu63SdgVB/CeFsQaj/yEz7mozEUCABmxsRG+2VC69zRUPTyP/ X-Gm-Gg: ASbGnctsRwkV5KJQKhSlDk5fpW+eRjuhpH3Z4PcfV4l/9lc0HA3PkLTiXzKzNey4fav 70uxGT5UfrN5/n1bMJxH7UZTQOVLZFkWPoEFDQYG16DPBILXMAJeFIQdnlCm0YSG5+/tNtWrcxD F8tGDcNv4uInBFbHjbNeOQzuCbSIM4Cd/jrrPOdcGlXdIRmOriyMZ0BWZMDTOEkU1YSyeYr87JR g8xxUj3zd+QypRXf8FEgxP95+aWr8bGLGQwKA7jx2qo8aEjenerYKPCshMkQj4r1q1XuPSUsyGn k+y06sWdNHFFoCYzPn0cQUEhL/YSFpviiXcQSf+hSYOU0UaIh4YYrbuF+91JuQ5wWBmZPWQbrdd TWA== X-Google-Smtp-Source: AGHT+IEd82/KaIrP4v3l/hIUqHB1vbL8Yns4imdfxbgbfiFn8gRA4XnyUTSvoiXRh5lRVoS9fxcz6Q== X-Received: by 2002:a05:6e02:1f0c:b0:3d3:f520:b7e0 with SMTP id e9e14a558f8ab-3d5e09094f8mr180509725ab.6.1743615761151; Wed, 02 Apr 2025 10:42:41 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:40 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 27/54] dyndbg: drop "protection" of class'd pr_debugs from legacy queries Date: Wed, 2 Apr 2025 11:41:29 -0600 Message-ID: <20250402174156.1246171-28-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Current classmap code protects class'd pr_debugs from unintended changes by "legacy" unclassed queries: # this doesn't disable all of DRM_UT_* categories echo "-p" > /proc/dynamic_debug/control # name the class to change it - protective but tedious echo "class DRM_UT_CORE +p" > /proc/dynamic_debug/control # or do it the (old school) subsystem way echo 1 > /sys/module/drm/parameters/debug This "name the class to change it" behavior gave a modicum of protection to classmap users (ie DRM) so their debug settings aren't trivially and unintentionally altered underneath them. And by "symmetry", if they're not picked by "class FOO", then they're excluded from adjustment. This allowed all previously conceived queries to work the way they always had; ie select the same set of pr_debugs, despite the inclusion of whole new classes of pr_debugs. That had 2 downsides: 1. "name the class to change it" means that every class must be individually modified, quickly becoming long-winded and tedious to adjust all the classes in a map via >control. 2. It made the class keyword special in some sense; the other keywords skip only on explicit mismatch, otherwise the code falls thru to adjust the pr-debug site. So this patch reverts to the traditional view, it drops protection of classes from default/legacy queries. But it also refactors the skip/continue choice to allow the module defining the classmap to protect its classes from unintended alterations by legacy/class-less queries. Next: Author choice: use of DYNAMIC_DEBUG_CLASSMAP_PARAM() means they want the drm.debug style control point. We should presume they want it to reflect whats set underneath, with only "class FOO" qualified queries changing the callsites beneath. CC: jbaron@akamai.com Signed-off-by: Jim Cromie --- v3- s/slctd_/selected_/ pitch the PARAM control of protection. --- lib/dynamic_debug.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 7a60088a1b5c..54f462cf41b0 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -197,6 +197,17 @@ ddebug_find_valid_class(struct _ddebug_info const *di, const char *query_class, return NULL; } +/* + * classmaps-v1 protected classes from changes by legacy commands + * (those selecting _DPRINTK_CLASS_DFLT by omission), v2 undoes that + * special treatment. State so explicitly. Later we could give + * modules the choice to protect their classes or to keep v2 behavior. + */ +static inline bool ddebug_client_module_protects_classes(const struct ddebug_table *dt) +{ + return false; +} + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -211,7 +222,7 @@ static int ddebug_change(const struct ddebug_query *query, struct flag_settings unsigned int nfound = 0; struct flagsbuf fbuf, nbuf; struct _ddebug_class_map *map = NULL; - int valid_class; + int selected_class; /* search for matching ddebugs */ mutex_lock(&ddebug_lock); @@ -224,21 +235,25 @@ static int ddebug_change(const struct ddebug_query *query, struct flag_settings if (query->class_string) { map = ddebug_find_valid_class(&dt->info, query->class_string, - &valid_class); + &selected_class); if (!map) continue; } else { - /* constrain query, do not touch class'd callsites */ - valid_class = _DPRINTK_CLASS_DFLT; + selected_class = _DPRINTK_CLASS_DFLT; } for (i = 0; i < dt->info.descs.len; i++) { struct _ddebug *dp = &dt->info.descs.start[i]; - /* match site against query-class */ - if (dp->class_id != valid_class) - continue; - + if (dp->class_id != selected_class) { + if (query->class_string) + /* site.class != given class */ + continue; + /* legacy query, class'd site */ + else if (ddebug_client_module_protects_classes(dt)) + continue; + /* allow change on class'd pr_debug */ + } /* match against the source filename */ if (query->filename && !match_wildcard(query->filename, dp->filename) && From patchwork Wed Apr 2 17:41:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036307 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 06260C36014 for ; Wed, 2 Apr 2025 17:42:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 570F410E88E; Wed, 2 Apr 2025 17:42:44 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ecnm/EgJ"; 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 1A6A110E899; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-85517db52a2so223739f.3; Wed, 02 Apr 2025 10:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615762; x=1744220562; 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=3hWaDK0EyUbVT4OX3HvU/+LKgntx8pUOZGP1ac6BsDE=; b=Ecnm/EgJVob5A7Y/szFbtyRzPv8CpIV3zfNZTEaDyzIQ5Z2/g2TLVs0bHFbr76DpZu kIkAadj1NB4zhBijvMKuXcj2OJjgL5CaeV7eQwVYCofHD2xCBERsZzR6Gpbsqi6+k0wD h6fkojPlxKMtof5UWcjuMDWv9kwy6HH48+RJkq+aqlVhhHbLWrgpCVxhosYEYqiznqlk UgWCgCkwutazbiILn9ck51IcuiYEuox1FQe5ct4MG2yrYw4lYBiuHU4MIiAlZlksY3n6 v06y/DeIPTXk2QKLRlNPdLClklqGqUSwIHF3HoZv+Qfxd79xjTJ9DASSlK0wSWJq3YH2 nFAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615762; x=1744220562; 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=3hWaDK0EyUbVT4OX3HvU/+LKgntx8pUOZGP1ac6BsDE=; b=nEqYMFQZVv6PKa6/wDfdpJydle6tuX/NjyBt1+71nnd3YTwb+Kk5HJhtxqgraIpanf ebuSFhCrOoUiCjsLKKYVIld0u0jHk7KBhUClU7yZramDYauOum4MI/ZbLtW6X4jR0K8c 2TG2UvhRs/fiLk3RroxGuICNWAU0982rYM0M9sivFTvsq9zSw5EuNHbC6C06pu625Bfm Lnvy2tf2WDwEYg69RRYiaHaVKnj7onhdtMGiJaV0Kazef3kSJ5a3GDp31mSvRe76HYpk lnPpeZttDkGQ5StSatyi5mrvwYdmUv/iT1e0Xkd0YssNhV9Jl4XFgmjcHGlg2GNAgHGl VlcQ== X-Forwarded-Encrypted: i=1; AJvYcCUgVA7CVpE+fj9DIpDwijkn/cc9WvQhasG6DvxXzUixkz8q3E4kTGijC9qZ6JRKDSLsC8CARAn1Pj9G@lists.freedesktop.org, AJvYcCV1iUuAR/CDfVunxVghqixdxMNAM6loSuwRsBch40I9LcxjSAJJAa0nRST/jpyPFERwy72sllUxiyUshae3aA==@lists.freedesktop.org, AJvYcCX3ermHKkWOgROWbzkt24qa3KVzKtFcxQ/Mk70LY2SE9wlU6tV2CM2orkGjO5i5lLSGQfWjKwwq@lists.freedesktop.org X-Gm-Message-State: AOJu0Yyh78okuUTzOq6XgJhsR21jFrQjahi5xWkO7Cc8ntcRt7cNdsc3 VcePpyMvs91R1og6OMHgKWnPgDR0GfLAdseSGBVxiFVUEpGp8fnm X-Gm-Gg: ASbGncvJEIyehYhJhQ7273r+cw5G7D5GHtrnUelPtFMod4vMocOF5AyjkMDJ98UQFS2 tg5s1yx3LBu41Kr6mVOEpXGGNxSrHwat6AETA1rutAEqcMztKDurwHL4uXbtbe7tADw/ruUdm7Z gHxsM3XpKDwonBugFpuTpNyjim7nrDJuH4F0D9gjN4UWxRsw1f3aVbBh74n/QnsQd3t3jnEmqSH cEErSPZyglv7hL/P3EnIR0xQZgUNuG8EOZBZKzCwjwFMsUDE0xrqN4jcRkk+xKaeLFNjnn8TNL5 0o/wulvVv+/VSiBf6k0ogga6k/Eox9YDgPTdLpcZhxLo6oltF1qbmN/iwgak8NFY3fZEkNZpje7 CDw== X-Google-Smtp-Source: AGHT+IE26Lvgy1sz8+/s+cZ/TgAmF79C63fY2ih6ts7b4QxKP/HjJZzZedKoG0eLTxzU2s+MwTib5Q== X-Received: by 2002:a05:6e02:746:b0:3d3:f27a:9101 with SMTP id e9e14a558f8ab-3d5e08e9ec2mr217926285ab.1.1743615762203; Wed, 02 Apr 2025 10:42:42 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:41 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 28/54] dyndbg: restore classmap protection when theres a controlling_param Date: Wed, 2 Apr 2025 11:41:30 -0600 Message-ID: <20250402174156.1246171-29-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" DRM has always had /sys/module/drm/parameters/debug (ie drm.debug). Without dyndbg, this is their only control point. One could presume they like it - in any case its a system/user interface, ie ABI. With dyndbg enabled, drm calls DYNAMIC_DEBUG_CLASSMAP_PARAM() to create the drm.debug kparam, wired to our param-handler, which writes a "class FOO" query for each bit in the classmap. Since no new interface was ever contemplated, this is using >control. Since drm.debug is ABI, we should not allow class-less queries to alter our implementation of its settings. This patch provides that protection, *only* when theres a PARAM. This is the user, expressing their wish for easy control of their entire classmap. They also wish to trust its settings. Classes without a PARAM are unprotected, allowing admins their shortcuts. No such use-cases exist yet. Anyway, this patch does: 1. adds struct _ddebug_class_map.controlling_param 2. set it in ddebug_match_apply_kparam(), during modprobe/init, when options like drm.debug are handled. 3. ddebug_class_has_param() checks .controlling_param 4. ddebug_class_wants_protection() macro renames 3. 5. ddebug_change() calls 4 when needed. IE when applying a class-less query to a class'd pr_debug / drm_dbg_ Historical Summary: -v0 - before classmaps. no special case keywords -v1 - "class DEFAULT" is assumed if not mentioned. this protects classes from class-less queries -v2.pre-this-patch - protection macro'd to false -v2.with-this-patch - sysfs knob decides -v2.speculative - module decides wrt classmap protection seems unneeded now, TBD NOTE: protection is only against class-less queries, explicit "class FOO" adjustments are allowed (that is the mechanism). Signed-off-by: Jim Cromie --- v3 - new patch --- include/linux/dynamic_debug.h | 3 +- lib/dynamic_debug.c | 55 ++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 2d87cca27544..d34a44ff961a 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -89,8 +89,9 @@ enum ddebug_class_map_type { * usually by stringifying the enum-vals. Modules with multiple * classmaps must arrange to share the 0..62 class_id space. */ - +struct _ddebug_class_param; struct _ddebug_class_map { + struct _ddebug_class_param *controlling_param; const struct module *mod; /* NULL for builtins */ const char *mod_name; const char **class_names; diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 54f462cf41b0..3eb4a8abeb33 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -198,16 +198,26 @@ ddebug_find_valid_class(struct _ddebug_info const *di, const char *query_class, } /* - * classmaps-v1 protected classes from changes by legacy commands - * (those selecting _DPRINTK_CLASS_DFLT by omission), v2 undoes that - * special treatment. State so explicitly. Later we could give - * modules the choice to protect their classes or to keep v2 behavior. + * classmaps-V1 protected classes from changes by legacy commands + * (those selecting _DPRINTK_CLASS_DFLT by omission). This had the + * downside that saying "class FOO" for every change can get tedious. + * + * V2 is smarter, it protects class-maps if the defining module also + * calls DYNAMIC_DEBUG_CLASSMAP_PARAM to create a sysfs parameter. + * Since they want the knob, we should assume they intend to use it + * (in preference to "class FOO +p" >control), and want to trust its + * settings. + * This gives protection when its useful, and not when its just tedious. */ -static inline bool ddebug_client_module_protects_classes(const struct ddebug_table *dt) +static inline bool ddebug_class_has_param(const struct _ddebug_class_map *map) { - return false; + return !!(map->controlling_param); } +/* re-framed as a policy choice */ +#define ddebug_class_wants_protection(map) \ + ddebug_class_has_param(map) + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -250,7 +260,7 @@ static int ddebug_change(const struct ddebug_query *query, struct flag_settings /* site.class != given class */ continue; /* legacy query, class'd site */ - else if (ddebug_client_module_protects_classes(dt)) + else if (ddebug_class_wants_protection(map)) continue; /* allow change on class'd pr_debug */ } @@ -650,6 +660,7 @@ 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, const unsigned long *new_bits, const unsigned long old_bits, @@ -1228,25 +1239,36 @@ static void ddebug_sync_classbits(const struct kernel_param *kp, const char *mod } } -static void ddebug_match_apply_kparam(const struct kernel_param *kp, - const struct _ddebug_class_map *map, - const char *mod_name) +static struct _ddebug_class_param * +ddebug_get_classmap_kparam(const struct kernel_param *kp, + const struct _ddebug_class_map *map) { struct _ddebug_class_param *dcp; if (kp->ops != ¶m_ops_dyndbg_classes) - return; + return false; dcp = (struct _ddebug_class_param *)kp->arg; - if (map == dcp->map) { + return (map == dcp->map) + ? dcp : (struct _ddebug_class_param *)NULL; +} + +static void ddebug_match_apply_kparam(const struct kernel_param *kp, + struct _ddebug_class_map *map, + const char *mod_name) +{ + struct _ddebug_class_param *dcp = ddebug_get_classmap_kparam(kp, map); + + if (dcp) { + map->controlling_param = dcp; v2pr_info(" kp:%s.%s =0x%lx", mod_name, kp->name, *dcp->bits); vpr_cm_info(map, " %s mapped to: ", mod_name); ddebug_sync_classbits(kp, mod_name); } } -static void ddebug_apply_params(const struct _ddebug_class_map *cm, const char *mod_name) +static void ddebug_apply_params(struct _ddebug_class_map *cm, const char *mod_name) { const struct kernel_param *kp; #if IS_ENABLED(CONFIG_MODULES) @@ -1266,6 +1288,13 @@ static void ddebug_apply_params(const struct _ddebug_class_map *cm, const char * } } +/* + * called from add_module, ie early. it can find controlling kparams, + * which can/does? enable protection of this classmap from class-less + * queries, on the grounds that the user created the kparam, means to + * use it, and expects it to reflect reality. We should oblige him, + * and protect those classmaps from classless "-p" changes. + */ static void ddebug_apply_class_maps(const struct _ddebug_info *di) { struct _ddebug_class_map *cm; From patchwork Wed Apr 2 17:41:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036308 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 26875C3601B for ; Wed, 2 Apr 2025 17:42:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3630B10E893; Wed, 2 Apr 2025 17:42:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CkpZ1p+5"; dkim-atps=neutral Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id F29C510E89F; Wed, 2 Apr 2025 17:42:43 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3d6d162e516so931245ab.1; Wed, 02 Apr 2025 10:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615763; x=1744220563; 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=PBFFM339JxjzZFE9F9mUGqskJ1T7S9VuqFHMSYzFpwo=; b=CkpZ1p+59xukBbO/wv3y8hW21H0p3+ocVt3Wx77r2Et6ISzVou4JK0FqRlNWg14qK2 YU/M0zMXfRLDYOJ7/DFIDAna3ced4amAUN32QoAm3Fig30qRfZFFBe7k504ghFkR3+jh kU/3zGP/aftZzjMCtue8QXKWwE4hYXCou6y+lZPotrC0m6YXn4Tx1uBvF15J3WgR75UW uCZ+rhvobqautBxpv8x5KBXej74XVvsiIGZ20ZluSBIQzyJ1mBeuK7RKMNNjONz6tqHL qFYMe8zOtUmCyo3ACKVwF9F/phoNj2HgzLbWnMVmGIVPmB0fxyVGxJlFzcdWfAz3crHv 8o2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615763; x=1744220563; 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=PBFFM339JxjzZFE9F9mUGqskJ1T7S9VuqFHMSYzFpwo=; b=LyVpTIfYELVEGZN403VRgxIm3kNd1l3obukfT+2xa1J/6/DUrCjb6Jf2X1GH6G8nJp 9rBVI7TFcDliA2lS/LIQFPGk9BhgZSQxdpE3CmGBIn5rItV1UB9AQh+6PUds0zVR9PER o0B89SJwflSUSs0nnATUsPJloXUXkPXGEa5O+udFrcDF9K/YhR47Tdikspas2n75UXBQ wKNqRjpXuexYD5KZqGYXATt33ORXxEnxKsZlnNXqFZCKcCLfFds9y6UuqfVtqBg6gx6e gSDMTAeFc4Vy22EeL8amzmmrGvkmC8CdX/c86Tr8LX0sRW4Zn0iG68A4Bcp6sddmzpok hOWg== X-Forwarded-Encrypted: i=1; AJvYcCUVy+pu+2ZYUt4L4XcKK+HC5YpWj8JUf7Y4VUceCnyJB8iAznMK0+gJNWDjzAL115JAi1dR0RDXdFfjMN1OQg==@lists.freedesktop.org, AJvYcCVXqYByUax9PzYW7nKL9qJgB9HD5GVh40uIQKHhs2cUdhHH27kG+RL4srU+bFhjhbBoY/jIkJcT@lists.freedesktop.org, AJvYcCVyS4Cx7P6T4JwxJZxShheHIrIvUfSne4vTZNBQUGQrGPGtybWmk09l2wFtIXZGRc437GvMIjlMsC+/@lists.freedesktop.org X-Gm-Message-State: AOJu0Yw3DobbNV4tucvZAi7iD8XZT1hyGjP4ac/mvY9LzfAEJuLxTx/g likXoIX6/lVuBn9V7O72EbR5DME2fI6JgKg93hOQJ1yklhvbHleR X-Gm-Gg: ASbGncvUCXqR4nsoWdSAkjrZ/Xc3BRFcoXjt3imzTzOO/X4XXjdbC4URB4FTTmzK/g5 aHvParimlLi0MjzdUJ+xFp34yrtOJzIwucbSu8eQIC6HPabOQfUNy7p39BoRfkbjLKt9IcsG9Ik 6TWiCbHZOTQsM84UVjzVMUbRt0V0ir/dMIwtfXaN2WOKMo5sLBtD2s+l1mIjVp4MTY7w2vsjDHi YIpNcb3X9C51MAIVSBQ1ywdyWT+g760R7bHgPN+AAzUpXxwlmYLqQyjpb0qP2VLNhnA6HFsOgGE WQ6WfUgZzX95FqSHnAKgqTkFXRpsVQEjDtV9Vf6ZjZLn1HfacknGEA7uiqLayu3aw8NdfQHcCGq 4Jw== X-Google-Smtp-Source: AGHT+IFhLqkbJE0UpVSJmNkM4dkx1ppVBJoKSeZT343o5h63VoCAKbsDpePVjKMaUIz6jLi9wx0olw== X-Received: by 2002:a05:6e02:1563:b0:3d6:cbc5:a102 with SMTP id e9e14a558f8ab-3d6d54ceea3mr34975145ab.13.1743615763162; Wed, 02 Apr 2025 10:42:43 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:42 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 , linux-doc@vger.kernel.org Subject: [PATCH v3 29/54] docs/dyndbg: add classmap info to howto Date: Wed, 2 Apr 2025 11:41:31 -0600 Message-ID: <20250402174156.1246171-30-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Describe the 3 API macros providing dynamic_debug's classmaps DYNDBG_CLASSMAP_DEFINE - create & export a classmap DYNDBG_CLASSMAP_USE - refer to exported map DYNDBG_CLASSMAP_PARAM - bind control param to the classmap DYNDBG_CLASSMAP_PARAM_REF + use module's storage - __drm_debug TBD: some of this might be over-specification, or just over-talked. NB: The _DEFINE & _USE model makes the user dependent on the definer, just like EXPORT_SYMBOL(__drm_debug) already does. cc: linux-doc@vger.kernel.org Signed-off-by: Jim Cromie --- v3- rework protection around PARAM v0.5 adjustments per Randy Dunlap v0.7 checkpatch fixes v0.8 more v0.9 rewords fixup-howto --- .../admin-guide/dynamic-debug-howto.rst | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 1ceadf4f28f9..5eb4ae3b2f27 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -394,3 +394,96 @@ just a shortcut for ``print_hex_dump(KERN_DEBUG)``. For ``print_hex_dump_debug()``/``print_hex_dump_bytes()``, format string is its ``prefix_str`` argument, if it is constant string; or ``hexdump`` in case ``prefix_str`` is built dynamically. + +Dynamic Debug classmaps +======================= + +The "class" keyword selects prdbgs based on author supplied, +domain-oriented names. This complements the nested-scope keywords: +module, file, function, line. + +The main difference from the others: classes must be named to be +changed. This protects them from generic overwrite: + + # IOW this cannot undo any DRM.debug settings + :#> ddcmd -p + +This protection is needed in order to honor the ABI, settings done +there must be respected: + + :#> echo 0x1ff > /sys/module/drm/parameters/debug + +So each class must be enabled individually (no wildcards): + + :#> ddcmd class DRM_UT_CORE +p + :#> ddcmd class DRM_UT_KMS +p + # or more selectively + :#> ddcmd class DRM_UT_CORE module drm +p + +That makes direct >control wordy and annoying, but it is a secondary +interface; it is not intended to replace the ABI, just slide in +underneath and reimplement it. + +However, since the param is the ABI, if a classmap DEFINEr doesn't +also add a _CLASSMAP_PARAM, there is no ABI, and no protection is +needed. In that case, class'd prdbgs would be enabled/disabled by +legacy (class-less) queries. + + +Dynamic Debug Classmap API +========================== + +DRM.debug is built upon: + ABI in /sys/module/drm/parameters/debug + the bits set all DRM_UT_* together + ~23 categorized api macros: drm_dbg_() + all calling drm_{,dev}dbg(DRM_UT_*, ....) + ~5000 calls to the api macros across drivers/gpu/drm/* + +The const short ints are good for optimizing compilers; a primary +classmaps design goal was to preserve those opporunities for +optimization. So basically .classid === category. + +Then we use the drm_categories DRM_UT_* enum for both the classnames +(stringified enum symbols) and their numeric values. + +Its expected that future users will also use an enum-defined +categorization scheme like DRM's, and dyndbg can be adapted under them +similarly. + +DYNAMIC_DEBUG_CLASSMAP_DEFINE(var,type,_base,classnames) - this maps +classnames (a list of strings) onto class-ids consecutively, starting +at _base, it also maps the names onto CLASSMAP_PARAM bits 0..N. + +DYNAMIC_DEBUG_CLASSMAP_USE(var) - modules call this to refer to the +var _DEFINEd elsewhere (and exported). + +Classmaps are opt-in: modules invoke _DEFINE or _USE to authorize +dyndbg to update those classes. "class FOO" queries are validated +against the classes, this finds the classid to alter; classes are not +directly selectable by their classid. + +There are 2 types of classmaps: + + DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, like DRM.debug + DD_CLASS_TYPE_LEVEL_NUM: classes are relative, ordered (V3 > V2) + +DYNAMIC_DEBUG_CLASSMAP_PARAM - modelled after module_param_cb, it +refers to a DEFINEd classmap, and associates it to the param's +data-store. This state is then applied to DEFINEr and USEr modules +when they're modprobed. + +The PARAM interface also enforces the DD_CLASS_TYPE_LEVEL_NUM relation +amongst the contained classnames; all classes are independent in the +control parser itself; there is no implied meaning in names like "V4". + +Modules or module-groups (drm & drivers) can define multiple +classmaps, as long as they (all the classmaps) share the limited 0..62 +per-module-group _class_id range, without overlap. If a module +encounters a conflict between 2 classmaps its USEing, we can extend +the _USE macro with an offset to allow avoiding the conflicting range. + +``#define DEBUG`` will enable all pr_debugs in scope, including any +class'd ones. This won't be reflected in the PARAM readback value, +but the class'd pr_debug callsites can be forced off by toggling the +classmap-kparam all-on then all-off. From patchwork Wed Apr 2 17:41:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036309 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 25452C36017 for ; Wed, 2 Apr 2025 17:42:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9A89D10E8A8; Wed, 2 Apr 2025 17:42:45 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZUh24d+A"; dkim-atps=neutral Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id D465B10E8A2; Wed, 2 Apr 2025 17:42:44 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so490965ab.0; Wed, 02 Apr 2025 10:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615764; x=1744220564; 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=TtBnrd8yWB3oKPUJX24gJEUHr1Wu50+TDt3ZzWgKjdc=; b=ZUh24d+At2WQVsf0XFB5OQMjjWmiKrWUf1YQJbjT5Q9mfVeBRCuQKstcgB5weE+YB6 /72mCigMRdrQR5HBSSwxv3Kw2dMk54oldRjpRYulA1ezK2+Q9uerPi9z0H371c2iE+vZ 3fhyCY8IXEFzFZe1QcSrugxsDoPcWywi9aSLwU85ofjC1/+5D46lYDUrao17W2oKPLIO k9z2Gn9bNhm0wBPCC5Tpmnk5Uqw2rAek7EK3zggrIU4uLdPS52HSVpVEEjPndbKfN/2s in0cWW/Uaj3mB+mC3tavsTjwVPMMfCCq3Hor7f1akIuEAuPAfe4wWcYTRALIQYauCKec y6rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615764; x=1744220564; 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=TtBnrd8yWB3oKPUJX24gJEUHr1Wu50+TDt3ZzWgKjdc=; b=WCf5lY45O5WdIMhdaCIJJ79zHcDm1ewCY+1UoYUBMtzd0PZSAy4mVWp0CXToRg5idZ HNFHb3o0fkEJeH8PK2INRToX3KUdxA+ofZaG4eblgTJsLbirsoeGnkU1mYrntNByWFWT bVRmWvbST13ScgFXejh5GEQv6O+Ig//DnmSztHoPWCvz3tYzssv38zTxSphKj+QhmRwL f5GvnAKZnI5KCc1FQav4Z+owuVdslrc7Ra3YHv0y4kGlCv+70yKrYsWvdHj9pKiglJoZ /g7tgbzPjSoWpNATHSgTA+g8cB+N0BbXtfZHnxCfgR7hci1qIKsp0rs5nwRyc3XNFRlC b0DQ== X-Forwarded-Encrypted: i=1; AJvYcCU31JOB4XIzH4wIMkTZPnLr7xZdxw3Ii2Z4vbQQf8JEMd12IVEvehBplJwMfOj9V+k27aoED2eaN9fG@lists.freedesktop.org, AJvYcCUzrG9TCxWtXf1B2u8ItnPSjdCVJQ5JBqe7LwU6KX1KONyayLaUNw2DI+N5kbgaxIXEPkpPyIyhGI2aBqNvrQ==@lists.freedesktop.org, AJvYcCWEKw8lDpLlky1+979vTy1ppudqYz4KrMBsqgwlMa7BeU955vEYDEUU9b2lKYEnyT7R0APp4/8C@lists.freedesktop.org X-Gm-Message-State: AOJu0YwKRff1nO0NoPD1VCoIOhhq48EpWYrWaMCmawCav+aAlcOaLfST B5HbeAaF08OaMVIVWKCSGT0LdZnuviP5ddw1xGbDOaIMorJe+Smn X-Gm-Gg: ASbGncsN0Ei+MzwM6AOeSD5zddHEzqxrWzTfxuZlH06fX0Wl68uQvxd7iM1DwViPGW7 NpIxasWOqWoCx8avXnQuXUlUq8h6ywNdhlN2pzA3JI4Nol+ceR9mz5pEuQKwXpnQF99a1ntzaLP HYF+0WP9oiI7fSqrLoaRVzsfGS1HoZ/sofzIsrRZQPN2nFzlB7SFJMbAHg+ViBDfflkdWtgOsEP ye96Lu4pDu9RGChRYI3hMgIYWmNrzzOvngLUc87eun19akGjEQDxmJd663x92xwk5+ulBnepG5l rTHqX+KmOf0MUfhFYK+DHZ1PuRN7jk9X2GYBjZWPuhqPhKL1BVseqxb2tXFk/BHv/fQWtv75Eot X9A== X-Google-Smtp-Source: AGHT+IGTBl3lbbr6SJDgP5PSLh5HQqCvYpL4DLPKQgcBrXs/j8ELoLu+4SyOVWtWqWN9s2TkWLcitA== X-Received: by 2002:a05:6e02:1a8f:b0:3d3:ff5c:287 with SMTP id e9e14a558f8ab-3d6d5535a0amr31636715ab.14.1743615764063; Wed, 02 Apr 2025 10:42:44 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:43 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 30/54] drm: use correct ccflags-y spelling Date: Wed, 2 Apr 2025 11:41:32 -0600 Message-ID: <20250402174156.1246171-31-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Incorrectly spelled CFLAGS- failed to add -DDYNAMIC_DEBUG_MODULE, which disabled dynamic-debug in modules built with: CONFIG_DYNAMIC_DEBUG=n # 1 CONFIG_DYNAMIC_DEBUG_CORE=y # 2 CONFIG_DRM_USE_DYNAMIC_DEBUG=y # 3 NB: this adds the flag (when 3) more often than strictly needed; modules built with CONFIG_DYNAMIC_DEBUG=y (!1) don't need the flag. Fixes: 84ec67288c10 ("drm_print: wrap drm_*_dbg in dyndbg descriptor factory macro") Signed-off-by: Jim Cromie --- drivers/gpu/drm/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 19fb370fbc56..704f94efc804 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -3,7 +3,8 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -CFLAGS-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE +ccflags-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE +subdir-ccflags-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE # Unconditionally enable W=1 warnings locally # --- begin copy-paste W=1 warnings from scripts/Makefile.extrawarn From patchwork Wed Apr 2 17:41:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036325 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 CD8D6C36014 for ; Wed, 2 Apr 2025 17:43:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CF22410E8B1; Wed, 2 Apr 2025 17:43:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="l9APGdRQ"; dkim-atps=neutral Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id 995FD10E8A2; Wed, 2 Apr 2025 17:42:56 +0000 (UTC) Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3d45503af24so751885ab.2; Wed, 02 Apr 2025 10:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615776; x=1744220576; 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=hj7/OLtj1fDw6OZs5+/lD0ex0mbib1oiHMYEMqtQMQs=; b=l9APGdRQXouBHUpaMeTOufZ5w928nEVFU4/uMst68vq0yeiN1ElwsqyZg1yKGJi+T+ GCUjHG0k0eON6hOe/43jjW6RumVjCLB2HZcrxcqdE9husTszoW4v3NlRT3qpiJ2U2RzN lAA0KErbLMS4jrf4AM+/F4F8DdRENMEkivzqrvQQF96o94mE4emSSlz6JZgarV8nbYyj 2clIfaFVUsCPxcrhDb7Rjs5FRd3uviTcDQRLmPmSmLTfx4R4/hUQSs1CYh8qdQGqzA5p /ez41bSPo+p7LrZWcN+xF07bZGsjTGYnq42XLMKd58o71muOfID5FyNyTunct1ZeirPc eZIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615776; x=1744220576; 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=hj7/OLtj1fDw6OZs5+/lD0ex0mbib1oiHMYEMqtQMQs=; b=Jer4Tq+90+ntAh8mwaqa8RFds4WjBAC2JtWN6nFfyXKaWXtmcNfsNgQZeq91G77wX8 usA/iduz4oVo6UOYGtsCaQzZVHSUYA1Ki+k8a274CpK8Sx7wtG45jSHr9EbS/1fN7jq5 2347skhHuBBlQzTcB0EpKfyd/o4T+PL/2WSc8f2H+vACNE7yl/tiJ3c2BQdlmSXWSxpw vJUD6fuh/jqSA4tr7V7nFd/YXVCNTvcNnh82s3E2a6csOVPL4xfNS6dTaANb//bA3NhK 6s6YLLyJA4gCIzdq5hoROBgIPq0FtDW/BWb5P5fI9AQsKxrReD0A/GrlaXSGWe/C56na 7w9g== X-Forwarded-Encrypted: i=1; AJvYcCWNIl53L7Xs42b1UTd5+pVVTyySjLW9JBbN0F7WemD1ZyCXpcZwujqIOV5R0tyeYo04Cuy9NkNiMpH1@lists.freedesktop.org, AJvYcCXJUTTy76Cv6VcU1mf8pYtvpxTDEYDLU3RVXSUURd1wA8ZzUFnHQb6gNyvAEy4WNgoolg5lpqtzPZ8XdgESAg==@lists.freedesktop.org, AJvYcCXyNHp5tIU9sDo+c2OD7oicCn7lR6dYJlftwlAm9QdpxzP1inYetAYZXkMFzr79OIyyN+1xRElK@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxa7r7OA6Et/Ny+MM79FgUjYb8tgxHTPbe3ToDiWMDRK2nyn4Ga PDinh5AG/kqnSBQUB8zfqwIgWyuwz0AwiDntDXD3mDPzAuMgPtLPYiQnEGGw X-Gm-Gg: ASbGnctJ10yttrmRTZnDzrOU92a7aKOMO4wn7ZWZI7pAgC8ytScELnfIC7+sVfVegGG 72GDw8/D6C1AO72jlawWb7r7R6hpU2Xr91SfrVtEd9wF885XnwI4Q2dfEBnFlU4joMnDs1xLYNW uF2L+Zy31p8JOpgq3awP/qEZybNfN9ozJKmRElDh5ZwtjfkUgMIG1YGQTbFHLkD0wbv2gJu1pbN ANe+1IyYniqwnxjqqofOfiIZzpN6xYULDbeFtxnWQE5+3eRWk6zh70OIb2gwdYqe/umIbzc5KAe 7FDkIERUa3LoHyHaq4NMotp7fuuFX+D22FMzUzLaARfvDGS+w5pbS++DVHTkoH65rLZejQmZg1z xXA== X-Google-Smtp-Source: AGHT+IHkTdxrnWHVM3s8kzejMvdVLgstsz/xh978QvWvn7zXHfoIkU/4gG/Iemvf+jXbraofO9mW5w== X-Received: by 2002:a05:6e02:2703:b0:3d3:d28e:eae9 with SMTP id e9e14a558f8ab-3d6ca5d16efmr104731125ab.7.1743615765249; Wed, 02 Apr 2025 10:42:45 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:44 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 31/54] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Date: Wed, 2 Apr 2025 11:41:33 -0600 Message-ID: <20250402174156.1246171-32-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" dyndbg's CLASSMAP-v1 api was broken; DECLARE_DYNDBG_CLASSMAP tried to do too much. Its replaced by DRM_CLASSMAP_DEFINE, which creates & EXPORTs a classmap (in DRM core), and DRM_CLASSMAP_USE which refers to the classmap defined elsewhere. The drivers still use DECLARE_DYNDBG_CLASSMAP for now, so they still redundantly re-declare the classmap, but we can convert the drivers later to DYNDBG_CLASSMAP_USE Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- this ignores a checkpatch WARNING: Argument 'name' is not used in function-like macro #70: FILE: include/drm/drm_print.h:148: +#define DRM_CLASSMAP_USE(name) the macro is empty, and correct. only 1 arg is expected. --- drivers/gpu/drm/drm_print.c | 25 +++++++++++++------------ include/drm/drm_print.h | 8 ++++++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 79517bd4418f..a3b70d104afa 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -55,18 +55,19 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG) module_param_named(debug, __drm_debug, ulong, 0600); #else -/* classnames must match vals of enum drm_debug_category */ -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +/* classnames must match value-symbols of enum drm_debug_category */ +DRM_CLASSMAP_DEFINE(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, + DRM_UT_CORE, + "DRM_UT_CORE", + "DRM_UT_DRIVER", + "DRM_UT_KMS", + "DRM_UT_PRIME", + "DRM_UT_ATOMIC", + "DRM_UT_VBL", + "DRM_UT_STATE", + "DRM_UT_LEASE", + "DRM_UT_DP", + "DRM_UT_DRMRES"); static struct ddebug_class_param drm_debug_bitmap = { .bits = &__drm_debug, diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 9732f514566d..e86ebb716b4c 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -141,6 +141,14 @@ enum drm_debug_category { DRM_UT_DRMRES }; +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +#define DRM_CLASSMAP_DEFINE(...) DYNAMIC_DEBUG_CLASSMAP_DEFINE(__VA_ARGS__) +#define DRM_CLASSMAP_USE(name) DYNAMIC_DEBUG_CLASSMAP_USE(name) +#else +#define DRM_CLASSMAP_DEFINE(...) +#define DRM_CLASSMAP_USE(name) +#endif + static inline bool drm_debug_enabled_raw(enum drm_debug_category category) { return unlikely(__drm_debug & BIT(category)); From patchwork Wed Apr 2 17:41:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036311 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 05FB0C36014 for ; Wed, 2 Apr 2025 17:42:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 290A910E897; Wed, 2 Apr 2025 17:42:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Acu115tc"; dkim-atps=neutral Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B50710E8AB; Wed, 2 Apr 2025 17:42:47 +0000 (UTC) Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3d59c8f0979so3699655ab.0; Wed, 02 Apr 2025 10:42:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615766; x=1744220566; 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=GdzbEW9zH0UE5x9JfjsCyVhdiuYXlGo5WMhyJQ/maLs=; b=Acu115tcqHH1r7w0/Nz9268tm0fsXE8t8it8xD2fXUcRSbeuAJSoUIqsXp5sVTZtva S7h1PJryMGorSr82F8KqQJPkTg1ooTFre9jOGQdsqM3DY3GGcJEZdAu/YtKiLYQzMLwW 0OhwpktzCo8RU8AAJHyDtBDUsFyE05QzzWCvTcTZAyi04bGCxXhl+2GcMiDiFMired2U dAzOeVfCfxL/kmAUpVcgAQOXyq0AfpECxrx/qL0PRmQ5TepdMWzLprsDiPBwgjEo2E6J 1tskQvt0uEoFdr7D2QD4oXMj+B/D9rRu5CI5LrzoRprwWBPXnEtjhTPrGsFmYa7yuxB5 b1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615766; x=1744220566; 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=GdzbEW9zH0UE5x9JfjsCyVhdiuYXlGo5WMhyJQ/maLs=; b=p2rMoOv9mFo+U7FwmoqPV4WpGH0jg527iIxh4VcanPtRe/c8/tHL/IBF6dZ0Wf1LlK 6iox5kMMUEN6/eoaL+SRGHrKaXbRbkpiggs6dryFvjDG1v+nUzg2PETC4RbiRhEWMOvY tq08a7nX/vY7skqRDs6U+dSalF9cfMRZTroiHRPpsqKA709P2Ji3+zhg9EqydrcMQvfF +mJqtXcCkKvY4lQbJ/tv0+0pCoSKjP/dvF1cl8RwqxX6E+ZmI7mBcRjLrD4Aq0Y3a3Af mPLGtd0Po3C2BlF46i5vMMz6E1Qubjq7B12gF+zuFPvYsEquFNkUQnWROa54+0Y+3kw3 bpAQ== X-Forwarded-Encrypted: i=1; AJvYcCUKOy+kSkE7L/EWdQR8PE8OVCwiRB1NPy75KPnaef1mat3BNDIn8ZocVsYQT9fFW/D+19zX7KXu@lists.freedesktop.org, AJvYcCUblxJlZDuZfj6aqGizesjc8vub9rJoxZCq6OFwiIC4VxGr5/Is9QAzTzwp3eV5eFUl/QtlXBn5rzxkNnf2pQ==@lists.freedesktop.org, AJvYcCWf4NiuklHpjiNfyNnzZYsOjZeBaNTpRpQhNM4awUs58xufiWU5yyubbsHVxtT2suqI5zuM6WcLwgGr@lists.freedesktop.org X-Gm-Message-State: AOJu0Yxy5GpM9Gy5C2FGtCqxC9dNFlxhmAv1HIr+q5GAGgrOeORvoVLs yveS17L4iI1Gds+1npfLPsYgDdHUa0LgL78fIbORhQYgWcKDpQj2 X-Gm-Gg: ASbGncsECKAlCDEp48/c31+3d7GoYP3jlfN8/2oXCrTPhF66lyfu8cc3q+eKpOXmrZz IHgn0QBX/zKhPWQmsuax5XBChvMnWg0DBVFHxW2GNkQ2ZYo5PGCBv7NWMvTZFw3fqE2TKCcHG4i 8BI/2xa5AAfLOvYizYbyZQs/7IGnfuvGyKYv83wRorm8Cj3RJnEFKjV6KDGII+mENfZtIC1XNDu X1NGpJ4UaDDLOd7zbOSxKrRvkO1M0QPa35Dd5o5zM+qFoB3nBy2jDc7YATUlI+3sR47FVkH7sQv ploqKuJIxvLmIxXTpRYQbqxFViZ+VcRV6He9cANmYpTgxz7MWhnZX4SkvYL3Vh6SjubKuYf7mDe 4Ew== X-Google-Smtp-Source: AGHT+IHM7tagESMun47M5HMS7lAKv6qUWexzrO14AcKjGRpEF7WGOj0nJoAxliwzZGovvAJef0zyEg== X-Received: by 2002:a05:6e02:1749:b0:3d4:6ed4:e0a with SMTP id e9e14a558f8ab-3d6dcb5e15emr6148965ab.4.1743615766244; Wed, 02 Apr 2025 10:42:46 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:45 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 32/54] drm-dyndbg: adapt DRM to invoke DYNAMIC_DEBUG_CLASSMAP_PARAM Date: Wed, 2 Apr 2025 11:41:34 -0600 Message-ID: <20250402174156.1246171-33-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Invoke DYNAMIC_DEBUG_CLASSMAP_PARAM to hook drm.debug (__drm_debug) to the DRM_UT_* classmap, replacing the ad-hoc wiring previously doing it. Add DRM_CLASSMAP_* adapter macros to selectively use DYNAMIC_DEBUG_CLASSMAP_* when DRM_USE_DYNAMIC_DEBUG=y is configured. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/drm_print.c | 8 ++------ include/drm/drm_print.h | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index a3b70d104afa..46d53fe30204 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -69,12 +69,8 @@ DRM_CLASSMAP_DEFINE(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, "DRM_UT_DP", "DRM_UT_DRMRES"); -static struct ddebug_class_param drm_debug_bitmap = { - .bits = &__drm_debug, - .flags = "p", - .map = &drm_debug_classes, -}; -module_param_cb(debug, ¶m_ops_dyndbg_classes, &drm_debug_bitmap, 0600); +DRM_CLASSMAP_PARAM_REF(debug, __drm_debug, drm_debug_classes, p); + #endif void __drm_puts_coredump(struct drm_printer *p, const char *str) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index e86ebb716b4c..8758449491b8 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -144,9 +144,13 @@ enum drm_debug_category { #ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG #define DRM_CLASSMAP_DEFINE(...) DYNAMIC_DEBUG_CLASSMAP_DEFINE(__VA_ARGS__) #define DRM_CLASSMAP_USE(name) DYNAMIC_DEBUG_CLASSMAP_USE(name) +#define DRM_CLASSMAP_PARAM_REF(...) DYNAMIC_DEBUG_CLASSMAP_PARAM_REF(__VA_ARGS__) +#define DRM_CLASSMAP_PARAM(...) DYNAMIC_DEBUG_CLASSMAP_PARAM(__VA_ARGS__) #else #define DRM_CLASSMAP_DEFINE(...) #define DRM_CLASSMAP_USE(name) +#define DRM_CLASSMAP_PARAM_REF(...) +#define DRM_CLASSMAP_PARAM(...) #endif static inline bool drm_debug_enabled_raw(enum drm_debug_category category) From patchwork Wed Apr 2 17:41:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036310 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 114E7C28B20 for ; Wed, 2 Apr 2025 17:42:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 50F4410E881; Wed, 2 Apr 2025 17:42:48 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ky9ExsDM"; dkim-atps=neutral Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by gabe.freedesktop.org (Postfix) with ESMTPS id CADDC10E8A2; Wed, 2 Apr 2025 17:42:47 +0000 (UTC) Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-85ea482e3adso35451839f.0; Wed, 02 Apr 2025 10:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615767; x=1744220567; 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=Jfz5L+gbGfT/xExPgo+08GeL0GIfXertlxd83qmdF8E=; b=ky9ExsDMElC1aLkkZpo+JTwdF+EzIDTqBd756eC2ga+2djsQexGuQkIxIJnQgJjEci apAtvMq/if0tqjpOcYH5mqf6m6pBRMU49cTF0pPlClffnMLMdbtsNWK78nA23Fq10Fc0 UDxC8t/TLqqwLN9t//8nC8On/ddRgASUViJRTfnQsiJ44N8X+jM1uudKt6Cv6yDAWSKd AltdnXG2dj6aXEACNkMEGwW+uCpCJyVOQerZxVrlcAF+fckUhOK2Tonek/sj5cm2D9ba aJqJ32wmSifh0F1aQGgniz23e78BDYV9sZit1f6dH8iXoIT2I3DOEMHN6gueiKcWapA0 uZ7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615767; x=1744220567; 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=Jfz5L+gbGfT/xExPgo+08GeL0GIfXertlxd83qmdF8E=; b=UpLX283xOVHsi/90/vBBcR+Mmbc/XhcQZZtEw7UtaO3aHm0AGCVr1bMh6SF+dGMrhy hZcnX8cnBTQi3z35TNv8fb7HSrI5ZE6UE9WtRCIWvwaoPK8SgocTOBu8FJa3NOqGx1iZ 5GuhMXSoOfDyuWDJOcz4AIU0tAW9dAx8ICthejWgJ/en0DVoJ17KW9naSJ20/eSvPEkm cGFEO72I3/rO4TZfPbp1O1XclLFY0qiV1SAnZy1XBWaykmCpiyqyltHV8cvnEXmO0oJk LYTp0HeSm+J2YGuy8FgVj4lS03OnuwW+DEjDKWisaXl+hUKcIo0lnt2pcAsxuwB4Bn3f JjCg== X-Forwarded-Encrypted: i=1; AJvYcCWeDQv0PSsVpHtKZV/EZNK26yER2A3zuz7arM6nNnBlujXSbxjgoU6uApQtGOvxIl4eoKBEkUah@lists.freedesktop.org, AJvYcCX5voiDFGLTu11HiuAiVOCVOuXw/nZDjtoszQt0E+PEi5K1USAtyDjJtAtzDTOfkpneXs1IJGlNQih97UFgUw==@lists.freedesktop.org, AJvYcCXROaNYR4KQ0OUfVO7eR3wk4l4gw8V+WUsJHkrAUNmZ+CcobS3jdfH6mtSPz2LifhJItX7oeDSZhgh7@lists.freedesktop.org X-Gm-Message-State: AOJu0Yy4KEoXSk0//XIm6ApjEZbU4YnGsF6poDsyP2eLe2yhndNQSjhY a6vLC4LRSndawvFBoZidAv5zkfhnA+lun7OiAF+bPiQsFl/YZQ3z X-Gm-Gg: ASbGncvdmrK+dvDp7M9LLXMZHbWpH6LCoQ+zHZ/WwjL5yKtW1KGeLPB/Y1g7zB2rTcG +KpNIztY8obpZLvmFU03krgUlqI5JkXWKNDLU3Cco3TCwqImr7znpYSMN6QOK5szNWZhsR0SWp+ ceNQqvta2+FdhGSEetI45KuZtol1YtSL7IFWck9zvqSTjDiG9OclP8IpEbSTj6+u9FP+zEQSZoO 9ilB0ix9a0XUFLlBUQ3Hp0uOvrhrAxvLNrKd+I0FLtxAd2tfzuGBMXaepT/RCpfTmLiKQCCaqBh 2ExsktS5DQdqLJ+k79Kx+rVjpIp51bCviui7lYktn3xdNiMEF9FImxmSDLt0QEZdDgfZ4XUN8Yk Rjw== X-Google-Smtp-Source: AGHT+IH23Mb806SUSpux0H1ekpyWa2rzurl+V62I0zvWkX0PXGUg8/Ozal3zIS9c5pZxy7jQ85b1yw== X-Received: by 2002:a05:6e02:240d:b0:3d4:44:958a with SMTP id e9e14a558f8ab-3d6dcb5e21cmr6314435ab.3.1743615767041; Wed, 02 Apr 2025 10:42:47 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:46 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 33/54] drm-print: fix config-dependent unused variable Date: Wed, 2 Apr 2025 11:41:35 -0600 Message-ID: <20250402174156.1246171-34-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" With CONFIG_DRM_USE_DYNAMIC_DEBUG=y, __drm_printfn_dbg() gets an unused variable warning/error on 'category', even though the usage follows immediately, in drm_debug_enabled(category). For static-key optimized dyndbg, the macro doesn't actually check the category var, since the static-key patches in the proper state. The compiler evidently sees this lack of reference and complains. So this drops the local var and refs the field directly in the macro-call, which avoids the warning/error. Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/drm_print.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 46d53fe30204..41ad11247b48 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -212,9 +212,8 @@ void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf) { const struct drm_device *drm = p->arg; const struct device *dev = drm ? drm->dev : NULL; - enum drm_debug_category category = p->category; - if (!__drm_debug_enabled(category)) + if (!__drm_debug_enabled(p->category)) return; __drm_dev_vprintk(dev, KERN_DEBUG, p->origin, p->prefix, vaf); From patchwork Wed Apr 2 17:41:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036313 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 1135AC36017 for ; Wed, 2 Apr 2025 17:42:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3D2AC10E89C; Wed, 2 Apr 2025 17:42:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fo2rpbZD"; dkim-atps=neutral Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) by gabe.freedesktop.org (Postfix) with ESMTPS id A092D10E897; Wed, 2 Apr 2025 17:42:48 +0000 (UTC) Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-3ce87d31480so493245ab.2; Wed, 02 Apr 2025 10:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615768; x=1744220568; 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=w02wgtcHHGYOO+gmdOwu7/FsZrX0ILEdqRJTa3eES9s=; b=Fo2rpbZDNXn4KZFQL9NehPY/0LIARyCodDKU0l3ScGYZqtptg8xsnA2mzaOx3qj95b +fP4gXt0jCMCYiA5nrvKvyXsr+tmSF/W/ZXFdlwAYm0BuMZQgYMkcH9TMMxAItsdHyQ1 Nfurxrn5sjGmsSRsEXUH20s3YdoItlz3tkfrk3I/LgLmkDl/Tu9GftkB5CbhhrafDbJf EF6TcGGfRLGSrsBWsr5zx5XMDXF6OZT9DJQC+n3+c5UEyFZjJJlIe8Cmf+5cUi5Olp1z u8LCAoZ6WAgIMzm/gYIG+IkDCD4wFOLif/tkPTgBbqkH6HwnCeNeqXBHI7wtq9mGUGPA /aoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615768; x=1744220568; 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=w02wgtcHHGYOO+gmdOwu7/FsZrX0ILEdqRJTa3eES9s=; b=BVRngVsJMCNpMJVzmfRwZCvE+Hov1jcVAv+qxIhCTfL4RA9BP1QzVa27HOSSm2qQNR XQ8J0JFvoa3dVBjTbGz0svtUsXn0c2WAKFlvVl2X71hYIAMxqGcqZqyf3t71oTmZglIn ZaD5flQaaYi7UuXECCWtECbOKkKZdbb49U6Bq4C0/B9oc4lmdoOHeptWgjPR6q5LHgaM dgevq1xjruqj4a7aIXqosuQDD1aU8tg0MYOAFgqu0oEIa7Zbwx946HiMwLnJ4jEl9O74 h9zw1BUJiied0wzLqLq8wEywB2D7N8jQs80h+OQxt7jRIgAO5+iE/v+yf2uFU0GtlZY3 dRMA== X-Forwarded-Encrypted: i=1; AJvYcCU7NkCXgbQ6HOKE6XR0qbnb0a2ejfkQqxdCQbz+ZFE652x3tESv6tGj+7p+Vg5MVQr5Tjmtib1S@lists.freedesktop.org, AJvYcCVMku0gctxpbzUUsJFE6KTvMHwl4Me9gGILMyRSpAmO+KmMOp0J0HHcYTT3QcyXsFL9bvh/4rD4PB+0@lists.freedesktop.org, AJvYcCXXH4arJYkmV3ESqRHqidmiZsYu1SA8q+UEKGcTCT2N4tA8Lcr2fc78NIBGU1qX3kplVNLmjlgK7B9wk5EjtQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yzst0vPgcRNsFbqxspsjRzg8M1VdiLNt6V2jaApGDE+bU3pewfd Ci5/Zkbs+J1BZPryWQmgSEC3UqP5mM2sDefoBIYPGiRj5FB5Bgig X-Gm-Gg: ASbGncu5tO256DClmqjn3dlemlvrbJsCc0KEJsTH+tcXryQDmXSrCJapbZEnRTzUHtv xOMaknMah2/Z629JRncy/OD+weIYtkpHLHdx5P3f8KB+TPCWyEtRMB+9sq2FrlOx+ZmSi03e4u1 ozFgY6002etobxDMU19llHi/diBQ3ECqRcu/SxWnUrcSVDPprGMwsxlkJYDeqLLXlGvBr9Z5cmi Z4yeGQMuMJ2zLg8fPFBYlUttLTDQvyw1j4vDF5VPy2kq2PIc6+1QE0I2sZHwjovAjPabBK3QZua YHOjRrsQYu4muTpuyI2d7DcvyqyP7h+o+jYiNG+zAoxAHhDraqzQqVjubm0+DS4ndUGzfSTwF2t mnA== X-Google-Smtp-Source: AGHT+IF1HLIFdbvBCtWhlGzPwTstv1cbLvUICq16go06Bgug7/wjFdTjKb45EA502/WLzrR1pH3YCg== X-Received: by 2002:a05:6e02:3c82:b0:3cf:c7d3:e4b with SMTP id e9e14a558f8ab-3d5e0a09a11mr204521865ab.21.1743615767925; Wed, 02 Apr 2025 10:42:47 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:47 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 34/54] drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver Date: Wed, 2 Apr 2025 11:41:36 -0600 Message-ID: <20250402174156.1246171-35-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Following the dyndbg-api-fix, replace DECLARE_DYNDBG_CLASSMAP with DRM_CLASSMAP_USE. This refs the defined & exported classmap, rather than re-declaring it redundantly, and error-prone-ly. This resolves the appearance of "class:_UNKNOWN_" in the control file for the driver's drm_dbg()s. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index c0ddbe7d6f0b..e1367f66c4d2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -234,17 +234,7 @@ int amdgpu_wbrf = -1; int amdgpu_damage_clips = -1; /* auto */ int amdgpu_umsch_mm_fwlog; -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +DRM_CLASSMAP_USE(drm_debug_classes); struct amdgpu_mgpu_info mgpu_info = { .mutex = __MUTEX_INITIALIZER(mgpu_info.mutex), From patchwork Wed Apr 2 17:41:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036312 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 F09ADC3601B for ; Wed, 2 Apr 2025 17:42:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E6AB10E89D; Wed, 2 Apr 2025 17:42:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Rhx/GeQY"; dkim-atps=neutral Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C14710E897; Wed, 2 Apr 2025 17:42:49 +0000 (UTC) Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3ce87d31480so493295ab.2; Wed, 02 Apr 2025 10:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615769; x=1744220569; 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=UexT083kjVXSMtfjeXG2YLxPBGob4DA2kkNTE3v1uqE=; b=Rhx/GeQY3ltV/2oJbfQHK7C8jVDlSVdXvO5/1/iqQxNvxp+cKj4oI52uLqC1PRLfao sopkzOY0HrKgDzX7otI7RjJd93lE1VxBmJsNtY6OfzdU8HUYRMwVS8GBuA5RJ8FUIdGB vK02skiHXWwnkGt3iyuJdF5J0c5SgH33N38DiY/h1SJkzLjplZemEHrys5hJsyVvokwV FJwrJ3o39V/XaiwE3A+Y7oOGpLxbRgJFS/n2X8soaoJ0FDJW5JiOAe7wvOCXLCA+tVcR VKjZ1wp7RTsrUuI0r9p9o9Vjaf+SeLjqLHoyS+wyq8BUzxLo9siuFFvcqueR9kjGmWDL C9ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615769; x=1744220569; 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=UexT083kjVXSMtfjeXG2YLxPBGob4DA2kkNTE3v1uqE=; b=NP7lh/kj89rNHg6XdfE25caCuYjzgF1VkSwqCvr48RF35bjqZ5Oo7BtihC6r3gw1lZ yh4yceFTQOd7WK5qXTdJUAlWw7bwyD3Pt5B4jxeYnhqjyN8hODkIJSaIL2J8dl8btrCa ahIMiwROYK6F0LAnu9CknEBiFW3w9q/h+s44wUC+UOTtX31wuaq9e/o/yRlFDocIuFoS t253p48eEIc8JWFqOp678NejIGaZoYSO6DOf6+DhLZ7xC7QE1x2zTUltjFKlKaSv41pO bLEaKjecBo2Gc4HWjrtTBTqASCIU0sGpeQsZXlL81ceuFnl0rsXcAZ/Cdoch+ENSDGUI BPwA== X-Forwarded-Encrypted: i=1; AJvYcCUNKhBo8pkGdWn12EtUwPeod9wotp56KQoYN1XwvuEyVvBu6wJ8FmALuWK/R5bPm14eUyCtEAgpZCoo@lists.freedesktop.org, AJvYcCXYh4MzEP5p60Siir/lCFPi+VkYyGJqqq4dPXp+3nDUTHlHu9kZDRyOO2HXJO+nmB6LfAujH0WdpnSG09M0Ng==@lists.freedesktop.org, AJvYcCXpaxpIZSHxxgE20gJT1FghZA4qM72wwxJRC64GIcYBek7UltVL6PDPVCD1twCEA7CsmCEDo6UP@lists.freedesktop.org X-Gm-Message-State: AOJu0Yy2vvE7zOwb0HZA4CWX6Xb3+CQ9fZnyHBsF9kdC5090malKb8Mr ya6lcfH64O84rzdEk8maMeTan+GItBchAbPVyYfwwMRYL0THPcqE X-Gm-Gg: ASbGncvb10j4ppCXCKyZmdh7y163wV+atyKfbcvaEydPctJ8nxAWAMsaoPE9rC5PCPq vTcCGrzfHzkjq5wCJdHCIjTEFzZhS8d+bORxKMhfn+A4AN/ymTatZjQljbY9+gROhL2ahE4uION TTT2jz0nFsrHrifVDpIxV5gNAzXgnP1YMyhr03OYbHpD0HwLr1V/june0xhtalwAGYbBEDwsiyb LCtBS+S8MD2eb0OfCjycHQ9iPCoU4ZYtNwRUvrEiymoZH+GkhV7Qm5RPlk8+3jmiFpTLVPtj98r LLDOVx3PsNZIbdcEKdKzQrXd3xbExSiJiDbkDd2J291JrhGqcGQHAj6rdYFTFYTSg75z9wLaWpD EbA== X-Google-Smtp-Source: AGHT+IG2+BK5PK9DVFs/ltNR0E73frvh29ivhJ5H3WwGU3GpDmZNKKN6o+UboVJzXIf7Z+nQdkxLrQ== X-Received: by 2002:a05:6e02:184e:b0:3d0:4e57:bbda with SMTP id e9e14a558f8ab-3d5e08eacfbmr222774665ab.1.1743615768727; Wed, 02 Apr 2025 10:42:48 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:48 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 35/54] drm-dyndbg: DRM_CLASSMAP_USE in i915 driver Date: Wed, 2 Apr 2025 11:41:37 -0600 Message-ID: <20250402174156.1246171-36-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Following the dyndbg-api-fix, replace DECLARE_DYNDBG_CLASSMAP with DRM_CLASSMAP_USE. This refs the defined & exported classmap, rather than re-declaring it redundantly, and error-prone-ly. This resolves the appearance of "class:_UNKNOWN_" in the control file for the driver's drm_dbg()s. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/i915/i915_params.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 37746dd619fd..2dc0e2c06e09 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -29,17 +29,7 @@ #include "i915_params.h" #include "i915_drv.h" -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +DRM_CLASSMAP_USE(drm_debug_classes); #define i915_param_named(name, T, perm, desc) \ module_param_named(name, i915_modparams.name, T, perm); \ From patchwork Wed Apr 2 17:41:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036315 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 02A49C28B20 for ; Wed, 2 Apr 2025 17:42:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F93B10E8A1; Wed, 2 Apr 2025 17:42:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ktv2pRs2"; dkim-atps=neutral Received: from mail-il1-f181.google.com (mail-il1-f181.google.com [209.85.166.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A1B610E896; Wed, 2 Apr 2025 17:42:50 +0000 (UTC) Received: by mail-il1-f181.google.com with SMTP id e9e14a558f8ab-3d5eb0ec2bdso423565ab.2; Wed, 02 Apr 2025 10:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615770; x=1744220570; 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=l+xh63ngQpysf5TdioxYR9h/6SGMYGM5RCAWumi1pq0=; b=ktv2pRs2rB/ALk/dKy6makiuOYR3agTwm9tuhdP8Vse+8yWTdv4yaKH8adYSF0Mg0+ +PSfV1odixJiVI5Ac1GoKjqMVKNHHvWZYuF0Ib/MZOvDzWsOpnoDH7sZsdEDju6lgfTb oxBNChgHsFEhO+aot5pzuRcT4iYuYDZQ7CsBHymo+yB3pRxXguQrQXspD2F3xEuiAHts DNKDB/GRat3zLWaSoAAadcc20QNSx6eqV09RdhkAJ1STmwIoy/VW16PiWXPYzQ0A1mAg RBkveVVIaICGsKgRn3PC/OLvIxkLbx90WuNZOxa5qxklAKfeCFnjtqXvmraFflmchp3n ii1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615770; x=1744220570; 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=l+xh63ngQpysf5TdioxYR9h/6SGMYGM5RCAWumi1pq0=; b=rqrproJxEAaSU4dgiSSVISeca3iTTYN+QBWZ6V5XAP2zejboa0S4j2EvukPCk9aF32 3FB2Uyxf0a3RjKS+Xreumg61WqnIFBDij27ZARkHnynBbxODxvFQ0T8PECXjRCIr8JXc rwhR1bG2rPrsx/OEhekeYPIH4TxrVUc10DsPNUVZFMHf5y9U87whVsrfMzjiQB0PNWlm IFLsDQm7iCxjSip2WX3XQvrSGA3tAnKY+0jE7LQOWJWrpD4UoaiRUDq97p3pxe3Hdtsb 0R4056+b5jX6++DM3TEvEOHnHZuSAlDCwK6WlC5D7fHo6gGslRa/QhrGiJHLIzhK+TKp EeMg== X-Forwarded-Encrypted: i=1; AJvYcCVie0ScqzzkrVgmAspIn9MWKA+XWI3uXQ4k2cWeEfk0Y+iNswhtfHEWPAEKikLIc4GB7MPD1YVDk7KtTz/KKw==@lists.freedesktop.org, AJvYcCVltHXIkeMq2F7K3bpmvgLr0zGdDAO5QgIzagjE5gtSQAuhRSkg7s98J4E4i0MrT0p9rTMQDNSVNUso@lists.freedesktop.org, AJvYcCXLdeJH5WGAFkvHzvonxctcD9PU4a7xdIhAhDsqjh4gwAjnXnQ9CWSySFNNcU9JIadTEAjS8hfP@lists.freedesktop.org X-Gm-Message-State: AOJu0YxnbG7Be2ahODMK42ZUmFoXg80HWA8WvwXmFIcrGO3QKPfxaPdz Oug6KweCUmepk12gamAAjFncxNWQkndui273Npb2sdb06krx1dcz X-Gm-Gg: ASbGncv2HWSpfE1IhIdOxv68leQNrM+Q2OSJf0q7EWOixGVWuHot5vxF0L+EqISrM1m BvPG5e19wXBEhKrOYa0DM17PfrnESnBhI2tmYd2A5kqUvUElWHpWBK3MEtpFUVPgkzg36xqhGZS Cr4/63v5QsL/zXViPRxWvRqIDtAVIOheIl3w+ZC0cyCmrihB4jIz/8DtZpOhqvpaPdUQtzfh0AL yvkPzhrqGOoknVhCdGXaRmyyawheP2bf5PPmlQYq6Dr+Zp/r0tYCZVrWp8KDRZIVtqlGSwQEViv NkF4qbCk02jsaEzmoeWlV/D12QlzfEooTP/MSKQy8hunmx7XPCn6DcW95R2OUl5Bq1ScxVDzATy M6w== X-Google-Smtp-Source: AGHT+IHfVFrzVXMnd2YBb1/YfvvBl5qCe+8rGWdMzMU5nSjNPKKxFlNTX09jmDed7K6kxVwAkyqtVg== X-Received: by 2002:a05:6e02:184e:b0:3d3:dcb8:1bf1 with SMTP id e9e14a558f8ab-3d5e08eb179mr230026675ab.3.1743615769662; Wed, 02 Apr 2025 10:42:49 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:49 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 36/54] drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper Date: Wed, 2 Apr 2025 11:41:38 -0600 Message-ID: <20250402174156.1246171-37-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Following the dyndbg-api-fix, replace DECLARE_DYNDBG_CLASSMAP with DRM_CLASSMAP_USE. This refs the defined & exported classmap, rather than re-declaring it redundantly, and error-prone-ly. This resolves the appearance of "class:_UNKNOWN_" in the control file for the driver's drm_dbg()s. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/drm_crtc_helper.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index 0955f1c385dd..1d08d759f238 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -50,17 +50,7 @@ #include "drm_crtc_helper_internal.h" -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +DRM_CLASSMAP_USE(drm_debug_classes); /** * DOC: overview From patchwork Wed Apr 2 17:41:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036314 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 E117FC36014 for ; Wed, 2 Apr 2025 17:42:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0755610E898; Wed, 2 Apr 2025 17:42:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MaJ+LL8j"; dkim-atps=neutral Received: from mail-il1-f175.google.com (mail-il1-f175.google.com [209.85.166.175]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5816010E8A2; Wed, 2 Apr 2025 17:42:51 +0000 (UTC) Received: by mail-il1-f175.google.com with SMTP id e9e14a558f8ab-3d45875d440so607745ab.0; Wed, 02 Apr 2025 10:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615770; x=1744220570; 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=NiOyM3S4jOaHGGlz5AF/FsMWLYpHRqSO4fLf+H68uvk=; b=MaJ+LL8jBCHz7zYR3K7/bFUwCQg8MkPr9RHEfPWCz8nnZAUur3Khy3O7EG6mOhlLdh 1QK79/nEPF41GJ9/u8tTbX1nKsqcvaIfLd/qSzPCUV/fwHQksDO5Q38h+ztiv0tkcnkg RS0Dkf+ajjayH9mvmZPM5B8t5X+OVEAejWtjzV9cBkgCeH4Nd+pb7/QiqggbCYq2cJbq B21OtP5QF3LEdrcMRKQwuDzYb0q10hM/k0ARtSK3mdKEA8ApvjmgKHiUsXEv9+2OTOjY slMBBzA9RvcFY4PCYLroT96AwLk7uZQRkQ/EPJa2sN7ne2AV/QpCvBpnafkk1vaRqEPd 0jhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615770; x=1744220570; 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=NiOyM3S4jOaHGGlz5AF/FsMWLYpHRqSO4fLf+H68uvk=; b=F0TQYfpxypvyRlKHL7GzvcGTW0qtX6jJKUXKuuQVOvwQHOz2KiH4/XkpDRgREvejqn oxnrWrJHGnM8Sc/jhVxA2q3Xf5Zzl5LqIPEJY+jVbz8FZG/48Putzoe0cWX1Cw//AhuN NMDxiR+kiGmPz5u30sJCmn7FrCCLjpaB801CXaLLFWTx9xI2zs7Cm+30OSOFDovDtCel Lx7/828Emu/QZX5BiBRwddyVS5nJOgoMf1GPTeWDLmg7mK/APlKqxamZOdh24cCT8qpG tAH50y8eUqu3Ky0t/UIN0oKe0tWf3sWwZD6/eTLcI60y2l8HQ4xKzFugPXKS4IgBxP88 36Ig== X-Forwarded-Encrypted: i=1; AJvYcCU1FiFPQrv3qh+Sgt5eHdcBbDRA9eIu6Yoo+/SKl+Ci3VIulA2HEAVh0OAtI6t2ySShk57gJOuMZVPf@lists.freedesktop.org, AJvYcCW4JnCTTheXAlR1JNjJBGadrdHubK5nEoMQDR8ySw6XZ6br3zeF0EWRynA21pG0ksbrn6xyepQhCDg5bCibGw==@lists.freedesktop.org, AJvYcCXqXPJmNfudjHiSp25CyUyTY8II1w3VPV0YsKPE0Dt8+WbbkSQaQuzi6+pc0ivBTdhb28L41UEB@lists.freedesktop.org X-Gm-Message-State: AOJu0YzOQkQaiVC9mfpbJPPh6W0EzoqaAs0WKVN+7W1fMTCjRwuiKhVS MotQ+BNLzw1fI/+LWNOQpOVzZZ6lDwEgdJccbF0IUEiKU7vw9JJ4 X-Gm-Gg: ASbGncs3qF3LsZr3NmRe5gFKU1QyOjpZ8cfHPvEa64SvNKDH5K7/rX7hwmMtCBg+yuB V/xKONiaaipAFXPqTDUGyWu8rKEx0VP4NkxMfYsYVeTkraiWL6kPOte1WvLaD4T2JK35Uuwfvfk y6Cr60mzQszqb3xTgkOkA+JZUFqQCN+PZga5fdCm5TCTazKlQF4ky99RdlUM0coJNVSlqyIILaq N51dhzy6g2Jc4Ut2wPLzVUENYCnLN9vY2iHqu7deg3cDzQSJPlA08sXCdbuoizLnH0V7qq1B+iy Fg3yNAgX59WVezKE6j3ovuGRkuLDpTAmIT2qu86H8efA1i9qkd0hhYSt8fmYpZXnwMIAmEcHnOx WsQ== X-Google-Smtp-Source: AGHT+IEmCAdxBmK0dq3RonyKvIJjIp5sHVor6eltDwW67xuLu5GGG8D2N9ixjYNq41QL7O0NfYR3PA== X-Received: by 2002:a05:6e02:4401:20b0:3d6:cb9b:cbd6 with SMTP id e9e14a558f8ab-3d6cb9bcef2mr55037985ab.13.1743615770553; Wed, 02 Apr 2025 10:42:50 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:50 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 37/54] drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper Date: Wed, 2 Apr 2025 11:41:39 -0600 Message-ID: <20250402174156.1246171-38-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Following the dyndbg-api-fix, replace DECLARE_DYNDBG_CLASSMAP with DRM_CLASSMAP_USE. This refs the defined & exported classmap, rather than re-declaring it redundantly, and error-prone-ly. This resolves the appearance of "class:_UNKNOWN_" in the control file for the driver's drm_dbg()s. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie Reviewed-by: Louis Chauvet --- drivers/gpu/drm/display/drm_dp_helper.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c index 61c7c2c588c6..68ba17eb2541 100644 --- a/drivers/gpu/drm/display/drm_dp_helper.c +++ b/drivers/gpu/drm/display/drm_dp_helper.c @@ -43,17 +43,7 @@ #include "drm_dp_helper_internal.h" -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +DRM_CLASSMAP_USE(drm_debug_classes); struct dp_aux_backlight { struct backlight_device *base; From patchwork Wed Apr 2 17:41:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036316 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 2463EC3601B for ; Wed, 2 Apr 2025 17:42:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D18510E88A; Wed, 2 Apr 2025 17:42:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GTv0FZZz"; dkim-atps=neutral Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 774EE10E898; Wed, 2 Apr 2025 17:42:52 +0000 (UTC) Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-3d6d162e516so932325ab.1; Wed, 02 Apr 2025 10:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615772; x=1744220572; 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=PH1+tp+xqUGCykXZdLvGRvCsZKn18R+wsUvu6RBydR0=; b=GTv0FZZzXa/WDWB3lLRLdLs9VpTXEq6FiwR2ZO12SIPIEtDzieQ9E4rkG8mygpERqo MWu4e/z8QlksnV2YcZgYLRzEijkXI9phKF80/wOwFiohtpz1m6kZkYZRP0ks2wSbertW dUEI0hJKWK8txOaYPNDJ9kq5BdaQ0tL1KOaRQu5jx65JDJXkGwTZMRBpkhErYyR+Tu3Z PIejVvy/G43a+i0Q6tsQjtunK8jRcYdFjGR07Tm1K1VryTwqdt4FHcAbEFXrHO7LiNnS 5R4urYmSgxbDmlItUqqi75Raw+BRrHpKDuIdplZKtQqsmSdBNsjcM9rUk/MNxE3DiU3X c/pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615772; x=1744220572; 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=PH1+tp+xqUGCykXZdLvGRvCsZKn18R+wsUvu6RBydR0=; b=eW+55qXkN2vAwGFCJk5o8TL7zr/L+Vecy0P0fnNlP7sSmhbyIsFLYzI1UZvR87uwAS gzOJxXMWQn/58536L/tAuA3L0yLEteupsfhovdliyS2JAdo8CkSVn2UzbW60/It7n6fa eBtWIaChKqahOQxPB3WqUHGf7NK0duxjlmfXGJhS2GzJf9UddxConl5rtKs3/yPxhiQV ePDpPA/sED068qZFb2y/S6PIAhchybG/FlnbiEBDLWG9jVDnKn7WWOdisW8cKkfHNc3W HKcQ5L7TVibZ0bRYvC5YzjdT8ifOkcj4vSRTEwVs17z7ds6Y70v0ZeZ3orAuly6X/ORs DGiA== X-Forwarded-Encrypted: i=1; AJvYcCUjyA7N2zYw5Qngn1mscEb4cB2X+hOeaIkWDhChI/hSB6XpsHPiDqU8mnU+bIeey8GQaB+kGXDm@lists.freedesktop.org, AJvYcCVd6+cH5L3jz+pJ4hkRQtldjfeQF/TCJ0zv14TzSlQQy2bxSLx0ccIskMA3iIMvWTMYU+1hN2Wa4+Il@lists.freedesktop.org, AJvYcCW4dj24yjdpCBEwgx7zZPT3okjVbnJPMBHN1WI6kwjGZaAut+6/h29CyDIyZavrAq/bhT/R4cWKH16aOh0Etw==@lists.freedesktop.org X-Gm-Message-State: AOJu0YyOrcawto4mbYqCggZrAjPb6/8NriZE6wxXlZLcTikKLeeHgsRF RsOXsBq1XHMmhFWQZeNbQf6WdUGV3wcLgOAOSfTYF/Jfsq73eRGs X-Gm-Gg: ASbGncsE7nRWFlKRF7zFby7FSNY+qt2Q7aXgCeUQlkS/UYEgbnTgNpP96qA4tDKvYlC FX2Dvnvi0fWotpY07lwS4dRb71riwCdgYkwot88OgwBEyISPHOympJbqyfUm3Kbsc00pjpWw6qr nBGxVvE92vKHFDAUDF5gvv/bidVbFbS8V71tsmrmFYW29YCh3/NCX4RtU+Usd2z0S8HvLVyxJaw BjDWu6EYIarikKXbbs23S3vT603hJ7dBxEwwlKhyfzXCEP750QV8zz36kvrgu+1FusQP1BrMjR3 0/s0lomeAESayMcf0vjJhZFWyJaQDLplwlRvcSzntxu6JxeQ8OM76E5wgKvaA3dhe8q65+PadD+ uWw== X-Google-Smtp-Source: AGHT+IFF0Xv42t006bgupPe2j5bd7+HXA5fzPJlKXda74vmLnmw3u7Z/scx8WHUoSwUy3lRWMoi1WQ== X-Received: by 2002:a05:6e02:1a24:b0:3d5:eb14:9c85 with SMTP id e9e14a558f8ab-3d6d54a1f71mr36768785ab.6.1743615771683; Wed, 02 Apr 2025 10:42:51 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:51 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 38/54] drm-dyndbg: DRM_CLASSMAP_USE in nouveau Date: Wed, 2 Apr 2025 11:41:40 -0600 Message-ID: <20250402174156.1246171-39-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Following the dyndbg-api-fix, replace DECLARE_DYNDBG_CLASSMAP with DRM_CLASSMAP_USE. This refs the defined & exported classmap, rather than re-declaring it redundantly, and error-prone-ly. This resolves the appearance of "class:_UNKNOWN_" in the control file for the driver's drm_dbg()s. Fixes: f158936b60a7 ("drm: POC drm on dyndbg - use in core, 2 helpers, 3 drivers.") Signed-off-by: Jim Cromie --- drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 5664c4c71faf..bdecd27efabf 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -74,17 +74,7 @@ #include "nouveau_uvmm.h" #include "nouveau_sched.h" -DECLARE_DYNDBG_CLASSMAP(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS, 0, - "DRM_UT_CORE", - "DRM_UT_DRIVER", - "DRM_UT_KMS", - "DRM_UT_PRIME", - "DRM_UT_ATOMIC", - "DRM_UT_VBL", - "DRM_UT_STATE", - "DRM_UT_LEASE", - "DRM_UT_DP", - "DRM_UT_DRMRES"); +DRM_CLASSMAP_USE(drm_debug_classes); MODULE_PARM_DESC(config, "option string to pass to driver core"); static char *nouveau_config; From patchwork Wed Apr 2 17:41:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036317 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 4FCC8C36017 for ; Wed, 2 Apr 2025 17:42:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E04AE10E8A4; Wed, 2 Apr 2025 17:42:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X461quz7"; dkim-atps=neutral Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29AA510E899; Wed, 2 Apr 2025 17:42:53 +0000 (UTC) Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-3d5e43e4725so476775ab.1; Wed, 02 Apr 2025 10:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615772; x=1744220572; 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=FATfNmmYepyBuSsmf/EtXKQeipPGgu5dSGlE3AdOnp0=; b=X461quz74ut6acwpjggJ80Dw4AAhBDuVeQV+S+cuPdy82WGts87eBSAorkr/rlDikg qvpSo53+vIWYy1yAzhrVCeRFyj0EhM0vsn7uuLRyfKrvX7YagUS7rqM0ilSYEs1Ccik/ /HoXYnCyBFinbzXxmUrP3EYe2RqC2CJzABc0jp5PI7kmU5A8HRJ9OU2139yI+z6gRmbr kSOmLpNUtpLD1DjJpao64yAKJB42jfdgvmjVuGvO+yx1tCY7P8xyJV5Kf9xis/7fsy02 1jrHqoFQjDaccymolD86mW6/f/SmKW2cSV9ZtXjqJUBQ3MrBabIOuGARglyG0Q5UXbAB pQbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615772; x=1744220572; 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=FATfNmmYepyBuSsmf/EtXKQeipPGgu5dSGlE3AdOnp0=; b=Q0OpzweKp8o1soNMGdTf0UX1g8U6eTPfaC4IBPGeXC7nlZFHGCPBZ1aDP2vPxQf1Ou Q6PK8P3mcd3c4PYWE2wHSV2QpPcX+yN4ddUbQ5Dw4JXNdylE+cKdKedw+YD7aQUwDLNN +24Sx1hkX4uRcOHHxj5fvfgW7CkZX/Rase5p1cNblYKOHlCZaOp7FdOCyj5zU0A4dVAe Kdnm+XVLsfwMICnpA+rU50QPGjoUSDhl9BxMPt3p4M4KhT3MASYYZo6+Tq7YGjooIdnc Y3+Vv0B3o+dazgpIIZS8qHW6dwjeQkX77F1bZ5Y3oDpxLa/XDVX4L8CwlrsLDI+Z9lfR iK0g== X-Forwarded-Encrypted: i=1; AJvYcCVRU525boEL3jhOYNDtnfbvpc4paJOjLMkqfULQjnsrbvXtbBZuJ+/duwj+Zhmwl3SASKP9KULkcsnL9Rm6ww==@lists.freedesktop.org, AJvYcCWBjQO0LLTkyPZ05IkFtu45OJlNA9se1X2JLh/QIsHCLhxOPhLBt43uRrn67Lrc58EaDtPEgUAz@lists.freedesktop.org, AJvYcCWjymL+uuhZf48vUXjP7AtuX+B1HSrkHoqD4UDT9W3Bhwh+z2aebX458iv8uEDb1JdM6mQor5j7be2S@lists.freedesktop.org X-Gm-Message-State: AOJu0YzVbSIXafq+AWPJdk8U+go3tAU7KTuXsIpMA/FtvhhmymcQEVES lyccfxRXS2qzSj0xnOV/p7gdZqHryW6+xA0E7AzZjIzlCpgV1dQD X-Gm-Gg: ASbGnctNLP4BcCbBzaiWsgohIk9Jl0tquNkOIA62MEzAW6y+pjiB6P50EXFgU6+ChN5 W6y0nU7kfUhcVclbDVtB/+2YbXheWEXJebBd5jUdBVnoTiQAX9izQdMOKgJK/Q0Jie5o1RPybwP PaQ0hYRtZ7IURgSj+Vn2kSbSl8pgO8DLwlPICDIRSpKhOmSKRMIz8ML1pZJRTxDWEAG8+qNFYGc gU9MFl3jSMK27xQEkHgkKA1uxvk12I6RsOhhCouN141vgmPXGI0gZy36yvGdEtOu/+xn11zwnsX G/1ooc156F7j1czyc//iotmsdI1dqtuzI02rYXpc5vJp5H1t+L5ZqKy9nR7r4XHEYLmNDdar0X6 FXA== X-Google-Smtp-Source: AGHT+IGe4ZjeecOx7VkTalotPIU8Orb/rdY2ZWXpy2CrhIYZ0sCG25kLdKxcJbOn9Bsi7SG3UWODzQ== X-Received: by 2002:a05:6e02:b4a:b0:3d4:36da:19a9 with SMTP id e9e14a558f8ab-3d6d5535b1amr35121145ab.15.1743615772465; Wed, 02 Apr 2025 10:42:52 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:52 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 39/54] drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver Date: Wed, 2 Apr 2025 11:41:41 -0600 Message-ID: <20250402174156.1246171-40-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Invoke DRM_CLASSMAP_USE from xe_drm_client.c. When built with CONFIG_DRM_USE_DYNAMIC_DEBUG=y, this tells dydnbg that Xe has drm.debug callsites. Signed-off-by: Jim Cromie --- drivers/gpu/drm/xe/xe_drm_client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c index 2d4874d2b922..756dba5c88f8 100644 --- a/drivers/gpu/drm/xe/xe_drm_client.c +++ b/drivers/gpu/drm/xe/xe_drm_client.c @@ -21,6 +21,8 @@ #include "xe_pm.h" #include "xe_trace.h" +DRM_CLASSMAP_USE(drm_debug_classes); + /** * DOC: DRM Client usage stats * From patchwork Wed Apr 2 17:41:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036318 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 513E8C36014 for ; Wed, 2 Apr 2025 17:42:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 01BD710E89F; Wed, 2 Apr 2025 17:42:56 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="di2dQ8kQ"; 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 066CF10E89F; Wed, 2 Apr 2025 17:42:54 +0000 (UTC) Received: by mail-io1-f54.google.com with SMTP id ca18e2360f4ac-854a68f5a9cso2556039f.0; Wed, 02 Apr 2025 10:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615773; x=1744220573; 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=lmnUjD6NKJR963XR8Ej2QuH8oZFh+mV0bkdDgwQtC1c=; b=di2dQ8kQQh7xS/JBDUgTAFXG+BQkZeJ9VU5iNc+aYc6xo3uDUZ8dW1SCEOhtbD1qXw xVLDFHErxs7b9DtgutNllNSq4tFO3I/6iVjbJ5nlFEul67wKTTPFZew+LQasAQaOtNBx IDm7eEoWYA5aEUf5jg0smCx5te7lq4D1NRjEOOh+AHviDb26fpV6LIVVolYaSe3SYx4b zWWITRBJZQLHLv+B8JnhG1zfScGKBgoY0yo63lnP/NMDI+/S+uJ3HgJgiKrRNf5xivPh dLNV2XtgkWkt+1DeSVpbKM5HPjbqK5/PMtudRssdqOYXQHU0Um4m/oeQ+Bfk6AOKq/TG zv7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615773; x=1744220573; 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=lmnUjD6NKJR963XR8Ej2QuH8oZFh+mV0bkdDgwQtC1c=; b=aa/7KBl2vC9HL1GuUJW/FrectgQquq1ifEswmRA0m2c6FdP0bkohOJORO76N6ui5ix KsAlTlTbeLB0zcKwWzvI7yxfVG+6y9A5xxFJHRYh8miz6BqMwNNoGbSnBmUOgYwED29n dEVHxP5McaqBh3MC2OEVf5wA4F57WUbcD6lLk0UVWYgDRRI7jOwcAxX3RfU+WCBIprkO 0kvnS+rBK8pCuFqOSKNVS/CZVKXChQNA6ERBNs+WgSv81Yb1T2KUIFnE/7D/HXJhL029 1RpRlTYldx1A6btVbjdweJuDXfv9Rwy8h+ZFKWmA9FjBWh/AFt44jIav2svy1XPmJ+08 7mTA== X-Forwarded-Encrypted: i=1; AJvYcCVsPehr/3GFlqjHqwIge6jc2fjPcPjR/hdvWNH8xawsEqESb0sjhFcLh0FMrVXmsUD2Q52ep/3N@lists.freedesktop.org, AJvYcCXd1a+dAjl/vujPIDcDAWq/2Yw8sURprRw0U0lLdoJirT/DSbPO0ouwhkNYMchMudm/tzgJNUn4YamH9k/DEw==@lists.freedesktop.org, AJvYcCXuXMTlpaMbq+ua0q+9xgZugdJE/rWM9H7uEkwwwynsPwIupitpiPwHCmnJiuxE2Q+Hn0ph/oKdZ6sP@lists.freedesktop.org X-Gm-Message-State: AOJu0YyfrUZM8ssVk77SPFyLLKN8DLEyQCvN0vzcIExvHrLZ0KLdQm/F GHLOTXYTGoF7gQhlOmcVJqETDJF9AbyiuWnrvPi/aHqULdaZj0hk X-Gm-Gg: ASbGnctak1eozV8gPA3bJoFnSGmj5fN3O1dR26yf6rQNfzPHgY21vMnH1FNxjgzALba GOo2jRStL7LN23SqMiZNuJywV4I3t9IT6To5KeijGC7AquGhl3cYruzVelzFzFGCUjJrKcRUccm jDBUH2JTPl1AnUOK+hfvngp75mnxqFiaAFZkt7dpQDEyXhDTZ3htKHIFru7bYeTxsDE4Ts5WZZb cX50yAm6BhmXh6xh7SurJP/5BqTCnz4kRafFS+kPjege8gP4yD8GHwZopUgW3kRZ6hVJCuHr4WZ GF3sfaYu4Ij7bn8eE2n/nYSGkkViDTk6rRPi1m/F9Lzn0sg30F7Ly8prrWwPa1G0B+HrprbukYQ v8Q== X-Google-Smtp-Source: AGHT+IEsoNgpLODjysSkI25oKJsaNZz7XSjHcm/Nhcv9gVki2+9S2pVoYAXgC+K6TNfR04N0YUf8TQ== X-Received: by 2002:a05:6e02:3981:b0:3d3:d823:5402 with SMTP id e9e14a558f8ab-3d6d54a1420mr42397655ab.7.1743615773292; Wed, 02 Apr 2025 10:42:53 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:52 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 40/54] drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu Date: Wed, 2 Apr 2025 11:41:42 -0600 Message-ID: <20250402174156.1246171-41-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" virtio_gpu has 10 DRM_UT_CORE debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module has class'd debugs. Signed-off-by: Jim Cromie --- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 6a67c6297d58..3bc4e6694fc2 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -45,6 +45,8 @@ static const struct drm_driver driver; static int virtio_gpu_modeset = -1; +DRM_CLASSMAP_USE(drm_debug_classes); + MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); module_param_named(modeset, virtio_gpu_modeset, int, 0400); From patchwork Wed Apr 2 17:41:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036322 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 1F272C3601B for ; Wed, 2 Apr 2025 17:43:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E7E3B10E8AD; Wed, 2 Apr 2025 17:42:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TUoIZSSU"; dkim-atps=neutral Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26FA589613; Wed, 2 Apr 2025 17:42:55 +0000 (UTC) Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-3ce868498d3so420875ab.3; Wed, 02 Apr 2025 10:42:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615774; x=1744220574; 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=/3ieg6OYf20TvXEjKUEioS2vPpvBZB2Yv38SKV0x07E=; b=TUoIZSSUGN7jtpOXRJEnrXJp05eA4hohNwJz3ylsvp/ej4fd6fJDz7WskM4Y132iiv 9qI6f85Is0U9s8QM3nb+fuhI3rp5qMWxVgZI70ILFRMWaFWOK6qOU8rxgnC4soVyb+9v v9KcIcNPBqW6+jryALw0rzcAfdjuVfm/iKlpXuWH9dpEmYwCOTRl0GptaBY+hgsaEglo uGYqRCqrifOMNScK3WAUxPn5p7jWsiXLG+5l8O29ELqg/5Zndl4eOy/1CvBDb2s/sTbr uTGjGkPR+jmeWGY/X0RXaDLsrUDxXvjGuyq1inMD/O72Qeo+BVfTgu7aAJfqChbMwyJi klsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615774; x=1744220574; 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=/3ieg6OYf20TvXEjKUEioS2vPpvBZB2Yv38SKV0x07E=; b=a6aWkhvXFHY13xFV5/9D15Qx1LyDlfEWBogWj21/mP41NaJwkGLCh5A3hZTneN5BnO 0YIqO4QTeIrNVneI5ACOnm6hG7/cCL226YDHzQU1HFrYSNCTBJuTaRU9hxUMVB2n426e VZ14E/v5wJebspKzyLVQa3beaP7CNqaVxFCpEvsW2or2nYoZKu51c5itARb5dnUaHg4k Ncsyh+qeShkkTYFJ39I6sGQrHfA3x3RUHCUt/4iKkn8DToS8CgiYU/XjVVhvoAUuIxRX /Da0vDs+uYIZdooSaRx2yBoUfKOf4kE8BjdGi7jRtl+9ACusuG2nesR4lWoHY5cROrd8 LXlw== X-Forwarded-Encrypted: i=1; AJvYcCV7EpnieIJJD6bb8VD/7h0GifOY5EZiBy2Drw6kEMusfOm6r4F08JDxjbE3uhuT/O32fRndWVb1asvL@lists.freedesktop.org, AJvYcCW2UqO3XaJKm9M8nnKDO+ghcrjX67AtHlWmwjwm9o/idy+E+MN0pbjt2P6O2O4Xc4maRSYiMjKC@lists.freedesktop.org, AJvYcCXhejIGJueTuaOj7U8dCUcoXtnOh/X7sADBXyw9eCyVvF/M58MU4I6/tzUmigJeNkFB0y7uXgCldkuWxdp5QA==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yza0Sl8fHmxKCLqZ9RkAIujj0c+HOglbJrMsS85ywYvuYpNyaxG F1Ks+RoTnCoGg45ma/UZql3KF5FaeU0Ho4J8412nEhdVjfimavMo X-Gm-Gg: ASbGnctbaN9fhjcBAAMInfLLA/YXk2TyYllNqDYhRtMSZvgLqNo+84eYvWIgIEy8Gq+ Nb0j0dwh+gIvR4x41uw7ynAoWTN9q5SBaEjyDns04Y0sUc11jy4KXWh6y04ewJy57OgJVRZsD/q wf77Jx6XUsu3GUFlO50vHw3kGHj5AjAmX/6dpCgOnt0Nm1Vwd5qQOzvG2BT8/tPE/lLtwqhvZqE fO4MknWaRpMwtSZDYna9HcNzHTrn9+Qu8+jvkk/HuWYkfzG2gRpZWiggtxtQvpP2Tnf0/mwXUUo yPWDBNAKj9EgfLD6nVQul/3lrZy9oELDWrszBQyY1PfPlwtiaAmq3oRPcd2gvbOR4SBdK4pkaii /wQ== X-Google-Smtp-Source: AGHT+IHe/pqeVfJKwU/w9Mu6w5oW6sxJF8LlG8OrV986EBMutyzx2qa4fxPX6enM0iFttCFAiE+Ekg== X-Received: by 2002:a05:6e02:1a8f:b0:3d3:ff5c:287 with SMTP id e9e14a558f8ab-3d6d5535a0amr31645515ab.14.1743615774357; Wed, 02 Apr 2025 10:42:54 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:53 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 41/54] drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm Date: Wed, 2 Apr 2025 11:41:43 -0600 Message-ID: <20250402174156.1246171-42-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" tiny/simpledrm has 3 DRM_UT_DRIVER debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module has class'd debugs. Signed-off-by: Jim Cromie --- drivers/gpu/drm/tiny/simpledrm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c index 5d9ab8adf800..bcf2cccac0ec 100644 --- a/drivers/gpu/drm/tiny/simpledrm.c +++ b/drivers/gpu/drm/tiny/simpledrm.c @@ -34,6 +34,8 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 +DRM_CLASSMAP_USE(drm_debug_classes); + /* * Helpers for simplefb */ From patchwork Wed Apr 2 17:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036320 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 CB294C28B20 for ; Wed, 2 Apr 2025 17:43:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A0A6B10E8A9; Wed, 2 Apr 2025 17:42:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X4JABFT0"; dkim-atps=neutral Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1964E10E8A2; Wed, 2 Apr 2025 17:42:56 +0000 (UTC) Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3d5eb0ec2bdso423955ab.2; Wed, 02 Apr 2025 10:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615775; x=1744220575; 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=Ck+/k2kUl1gxvAy57O83XENj4jmXSLh8yxG6/aZ/GV4=; b=X4JABFT0g7/OpFzdHFV5CqSB09cP/j9Qu33x8HDJKth2ad9WW8foRMMsyolEdJ7920 SrV2L9nkfnd7WLr25OapS0iO0Tr91Tas1Klwl0dcgkAo2RBddQUT1KB/MnRZYWwwV2YM IL9LyYR7eiDV+P89Zl+aCXSLsucxwkznxFt2qKK8Xxrid+EqY9Y323LaVdRwxzQj6Vxd i6oP5Jxvojg7wndE+mBhVKDAbtUTplmO+0PukKu+9eRqC5Xo+HViNDnwoV7CggL0HthC UWPTI/VU7WDRqwFlln01guT4meXpswgv0JAyUvwcG+R6o2QrceSQwtYlSA06UUm2EMGr f7tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615775; x=1744220575; 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=Ck+/k2kUl1gxvAy57O83XENj4jmXSLh8yxG6/aZ/GV4=; b=PDx+lCQVwQ3FUTUrG3uxUr9mB+SbPH+ruJNLdIaW/31CZF4nIHGYouovUEVh0mwPuW 6Qw1pioFbXzy6WEDH8hCV6AnqtPFsHz1Vc1CSZCm0YE4KBi2pvygyDPngfqm0zSojlSK 5myzboFAsaQkZVh3GZd1NyJoxYR3WAWgGn885Q3TvUHoE0GZHMeTZ6l4XsU2eHW8LAWi X5z8a8nFkXGqf5u+H9xXbFaC2jUbIugLuVh8inVUd0kFxlglsQBPj7viihlWGP61iwev oWTMdaAEniVYzFgMFnHs3CW/HyJrsK6tUgPiK8Kj6NQID+1I2GnYlI3qwUhgeG0evxM+ BN0A== X-Forwarded-Encrypted: i=1; AJvYcCUOmKFYpy44NG26M7YSpZLEoi+vFwyGMYG1G9i6ckar+EPosGyyCE0xeVzCJi/juBK7pAuiHj+b@lists.freedesktop.org, AJvYcCWbNki5/UrwVcuKZZGKp4yaR4e9kBN9NRP0QcW/1q9msQFm0utKJgZUgwgzrVTAiUgz2chvUMv/lxLd@lists.freedesktop.org, AJvYcCWoR+UVUEhjqjq309UbfNtAUNeCqUOEk83fZQ099nIb3Reaepz1mQhMaMlNoLowa0O3217YhFxDE+BGxQmGTA==@lists.freedesktop.org X-Gm-Message-State: AOJu0YzH5A2g/lSJgTffZeKLJBPtk9HlqDWXvQW69EHvGhzO7KAn4x7j M7Xuv27Ga4yHtXthVRFPdMqf2N8NOKED7TfpOvV5Ybx0WWcnOGm1 X-Gm-Gg: ASbGncuJ2D7wZraS3PLLh5QqZhU+SEtqPtgmrhSTZWFPYTg+guQ2vBWqqe8BSYjVNGF lhRTj6Oo7wLKmpKJ7TuDv3b3inRv5m9dCDs0N5lUV4FPsbZ49sp1iGUXeM/UZCDBohR7cxwtmcB yghcRjS0TNQFFHYNfIjRr63QhZB9SMrtxH+uq9Z5h7kli0D03fUUqYn+fFVgEzLCDM5s6B1/KW+ 9A6E4v7dt3ETP8dIeSTNBTnjAgJIfin+ofcVlq62CVuEhiMdKIMI5nx8HHs4rkoSyyyKfw6LmTL VKyMg/dE3XkdEQZDL9PGsQcfOuRjCo6nBucvVpE5MJrLw70bS4isUOjlWIMz/Y4qslgDwD9hXZ1 9ng== X-Google-Smtp-Source: AGHT+IHOrTfoglNfhTLG8b2lwZ1DeIxr9/rPRHu/zfzN/2T0Ub79/SVMCDvXhpVtgwBAHBV2XSusPA== X-Received: by 2002:a05:6e02:1a67:b0:3d0:21aa:a752 with SMTP id e9e14a558f8ab-3d5e08eaf0emr82506525ab.2.1743615775316; Wed, 02 Apr 2025 10:42:55 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:54 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 42/54] drm-dyndbg: add DRM_CLASSMAP_USE to bochs Date: Wed, 2 Apr 2025 11:41:44 -0600 Message-ID: <20250402174156.1246171-43-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" tiny/bochs has 5 DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module has class'd debugs. Signed-off-by: Jim Cromie --- drivers/gpu/drm/tiny/bochs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 8706763af8fb..dbcc8ba70dfa 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -59,6 +59,8 @@ static int bochs_modeset = -1; static int defx = 1024; static int defy = 768; +DRM_CLASSMAP_USE(drm_debug_classes); + module_param_named(modeset, bochs_modeset, int, 0444); MODULE_PARM_DESC(modeset, "enable/disable kernel modesetting"); From patchwork Wed Apr 2 17:41:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036319 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 A18ABC3601B for ; Wed, 2 Apr 2025 17:42:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB9B610E8A3; Wed, 2 Apr 2025 17:42:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HCq1V/zk"; dkim-atps=neutral Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id E93DB10E8A2; Wed, 2 Apr 2025 17:42:56 +0000 (UTC) Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3d45875d440so608125ab.0; Wed, 02 Apr 2025 10:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615776; x=1744220576; 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=mR3GZQ988EXrhdMWSVSfrBHjk8VugzTeXVmkAtrRrJY=; b=HCq1V/zkgDeioQL94AI/5A/igYvkwgyEjW5qYBtHrucDCVnAlpJEQcNjByKmafgLWB jS6teYOprhEbYvmAimSXozZqGqiofZlQtRxwDA63Kb/RHbptggQsnEE8WNokS2wfhSja T7/rz6cwlNcSowBqTfK9vwr1P02zUhGC7ncyPupZB+ZJuqCpLWbXBjEpPlUQX9t8arrw 6jj2CohtyeP4tikT7irhqmOqKvbRfkUttUNIk3xCH/ITr7dZtXKD/ztomNfv5MDSp7qc 4X9N5bLcMfFiC8EVnEB8VvojNrdGwgW/CTeEdHOToZgYWjWMvl1FDgLxJM9p/+YgtJ+4 M7IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615776; x=1744220576; 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=mR3GZQ988EXrhdMWSVSfrBHjk8VugzTeXVmkAtrRrJY=; b=rrxpYEqux6DoYbfkunY6pxIEpt38l6cbTo7ebNTerdq1Z9P+1/z04Gx/fdiOYitjdC Ha1DL+1k590nCBdW9BRaIGInir8Vp8305IY3DhvnUd/G8kntpuH32kRxgmJjvOWHdiwK lw9sPd4Knx4QTyi5YcZ5bgA754Bmj90MzeN999j0nXs6crcoca7R433M7kTNpnfgSTM+ PrXp2JuspNovzDWn6/O07w4b0heMXA+DYQg+rxgW7XBrJCeS8FzhO5paStiavnkQkXT5 h6fZnfOZ1Pk88tW6nTr80pWORwuLhm50Bm6ooE8SnXchh2eTratJjW8XbVBsFOxtuLaw JrHA== X-Forwarded-Encrypted: i=1; AJvYcCW1DgFT+hPTzyYzFliafzfnWvQ8nMc3SQPOtAr8P0uB+jmnrKs/IUtoFSyiIlwCyg3d/47pXwQWRoWM@lists.freedesktop.org, AJvYcCWxKkeI+IikTgmGzgpp4yKQwlFpplp2RONhZLUi9PpaGuJfIOcewdNiH0vK08WX7QhrRkMAj5KgPjig2A1Ypw==@lists.freedesktop.org, AJvYcCXxTnEFVrLC71n08pEAuK4kvd9T0EeW0Of5YDTcHRSuxL+Q6coTF8s/779vB2JbegtFvyaqPpJ0@lists.freedesktop.org X-Gm-Message-State: AOJu0YzjWf3gY4DikQffqgsRGU0iIHYvkAjRJMMsfl5gpzbblju5O138 04MOZ5XZbj3ZkmSqbKA6sbhFuZXywm2Kimyn9PmH0HTGBkXlcA1q X-Gm-Gg: ASbGncs+rCEFDVyWwXCzvCkdi5K0bHFhOPtBCCuqkP2ep+dTZk7JSkAr/aJKJYEaTvF Gi1oCPS2QwPgg5hkKafjC3gXxAzG6qXky/fxbG4UMh7rW13n+9QKjWvWAifzA4lKAwPF3jjshji mNZ2agOl1U9QVRTFXrzt83o+jgLWbRdf/1Odq5zWCHt9WWUsJ7V4O/kFPitA2HI+wz7bbZ5TlR0 rLaL275ej8VygYTt8uYT5Wz9iuroUFFcFEmbrPxFJ4eT6mh+++pRWnaU8jUTkKsq3gEG+QrfXqV G8Wq4wu+UwQK4SGsZnu6bOcOV7Har+NOOkXDb4GobU1i8TuptxMmL9pt2J/oDcr76aQslzx69kn 9XQ== X-Google-Smtp-Source: AGHT+IGz0mzs+hYYK7NGp1ygOapy1Xtg2pb7btBR9FttZE3xaY/IeRPzMzWa7VzATtwuhacGo5/EtA== X-Received: by 2002:a05:6e02:c:b0:3d1:a34b:4d01 with SMTP id e9e14a558f8ab-3d5e09090famr201390495ab.8.1743615776107; Wed, 02 Apr 2025 10:42:56 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:55 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 43/54] drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv Date: Wed, 2 Apr 2025 11:41:45 -0600 Message-ID: <20250402174156.1246171-44-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" etnaviv has 5 DRM_UT_CORE debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module has class'd debugs as well as plain-old pr_debug()s Signed-off-by: Jim Cromie --- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 3e91747ed339..70759b7d338f 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -25,6 +25,8 @@ #include "etnaviv_mmu.h" #include "etnaviv_perfmon.h" +DRM_CLASSMAP_USE(drm_debug_classes); + /* * DRM operations: */ From patchwork Wed Apr 2 17:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036321 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 E4246C36017 for ; Wed, 2 Apr 2025 17:43:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 037F610E8AB; Wed, 2 Apr 2025 17:42:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OUixhfQh"; dkim-atps=neutral Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id C9D4410E899; Wed, 2 Apr 2025 17:42:57 +0000 (UTC) Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-3d58908c43fso506905ab.0; Wed, 02 Apr 2025 10:42:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615777; x=1744220577; 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=XVuxeJKKK9Rs+v9Dxb1+k9xlxA6UW5kge7MRPvzoPYI=; b=OUixhfQh9kBz0qkedhPrzG/UKzFzpU/uI9z8zKg7xvarD9RgXR/8/udsspZJlgcriO C2j2Ta6JvZlatos4grMJvUicgigOinE9kKs1OV6/zad7MlBEC/cfVHT1oBQxGDvM8/Y3 AOrLoV7hat/iO0YQ/KNznWlegjJtScgQUaQhOs5aWuuW/ONKmcb8vaYbO4lnsaEyMP6w dQOwZVl2amsHL4KbDKUQZwO+33MQiRnsMtevHK4I3p+YZW4o9GwbMdQxeTYyMCFmz0Mj 7blQ2QPPspyemz1LNHY9cxFXY4aFDWGlcWXPz4J5ODM1dIoidu4joq1mCB5MXz2NXgwU V9sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615777; x=1744220577; 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=XVuxeJKKK9Rs+v9Dxb1+k9xlxA6UW5kge7MRPvzoPYI=; b=c1XclUXQC7atlLl6ilLFBWr5ikpF/M+uo6c2q4LwNibj5RqWsAATQf8lM+tRLqaY92 7l+8W6Vr8fi53NGcoiqqwlxvBZ8vVe4zNsQPp3dutu5fGZH/89fdcSgf72omYA2/CQsv CJ49xfiOFgi8jZmzfPDlMKfZHVhhxmDcyfWTX/ZRpl9j9yPCNc5ZigW9tQa2JE7Ytg7z ZnwYCUalTnTWwRWXcJCgpiK6IPSlzUBn6LLq5w3cKxVG5WlC6puQTVOX9XGCTxmA8dXU w8+a273j3EU+JHnPUCSu3+a8aF8IwkF3DLJ4SvMths1Dh4qkh+UGKRlgDbobPCjBvc2l 6Nmw== X-Forwarded-Encrypted: i=1; AJvYcCUnHkBqgnGovoLQ/4jrQOCzcJH5rkzXCouGWmCHbqjvfFWNneiVCB8hkZXWD2L/RfH/g7h7Shl0@lists.freedesktop.org, AJvYcCVAOxpEOh9BUhIUuQjxIuH6E0P/svZAhKe1VeHTObFp6IF+QMwZK4x6IfiTvteRwNdr6gdg6gkkWx9euZxSrg==@lists.freedesktop.org, AJvYcCXOBOKr64goJiZkf2UW3swqtvykvsSAZsRz8Z6U1CNeAc9Vq0vS55zTolIYAmuP2aT4HzTGIJFp5xYp@lists.freedesktop.org X-Gm-Message-State: AOJu0Yx9NJdFqRPxP+qqv0eBBoV3m42wDfkHPV32ro6oH6IdgV/vo0KR wEbWbIkTpq9F1lYtlF6ws7NewUxdGls37L5xg7/Pr1q7roG0dRMM X-Gm-Gg: ASbGncsyUTq3YozljjyPwLgS+zVlP5bZYwoYb6colgUwFU3onoPalf6GVwYueE9GS2C UbHu/0Un5y11r+dmQQ9lr48AHE5Gdid00FXmm7z+u9bP+n7lq4FJKeffsg/v80fO/9h1b3WoFsh wP0FqE1b0lLlR1XoOUdcVbB8ATnP1DsYFj/MYh0WGpB2Afh602+VHfAMiC+/ZHxMxpw6tqMAPV+ 6BzrfexwZiIbikTK2a3kMl9/QeW8JcQizjpX/+MhX8KFSpDpYzkCUxcGJ5u8f86aA+fzQk/ph9s zywCVntZjsumydppU3CjqDb9bfZhmpUY6U0MU6YG9aFfC0KyRSmpOVMYQbuZ6H2QND5iwLBxtAD tkw== X-Google-Smtp-Source: AGHT+IHC7Ea8gqOI7SUhdkIs0stRkMgjiR8iRe4Z1Hury5vPgr/hHoKAmFAKEUAuImZWm4ZQOlbLag== X-Received: by 2002:a05:6e02:2504:b0:3d4:6f37:3724 with SMTP id e9e14a558f8ab-3d5e09e467emr214829515ab.18.1743615777081; Wed, 02 Apr 2025 10:42:57 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:56 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 44/54] drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver Date: Wed, 2 Apr 2025 11:41:46 -0600 Message-ID: <20250402174156.1246171-45-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The gma500 has 126 DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module has class'd debugs. Signed-off-by: Jim Cromie --- drivers/gpu/drm/gma500/psb_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 85d3557c2eb9..dc72388ed08d 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -40,6 +40,8 @@ static const struct drm_driver driver; static int psb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent); +DRM_CLASSMAP_USE(drm_debug_classes); + /* * The table below contains a mapping of the PCI vendor ID and the PCI Device ID * to the different groups of PowerVR 5-series chip designs From patchwork Wed Apr 2 17:41:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036326 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 F0F19C28B20 for ; Wed, 2 Apr 2025 17:43:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 099EC10E8A6; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OZ2jxgMl"; dkim-atps=neutral Received: from mail-il1-f173.google.com (mail-il1-f173.google.com [209.85.166.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 100DE10E8AD; Wed, 2 Apr 2025 17:42:59 +0000 (UTC) Received: by mail-il1-f173.google.com with SMTP id e9e14a558f8ab-3d43c972616so332285ab.0; Wed, 02 Apr 2025 10:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615778; x=1744220578; 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=Tgy450ZES2ez3J/XkWzr8/KGFStO5bXfg+gAZCZdzzk=; b=OZ2jxgMlwhtH+mfEESynlS+ELb613wLNpX4gHmYQXMzoSOs/BqQPPINLwTDJme5zX9 +jB+RrecSo/Tjf8WHsT2mFMKcxkpTi1x+S6e/e9xzgk7QBtw3rH8xmU+VAqTVj8a9jk/ +nVQz16pldq+jPqCW+MtokpZm6C9h3jqm/MzO4vawCWgXz9UtOBVCcVa/Y34CrHRvWWJ I/hchmOeEW+ex/fa7yeclY30V8juFlBqWeN8MrqRM48ausbapg3J3z7vUBeY0i/xFzAQ lCCd1XO4Bi/AFYvUZYYZ/19z/VqyokjVb+lBd6+NgfOIm9Mz4kOHw04OgDF6wEWSgwdO ky1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615778; x=1744220578; 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=Tgy450ZES2ez3J/XkWzr8/KGFStO5bXfg+gAZCZdzzk=; b=EJ7Z21TO/MOERhQLlvbM/Suus2q9XDzro1+Rvn6UhGuEflaxNSaqNNy7g5NWQS/gIz Q6+/SbxMe5RfB9fYnkhnNjQJtYxuVusek8T0jy7+p+k6KAgANW4x13vOBndGFmYhHPRl K7gd4Bs+E1mS8vCVKGmY0tbL17lrzmbwdVylvjT7ZFd1ckNm+3ErPlZIx8qxa+wLZBHT BC5NvRc8ddihWItxOFLZtcOHj8BEdu2NWiIiiQOPCByn2TO8hO6HkBEUQKwEy0tr1FmN XMiHpUWc6Cus61kdlzKHu3qFYN4j2TLgxTOIVHUlz6w0wQyfSr3QEbC7pAaLrppiXIKP kzBw== X-Forwarded-Encrypted: i=1; AJvYcCUNZJEExFPzgE+7yL9Bs64ZCI3QCK/NWSAroL0iVRL7MWSrjwhKFlJaSZhmv9TO8xwNMlcyvb86h9Tq@lists.freedesktop.org, AJvYcCWVyEGrUSzda97GGDYdscekrJMP1YTSv3Gqw5kHgHQZUx43tEU6Fjrf+E5C4MXG3seRFkkXKOZS@lists.freedesktop.org, AJvYcCX++gjBWgsp9dDz8r2d726FzXmEQ3y4Mx2BqDxXxg9+hYDAIuU3riWh7vzlpQyvkWMTJsoAI3X+kN+54Trv/A==@lists.freedesktop.org X-Gm-Message-State: AOJu0YxZ6l16x6CLBi8JtQettudnCDFDsL/iluTE6rYq9zotsiBJRp3Y HepIaDOkzeqLIQ+8qrQf9VebsOdEAuXqfh89U6QzVpBpliN3Dd3u X-Gm-Gg: ASbGncvH37qdepvV/oXYoe8BxAr6KUyBuNB/sggHJyX1l8h+8eWAFr6nUpqHTuEl+6N kW1CGKf3d5lcS75vstcMVLjQ/jqBQJsQvhX1D8T49EKRCAQRzIum54p83M+mngDFreSR81lX9gJ Cq20mR7CvEScgGg5JU/dGmUvdBtYt/hszQLO54oiJrpWzmOCyLvMdkqvAUXlKpVlNh4rY469dpQ aVESFJDp+mYsFLzglCpxx5P4jxtjutEKUWekC6J3ugef96ms4xa5Q2A9eQdRdxUSgr4Dr3xTUej qyz8EMP3bHUKWIT/RtfYr+a6jXYvFGMj3ptUD1uJO34hw7G5sozVWt52mdgvtTzMyxC4p2NUA6i q4A== X-Google-Smtp-Source: AGHT+IGOn5uIZhYGkruQeCbC1f+WjkFMEGOf33zX/XAEqkxeDsXMZ4VsYrJ+aFa+RIq7clpGvTTA5w== X-Received: by 2002:a05:6e02:1d9d:b0:3d4:2acc:81fa with SMTP id e9e14a558f8ab-3d6dcb49685mr7363055ab.2.1743615778123; Wed, 02 Apr 2025 10:42:58 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:57 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 45/54] drm-dyndbg: add DRM_CLASSMAP_USE to radeon Date: Wed, 2 Apr 2025 11:41:47 -0600 Message-ID: <20250402174156.1246171-46-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" radeon has some DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg about its use of the class'd debugs. Signed-off-by: Jim Cromie --- drivers/gpu/drm/radeon/radeon_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 267f082bc430..6eaac728e966 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -253,6 +253,8 @@ static const struct pci_device_id pciidlist[] = { }; MODULE_DEVICE_TABLE(pci, pciidlist); +DRM_CLASSMAP_USE(drm_debug_classes); + static const struct drm_driver kms_driver; static int radeon_pci_probe(struct pci_dev *pdev, From patchwork Wed Apr 2 17:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036323 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 4F983C36014 for ; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0DA7610E8A5; Wed, 2 Apr 2025 17:43:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bMUslWwy"; dkim-atps=neutral Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC5C810E896; Wed, 2 Apr 2025 17:42:59 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3d6d6d82633so491955ab.0; Wed, 02 Apr 2025 10:42:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615779; x=1744220579; 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=JTbNTI64Sdb94F5FeGTeZQmx91wNwlAKHYCBLiEXOdM=; b=bMUslWwyHJGkm5c0ZTP+IdJ/7L+RoLPBjNQ+KtCcqMrgQYMm6QZuSt5eBxMe9GiABt gzv4dXzJF0GNpUXEWB0MZUamSyhUtM4W9teFqHpKCXalFqNlojnLZh1BkD6aZlTlc42I 6GcsFbUHpMRpzYCWSC2ivgrxbpKObppBxK6KUfS82paltKqQtE7qr/ih9Xc/EDH2Tjnb iWbnTkEVMcS6rhFNUNEOBFc+E4EYavmUzZYmJV5TA4qc0GrPMJnf70aQma2HQiNlLVW8 xu640b8OZHudCMS0tkGhaeJHHAIs/GLOus6e2eH26rlTkh1S1QhR9k7HROrOf1cS6gcW yaNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615779; x=1744220579; 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=JTbNTI64Sdb94F5FeGTeZQmx91wNwlAKHYCBLiEXOdM=; b=rnZ5lQD1WAfC3t7944OmEA3ni/mTHYTQO9/3UH9+geRgxzJh/SP5T+pqHTJHkt9054 oWLu26W4t3pig8DGJHZIPZ4QASQyxpTF9zTO/b8JW6imGu8AEsYlKdTwWYrYVl8WRJWO p8HNtTHtrjw3XEBIWKdBmFTDGE01Gnl0MaYFUiShpyPPGZ9SwnuVYdUcL8yK/PyqQvMC 4wZN40271Vd7bttTf01jQFBPcWtlJYQcjAyr0IwhCyREtPIuQkvlDbS4oZQbLLvB87pn 27LB5h63KAYq7d/Nqtj3tj6dtd/qf5PfHYKjSPG3hhrKhfsn7PTxiL+tmL9fgxHBEvLf WpbQ== X-Forwarded-Encrypted: i=1; AJvYcCVg0YK34fG4X8toWnJm5k1maIaPD6mCkwuOT5ypS2LP3T1FfbWCkR59whOF8VXmlrt70SoXfqtEE05b@lists.freedesktop.org, AJvYcCVzGZGPRdAW6V3QMe7fWWl7OMV+fCMUty2XWIpdVLRtzKnY2yqZF929t5RKLhBmB2pwXsf++GvJ@lists.freedesktop.org, AJvYcCWVKkMvcOs7KjEn73bGMc6z1SLwvpYK3+y15Cb/WN9QDiKOj8+ae96Af1lPy5yEo+oizZh1PMVTsS0cjccG/w==@lists.freedesktop.org X-Gm-Message-State: AOJu0YykERskzqs/99dQ0Nhr1r8TJC87dQi3xHOSipo/FPeXOCEAd8xk M2HRZd2EhHBmus8U9UNlm/Vh4V6vV2fmMLtMzTK8hTTqkvPN9D2a X-Gm-Gg: ASbGncvApcmMNWSuO+DWegK+BYmHydBp9SMZAoWq4Hs8dSfDP2VRtV+wAZJ/kH3vZMx a10PDWh/lQJSdz2mA3B3k+q+deM9wo4Lba2z71wYTzLiAYqOnDMnT8zui0ThjAqj+k9FUsF53vb PnFlRuLBhQoP/Gy1u342ZN9schWvBzXsTrz4LkgkftzN8yVft2M+EeK1gm2w29xrCQpDh6X8d9b KSXDY1UxTgHxSkHX/YMfU1FqcnSBJ8t9UBXKQxeIsxBmiLg6mKrAmEDPTznr0Sy8cEIx8mPvr5o W0Hja53cGD17YhfL0CLp3wHvkOldgm1hvUald5tdbhB+vWhz6TlneSnD956rNzxXP+mALUmwF+8 H5Q== X-Google-Smtp-Source: AGHT+IF3u0H+oGQ2/wIhP84jzTNGBP4fVHIk9OQhmyCTNULQcvXR/2W1nzJq7bC541uOcFJorl3+xw== X-Received: by 2002:a05:6e02:198f:b0:3d3:fbae:3978 with SMTP id e9e14a558f8ab-3d6d548bc33mr33323115ab.9.1743615779091; Wed, 02 Apr 2025 10:42:59 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:58 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 46/54] drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver Date: Wed, 2 Apr 2025 11:41:48 -0600 Message-ID: <20250402174156.1246171-47-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The vmwgfx driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 0f32471c8533..2b4f862fe5d4 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -279,6 +279,8 @@ static int vmw_probe(struct pci_dev *, const struct pci_device_id *); static int vmwgfx_pm_notifier(struct notifier_block *nb, unsigned long val, void *ptr); +DRM_CLASSMAP_USE(drm_debug_classes); + MODULE_PARM_DESC(restrict_iommu, "Try to limit IOMMU usage for TTM pages"); module_param_named(restrict_iommu, vmw_restrict_iommu, int, 0600); MODULE_PARM_DESC(force_coherent, "Force coherent TTM pages"); From patchwork Wed Apr 2 17:41:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036328 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 8B116C36017 for ; Wed, 2 Apr 2025 17:43:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D6EA510E8AE; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j5yP6fhX"; dkim-atps=neutral Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95B3010E8A2; Wed, 2 Apr 2025 17:43:00 +0000 (UTC) Received: by mail-il1-f171.google.com with SMTP id e9e14a558f8ab-3d5ebc2b725so325615ab.3; Wed, 02 Apr 2025 10:43:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615780; x=1744220580; 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=JhoA9XaTmEGFO/43twqabJw5GWuyyTcgJpDDhp+La9k=; b=j5yP6fhXbIBHJz4bWrScnle5KeETvQzO8F5YBknZbJ/4QG2ieEWYz16e96ayLa6XQF vxD+OIqNdRPJ7KUTVnwCq53v4tZ9X13mpxRN39RgNOmtAFM9xodjOpuQhIpUf3cW7NwT FU///2cHPxsxpwqblOItIV5C7wWoikVHTreJSn2eqa/KW+iXgSlRuNB+WAjPC0EGZdHB Wzl3saWZ8TzvZJcWn/ZJThgiQkexTfwc1eAa2+Rd6F0RVs8xF1rzsrxri0mh2AIEeZIM WcdTrEkMHd38iaf7f5IomfoqflF9i6Pehe1bDjVCQ4H1oKOQZ7a3pBkONrpyzcXoQ+/M AFtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615780; x=1744220580; 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=JhoA9XaTmEGFO/43twqabJw5GWuyyTcgJpDDhp+La9k=; b=ftHPAjW0TGpAXAiOBFkuljJBIMD5sdu+C8z89reTNY6gLeVZM13/zhfsaAIDoyf3/H BoV5RaWf9NUZA2Yp4PykBI9AII/7yS6taJkhQmwsSMO+dzhzERURl55d6yMDIJ354QHj GHJ5dJFe5Gd2lpXFUUkJk6wRyl299dQq8OqmvA876FrOzvOyOJTRQvI/ZqrwYySzt97W 9R6QbpdX3AdmolkRYtdTOmTTN7uGHulHHiALFtEKsJ3FpjabtAklUh3y23AYobxiuo1s Yp1RL6kf5pYL/1lwbrvdezFWil7jq775vhBpErGb950H0zcYomnU9WPWTFu/hZgF3Cp1 +lBg== X-Forwarded-Encrypted: i=1; AJvYcCUM/MrpNDzFsyvIt+wlvDjCkFzcdmxV5wKzvnKX0bqGFc6hHFJw8sJUzpum7YNueJHrvZiL/iiNu7eX@lists.freedesktop.org, AJvYcCUSbquapJZWl1QutJa5EkYxrTWDKYpGO2BEW7i/VwZnpm/WwQdikpi+Bg4taXCTPluUYjnEQhjVDf7OtzFJ7g==@lists.freedesktop.org, AJvYcCWo3B5Od5ufNLNrM5n00cdmgHDPTFMiun+AYg5vWgYX02w5wFS2YF7x6Ad0ryW+WeXqBDE9EGzf@lists.freedesktop.org X-Gm-Message-State: AOJu0YzbLVifhnt8V4s30n04Sr2/1lZw+srrKK4YUb1aUg4GJSxOtzVw Zne61PPjZTJgroXftHhkrkixA7suqIPnXCQeaGt6sAO6aviZ1NPo X-Gm-Gg: ASbGncu90pMzBkHLd7rt0XO8hieBXSvpoucAGinaP3h3ysrBbYSyAW4HOUDc37vkeF5 sbFpk/jL0ERcaFYJMBiYzE2YTuFktUTsF0LE0xTk91PKz3+8gqtcqRcmt32ZJQCfLqH1aoXA824 EqBGAf1X+yELXoCdL0on/al5UiytVXQI3MStMvPWz1mctbjNhMSU84NMi1i+xwBkHtOx6nudb4p SFcTYltPjpQsYdvdl+O03mDQD8zWGDmvT4obmhwEc35Z/FgRFdftjRJ8WNpdJAMfGAfj+1zKDzI IYl2JY8eSQygvhc6JZRRh63bn7s3xzvCakEQYnXLfue60hK7asTJBH7wH74WVk/k+kokjQf8y79 dLg== X-Google-Smtp-Source: AGHT+IFlUifTRIdBdJrWmohJtGkz5j2ZAgmAXuJf+hqwzf5FhiZ9fS2SCZmP2KeBUmNu/DQKgqx/aQ== X-Received: by 2002:a05:6e02:1787:b0:3d5:893a:93ea with SMTP id e9e14a558f8ab-3d5e0934a71mr183638485ab.13.1743615779885; Wed, 02 Apr 2025 10:42:59 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:42:59 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 47/54] drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver Date: Wed, 2 Apr 2025 11:41:49 -0600 Message-ID: <20250402174156.1246171-48-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The vkms driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/vkms/vkms_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index e0409aba9349..4b9da64661fb 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -39,6 +39,8 @@ static struct vkms_config *default_config; +DRM_CLASSMAP_USE(drm_debug_classes); + static bool enable_cursor = true; module_param_named(enable_cursor, enable_cursor, bool, 0444); MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); From patchwork Wed Apr 2 17:41:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036324 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 8F4ADC28B20 for ; Wed, 2 Apr 2025 17:43:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FCF810E8A7; Wed, 2 Apr 2025 17:43:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Tx/UhFPw"; dkim-atps=neutral Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by gabe.freedesktop.org (Postfix) with ESMTPS id A73B010E899; Wed, 2 Apr 2025 17:43:01 +0000 (UTC) Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3d46ef71b6cso826725ab.3; Wed, 02 Apr 2025 10:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615781; x=1744220581; 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=phnE7T3rE82X9afYdUepg2ZaVnfZbBYGopazv1dsHzc=; b=Tx/UhFPwcCVmluMOd0jv39M7yAm2KrFLDuhg5PwjylzijiOBSmNcPJ/EjrnDhYYfKB UrDeK+njbVIrjgOEsTsTkasEeoFfM9+mF5IaHAEtcf8c27M66KxyBfbSgzzg/q5Pbcyq JWXqv1qPNMbKA1dKssNMh7DtpjVSmEGasQPl8eHmvLuTUi9O8QBu2k6xJX7EU73VVoj5 M6lLhyXW+9j8A6VmnaZr9FP4cdYN/1UjAC+Qr3wYKAeJCwxFjqMGTmmfpHC02YmXzFfF BDPzdibpkkm9OCXJ7+5KzXvbEyk4tV53vhJEpBuaePIHvKm+nFp8uT+PviSsbDfebb60 6ZGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615781; x=1744220581; 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=phnE7T3rE82X9afYdUepg2ZaVnfZbBYGopazv1dsHzc=; b=Xf4NZFwwvq9agJdmSP8e7hpXmBqT+uQDdnfpVIQbdPIs+wzCQ0j189HtADe8GevSqm W6RCRSDVCNhwX0rRK9g5o5HC4V4sVOJLspRaWhVATOzF18KorLuC7S76k5VMhhQhECO9 fYPL3SGreINEZZyMcnKFVStwWVoiRu9zqADbusltarvrY/LhVUke4v9cal0BiWs99J1s jZrL4yvFfgJlYhrhScF4aShTNUHchMo1srynU55jR1RPvNQqeCnFp9U4PLWg33vQJXr+ bgrdJUnPs2hlqS+wDXWiQudV4UXOr7BTuU0zvtd0xqoXHC3mekgLaLvZMedZ+v2voGXQ BVhw== X-Forwarded-Encrypted: i=1; AJvYcCUw7fdjDqczbsyC0OMWiRk7krr+4b0OX3lp/Qd6bkq+372PgFm4uotB6UG+mIk5toduMhcJADl9@lists.freedesktop.org, AJvYcCVFrVvqn2Mii6Fr51NJjS9XphqX81JssyXT9I4vPA2dvgkb6VAig0s83L69Fx7q/weGFZHKlzR2o4GAfVrn3Q==@lists.freedesktop.org, AJvYcCWXFySf/b5C+S8UC2VsOAQHztCuciEOcWDGudAv0KMpTBkwqL8JplY+luq73QtuEH4YY2yQJuXGiJGM@lists.freedesktop.org X-Gm-Message-State: AOJu0YyA13URduWr/AmwPActFkegrwhfSpkMGih6IVibG0FZZO9NzQMz K8Zb0MWpePCoHvpycuFM4H8/HDXYVl3hlavMeax342MU+LQh6kjN X-Gm-Gg: ASbGnctuuxSwMCL7RhCs7Oi0xSKhPOBEfNJIwa4LUiEsHfmpRIhEEcNjHAB1bF6pp3h NXQYRBGKpd0mN22xDFOsdOTvfIAZCtHr6FaAxIHKxx2DGRBHFq6ACARY0uErd4q5BgYHSNV8jUa v/mdySKHhZPKyAhvlMjHEQxlPMKeMyFxZai7USAXMRv4ZQm2dyAigODqHb4oMSN4KJnBTlPUuZx CCz8iSbUgI65O2K7yfYtT0cdHjPRpb+tYmNTWBUV8AaCS/okDqaO8fHD8aFVkXqhh4Vy85VoGAh Lil+7Aewl2vdYnNWK3+7VSk2AzCnC/GLnQl9ppyFL0SyEjJYIKeLpjZegARIBhiq8cdp3bMYEav bVQ== X-Google-Smtp-Source: AGHT+IFuJV2A3WyeGyRKkWOVHXtPxLV1+Mi2JNfQFD+IYZFzlTa+4ZUBb0ebsjuh3kRTyYLqlLO2Zw== X-Received: by 2002:a05:6e02:180a:b0:3d0:4bce:cfa8 with SMTP id e9e14a558f8ab-3d6ca5b1d53mr103006025ab.3.1743615780941; Wed, 02 Apr 2025 10:43:00 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:00 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 48/54] drm-dyndbg: add DRM_CLASSMAP_USE to udl driver Date: Wed, 2 Apr 2025 11:41:50 -0600 Message-ID: <20250402174156.1246171-49-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The udl driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/udl/udl_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/udl/udl_main.c b/drivers/gpu/drm/udl/udl_main.c index 3ebe2ce55dfd..ba57c14454e5 100644 --- a/drivers/gpu/drm/udl/udl_main.c +++ b/drivers/gpu/drm/udl/udl_main.c @@ -19,6 +19,8 @@ #define NR_USB_REQUEST_CHANNEL 0x12 +DRM_CLASSMAP_USE(drm_debug_classes); + #define MAX_TRANSFER (PAGE_SIZE*16 - BULK_SIZE) #define WRITES_IN_FLIGHT (20) #define MAX_VENDOR_DESCRIPTOR_SIZE 256 From patchwork Wed Apr 2 17:41:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036327 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 76102C36014 for ; Wed, 2 Apr 2025 17:43:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8706110E8AA; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bqvF0wmi"; dkim-atps=neutral Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 60FAC10E899; Wed, 2 Apr 2025 17:43:02 +0000 (UTC) Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3d4436ba324so1030995ab.2; Wed, 02 Apr 2025 10:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615781; x=1744220581; 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=av5O5WnsuBn1uC/IGfMHk77btJQzrlTi1UNrBIeIfGA=; b=bqvF0wmiVhtvVNd71rzvV3Jr1OUIZ4/cx7sBBKYEwgsvdjD3Fu7Z9L7erbO3EBPcCR gLklbQXQAqFqxT4qLWSHGrTxYajA0g0dukGO40k2T9ij5jIkXEjr4Ooe3RiivO1Hjil1 hs9NZtlOGEgBBkIinrdETbEcBrY3h/0DT719Vc7gICYTAFpRTuIWMyAQmnGAYrtTe0B7 HVg2chhiZtL/cRtXd51e8XPCk3rhQznnkYiw8x+UQovKq8uqS+oCek2GMmVsm7tdzykR kJA1heKULF+DGXs4L0fWGZ8ePDMPolBWYFLLecdyiXV4XfzE2sAZyqXBk0nqTOtbLmox pADg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615781; x=1744220581; 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=av5O5WnsuBn1uC/IGfMHk77btJQzrlTi1UNrBIeIfGA=; b=HSW7Ui/rDphvcJHFuUjL5bxvQsDS4CcleY0/9ohuUeQ4L3UMPbUM8jPam/gqnkhims jFuCBfHMXH64N83MWVBN3jAvwNYcVNiEEld8cshlI5uB8cIy/SwEoYjuJToKpeldiVnx UiK72DmQ8zNkpfqfBLI1PhlD0ik8+vKxgWEHlPf7KEUWG+cGg20GnjGIuDxd6bPEh93r /i01m8rQm/ecQ2toej83jKTKInDkcmbfE/JBQGx5CEr1AT10Ri947vMeP6iaTBfJcRDs oOSTuBJYJ+GNNjFj4oPhKNrwxgTaSmUiykRwtgxsywuXMSbfMFyM5vtgQqKDQlpKBqp+ a5og== X-Forwarded-Encrypted: i=1; AJvYcCVanmket21df7tBaK9ihsO2eupiYpRqdaxbLyUSvYdaA2h4Pn5XGPEjNNn7qQHbWL+MA5sCvZCM@lists.freedesktop.org, AJvYcCVzlMnpK3iv99KUDCmdCqaMcuMhOa2ixB3jPc8XeRmztwQWmbAWAfOVrTA6vDb0RMpLFdYwVXRLvEVg@lists.freedesktop.org, AJvYcCWYQ5KfXvv456+1YGmcvRMm3lEopTos0uW9ScSV7PoSU5gbzaO1KkLa2JQWLOU182Pl4Hj+cit5idaj7TfW0g==@lists.freedesktop.org X-Gm-Message-State: AOJu0Yx+uOFqvTMMKmBF8r9YpZnSXxdkg8XsALpZGkqZz3cIhsRfQpxR iE1bhajJhsFxJZ4ZhEoxStsBWINI2xnFGO8GU66BosM81YQXW3uD X-Gm-Gg: ASbGncurjirRnbEisXU4FSwYMeMlzfOMgNxSbYYOdM4rxdUReSRpOHAB3TJSPvc4lzy qemLPgL0kpHaZhFqoOMEGcKo1Gu/hDQjNhqaSBQuLFtcAjGj0LWkbVksSPKcpVmVfbC0HTLqE/S lcimb7gYBcmGTobycmRUQQc0qenI4eButUJUlu+jcXndGGW+qLWHr/oM1g11POaQoze+3P1u3ka dvQeDwed13gVOaRekrjesebZCUwZ1f465OidPXcSySB38Yn11X7555EsbtV5oP0yvPbXBDXgIwF 02b1CD81a7aKrtLbvbtYLxNEseUW26qyWcczld/G/1ECOTUSXga9tBw8wuNvhJJWpcGisJMEDW5 d6w== X-Google-Smtp-Source: AGHT+IG8XSmNVp+q/PMUM7nI1VXleBCEFjeSE8gGJHee5Xa3olHDY+LWA8eCwUT1fL6HdiRQkmnU2w== X-Received: by 2002:a05:6e02:12cd:b0:3d5:deaf:b443 with SMTP id e9e14a558f8ab-3d5e08e251emr222409015ab.3.1743615781696; Wed, 02 Apr 2025 10:43:01 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:01 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 49/54] drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver Date: Wed, 2 Apr 2025 11:41:51 -0600 Message-ID: <20250402174156.1246171-50-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The mgag200 driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 069fdd2dc8f6..5b6ec1550da3 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -27,6 +27,8 @@ static int mgag200_modeset = -1; MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); module_param_named(modeset, mgag200_modeset, int, 0400); +DRM_CLASSMAP_USE(drm_debug_classes); + int mgag200_init_pci_options(struct pci_dev *pdev, u32 option, u32 option2) { struct device *dev = &pdev->dev; From patchwork Wed Apr 2 17:41:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036329 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 BBF90C28B20 for ; Wed, 2 Apr 2025 17:43:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC3F710E8B7; Wed, 2 Apr 2025 17:43:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WlT8F0uL"; dkim-atps=neutral Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DDE310E8A6; Wed, 2 Apr 2025 17:43:03 +0000 (UTC) Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-85e1b1f08a5so439339f.2; Wed, 02 Apr 2025 10:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615782; x=1744220582; 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=/NT2KOV5clgY+fvBVb0kMabH8vqyg2O7PfGhDz8vOzc=; b=WlT8F0uLxkuzhT+UeyhzHvliGEs8XPXAjINLn8QJcEotYk2I53AqRrjjbUSasLaYQj VHJPBw7F+kTTb8nJMMXDDr6RHbbvZT5TwkyDbi/jwkzZu7VIsP7p0XfGxB4avYZzzJwN MO42r15sHp+fYki1G3Ebv57aPIOKa1MUldWyL8s9rLhl88RgDvagMjsNCiKdbxfDIkEM obLpcuLmRMcuZZtOMQSvi2SK70IbRFlqW9goyzxcNR9so0VwME8N3vdd3twzXLFxdCcv 3bKrkD1r827N1QRd60HP611tqxVg9UtjoYvoAA2yvdFQvk1F86t0BDykqln0kIK/UN1g xc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615782; x=1744220582; 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=/NT2KOV5clgY+fvBVb0kMabH8vqyg2O7PfGhDz8vOzc=; b=WC5INumY4+lpJWXXhVIp+2P/AJ+Kurm5RMq4HDB6hpSgoeHF37oh/Qnj2PXhRvqTnV kdRZrFN0aUuBM8GFP6uPvfCjEKwRWuivE0J5WuEWtt2h2DazP6iE6FT9gyJIee2cPKqt daNQ+Kw2R3Q3Wx7D2NGH0yRuCeffXACv/zqlS1jDgarzcF2OeCQX8abPNSEIibUVBCM8 oN/3pXUPz+iohwDk5I/d1hiM/Kgd23v1DJbUPS+dP921x+j1kPz03rscr64x0u30aYhm fMF+bJVYteJNVb6fyQ5AxFnUSPrpP1JjEuAZqn4NrMbsGuCnKJ43gCZ/4EIhtx+oBHqv 67zw== X-Forwarded-Encrypted: i=1; AJvYcCUpem54MPvpdwrtFI9QMRbTsuxYcCewjaiZbf3QCD8UXulobL/czPpfcUWgifITK3KUeBledA80@lists.freedesktop.org, AJvYcCUqXCO5IdT1bX3XHk+RooFm0H5cGbaLGtazJZZvuQ0IH+PkkgyQ1lkuPOrV5CTpHsGGvvX995fid7WDj6to6w==@lists.freedesktop.org, AJvYcCUy8KPTN9e817raJZHeC1r32s/nTG0k/V1xIKpJf8Qc7graBKtViCn+jGHuX0mRr9v3+crY9RLoeLcX@lists.freedesktop.org X-Gm-Message-State: AOJu0Yx+FPl8me5MPZYEnznHrmGoHvsifY6iNMnzn7qJR5WmVToE74Jp Dd2XxLh1poJmAT10HjAuXbd6IYUobQlaDEZiI3xSkfe1B32vnknm X-Gm-Gg: ASbGncugJaGuZS8gXy+QcA2ObTRZNx0c2M+R0h8KI5KRbDoacxk8n366hui/phGKvPv wbo++oR1kEXYFB+xvGGbd1CMoUDSAqtTnHQRxV6QxtHmOcBdIG1eEVuwV4JmzodzkDTUiw8xXom o+Fqd7GJMgvq3W75RS+X7xfMIqIylkosnQiL4vmERfTxsP6mS4XlaWTXugqGePB8HH2MEuGSccy ptNqTWd6Nw3Yg3BzpzxP1GfXYpt2MMgRm4dCM2kuKFiFtj7+6ZW21eik/Jad3x1VtVZ1ve4Q8Xl F9kxs5l02eUST2H2T50Nx8n4mNmZZ4VnmE2eoLDBoArhtS+0f488R/rn/wInd4Q3L5vLPn7HGNG K0Py9BRFcUhsp X-Google-Smtp-Source: AGHT+IHugLKyVSM4152JdpDyO0IyiqFWhgdr4RcjxQiNgdLiEazciacIDXztJ7jfLMjeFRlO1pAg2Q== X-Received: by 2002:a05:6e02:1a21:b0:3d5:d6ad:286a with SMTP id e9e14a558f8ab-3d6d54bba56mr37037015ab.13.1743615782473; Wed, 02 Apr 2025 10:43:02 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:02 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 50/54] drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver Date: Wed, 2 Apr 2025 11:41:52 -0600 Message-ID: <20250402174156.1246171-51-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The gud driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/gud/gud_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c index cb405771d6e2..3843c0e47169 100644 --- a/drivers/gpu/drm/gud/gud_drv.c +++ b/drivers/gpu/drm/gud/gud_drv.c @@ -32,6 +32,8 @@ #include "gud_internal.h" +DRM_CLASSMAP_USE(drm_debug_classes); + /* Only used internally */ static const struct drm_format_info gud_drm_format_r1 = { .format = GUD_DRM_FORMAT_R1, From patchwork Wed Apr 2 17:41:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036333 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 7B782C28B20 for ; Wed, 2 Apr 2025 17:43:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FE0D10E8AF; Wed, 2 Apr 2025 17:43:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i9iDpHaM"; dkim-atps=neutral Received: from mail-il1-f169.google.com (mail-il1-f169.google.com [209.85.166.169]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3DEAD10E8B3; Wed, 2 Apr 2025 17:43:04 +0000 (UTC) Received: by mail-il1-f169.google.com with SMTP id e9e14a558f8ab-3d6d84923c8so446585ab.0; Wed, 02 Apr 2025 10:43:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615783; x=1744220583; 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=v1ua5S//H69kDLjZ/ereYDRSGWaurp/ZUyrfcdHp8ig=; b=i9iDpHaMbiEm9Cl5tECbUBZcAR4vozFOSnmk5IlP74hcQ/hL44qTn2A1AxrEc45Pk0 +vFrjrV/rVBXw03SNRuFuCzCCzEl+PPuTDU9vbToGCmqbPkBf89m9M0IT1d2uzYSDrnn NtqYl97woPAmUje/vpQLPhmAzQd4IxzBYTOz056xoxnt8pXyYHIYoJO1ZwT/LahLZ1QB femEKfYPU7Tr4UGlIBeoURvEEX3OHsNz3cRV7hCrkuWJcDvGZJ08v0TCD6HVtT8tIsGy 3pOrn90YdHjYR1zUD7+8NaYBV60ssBmYjtwwfOwTOY4p36mupZxRzxT96PWQEWhZ4YSV vrqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615783; x=1744220583; 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=v1ua5S//H69kDLjZ/ereYDRSGWaurp/ZUyrfcdHp8ig=; b=vpsPJSqFiAeYkw1QtPEcVlKoXzr5kyPsWa+N+sBX2q71OQ8I6U3Afwt5OOwubPNpay MFlQvmYN+CUz33XlVPQEGz+Xq6dc5W9RjpYHk9p+BBLY3FVRIpTnecxyrbk2V5epqmn+ /D2DPFHxiwhbWtlpcTAaZSx2zFoQNiW17P7/HYaB0IUVJ8nPAjlikptXCI0sg/SqpxmB aUCGu3uvayZhd00HbWbkW1oh6But57GMsunTJuk5Csd0AixHXiNyTPBIYJrkWdn81Q3C qxSJ9LWzKR5FsMj4TurOWoHeCqpA+vHQ1Qo3ARCanQi25q87vL2rHSRxpCz3lqUMYGXs eejg== X-Forwarded-Encrypted: i=1; AJvYcCUFgxTG7TmgutSpIpCytx8KujLX4PVFDwvlt8Y1ndhkX9dNhyCh++LoJJ/0QiTPLDFClN0v6odOPLKYjA7FYw==@lists.freedesktop.org, AJvYcCV/F4nf08/rOBguFthh6SSq+082dBV0swwmizQDstnLPvCreNvZYsL0wxclzQb7IUpWEBdyyin6@lists.freedesktop.org, AJvYcCV455/RbubEXcbJlWrGmU1tzf8Qf+4hSzx/WUY4fXDlNmqjBmDLZzDbK11gjMTRoTyjpkMqquw8cLBG@lists.freedesktop.org X-Gm-Message-State: AOJu0YyKAVSOtXYaaksCmT05mjwA6O7mDnbaOapUPYnHmVx5z/ZWOvx1 IFIw7lf8iDLbPbR+ov47yfFWDVSZBJS+EM+D/kktFFUKB6/zRg5+ X-Gm-Gg: ASbGnct98/lkycU9ygFbx7n7EFzpjsA2hI3XOVa2442ZXmsIyYlK8fQEfopCqM/RJ/v vAQpq+q06pWsisy1wP5EJeigO+F0YRnKBiy8sx29FhSykhKwehNenqZswmnnQPYottvFof8Z7gJ TcZKgmLuGLvl09cVDItpC++PaDBbrOvriqfQBbzPvpTzidS5ssCG0bHLhkZ9Bajicc76eT9O5iI u87+LCi//xc7i+squz5x7p75fkRkxbN7CWW0EgsaqfM9efmVv821A7cNITi3YrQWSIKIAjRBAwn 4ZaRP3+YIgdYYUYkrWKXzGGzi6wwweXhmJ/no2wFqHeo+ck9jkGEKn/SHQD1ZUq2UktP7xgYKsM ZJg== X-Google-Smtp-Source: AGHT+IFNbSL/mGRZnpcJ5fpN82ueS3a1gUICe3xx8i7wsRjblgimnfxJciryAt1b8LRjBn5RrhWasA== X-Received: by 2002:a05:6e02:12cf:b0:3d5:8937:f419 with SMTP id e9e14a558f8ab-3d5e093c0e0mr170520315ab.13.1743615783315; Wed, 02 Apr 2025 10:43:03 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:03 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 51/54] drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver Date: Wed, 2 Apr 2025 11:41:53 -0600 Message-ID: <20250402174156.1246171-52-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The qxl driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/qxl/qxl_drv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 417061ae59eb..c18577a3153d 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -66,6 +66,8 @@ module_param_named(modeset, qxl_modeset, int, 0400); MODULE_PARM_DESC(num_heads, "Number of virtual crtcs to expose (default 4)"); module_param_named(num_heads, qxl_num_crtc, int, 0400); +DRM_CLASSMAP_USE(drm_debug_classes); + static struct drm_driver qxl_driver; static struct pci_driver qxl_pci_driver; From patchwork Wed Apr 2 17:41:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036330 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 E8527C36014 for ; Wed, 2 Apr 2025 17:43:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A6B0010E896; Wed, 2 Apr 2025 17:43:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="arBgeyjw"; dkim-atps=neutral Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0A6C110E8B2; Wed, 2 Apr 2025 17:43:05 +0000 (UTC) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-3d45875d440so608545ab.0; Wed, 02 Apr 2025 10:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615784; x=1744220584; 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=riXSD1tORrHtkttiQwAlqFF38I5b7O133kwF8VYREw8=; b=arBgeyjwh3Xd2brJrK0Zxc/2GKikXZFueGFq0tQhWLZWiJ/6svTm2JErWpl8r+fL7c kZU63yn0pLRPg98vrll0IHzerbuYv2//0xkumL6UV1xO1hFIWKWuedbxtZB5fe4JQvpU Nn4FpsUfFgwxiETnCGBMQ4u+Glhr1M8i4o1OvCW58N9/SI4dsa5gcE54JfYkzvCXCAF/ iwY6Yqkc4UYGTZTB69M9eQn7wLcdtHV9vjXr5+aYNuy+imYEQAI7mCmFUC4bt4g6Z+8Z F42M2LDfR3bpm8ZFxpoE4FxqCqHIb+SVwWny0mdH13l+BJuDD4uMro4WmuxczIjOOc7F xNvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615784; x=1744220584; 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=riXSD1tORrHtkttiQwAlqFF38I5b7O133kwF8VYREw8=; b=wZWGRWA1JnLbNXdCI6UDnDtPro6CuZm0QcvpxhcTz6SGhcn7q6lzMJnBNCGzVq+Kkd bwTwa/uXMNJN3lbwRbrUT7DfQKYZxTONAJ3aB5++5NPZ0lcszoxg6dSsvZe9JDZXl8S4 Xj9aXKu9wwAXCeyMgrFsA+9a/A3EwGzSx5WsJyn4BWdPRiAjCqgOwDPLyRs7lVdxDT6r +9Xqqnrdg/MOqObUl88zApfRs/IWacjhAWCSpF5oyvdksMAARexGZBykf9dya9ZoEPrX 59kAfe8m9JYzpbQbW888EVF0mDM7QGgop+4a5189ba6yp3mYQZrmPWCSQiVnwRDewXWA tV7Q== X-Forwarded-Encrypted: i=1; AJvYcCVkVYdLM/a7sBnPe0oSukOXsMtwnpj2ZQqmhbTGpYmf/w4+LYnU+a5u+1hX0nmNRADkB1xWQZwI@lists.freedesktop.org, AJvYcCWfLAVedfxFHbjK/nF6GhCZw3VNW6I1GCLbV3WJp1rR0l7TynntcrIPx6s74Omz9LHsPopsK/5p8NhA@lists.freedesktop.org, AJvYcCX5jZixBHtNqI7iXHPHXe0MiTkqlW9hmIGvQ7kFAyhvmiznmPjXOPHpHU5DRkHs2be50ObQ3OIArRVvLlQLsQ==@lists.freedesktop.org X-Gm-Message-State: AOJu0YyVzalFGGOCBsKEhjJfvXeRt+GT3de0hQS8+hKVyhbn7w0x0T6i O++wxzPqIamtUbCeZXnitzZ2IgRqGaZD/pdp7hNAJRpmc/MJTGt+ X-Gm-Gg: ASbGnctKgLzQg5J7OU/oqE5zt/ynPia1mLGvylr+J4ah8/5Xmk6H6iEXfhExHj+zhqv Xr3h9+PdUy/tNhwh4TjRIaIuidr4qMYx550BXdKFrMxmcrozAbtVLWXq+rlsnJyn+B6XJlKS81h tLsapZutU6Ylb+d9cAlEMrI2OUtc4boX50Fzb3T/YZUYt4KdZ2rP3cRSgs+tQElT9xa7Vlqjw1p 2whOOvA1u8NhfB4hhNKfFLLYOZLxdTnoRlgonU7fyDLLC0eZYVLqpatlEkGHX6gzPidKzjpmOAh 5MwdZmd/rTNFtZ3Af4qvUmmORbDfcQyX4tJNf34kQs6fl/rIeRxm7OHaFn5jpao7aYn4HAK2J+b STw== X-Google-Smtp-Source: AGHT+IEbSBP+B3xptDWbc/1upPiI0aJgKHmWB2BUQakR8KahNUKIycomB71fjze7DtGkXTxHa/MFtA== X-Received: by 2002:a05:6e02:2612:b0:3d4:3d63:e070 with SMTP id e9e14a558f8ab-3d5e09d9fb0mr177162865ab.16.1743615784292; Wed, 02 Apr 2025 10:43:04 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:03 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 52/54] drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver Date: Wed, 2 Apr 2025 11:41:54 -0600 Message-ID: <20250402174156.1246171-53-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" The drm_gem_shmem_helper driver has a number of DRM_UT_* debugs, make them controllable when CONFIG_DRM_USE_DYNAMIC_DEBUG=y by telling dyndbg that the module uses them. Signed-off-by: Jim Cromie --- drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 5ab351409312..481d18561688 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -23,6 +23,7 @@ #include MODULE_IMPORT_NS("DMA_BUF"); +DRM_CLASSMAP_USE(drm_debug_classes); /** * DOC: overview From patchwork Wed Apr 2 17:41:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036332 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 54035C36014 for ; Wed, 2 Apr 2025 17:43:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC68C10E8B8; Wed, 2 Apr 2025 17:43:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VykCYApp"; dkim-atps=neutral Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCE3A10E8B0; Wed, 2 Apr 2025 17:43:05 +0000 (UTC) Received: by mail-il1-f170.google.com with SMTP id e9e14a558f8ab-3cfc8772469so414895ab.3; Wed, 02 Apr 2025 10:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615785; x=1744220585; 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=/+QMYU6kMnFOETa/gyjW3XwbPIpROUU0JSPdCI4eHHw=; b=VykCYAppdYYwszap+5AjEvEiybSwMGHFoQTIhZBqKSFz3DSq/E1glPS9QukrxboN7R lRPCwh6igLEVVgd5KoOo1cJLs8rGhr1Jai95L1vmjpH2Bgyqw9TZYlxrNg/HLJsP5vi3 3lzEMJ+KpCJjrduHthfmbuwzCnEFG/NdJW/kzLn3Kp3SG38997KvX4iv27SOQfMpotX4 7R3L+O8Q9jwbPaxw0urc5A4TfDE4v+AmCLc8VeRv5dpaDgRjdno3WyzCNKUWEMhGZ344 oo814GaejLZwXfu23W5rKgq1X5bfQRwjmkdq5uh+44gvOZnqeee0ObW2RbLIY4UU0UKD EOFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615785; x=1744220585; 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=/+QMYU6kMnFOETa/gyjW3XwbPIpROUU0JSPdCI4eHHw=; b=ATa+EL5f8nzuqG9221kLImRwbEMzvTKn8lYf336seKXcnqJvPi6x2e3DrLnUKqga1g fu+u/++Sx6ew0WKuDIOVy8p9TMQQXEwzkt0zuiaZL8ExPD9rSdTMxAO+QvPhmPM7y/C2 CTxUopcuOQO77HTFOPD+YvqYFlv3r40xPRJ0Sjsboe+fx89XY4+v1AJz8BRwGQZQBiCo rJ63XtxXLQ3G62dIN5cr6p6Yp8rBOhGb4tJr6KAsA2zLcWP1HEn4gkA+q4u+4enmN73K OpKCIk4ycMg85fc9pDuEqADdOFpKSacyqH2zgj7ukREj3hGv+SYQ/6QOnP4+laf+9Q9v zi5g== X-Forwarded-Encrypted: i=1; AJvYcCUUpXVKf1sPcRG+7u3arkWnBq9LvR2G7l0ROxV5YBelwT0wWYZTy6rXg/Pg13LirI4OsrV6b0JLIT73@lists.freedesktop.org, AJvYcCWoIYUps/AciFFRYTiqiAQqjFsvH9PJWffFdjB9mYsTPYR4Lrka5bEBBE25eGHSFUXA/sHTYkJv@lists.freedesktop.org, AJvYcCWv1a6cq0l1FWqIN8G59PXZfkrTkLj5pbMfm1LENR2d1rkIptDiQnTeA/nSoUrovjcTrdH4U/BRiPoLOp3ayg==@lists.freedesktop.org X-Gm-Message-State: AOJu0YzvJ652+z9TA2x2P9L24SH1M3OglmGuSHPxoBuotoXDwQSDM7Lk ZAYTeQs94VAUEjOQ7Cs/OiCbscXehMJ/7xKROMzAoXepntTvpOjf X-Gm-Gg: ASbGncsz74b51Lh8u03Q8szNLmddAu+rLjBAdX9V4iFSCdprzGlVnEBtZHQmTkuObF2 Q2YR66dlOS8jtDnM/8h1ckghCxjIHviwF3M6ezwO3x+hwqkt4F+dCx0ZOXMcV0r1gTCdIndeJep EEFzlGn12mqhP/WTMFLPZqHOLRwve2uedZVD1iBt4USVgD+DFaVHbTCnRWFsg96xylNZse4ePTD hont0GVtcoOmbxCsM0sxTJ6ZZSXeqI5jpg66nvqc31YgQ2IkfnasAqJUSoYDxn4mqy3hprZLrrl FaFB/GMBceLdrQr1hpnLgXltaMQGOFIQKhou1TATymmYqeN16VPUe5grb4KrMZta2a/oNObPPpH +sw== X-Google-Smtp-Source: AGHT+IH6nE+1RRyptl+hnFIsnD98qBIE2DJ5GwLkp49MBABtaplmtxYAgbpkZKesyp6M7QVsZiqFPg== X-Received: by 2002:a05:6e02:144a:b0:3d2:aa73:7b7a with SMTP id e9e14a558f8ab-3d5e0939424mr211440705ab.12.1743615785077; Wed, 02 Apr 2025 10:43:05 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:04 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 53/54] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Date: Wed, 2 Apr 2025 11:41:55 -0600 Message-ID: <20250402174156.1246171-54-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Time for some thorough CI. Also, the previous 18 patches could perhaps be replaced by a single invocation of DYNDBG_CLASSMAP_USE, from a C-file linked into all drm drivers & helpers. I didn't find such a file, nor a drm-client linkage item in the Makefile. Signed-off-by: Jim Cromie --- drivers/gpu/drm/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index fbef3f471bd0..c7d6adbe17eb 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -53,8 +53,7 @@ config DRM_DEBUG_MM config DRM_USE_DYNAMIC_DEBUG bool "use dynamic debug to implement drm.debug" - default n - depends on BROKEN + default y depends on DRM depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE depends on JUMP_LABEL From patchwork Wed Apr 2 17:41:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Cromie X-Patchwork-Id: 14036331 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 1D31BC3601B for ; Wed, 2 Apr 2025 17:43:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81D3910E8B3; Wed, 2 Apr 2025 17:43:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="a7dpzCy6"; dkim-atps=neutral Received: from mail-io1-f41.google.com (mail-io1-f41.google.com [209.85.166.41]) by gabe.freedesktop.org (Postfix) with ESMTPS id AB4A610E8AC; Wed, 2 Apr 2025 17:43:06 +0000 (UTC) Received: by mail-io1-f41.google.com with SMTP id ca18e2360f4ac-85b3f92c866so338339f.3; Wed, 02 Apr 2025 10:43:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743615786; x=1744220586; 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=dmamZMwYgFpi0j7+3VuOLzPrfkXXmhZ2avEG64/SS20=; b=a7dpzCy6r9vff1Z949GSSbX0UE1mznfVBocvgojgUmHqL+H/CIJPAxCj9AfyWig2ev R4mtKzLQtRyGzSZtV9sXcKfo1iClV4cT7ALJYWUvI+TDdvDpb+xdOtkMnipKOPQZVpyn 7Z2RM5Pe5nEC9OKa4CFP8qpAOPMq+WkkqhUDmd2cYY5C6OwHb8BlR0nWbglpMXjNfbkP 2jkTQ53swcthA/G9Ldy9A8doMNjzqKyV4op7dDWTWM17xTnSBGlIMV209beFnWcGBhRP wxvXAeJE7u/K9BH3nNnkoJWYUgpILz+NNt9QKjiDxJnUTE8ADEqqe3Omj2s8F3cM/1sP +CUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743615786; x=1744220586; 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=dmamZMwYgFpi0j7+3VuOLzPrfkXXmhZ2avEG64/SS20=; b=Q4xWYZQVu+/j16cZOYEFOm3EPghD9mGPIPbFjMWDuMK/FomSz2FZ2ez1CVr7ePQc4I BI5bffPgH16YDsLJvqQg3TDG0xW2eAD3jAtsqRDFNpWF5WBhxk0x/RQRE9fopFL+G21P E734Kla21mQvZlXiZaRlDCUbsF+sqvYcXjvPDVrPNhLHAFb7MLXBzRx3IZ62WsVgDG8r NvV44gD6F9euvA79luxkGAxbzHcX+mBG2uy1NqkWkykJ/sXeFWbD+05Srcl7IHN5Dm7c Cd5Cl2RjfRiXQQE6YnZTaabd0a8kJ5LKI//Cfph3fGD5W6I4xkkE7cez4JY4xKRBvwRI HHkA== X-Forwarded-Encrypted: i=1; AJvYcCUQkOEbcXqc0OL2RrEx/DXmhhTpQ5ojOhlDMhZ6N0+pV4hrrFvj8RwSvwaen/E38TOJoU52CrY2rCJeeXVABQ==@lists.freedesktop.org, AJvYcCWDBdnbJWNq0EDaREKjcf4rnyGptVFDfvIqytX4wMCikh3SxjLtubww7DD4YvBcAkboO6StxR86v/NZ@lists.freedesktop.org, AJvYcCWW4rGy1R+aNmCaEt6XC9VpmVElLw2OsOENYgWKBEl0VGUBufpaTZrIkKjxO6B+r/jmPUhnL588@lists.freedesktop.org X-Gm-Message-State: AOJu0YywS5khXRnOqwLoULaweDyVmrlp/b+QxNs4MRe9hM0zx1aKFQnW +vHZXeT/JGpVJ2R5+8qMjdegd0Nuv/Ph4h6/fSW7XG4grNQ7CLbv X-Gm-Gg: ASbGncttbb9fn/gSVQ8nkPOfYTpSyi2Ay2TeI3Vg/Nuni764JCfCDZHnO8a3Kqv1JHB 1bvdCWwa3TQTv4PTooOxXN/ftwGavLWMGqkXpV6CEVhmOyNDXvN2PPr16GWZ7q2g5SoPIkbYe+3 mZHDAIa4QhM07H4x3gLCoopH+Xl/h9k8x8Rbgh+/DH12gQb69uRmeOQLiSFLTeYlpB797KrLu/4 V59CeDnPqEikI67XER4DT0XUJCx3JA6OEetZewMGE4kiAymsDLROT7Lq7tP1llrcyH4xxO4Uxg5 m3dxYK5FuLCOoWJU7h/MEW6qm+5gGXzH2wbXV0f1+UIX8A8eATY3nmWYhCi9wRHlTdLgfTl4/+Z BdA== X-Google-Smtp-Source: AGHT+IHals0Ha6Jbgxu6ZrP/iyj69ILFezhPsXy3WvO7TTJBtm+wHjVRufglAOrxetkFLageXKmqeg== X-Received: by 2002:a92:cda4:0:b0:3d3:fcff:edae with SMTP id e9e14a558f8ab-3d5e08eb18amr200191655ab.3.1743615785891; Wed, 02 Apr 2025 10:43:05 -0700 (PDT) Received: from gandalf.. (c-67-165-245-5.hsd1.co.comcast.net. [67.165.245.5]) by smtp.googlemail.com with ESMTPSA id e9e14a558f8ab-3d5d5af8369sm33439725ab.71.2025.04.02.10.43.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Apr 2025 10:43:05 -0700 (PDT) From: Jim Cromie To: jbaron@akamai.com, gregkh@linuxfoundation.org, ukaszb@chromium.org, louis.chauvet@bootlin.com, linux-kernel@vger.kernel.org Cc: 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 v3 54/54] drm: RFC - make drm_dyndbg_user.o for drm-*_helpers, drivers Date: Wed, 2 Apr 2025 11:41:56 -0600 Message-ID: <20250402174156.1246171-55-jim.cromie@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402174156.1246171-1-jim.cromie@gmail.com> References: <20250402174156.1246171-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" Add new drm_dyndbg_user.c with a single call to DYNDBG_CLASSMAP_USE(drm_debug_classes). This creates a _class_user record (and a linkage dependency). If a driver adds this object to its Makefile target, it gets the record, which authorizes dyndbg to enable the module's class'd pr_debugs, such as DRMs _dbg() macros. So Id like to automatically inject this object into drivers. I tried subdir-objs-y, but thats not a thing. In drm/Makefile: Add object dependency to drm_*_helper-y targets: $targ-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o Attempt a foreach: to add $driver-y += ../drm_dyndbg_user.o this appears to be a train-wreck for impl reasons, but it describes a want/need reasonably well. It might not be a good maintainble idea. Explicitly adding to radeon/Makefile worked: $radeon-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += ../drm_dyndbg_user.o But doing this is just as per-module as just adding the _USE() explicitly to the main .c file, which is less magical than make-fu. Also, it appears to cause make && make rebuilds. and try to link it to helpers and everything Signed-off-by: Jim Cromie --- drivers/gpu/drm/Makefile | 9 +++++++++ drivers/gpu/drm/drm_dyndbg_user.c | 11 +++++++++++ 2 files changed, 20 insertions(+) create mode 100644 drivers/gpu/drm/drm_dyndbg_user.c diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 704f94efc804..1adb5a262180 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -74,10 +74,12 @@ drm-y := \ drm_vblank_work.o \ drm_vma_manager.o \ drm_writeback.o + drm-$(CONFIG_DRM_CLIENT) += \ drm_client.o \ drm_client_event.o \ drm_client_modeset.o + drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o drm-$(CONFIG_COMPAT) += drm_ioc32.o drm-$(CONFIG_DRM_PANEL) += drm_panel.o @@ -111,20 +113,25 @@ obj-$(CONFIG_DRM_BUDDY) += drm_buddy.o drm_dma_helper-y := drm_gem_dma_helper.o drm_dma_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_dma.o drm_dma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_dma_helper.o +drm_dma_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_GEM_DMA_HELPER) += drm_dma_helper.o drm_shmem_helper-y := drm_gem_shmem_helper.o drm_shmem_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_shmem.o +drm_shmem_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_GEM_SHMEM_HELPER) += drm_shmem_helper.o drm_suballoc_helper-y := drm_suballoc.o +drm_suballoc_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_SUBALLOC_HELPER) += drm_suballoc_helper.o drm_vram_helper-y := drm_gem_vram_helper.o +drm_vram_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o drm_ttm_helper-y := drm_gem_ttm_helper.o drm_ttm_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_ttm.o +drm_ttm_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_TTM_HELPER) += drm_ttm_helper.o # @@ -149,11 +156,13 @@ drm_kms_helper-y := \ drm_simple_kms_helper.o drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o +drm_kms_helper-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o # # Drivers and the rest # +subdir-obj-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += drm_dyndbg_user.o obj-y += tests/ diff --git a/drivers/gpu/drm/drm_dyndbg_user.c b/drivers/gpu/drm/drm_dyndbg_user.c new file mode 100644 index 000000000000..9e4aa87d4b58 --- /dev/null +++ b/drivers/gpu/drm/drm_dyndbg_user.c @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "drm/drm_print.h" +/* + * if DRM_USE_DYNAMIC_DEBBUG: + * DYNDBG_CLASSMAP_USE(drm_debug_classes); + * + * dyndbg classmaps are opt-in, so modules which call drm:_*_dbg must + * link this to authorize dyndbg to change the static-keys underneath. + */ +DRM_CLASSMAP_USE(drm_debug_classes);