Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 15:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update of blkg_stat and blkg_rwstat may happen in bh context.

Browse Source 
While u64_stats_fetch_retry is only preempt_disable on 32bit
UP system. This is not enough to avoid preemption by bh and
may read strange 64 bit value.

Signed-off-by: Hong Zhiguo <zhiguohong@tencent.com>
Acked-by: Tejun Heo <tj@kernel.org>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Hong Zhiguo 2013-11-20 10:35:05 -07:00 committed by Jens Axboe
parent 82023bb7f7
commit 2c575026fa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-cgroup.h
View File

@ -435,9 +435,9 @@ static inline uint64_t blkg_stat_read(struct blkg_stat *stat)
uint64_t v; uint64_t v;
do { do {
start = u64_stats_fetch_begin(&stat->syncp); start = u64_stats_fetch_begin_bh(&stat->syncp);
v = stat->cnt; v = stat->cnt;
} while (u64_stats_fetch_retry(&stat->syncp, start)); } while (u64_stats_fetch_retry_bh(&stat->syncp, start));
return v; return v;
} }
@ -508,9 +508,9 @@ static inline struct blkg_rwstat blkg_rwstat_read(struct blkg_rwstat *rwstat)
struct blkg_rwstat tmp; struct blkg_rwstat tmp;
do { do {
start = u64_stats_fetch_begin(&rwstat->syncp); start = u64_stats_fetch_begin_bh(&rwstat->syncp);
tmp = *rwstat; tmp = *rwstat;
} while (u64_stats_fetch_retry(&rwstat->syncp, start)); } while (u64_stats_fetch_retry_bh(&rwstat->syncp, start));
return tmp; return tmp;
} }