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 E3AD3C43461 for ; Tue, 11 May 2021 18:51:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7F3FF611AE for ; Tue, 11 May 2021 18:51:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7F3FF611AE 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 611426B0082; Tue, 11 May 2021 14:51:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DC456B0083; Tue, 11 May 2021 14:51:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D6A836B0087; Tue, 11 May 2021 14:51:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0220.hostedemail.com [216.40.44.220]) by kanga.kvack.org (Postfix) with ESMTP id A89646B0083 for ; Tue, 11 May 2021 14:51:31 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 5C0F4181AEF3F for ; Tue, 11 May 2021 18:51:31 +0000 (UTC) X-FDA: 78129843582.06.5EE4A55 Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by imf28.hostedemail.com (Postfix) with ESMTP id 8DF9C2000264 for ; Tue, 11 May 2021 18:51:29 +0000 (UTC) Received: by mail-il1-f177.google.com with SMTP id z1so10201643ils.0 for ; Tue, 11 May 2021 11:51:30 -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=nhCiWTrLaek2l7vUen81GgzaKiSCRGwtP17K82jei8A=; b=Yhx1L10EEQDF9KD2LDl5eJfcnHTASJESzEYK0s/A3gNp+lePUTEQT1LFN8Mj73dwiK g49vxxv+ybCQQALpP5kuMlnYjVnD7TW6QZks5w8gLmJTuGl5BpbZGoCSVFtXOpvbSbKM qYHm7CLaJq021V4cJglqkml/tZkmzs/BpnIA0UdUGvXEgOO8ucgA1jGxUKtqrkZxVSCD KojoHWyyUEWVAiBVrZ0iD0Qr/PbA/dPs0Runf+Tgvd1/oRfe2q0YYN6wGLWnHALm5et/ qJhA87XYL42lICWQS2g89yG0x+jgaXx/Oqw5fUpliLuPglH52kA3fxwcRyB9hCg396hO LIyw== 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=nhCiWTrLaek2l7vUen81GgzaKiSCRGwtP17K82jei8A=; b=WzFuSDsdt1vfcCOazjTFOkcvXmr59TPDUq43iZg+En8wjC8WdrQX2cE2nZJ7RRhJbe KU3B28w+xuhvPzYS3M0Jc9yUOBtORqexF8jEhlRZaXFyInPsCCwI/qr3csi7EyT7Onpv MwmTqzh13zC2fnGEPnWBTTSzDUhHCV+0rAMUITD6ydBHvw7YuEsKpcvy5Q5w8O8ZNvWE uJKlfvgVx90yCmkoM7mhkpwOmC9dAG9fxToiRxub5DoQnx5ToSBYOIZvd0u9kvaaoS9d K0gMS97+25R9OdOdsd0ofgWv9obj7OzP4qNh64+jmhwWkGf+EEjP6DlWLPIT3J1b3mRP qasQ== X-Gm-Message-State: AOAM531ApBaPVUh3BrtqnOl3eajQ1mIfNHlwubsY7Pjw8MDR0LrdaLfZ DwnvwPyhijd0o1hwRtbOeo4= X-Google-Smtp-Source: ABdhPJw0bBk5w3RUzzAen2n0A4ZC46f1p52jWlNLNunZfi+6JyH1Sp29JsV5c3WV+JHeDh4c01tL1w== X-Received: by 2002:a05:6e02:80b:: with SMTP id u11mr28566931ilm.153.1620759090309; Tue, 11 May 2021 11:51:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:51:29 -0700 (PDT) From: Jim Cromie To: Jason Baron , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH v5 11/28] dyndbg: refactor ddebug_alter_site out of ddebug_change Date: Tue, 11 May 2021 12:50:40 -0600 Message-Id: <20210511185057.3815777-12-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: 8DF9C2000264 Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Yhx1L10E; spf=pass (imf28.hostedemail.com: domain of jimcromie@gmail.com designates 209.85.166.177 as permitted sender) smtp.mailfrom=jimcromie@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Stat-Signature: nuxij87kb7nk6ztb9pd6yhi86jifjbx6 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf28; 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: 1620759089-508576 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: Move the JUMP_LABEL/static-key code to a separate function. no functional changes. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 5faf49054b1d..a4ddafdbd9a1 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -191,6 +191,18 @@ static int ddebug_match_site(const struct ddebug_que= ry *query, return true; } =20 +static void ddebug_alter_site(struct _ddebug *dp, + struct flag_settings *modifiers) +{ +#ifdef CONFIG_JUMP_LABEL + if (dp->flags & _DPRINTK_FLAGS_PRINT) { + if (!(modifiers->flags & _DPRINTK_FLAGS_PRINT)) + static_branch_disable(&dp->key.dd_key_true); + } else if (modifiers->flags & _DPRINTK_FLAGS_PRINT) + static_branch_enable(&dp->key.dd_key_true); +#endif +} + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -227,13 +239,9 @@ static int ddebug_change(const struct ddebug_query *= query, newflags =3D (dp->flags & modifiers->mask) | modifiers->flags; if (newflags =3D=3D dp->flags) continue; -#ifdef CONFIG_JUMP_LABEL - if (dp->flags & _DPRINTK_FLAGS_PRINT) { - if (!(modifiers->flags & _DPRINTK_FLAGS_PRINT)) - static_branch_disable(&dp->key.dd_key_true); - } else if (modifiers->flags & _DPRINTK_FLAGS_PRINT) - static_branch_enable(&dp->key.dd_key_true); -#endif + + ddebug_alter_site(dp, modifiers); + dp->flags =3D newflags; =20 if (dc) --=20 2.31.1