From nobody Tue Dec 16 20:33:33 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84B4BC4167B for ; Thu, 30 Nov 2023 23:41:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377361AbjK3XlM (ORCPT ); Thu, 30 Nov 2023 18:41:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377355AbjK3XlK (ORCPT ); Thu, 30 Nov 2023 18:41:10 -0500 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D477D10E2 for ; Thu, 30 Nov 2023 15:41:16 -0800 (PST) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a18f732dc83so174390966b.1 for ; Thu, 30 Nov 2023 15:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; t=1701387675; x=1701992475; 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=5Wq8EpQ6dCRcGOk0/JZhMwPd7dekut1Rp7pQcPvRIiQ=; b=Bd72puUw2+qMUcz3c27Gv3BYDyrF8XuGurmKFunbINC6l3Xqkz6iswNqf7+M+tyrT7 BN+0zN9qBRVh84mOPunzLY/mE6N2xm08ZPgtVBqOVcoicSViPHc/cLKs/yx/LeXuqK33 a/1XixL0qy5zkQ7+LOQts2Dtu+6fJ0e0/rdfPwhma1SD/RZBynQWQOjYDdvwabGwtzd5 8RwDBfVwPO5W7MCwH2CfaW8UcCega8rx2O6xnGedkKsoaIHvnBa4VyujuW0CxcalHIO/ pVo5jYLS84XYrfNvWzRkc+6sT6GxWpiaFtaWC7ZxkGVtr34XUw9w5t8usUw3qejwcAly tzcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701387675; x=1701992475; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5Wq8EpQ6dCRcGOk0/JZhMwPd7dekut1Rp7pQcPvRIiQ=; b=gyQll01GYtFyirqpiqDU3SNach+E9R8pXcxU0XUCWO3BvtuV8bYNqmnK5mXnLlRyaT +107vUoEnqdJOEmtUgePfKTeusKa7NiLo2MeXEBGj2Edzzl3eK5BbjyUZu96tF8Zw6Li zTxTnGg5xVwoIUdUH4ATWT8hsodwJpQE0VwFQLclQcSKHMvNAM5KPEW718dHY4ermX7q ZUaAfArXC/8o5PwXlBd6TLsRcIKvPK3gEHUiOCxKuy3ckBDwt+f9vQbYlNS/e3yok9eW 7NszxTla1+y/KY9LxhadWEVujvriweQfGJlhdUBCE0dGzyPmmxRXpQV7K+lY5lRfIdD7 Fe0Q== X-Gm-Message-State: AOJu0YzRoYayUXSZYuRrysojlw+cQEKo16wjGHMXCcSWdDeSBn+aJnyJ NdYOtylgdWJnVgY40/k7boCb X-Google-Smtp-Source: AGHT+IG8TeQ+Zx3H3YN74SgCo0q6DDaeAMwm7mi2DhuuInzgByqvCQ2Twc/uEAZnoZAX9wm10qB19g== X-Received: by 2002:a17:906:73c2:b0:9c7:59ff:b7fd with SMTP id n2-20020a17090673c200b009c759ffb7fdmr373547ejl.28.1701387675442; Thu, 30 Nov 2023 15:41:15 -0800 (PST) Received: from ukaszb-l.semihalf.net (public-gprs368940.centertel.pl. [37.47.72.109]) by smtp.gmail.com with ESMTPSA id 9-20020a170906100900b009ddaf5ebb6fsm1210175ejm.177.2023.11.30.15.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 15:41:15 -0800 (PST) From: =?UTF-8?q?=C5=81ukasz=20Bartosik?= To: Jason Baron , Jim Cromie , Andrew Morton , Kees Cook , Douglas Anderson Cc: Guenter Roeck , Yaniv Tzoreff , Benson Leung , Steven Rostedt , Vincent Whitchurch , Pekka Paalanen , Sean Paul , Daniel Vetter , linux-kernel@vger.kernel.org, upstream@semihalf.com Subject: [PATCH v2 01/15] dyndbg: add _DPRINTK_FLAGS_ENABLED Date: Fri, 1 Dec 2023 00:40:34 +0100 Message-ID: <20231130234048.157509-2-lb@semihalf.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog In-Reply-To: <20231130234048.157509-1-lb@semihalf.com> References: <20231130234048.157509-1-lb@semihalf.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Jim Cromie Distinguish the condition: _DPRINTK_FLAGS_ENABLED from the bit: _DPRINTK_FLAGS_PRINT, and re-define former in terms of latter, in preparation to add a 2nd bit: _DPRINTK_FLAGS_TRACE Update JUMP_LABEL code block to check _DPRINTK_FLAGS_ENABLED symbol. Also add a 'K' to get new symbol _DPRINTK_FLAGS_PRINTK, in order to break any stale uses. CC: vincent.whitchurch@axis.com Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 10 ++++++---- lib/dynamic_debug.c | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 4fcbf4d4fd0a..7be791af7cf1 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -32,7 +32,7 @@ struct _ddebug { * writes commands to /dynamic_debug/control */ #define _DPRINTK_FLAGS_NONE 0 -#define _DPRINTK_FLAGS_PRINT (1<<0) /* printk() a message using the format= */ +#define _DPRINTK_FLAGS_PRINTK (1 << 0) /* printk() a message using the for= mat */ #define _DPRINTK_FLAGS_INCL_MODNAME (1<<1) #define _DPRINTK_FLAGS_INCL_FUNCNAME (1<<2) #define _DPRINTK_FLAGS_INCL_LINENO (1<<3) @@ -44,8 +44,10 @@ struct _ddebug { _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID |\ _DPRINTK_FLAGS_INCL_SOURCENAME) =20 +#define _DPRINTK_FLAGS_ENABLED _DPRINTK_FLAGS_PRINTK + #if defined DEBUG -#define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT +#define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINTK #else #define _DPRINTK_FLAGS_DEFAULT 0 #endif @@ -199,10 +201,10 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, =20 #ifdef DEBUG #define DYNAMIC_DEBUG_BRANCH(descriptor) \ - likely(descriptor.flags & _DPRINTK_FLAGS_PRINT) + likely(descriptor.flags & _DPRINTK_FLAGS_ENABLED) #else #define DYNAMIC_DEBUG_BRANCH(descriptor) \ - unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT) + unlikely(descriptor.flags & _DPRINTK_FLAGS_ENABLED) #endif =20 #endif /* CONFIG_JUMP_LABEL */ diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 6fba6423cc10..ee0cb37153ef 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -89,7 +89,7 @@ static inline const char *trim_prefix(const char *path) } =20 static const struct { unsigned flag:8; char opt_char; } opt_array[] =3D { - { _DPRINTK_FLAGS_PRINT, 'p' }, + { _DPRINTK_FLAGS_PRINTK, 'p' }, { _DPRINTK_FLAGS_INCL_MODNAME, 'm' }, { _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' }, { _DPRINTK_FLAGS_INCL_SOURCENAME, 's' }, @@ -247,10 +247,10 @@ static int ddebug_change(const struct ddebug_query *q= uery, if (newflags =3D=3D dp->flags) continue; #ifdef CONFIG_JUMP_LABEL - if (dp->flags & _DPRINTK_FLAGS_PRINT) { - if (!(newflags & _DPRINTK_FLAGS_PRINT)) + if (dp->flags & _DPRINTK_FLAGS_ENABLED) { + if (!(newflags & _DPRINTK_FLAGS_ENABLED)) static_branch_disable(&dp->key.dd_key_true); - } else if (newflags & _DPRINTK_FLAGS_PRINT) { + } else if (newflags & _DPRINTK_FLAGS_ENABLED) { static_branch_enable(&dp->key.dd_key_true); } #endif --=20 2.43.0.rc2.451.g8631bc7472-goog