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=-10.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,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 D98FBC433ED for ; Tue, 11 May 2021 18:51:23 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6A2BB61433 for ; Tue, 11 May 2021 18:51:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A2BB61433 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3EFE56B0070; Tue, 11 May 2021 14:51:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 39C936B0072; Tue, 11 May 2021 14:51:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 23EE36B0073; Tue, 11 May 2021 14:51:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0160.hostedemail.com [216.40.44.160]) by kanga.kvack.org (Postfix) with ESMTP id 0CF126B0070 for ; Tue, 11 May 2021 14:51:22 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B3DA08E71 for ; Tue, 11 May 2021 18:51:21 +0000 (UTC) X-FDA: 78129843162.25.C9310C1 Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by imf04.hostedemail.com (Postfix) with ESMTP id 09AC33C7 for ; Tue, 11 May 2021 18:51:14 +0000 (UTC) Received: by mail-io1-f43.google.com with SMTP id k16so5078587ios.10 for ; Tue, 11 May 2021 11:51:21 -0700 (PDT) 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=7sTUPuFc66ybePyVc1BipkRA9wzdceMEI5lxpFNGBTY=; b=Ejt6pYdhRRT/Y99OtH6AqvCn+KURqUFlvSmqQYYC6RQ6BuuQljq3uRuLepMpaUyF2O q5H+LqUdg0JzK9dJcSVcRe5CZIuLe1ExMHs9WDYbHFnwjPeu60302dqMM9Vga1EM+lNQ uiLjx9PijnJNal5gs9NqFR2fU/Afuk+UFubRaGO9H5dg/h7BIkAja45+pIIsETAxhG28 6cvcu+yFJO4Yyv8Lgdc7vhXV+379QExU+vqoSYrsN0eN43JNav3jcBGoUIwwKTQbvlyf vBMaUxQbIm0LErKcUxIxqNTz2LkWP493xXiAwywvTYA5rSXSdi3O70ohUDLCx92+iVi/ Sctg== 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=7sTUPuFc66ybePyVc1BipkRA9wzdceMEI5lxpFNGBTY=; b=cP+AIX5lJfhAoGG2ptfcjU0uydEwfXo4yn7dC2xODhK7WQMNX42uqCfo6fwNW9EIgk GXad8Goh0IOrbVoXW1hcScIghjFkpq41pgGq+vGfuJvjWhERr/vPMaS89ZYITOxfJ9jw UR/oLIVqJUveukavjpamQZ4ibpkeR2EWbc0YEgGyK9+OE6tmzpxQEKcXq/D/E3y70foN ZTKpF8pVBN46k1qCz9Poj754th1wToDT6TxMaIH5iGfPQjV4IMCHmVeZyj5hFkiQVwG6 LTIK4Ixmoak4NpPO4L9ZT4Sf7flFyXsV8GiXFnmEhKwxq9YIIIL7XGoQUd/17NGraGgm awQQ== X-Gm-Message-State: AOAM53010vU1lTH5sFOSIFZzdhgS3sFhTXhWlEpUA9Yhozx9vGugkK4G QZzMgrzxgH2g/g763kMc1W0= X-Google-Smtp-Source: ABdhPJzfp/aDRmoziPojTcrdukG+4wgAm6I/Yg15+Asnz8wLXjxY1VrZGxPuvnMMl1uFWN2iXZsHYg== X-Received: by 2002:a02:bb98:: with SMTP id g24mr28108373jan.19.1620759080669; Tue, 11 May 2021 11:51:20 -0700 (PDT) Received: from frodo.mearth (c-24-9-77-57.hsd1.co.comcast.net. [24.9.77.57]) by smtp.googlemail.com with ESMTPSA id t10sm405096ils.36.2021.05.11.11.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:51:20 -0700 (PDT) From: Jim Cromie To: Jason Baron , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH v5 01/28] dyndbg: avoid calling dyndbg_emit_prefix when it has no work Date: Tue, 11 May 2021 12:50:30 -0600 Message-Id: <20210511185057.3815777-2-jim.cromie@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210511185057.3815777-1-jim.cromie@gmail.com> References: <20210511185057.3815777-1-jim.cromie@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 09AC33C7 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Ejt6pYdh; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of jimcromie@gmail.com designates 209.85.166.43 as permitted sender) smtp.mailfrom=jimcromie@gmail.com X-Rspamd-Server: rspam03 X-Stat-Signature: 5drfu4s6s3mtma94jefwi86iyu49peat Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail-io1-f43.google.com; client-ip=209.85.166.43 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620759074-173111 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Wrap function in a static-inline one, which checks flags to avoid calling the function unnecessarily. And hoist its output-buffer initialization to the grand-caller, which is already allocating the buffer on the stack, and can trivially initialize it too. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 5 +++++ lib/dynamic_debug.c | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.= h index a57ee75342cf..dce631e678dd 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -32,6 +32,11 @@ 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_INCL_ANY \ + (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\ + _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID) + #if defined DEBUG #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT #else diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c70d6347afa2..ede4a491ee87 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -586,13 +586,11 @@ static int remaining(int wrote) return 0; } =20 -static char *dynamic_emit_prefix(const struct _ddebug *desc, char *buf) +static char *__dynamic_emit_prefix(const struct _ddebug *desc, char *buf= ) { int pos_after_tid; int pos =3D 0; =20 - *buf =3D '\0'; - if (desc->flags & _DPRINTK_FLAGS_INCL_TID) { if (in_interrupt()) pos +=3D snprintf(buf + pos, remaining(pos), " "); @@ -618,11 +616,18 @@ static char *dynamic_emit_prefix(const struct _ddeb= ug *desc, char *buf) return buf; } =20 +static inline char *dynamic_emit_prefix(struct _ddebug *desc, char *buf) +{ + if (unlikely(desc->flags & _DPRINTK_FLAGS_INCL_ANY)) + return __dynamic_emit_prefix(desc, buf); + return buf; +} + void __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...= ) { va_list args; struct va_format vaf; - char buf[PREFIX_SIZE]; + char buf[PREFIX_SIZE] =3D ""; =20 BUG_ON(!descriptor); BUG_ON(!fmt); @@ -655,7 +660,7 @@ void __dynamic_dev_dbg(struct _ddebug *descriptor, if (!dev) { printk(KERN_DEBUG "(NULL device *): %pV", &vaf); } else { - char buf[PREFIX_SIZE]; + char buf[PREFIX_SIZE] =3D ""; =20 dev_printk_emit(LOGLEVEL_DEBUG, dev, "%s%s %s: %pV", dynamic_emit_prefix(descriptor, buf), @@ -684,7 +689,7 @@ void __dynamic_netdev_dbg(struct _ddebug *descriptor, vaf.va =3D &args; =20 if (dev && dev->dev.parent) { - char buf[PREFIX_SIZE]; + char buf[PREFIX_SIZE] =3D ""; =20 dev_printk_emit(LOGLEVEL_DEBUG, dev->dev.parent, "%s%s %s %s%s: %pV", @@ -720,7 +725,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, vaf.va =3D &args; =20 if (ibdev && ibdev->dev.parent) { - char buf[PREFIX_SIZE]; + char buf[PREFIX_SIZE] =3D ""; =20 dev_printk_emit(LOGLEVEL_DEBUG, ibdev->dev.parent, "%s%s %s %s: %pV", --=20 2.31.1