From patchwork Mon May 29 06:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunliming X-Patchwork-Id: 100124 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1322392vqr; Sun, 28 May 2023 23:58:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ761zdYkdS7k2f7D6Zbyz2fDC/ET+TJhDT09fIARFDH7KVeQvF7bTQCEbv7j+D61TUX6jjc X-Received: by 2002:a17:902:e750:b0:1af:c7f8:b329 with SMTP id p16-20020a170902e75000b001afc7f8b329mr12257492plf.24.1685343507146; Sun, 28 May 2023 23:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685343507; cv=none; d=google.com; s=arc-20160816; b=DR9ByRfhBB2a+R2Wk2l+CP7mlJZlwWnrjavroSLGh53ygnkFiWRFVe/wqhBQE5hsdd eh/Zhiypjr6DTdUtoyde0kieSwQk/Q/ND1K/6oGp2kSAxKQ4D+IHxcpyYF/mXM13euA+ I5AvuDx6ed0D0mxaTvqh8HS2dEmHA8mwpZJswHnAzhvkoDbIaCNmexs+6TZciE7Eq/29 dyINnJPqhGmh8E5FFanJbvwZtD6ePgNA6LJ7ThQI3B0RMTSW/LRCHOfBu1jeW+BuqrrB E5tnc8o1VSp+CpMkJ5U9aCmvizCBa7CVc6j9fc1bEehhYSsiRVbF/62yWI8AgzqWHAl4 V9sg== 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 :message-id:date:subject:cc:to:from; bh=wdVusEjK9OZyb/2gLlqZLiiYHDX2czHduX2fEeB+Rfk=; b=G4jSyMxMFfQ3w88gsMmZ3GSsgF7Izo8WR/zNQIz2GLz32VG1v2oq/UUBSAaGR+DXGk HpXeKe6ce05qU6jVu2xM98Ywdo3H6xfwy1mB9Wa+pyUFTRxfoNbwWBtala5ag05uVc0Z bfd5JA0GnQ36ggsvrC3DqBqke5i/Ysr/AOuHOuSjHeZW+sCjpe3cTNmCWCdlOKG504Z/ A81vgNxZNqEEyHCiZA3qyy0gg3cxGy8T6seyquROpx5FPbW+rG5MvGzoFPv4649K/mbP W75ez+LI8gENz3U+Ocj0QiJ0JEBTwYNWaSH/PU0EzYuTx8wF5c07s42HVf4BC1v4v4+5 MQcA== 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 b4-20020a170902d50400b001afd30b8fa4si3412125plg.333.2023.05.28.23.58.15; Sun, 28 May 2023 23:58:27 -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 S230348AbjE2GvW (ORCPT + 99 others); Mon, 29 May 2023 02:51:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbjE2GvU (ORCPT ); Mon, 29 May 2023 02:51:20 -0400 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E6CC90; Sun, 28 May 2023 23:51:19 -0700 (PDT) Received: by mail-pl1-f194.google.com with SMTP id d9443c01a7336-1ae3fe67980so27110855ad.3; Sun, 28 May 2023 23:51:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685343078; x=1687935078; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wdVusEjK9OZyb/2gLlqZLiiYHDX2czHduX2fEeB+Rfk=; b=aQ5cyWPJu//ze3yjXo++2SitqSa25DE/NPJSQ5bF+Ol51Za3ak9pBNl8wiwdkTKUWB CzW2BYsmMsJrtwq6eOk4LjmOi51YANWk0dcGJAxCYSBw7rCt0DyZMZaEX41G8O6y/Onj d1il2j4F6BGe9XIRXdKxYMBSRrb3sH5uG2D98nlP9d8y7VTOFcTkPbWEels5jndezz07 QGyL8Mnez8DcnwnhU4bPocDGL8WoDYMJmPoCEb8EzNDoYGWvQUpdEhOR+I5E8eAD4cLZ 7RO9jlQICAYlv4eBHtC7naXNmYQmyDDBlgaFNaG5qvzkcbkwiETRYfecwPRWVa/JYu03 uRFw== X-Gm-Message-State: AC+VfDzkj4E4rAwlbM2zVOvHhxPyXnZFNB3bllqy0oSQi3I10okOxAJ8 Z0ggX9I2pRLEddjBOmakI43BUKEwgPk9q4Zw1g== X-Received: by 2002:a17:902:cec4:b0:1af:b9ed:1677 with SMTP id d4-20020a170902cec400b001afb9ed1677mr12388799plg.2.1685343078392; Sun, 28 May 2023 23:51:18 -0700 (PDT) Received: from localhost.localdomain ([116.128.244.169]) by smtp.gmail.com with ESMTPSA id u7-20020a17090282c700b001ab2a0733aasm7318319plz.39.2023.05.28.23.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 May 2023 23:51:17 -0700 (PDT) From: sunliming To: rostedt@goodmis.org, mhiramat@kernel.org, beaub@linux.microsoft.com Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, sunliming Subject: [PATCH] tracing/user_events: Handle matching arguments that is null from dyn_events Date: Mon, 29 May 2023 14:51:10 +0800 Message-Id: <20230529065110.303440-1-sunliming@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1767210753534840335?= X-GMAIL-MSGID: =?utf-8?q?1767210753534840335?= 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. Signed-off-by: sunliming Acked-by: Masami Hiramatsu (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 e90161294698..0d91dac206ff 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -1712,6 +1712,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; }