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 58410CDB46E for ; Thu, 12 Oct 2023 19:48:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D20E8D0149; Thu, 12 Oct 2023 15:48:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10F648D0002; Thu, 12 Oct 2023 15:48:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E05708D0149; Thu, 12 Oct 2023 15:48:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D08608D0002 for ; Thu, 12 Oct 2023 15:48:41 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AED80A08D9 for ; Thu, 12 Oct 2023 19:48:41 +0000 (UTC) X-FDA: 81337846842.20.EF1BFBC Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by imf11.hostedemail.com (Postfix) with ESMTP id E424240015 for ; Thu, 12 Oct 2023 19:48:39 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dbhDx3CS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.53 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697140119; a=rsa-sha256; cv=none; b=5agZlyd/IBdQxgqSnuTEFE6oMrEUwe/U2//wTxjjj0bFauHpYVJwBFBv/Cwp712uuQyhCW DtQwu2LBTxMuTx3oT9YXXygiHP311wSWcyTlohhmkgFbfeuom3+WwZYgL74icBB63Vr/JL 0RpAydNd88aySwH1Qs0SlarjhQqdFGU= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dbhDx3CS; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.53 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697140119; 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=qUViZFu6qDP+V9dlTKCnuIaJi78i9uWOlvfP3OhngjY=; b=ZFBWQXJcPSDqmkOk2zBG5l07mOupEDALorJsWVmjJUE+WzWuLSpOKyKM3Tl5YGfCJL6o49 7tRD2Ts/EGF+D8oYW9CqUOnUaS6pBhQRq587yCVmA1jfA3ftBwG8H+xu0hCpd6UHTaSEIx FGBCe4QXpBP5RkyA+ZDAv2Er5GfmQ68= Received: by mail-io1-f53.google.com with SMTP id ca18e2360f4ac-7a25040faffso57292639f.1 for ; Thu, 12 Oct 2023 12:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697140119; x=1697744919; 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=qUViZFu6qDP+V9dlTKCnuIaJi78i9uWOlvfP3OhngjY=; b=dbhDx3CSukk5WuUd5yvKw5WVkRy/VjvqGMwIzPBimB8q7ZXJDlnOb0efIlq6EHRVYK jXoQZv8A9eoBIO/Igamka8bqOBXeFctvzf4ZqOzK0HCZGYKGg1t9hGaFgHV1EJBVDZTb qrJ+mcss9Zc91K2pcGrvnlBOFhOUPt7GiEYA83zNAENTym7LNjJ0yeyZ6iNpaWeUdphP MHgc07g5RI+eB0CFzemAnysBUFto9/QnNZXKwACAg7SiMI+J+BHe5620JlGNaCORG45Q 74BQtwu4WldSUEJZg62Vi3rkv0ACEFRr8MlN7sbZ3IjMh27VeCVa1XFmaxPI4E6GrZTB d+Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697140119; x=1697744919; 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=qUViZFu6qDP+V9dlTKCnuIaJi78i9uWOlvfP3OhngjY=; b=ZLcAhHSj98+9zBRowb9fGlGZA+hlhdGSkPbF1l5D1pJf1ZOTrcThlgAzYloQcAR69/ x8J0ZCJj5tKgx4LcEQn4HSvkN7eX9BYBkPB2pxdiJgQnQA69EbPmWqqnFI/Rv55XQZyD L/hox5qUMh0KlNb0KmPx7lNidiF/vQmiHXnv/R49gKEaQBbsDmkaoDxFYoeFD8Cs0rCX zoMwtHnaVPcXTWPklUaYVtD3udrsMrKmR6bXNLVo5QnP3q6Zi+gHHpDLK5iVPIXe9aJl 4UVlLW8HIbV9poIKfo0R8X8fYdnib9MCwYS2ZVVNK1hlG7Zjzm2ZbEwYP/SQW6OSAkAk BPjw== X-Gm-Message-State: AOJu0YxEhVppR8yxjEjbkomEtmWIdNoUmcJ+ffIdJHPa0hW/ilvBrgJw EkHjkN2IJiXMyvoOmX95028= X-Google-Smtp-Source: AGHT+IEIAuL545uphGsUTelNzl/EYkM+08iRqpJX2+URkY+jsN1KrPbPfSqrYVohS7AgKwAvd/zf1w== X-Received: by 2002:a6b:fd01:0:b0:790:c3d0:8f87 with SMTP id c1-20020a6bfd01000000b00790c3d08f87mr26613731ioi.19.1697140119145; Thu, 12 Oct 2023 12:48:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:48:38 -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 02/10] dyndbg: split __dyndbg_sites section out from __dyndbg Date: Thu, 12 Oct 2023 13:48:26 -0600 Message-ID: <20231012194834.3288085-3-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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E424240015 X-Stat-Signature: uo8kjuw87cp8o953cg4zig3nzr5afp1i X-HE-Tag: 1697140119-941931 X-HE-Meta: U2FsdGVkX19oqjOpDsSuZJMFlcyc8AyE+RU/9Mbb0gdkcGQ2yHWN8RHIi6pRQwSa9TDU0XAHJGtJwmR9W4Fxd5CeHehpl0w58hjWoRFrXumkudN3qrKumTQ39tFCTEZbMJtl4stQktiELH1b/F89AwiDPQV+fLk9sScifnu9mKu31xnFdxF0l7/aT66VHUtvzD7dL89290ZEx6YlFCaNTl2lseNwD814xbsI7qFicewmMyHIHlp1nTAk+uCJNZ8haEFTgN23IIFgKVhPdaKNuq9alljJORKs3lK+7D12B6tOr/xUN4oJ41uaXrG8hwS775EEhrkYpvB//XdDqsUh/+QsW2gJzXwVLYvEV0mtWEOxwWl42kg8Ex2c694u3WqXuz5u1ZVc1A5xGnAjBlk0c2RIrpL9Ef8uYQtAI6DWOiKLHZwgGxnbS5tdggxvaNBIEDWnNsnlaPSeFDT6trGw+USU3tk4L1SbUQrONEV2aomC5Y665wdVSVi4L2nwF+f6O0acOtJWizCfrDCncOTi7Mt47yQpGKIsJc8axkst8dJ0TtiwaKA+JJSGeqF/88Zy+RnvhIsctA/CV02QcZXWiBoS9/tlQe90EJKH9IS0zcdx3R2u8xlR9BSMXxz/AIq5M5IisyImFv5WGl4NqmvsS73LEBavfdqBEUYKmleiFXrWtUu6JAeXdMftZnD8TwSexpPgSgpu9IoyV6sJM/WvwqPogzbffS/Gz44D60RRZ6cr3XUqdsuYMrhAoqkoitsnR6gA1sIA9+41QB+UDX7JGJfNYaT1y+HLN6coA85BzTQJKp/9m/AuPAJr7HrDxoin+1nunIb3iCmmFfXPzWisA0mcZrYPyRbnpXVsyWvPvJ5ETuDaZ79IGdsMu2R22liXgiuRFnW6pGe/ZZmUXCJYfIuxrIHmwNU43IDtEDGmwzq5dg2Kfd6uM7ELIo7XQc275L0JO3j7XhN6HcFNbDr qdUVT6rY eTpDm9ktpVOfKVWGBZ+PQU4qVv9a30BaNOoa7rb8D30ukNgLuJUZYD9+nPW3LJCSwLi1CadAO8zjVmd5M84WKKFnG+26sRwZeJ0bNgLkotvnRpHSbdw7dlGARcYUtyEPTyCcz8HzmafUlP8mIyAVbTAzyiCNvWknygJWtgJJqJzLU93r/MQr7JhopO6zzW36ERjOMndA6/bGqHhhLtSbInhnuqFS/FELerCnNB5ZMVY6dJvDTVi3i9W2x5GJLRNWsFXj5nda7+BBiBJnaSawnQyA/Is8ZXjOMakBJ+H/VXGu+bCKiWhYQz06A4eExycWk5WzWJ1Sc1Ln/NimKqr1jDnMK/JVrswU9IJScduc44UXwBDgrqbYKoYqZnbp85yhPAtp6ok7WqVXD4sfYh6J6lUJvphMwSDM4tZq45EX3zYN57GdswwXcoPn1OPgSUuZ/9ZkEzNiWxsrS8qmK7yWRjmv0xCne78JxjY1nwcG0Ldhzr8GcIeSMpvzzQsScKDBrsu2PRwhmxf02u2x+9Phbx2bzM61xO1X8ENmx1E4dd9WU/e9DMt8RZef3f3hn6v40KHzDj/KWyd7/oBel4VKMuvHtgg== 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: split struct _ddebug_site out from struct _ddebug (adding a site ptr), and add new __dyndbg_sites section placement to vmlinux.lds.h This is an implementation detail to isolate the redundant columns into a separate section, so it specifically excludes lineno. This allows (later) to copy and compress the info into a better (more compact) representation thats still fast enough. Then we can just reclaim the whole __dyndbg_sites section. Signed-off-by: Jim Cromie --- include/asm-generic/vmlinux.lds.h | 1 + include/linux/dynamic_debug.h | 40 ++++++++++++++++++------------- kernel/module/main.c | 3 +++ lib/dynamic_debug.c | 6 +++++ 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 5451f926a753..1d128259e373 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -368,6 +368,7 @@ BOUNDED_SECTION_BY(__dyndbg_classes, ___dyndbg_classes) \ BOUNDED_SECTION_BY(__dyndbg_class_users, ___dyndbg_class_users) \ BOUNDED_SECTION_BY(__dyndbg, ___dyndbg) \ + BOUNDED_SECTION_BY(__dyndbg_sites, ___dyndbg_sites) \ LIKELY_PROFILE() \ BRANCH_PROFILE() \ TRACE_PRINTKS() \ diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index aacfafc466c0..5206a2cfdb37 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -9,21 +9,25 @@ #include /* - * An instance of this structure is created in a special - * ELF section at every dynamic debug callsite. At runtime, - * the special section is treated as an array of these. + * A pair of these structs are created into 2 special ELF sections for + * each pr_debug callsite. At runtime, the special sections are + * treated as arrays. */ - -struct _ddebug { +struct _ddebug; +struct _ddebug_site { /* - * These fields are used to drive the user interface - * for selecting and displaying debug callsites. + * These fields are used to: + * - display callsites in the control file + * - query/select callsites by the code's organization + * - prefix/decorate pr_debug messages per user choices */ - struct /* _ddebug_site */ { - const char *_modname; - const char *_function; - const char *_filename; - }; + const char *_modname; + const char *_function; + const char *_filename; +}; + +struct _ddebug { + struct _ddebug_site *site; const char *format; unsigned int lineno:18; #define CLS_BITS 6 @@ -64,10 +68,6 @@ struct _ddebug { #endif } __attribute__((aligned(8))); -#define desc_modname(d) (d)->modname -#define desc_filename(d) (d)->filename -#define desc_function(d) (d)->function - enum ddebug_class_map_type { DD_CLASS_TYPE_DISJOINT_BITS, /** @@ -139,9 +139,11 @@ struct ddebug_class_user { /* encapsulate linker provided built-in (or module) dyndbg data */ struct _ddebug_info { struct _ddebug *descs; + struct _ddebug_site *sites; struct ddebug_class_map *classes; struct ddebug_class_user *class_users; unsigned int num_descs; + unsigned int num_sites; unsigned int num_classes; unsigned int num_class_users; }; @@ -226,9 +228,13 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, ._filename = __FILE__ #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \ + static struct _ddebug_site __aligned(8) \ + __section("__dyndbg_sites") name ##_site = { \ + DYNAMIC_DEBUG_SITE_INIT(), \ + }; \ static struct _ddebug __aligned(8) \ __section("__dyndbg") name = { \ - DYNAMIC_DEBUG_SITE_INIT(), \ + .site = &(name ##_site), \ .format = (fmt), \ .lineno = __LINE__, \ .flags = _DPRINTK_FLAGS_DEFAULT, \ diff --git a/kernel/module/main.c b/kernel/module/main.c index 6b0b0d82b5ab..43458184744d 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2211,6 +2211,9 @@ static int find_module_sections(struct module *mod, struct load_info *info) mod->dyndbg_info.descs = section_objs(info, "__dyndbg", sizeof(*mod->dyndbg_info.descs), &mod->dyndbg_info.num_descs); + mod->dyndbg_info.sites = section_objs(info, "__dyndbg_sites", + sizeof(*mod->dyndbg_info.sites), + &mod->dyndbg_info.num_sites); mod->dyndbg_info.classes = section_objs(info, "__dyndbg_classes", sizeof(*mod->dyndbg_info.classes), &mod->dyndbg_info.num_classes); diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index c0e595483cb9..0ad9f1bc00f0 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -41,6 +41,8 @@ extern struct _ddebug __start___dyndbg[]; extern struct _ddebug __stop___dyndbg[]; +extern struct _ddebug_site __start___dyndbg_sites[]; +extern struct _ddebug_site __stop___dyndbg_sites[]; extern struct ddebug_class_map __start___dyndbg_classes[]; extern struct ddebug_class_map __stop___dyndbg_classes[]; extern struct ddebug_class_user __start___dyndbg_class_users[]; @@ -191,6 +193,10 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons return NULL; } +#define desc_modname(d) (d)->site->_modname +#define desc_filename(d) (d)->site->_filename +#define desc_function(d) (d)->site->_function + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching -- 2.41.0