From patchwork Mon Oct 24 11:30:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp532912wru; Mon, 24 Oct 2022 09:08:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4D9iR+c6+C6/FeZR6KRQeCaW6KK3OGSfLN7U0Da15hw7mgOt51K9TD2qgtdbBM42fLPn02 X-Received: by 2002:a17:907:162a:b0:7a9:9875:3147 with SMTP id hb42-20020a170907162a00b007a998753147mr3594628ejc.546.1666627726541; Mon, 24 Oct 2022 09:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627726; cv=none; d=google.com; s=arc-20160816; b=NmEUt3/Vjw+wm+fNDs354dX4IqJ4rPMRoasRwAV76vpk797dtPrFtaEGIXqIDzzw2c W7mnkTEDsjTHnmQww+kZt7EO6+J/+/yZehU/SK5FP9CTUV+EROfR5IDj/PKiQszAbuaj GCNb27UAJoNVwTI/McHEu6M+oisymyP2r7q4EyOHvue8yLQ5kzpzF8iGs/AqDYnvO4po add7adYaHXyrnQgXf5s7oyItTw7iZqoadqksFGlax8jWKcc2Ji5dwLg+IW/rAtGMmWyB zFjENkMIx67pCJJobgdoO7yyMKoRcu26UcqxSE/9OR1+VB40lF94SNw3KPOa1VCWlCKa FT3A== 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=UQ3C8ZlrrS6s9rIkZwxen66/UAm8iRME9/T3AfS4yBU=; b=iKV19OYcM0t04JLtDmicTiowwvmysKkeSnxs3YFhdSzlF2i6gS8M3CB9aHP6UyxyYF HJ6niLeUaLEZkXN6GPm10P53gguuvfaFT73MhzSSQwxCwptpGWBDr4+Uv8U9nNnfYgBj sL+r/E6he1QGSjb5rFbPi0b2L9LHaRPEmuSuikCX6nAErdgv2z6S7OKuHGgRZS+nltNi 7RnCFq/2TxGsriIEOLEbS7L1VglvOm66sWOLMWI+YIc4lV/vrst4fHRVmgzmEL0Xl8bD 94k0DFEL+lHdNKU1km5MEx5mqK3+ubJSSqM7vuZzpg7c6s/YUOvgZosX0O6HUv92dimx 3KAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DuAMR19p; 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 gn21-20020a1709070d1500b007832270e88fsi140662ejc.681.2022.10.24.09.08.21; Mon, 24 Oct 2022 09:08:46 -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=DuAMR19p; 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 S233371AbiJXQHq (ORCPT + 99 others); Mon, 24 Oct 2022 12:07:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233181AbiJXQET (ORCPT ); Mon, 24 Oct 2022 12:04:19 -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 F373E4AD60; Mon, 24 Oct 2022 07:56:40 -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 0D889B8119C; Mon, 24 Oct 2022 12:26:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62E53C433C1; Mon, 24 Oct 2022 12:26:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614402; bh=LzSGZoNYlpfxvUABGLLZKCeoT9yYlmeRuLWFvqfT5BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DuAMR19pCkD4N27+b9Tr0mzqNTc9bGgEFTIm0vrKCyVnjxbkCqQxzW3LeTvhkbQo+ gP+hRHJ/FQoUixvzqfQoeSWnNmUcCi8kR88fv1TegNiKoRdorenas496f9B0+xz8Hb UYhNDSw0ts19vE4HsQ3cshAov2Qb0pMGbqC/ae2s= 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.10 220/390] dyndbg: drop EXPORTed dynamic_debug_exec_queries Date: Mon, 24 Oct 2022 13:30:17 +0200 Message-Id: <20221024113032.144014646@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@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?1747585834956161525?= X-GMAIL-MSGID: =?utf-8?q?1747585834956161525?= 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 b0b23679b2c2..c0c6ea9ea7e3 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -50,9 +50,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); @@ -216,12 +213,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 02a1a6496375..10a50c03074e 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)