From patchwork Wed Jun 14 22:27:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 105599 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp512105qgd; Wed, 14 Jun 2017 15:27:50 -0700 (PDT) X-Received: by 10.98.43.206 with SMTP id r197mr2062828pfr.202.1497479270723; Wed, 14 Jun 2017 15:27:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497479270; cv=none; d=google.com; s=arc-20160816; b=Nxw2X/DV5xzEl5qCrvgpgWabdyq82VZ4HN2bhkvpdxDJYa4cT4LrfRi52+72U/hN15 a+9a36fbvuJwRfCcjFNfC40s3Zh36dvGCMVB7fJIFdZBXXTXiuYUlF4k2KiHbO41CqQS HWBfus5Xsp3T2JDkkC+CuJScCwvFKxQ65B3RqDJTmTB427egbJsXT6wczjx7ocVELQN2 Obh90Mgs8sTcED17F0vk7z1jcf8IhhJ4bPk/nrfXgq77CfWMZ6ZawMDw5QPy3sSNyb5v PtdiQvrbs6S8PRB4wA5vTdI2AF9l9wQ7tuY5F22EJWG3I4BcfxnztOHpD1OCsB7bzRt3 +V2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=BulRlMTc/fiEUAu1YYc9qhiy8lNl/tT5Xz6dLO9DMNQ=; b=ATBnJumz05Z3M3CKnxCFgBmhP0wquzgory11E46qGgQYCG+ZcJDgTFA9z5szHQ/XIG iWQ+MXI7sm0xkZC2VxrcyV7nan20mno5pUur6d6kcBn8DV4pSwDsHxwaVlFYr8ckpb7P FwYdrZRV+Gcew3nHu2+XQpF2qU6IY3Fy7T5ASxH2jVs6xuxcekOah/EDrhJrpeg6+1dS 1N6DrJVFAER2axFi/WFiFxpzOhfZy+v+Q1dwQOlpmwZsQSHgLUVYshnAstguxEUaRYv9 fY13gFq0PgQdzmR+mf21wa9hKQWX2UjKDOeIIfCJIwSFPhmPaGmINsPXQ9rRHshRHJPS 67bQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si843833pld.242.2017.06.14.15.27.50; Wed, 14 Jun 2017 15:27:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752802AbdFNW1n (ORCPT + 25 others); Wed, 14 Jun 2017 18:27:43 -0400 Received: from foss.arm.com ([217.140.101.70]:39692 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752712AbdFNW1l (ORCPT ); Wed, 14 Jun 2017 18:27:41 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1FB201991; Wed, 14 Jun 2017 15:27:36 -0700 (PDT) Received: from beelzebub.ast.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8B9923F3E1; Wed, 14 Jun 2017 15:27:35 -0700 (PDT) From: Jeremy Linton To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, rostedt@goodmis.org, mingo@redhat.com, rusty@rustcorp.com.au, jeyu@redhat.com, kirill.shutemov@linux.intel.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, jcm@jonmasters.org, clemens@ladisch.de, perex@perex.cz Subject: [PATCH v2 09/13] tracing: define TRACE_DEFINE_SIZEOF() macro to map sizeof's to their values Date: Wed, 14 Jun 2017 17:27:25 -0500 Message-Id: <20170614222729.16521-10-jeremy.linton@arm.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614222729.16521-1-jeremy.linton@arm.com> References: <20170614222729.16521-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Perf has a problem that if sizeof() macros are used within TRACE_EVENT() macro's they end up in userspace as "sizeof(kernel structure)" which cannot properly be parsed. Add a macro which can forward this data through the eval_map for userspace utilization. Signed-off-by: Jeremy Linton --- include/linux/tracepoint.h | 1 + include/trace/trace_events.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) -- 2.9.4 diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index f7b0f55..a26ffbe 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -88,6 +88,7 @@ extern void syscall_unregfunc(void); #define PARAMS(args...) args #define TRACE_DEFINE_ENUM(x) +#define TRACE_DEFINE_SIZEOF(x) #endif /* _LINUX_TRACEPOINT_H */ diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 49cce5f..3976fa1 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -46,6 +46,19 @@ TRACE_MAKE_SYSTEM_STR(); __attribute__((section("_ftrace_eval_map"))) \ *TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a +#undef TRACE_DEFINE_SIZEOF +#define TRACE_DEFINE_SIZEOF(a) \ + static struct trace_eval_map __used __initdata \ + __##TRACE_SYSTEM##_##a = \ + { \ + .system = TRACE_SYSTEM_STRING, \ + .eval_string = "sizeof(" #a ")", \ + .eval_value = sizeof(a) \ + }; \ + static struct trace_eval_map __used \ + __attribute__((section("_ftrace_eval_map"))) \ + *TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a + /* * DECLARE_EVENT_CLASS can be used to add a generic function * handlers for events. That is, if all events have the same @@ -158,6 +171,9 @@ TRACE_MAKE_SYSTEM_STR(); #undef TRACE_DEFINE_ENUM #define TRACE_DEFINE_ENUM(a) +#undef TRACE_DEFINE_SIZEOF +#define TRACE_DEFINE_SIZEOF(a) + #undef __field #define __field(type, item)