From nobody Thu Apr 2 20:20:49 2026 Received: from mail-oa1-f47.google.com (mail-oa1-f47.google.com [209.85.160.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BC23C423A71 for ; Thu, 26 Mar 2026 18:55:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551319; cv=none; b=CB6elxpbkkTTurPp5i0CGLRFbH2gWSSrth3Kej2rdF7n5tVRVLMsPh58p/RwOpD3RbJqVLuKBYWrl5cDMRiEpvaq7z2NR70zy5BNpFaiYGXssiiS/rcUl2a7it7AXduuOjwEFJPCpHvL16w5qbwvysSTa9OunegK7oEruff047k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774551319; c=relaxed/simple; bh=gSLOnEPV+jvjPNA5x/nZIZ9K0KOd+BB7WmwBOrzaITU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UPY/GBgqRvvwWGlsCFNZnIgZQ5dxe4053808J4uT0YqMNb5vwkrRL8J+O34XSkNUHI0SLHsrkW5xY6DdyGMa6APsZIm4mIXAbEMpvG/DwGBbo4Itxr+YQwtMcq+2OeteUw8e9UVQBiTAWs3EwO04LEOVvVr65lmuRLPh0wvA/IQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WVTb43Ej; arc=none smtp.client-ip=209.85.160.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WVTb43Ej" Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-409de4132b5so816385fac.1 for ; Thu, 26 Mar 2026 11:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774551316; x=1775156116; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wYQBxHr3Fa2/s6UIiugIdxA7TpYQIjo73GyHI23/HiM=; b=WVTb43EjXpYOeySnfM4GmZq1go9009N9pLjOBp4pe5gUOreu6nGuHN73pSfnEga9kk Cy8XtsQxiQe1W5iPBoIx98DLV1xO+BpGOerojVnkzjiZc3zcVZuOPy1cTznom3Lfyqqw cGn27c2HkReE5wdULUxPXNOj/MLXde3kZDAvbV048Sy1llYovG88eNy4iCW4Sj7g1/gv /HtFfxNfoRtFFyD4VJmfSWMNHrVD3rUokiEXL0qhfVmJfgtIMT0S/iVTNeUouPoXJSX5 k2jTYoJVkr6iL5eYUWs2esRlnPVpf0GaP7aVC8q5FxYLxRYxdx+0iZ+MZTgEKjjqtpfz lOUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774551316; x=1775156116; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wYQBxHr3Fa2/s6UIiugIdxA7TpYQIjo73GyHI23/HiM=; b=oseHXSmiGMEknVd52ij1xmdcpggCpdRfcRkPG3DatWtI8qw+2/SNfLbzob+skiwld7 Hm3xShNlq7zZVB5d5Zf4Ka+8TjMOeTv15ahgm8jyUYDCF6w2Y3hWDUaIQC2Wn3GSFrP6 FaQLhKWrVvAWZSSSkTggwTZXsp/6g6s5/WbcPGcvMegpLTBLzWVCLBHVTxYxg8U7PTML dj7sJzbOpTEJOdkPPZ7hu/aXWIE/6R9qPFKyvhJm9L+any+M4Y2Lpfh4ff38xokTLbYB ms8GEBZTZGVMUV3Ay+tzOwUIo5ccr3z6bYQxUS/pjmuP0U/yEDJA7AYBX8ql+j4PVVSK PCwQ== X-Gm-Message-State: AOJu0YwFq4RduO4Eb6HBUVR/Bscr4QjnKbH6d8Fs7eAcsBNcyQnnVQa2 o12bYc55PkKXv5FzgDy4a+T47loVrNBNxDvHLOfny5T27xRS6FF03SCyMFzRnA== X-Gm-Gg: ATEYQzz5OvXdlQUS/SA9CJO7y+WxLAu+qbDimj0fJtNXT5XqSitLlZOBIVNFQkZvh2h vPKKmsRO2CaMXyaXjM/A7dwCG2xVNguatg2m3HjMbpAFRpa0r7wSRvVRHJZ5otl+FUQKTP8fP5/ rsEoKsSeweZZ8I8p17pshWgUBOcBrzEIVCcWVlWAJbdoDW8n8w29kl/rP8ZohxcIWfopxfs8sNB +iN5UHALzA8UiHUfxqhgPfnuvLX2bJFTF//26Zf6mLZezmZu15Oa78PQKBt+d4xDQVuboIYru7M EcgDdZKzD5Hd5LEHpYLoKdmIsZse1nmKYDF2Qr4eaqz2Dxh8noXlvODJLtQLvhcspPIBWF+qV2t a30MDRMJZLn2i1oVkD8gSdjAaeQmGgZql2np3Zfiq9eF/gwljPrQHf0r2uXJappvKoXMPhcRlYQ ClG9YWblucQkPp0gri4buFd4u5rhlKXgw9lKZkfbD+8NM5X8qV X-Received: by 2002:a05:6870:16cb:b0:41c:4e6b:3673 with SMTP id 586e51a60fabf-41ca6f4c6c3mr4241281fac.10.1774551316520; Thu, 26 Mar 2026 11:55:16 -0700 (PDT) Received: from frodo (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-41cc7760c08sm3075171fac.4.2026.03.26.11.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:55:16 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, airlied@gmail.com, simona@ffwll.ch, jbaron@akamai.com, gregkh@linuxfoundation.org Cc: jim.cromie@gmail.com, mripard@kernel.org, tzimmermann@suse.de, maarten.lankhorst@linux.intel.com, jani.nikula@intel.com, ville.syrjala@linux.intel.com, christian.koenig@amd.com, matthew.auld@intel.com, arunpravin.paneerselvam@amd.com, louis.chauvet@bootlin.com, skhan@linuxfoundation.org, pmladek@suse.com, ukaszb@chromium.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH v12 31/69] dyndbg: split multi-query strings with % Date: Thu, 26 Mar 2026 12:53:35 -0600 Message-ID: <20260326185413.1205870-32-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326185413.1205870-1-jim.cromie@gmail.com> References: <20260326185413.1205870-1-jim.cromie@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 85f7f6c0edb8 ("dynamic_debug: process multiple debug-queries on a line") Multi-query commands have been allowed: modprobe drm dyndbg=3D"class DRM_UT_CORE +p; class DRM_UT_KMS +p" modprobe drm dyndbg=3D< [ 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. Reviewed-by: Louis Chauvet Signed-off-by: Jim Cromie --- .../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/Documentat= ion/admin-guide/dynamic-debug-howto.rst index dbf901150587..0a42b9de55ac 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 equivalen= t:: :#> ddcmd ' file svcsock.c line 1603 +p ' :#> ddcmd file,svcsock.c,line,1603,+p =20 -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``:: =20 - :#> 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 16cff6c3b81a..6430f77c7b9c 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -626,7 +626,7 @@ static int ddebug_exec_queries(char *query, const char = *modname) int i, errs =3D 0, exitcode =3D 0, rc, nfound =3D 0; =20 for (i =3D 0; query; query =3D split) { - split =3D strpbrk(query, ";\n"); + split =3D strpbrk(query, "%;\n"); if (split) *split++ =3D '\0'; =20 diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/too= ls/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 =3D_ } =20 +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 =3D_ + modprobe test_dynamic_debug dyndbg=3Dclass,D2_CORE,+pf%class,D2_KMS,+p= t%class,D2_ATOMIC,+pm + check_match_ct =3Dpf 1 + check_match_ct =3Dpt 1 + check_match_ct =3Dpm 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 =3Dpmf 1 + check_match_ct =3Dplt 1 + check_match_ct =3Dpml 1 + check_match_ct test_dynamic_debug 23 -r + ifrmmod test_dynamic_debug +} + tests_list=3D( basic_tests comma_terminator_tests + test_percent_splitting ) =20 # Run tests --=20 2.53.0