iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blktrace: Avoid sparse warnings when assigning q->blk_trace

Browse Source 
Mostly for historical reasons, q->blk_trace is assigned through xchg()
and cmpxchg() atomic operations. Although this is correct, sparse
complains about this because it violates rcu annotations since commit
c780e86dd48e ("blktrace: Protect q->blk_trace with RCU") which started
to use rcu for accessing q->blk_trace. Furthermore there's no real need
for atomic operations anymore since all changes to q->blk_trace happen
under q->blk_trace_mutex and since it also makes more sense to check if
q->blk_trace is set with the mutex held earlier.

So let's just replace xchg() with rcu_replace_pointer() and cmpxchg()
with explicit check and rcu_assign_pointer(). This makes the code more
efficient and sparse happy.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jan Kara 2020-06-05 16:58:37 +02:00 committed by Jens Axboe
parent 1b0b283648
commit c3dbe541ef
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/trace/blktrace.c
View File

@ -347,7 +347,8 @@ static int __blk_trace_remove(struct request_queue *q)
{ {
struct blk_trace *bt; struct blk_trace *bt;
bt = xchg(&q->blk_trace, NULL); bt = rcu_replace_pointer(q->blk_trace, NULL,
lockdep_is_held(&q->blk_trace_mutex));
if (!bt) if (!bt)
return -EINVAL; return -EINVAL;
@ -501,7 +502,8 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
* bdev can be NULL, as with scsi-generic, this is a helpful as * bdev can be NULL, as with scsi-generic, this is a helpful as
* we can be. * we can be.
*/ */
if (q->blk_trace) { if (rcu_dereference_protected(q->blk_trace,
lockdep_is_held(&q->blk_trace_mutex))) {
pr_warn("Concurrent blktraces are not allowed on %s\n", pr_warn("Concurrent blktraces are not allowed on %s\n",
buts->name); buts->name);
return -EBUSY; return -EBUSY;
@ -556,10 +558,7 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
bt->pid = buts->pid; bt->pid = buts->pid;
bt->trace_state = Blktrace_setup; bt->trace_state = Blktrace_setup;
ret = -EBUSY; rcu_assign_pointer(q->blk_trace, bt);
if (cmpxchg(&q->blk_trace, NULL, bt))
goto err;
get_probe_ref(); get_probe_ref();
ret = 0; ret = 0;
@ -1642,7 +1641,8 @@ static int blk_trace_remove_queue(struct request_queue *q)
{ {
struct blk_trace *bt; struct blk_trace *bt;
bt = xchg(&q->blk_trace, NULL); bt = rcu_replace_pointer(q->blk_trace, NULL,
lockdep_is_held(&q->blk_trace_mutex));
if (bt == NULL) if (bt == NULL)
return -EINVAL; return -EINVAL;
@ -1674,10 +1674,7 @@ static int blk_trace_setup_queue(struct request_queue *q,
blk_trace_setup_lba(bt, bdev); blk_trace_setup_lba(bt, bdev);
ret = -EBUSY; rcu_assign_pointer(q->blk_trace, bt);
if (cmpxchg(&q->blk_trace, NULL, bt))
goto free_bt;
get_probe_ref(); get_probe_ref();
return 0; return 0;