From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90EB5C2D0DA for ; Thu, 26 Dec 2019 14:05:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59FD820838 for ; Thu, 26 Dec 2019 14:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577369157; bh=yMBl8XxaxKdvGCY+1+Oua0hhZ/Go8NMOCgUYd9B9UNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oE7HlwYEtnfrIoMzdihgsmZdMozQhfG4rMPyA6TAZrEk6M2baBkH8NaaKj9e1aUF7 RPMbzPSYYNhJ8Aa/8Kh+b1T/A8Btxpk9GYevW6H5Sb3o3LMbxKELqvhkyvzlEryy27 JlQnK+xQK8HZKxGIapvHslqyUF9fRHSKFpUIeey4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726508AbfLZOF5 (ORCPT ); Thu, 26 Dec 2019 09:05:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:51878 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726453AbfLZOF5 (ORCPT ); Thu, 26 Dec 2019 09:05:57 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 12DF720828; Thu, 26 Dec 2019 14:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577369156; bh=yMBl8XxaxKdvGCY+1+Oua0hhZ/Go8NMOCgUYd9B9UNE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MpEHs14iMrx9XIgrnOUTokYdmLRpK9XlDm/Bk3V8RWnsnS8L4gH1DQmxEmgPoTIhJ jqCaTvte6rqJZieGBCCPeuVwi7S2peHJRKMO2FxlBTxTUU3EDHnkmD4vpa5BlAMQAm Ya9pgdAmedAXrqzrRTOmJznRo7rky4P6axKsScwk= From: Masami Hiramatsu To: Steven Rostedt , Frank Rowand Cc: Ingo Molnar , Randy Dunlap , Namhyung Kim , Tim Bird , Jiri Olsa , Arnaldo Carvalho de Melo , Tom Zanussi , Rob Herring , Andrew Morton , Thomas Gleixner , Greg Kroah-Hartman , Alexey Dobriyan , Jonathan Corbet , Linus Torvalds , linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/22] tracing: Apply soft-disabled and filter to tracepoints printk Date: Thu, 26 Dec 2019 23:05:49 +0900 Message-Id: <157736914939.11126.13682942838710986821.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <157736902773.11126.2531161235817081873.stgit@devnote2> References: <157736902773.11126.2531161235817081873.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org Apply soft-disabled and the filter rule of the trace events to the printk output of tracepoints (a.k.a. tp_printk kernel parameter) as same as trace buffer output. Signed-off-by: Masami Hiramatsu --- 0 files changed diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ddb7e7f5fe8d..43f0f255ad66 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2610,6 +2610,7 @@ static DEFINE_MUTEX(tracepoint_printk_mutex); static void output_printk(struct trace_event_buffer *fbuffer) { struct trace_event_call *event_call; + struct trace_event_file *file; struct trace_event *event; unsigned long flags; struct trace_iterator *iter = tracepoint_print_iter; @@ -2623,6 +2624,12 @@ static void output_printk(struct trace_event_buffer *fbuffer) !event_call->event.funcs->trace) return; + file = fbuffer->trace_file; + if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) || + (unlikely(file->flags & EVENT_FILE_FL_FILTERED) && + !filter_match_preds(file->filter, fbuffer->entry))) + return; + event = &fbuffer->trace_file->event_call->event; spin_lock_irqsave(&tracepoint_iter_lock, flags);