From patchwork Mon Oct 24 11:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp643122wru; Mon, 24 Oct 2022 13:40:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7141zMbB0UMfz0KB3vUvVZoafzsC/wNHql9m8fBiK8X3Q3J8R3ih06DhbkXRKFOqlGUUGh X-Received: by 2002:a17:902:f643:b0:185:3e6d:6171 with SMTP id m3-20020a170902f64300b001853e6d6171mr34616346plg.123.1666644029555; Mon, 24 Oct 2022 13:40:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666644029; cv=none; d=google.com; s=arc-20160816; b=oEcBYrcf1gbm6VrW9DGMa0jgYqEuBgETlDiEnuEE3d1R1abzSUAdhS2xTedkdLrmdK pQz11B98kvLod3pXTTW9fvyb6xdKINJQM/DZIsDJZWLy0ALCuTf9WjeYQpg5d2cI04Za 1ctbivJUUTVa5yTQTlSUCgQOFq9lZXGkL2NjJBPtJd60GKf66JZrlcyKla38urp2Ihlt 4w5ycO6zyscMTyOMngobsu5N+y+G2K0InMDSOJCXGR2zYD31+Zjm+M+BOWQExR3x+jTW sha2AKkCdPMFSdkwA+Cn0H+7anZVJY9btNAVrwCpWxS69V/fA4+dSWBMfTmtkKpGjRmW JEXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WVilmM0OPTC3L0x/WNODIw+lbs8aNIcCkUE2yDbHI/k=; b=itDD92V/ur8ETJrx4bRXR8HgLbPcW0iHQ6VH1MjWgSDsJY1na4X84NF5G430jhvFps u3tk975tGhhtNycvDGQfg9J0XXBTGELc9+dxG4GyxYqq1nxum8i3iCWcaGa038dJNHfY bSdi6UAyfaf4r1ulSSxlPLbYv9kELnIjhIuGM/zJeIMviJgu+L4XgsuCnSzBRJPFustU KUCIKpbJBOiA9uBuBw+8pfCCs9mBrx4WuAygX8bJGk7KQBupFq5wSpL4Muj78wYgN0It 8bPbQek+SFbBu0F7l3n4URDaZr5TeGqsKeEREYcd29kvuk4UOJdiu/NK75BeQteyjsuo Lhlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Wg68PNHI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d2-20020a170902cec200b00186abd10814si643612plg.250.2022.10.24.13.40.16; Mon, 24 Oct 2022 13:40:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Wg68PNHI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234516AbiJXUjn (ORCPT + 99 others); Mon, 24 Oct 2022 16:39:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234411AbiJXUil (ORCPT ); Mon, 24 Oct 2022 16:38:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 088451658D; Mon, 24 Oct 2022 11:49:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7EB9CB8191D; Mon, 24 Oct 2022 12:47:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4C2FC433D6; Mon, 24 Oct 2022 12:47:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615647; bh=RW2RwW0JdXaxm1KEivRvaSPCOsUTi6Nc0htOetkrg8g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wg68PNHIwx+TJkmstDiE1fQZz87dXK8/7S8eS6P0oJUFXkEMUzeoJ+W4EIuMc5Fhm YU5mzYIPHgjBytw+fS2vwKO1zqnlPUNYdIELuAAhzL0xeozc9nm9owEZjBS7xBlpZT kgJ/XqRln/Dw+gMZDpfa8aT9wPnLigtF9hDng1js= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jason Baron , Daniel Vetter , Jim Cromie , Sasha Levin Subject: [PATCH 5.15 300/530] dyndbg: drop EXPORTed dynamic_debug_exec_queries Date: Mon, 24 Oct 2022 13:30:44 +0200 Message-Id: <20221024113058.647921000@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747602930207932317?= X-GMAIL-MSGID: =?utf-8?q?1747602930207932317?= From: Jim Cromie [ Upstream commit e26ef3af964acfea311403126acee8c56c89e26b ] This exported fn is unused, and will not be needed. Lets dump it. The export was added to let drm control pr_debugs, as part of using them to avoid drm_debug_enabled overheads. But its better to just implement the drm.debug bitmap interface, then its available for everyone. Fixes: a2d375eda771 ("dyndbg: refine export, rename to dynamic_debug_exec_queries()") Fixes: 4c0d77828d4f ("dyndbg: export ddebug_exec_queries") Acked-by: Jason Baron Acked-by: Daniel Vetter Signed-off-by: Jim Cromie Link: https://lore.kernel.org/r/20220904214134.408619-10-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- include/linux/dynamic_debug.h | 9 --------- lib/dynamic_debug.c | 29 ----------------------------- 2 files changed, 38 deletions(-) diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index f30b01aa9fa4..8d9eec5f6d8b 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -55,9 +55,6 @@ struct _ddebug { #if defined(CONFIG_DYNAMIC_DEBUG_CORE) -/* exported for module authors to exercise >control */ -int dynamic_debug_exec_queries(const char *query, const char *modname); - int ddebug_add_module(struct _ddebug *tab, unsigned int n, const char *modname); extern int ddebug_remove_module(const char *mod_name); @@ -221,12 +218,6 @@ static inline int ddebug_dyndbg_module_param_cb(char *param, char *val, rowsize, groupsize, buf, len, ascii); \ } while (0) -static inline int dynamic_debug_exec_queries(const char *query, const char *modname) -{ - pr_warn("kernel not built with CONFIG_DYNAMIC_DEBUG_CORE\n"); - return 0; -} - #endif /* !CONFIG_DYNAMIC_DEBUG_CORE */ #endif diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 60d453974155..2ca56c22a169 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -552,35 +552,6 @@ static int ddebug_exec_queries(char *query, const char *modname) return nfound; } -/** - * dynamic_debug_exec_queries - select and change dynamic-debug prints - * @query: query-string described in admin-guide/dynamic-debug-howto - * @modname: string containing module name, usually &module.mod_name - * - * This uses the >/proc/dynamic_debug/control reader, allowing module - * authors to modify their dynamic-debug callsites. The modname is - * canonically struct module.mod_name, but can also be null or a - * module-wildcard, for example: "drm*". - */ -int dynamic_debug_exec_queries(const char *query, const char *modname) -{ - int rc; - char *qry; /* writable copy of query */ - - if (!query) { - pr_err("non-null query/command string expected\n"); - return -EINVAL; - } - qry = kstrndup(query, PAGE_SIZE, GFP_KERNEL); - if (!qry) - return -ENOMEM; - - rc = ddebug_exec_queries(qry, modname); - kfree(qry); - return rc; -} -EXPORT_SYMBOL_GPL(dynamic_debug_exec_queries); - #define PREFIX_SIZE 64 static int remaining(int wrote)