From patchwork Mon Oct 24 11:30:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8783 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430723wru; Mon, 24 Oct 2022 05:42:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4YZvqCRMXY/4bQZT/Vl/9F/1YS6OYBhbtmRWR3U/HlofRxh94z6qD0YeEZhhrp3Iu8Usck X-Received: by 2002:a17:902:7c04:b0:186:abd0:9401 with SMTP id x4-20020a1709027c0400b00186abd09401mr4425034pll.64.1666615329828; Mon, 24 Oct 2022 05:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615329; cv=none; d=google.com; s=arc-20160816; b=l0xKHomraFdKw366M/CdMh6DlNFkFvY6KpuSDu7tkL4UxmcP+DVWImzmCB6xA5itGE UQzxn2QEUWyiZIBWlLdLlunHqgseT1f5rWhrHCi34fdSZibvmS5x1s5g31+AUODkpySz tsBnp6jqarxumz46ZJ7QN8FfNi26fzRcaACPNAmNlYsRGSZe1yvxr8XoNQ+uBEZR38pM 6HWd69HZsKOC+zznCspapSfEBSHytyOMwDUwXpPnr8KxuIP7tSG6ia8oGIPRXWPVC769 PzWzMjkcrO9m0ZsfjbFlxLtig5DgQPoSf5Pvct1kSl5TRhCwp5UZ/SvaWYNr5b1UTA5N Vi2g== 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=nkUmu3dtCzAIfoUlVSKpoaz3v4R8I8vNcEhMgse84A8=; b=ycv/RWwHdqlqmoIB0HS1cGEIkRdpgh0DNTBhb54uE6pXs5EM3KgevrpoUzFCC0jOBW FAMgzBQQoVCESY7NfiuQM+/SuyE/gRXHtpIkoXpCAU0V4bd0YWhA+Kc5EefM+NiaoLXE JvPU2UWRqsQ6FpQUkcTd4abjL6KHrYv1HPnjy6dHWJmhec2ESJBUUriQB1Hqoa+ygcrd chHdudK/Fog9Xx1AkDpAIhIgO7+UjPmaaB+XyRbjzPMlppbefL0xFAlduVefKEzF+e96 PmrXEq4qeakVe14XtvU0pZqMVIuQkprW2gxd0sTgBo1lb6LqxPgb33I5ZaAVgDhGiNWk YNgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JLwaiBPU; 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 t2-20020a056a0021c200b0054d5253e7d7si15022402pfj.190.2022.10.24.05.41.56; Mon, 24 Oct 2022 05:42:09 -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=JLwaiBPU; 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 S229974AbiJXMdA (ORCPT + 99 others); Mon, 24 Oct 2022 08:33:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234009AbiJXM3L (ORCPT ); Mon, 24 Oct 2022 08:29:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6C0E87F9B; Mon, 24 Oct 2022 05:03:01 -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 dfw.source.kernel.org (Postfix) with ESMTPS id D38EC6121A; Mon, 24 Oct 2022 12:00:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E779EC433C1; Mon, 24 Oct 2022 12:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612825; bh=Tv1qlyGz+W4DAit23WsKH3GA9/Z/UUoihIb9T67RTpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLwaiBPUxgbCt+ynrWvqE+ze4FJgc7EDkKWdSUSv9DKefwQcuSH7jRwGtV09mLRwa Dcu9UdgRL8ZHyFLTD+gM0sKPZcQuUPbGaqh35c1WPBiL2DQs16oRZCUJJFEl6/qT8L r5KZ5iZxNZGkcDPisRvzC2oHRPvX60IXpxXvP68o= 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 4.19 134/229] dyndbg: let query-modname override actual module name Date: Mon, 24 Oct 2022 13:30:53 +0200 Message-Id: <20221024113003.343691236@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@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?1747572836412655824?= X-GMAIL-MSGID: =?utf-8?q?1747572836412655824?= From: Jim Cromie [ Upstream commit e75ef56f74965f426dd819a41336b640ffdd8fbc ] dyndbg's control-parser: ddebug_parse_query(), requires that search terms: module, func, file, lineno, are used only once in a query; a thing cannot be named both foo and bar. The cited commit added an overriding module modname, taken from the module loader, which is authoritative. So it set query.module 1st, which disallowed its use in the query-string. But now, its useful to allow a module-load to enable classes across a whole (or part of) a subsystem at once. # enable (dynamic-debug in) drm only modprobe drm dyndbg="class DRM_UT_CORE +p" # get drm_helper too modprobe drm dyndbg="class DRM_UT_CORE module drm* +p" # get everything that knows DRM_UT_CORE modprobe drm dyndbg="class DRM_UT_CORE module * +p" # also for boot-args: drm.dyndbg="class DRM_UT_CORE module * +p" So convert the override into a default, by filling it only when/after the query-string omitted the module. NB: the query class FOO handling is forthcoming. Fixes: 8e59b5cfb9a6 dynamic_debug: add modname arg to exec_query callchain Acked-by: Jason Baron Acked-by: Daniel Vetter Signed-off-by: Jim Cromie Link: https://lore.kernel.org/r/20220904214134.408619-8-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- lib/dynamic_debug.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 9305ff43fc15..fec610703095 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -327,10 +327,6 @@ static int ddebug_parse_query(char *words[], int nwords, } memset(query, 0, sizeof(*query)); - if (modname) - /* support $modname.dyndbg= */ - query->module = modname; - for (i = 0; i < nwords; i += 2) { if (!strcmp(words[i], "func")) { rc = check_set(&query->function, words[i+1], "func"); @@ -379,6 +375,13 @@ static int ddebug_parse_query(char *words[], int nwords, if (rc) return rc; } + if (!query->module && modname) + /* + * support $modname.dyndbg=, when + * not given in the query itself + */ + query->module = modname; + vpr_info_dq(query, "parsed"); return 0; }