Message ID | 20221120201222.773967768@goodmis.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1255777wrr; Sun, 20 Nov 2022 12:29:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf5N2tP02/xbLUwL+/kgBAtONHoiN0iywG5T6QREyQ6y6UgjExmdHhdtPcporaQiDGpxu1cY X-Received: by 2002:a17:90a:9706:b0:218:7ccd:d487 with SMTP id x6-20020a17090a970600b002187ccdd487mr14660470pjo.18.1668976167384; Sun, 20 Nov 2022 12:29:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668976167; cv=none; d=google.com; s=arc-20160816; b=h58kmDxX1d7XdfZT5WAYVWAIGkYcAw35D/PCUZzaC/WO3MbdlXYXlKDnD3iRCm/jj4 IPhk5JG0S0FNwHqxdiAGqq0UnwXR7aTjDHhNMRYpnc/V6e9BEmIMe1rOqC4wWwqUC9F1 4FoI+wDn67Unsxg7dVqIJUYE5vRH1zFgpr304klaENU5kFChuIyInynYjOGzq4ENF4Db ccEcALigLT+QELnos5I+S3mfMNav42FY/rrVjVgdegFWBTfL/eN7dAWcwsXHd3fEyczF rDu1DCn5YDqPG47/IYj7jtuJt/WRpl/EyxGXF/WYF4iF9dUm1wTN0zHJ7FFTV1qo4qYo 1kxg== 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=RHfle7F4zj03HufvWsnK1FYEADm1NrT1e1Tvi6DA3ns=; b=RtbP2NOY1WWCj6/2MlTozGdvr4YomsImzxLRnEBIqfq52oKoSiRtw2YYtWkxFgTFab b5X9KKxxEHcTC1D7RGjQqFh7DLQipmbekSiO2Bs//vyvl1XVJxx4MNQG0ueY5pH9sX58 fP8b6RrUAIlbE2RC3Cr3l2AjC1TAx2SEVKoQfwesSILNzQXiy1/8guxOaEHJGOcSwWAi hh84s2IxDxyFyjpabL3KXZLHD7MgWrhjkiCrEBJBixp1J7U1Zh50bxo4JWWWBLjwQFOv WYwLlwdExt/9omze3b+LV4VLepJuYSWqO4LoE5QtuR8sZycGmuF9zLYZzaVW8JJ6SX4u NOHw== 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 d17-20020aa78691000000b0056d097ca7efsi8645939pfo.37.2022.11.20.12.29.04; Sun, 20 Nov 2022 12:29:27 -0800 (PST) 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 S229721AbiKTUMg (ORCPT <rfc822;leviz.kernel.dev@gmail.com> + 99 others); Sun, 20 Nov 2022 15:12:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbiKTUM3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 20 Nov 2022 15:12:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EA04B6E for <linux-kernel@vger.kernel.org>; Sun, 20 Nov 2022 12:12:25 -0800 (PST) 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 25D9160D2B for <linux-kernel@vger.kernel.org>; Sun, 20 Nov 2022 20:12:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6E67C4314B; Sun, 20 Nov 2022 20:12:23 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from <rostedt@goodmis.org>) id 1owqfu-00DiZ1-2v; Sun, 20 Nov 2022 15:12:22 -0500 Message-ID: <20221120201222.773967768@goodmis.org> User-Agent: quilt/0.66 Date: Sun, 20 Nov 2022 15:12:03 -0500 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Rafael Mendonca <rafaelmendsr@gmail.com> Subject: [for-linus][PATCH 7/7] tracing/eprobe: Fix eprobe filter to make a filter correctly References: <20221120201156.868430827@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750048353417605737?= X-GMAIL-MSGID: =?utf-8?q?1750048353417605737?= |
Series |
probes: Fixes for 6.1
|
|
Commit Message
Steven Rostedt
Nov. 20, 2022, 8:12 p.m. UTC
From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org> Since the eprobe filter was defined based on the eprobe's trace event itself, it doesn't work correctly. Use the original trace event of the eprobe when making the filter so that the filter works correctly. Without this fix: # echo 'e syscalls/sys_enter_openat \ flags_rename=$flags:u32 if flags < 1000' >> dynamic_events # echo 1 > events/eprobes/sys_enter_openat/enable [ 114.551550] event trace: Could not enable event sys_enter_openat -bash: echo: write error: Invalid argument With this fix: # echo 'e syscalls/sys_enter_openat \ flags_rename=$flags:u32 if flags < 1000' >> dynamic_events # echo 1 > events/eprobes/sys_enter_openat/enable # tail trace cat-241 [000] ...1. 266.498449: sys_enter_openat: (syscalls.sys_enter_openat) flags_rename=0 cat-242 [000] ...1. 266.977640: sys_enter_openat: (syscalls.sys_enter_openat) flags_rename=0 Link: https://lore.kernel.org/all/166823166395.1385292.8931770640212414483.stgit@devnote3/ Fixes: 752be5c5c910 ("tracing/eprobe: Add eprobe filter support") Reported-by: Rafael Mendonca <rafaelmendsr@gmail.com> Tested-by: Rafael Mendonca <rafaelmendsr@gmail.com> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> --- kernel/trace/trace_eprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c index e888446d80fa..123d2c0a6b68 100644 --- a/kernel/trace/trace_eprobe.c +++ b/kernel/trace/trace_eprobe.c @@ -643,7 +643,7 @@ new_eprobe_trigger(struct trace_eprobe *ep, struct trace_event_file *file) INIT_LIST_HEAD(&trigger->list); if (ep->filter_str) { - ret = create_event_filter(file->tr, file->event_call, + ret = create_event_filter(file->tr, ep->event, ep->filter_str, false, &filter); if (ret) goto error;