From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: Re: [patch V2 22/29] tracing: Make ftrace_trace_userstack() static and conditional Date: Fri, 19 Apr 2019 09:28:23 -0400 Message-ID: <20190419092823.094a6061@gandalf.local.home> References: <20190418084119.056416939@linutronix.de> <20190418084255.088813838@linutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190418084255.088813838@linutronix.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Thomas Gleixner 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 , Josef Bacik , Mike Rapoport , Andy Lutomirski , Josh Poimboeuf , David Sterba , Dmitry Vyukov List-Id: linux-arch.vger.kernel.org T24gVGh1LCAxOCBBcHIgMjAxOSAxMDo0MTo0MSArMDIwMApUaG9tYXMgR2xlaXhuZXIgPHRnbHhA bGludXRyb25peC5kZT4gd3JvdGU6Cgo+IEl0J3Mgb25seSB1c2VkIGluIHRyYWNlLmMgYW5kIHRo ZXJlIGlzIGFic29sdXRlbHkgbm8gcG9pbnQgaW4gY29tcGlsaW5nIGl0Cj4gaW4gd2hlbiB1c2Vy IHNwYWNlIHN0YWNrIHRyYWNlcyBhcmUgbm90IHN1cHBvcnRlZC4KPiAKPiBTaWduZWQtb2ZmLWJ5 OiBUaG9tYXMgR2xlaXhuZXIgPHRnbHhAbGludXRyb25peC5kZT4KPiBDYzogU3RldmVuIFJvc3Rl ZHQgPHJvc3RlZHRAZ29vZG1pcy5vcmc+CgpGdW5ueSwgdGhlc2Ugd2VyZSBtb3ZlZCBvdXQgdG8g Z2xvYmFsIGZ1bmN0aW9ucyBhbG9uZyB3aXRoIHRoZQpmdHJhY2VfdHJhY2Vfc3RhY2soKSBidXQg SSBndWVzcyB0aGV5IHdlcmUgbmV2ZXIgdXNlZC4KClRoaXMgYmFzaWNhbGx5IGp1c3QgZG9lcyBh IHBhcnRpYWwgcmV2ZXJ0IG9mOgoKIGMwYTBkMGQzZjY1MjggKCJ0cmFjaW5nL2NvcmU6IE1ha2Ug dGhlIHN0YWNrIGVudHJ5IGhlbHBlcnMgZ2xvYmFsIikKCgo+IC0tLQo+ICBrZXJuZWwvdHJhY2Uv dHJhY2UuYyB8ICAgMTQgKysrKysrKystLS0tLS0KPiAga2VybmVsL3RyYWNlL3RyYWNlLmggfCAg ICA4IC0tLS0tLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCAxNCBkZWxl dGlvbnMoLSkKPiAKPiAtLS0gYS9rZXJuZWwvdHJhY2UvdHJhY2UuYwo+ICsrKyBiL2tlcm5lbC90 cmFjZS90cmFjZS5jCj4gQEAgLTE1OSw2ICsxNTksOCBAQCBzdGF0aWMgdW5pb24gdHJhY2VfZXZh bF9tYXBfaXRlbSAqdHJhY2VfCj4gICNlbmRpZiAvKiBDT05GSUdfVFJBQ0VfRVZBTF9NQVBfRklM RSAqLwo+ICAKPiAgc3RhdGljIGludCB0cmFjaW5nX3NldF90cmFjZXIoc3RydWN0IHRyYWNlX2Fy cmF5ICp0ciwgY29uc3QgY2hhciAqYnVmKTsKPiArc3RhdGljIHZvaWQgZnRyYWNlX3RyYWNlX3Vz ZXJzdGFjayhzdHJ1Y3QgcmluZ19idWZmZXIgKmJ1ZmZlciwKPiArCQkJCSAgIHVuc2lnbmVkIGxv bmcgZmxhZ3MsIGludCBwYyk7Cj4gIAo+ICAjZGVmaW5lIE1BWF9UUkFDRVJfU0laRQkJMTAwCj4g IHN0YXRpYyBjaGFyIGJvb3R1cF90cmFjZXJfYnVmW01BWF9UUkFDRVJfU0laRV0gX19pbml0ZGF0 YTsKPiBAQCAtMjkwNSw5ICsyOTA3LDEwIEBAIHZvaWQgdHJhY2VfZHVtcF9zdGFjayhpbnQgc2tp cCkKPiAgfQo+ICBFWFBPUlRfU1lNQk9MX0dQTCh0cmFjZV9kdW1wX3N0YWNrKTsKPiAgCj4gKyNp ZmRlZiBDT05GSUdfVVNFUl9TVEFDS1RSQUNFX1NVUFBPUlQKPiAgc3RhdGljIERFRklORV9QRVJf Q1BVKGludCwgdXNlcl9zdGFja19jb3VudCk7Cj4gIAo+IC12b2lkCj4gK3N0YXRpYyB2b2lkCj4g IGZ0cmFjZV90cmFjZV91c2Vyc3RhY2soc3RydWN0IHJpbmdfYnVmZmVyICpidWZmZXIsIHVuc2ln bmVkIGxvbmcgZmxhZ3MsIGludCBwYykKPiAgewo+ICAJc3RydWN0IHRyYWNlX2V2ZW50X2NhbGwg KmNhbGwgPSAmZXZlbnRfdXNlcl9zdGFjazsKPiBAQCAtMjk1OCwxMyArMjk2MSwxMiBAQCBmdHJh Y2VfdHJhY2VfdXNlcnN0YWNrKHN0cnVjdCByaW5nX2J1ZmZlCj4gICBvdXQ6Cj4gIAlwcmVlbXB0 X2VuYWJsZSgpOwo+ICB9Cj4gLQo+IC0jaWZkZWYgVU5VU0VECgpTdHJhbmdlLCBJIG5ldmVyIGtu ZXcgYWJvdXQgdGhpcyBpZmRlZi4gSSB3b3VsZCBoYXZlIG51a2VkIGl0IHdoZW4gSQpzYXcgaXQu CgpBbnl3YXksCgpSZXZpZXdlZC1ieTogU3RldmVuIFJvc3RlZHQgKFZNd2FyZSkgPHJvc3RlZHRA Z29vZG1pcy5vcmc+CgotLSBTdGV2ZQoKCj4gLXN0YXRpYyB2b2lkIF9fdHJhY2VfdXNlcnN0YWNr KHN0cnVjdCB0cmFjZV9hcnJheSAqdHIsIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCj4gKyNlbHNlIC8q IENPTkZJR19VU0VSX1NUQUNLVFJBQ0VfU1VQUE9SVCAqLwo+ICtzdGF0aWMgdm9pZCBmdHJhY2Vf dHJhY2VfdXNlcnN0YWNrKHN0cnVjdCByaW5nX2J1ZmZlciAqYnVmZmVyLAo+ICsJCQkJICAgdW5z aWduZWQgbG9uZyBmbGFncywgaW50IHBjKQo+ICB7Cj4gLQlmdHJhY2VfdHJhY2VfdXNlcnN0YWNr KHRyLCBmbGFncywgcHJlZW1wdF9jb3VudCgpKTsKPiAgfQo+IC0jZW5kaWYgLyogVU5VU0VEICov Cj4gKyNlbmRpZiAvKiAhQ09ORklHX1VTRVJfU1RBQ0tUUkFDRV9TVVBQT1JUICovCj4gIAo+ICAj ZW5kaWYgLyogQ09ORklHX1NUQUNLVFJBQ0UgKi8KPiAgCj4gLS0tIGEva2VybmVsL3RyYWNlL3Ry YWNlLmgKPiArKysgYi9rZXJuZWwvdHJhY2UvdHJhY2UuaAo+IEBAIC03ODIsMTcgKzc4Miw5IEBA IHZvaWQgdXBkYXRlX21heF90cl9zaW5nbGUoc3RydWN0IHRyYWNlX2EKPiAgI2VuZGlmIC8qIENP TkZJR19UUkFDRVJfTUFYX1RSQUNFICovCj4gIAo+ICAjaWZkZWYgQ09ORklHX1NUQUNLVFJBQ0UK PiAtdm9pZCBmdHJhY2VfdHJhY2VfdXNlcnN0YWNrKHN0cnVjdCByaW5nX2J1ZmZlciAqYnVmZmVy LCB1bnNpZ25lZCBsb25nIGZsYWdzLAo+IC0JCQkgICAgaW50IHBjKTsKPiAtCj4gIHZvaWQgX190 cmFjZV9zdGFjayhzdHJ1Y3QgdHJhY2VfYXJyYXkgKnRyLCB1bnNpZ25lZCBsb25nIGZsYWdzLCBp bnQgc2tpcCwKPiAgCQkgICBpbnQgcGMpOwo+ICAjZWxzZQo+IC1zdGF0aWMgaW5saW5lIHZvaWQg ZnRyYWNlX3RyYWNlX3VzZXJzdGFjayhzdHJ1Y3QgcmluZ19idWZmZXIgKmJ1ZmZlciwKPiAtCQkJ CQkgIHVuc2lnbmVkIGxvbmcgZmxhZ3MsIGludCBwYykKPiAtewo+IC19Cj4gLQo+ICBzdGF0aWMg aW5saW5lIHZvaWQgX190cmFjZV9zdGFjayhzdHJ1Y3QgdHJhY2VfYXJyYXkgKnRyLCB1bnNpZ25l ZCBsb25nIGZsYWdzLAo+ICAJCQkJIGludCBza2lwLCBpbnQgcGMpCj4gIHsKPiAKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5n IGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVk ZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:53896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727533AbfDSS3Q (ORCPT ); Fri, 19 Apr 2019 14:29:16 -0400 Date: Fri, 19 Apr 2019 09:28:23 -0400 From: Steven Rostedt Subject: Re: [patch V2 22/29] tracing: Make ftrace_trace_userstack() static and conditional Message-ID: <20190419092823.094a6061@gandalf.local.home> In-Reply-To: <20190418084255.088813838@linutronix.de> References: <20190418084119.056416939@linutronix.de> <20190418084255.088813838@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: Thomas Gleixner Cc: LKML , Josh Poimboeuf , x86@kernel.org, Andy Lutomirski , Alexander Potapenko , Alexey Dobriyan , Andrew Morton , Pekka Enberg , linux-mm@kvack.org, David Rientjes , Christoph Lameter , Catalin Marinas , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Mike Rapoport , Akinobu Mita , iommu@lists.linux-foundation.org, Robin Murphy , Christoph Hellwig , Marek Szyprowski , Johannes Thumshirn , David Sterba , Chris Mason , Josef Bacik , linux-btrfs@vger.kernel.org, dm-devel@redhat.com, Mike Snitzer , Alasdair Kergon , intel-gfx@lists.freedesktop.org, Joonas Lahtinen , Maarten Lankhorst , dri-devel@lists.freedesktop.org, David Airlie , Jani Nikula , Daniel Vetter , Rodrigo Vivi , linux-arch@vger.kernel.org Message-ID: <20190419132823.ZS9XHJ8TffhLKm4qOyyeNxxBEiCkb7BRYlqNuJYJ8vg@z> On Thu, 18 Apr 2019 10:41:41 +0200 Thomas Gleixner wrote: > 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 Funny, these were moved out to global functions along with the ftrace_trace_stack() but I guess they were never used. This basically just does a partial revert of: c0a0d0d3f6528 ("tracing/core: Make the stack entry helpers global") > --- > 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 Strange, I never knew about this ifdef. I would have nuked it when I saw it. Anyway, Reviewed-by: Steven Rostedt (VMware) -- Steve > -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) > { >