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 21E8ECDB46E for ; Thu, 12 Oct 2023 19:49:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94DCD8D014F; Thu, 12 Oct 2023 15:48:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 838E48D0002; Thu, 12 Oct 2023 15:48:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B4D48D014F; Thu, 12 Oct 2023 15:48:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 586BE8D0002 for ; Thu, 12 Oct 2023 15:48:47 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3B7FDB5625 for ; Thu, 12 Oct 2023 19:48:47 +0000 (UTC) X-FDA: 81337847094.27.B964D30 Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by imf15.hostedemail.com (Postfix) with ESMTP id 660F1A0019 for ; Thu, 12 Oct 2023 19:48:45 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DQzZEQu+; spf=pass (imf15.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.46 as permitted sender) smtp.mailfrom=jim.cromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697140125; a=rsa-sha256; cv=none; b=gxivTo3jo5xBmTYg73y9SyIa/NB66Z1lgTyih+ci4e8BxTbRSaXs3+awYaygXbT7pXET36 BcPlmucqWhW5/tN+7+a1Zf2Lp3gzpxJdFyXRN5hpuH3e9bmLzrLkDu1b88PAtVUkuiCqiW 43SFtXw4nmyT3i+AOseQUHGXD7tAIAA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DQzZEQu+; spf=pass (imf15.hostedemail.com: domain of jim.cromie@gmail.com designates 209.85.166.46 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=1697140125; 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=Iuwbt1McOcGdkIO7L8zjw1pQxOK6ynndpanb3dr/E5o=; b=bZ77nw3svQKYBD4h3XgviCOLTOZQUKUmUZeSRjEzkPVD/WrPsvhtUguxG7LYWZ0y/ExCTz FIIo8e1sxd7JZfjbGkzqKGZYk7t8n2sK3kcsd4LLqrrFHaqbWpNMcFFMuhdJ+SRffrFPoZ qkf5+f7EQf869uzzknxbcKCpQ955Ijs= Received: by mail-io1-f46.google.com with SMTP id ca18e2360f4ac-79fa5d9f3a2so54899439f.3 for ; Thu, 12 Oct 2023 12:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697140124; x=1697744924; 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=Iuwbt1McOcGdkIO7L8zjw1pQxOK6ynndpanb3dr/E5o=; b=DQzZEQu+/Uf0pAlzV0+NsnId98qxWyxOre0BgHGkX/aYY/t2MCRFmvgkg4Tal6N06b vttFkVos2t+HqCAPqkUfz2OXNrfzAt7PHZR8XKVCMSOi7Mbc2Vm1dYgzY9df6xiaz8jn ediTyi0ZfT5AEpMtZbfnPl/yBcZlCHlT5+zSWvwNAyLRmo+u3Bprhnn+IqY70HTnkbY7 2Y5shjzI+PUSFJo852A6qvah9c72pI71Sethd4+pjDr8NuleT9AU8aw0LaI1kPPxEZo2 GMpVFMRX9DibSMkJqSmCFtkFTNIhtj5m9e+dN+2yUd40bUq/P8Ww0CHSd8tEmXh9tGPb jnUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697140124; x=1697744924; 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=Iuwbt1McOcGdkIO7L8zjw1pQxOK6ynndpanb3dr/E5o=; b=pIBsl5pE8MGgc0IlPG6wfelXDqiUzIsWU7LBUJuyXrzaLszNuw5OOju1L5CMPa/axe 1RVapVDmTz4wTCkQRMaHQ5pixT9+fW3Jq+SP4aUl82rAeuEcXuGT0BsQhIZ9ewwpkeC4 6935Fan5189MtUQ115A5WAsOf8CM6f1Rjag5apziRJwTdG6MKsJ9zpl+NxFnUAhzJyzI J4H/WyYbNXqZQ9YPydoUxBoRJyh2ADGx6iD04esTjkvooN829bgcyZ7IFnkMUQrnj48n hcPqoH1vWBYiI2OwUIYsekonb8+1yoiZKT/Kx9KrD+hO8002Xv9RAAoNZQyp0xVwzFLC jR5g== X-Gm-Message-State: AOJu0YwnFyqXeIVnOLGhn6jzjceFllWVOpTskcncmezvSj+0kLRc9izN SZFVXt51ikcG3zIA1QKCWlRKZ1p82N9VwQ== X-Google-Smtp-Source: AGHT+IHlxTW+J6rW7Zd2Pq9sVXFhxqom9NxXG/NPLrr0aum2XInHvnhwAk/EyR/uZTaVq9k5JHvdXg== X-Received: by 2002:a6b:d81a:0:b0:792:82f8:749d with SMTP id y26-20020a6bd81a000000b0079282f8749dmr30579249iob.10.1697140124637; Thu, 12 Oct 2023 12:48:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 12:48:44 -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 08/10] dyndbg: drop _ddebug.site member Date: Thu, 12 Oct 2023 13:48:32 -0600 Message-ID: <20231012194834.3288085-9-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-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 660F1A0019 X-Stat-Signature: 93mq6hyko8fa6aad8zcon4i746szn37k X-Rspam-User: X-HE-Tag: 1697140125-370632 X-HE-Meta: U2FsdGVkX1+NcRZ/OdHl0sb1Ms2x049+ObGrkIxpNc75ihyeoAJ+9CHfqX+bruiUMeE3FbZH4wEIsDBIuEs93uFvr+1Nk8EdIQkCjnA//47qzD+Q20MYTZDTOr1xFY9N7lHOLgNirr7KzH0WKzqFqQy1iC3tg7TtzCTANFCtc9LxbgtSBbPZ23S7+SEw859S6TAlmLRNh81VIwEFlt2a4TaQpL2iXem1uXaPgb6WbV5aK+Oo374ZHnE3hMcC0bdCc8qCTiNGyIFHQP1MMCV239/Qv290mbpjnQNQGinB3WqkEirMLrggN7ycS2IvmCQ5udUlGLVLsMX8iBvvXG7C8XxEq9NFCIWWNM67NnrjJz1vLQcUl8Oe1d4enb0xu8/VzN0GvGv1qCW4uhWqDN078t/tiDoCV47X73fAqxVlFfYDgZOoyed4wR+NPb22QOf/KeIFrz8oBM4dsug+jSz2SNBSH3OM+UR19U3/P5yJOr/F1LdWB8zVjUQDoKqup40JtnBkGPan+vZjyMB1Md1L2CSsXsBUSoaY3gKQOLxvMk1fwLkxvp+zAnKzCQGCbBFIPAAXsN7KdG/pVwQpby5Ise6UiRz1bhqpTxzzo3cHlhXq3KHM8Qoj8WE/kCagnJ8IBkj5d3e0JAhniNoObI0BtwVMxUGv6VzQSTR5un4OlHhn4h80DGCa6B5ByyWW/WLD9e8gCuYMdt7bCt2N3G0zdcvh6y6swFkyqyCXrG0uY5+OrCwPqzOJfJpS1yEwJBPvyL9+hzwR+6ddzQ4Lf0mZw0CQAVyenTwRnn3iuYFPVB/3uMM+p7DM+7ZP5i2X6fU39qbiEFdT2UAYjhn3b2HogpCsq7qOpJi26VxrPzGIcEqihhlA7tTFeDic/wzULQfcZz4/ZdW6HvNAW/NqrWVeMU/brado6o4JEP+bhKAZo8QbyS0aK3IFWykFT7fIlsb8KKkY5dk6xuJ/9NkjdWs US46B8Kw 1ivF+xGt3N5GVnFRoRbBLCP2Yrc0kEy0kV3R7fBbZN0xIY8PokqauaBMIAsycMha0F2LGFH/0zwK0m8xQZcqJ9n+b8u2vyzELMPUnqYl3hUeX0dsXNRUi8GWRz67Uc4UvAaK5qy77r03Sq9P6FDY3KKYSxmehc+NPH/v7E3Sz8iyht8YhUx8W8S/RHQHAwA9vOjdRVbdqvRDHdQ7UWV4E+F7uyZm1TtoKcH03KkpZEDUkRBBokCkfh5c7nzZlLrw4rjUh/HxDIfjewy21ySXwjQjVn4Z4WMAodrnCXaDzfCF3C26mYdKPjPM7RnSXx/8NUbiyTd8BhPfBC0M6YkQJ2uus9DIxNBu9aFyN0WyR1GlS97v0SZhkHRDATxMllFZ/rRAhCm8NcSRjcVhKm3yebCFth/7mbJJAhdrGdfim/MxL9W9ZN1P80SON4gqJ7iYtaS4ilxlhY3faTrWiPTcWcUnG0vGHcH4v/u2WvIGm8q9ZA2IbT6ffcggPqNIX48ETy6FbsCSRPHzbHYXux1mmA66xGOcVG3UmBwJdgCdVFIrOj9k+o0V2zUpFApK8SDQGoS2HbCAi28Qn3S6iefdVckxx5w== 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: drop site ptr, and rely upon the maple-tree intervals loaded by ddebug_condense_sites(). In DEFINE_DYNAMIC_DEBUG_METADATA_CLS(), which creates a pair of _ddebug & _ddebug_site structs, add '__used' to the latter, because it is no longer linked from the former, and then also to the former, so they both have the same number of entries. Replace the BUG_ON with a pr_warn that shows the size of the mismatch. TODO: sort out where the extra records are coming from. Signed-off-by: Jim Cromie --- include/linux/dynamic_debug.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index 5206a2cfdb37..406b30d8eb98 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -27,7 +27,6 @@ struct _ddebug_site { }; struct _ddebug { - struct _ddebug_site *site; const char *format; unsigned int lineno:18; #define CLS_BITS 6 @@ -228,13 +227,12 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, ._filename = __FILE__ #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \ - static struct _ddebug_site __aligned(8) \ + static struct _ddebug_site __used __aligned(8) \ __section("__dyndbg_sites") name ##_site = { \ DYNAMIC_DEBUG_SITE_INIT(), \ }; \ - static struct _ddebug __aligned(8) \ + static struct _ddebug __used __aligned(8) \ __section("__dyndbg") name = { \ - .site = &(name ##_site), \ .format = (fmt), \ .lineno = __LINE__, \ .flags = _DPRINTK_FLAGS_DEFAULT, \ -- 2.41.0