From nobody Tue Dec 2 02:41:29 2025 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 060A8377E94 for ; Tue, 18 Nov 2025 20:19:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497175; cv=none; b=pvESqp+SkO04WXhVy5wRJOXXqvseA3d3guis6i3OR8Z0ZRPLJf2L0KW2A8woe3t6TUATiJse8dl1AFr/vMshK138vkcO066wJSZuiKlEqUFuMInbjBW5uk9v1EpxiR7q/231AbH3hmlulMUI97hv2ksRlwMuM9pHIqLTZ4AUndQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763497175; c=relaxed/simple; bh=KSE7MkB4NgXgxQWMFFlBNfAoIcqlxC5BEzgg/j3dP24=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ICMeezTL0CE3kL2h1hWqJp3x8s5NJWucAFsoxPq6bd/GS/DZ+1qvxmKQhAjnMtxgP5xZJOSPPtfnxnTP3SF8vvuvSG3Po17cp3QPwsXPz0kA+ViAkncVNt0z7NeaUiFZJSiR516G/lWH6gGF76xRAow+N8/T5wCiijHF6LTd7/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PGPt23Tr; arc=none smtp.client-ip=209.85.166.42 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="PGPt23Tr" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-9491571438cso95886239f.0 for ; Tue, 18 Nov 2025 12:19:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763497171; x=1764101971; 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=pSs3Y1qOAJs6RAkTlU1X0YsQPOXWFdsurW/bzJWGvXI=; b=PGPt23TrxsH902kjSuGS6FSChWRkUmFj5/Jpaey33dw+YAmIghDVVDa/ezh0qf0qi5 vc1SnqrKqXuVMtAupWuOV+5QUzN6Gs161SeJWsf/46FHAcaf7zd1h95seIJpV/is3gTW UwpSQdUeDYOYKIZJWLn67cGfGzmSwma0ucoOh7GO2GJuj6SKVGxU2chCWW8P9VOzw8Ew VQJQrNmQ4YMEhRUqbtbkIIfUh5djVPC5rMO3JChTtdo/fCsR7InatGWFkzcpXmy4WONk 11hhmQLuCgducic3pPnVLJouVprgR3RLldcuG8fEqt/ZX+97eH0lPMzQ+TPDplLm/sfj 87oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763497171; x=1764101971; 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=pSs3Y1qOAJs6RAkTlU1X0YsQPOXWFdsurW/bzJWGvXI=; b=L17OzuqFFFAjGerA+ellUQO01XQD1EcV5h90fcfBKw3r0e5MRK3ZTkPRa6DCjERLX4 S8ddRZEKeJwJmFKghgLX3y5Q3N9XsWNpj0VTiHWySUcpsnGqlvj/k9oIGKAXtXJHGju9 J8AcgyxMjwBibcJ2TM6ww42y+pVvDm4m6LipwSCDeHZrD9kUwkQpg0NITO1damF6+vGP n+L8/7mqPhcXgPoyO7q/0eIEjxqfNqZqAK8OsteiXZbHSn0ky9ZGk7Pqa2Xy+0pOeDv/ lEnT62f3BMs5yGmJOHW7gm95qSrdMQaxnDHjhP+xTawPNOwZpBPOlLRyUjJYldCCq0cF TVKA== X-Gm-Message-State: AOJu0YzlgQsw2a5SQk92bCCcLdc7p94kZOuc70TF6a6FfyGfZzTWIPkJ 5QR4mwcdDJX9O/OCwemIk2BDmRJSiGpzEXoIt1DLsqyDMbvnZBGqf/JYOOmlCu3C X-Gm-Gg: ASbGnct6FeVMo+BUkZ3hasSrPwRsPgsFCa9uPZepOW/kB22WScgOQyAI+hqIhmZrPf3 OYmqrBva02WnQu6RwA0l2o++cI2UWtH7Uwd2jaBNslBKgCoWw5mLxP5vGhljIqsULnwDf3651NA AzUN3pnl99pT17kFjiy2/1/LOWTAUsYtsZptg5sglgUCcIcTDUdImd7fqI6LV7ivqdpJ0fcAf/M 71ynConZD8g1dBrb70B0LHWTDh3ZIb+jLvanLBFS//fJ21bVat2Mox5FzGZCgTGtD3VPKFaR+Lo 46oQ9ENd5IgC7Wi+doOG9u6naTRhfwEAPpvMpLGKRLOqQYfdPfNTrVxMzODAtIx5+RhQQ6I9/Mw GSAZ+D465Ah2iJMBKW/EjnT5KBkHxnTGrdosv18q947Fjk6L9t3sxO0jGedCSP5FeoK4XlNGa74 Z3xDQi5W3NDprS6mOtDGkrEx3udk6YWTYZQcRlu7T+QIDzdnpKJuybE8t7cOw02ibGaAM0I51Ei 3+zcR65X5ghJhTR X-Google-Smtp-Source: AGHT+IF/109dS81O6NLrPpISZ9YNF9oRBx0yDRnxWROCoBNih0q1Ou0KcWqNxbpWmEkDq5q5rScEtQ== X-Received: by 2002:a05:6638:c114:b0:5b7:bf63:9c2b with SMTP id 8926c6da1cb9f-5b7c9d5acefmr15014841173.12.1763497171298; Tue, 18 Nov 2025 12:19:31 -0800 (PST) Received: from godzilla.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id ca18e2360f4ac-948fd4c273bsm419823939f.18.2025.11.18.12.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Nov 2025 12:19:30 -0800 (PST) From: Jim Cromie To: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, jbaron@akamai.com Cc: ukaszb@chromium.org, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v6 27/31] dyndbg: split multi-query strings with % Date: Tue, 18 Nov 2025 13:18:37 -0700 Message-ID: <20251118201842.1447666-28-jim.cromie@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118201842.1447666-1-jim.cromie@gmail.com> References: <20251118201842.1447666-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. 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/Documentat= ion/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 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 c34de431305d..636a6b5741f7 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.51.1