From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752260AbbDARGl (ORCPT ); Wed, 1 Apr 2015 13:06:41 -0400 Received: from smtprelay0053.hostedemail.com ([216.40.44.53]:56333 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750924AbbDARGk (ORCPT ); Wed, 1 Apr 2015 13:06:40 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 40,2.5,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:982:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1535:1544:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3355:3622:3865:3866:3867:3868:3870:3871:3872:3874:4321:4605:5007:6119:6261:7875:7903:7904:8660:9592:10011:10848:10967:11026:11232:11473:11658:11914:12043:12296:12438:12517:12519:12555:12663:12740:13148:13161:13229:13230:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:1:0 X-HE-Tag: shame26_911145aacd94d X-Filterd-Recvd-Size: 5155 Date: Wed, 1 Apr 2015 13:06:35 -0400 From: Steven Rostedt To: Cornelia Huck Cc: LKML , Christian Borntraeger , David Hildenbrand , Marcelo Tosatti , Xenia Ragiadakou , Sarah Sharp , Mark Brown Subject: Re: [RFC][PATCH] tracing: Replace '-' with '_' in event system names Message-ID: <20150401130635.357579fe@gandalf.local.home> In-Reply-To: <20150401123657.29d01802.cornelia.huck@de.ibm.com> References: <20150331231802.23527931@grimm.local.home> <20150401123657.29d01802.cornelia.huck@de.ibm.com> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 1 Apr 2015 12:36:57 +0200 Cornelia Huck wrote: > The only direct dependency for kvm-s390 I'm aware of is in > perf/tests/parse-events.c, added because parsing an event with '-' in > the name was broken. > > Otherwise, I'm not aware of things that should break, excluding local > scripts and so on of course. I don't like the fact that this changes what userspace sees. This is the work around that I'm leaning towards: -- Steve diff --git a/arch/s390/kvm/trace-s390.h b/arch/s390/kvm/trace-s390.h index 653a7ec09ef5..707a3e08639f 100644 --- a/arch/s390/kvm/trace-s390.h +++ b/arch/s390/kvm/trace-s390.h @@ -10,6 +10,13 @@ #define TRACE_INCLUDE_FILE trace-s390 /* + * The TRACE_SYSTEM_VAR defaults to TRACE_SYSTEM, but must be a + * legitimate C variable. It is not exported to user space. + */ +#undef TRACE_SYSTEM_VAR +#define TRACE_SYSTEM_VAR trace_s390 + +/* * Trace point for the creation of the kvm instance. */ TRACE_EVENT(kvm_s390_create_vm, diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h index dde3959b7a33..f44be8293217 100644 --- a/drivers/usb/host/xhci-trace.h +++ b/drivers/usb/host/xhci-trace.h @@ -14,6 +14,13 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM xhci-hcd +/* + * The TRACE_SYSTEM_VAR defaults to TRACE_SYSTEM, but must be a + * legitimate C variable. It is not exported to user space. + */ +#undef TRACE_SYSTEM_VAR +#define TRACE_SYSTEM_VAR xhci_hcd + #if !defined(__XHCI_TRACE_H) || defined(TRACE_HEADER_MULTI_READ) #define __XHCI_TRACE_H diff --git a/include/trace/events/intel-sst.h b/include/trace/events/intel-sst.h index 76c72d3f1902..a4705d7e549c 100644 --- a/include/trace/events/intel-sst.h +++ b/include/trace/events/intel-sst.h @@ -1,6 +1,13 @@ #undef TRACE_SYSTEM #define TRACE_SYSTEM intel-sst +/* + * The TRACE_SYSTEM_VAR defaults to TRACE_SYSTEM, but must be a + * legitimate C variable. It is not exported to user space. + */ +#undef TRACE_SYSTEM_VAR +#define TRACE_SYSTEM_VAR intel_sst + #if !defined(_TRACE_INTEL_SST_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_INTEL_SST_H diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 708e2caf8a36..e6c8ed5f6a0c 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -18,11 +18,17 @@ #include +#ifndef TRACE_SYSTEM_VAR +#define TRACE_SYSTEM_VAR TRACE_SYSTEM +#endif + #define __app__(x, y) str__##x##y #define __app(x, y) __app__(x, y) +#define TRACE_SYSTEM_STRING __app(TRACE_SYSTEM_VAR,__trace_system_name) + #define TRACE_MAKE_SYSTEM_STR() \ - static const char __app(TRACE_SYSTEM,__trace_system_name)[] = \ + static const char TRACE_SYSTEM_STRING[] = \ __stringify(TRACE_SYSTEM) TRACE_MAKE_SYSTEM_STR(); @@ -32,7 +38,7 @@ TRACE_MAKE_SYSTEM_STR(); static struct trace_enum_map __used __initdata \ __##TRACE_SYSTEM##_##a = \ { \ - .system = __app(TRACE_SYSTEM,__trace_system_name), \ + .system = TRACE_SYSTEM_STRING, \ .enum_string = #a, \ .enum_value = a \ }; \ @@ -127,7 +133,6 @@ TRACE_MAKE_SYSTEM_STR(); #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) - /* * Stage 2 of the trace events. * @@ -717,7 +722,7 @@ static inline void ftrace_test_probe_##call(void) \ _TRACE_PERF_PROTO(call, PARAMS(proto)); \ static char print_fmt_##call[] = print; \ static struct ftrace_event_class __used __refdata event_class_##call = { \ - .system = __app(TRACE_SYSTEM,__trace_system_name), \ + .system = TRACE_SYSTEM_STRING, \ .define_fields = ftrace_define_fields_##call, \ .fields = LIST_HEAD_INIT(event_class_##call.fields),\ .raw_init = trace_event_raw_init, \ @@ -760,6 +765,7 @@ __attribute__((section("_ftrace_events"))) *__event_##call = &event_##call #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) +#undef TRACE_SYSTEM_VAR #ifdef CONFIG_PERF_EVENTS