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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A93D1CDB46E for ; Thu, 12 Oct 2023 19:49:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 704418D0151; Thu, 12 Oct 2023 15:48:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6B4FE8D0002; Thu, 12 Oct 2023 15:48:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DE938D0151; Thu, 12 Oct 2023 15:48:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3645E8D0002 for ; Thu, 12 Oct 2023 15:48:50 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 8CC0C1CACD1 for ; Thu, 12 Oct 2023 19:48:49 +0000 (UTC) X-FDA: 81337847178.07.345757E Received: from mail-io1-f52.google.com (mail-io1-f52.google.com [209.85.166.52]) by imf18.hostedemail.com (Postfix) with ESMTP id CE5181C0026 for ; Thu, 12 Oct 2023 19:48:47 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XamHmArt; spf=pass (imf18.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.52 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697140127; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Q6n2IA/eHEf6LdvM5ZmMrOftNFYznxmP1Ujq1nl5xlM=; b=RibouzMx2TWvC22NadjtE37ROU8vYLmYk1o+YBs9lFuKv7FL+vZXVYpOfHvJfa7y9LEahe rdnZggpHLRvEZdth3xBJBDRPgHsgE1ZT3SKzFUm1VgSet0YtjyZ8mZDxbTGEW5S1ZEw8Vs A4N5iSaiOKEqr4GWVi6iMT8YSjNFwwk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697140127; a=rsa-sha256; cv=none; b=cXuU/ewfmm2vFaAOYwqpSQkNIVNTUMsMgQsOiumtBVyHCXP0hTF/tojM/ODNNJIpijbiI/ bIVV2x3Yil2qypCCB18s6SjSveIYymD+PqOYUpgmj0dJsUEv/hcd+o9LBWETP7I/Wpoi8l QWetTi2QFHijfJMcXdWaxAUCdguZEw8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=XamHmArt; spf=pass (imf18.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.52 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-79fa425855cso55059939f.2 for ; Thu, 12 Oct 2023 12:48:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697140127; x=1697744927; darn=kvack.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=Q6n2IA/eHEf6LdvM5ZmMrOftNFYznxmP1Ujq1nl5xlM=; b=XamHmArtyWCHbFmBFO0sSD4Jn/laXcbTN+mLkbiG0b/LdrosOf+6qavR86zpEv5D+Z HPnai5giUxbpMA4vRtp3JoVF4Td145GnXhQusEeuUvtGoeZKlZLV2QsRcIGk2KFAO/Sk YTtzh39fC/x63UFPYZRdO9CD4O9Jaq52n5YQmC4IHJm2kPStOf36jiozqK1JRNrMYdZ0 izD+jQzZZc7R4VXwXLxXHhbjzpsSWwMf73whcJskMsH9nZdR9MidipICdQIcIhGXoMMY 91jxfBVK4yYPO8ncKB86w/doKkFMwIbObM+sOGT5UerR+HmOTCulYWPIoxhHESUNZyf2 YMPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697140127; x=1697744927; 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=Q6n2IA/eHEf6LdvM5ZmMrOftNFYznxmP1Ujq1nl5xlM=; b=DlObK5S49KVWh8nk26gRraCdFliEPp6/bqCt0ghSLZOYHwkoP+2MI0FgMTQeXmMOl6 4Lb7/ItiHRPtfXja5046cYvm6iEgTNpobn26pTx1akeCbSdbV3IgjhFdNU5bKpCZDngz k+SPMRffrILEpnUCTDKS2OB9c5C8G9Ra2NhvsDsG45LY4lrDTHICEyJDxpO4VAEM+im2 H+wD53mgQoh3Fs6SiiV1BpFKArAPoip5C5BO4e5Egx7d1etvVcEq6FalOjmM79zhTV7A dIoyEEoamZ/f3zKajNkJDuv8jinCoA2J2MWhEv1NmO8GEMMtMNwOQU24ykOXGXJ9Bwln mVhQ== X-Gm-Message-State: AOJu0Ywy/ek67NfSwD6WRJ7JDBgWAjiKUpac2oAeQKI3ie6KTtNCzYcq 3SIYwrkeO1E34Zh0xGzPOGg= X-Google-Smtp-Source: AGHT+IEnq0smZ7G8P5z5vC02OT8MB+EcSRtbm1qklN4D/7Ye4KzZyrfDlCDnug/mqix5MN36Nab6Uw== X-Received: by 2002:a05:6602:29a3:b0:785:d4f5:2225 with SMTP id u3-20020a05660229a300b00785d4f52225mr28824779ios.19.1697140127022; Thu, 12 Oct 2023 12:48:47 -0700 (PDT) Received: from frodo.. (c-73-78-62-130.hsd1.co.comcast.net. [73.78.62.130]) by smtp.googlemail.com with ESMTPSA id h6-20020a5d9e06000000b007a25540c49bsm4307891ioh.27.2023.10.12.12.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:48:46 -0700 (PDT) From: Jim Cromie To: linux-kernel@vger.kernel.org, jbaron@akamai.com, gregkh@linuxfoundation.org Cc: david@redhat.com, lb@semihalf.com, linux@rasmusvillemoes.dk, joe@perches.com, mcgrof@kernel.org, Liam.Howlett@Oracle.com, linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH 10/10] dyndbg: cache the dynamically generated prefixes per callsite Date: Thu, 12 Oct 2023 13:48:34 -0600 Message-ID: <20231012194834.3288085-11-jim.cromie@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231012194834.3288085-1-jim.cromie@gmail.com> References: <20231012194834.3288085-1-jim.cromie@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: 3ntokpmr7c1a8o36uoieu34htqsrdqh4 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: CE5181C0026 X-Rspam-User: X-HE-Tag: 1697140127-697294 X-HE-Meta: U2FsdGVkX1/9IEuCQGO2BEaR6EZC9ec5i3F61/JUnfTzNSQjnUzm2EYsy5KF/E8lQyfB/zOyed9eEvtI7axK2Db5L6tH2ATdVD0E7J8iPmVwWp2xmjAsw8hRa+la2Gixw7obtR6cntmRsZwdwZOFD7nJ/BKm3cdJX+o+HKbs0sO6b/Omy/cWZ0Z95OJIXFmj3PSGYtE0hU8VITuiIA7q/WQZ9gUssTN7C6QdjmTO314ATngfeM76wMh36klvcLeAVfwiEXJ3/75XKii5F2Z17ilGHyiKaoXwvQjfkqcTNC/A9PfQHd6N0vkj6ZixEaKKKEtUuHVf1MhNkG0r+A3ja/x/B4AOu+HFKOd2hiKsJb7A4LeMsDJQwO2M8CoMX80hgkZXvvXH2j1nmTl0LClLZQJTHK8Oh2ZHG02/iIGkxY+yl8neuBkPn4WVvqzBc2JKyJg1CiwaLhhgwW8O+CgXblTMsMhsEIpJuNwxjb6AxmxXebv/tYJf2iLM2HwC2iM/UN7gACDD8yWu+69J77MmKMaeQg2WiAHmPtdLswMq6Z0QGtAOmAOAqvgzpJjU+qpi/v0LsJviNuw2bfiv23vPv9QP7T7NXPyY45UpcQJ1W/S+pnURPUWUQBq48tzfC13dCsVVW6XhETPsmYAz4/Q3b4J9+ZQmR26nidjZ/3XB1e0L4xA6PDtHYrAFyjjfoEuQ/ZDSvNOL9oCU40GEFrRhplw8KnO7v+CYX/hnPHOKsb8Gdfy9ForJyfusD2+j3niRmkuETR5Vybkq261RL7xzY02jDtImd6ZqGfOfEeV51tTCzbmTFmRxVDoNidnVGDyEy0YDw6Zg8ePq9ZnjY4aH6q7Si/skp6oe+FSF8+hS07Q0w74y1QpBADLK5JksXcIWibytFwSXz3cB5sRuxiz8nJ1ijbVKPZoqOHCTi/8XHCfiX17/PxO1cl3o1Hipd61Q7/OnBve5/0LV+VzwwtZ 3ezxSToK i2cwFe+DU4nw2pIHjjaKho5o8TGX/G2LVGYYQRMpXWR4tlCsH1Ttsjn/xIrKSmIgGlTygBeYNz1P9IaJQct72s0i86KOBgAEkQBAEAY8Wjkbssivqq7batncMoE0Yf4YEEz0jiIvikqgNV2qvM/jN0SLGsqrLSStaibKD7tkCIruom72I1670+Ucapb4ukVcUXLTsUYEUGRHZsG1WEn/KewIBHc1e5ocxh5LXtsa0SJxk8IlxP58vdUFAtNZKvZ7ueFegobDdmKmGMeE8hRpSz53+CKOBwDHp1zcHwQdvpq9Udxwz/37YUHzsCG49b/ixSuWTwUPfr3CT3YQkdZaWp0888GbEawMRRQ+bFl9bifBlqvForOv2pwKt4PudF5Tg8bzjz8D4CwY5WlIzESucVC0XNfJRq91kPJOMNpM787BslwP60ouvLo26WvA5FY0G0r9/zMJucvrkg3J3RA3xwn3C9Zid51g4mwYdgoH5Ybbw6K4q8SxoBpBm8nX2DuVqt6fh0tPXJB1ODG3FVbpvjEfxalcx1N8GAcvvtpizxsOK4/k= 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: Add a private maple-tree to cache any prefix strings required (and then generated) for any enabled pr_debug callsites. And delete any cache entries if any flags are changed afterwards. This cache is strictly per-callsite, so if a function has 20 pr_debugs, all enabled with the same flags: echo function foo +pmfs > /proc/dynamic_debug/control there will be 20 separate, identical cache items created. Maybe this can be trivially improved later. Or lineno could be folded in too, so the %d is rendered once. NB: +tl flags are added outside the cache; the thread-id doesnt belong in the cache, the lineno could be added, esp if the 20:1 sharing isnt trivial enough. NBB: lineno:18 is enormously "sparse". At this point its not so far to pack it into something else. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 92ffd70a07de..02df61ab6403 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -90,6 +90,8 @@ MODULE_PARM_DESC(verbose, " dynamic_debug/control processing " static DEFINE_MTREE(mt_funcs); static DEFINE_MTREE(mt_files); static DEFINE_MTREE(mt_mods); +/* cache of composed prefixes for enabled pr_debugs */ +static DEFINE_MTREE(pr_prefixes); static void dd_mt_scan(struct maple_tree *mt, const char *kind); static int param_set_do_scan(const char *instr, const struct kernel_param *kp) @@ -112,6 +114,11 @@ static const struct kernel_param_ops param_ops_do_scan = { }; module_param_cb(do_scan, ¶m_ops_do_scan, NULL, 0600); +void ddebug_clear_prefix_cache(const struct _ddebug *dp) +{ + mtree_erase(&pr_prefixes, (unsigned long)dp); +} + /* Return the path relative to source root */ static inline const char *trim_prefix(const char *path) { @@ -350,6 +357,7 @@ static int ddebug_change(const struct ddebug_query *query, newflags = (dp->flags & modifiers->mask) | modifiers->flags; if (newflags == dp->flags) continue; + ddebug_clear_prefix_cache(dp); #ifdef CONFIG_JUMP_LABEL if (dp->flags & _DPRINTK_FLAGS_PRINT) { if (!(newflags & _DPRINTK_FLAGS_PRINT)) @@ -855,8 +863,18 @@ static int remaining(int wrote) return 0; } -static int __dynamic_emit_prefix(const struct _ddebug *desc, char *buf, int pos) +static int __dynamic_emit_prefix(struct _ddebug *desc, char *buf, int pos) { + char *prefix, *cpy; + + if (desc->flags & _DPRINTK_FLAGS_PREFIX_CACHED) { + prefix = (char*) mtree_load(&pr_prefixes, (unsigned long)desc); + if (prefix) { + pos += snprintf(buf + pos, remaining(pos), "%s", prefix); + v4pr_info("using prefix cache:%px %s", buf, buf + pos); + return pos; + } + } if (desc->flags & _DPRINTK_FLAGS_INCL_MODNAME) pos += snprintf(buf + pos, remaining(pos), "%s:", desc_modname(desc)); @@ -866,6 +884,13 @@ static int __dynamic_emit_prefix(const struct _ddebug *desc, char *buf, int pos) if (desc->flags & _DPRINTK_FLAGS_INCL_SOURCENAME) pos += snprintf(buf + pos, remaining(pos), "%s:", trim_prefix(desc_filename(desc))); + + /* save dup of buf to cache */ + cpy = kstrdup(buf + pos, GFP_KERNEL); + mtree_store(&pr_prefixes, (unsigned long)desc, (void*)cpy, GFP_KERNEL); + desc->flags |= _DPRINTK_FLAGS_PREFIX_CACHED; + v3pr_info("filling prefix cache:%px %s", desc, cpy); + return pos; } -- 2.41.0