From: Steven Rostedt <rostedt@goodmis.org>
To: Chuck Lever III <chuck.lever@oracle.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: runtime warning after merge of the cel-fixes tree
Date: Thu, 7 Apr 2022 11:42:41 -0400 [thread overview]
Message-ID: <20220407114241.0c52b8f0@gandalf.local.home> (raw)
In-Reply-To: <F1B98786-A0C4-4907-9B44-7D13050237F2@oracle.com>
On Thu, 7 Apr 2022 15:35:24 +0000
Chuck Lever III <chuck.lever@oracle.com> wrote:
> > --- a/kernel/trace/trace_events.c
> > +++ b/kernel/trace/trace_events.c
> > @@ -392,8 +392,9 @@ static void test_event_printk(struct trace_event_call *call)
> > if (!(dereference_flags & (1ULL << arg)))
> > goto next_arg;
> >
> > - /* Check for __get_sockaddr */;
> > - if (str_has_prefix(fmt + i, "__get_sockaddr(")) {
> > + /* Check for __get_sockaddr or __get_dynamic_array */;
> > + if (str_has_prefix(fmt + i, "__get_sockaddr(") ||
> > + str_has_prefix(fmt + i, "__get_dynamic_array(")) {
> > dereference_flags &= ~(1ULL << arg);
> > goto next_arg;
> > }
>
> That looks reasonable for present and future kernels.
Actually, I found an issue with the above that will not fix it, but the fix
to that is not that difficult (currently testing it this time).
>
> We're looking for a solution that can be back-ported to stable,
> however, because the patch Mr. Rothwell had to revert is meant
> to address a NULL pointer deref that was introduced several years
> ago. (Otherwise I would have just used __get_sockaddr() and put
> my pencil down).
I can make a stable version of this patch, as __get_dynamic_array() has
been around for a long time. We could even keep the check for
"__get_sock_addr()" even though it does not exist in older kernels, but
this is just a string check, so that doesn't matter.
>
> The simplest option is to take a brute-force approach and
> convert the sockaddr to a presentation address with an snprintf()
> call in the TP_fast_assign() arm of the tracepoints. Allow that
> to be carried into -stable as needed; then in v5.19 apply a
> clean-up that converts that mess into a proper __get_sockaddr().
>
> That way, it stays my issue to address without needing to
> co-ordinate with fixes in other areas.
This change makes the tracing system more robust, which means it's not just
changing to solve an issue with your code. I'm happy to get this working
and backported.
-- Steve
next prev parent reply other threads:[~2022-04-07 15:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-07 4:45 linux-next: runtime warning after merge of the cel-fixes tree Stephen Rothwell
2022-04-07 13:48 ` Chuck Lever III
2022-04-07 14:54 ` Steven Rostedt
2022-04-07 15:13 ` Steven Rostedt
2022-04-07 15:35 ` Chuck Lever III
2022-04-07 15:42 ` Steven Rostedt [this message]
2022-04-07 15:50 ` Steven Rostedt
2022-04-07 16:05 ` Steven Rostedt
2022-04-07 16:04 ` Chuck Lever III
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=20220407114241.0c52b8f0@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=chuck.lever@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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