From patchwork Thu Jun 15 13:05:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 108529 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp648344vqr; Thu, 15 Jun 2023 06:48:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5sl/PZT0du/mFanqrdrMQdZQzVmPq+EsbjW40vXWwUz1Di9sf+nyRDoLXtfoBb5XZ+yH5C X-Received: by 2002:a17:902:ceca:b0:19c:dbce:dce8 with SMTP id d10-20020a170902ceca00b0019cdbcedce8mr18815573plg.15.1686836916218; Thu, 15 Jun 2023 06:48:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686836916; cv=none; d=google.com; s=arc-20160816; b=kXvQZLljzCM3eZqVZL4SwKUpV0/FqmCWGsfMqWDdnthD6LZ2jG+Hb+smXX31dWQ4CV NhFgBbTUiezqljrS5uzNlfLDlxyXPEpVDz0lwS8wmiHwcoAfqrohoNY9PehpsARAKta6 LGCH0Lsa/fkBKRmX7Q7nm22EzgwUOpMzz3OEML6vtFoQGWPBZm7qJBHyh0OmGCjyzjXy Cwk/MElHD9UxSZXtm6vUB3QNt8DnjQFAK5z1YeMIZ8j/VNsGZ8fwc0GGPrZIt5BPp7EF Sp7kK0MRqoYEqRxNhaWtZWQiCRvY3PH+h+vrFMRERn60gXFplK3KC6z0fCIGOu6/Z0wP K+lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=VnBtuuztT8YTEIzv1KqCpstxn1D0sObw353No87dbfg=; b=DvxAtVk+jdpknqO7w2iJUp1LxWPz1z3hEsQ5ZLWYkDZQl9vbY9tYO6EdkxxtB7BKGn pTW6W+gsG3Mxh6pkhTMeggk86o8MHQf7DhBYk9DK4TNnHfrhoFEwViAmNe4xgvq0qEzs wD6aUt9zREe7oAGfnoAvZWt6UkVVYsY90U9FOCIYq3iuhgRA5em6bGGUGL2doQs4bovn vjNULF7m3wPnryZv9SRh/6Mq41zl14L/1e3dKAYiJh8MdyXdMfykchC9ERV50AtJioE1 z0PGZXq/x9bGbXF7aIF/0UYInasF6ACEoCn4oqrHIe0szmkSgGp8oma6h7u18sVFZoBP ouNA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p1-20020a170902e74100b001b1bf4c8688si9289197plf.231.2023.06.15.06.48.21; Thu, 15 Jun 2023 06:48:36 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344202AbjFONfe (ORCPT + 99 others); Thu, 15 Jun 2023 09:35:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344484AbjFONfD (ORCPT ); Thu, 15 Jun 2023 09:35:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5046430E0 for ; Thu, 15 Jun 2023 06:34:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 15584637DA for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7872DC43391; Thu, 15 Jun 2023 13:34:16 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n79-000TmP-1U; Thu, 15 Jun 2023 09:34:15 -0400 Message-ID: <20230615133415.275901907@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:34 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , sunliming Subject: [for-linus][PATCH 03/15] tracing/user_events: Handle matching arguments that is null from dyn_events References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE 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?1768776705891080326?= X-GMAIL-MSGID: =?utf-8?q?1768776705891080326?= From: sunliming When A registering user event from dyn_events has no argments, it will pass the matching check, regardless of whether there is a user event with the same name and arguments. Add the matching check when the arguments of registering user event is null. Link: https://lore.kernel.org/linux-trace-kernel/20230529065110.303440-1-sunliming@kylinos.cn Signed-off-by: sunliming Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 37a38496a6be..afe61dc86543 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1745,6 +1745,8 @@ static bool user_event_match(const char *system, const char *event, if (match && argc > 0) match = user_fields_match(user, argc, argv); + else if (match && argc == 0) + match = list_empty(&user->fields); return match; }