From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) (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 A207A37D117 for ; Thu, 29 Jan 2026 07:31:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769671895; cv=none; b=llrUPoGKNfEZAT79Dp2NIKQl6EXxaO4yA6ZySzohmQuYBVsztBbUdmM8dTQSN0dLwRIkuRgjhlvR1o8R10Ob6YApNIUhfBjY7CfIKxpagbMVgfIufr2psVvjaSIomAiDgGlsJ0+Y2Wv+iQyDSEbHrThLg+6RFn+R2v9AzJ7xgSw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769671895; c=relaxed/simple; bh=9Qhvx7vJdRtG15sgDwXLo0r/z/Gr9Hzz1GSkhg9RflA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HJo2PUPzzDAIFcpc9TTBAz/B5fYlQyzllsYgFI3/rsyZgT8Z8hfeIaDvC4ulQ8rCtdXRKKH3C+oZLc+bFP65KmOPgmxwdz+n3q54ZYM4+S4b2xc7F0tXsCRRXvhZwBWHyAk9K9+l9HD7cIMS0riP76FeCKUHXEmZVFlQzn5n/wQ= 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=kNwI5y13; arc=none smtp.client-ip=209.85.160.52 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="kNwI5y13" Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-4043eea60a3so360133fac.2 for ; Wed, 28 Jan 2026 23:31:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769671892; x=1770276692; 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=RLcZNaRkQY/d+FYEr9TpNpPuAc7QSA/DtioB93EdW3A=; b=kNwI5y13Kx9k7BENXIG23SOdlrQxC/gvABfSvhVGWGVdl8osxGaPiQl2E+zPBZTVMA OF8Xbf15QkGyrSAOxEAp/oIuDGnnvo8ef28x4CWdFotLbb+Yv2JP5cDsPhSIxz1LitJw iUc7i9kNgSvLX1+GpCBBVtwo7IQF53w/rsa94qA2TYAodpRw975PJ9rPxsAeu5k15vnh /F2qNVgPWJvv4uHC6anUPD8zFpsPMLQJmPx9eVzm5++fIgpbZLsuyqaWmqAEcp1+TKQo Rnf6HnkbIgPjVwrZr4cn3L7krhKfdI1zHbFqDo8wPBwXAVGQU5dhzgrL3auVooPXmxpS ukyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769671892; x=1770276692; 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=RLcZNaRkQY/d+FYEr9TpNpPuAc7QSA/DtioB93EdW3A=; b=CoEGh1XWs8qnueGSpJxJqs1VIuLWPk2wPj8HGGSTQ2ZstOS/OrVnWD7/JbHHyoKK0c v7KZKIMPHN6rtZJqwIhzGEHMRT1ZusBiTlttcPZLyhEvlcECoRHJ3JQPtYxrYg/UDLsZ QERzmLTRxTSG5fjqQ5yWZTzx2VaJ1kmRRKA4m62e5l9NIL5mVOXUwVZBOW80Gv7H7m16 LCPhfZyp3JVLHjCz5giFk4OadDx5c9uCrAZlvKFMs6APhybt8Z7bPK4vN7nLH61KaRIe 5fY8sUjFfCpAemy9bWFB1BzGduaFEBsxp7yrHAUsFMN6alAT10FODSlDlx7VMtzf9LbO aGiA== X-Forwarded-Encrypted: i=1; AJvYcCWu40O8UqCBUSxULGqo62Qrc9cMrwxRI5o96cGt8rMvDJ/4R0GDmy2dz89GB8wAtM92e8ioOwNzNKKZbfY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz8ahWGPf30QZ5fL2fgxSR4rQGYgocAHctzk1ni5cfJjHhBzZly ugDv291ZZTvhW1YB1ykf2J7F6VatjGYoqu/ta32Vf8/OOhczWLG7suj4 X-Gm-Gg: AZuq6aKHe86Lv4km4KZtlsFsRPFG0Ptjz09nYlCmVFCnLSPiNrsO5Map+RiCFaCy+Vc l1CAh60I41ZpQda7MT7Gy7Oo2pBODPaNOtKVWqeR876vspbyJbAkRGPxqbPTjVBgkv4/F2nmgI4 i7c/OpJRyJ3N/amcpaK2QvcKKzL+tkAXlz1/hwszMl9hHZReg6yS903T7vrEZ97c+mCb6jowrVX 6/EGkJTn6KTeYVfwQmx9H5OJeJgVycwvWff8hLl08oyoarmkxfzzY7b4O92LbANKtMUuiHfD+IX Oy9w4dT0irCqKa7DZ+L/yBadVijJ9eJUuv4D4VJuO1OdvMe6dM+pSJqaNyHSK6fudV9pyyhtD7M 98YS/H18xmu1RjUZ21s1oQ0LDn580jH3Vlw97r86hHWVeihDUPuI1UKtTH1l0Rvv8eNCoUZppoD LTjh8x9Pw8SYWwHZN0DTT5sK9MwdWZ5L+vVwW7ze6a X-Received: by 2002:a05:6871:7418:b0:329:7f93:2b6 with SMTP id 586e51a60fabf-4093fefe874mr4607827fac.29.1769671892377; Wed, 28 Jan 2026 23:31:32 -0800 (PST) Received: from godzilla (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 586e51a60fabf-4095716cc6esm3355185fac.7.2026.01.28.23.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jan 2026 23:31:31 -0800 (PST) From: Jim Cromie To: gregkh@linuxfoundation.org Cc: Jim Cromie , Jason Baron , =?UTF-8?q?=C5=81ukasz=20Bartosik?= , Louis Chauvet , Bagas Sanjaya , Dave Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org, Petr Mladek , Shuah Khan , linux-doc@vger.kernel.org, Jonathan Corbet , Andrew Morton , Shuah Khan , Ye Bin , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v9 28/32] dyndbg: split multi-query strings with % Date: Thu, 29 Jan 2026 00:29:14 -0700 Message-ID: <20260129072932.2190803-29-jim.cromie@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129072932.2190803-1-jim.cromie@gmail.com> References: <20260129072932.2190803-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: 8bit 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. 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/Documentation/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 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 cec054ef7d64..08ad3f8a2172 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -627,7 +627,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 -- 2.52.0