From: Steven Rostedt <rostedt@goodmis.org>
To: John Sperbeck <jsperbeck@google.com>
Cc: wsa@the-dreams.de, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org, mingo@redhat.com
Subject: Re: [PATCH v2] i2c: core-smbus: don't trace smbus_reply data on errors
Date: Mon, 11 Feb 2019 09:24:17 -0500 [thread overview]
Message-ID: <20190211092417.7f211ee0@gandalf.local.home> (raw)
In-Reply-To: <20190211034021.242932-1-jsperbeck@google.com>
On Sun, 10 Feb 2019 19:40:21 -0800
John Sperbeck <jsperbeck@google.com> wrote:
> If an smbus transfer fails, there's no guarantee that the output
> buffer was written. So, avoid trying to show the output buffer when
> tracing after an error. This was 'mostly harmless', but would trip
> up kasan checking if left-over cruft in byte 0 is a large length,
> causing us to read from unwritten memory.
This looks fine to me, but I'm not sure how the i2c maintainers feel,
but I always require that a new patch version starts a new thread, and
not be part of a older thread release (causes these patches to be
hidden from those that read patches in threading mode).
-- Steve
>
> Signed-off-by: John Sperbeck <jsperbeck@google.com>
> ---
> drivers/i2c/i2c-core-smbus.c | 2 +-
> include/trace/events/smbus.h | 6 +++---
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core-smbus.c b/drivers/i2c/i2c-core-smbus.c
> index 9cd66cabb84f..132119112596 100644
> --- a/drivers/i2c/i2c-core-smbus.c
> +++ b/drivers/i2c/i2c-core-smbus.c
> @@ -585,7 +585,7 @@ s32 __i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
> trace:
> /* If enabled, the reply tracepoint is conditional on read_write. */
> trace_smbus_reply(adapter, addr, flags, read_write,
> - command, protocol, data);
> + command, protocol, data, res);
> trace_smbus_result(adapter, addr, flags, read_write,
> command, protocol, res);
>
> diff --git a/include/trace/events/smbus.h b/include/trace/events/smbus.h
> index d2fb6e1d3e10..a4892a187842 100644
> --- a/include/trace/events/smbus.h
> +++ b/include/trace/events/smbus.h
> @@ -138,9 +138,9 @@ TRACE_EVENT_CONDITION(smbus_reply,
> TP_PROTO(const struct i2c_adapter *adap,
> u16 addr, unsigned short flags,
> char read_write, u8 command, int protocol,
> - const union i2c_smbus_data *data),
> - TP_ARGS(adap, addr, flags, read_write, command, protocol, data),
> - TP_CONDITION(read_write == I2C_SMBUS_READ),
> + const union i2c_smbus_data *data, int res),
> + TP_ARGS(adap, addr, flags, read_write, command, protocol, data, res),
> + TP_CONDITION(res >= 0 && read_write == I2C_SMBUS_READ),
> TP_STRUCT__entry(
> __field(int, adapter_nr )
> __field(__u16, addr )
next prev parent reply other threads:[~2019-02-11 16:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 0:42 [PATCH] i2c: core-smbus: don't trace smbus_reply data on errors John Sperbeck
2019-01-04 2:49 ` Steven Rostedt
2019-02-05 12:13 ` Wolfram Sang
2019-02-05 17:19 ` John Sperbeck
2019-02-05 19:08 ` Wolfram Sang
2019-02-11 3:40 ` [PATCH v2] " John Sperbeck
2019-02-11 14:24 ` Steven Rostedt [this message]
2019-02-11 21:43 ` John Sperbeck
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=20190211092417.7f211ee0@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=jsperbeck@google.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=wsa@the-dreams.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).