From patchwork Mon Oct 24 11:30:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp419748wru; Mon, 24 Oct 2022 05:16:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5AWY9mPs384v8Xyimke247oStjxiU2AM3JR6U/umWPcapY+LBjiByJWSH2EOvQ9jJ/P00Y X-Received: by 2002:a17:907:7244:b0:78d:cedc:7a9e with SMTP id ds4-20020a170907724400b0078dcedc7a9emr26781951ejc.600.1666613812600; Mon, 24 Oct 2022 05:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613812; cv=none; d=google.com; s=arc-20160816; b=bY28uJhMZKeA7lyjcs8GKvI2Os8+qgaBsJWA0Oa4wN+gIx307HVIROD9765fCsqgNd 2C7q5MOvqgRuNgcPHV38gqUz4UsI0p55RgNOUI3wtJSDFKbRh0XERA83VH9sRSj01e0L XeNtOZwYqMgxQ9FB+DHJ0fGfvC3xstq+8zmBgHx39/UkbFyBJFEdPvHwvijnMHWZ091R L+hoRaRFqZm8fGw8+numQTqZy6xiLMEFPLEnsonx9yjWHHS80WoTuT0lJUUCw++z4Ugx E9FPahWMHH1rjGFsdQmAicU2vSo5Ql0zydSBc9rFd5Xu52KpY0S0uL7rGs+QU7qLk3EA fwxw== 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=AhxWyfrE54TY4jmdPKQVatS23utZeDCqIjqDLjrHWFY=; b=IiJkLJNJHT+lUKoCX8p/4tfekHfkohW1k9r6aSrUg8GpAZNG9gor3tMgSM49YDufof /5K5cVFqGThzbRbzYOe4MKozqpx3cfA7Y62MV7wcxmMDnkLHATjLGwRR+te9BOPJhOwf eNr1MtRBMQCGm7ADfh/Vb6WxNWBJ6XTmt2sxLQxNrdN+mPK3OXsMz+JGNDR5RAgWqrcG 7V+RJPk2DoMJx4GIjGqXO3veYVM7rqU6hZRkDpbf+MACBWixkYmqGLDByA2X2gVrXacj OO9xe32IGdMbhLH8Bcq2AIKy04liC7HjTm0QnKEYNAbUapLyjkUaodIjuji4bb2mzQ5V 11RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DTDZXVRN; 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 g8-20020a056402114800b00458e43471d5si24817813edw.614.2022.10.24.05.16.28; Mon, 24 Oct 2022 05:16:52 -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=DTDZXVRN; 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 S230234AbiJXMKF (ORCPT + 99 others); Mon, 24 Oct 2022 08:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbiJXMH5 (ORCPT ); Mon, 24 Oct 2022 08:07:57 -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 81BC97E321; Mon, 24 Oct 2022 04:51:41 -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 CB166B81199; Mon, 24 Oct 2022 11:51:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E652C433C1; Mon, 24 Oct 2022 11:51:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612260; bh=R2o+Cu2UAOttf3+FN46CvIfUeo5oZyZa9B5Y8e4wXF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DTDZXVRN7Ia0idxc5hTBbOaGJde+B+B5WYo1CUiMDt2GMSe/vX/VJFBhlSSXcC8kv BPXxDaQlIUZGZCXPFrEU/g3+9INjJGMfhtM9vK2QhZ0xsavjGLkrmfEKtI9ooK/PF3 H3VnrkniBeBzH205vUYJogtp867OU0wa4SYPLjY0= 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.14 129/210] dyndbg: let query-modname override actual module name Date: Mon, 24 Oct 2022 13:30:46 +0200 Message-Id: <20221024113001.172915017@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571245177676476?= X-GMAIL-MSGID: =?utf-8?q?1747571245177676476?= 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 91c451e0f474..01591a7b151f 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; }