From: Steven Rostedt <rostedt@goodmis.org>
To: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Beau Belgrave <beaub@linux.microsoft.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-trace-devel <linux-trace-devel@vger.kernel.org>,
bpf <bpf@vger.kernel.org>, netdev <netdev@vger.kernel.org>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Michal Marek <michal.lkml@markovi.net>,
ndesaulniers <ndesaulniers@google.com>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>
Subject: Re: [PATCH] tracing: do not export user_events uapi
Date: Thu, 31 Mar 2022 13:17:32 -0400 [thread overview]
Message-ID: <20220331131732.5e2305ee@gandalf.local.home> (raw)
In-Reply-To: <602770698.200731.1648742848915.JavaMail.zimbra@efficios.com>
On Thu, 31 Mar 2022 12:07:28 -0400 (EDT)
Mathieu Desnoyers <mathieu.desnoyers@efficios.com> wrote:
> diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
> index 8b3d241a31c2..823d7b09dcba 100644
> --- a/kernel/trace/trace_events_user.c
> +++ b/kernel/trace/trace_events_user.c
> @@ -18,7 +18,7 @@
> #include <linux/tracefs.h>
> #include <linux/types.h>
> #include <linux/uaccess.h>
> -#include <uapi/linux/user_events.h>
> +#include <linux/user_events.h>
> #include "trace.h"
> #include "trace_dynevent.h"
>
> Including <linux/user_events.h> will continue to work even when the header is
> moved to uapi in the future.
Actually, when I thought of this, I was thinking more of:
diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c
index 846c27bc7aef..0f3aa855cf72 100644
--- a/kernel/trace/trace_events_user.c
+++ b/kernel/trace/trace_events_user.c
@@ -18,7 +18,11 @@
#include <linux/tracefs.h>
#include <linux/types.h>
#include <linux/uaccess.h>
+#ifdef CONFIG_COMPILE_TEST
+#include <linux/user_events.h>
+#else
#include <uapi/linux/user_events.h>
+#endif
#include "trace.h"
#include "trace_dynevent.h"
That way, when we take it out of broken state, it will fail to compile, and
remind us to put it back into the uapi directory.
-- Steve
next prev parent reply other threads:[~2022-03-31 17:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 20:17 [PATCH] tracing: do not export user_events uapi Mathieu Desnoyers
2022-03-30 20:21 ` Steven Rostedt
2022-03-31 7:29 ` Masahiro Yamada
2022-03-31 12:13 ` Steven Rostedt
2022-03-31 14:41 ` Masahiro Yamada
2022-03-31 14:48 ` Steven Rostedt
2022-03-31 16:07 ` Mathieu Desnoyers
2022-03-31 17:17 ` Steven Rostedt [this message]
2022-03-31 1:22 ` Masami Hiramatsu
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=20220331131732.5e2305ee@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=alexei.starovoitov@gmail.com \
--cc=beaub@linux.microsoft.com \
--cc=bpf@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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