From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Gleixner Subject: [patch V2 22/29] tracing: Make ftrace_trace_userstack() static and conditional Date: Thu, 18 Apr 2019 10:41:41 +0200 Message-ID: <20190418084255.088813838@linutronix.de> References: <20190418084119.056416939@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: LKML Cc: Mike Snitzer , David Airlie , Catalin Marinas , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Christoph Hellwig , Alasdair Kergon , Marek Szyprowski , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Akinobu Mita , Steven Rostedt , Josef Bacik , Mike Rapoport , Andy Lutomirski , Josh Poimboeuf , David Sterba List-Id: iommu@lists.linux-foundation.org SXQncyBvbmx5IHVzZWQgaW4gdHJhY2UuYyBhbmQgdGhlcmUgaXMgYWJzb2x1dGVseSBubyBwb2lu dCBpbiBjb21waWxpbmcgaXQKaW4gd2hlbiB1c2VyIHNwYWNlIHN0YWNrIHRyYWNlcyBhcmUgbm90 IHN1cHBvcnRlZC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBHbGVpeG5lciA8dGdseEBsaW51dHJv bml4LmRlPgpDYzogU3RldmVuIFJvc3RlZHQgPHJvc3RlZHRAZ29vZG1pcy5vcmc+Ci0tLQoga2Vy bmVsL3RyYWNlL3RyYWNlLmMgfCAgIDE0ICsrKysrKysrLS0tLS0tCiBrZXJuZWwvdHJhY2UvdHJh Y2UuaCB8ICAgIDggLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCi0tLSBhL2tlcm5lbC90cmFjZS90cmFjZS5jCisrKyBiL2tlcm5lbC90 cmFjZS90cmFjZS5jCkBAIC0xNTksNiArMTU5LDggQEAgc3RhdGljIHVuaW9uIHRyYWNlX2V2YWxf bWFwX2l0ZW0gKnRyYWNlXwogI2VuZGlmIC8qIENPTkZJR19UUkFDRV9FVkFMX01BUF9GSUxFICov CiAKIHN0YXRpYyBpbnQgdHJhY2luZ19zZXRfdHJhY2VyKHN0cnVjdCB0cmFjZV9hcnJheSAqdHIs IGNvbnN0IGNoYXIgKmJ1Zik7CitzdGF0aWMgdm9pZCBmdHJhY2VfdHJhY2VfdXNlcnN0YWNrKHN0 cnVjdCByaW5nX2J1ZmZlciAqYnVmZmVyLAorCQkJCSAgIHVuc2lnbmVkIGxvbmcgZmxhZ3MsIGlu dCBwYyk7CiAKICNkZWZpbmUgTUFYX1RSQUNFUl9TSVpFCQkxMDAKIHN0YXRpYyBjaGFyIGJvb3R1 cF90cmFjZXJfYnVmW01BWF9UUkFDRVJfU0laRV0gX19pbml0ZGF0YTsKQEAgLTI5MDUsOSArMjkw NywxMCBAQCB2b2lkIHRyYWNlX2R1bXBfc3RhY2soaW50IHNraXApCiB9CiBFWFBPUlRfU1lNQk9M X0dQTCh0cmFjZV9kdW1wX3N0YWNrKTsKIAorI2lmZGVmIENPTkZJR19VU0VSX1NUQUNLVFJBQ0Vf U1VQUE9SVAogc3RhdGljIERFRklORV9QRVJfQ1BVKGludCwgdXNlcl9zdGFja19jb3VudCk7CiAK LXZvaWQKK3N0YXRpYyB2b2lkCiBmdHJhY2VfdHJhY2VfdXNlcnN0YWNrKHN0cnVjdCByaW5nX2J1 ZmZlciAqYnVmZmVyLCB1bnNpZ25lZCBsb25nIGZsYWdzLCBpbnQgcGMpCiB7CiAJc3RydWN0IHRy YWNlX2V2ZW50X2NhbGwgKmNhbGwgPSAmZXZlbnRfdXNlcl9zdGFjazsKQEAgLTI5NTgsMTMgKzI5 NjEsMTIgQEAgZnRyYWNlX3RyYWNlX3VzZXJzdGFjayhzdHJ1Y3QgcmluZ19idWZmZQogIG91dDoK IAlwcmVlbXB0X2VuYWJsZSgpOwogfQotCi0jaWZkZWYgVU5VU0VECi1zdGF0aWMgdm9pZCBfX3Ry YWNlX3VzZXJzdGFjayhzdHJ1Y3QgdHJhY2VfYXJyYXkgKnRyLCB1bnNpZ25lZCBsb25nIGZsYWdz KQorI2Vsc2UgLyogQ09ORklHX1VTRVJfU1RBQ0tUUkFDRV9TVVBQT1JUICovCitzdGF0aWMgdm9p ZCBmdHJhY2VfdHJhY2VfdXNlcnN0YWNrKHN0cnVjdCByaW5nX2J1ZmZlciAqYnVmZmVyLAorCQkJ CSAgIHVuc2lnbmVkIGxvbmcgZmxhZ3MsIGludCBwYykKIHsKLQlmdHJhY2VfdHJhY2VfdXNlcnN0 YWNrKHRyLCBmbGFncywgcHJlZW1wdF9jb3VudCgpKTsKIH0KLSNlbmRpZiAvKiBVTlVTRUQgKi8K KyNlbmRpZiAvKiAhQ09ORklHX1VTRVJfU1RBQ0tUUkFDRV9TVVBQT1JUICovCiAKICNlbmRpZiAv KiBDT05GSUdfU1RBQ0tUUkFDRSAqLwogCi0tLSBhL2tlcm5lbC90cmFjZS90cmFjZS5oCisrKyBi L2tlcm5lbC90cmFjZS90cmFjZS5oCkBAIC03ODIsMTcgKzc4Miw5IEBAIHZvaWQgdXBkYXRlX21h eF90cl9zaW5nbGUoc3RydWN0IHRyYWNlX2EKICNlbmRpZiAvKiBDT05GSUdfVFJBQ0VSX01BWF9U UkFDRSAqLwogCiAjaWZkZWYgQ09ORklHX1NUQUNLVFJBQ0UKLXZvaWQgZnRyYWNlX3RyYWNlX3Vz ZXJzdGFjayhzdHJ1Y3QgcmluZ19idWZmZXIgKmJ1ZmZlciwgdW5zaWduZWQgbG9uZyBmbGFncywK LQkJCSAgICBpbnQgcGMpOwotCiB2b2lkIF9fdHJhY2Vfc3RhY2soc3RydWN0IHRyYWNlX2FycmF5 ICp0ciwgdW5zaWduZWQgbG9uZyBmbGFncywgaW50IHNraXAsCiAJCSAgIGludCBwYyk7CiAjZWxz ZQotc3RhdGljIGlubGluZSB2b2lkIGZ0cmFjZV90cmFjZV91c2Vyc3RhY2soc3RydWN0IHJpbmdf YnVmZmVyICpidWZmZXIsCi0JCQkJCSAgdW5zaWduZWQgbG9uZyBmbGFncywgaW50IHBjKQotewot fQotCiBzdGF0aWMgaW5saW5lIHZvaWQgX190cmFjZV9zdGFjayhzdHJ1Y3QgdHJhY2VfYXJyYXkg KnRyLCB1bnNpZ25lZCBsb25nIGZsYWdzLAogCQkJCSBpbnQgc2tpcCwgaW50IHBjKQogewoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBt YWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA== 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=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 E099CC10F0E for ; Thu, 18 Apr 2019 09:34:29 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC5A8214DA for ; Thu, 18 Apr 2019 09:34:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC5A8214DA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linutronix.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B70CF1515; Thu, 18 Apr 2019 09:34:27 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id C14B211B0 for ; Thu, 18 Apr 2019 09:34:26 +0000 (UTC) X-Greylist: greylisting inactive for cl@linux.com in SQLgrey-1.7.6 X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from Galois.linutronix.de (Galois.linutronix.de [146.0.238.70]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3F4B9466; Thu, 18 Apr 2019 09:34:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=nanos.tec.linutronix.de) by Galois.linutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1hH30I-0001v7-RI; Thu, 18 Apr 2019 11:06:47 +0200 Message-Id: <20190418084255.088813838@linutronix.de> User-Agent: quilt/0.65 Date: Thu, 18 Apr 2019 10:41:41 +0200 From: Thomas Gleixner To: LKML Subject: [patch V2 22/29] tracing: Make ftrace_trace_userstack() static and conditional References: <20190418084119.056416939@linutronix.de> MIME-Version: 1.0 Cc: Mike Snitzer , David Airlie , Catalin Marinas , Joonas Lahtinen , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, dm-devel@redhat.com, Alexander Potapenko , Christoph Lameter , Christoph Hellwig , Alasdair Kergon , linux-arch@vger.kernel.org, x86@kernel.org, kasan-dev@googlegroups.com, Johannes Thumshirn , Andrey Ryabinin , Alexey Dobriyan , intel-gfx@lists.freedesktop.org, David Rientjes , Maarten Lankhorst , Akinobu Mita , Steven Rostedt , Josef Bacik , Rodrigo Vivi , Mike Rapoport , Jani Nikula , Andy Lutomirski , Josh Poimboeuf , David Sterba , Dmitry Vyukov , Chris Mason , Pekka Enberg , iommu@lists.linux-foundation.org, Daniel Vetter , Andrew Morton , Robin Murphy , linux-btrfs@vger.kernel.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190418084141.RJYzUq5jCeAQ5-B4KZHP60N8bwGXVkdeX4upxWX1CKA@z> It's only used in trace.c and there is absolutely no point in compiling it in when user space stack traces are not supported. Signed-off-by: Thomas Gleixner Cc: Steven Rostedt --- kernel/trace/trace.c | 14 ++++++++------ kernel/trace/trace.h | 8 -------- 2 files changed, 8 insertions(+), 14 deletions(-) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -159,6 +159,8 @@ static union trace_eval_map_item *trace_ #endif /* CONFIG_TRACE_EVAL_MAP_FILE */ static int tracing_set_tracer(struct trace_array *tr, const char *buf); +static void ftrace_trace_userstack(struct ring_buffer *buffer, + unsigned long flags, int pc); #define MAX_TRACER_SIZE 100 static char bootup_tracer_buf[MAX_TRACER_SIZE] __initdata; @@ -2905,9 +2907,10 @@ void trace_dump_stack(int skip) } EXPORT_SYMBOL_GPL(trace_dump_stack); +#ifdef CONFIG_USER_STACKTRACE_SUPPORT static DEFINE_PER_CPU(int, user_stack_count); -void +static void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) { struct trace_event_call *call = &event_user_stack; @@ -2958,13 +2961,12 @@ ftrace_trace_userstack(struct ring_buffe out: preempt_enable(); } - -#ifdef UNUSED -static void __trace_userstack(struct trace_array *tr, unsigned long flags) +#else /* CONFIG_USER_STACKTRACE_SUPPORT */ +static void ftrace_trace_userstack(struct ring_buffer *buffer, + unsigned long flags, int pc) { - ftrace_trace_userstack(tr, flags, preempt_count()); } -#endif /* UNUSED */ +#endif /* !CONFIG_USER_STACKTRACE_SUPPORT */ #endif /* CONFIG_STACKTRACE */ --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -782,17 +782,9 @@ void update_max_tr_single(struct trace_a #endif /* CONFIG_TRACER_MAX_TRACE */ #ifdef CONFIG_STACKTRACE -void ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, - int pc); - void __trace_stack(struct trace_array *tr, unsigned long flags, int skip, int pc); #else -static inline void ftrace_trace_userstack(struct ring_buffer *buffer, - unsigned long flags, int pc) -{ -} - static inline void __trace_stack(struct trace_array *tr, unsigned long flags, int skip, int pc) { _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu