From: Jiri Olsa <jolsa@kernel.org>
To: linux-rt-users@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Juri Lelli <juri.lelli@redhat.com>,
Sebastian Sewior <bigeasy@linutronix.de>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>
Subject: [PATCH] tracing: Fix trace entry and trace common fields for preempt_lazy_count
Date: Fri, 21 Feb 2020 16:35:41 +0100 [thread overview]
Message-ID: <20200221153541.681468-1-jolsa@kernel.org> (raw)
When commit 65fd07df3588 added preempt_lazy_count into 'struct trace_entry'
it did not add 4 bytes padding. Also we need to update the common fields
for tracepoint, otherwise some tools (bpftrace) stop working due to missing
common fields.
Fixes: 65fd07df3588 ("x86: Support for lazy preemption")
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
include/linux/trace_events.h | 2 ++
kernel/trace/trace_events.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index f3b1ef07e4a5..51a3f5188923 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -65,6 +65,8 @@ struct trace_entry {
unsigned short migrate_disable;
unsigned short padding;
unsigned char preempt_lazy_count;
+ unsigned char padding1;
+ unsigned short padding2;
};
#define TRACE_EVENT_TYPE_MAX \
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index accaae59a762..1fe37b7aeaff 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -183,6 +183,9 @@ static int trace_define_common_fields(void)
__common_field(int, pid);
__common_field(unsigned short, migrate_disable);
__common_field(unsigned short, padding);
+ __common_field(unsigned char, preempt_lazy_count);
+ __common_field(unsigned char, padding1);
+ __common_field(unsigned short, padding2);
return ret;
}
--
2.24.1
next reply other threads:[~2020-02-21 15:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-21 15:35 Jiri Olsa [this message]
2020-02-21 15:49 ` [PATCH] tracing: Fix trace entry and trace common fields for preempt_lazy_count Steven Rostedt
2020-02-21 16:10 ` Jiri Olsa
2020-02-21 16:21 ` Steven Rostedt
2020-02-21 16:29 ` Jiri Olsa
2020-02-21 16:50 ` Steven Rostedt
2020-02-21 16:37 ` Sebastian Andrzej Siewior
2020-02-21 17:44 ` [PATCH RT] tracing: make preempt_lazy and migrate_disable counter smaller Sebastian Andrzej Siewior
2020-02-21 19:51 ` Steven Rostedt
2020-02-21 20:20 ` Sebastian Andrzej Siewior
2020-02-21 20:49 ` Jiri Olsa
2020-02-24 10:01 ` Sebastian Andrzej Siewior
2020-02-24 11:54 ` Jiri Olsa
2020-02-24 17:01 ` [PATCH RT v2] " Sebastian Andrzej Siewior
2020-03-09 12:30 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200221153541.681468-1-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=acme@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=juri.lelli@redhat.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).