Skip to content

Commit 7dc5537

Browse files
committed
erofs: fix race in z_erofs_get_gbuf()
In z_erofs_get_gbuf(), the current task may be migrated to another CPU between `z_erofs_gbuf_id()` and `spin_lock(&gbuf->lock)`. Therefore, z_erofs_put_gbuf() will trigger the following issue which was found by stress test: <2>[772156.434168] kernel BUG at fs/erofs/zutil.c:58! .. <4>[772156.435007] <4>[772156.439237] CPU: 0 PID: 3078 Comm: stress Kdump: loaded Tainted: G E 6.10.0-rc7+ #2 <4>[772156.439239] Hardware name: Alibaba Cloud Alibaba Cloud ECS, BIOS 1.0.0 01/01/2017 <4>[772156.439241] pstate: 83400005 (Nzcv daif +PAN -UAO +TCO +DIT -SSBS BTYPE=--) <4>[772156.439243] pc : z_erofs_put_gbuf+0x64/0x70 [erofs] <4>[772156.439252] lr : z_erofs_lz4_decompress+0x600/0x6a0 [erofs] .. <6>[772156.445958] stress (3127): drop_caches: 1 <4>[772156.446120] Call trace: <4>[772156.446121] z_erofs_put_gbuf+0x64/0x70 [erofs] <4>[772156.446761] z_erofs_lz4_decompress+0x600/0x6a0 [erofs] <4>[772156.446897] z_erofs_decompress_queue+0x740/0xa10 [erofs] <4>[772156.447036] z_erofs_runqueue+0x428/0x8c0 [erofs] <4>[772156.447160] z_erofs_readahead+0x224/0x390 [erofs] .. Fixes: f36f301 ("erofs: rename per-CPU buffers to global buffer pool and make it configurable") Cc: <[email protected]> # 6.10+ Reviewed-by: Chunhai Guo <[email protected]> Reviewed-by: Sandeep Dhavale <[email protected]> Reviewed-by: Chao Yu <[email protected]> Signed-off-by: Gao Xiang <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9c421ef commit 7dc5537

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

fs/erofs/zutil.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,13 @@ void *z_erofs_get_gbuf(unsigned int requiredpages)
3838
{
3939
struct z_erofs_gbuf *gbuf;
4040

41+
migrate_disable();
4142
gbuf = &z_erofs_gbufpool[z_erofs_gbuf_id()];
4243
spin_lock(&gbuf->lock);
4344
/* check if the buffer is too small */
4445
if (requiredpages > gbuf->nrpages) {
4546
spin_unlock(&gbuf->lock);
47+
migrate_enable();
4648
/* (for sparse checker) pretend gbuf->lock is still taken */
4749
__acquire(gbuf->lock);
4850
return NULL;
@@ -57,6 +59,7 @@ void z_erofs_put_gbuf(void *ptr) __releases(gbuf->lock)
5759
gbuf = &z_erofs_gbufpool[z_erofs_gbuf_id()];
5860
DBG_BUGON(gbuf->ptr != ptr);
5961
spin_unlock(&gbuf->lock);
62+
migrate_enable();
6063
}
6164

6265
int z_erofs_gbuf_growsize(unsigned int nrpages)

0 commit comments

Comments
 (0)