Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89619431 authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Pradeep P V K
Browse files

ubifs: Fix deadlock in concurrent bulk-read and writepage



In ubifs, concurrent execution of writepage and bulk read on the same file
may cause ABBA deadlock, for example (Reproduce method see Link):

Process A(Bulk-read starts from page4)         Process B(write page4 back)
  vfs_read                                       wb_workfn or fsync
  ...                                            ...
  generic_file_buffered_read                     write_cache_pages
    ubifs_readpage                                 LOCK(page4)

      ubifs_bulk_read                              ubifs_writepage
        LOCK(ui->ui_mutex)                           ubifs_write_inode

	  ubifs_do_bulk_read                           LOCK(ui->ui_mutex)
	    find_or_create_page(alloc page4)                  ↑
	      LOCK(page4)                   <--     ABBA deadlock occurs!

In order to ensure the serialization execution of bulk read, we can't
remove the big lock 'ui->ui_mutex' in ubifs_bulk_read(). Instead, we
allow ubifs_do_bulk_read() to lock page failed by replacing
find_or_create_page(FGP_LOCK) with
pagecache_get_page(FGP_LOCK | FGP_NOWAIT).

Change-Id: I49a5b8d22c66bc4e45c1b93de59baff55d69ff43
Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Suggested-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Cc: <Stable@vger.kernel.org>
Fixes: 4793e7c5 ("UBIFS: add bulk-read facility")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=206153


Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Git-commit: f5de5b83303e61b1f3fb09bd77ce3ac2d7a475f2
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/


Signed-off-by: default avatarPradeep P V K <ppvk@codeaurora.org>
parent 0214ec6b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment