From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5DB72342CB2; Wed, 9 Sep 2026 00:55:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788915304; cv=none; b=W74InqVnVtSp/CBgJwEuDFwuoQJ9F5Mq+nA16FIkKKU6tlW064uoFmTizVCEOA78uaqWsW7ABnDmD1BbgpjtNwDn5ZcK3BkEBBilqWi3IoM6I2preUxdcuFGBV/JAtUXqgDoMwjOrRph6HZs1VFnGfOOKBSKvLW3wiSYl16EXtY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788915304; c=relaxed/simple; bh=mUGQkobXRiJxV0Xzh536dnjtF2gAbcF4JnUV4nTmdfU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RGfW/4N76FbmVMWh2zv0qXGIDJVawnUSUxNbnJ3JNwtSMa6aiddDSOTxIhpMeN1mpdcaLSDlXER2uMD5eNhABsn0prMTDqO5wvv6Q8IGX/56ZckCl0gSQoFGxf2nTSXG6o4Cgew+2nTO0QqDFZJHEUpgontACKW0+qRDhJgztqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ADe+V1CC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ADe+V1CC" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3DF97C2BD05; Wed, 9 Sep 2026 00:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788915304; bh=mUGQkobXRiJxV0Xzh536dnjtF2gAbcF4JnUV4nTmdfU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ADe+V1CC4vk7mpAxjOe473AdQnnD8LQq8a+jmHJghwdKZIwRXKV7wt7u1C8O9l1Yl +U8++dQcVYntGjthBDX2YWsIb8Xa0aob7XvpSYeVtjC3lE7WFFtse50DWXlrI2SvzR gcTolhfSE4I97QhMBsAM6RhAtU8d3MVay+u8TOBNsrJkV/mA4ytZvjOPzMsfuRqSTW Rilc5pLueXwbBICu7W78+Fo1tIvaQBrKkUwIV0j/pnc3P4iVQx65oynqZUop3eTcfa jFIJO+v+F4dJwv4E/dMAVrM6t9rFm+L/xWj+mrfA1VSOkf+5hNEwiLLOWeSwAU/ZPp al1PZptdlcUGg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CB32C79FB5; Wed, 9 Sep 2026 00:55:04 +0000 (UTC) From: Jim Cromie via B4 Relay Date: Tue, 08 Sep 2026 18:55:26 -0600 Subject: [PATCH v9 30/39] dyndbg: control-parser: treat comma as a token separator Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260908-dd-cmap-part2-clean-v9-30-3a3f621f4a10@gmail.com> References: <20260908-dd-cmap-part2-clean-v9-0-3a3f621f4a10@gmail.com> In-Reply-To: <20260908-dd-cmap-part2-clean-v9-0-3a3f621f4a10@gmail.com> To: Jason Baron , Shuah Khan , Andrew Morton , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Arnd Bergmann , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Jonathan Corbet , Greg Kroah-Hartman , Nathan Chancellor , Nicolas Schier , Shuah Khan , Randy Dunlap , "Rafael J. Wysocki" , Pavel Machek , Len Brown Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org, linux-modules@vger.kernel.org, linux-doc@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-pm@vger.kernel.org, Jim Cromie X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788915300; l=4404; i=jim.cromie@gmail.com; s=20260203; h=from:subject:message-id; bh=Iaet9M/L2Bm5+DwcFi87SdD7iiNTvlTgW5oEkbvSApo=; b=RsD4lyePNbC4PaeKkWRnweZ8BBMp9sucpHkZaXLgG/el8qYFZHcVITubufYORkjLwGr8rtuh2 NHhxWK0pXvVD8D6N7LN7M2OHKFOmhLP8Z2aSzRVV9iVmuKuKtZiNCcc X-Developer-Key: i=jim.cromie@gmail.com; a=ed25519; pk=C6E5ODlPQo7ZBynATXH9wg7K6HxP0pIXyf4s38Qw0XE= X-Endpoint-Received: by B4 Relay for jim.cromie@gmail.com/20260203 with auth_id=958 X-Original-From: Jim Cromie Reply-To: jim.cromie@gmail.com From: Jim Cromie 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 Add corresponding Strategy 2 control-file fingerprinting checks to verify the exact control-file state of kernel/params callsites after commas-as-spaces, ignored-commas, and quoted-commas queries. Signed-off-by: Jim Cromie --- Documentation/admin-guide/dynamic-debug-howto.rst | 4 +++- lib/dynamic_debug.c | 17 +++++++++++++---- .../testing/selftests/dynamic_debug/dyndbg_selftest.sh | 4 ++-- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 99bbae37d34e..fe86a9997ab5 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``:: @@ -176,6 +177,7 @@ module module */main # any subsystem ending in main module main # simple modname, selects same as above module drm* # both drm, drm_kms_helper + module,sunrpc # with ',' as token separator format The given string is searched for in the dynamic debug format diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 15aba978d3c4..d28858acdc8f 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -322,6 +322,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, @@ -335,8 +343,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 == '#') @@ -352,7 +360,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, @@ -627,7 +635,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 97588c9b07a7..89c9cfa23d2c 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -653,8 +653,8 @@ function GOLDEN_RECORDS { #K= f2b4f24fece9c55f5a5d28323c2019f8 FT_basic_queries.5 #K= 8c2dd1164fbcefb721345ce62a864a37 FT_basic_queries.6 #K= 4542e1e5e7eadcbe8f90a9c934635618 FT_basic_queries.7 -#K= 3bcbdc30323082d6e961b5f0e269fff7 FT_test_classes.1 -#K= 5516e3d13cba7ea4197a7fb6c033887a FT_test_classes.2 +#K= 8146f6f983c3a76783c89b78b892ed48 FT_test_classes.1 +#K= a15ec4843acd721fbdfddc0b512c8032 FT_test_classes.2 #K= 20d4545f9753e677e72e3adf52527fd3 FT_test_classes.3 #K= 3a6afd41fadaaf70fad18f8a4632ffec FT_classmap_inheritance.1 #K= 6f1e347f0a7930814d2e54d589439465 FT_classmap_inheritance.2 -- 2.55.0