From: Jeff Moyer <jmoyer@redhat.com>
To: Davidlohr Bueso <dave@stgolabs.net>
Cc: Jens Axboe <axboe@kernel.dk>,
Steven Rostedt <rostedt@goodmis.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] blktrace: re-write setting q->blk_trace
Date: Thu, 29 Oct 2015 15:35:54 -0400 [thread overview]
Message-ID: <x49io5p5uxx.fsf@segfault.boston.devel.redhat.com> (raw)
In-Reply-To: <20151029191905.GA7947@linux-uzut.site> (Davidlohr Bueso's message of "Thu, 29 Oct 2015 12:19:05 -0700")
Davidlohr Bueso <dave@stgolabs.net> writes:
>>The patch itself looks ok, but it doesn't seem to apply to a recent
>>kernel tree. It appears as though it is white-space damaged. Would you
>>mind re-sending it?
>
> Hmm sorry about that. I thought I had based it against that day's tip/master.
> Anyway, here is v3 which is against tip/master as of 338e29ba93639138fafb9fb5ba946fd99a512aae.
Thanks.
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
> 8<--------------------------------------------------------------------------------
> From: Davidlohr Bueso <dave@stgolabs.net>
> Date: Thu, 29 Oct 2015 12:13:24 -0700
> Subject: [PATCH -tip v3] blktrace: re-write setting q->blk_trace
>
> This is really about simplifying the double xchg patterns into
> a single cmpxchg, with the same logic. Other than the immediate
> cleanup, there are some subtleties this change deals with:
>
> (i) While the load of the old bt is fully ordered wrt everything,
> ie:
>
> old_bt = xchg(&q->blk_trace, bt); [barrier]
> if (old_bt)
> (void) xchg(&q->blk_trace, old_bt); [barrier]
>
> blk_trace could still be changed between the xchg and the old_bt
> load. Note that this description is merely theoretical and afaict
> very small, but doing everything in a single context with cmpxchg
> closes this potential race.
>
> (ii) Ordering guarantees are obviously kept with cmpxchg.
>
> (iii) Gets rid of the hacky-by-nature (void)xchg pattern.
>
> Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
> ---
> v3: rebased ontop of today's -tip.
> minor changelog addition.
>
> kernel/trace/blktrace.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 90e72a0..e3a2618 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -437,7 +437,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
> struct block_device *bdev,
> struct blk_user_trace_setup *buts)
> {
> - struct blk_trace *old_bt, *bt = NULL;
> + struct blk_trace *bt = NULL;
> struct dentry *dir = NULL;
> int ret;
>
> @@ -519,11 +519,8 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
> bt->trace_state = Blktrace_setup;
>
> ret = -EBUSY;
> - old_bt = xchg(&q->blk_trace, bt);
> - if (old_bt) {
> - (void) xchg(&q->blk_trace, old_bt);
> + if (cmpxchg(&q->blk_trace, NULL, bt))
> goto err;
> - }
>
> if (atomic_inc_return(&blk_probes_ref) == 1)
> blk_register_tracepoints();
> @@ -1481,7 +1478,7 @@ static int blk_trace_remove_queue(struct request_queue *q)
> static int blk_trace_setup_queue(struct request_queue *q,
> struct block_device *bdev)
> {
> - struct blk_trace *old_bt, *bt = NULL;
> + struct blk_trace *bt = NULL;
> int ret = -ENOMEM;
>
> bt = kzalloc(sizeof(*bt), GFP_KERNEL);
> @@ -1497,12 +1494,9 @@ static int blk_trace_setup_queue(struct request_queue *q,
>
> blk_trace_setup_lba(bt, bdev);
>
> - old_bt = xchg(&q->blk_trace, bt);
> - if (old_bt != NULL) {
> - (void)xchg(&q->blk_trace, old_bt);
> - ret = -EBUSY;
> + ret = -EBUSY;
> + if (cmpxchg(&q->blk_trace, NULL, bt))
> goto free_bt;
> - }
>
> if (atomic_inc_return(&blk_probes_ref) == 1)
> blk_register_tracepoints();
> --
> 2.1.4
next prev parent reply other threads:[~2015-10-29 19:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-27 3:05 [PATCH] blktrace: re-write setting q->blk_trace Davidlohr Bueso
2015-10-27 3:14 ` [PATCH v2] " Davidlohr Bueso
2015-10-28 21:37 ` Jeff Moyer
2015-10-29 19:19 ` Davidlohr Bueso
2015-10-29 19:35 ` Jeff Moyer [this message]
2015-10-29 20:28 ` Jens Axboe
2015-10-29 20:46 ` Jeff Moyer
2015-10-29 20:48 ` Jens Axboe
2015-10-29 20:52 ` Jeff Moyer
2015-10-29 21:05 ` Davidlohr Bueso
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=x49io5p5uxx.fsf@segfault.boston.devel.redhat.com \
--to=jmoyer@redhat.com \
--cc=axboe@kernel.dk \
--cc=dave@stgolabs.net \
--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).