From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B66CCC43603 for ; Tue, 10 Dec 2019 02:28:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83F4020836 for ; Tue, 10 Dec 2019 02:28:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HXNSvl7Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727282AbfLJC2i (ORCPT ); Mon, 9 Dec 2019 21:28:38 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:43753 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727199AbfLJC20 (ORCPT ); Mon, 9 Dec 2019 21:28:26 -0500 Received: by mail-io1-f66.google.com with SMTP id s2so17102627iog.10; Mon, 09 Dec 2019 18:28:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xmatraap7utM3UBBXkoOzBBOs4oxtMT13bukNxmEbMs=; b=HXNSvl7Q+yn8QEBNBwbbGbGl9aPoCoeY5HX/OHjA15JQ9KGLZpMVNj8vVVlmNN0QJc JY0TVOgq8zpZaNFyeYWIudL61X2qrxQ5J41Vp56RXYvmYAhyVALonwLSfHbhxbZORTr+ FwAEP9GpCJWaXYT2kpKGFuc6GxzNCSizDitWURsXoxCR0evzJkcXKnsn9/nrap1M78BP bHwWuCSPMAUtXRZ2OJmJ3yIUdIccDL5RZBbtf8QjDpoLiGUncplhT5ErKj6J5qcj+Zjv iLtOf05uTY6YMIT7kXSN7LlWD/S804Af5QdyYPZtA8esavO7lv0fFhWV9EZsiX8yPG3L +otg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xmatraap7utM3UBBXkoOzBBOs4oxtMT13bukNxmEbMs=; b=RmKlTTDzn3TpT5CP0qqDl9T0pi9SZtNXkBEjTg7W2jMIIMEz4QMcT6dzd4JvxhH/Qt pY1eZaLtp0WKSEUQ5X2aDd0+Y5L75Syk9X9ea5YGFVE+HZvi7sw/CyC5lp7asJ0890pY opT6gn65SBHRQrkwOtMoXP5pxdxUZ5GTsnpiG6Aovd9Aufv1hZcuJLvZw6DW2kKSsaLn 5E016PPvp2Je8iJFUCQChSke/b7hUVdos1s30z2WcGXZyZfeiFzjdcz3MJPyIAjzRg7l qiVNLiyavU1GDT74TPE+i15IPE18wBc7y5Rm0V9v/FcgZ+PCNda30mDTRvtEcefzymv9 sqVQ== X-Gm-Message-State: APjAAAX7hifIr6NHx6oe3mRA7i/zjMGdNPoyLO4IZM4Irx90ReYdBHal T7mnDat7eXf/q1GlNZu4oPg= X-Google-Smtp-Source: APXvYqxUGNTXzQpGNzz5yC+sTfc4A3Fv5B/Jww3LSUaf9cReTOlNw5tXfMXJCAnWTFfPWV/nFhyZMA== X-Received: by 2002:a02:cdcb:: with SMTP id m11mr30807783jap.125.1575944905084; Mon, 09 Dec 2019 18:28:25 -0800 (PST) Received: from localhost.localdomain (c-24-9-77-57.hsd1.co.comcast.net. [24.9.77.57]) by smtp.googlemail.com with ESMTPSA id l9sm334052ioh.77.2019.12.09.18.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2019 18:28:24 -0800 (PST) From: Jim Cromie To: jbaron@akamai.com, linux-kernel@vger.kernel.org, akpm@linuxfoundation.org Cc: gregkh@linuxfoundation.org, linux@rasmusvillemoes.dk, Jim Cromie , Jonathan Corbet , linux-doc@vger.kernel.org Subject: [PATCH v4 14/16] dyndbg: add user-flag, negating-flags, and filtering on flags Date: Mon, 9 Dec 2019 19:27:40 -0700 Message-Id: <20191210022742.822686-15-jim.cromie@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191210022742.822686-1-jim.cromie@gmail.com> References: <20191210022742.822686-1-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 1. Add a user-flag [u] which works like original [pfmlt] flags, but has no effect on callsite behavior; it allows marking of arbitrary sets of callsites. 2. Add [PFMLTU] flags, which negate their counterparts; P===!p etc. And in ddebug_read_flags(): current code does: [pfmltu_] -> flags copy it to: [PFMLTU_] -> mask also disallow both of a pair: ie no 'pP', no true & false. 3. Add filtering ops into ddebug_change(), right after all the callsite-property selections are complete. These test the callsite's current flagstate before applying modflags. Why ? The new user flag facilitates batching of changes. By marking individual callsites with 'u', user can compose an arbitrary set of changes, then activate them together by selecting on 'u': #> echo 'file foo.c +u; file bar.c +u' > control #> echo 'u+p' > control The user flag isn't strictly needed, but with it you can avoid using [fmlt] flags for marking, which would alter logging when enabled. Signed-off-by: Jim Cromie --- .../admin-guide/dynamic-debug-howto.rst | 31 ++++++++++++++++--- include/linux/dynamic_debug.h | 1 + lib/dynamic_debug.c | 31 ++++++++++++++----- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index cdc45dcb3e0c..9f68062ba316 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -230,16 +230,39 @@ The flags are:: l Include line number in the printed message m Include module name in the printed message t Include thread ID in messages not generated from interrupt context + u user flag, to mark callsites into a group _ No flags are set. (Or'd with others on input) -For ``print_hex_dump_debug()`` and ``print_hex_dump_bytes()``, only ``p`` flag -have meaning, other flags ignored. +Additionally, the flag-chars ``[pflmtu]`` have negating flag-chars +``[PFMLTU]``, which invert the meanings above. Their use follows. + +Using Filters:: + +Filter-flags specify an optional additional selector on pr_debug +callsites; with them you can compose an arbitrary set of callsites, by +iteratively marking them with ``+u``, then enabling them all with +``u+p``. You can also use ``fmlt`` flags for this, unless the format +changes are inconvenient. + +Filters can also contain the negating flags, like ``UF``, which select +only callsites with ``u`` and ``f`` cleared. + +Flagsets cannot contain ``pP`` etc, a flag cannot be true and false. + +modflags containing upper-case flags is reserved/undefined for now. +inverted-flags are currently ignored, usage gets trickier if given +``-pXy``, it should leave x set. + +Notes:: + +For ``print_hex_dump_debug()`` and ``print_hex_dump_bytes()``, only +``p`` flag has meaning, other flags are ignored. For display, the flags are preceded by ``=`` (mnemonic: what the flags are currently equal to). -Note the regexp ``^[-+=][flmpt_]+$`` matches a flags specification. -To clear all flags at once, use ``=_`` or ``-flmpt``. +Note the regexp ``^[-+=][flmptu_]+$`` matches a flags specification. +To clear all flags at once, use ``=_`` or ``-flmptu``. Debug messages during Boot Process diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 802480ea8708..a5d76f8f6b40 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -32,6 +32,7 @@ struct _ddebug { #define _DPRINTK_FLAGS_INCL_FUNCNAME (1<<2) #define _DPRINTK_FLAGS_INCL_LINENO (1<<3) #define _DPRINTK_FLAGS_INCL_TID (1<<4) +#define _DPRINTK_FLAGS_USR (1<<5) #if defined DEBUG #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT #else diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 26432f88b329..736895efe17d 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -85,13 +85,14 @@ static inline const char *trim_prefix(const char *path) return path + skip; } -static struct { unsigned flag:8; char opt_char; } opt_array[] = { - { _DPRINTK_FLAGS_PRINT, 'p' }, - { _DPRINTK_FLAGS_INCL_MODNAME, 'm' }, - { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' }, - { _DPRINTK_FLAGS_INCL_LINENO, 'l' }, - { _DPRINTK_FLAGS_INCL_TID, 't' }, - { _DPRINTK_FLAGS_NONE, '_' }, +static struct { unsigned flag:8; char opt_char, not_char; } opt_array[] = { + { _DPRINTK_FLAGS_PRINT, 'p', 'P' }, + { _DPRINTK_FLAGS_INCL_MODNAME, 'm', 'M' }, + { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f', 'F' }, + { _DPRINTK_FLAGS_INCL_LINENO, 'l', 'L' }, + { _DPRINTK_FLAGS_INCL_TID, 't', 'T' }, + { _DPRINTK_FLAGS_NONE, '_', '_' }, + { _DPRINTK_FLAGS_USR, 'u', 'U' }, }; /* format a string into buf[] which describes the _ddebug's flags */ @@ -195,6 +196,13 @@ static int ddebug_change(const struct ddebug_query *query, dp->lineno > query->last_lineno) continue; + /* filter for required flags */ + if ((dp->flags & filter->flags) != filter->flags) + continue; + /* filter on prohibited bits */ + if ((~dp->flags & filter->mask) != filter->mask) + continue; + nfound++; newflags = (dp->flags & mods->mask) | mods->flags; @@ -428,10 +436,17 @@ static int ddebug_read_flags(const char *str, struct flagsettings *f) if (*str == opt_array[i].opt_char) { f->flags |= opt_array[i].flag; break; + } else if (*str == opt_array[i].not_char) { + f->mask |= opt_array[i].flag; + break; } } if (i < 0) { - pr_err("unknown flag '%c' in \"%s\"\n", *str, str); + pr_err("unknown flag '%c'", *str); + return -EINVAL; + } + if (f->flags & f->mask) { + pr_err("flag '%c' conflicts with earlier one\n", *str); return -EINVAL; } } -- 2.23.0