From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org, Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org
Subject: Re: [PATCH 2/2] tracing/blktrace: Fix to allow setting same value
Date: Fri, 17 Aug 2018 01:38:47 +0900 [thread overview]
Message-ID: <20180817013847.85ff26224bfd48d0fca1fd3f@kernel.org> (raw)
In-Reply-To: <20180816103802.08678002@gandalf.local.home>
On Thu, 16 Aug 2018 10:38:02 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Thu, 16 Aug 2018 18:51:15 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > Current trace-enable attribute in sysfs returns an error
> > if user writes the same setting value as current one,
> > e.g.
> >
> > # cat /sys/block/sda/trace/enable
> > 0
> > # echo 0 > /sys/block/sda/trace/enable
> > bash: echo: write error: Invalid argument
> > # echo 1 > /sys/block/sda/trace/enable
> > # echo 1 > /sys/block/sda/trace/enable
> > bash: echo: write error: Device or resource busy
> >
> > But this is not a preferred behavior, it should ignore
> > if new setting is same as current one. This fixes the
> > problem as below.
> >
> > # cat /sys/block/sda/trace/enable
> > 0
> > # echo 0 > /sys/block/sda/trace/enable
> > # echo 1 > /sys/block/sda/trace/enable
> > # echo 1 > /sys/block/sda/trace/enable
> >
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > Cc: Jens Axboe <axboe@kernel.dk>
> > Cc: linux-block@vger.kernel.org
> > ---
> > kernel/trace/blktrace.c | 11 +++++++----
> > 1 file changed, 7 insertions(+), 4 deletions(-)
> >
> > diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> > index 987d9a9ae283..e67db1e8a000 100644
> > --- a/kernel/trace/blktrace.c
> > +++ b/kernel/trace/blktrace.c
> > @@ -1602,11 +1602,11 @@ static int blk_trace_remove_queue(struct request_queue *q)
> > struct blk_trace *bt;
> >
> > bt = xchg(&q->blk_trace, NULL);
> > - if (bt == NULL)
> > - return -EINVAL;
> > + if (bt != NULL) {
> > + put_probe_ref();
> > + blk_trace_free(bt);
> > + }
> >
> > - put_probe_ref();
> > - blk_trace_free(bt);
> > return 0;
> > }
> >
> > @@ -1619,6 +1619,9 @@ static int blk_trace_setup_queue(struct request_queue *q,
> > struct blk_trace *bt = NULL;
> > int ret = -ENOMEM;
> >
> > + if (q->blk_trace)
> > + return 0;
> > +
> > bt = kzalloc(sizeof(*bt), GFP_KERNEL);
> > if (!bt)
> > return -ENOMEM;
>
> Hmm, why not just do this? Does this fix it too?
Ah, yes, but we need to clear "ret" in that case.
Thanks!
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 987d9a9ae283..10b2b9c5fd25 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -1841,6 +1841,8 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev,
> mutex_lock(&q->blk_trace_mutex);
>
> if (attr == &dev_attr_enable) {
> + if (!!value == !!q->blk_trace)
> + goto out_unlock_bdev;
> if (value)
> ret = blk_trace_setup_queue(q, bdev);
> else
>
> -- Steve
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2018-08-16 16:38 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <153441301698.6024.1680500212551396320.stgit@devbox>
2018-08-16 9:51 ` [PATCH 2/2] tracing/blktrace: Fix to allow setting same value Masami Hiramatsu
2018-08-16 14:38 ` Steven Rostedt
2018-08-16 16:38 ` Masami Hiramatsu [this message]
2018-08-16 16:49 ` Steven Rostedt
2018-08-16 17:07 ` 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=20180817013847.85ff26224bfd48d0fca1fd3f@kernel.org \
--to=mhiramat@kernel.org \
--cc=axboe@kernel.dk \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.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;
as well as URLs for NNTP newsgroup(s).