From nobody Sat Dec 27 07:07:36 2025 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 22E54E56C for ; Sat, 23 Dec 2023 01:52:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=semihalf.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=semihalf.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=semihalf.com header.i=@semihalf.com header.b="EdB/o8uT" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-33674f60184so2293346f8f.1 for ; Fri, 22 Dec 2023 17:52:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; t=1703296332; x=1703901132; 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=JWilt8xXopZLz3aWBvrS8u+uuqRM1/IhwYaiNrDNBL8=; b=EdB/o8uTMFdMXswuew9mjIXOXLUBt+iQPjCLyYX1yIm4injx5Lsnh5ULdmb7v7CGOw wWfbXH6EeAnB6NtvbqwnsGNTVnJpZkPAsASe19PPMWoXpYAp+MlIofT6952zVmlpZA6p azN7/2BQoV4wz7W5IdA5LGS2liLNRhGriHcSq7jkoBdJl6UbkiYgCqYUSxffpTUoJrH+ Rk+E78o45LCS2tvBRr34Ls0vA52tLafkhRkk6IUyem/LPwWAtjunn/sjsJ1gffgDnBSn I75dbEsnFGmxeSB1xRyAZ+6TIB9TgAIwKTgUWrUohbsWSp6hZIAOELIAqPg31/hh+BZW ewHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703296332; x=1703901132; 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=JWilt8xXopZLz3aWBvrS8u+uuqRM1/IhwYaiNrDNBL8=; b=PJvxh/K/jZY79NjNirf7jY9JiFk0g2jN1Bi7qBWs2gi1NFqB/edTzFe/KiSb1Z8qBp rmCnn/T0fnffuh7FFLO7vrh1Ezt1SMc0EAzeXhJVDpcat8pxbXxk/3aJw9+Ev2cpZCPa dleOouyJ1CkHZpkuultnTIA+u+O5RbL/1k1TZ1LArsORLkPfVOkuqyM5a5oHDILvJAXr kzP20IzQ+1T3VcjIgSvwKhxIcBy8fRbCqZiZMFhGpVaYrnscQnhScY3RtO1UhZp0noD2 9HhTcG6/ewZ6p2sOoyFQOs8XlrRx3ORpnw3NBZcOCiFgReQ4IY9WndAAIW3EtTvOrNwR aWkg== X-Gm-Message-State: AOJu0YwAffA8QEqnH7F7/c36pxS1dHzim4DfYw7MOcU6Qbc4IH0g9I1v EDtKJvUAEIy/Ibiy5JTiDetpZGe7VCjZ X-Google-Smtp-Source: AGHT+IE17AFKylC4vEQBQhSQfzkY3zey+tE/oZSiU8ugOZex1kpF3bBIdIhwS9dYXMoPcHe6M+QBjw== X-Received: by 2002:a05:600c:3d0f:b0:40d:43ea:ed19 with SMTP id bh15-20020a05600c3d0f00b0040d43eaed19mr1064900wmb.124.1703296332488; Fri, 22 Dec 2023 17:52:12 -0800 (PST) Received: from ukaszb-l.semihalf.net (alfa56.extreme-net.one.pl. [213.77.89.56]) by smtp.gmail.com with ESMTPSA id h2-20020a0564020e8200b005532a337d51sm3288494eda.44.2023.12.22.17.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Dec 2023 17:52:12 -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 , Simon Ser , John Ogness , Petr Mladek , Sergey Senozhatsky , linux-kernel@vger.kernel.org, upstream@semihalf.com Subject: [PATCH v3 13/22] dyndbg: add support for default trace destination Date: Sat, 23 Dec 2023 02:51:22 +0100 Message-ID: <20231223015131.2836090-14-lb@semihalf.com> X-Mailer: git-send-email 2.43.0.472.g3155946c3a-goog In-Reply-To: <20231223015131.2836090-1-lb@semihalf.com> References: <20231223015131.2836090-1-lb@semihalf.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Instead of repeating trace destination name explicitly for each command (e.g. +T:thunderbolt), this change saves previously used trace destination provided to [=3D+-]T as default and consecutive commands which don't provide trace destination explicitly will usa the saved trace destination. Signed-off-by: =C5=81ukasz Bartosik --- lib/dynamic_debug.c | 94 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 77 insertions(+), 17 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 6c3b83bce18d..99ab5756f0ed 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -72,7 +72,7 @@ struct ddebug_iter { struct flag_settings { unsigned int flags; unsigned int mask; - unsigned int trace_dst; + int trace_dst; }; =20 #define DD_OPEN_CMD "open" @@ -99,6 +99,10 @@ struct dd_tracebuf_tbl_info { struct dd_private_tracebuf buf[TRACE_DST_LAST]; DECLARE_BITMAP(bmap, TRACE_DST_LAST); int bmap_size; +#define DST_NOT_SET (-1) +#define DST_TR_EVENT 0 +#define DST_NOT_SET_STR "not set" + int default_dst; }; =20 static DEFINE_MUTEX(ddebug_lock); @@ -109,7 +113,8 @@ MODULE_PARM_DESC(verbose, " dynamic_debug/control proce= ssing " "( 0 =3D off (default), 1 =3D module add/rm, 2 =3D >control summary, 3 = =3D parsing, 4 =3D per-site changes)"); =20 static struct -dd_tracebuf_tbl_info trc_tbl =3D { .bmap_size =3D TRACE_DST_LAST }; +dd_tracebuf_tbl_info trc_tbl =3D { .bmap_size =3D TRACE_DST_LAST, + .default_dst =3D DST_NOT_SET, }; =20 static inline struct dd_ctrl *get_ctrl(struct _ddebug *desc) { @@ -131,6 +136,11 @@ static inline unsigned int get_trace_dst(const struct = _ddebug *desc) return desc->ctrl.trace_dst; } =20 +static inline bool has_tr_default_dst(void) +{ + return trc_tbl.default_dst !=3D DST_NOT_SET; +} + static int find_tr_instance(const char *name) { int idx =3D 1; @@ -145,11 +155,16 @@ static int find_tr_instance(const char *name) static const char *read_T_args(const char *str, struct flag_settings *modifiers) { - int len, idx =3D 0; - char *end; + bool has_colon =3D *(str+1) =3D=3D ':' ? true : false; + int len =3D 0, idx =3D DST_TR_EVENT; + char *end =3D NULL; =20 - if (*(str+1) !=3D ':') - return str; + if (!has_colon) { + if (!has_tr_default_dst()) + return NULL; + idx =3D trc_tbl.default_dst; + goto end; + } =20 str +=3D 2; end =3D strchr(str, '.'); @@ -168,8 +183,12 @@ char *read_T_args(const char *str, struct flag_setting= s *modifiers) goto end; =20 idx =3D find_tr_instance(str); - if (idx < 0) - return NULL; + if (idx < 0) { + if (!has_tr_default_dst() || + has_colon) + return NULL; + idx =3D trc_tbl.default_dst; + } end: modifiers->trace_dst =3D idx; return end ? end : str + len; @@ -389,6 +408,13 @@ static int handle_trace_close_cmd(const char *arg) goto end; } =20 + /* + * check if default trace instance is being closed, + * if yes then clear default destination + */ + if (trc_tbl.default_dst =3D=3D idx) + trc_tbl.default_dst =3D DST_NOT_SET; + trace_array_put(buf->arr); /* * don't destroy trace instance but let user do it manually @@ -427,6 +453,30 @@ void update_tr_dst(const struct _ddebug *desc, const s= truct dd_ctrl *nctrl) trc_tbl.buf[ndst].use_cnt++; } =20 +static const char *get_tr_default_dst_str(void) +{ + switch (trc_tbl.default_dst) { + case DST_NOT_SET: + return DST_NOT_SET_STR; + case DST_TR_EVENT: + return DD_TR_EVENT; + default: + return trc_tbl.buf[trc_tbl.default_dst].name; + } +} + +static void update_tr_default_dst(const struct flag_settings *modifiers) +{ + int dst =3D modifiers->trace_dst; + + if (dst =3D=3D DST_NOT_SET || dst =3D=3D trc_tbl.default_dst) + return; + + trc_tbl.default_dst =3D dst; + v3pr_info("set default trace dst to idx=3D%d, name=3D%s\n", dst, + get_tr_default_dst_str()); +} + static int ddebug_parse_cmd(char *words[], int nwords) { if (nwords !=3D 1) @@ -537,7 +587,8 @@ static int ddebug_change(const struct ddebug_query *que= ry, nfound++; =20 nctrl.flags =3D (get_flags(dp) & modifiers->mask) | modifiers->flags; - nctrl.trace_dst =3D modifiers->trace_dst; + nctrl.trace_dst =3D modifiers->trace_dst =3D=3D DST_NOT_SET ? + get_trace_dst(dp) : modifiers->trace_dst; if (!memcmp(&nctrl, get_ctrl(dp), sizeof(nctrl))) continue; #ifdef CONFIG_JUMP_LABEL @@ -561,6 +612,9 @@ static int ddebug_change(const struct ddebug_query *que= ry, if (!nfound && verbose) pr_info("no matches for query\n"); =20 + if (nfound) + update_tr_default_dst(modifiers); + return nfound; } =20 @@ -833,7 +887,7 @@ static int ddebug_parse_flags(const char *str, struct f= lag_settings *modifiers) =20 static int ddebug_exec_query(char *query_string, const char *modname) { - struct flag_settings modifiers =3D {}; + struct flag_settings modifiers =3D { .trace_dst =3D DST_NOT_SET }; struct ddebug_query query =3D {}; #define MAXWORDS 9 int nwords, nfound; @@ -1595,15 +1649,21 @@ static int ddebug_proc_show(struct seq_file *m, voi= d *p) } seq_puts(m, "\n"); =20 - if (ddebug_iter_is_last(iter) && - !bitmap_empty(trc_tbl.bmap, trc_tbl.bmap_size)) { - int idx =3D 1; + if (ddebug_iter_is_last(iter)) { =20 seq_puts(m, "\n"); - seq_puts(m, "#: Opened trace instances:"); - for_each_set_bit_from(idx, trc_tbl.bmap, trc_tbl.bmap_size) - seq_printf(m, " %s", trc_tbl.buf[idx].name); - seq_puts(m, "\n"); + seq_printf(m, "#: Default trace destination: %s\n", + get_tr_default_dst_str()); + + if (!bitmap_empty(trc_tbl.bmap, trc_tbl.bmap_size)) { + int idx =3D 1; + + seq_puts(m, "\n"); + seq_puts(m, "#: Opened trace instances:"); + for_each_set_bit_from(idx, trc_tbl.bmap, trc_tbl.bmap_size) + seq_printf(m, " %s", trc_tbl.buf[idx].name); + seq_puts(m, "\n"); + } } =20 return 0; --=20 2.43.0.472.g3155946c3a-goog