From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f51.google.com (mail-oo1-f51.google.com [209.85.161.51]) (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 C3C273921FA for ; Wed, 8 Apr 2026 20:02:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678569; cv=none; b=Lziz/Z+MByg6XCYLgUS0jsnCVN8vpDlANHJfrHbHoPt1NwlIyrEEBiIKUnELTHwWnPzO/qHmNRWlqtaKP+j7GM9Lt84Ed8454juz7gim0IIPTOhmIAl6qaLcRZSFeuakvEGjaX0GuGTvGY+4Yk7joFjz5ot+tcvRAvjAZ1jLb5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775678569; c=relaxed/simple; bh=gSLOnEPV+jvjPNA5x/nZIZ9K0KOd+BB7WmwBOrzaITU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JFNoqKfZ9mDe1EXQN6dCOLR4f+f86zqZmEK4aJEwJLFqBA4FfbwyjIKqegfTe4e6Lr13IFUiD29Od4VsPnIGg2uN+mhXbEOpImClYPlIGvWMsahFhnxPGkvZOZkzrk6wG1RdKiKG7TIsgNsQPIfMATajORLm4V8k99WJeIW4vrE= 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=N2ZSaGVn; arc=none smtp.client-ip=209.85.161.51 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="N2ZSaGVn" Received: by mail-oo1-f51.google.com with SMTP id 006d021491bc7-67e0d3f288aso97859eaf.0 for ; Wed, 08 Apr 2026 13:02:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775678566; x=1776283366; 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=N2ZSaGVn9WE/7U9DVJU14kr2WH8oytvSLPFR36oPQSuhIM0O06JJ/mXHSPCEGAWTcH n9bkLwJa8SKGqp1MNzHhTTZDWDS8lpenCXC0w3A/DWNBrKjtBjjVwHzjbjpDzlHqAV5G CKl8WwgoQOPbCbXogUPS6NB+MqAzW7CCJjBfAJ4dT/Pm0LACvSjB+0e5GK0rXZanWQTf XXBCd//0uN+9PwlSsTOSPB3JX7oVpCr/2RgO/S1+UCLDv4MFv5SLvr7gf624Pd6wGPRl htv4Vp8IjwgAiBeGie+/pyRj2SnbbG0170jnRRiUI+DNu3rgSYeoeJHuhWzrcqjlvlIN g6pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775678566; x=1776283366; 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=sg8KNsCP4MPTcQdMCySLIWXmlV5RueFcJcEf8QzjC8K2THhw7pXKqD6axhwfxEQ7tW T96WN8MsfeMCnun8ZDdLNeG2sJfnsDlGeV9B6u8GmiXxoUoRcGWZ4AyJRVfqDE8USJN2 8c2nUGubF/FfhCInU3Sjfvmba7DucLRYoillFGOmJ/pwoVmZYRFfti22/xO4ebqswGb3 PgJTZl6qzXhVSARpnLfIYsOxIs1reJkfKAuvALDRdRpLtzngU2qbq1B7qBk1vz9N3U6h BWlzaIWyPlJ/Mil+9p8o8xwdtM68654CptTF2wBLewhakdO/Ih89yGaET4wOk4FMQKbQ hNRw== X-Gm-Message-State: AOJu0YzzrRtnIcdkUS2tcOPHtpquSknkjge6sIA96C88Jo7DH/oa6umk 4COLSOylKE/wsi+M+x0P1HLhA6rGycbEDNHNd6fqoQuMlNFpZEXI+L8ZZrCwkw== X-Gm-Gg: AeBDiev6TEOd1yH4PJWCtNPxkvuoFMVVHH8/iXQz3zmWnPkqjtOgs5hdjboOr4ksDxM bpvVkeezLOm6hKR+vh1I3rwkvBlARZ2xUreJbahGqefhMlwW/qjLrOHWR3A3JEKDdZoS58RdQuR 4utFD2wAELJkqfLXtMyXbOOuosVsL1f0q+V8haY2yIsxd0l4GNkv0HMcY+FXj37D6tZtQ2zxyxO 9R1BNiejppYz9zPs7MEuiueHk4QVWZ+SnbWwHpA0vsCVUivRC0ONizuUb8IICZcEMTnQbaBtaYL mUUnJ+HZQSy9DhOdoYTHxQo64hSWTF3GJ4pM+f3CDtcv9HjMrrs5bRoSgAlHW70CJ7CRK7BAnrV ZmD275lebpJm+3xHpidnxBk1Wpy6C40DUqACYpOwtlzARNZXtiNRsRwL5ktRm//jf21HDe73TF5 etYWb62jsmFEACMYykObAFqQBB4KjkEFTTfpx1wR2z/znoctEwcpJ08jErFdoGr3B/u9PfKgM3u s+lp2+RlilyBw== X-Received: by 2002:a05:6820:1513:b0:67e:3967:16a6 with SMTP id 006d021491bc7-6821f6793f6mr12310642eaf.39.1775678566509; Wed, 08 Apr 2026 13:02:46 -0700 (PDT) Received: from frodo.raven-morpho.ts.net (c-98-38-17-99.hsd1.co.comcast.net. [98.38.17.99]) by smtp.googlemail.com with ESMTPSA id 006d021491bc7-680a63c7fd1sm12254208eaf.8.2026.04.08.13.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 13:02:45 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jbaron@akamai.com, louis.chauvet@bootlin.com, Jim Cromie Subject: [PATCH v13 31/36] dyndbg: split multi-query strings with % Date: Wed, 8 Apr 2026 14:02:06 -0600 Message-ID: <20260408200211.43821-32-jim.cromie@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408200211.43821-1-jim.cromie@gmail.com> References: <20260408200211.43821-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 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 = 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.53.0