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=-13.6 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,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 171D5C433B4 for ; Tue, 11 May 2021 18:52:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A252B61185 for ; Tue, 11 May 2021 18:52:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A252B61185 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 E28066B009F; Tue, 11 May 2021 14:51:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DAF5F6B00A0; Tue, 11 May 2021 14:51:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B664D8D0001; Tue, 11 May 2021 14:51:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0137.hostedemail.com [216.40.44.137]) by kanga.kvack.org (Postfix) with ESMTP id 90AC96B009F for ; Tue, 11 May 2021 14:51:57 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 5904D8249980 for ; Tue, 11 May 2021 18:51:57 +0000 (UTC) X-FDA: 78129844674.24.A102357 Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by imf04.hostedemail.com (Postfix) with ESMTP id 9609B3E1 for ; Tue, 11 May 2021 18:51:50 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id s9so788292ilp.9 for ; Tue, 11 May 2021 11:51:56 -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=w/MStH6rleojLv6FsPubLujifVnUutNTi0UTvEWgL70=; b=n0w1LLoKmwiskrevRxDlHMcMz0ItQvFgP4Mm/+gUC3Hp2n1gu9Wu8t1tjnP2fFWVdF MCf/6W3GMlxHEjyKcSIeRZqJGegNFHbpGto8pZz8nrjz8BSQt6E2Ndv1wiQfIvz5SDN4 C0tuwP/5MfQ4mkeailcv+3URknXWfvSTiXqz1962+ABfNbpXUMJiH6o9B3+E7t3FM1n+ wlEoObEB5kWpLDoyBKGnByn6Aw4Ui9eoBwWwqY4HRrrlroXY0PKfVQYHcScf7ExTPOVf GE2BaTLnwq6vJwG7/NS9Ule3fb1rqoIw23Ki3j6GFKDU/xsAEuWixpSZJ6jnlNAHJv30 jmDA== 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=w/MStH6rleojLv6FsPubLujifVnUutNTi0UTvEWgL70=; b=g/eb1NeogS5+p3cU/eir6z4uxmacHyD7w7L16ApGQDmJUsahkvbOCwfsg3kY1hsEhO jWHLu9VxT9Wi7DihRpRJTyNHc95VcbKBvGxQpgDOjlTHn0zjHWHGPqr7urzUafmySuuM hWKJmq22+Z0FmyKrt/oh+LK9G1h0aTNGfcH6dQyO4hQ76zNedXQBvEi9h/9UHm/FfGTP hBpr+rQovMP7cnbzP+OTYM0oqCreoML/gFf/Sttn5W2/IZY586derUSJfB7e29ifDslo gfjau7UlzyK99DiUP2u3SzyV23xnLGQVxx3JUWNt3EiWots3rVgzLrMbauRwNOh30b73 xU+w== X-Gm-Message-State: AOAM533iqrVmrPspvlrplgrVeIZhAdqJ/aMHdbqMooT98XQwNyLIPqRc H24l5+fIChoME+sNY+RGOww= X-Google-Smtp-Source: ABdhPJxZIho9S9YRnlHrZ1rQU5B1tlKuVPPKUeHaGibAuu93uqCrmR1pZxVkYnI/ke59YOgpp2ttqA== X-Received: by 2002:a92:c846:: with SMTP id b6mr23449530ilq.68.1620759116365; Tue, 11 May 2021 11:51:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:51:56 -0700 (PDT) From: Jim Cromie To: Jason Baron , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH v5 28/28] dyndbg: RFC drop _ddebug.site pointer Date: Tue, 11 May 2021 12:50:57 -0600 Message-Id: <20210511185057.3815777-29-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: 9609B3E1 Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=n0w1LLoK; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf04.hostedemail.com: domain of jimcromie@gmail.com designates 209.85.166.177 as permitted sender) smtp.mailfrom=jimcromie@gmail.com X-Rspamd-Server: rspam03 X-Stat-Signature: frjmes41a36pnpazumd7mtsdmunjdunb Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf04; identity=mailfrom; envelope-from=""; helo=mail-il1-f177.google.com; client-ip=209.85.166.177 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620759110-327870 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: In .h, flip the switch on #define SITE_CHK. This finally removes the _ddebug.site pointer, and all uses of it. Due to this, the .site cross-link done by DEFINE_DYNAMIC_DEBUG_METADATA() is lost to the compiler, so suppress the resulting warnings by adding a "__used" to the _ddebug_site records initialized there. In .c, fix a bunch of fallout: - mostly casts from struct to/from union - convert a BUG_ON to a WARN, it happens ~20x per `cat control`, probably headers on loaded modules - fixup missing _ddebug_header.site, bad initialization of some sort. This seems to work, but should be cleaner. RFC Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 4 ++-- lib/dynamic_debug.c | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.= h index 9ca413985fb2..7f2b255a25ae 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -6,7 +6,7 @@ #include #endif =20 -#define SITE_CHK /* include .site pointer and checks on it */ +// #define SITE_CHK /* include .site pointer and checks on it */ =20 #ifdef SITE_CHK #define SITE_CHK_(...) __VA_ARGS__ @@ -135,7 +135,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, const char *fmt, ...); =20 #define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \ - static struct _ddebug_site __aligned(8) \ + static struct _ddebug_site __aligned(8) __used \ __section("__dyndbg_sites") name##_site =3D { \ .modname =3D KBUILD_MODNAME, \ .filename =3D __FILE__, \ diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index aa4a476d70ad..db759c998c54 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -148,9 +148,12 @@ static void vpr_info_dq(const struct ddebug_query *q= uery, const char *msg) =20 static struct _ddebug_site *ddebug_site_get(struct _ddebug *dp) { - struct _ddebug *dh =3D dp - (dp->_index); + union _ddebug_header *dh =3D (union _ddebug_header *) (dp - dp->_index)= ; + + if (!is_dyndbg_header_pair(dh, dh->site)) { + v3pr_info("get: header fail\n"); + } =20 - BUG_ON(!is_dyndbg_header_pair(dh, dh->site)); #ifdef SITE_CHK if (dp >=3D __start___dyndbg && dp < __stop___dyndbg) { =20 @@ -178,7 +181,7 @@ static struct _ddebug_site *ddebug_site_get(struct _d= debug *dp) =20 return dp->site; #else - return &dh->site[dp->_index]; + return (struct _ddebug_site *) &dh->site[dp->_index]; #endif } static inline void ddebug_site_put(struct _ddebug *dp) @@ -1070,17 +1073,23 @@ static int __ddebug_add_module(struct _ddebug *ta= b, struct _ddebug_site *sites, const char *modname) { struct ddebug_table *dt; + union _ddebug_header *dh =3D (union _ddebug_header *) &tab[0]; int i; =20 v3pr_info("add-module: %s.%d sites\n", modname, numdbgs); =20 - if (numdbgs && is_dyndbg_header_pair(tab, sites)) { + if (numdbgs && is_dyndbg_header_pair(dh, sites)) { =20 - v3pr_info(" header: %d %s.%s.%d\n", tab[0]._index, modname, - tab[0].site->function, tab[0].lineno); + v3pr_info(" header: %d %s.\n", dh->_index, modname); =20 - SITE_CHK_(BUG_ON(tab[0].site !=3D &sites[0])); + SITE_CHK_(BUG_ON(dh->site[0] !=3D &sites[0])); =20 + /* for !SITE_CHK, need to set site ptr, fixup missed init! */ + if (!dh->site) { + dh->site =3D (union _ddebug_site_header *) sites; + v3pr_info(" header: %d %s.%s.%d\n", dh->_index, modname, + dh->site->function, dh->lineno); + } if (numdbgs <=3D 1) { v3pr_info(" skip header %s\n", modname); return 0; @@ -1110,7 +1119,7 @@ static int __ddebug_add_module(struct _ddebug *tab,= struct _ddebug_site *sites, for (i =3D 0; i < numdbgs; i++, base++) { tab[i]._index =3D base; v3pr_info(" %d %d %s.%s.%d\n", i, base, modname, - tab[i].site->function, tab[i].lineno); + sites[i].function, tab[i].lineno); } =20 mutex_lock(&ddebug_lock); --=20 2.31.1