Skip to content

Commit

Permalink
ocfs2: fix deadlock between setattr and dio_end_io_write
Browse files Browse the repository at this point in the history
commit 90bd070aae6c4fb5d302f9c4b9c88be60c8197ec upstream.

The following deadlock is detected:

  truncate -> setattr path is waiting for pending direct IO to be done (inode->i_dio_count become zero) with inode->i_rwsem held (down_write).

  PID: 14827  TASK: ffff881686a9af80  CPU: 20  COMMAND: "ora_p005_hrltd9"
   #0  __schedule at ffffffff818667cc
   Roynas-Android-Playground#1  schedule at ffffffff81866de6
   Roynas-Android-Playground#2  inode_dio_wait at ffffffff812a2d04
   Roynas-Android-Playground#3  ocfs2_setattr at ffffffffc05f322e [ocfs2]
   Roynas-Android-Playground#4  notify_change at ffffffff812a5a09
   Roynas-Android-Playground#5  do_truncate at ffffffff812808f5
   Roynas-Android-Playground#6  do_sys_ftruncate.constprop.18 at ffffffff81280cf2
   Roynas-Android-Playground#7  sys_ftruncate at ffffffff81280d8e
   Roynas-Android-Playground#8  do_syscall_64 at ffffffff81003949
   Roynas-Android-Playground#9  entry_SYSCALL_64_after_hwframe at ffffffff81a001ad

dio completion path is going to complete one direct IO (decrement
inode->i_dio_count), but before that it hung at locking inode->i_rwsem:

   #0  __schedule+700 at ffffffff818667cc
   Roynas-Android-Playground#1  schedule+54 at ffffffff81866de6
   Roynas-Android-Playground#2  rwsem_down_write_failed+536 at ffffffff8186aa28
   Roynas-Android-Playground#3  call_rwsem_down_write_failed+23 at ffffffff8185a1b7
   Roynas-Android-Playground#4  down_write+45 at ffffffff81869c9d
   Roynas-Android-Playground#5  ocfs2_dio_end_io_write+180 at ffffffffc05d5444 [ocfs2]
   Roynas-Android-Playground#6  ocfs2_dio_end_io+85 at ffffffffc05d5a85 [ocfs2]
   Roynas-Android-Playground#7  dio_complete+140 at ffffffff812c873c
   Roynas-Android-Playground#8  dio_aio_complete_work+25 at ffffffff812c89f9
   Roynas-Android-Playground#9  process_one_work+361 at ffffffff810b1889
  Roynas-Android-Playground#10  worker_thread+77 at ffffffff810b233d
  Roynas-Android-Playground#11  kthread+261 at ffffffff810b7fd5
  Roynas-Android-Playground#12  ret_from_fork+62 at ffffffff81a0035e

Thus above forms ABBA deadlock.  The same deadlock was mentioned in
upstream commit 28f5a8a7c033 ("ocfs2: should wait dio before inode lock
in ocfs2_setattr()").  It seems that that commit only removed the
cluster lock (the victim of above dead lock) from the ABBA deadlock
party.

End-user visible effects: Process hang in truncate -> ocfs2_setattr path
and other processes hang at ocfs2_dio_end_io_write path.

This is to fix the deadlock itself.  It removes inode_lock() call from
dio completion path to remove the deadlock and add ip_alloc_sem lock in
setattr path to synchronize the inode modifications.

[wen.gang.wang@oracle.com: remove the "had_alloc_lock" as suggested]
  Link: https://lkml.kernel.org/r/20210402171344.1605-1-wen.gang.wang@oracle.com

Link: https://lkml.kernel.org/r/20210331203654.3911-1-wen.gang.wang@oracle.com
Signed-off-by: Wengang Wang <wen.gang.wang@oracle.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Wengang-oracle authored and ratatouille100 committed Dec 18, 2023
1 parent b456a6f commit 7876026
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
11 changes: 1 addition & 10 deletions fs/ocfs2/aops.c
Original file line number Diff line number Diff line change
Expand Up @@ -2309,7 +2309,7 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
struct ocfs2_alloc_context *meta_ac = NULL;
handle_t *handle = NULL;
loff_t end = offset + bytes;
int ret = 0, credits = 0, locked = 0;
int ret = 0, credits = 0;

ocfs2_init_dealloc_ctxt(&dealloc);

Expand All @@ -2320,13 +2320,6 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
!dwc->dw_orphaned)
goto out;

/* ocfs2_file_write_iter will get i_mutex, so we need not lock if we
* are in that context. */
if (dwc->dw_writer_pid != task_pid_nr(current)) {
inode_lock(inode);
locked = 1;
}

ret = ocfs2_inode_lock(inode, &di_bh, 1);
if (ret < 0) {
mlog_errno(ret);
Expand Down Expand Up @@ -2401,8 +2394,6 @@ static int ocfs2_dio_end_io_write(struct inode *inode,
if (meta_ac)
ocfs2_free_alloc_context(meta_ac);
ocfs2_run_deallocs(osb, &dealloc);
if (locked)
inode_unlock(inode);
ocfs2_dio_free_write_ctx(inode, dwc);

return ret;
Expand Down
8 changes: 6 additions & 2 deletions fs/ocfs2/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,22 +1250,24 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)
goto bail_unlock;
}
}
down_write(&OCFS2_I(inode)->ip_alloc_sem);
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS +
2 * ocfs2_quota_trans_credits(sb));
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
mlog_errno(status);
goto bail_unlock;
goto bail_unlock_alloc;
}
status = __dquot_transfer(inode, transfer_to);
if (status < 0)
goto bail_commit;
} else {
down_write(&OCFS2_I(inode)->ip_alloc_sem);
handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS);
if (IS_ERR(handle)) {
status = PTR_ERR(handle);
mlog_errno(status);
goto bail_unlock;
goto bail_unlock_alloc;
}
}

Expand All @@ -1278,6 +1280,8 @@ int ocfs2_setattr(struct dentry *dentry, struct iattr *attr)

bail_commit:
ocfs2_commit_trans(osb, handle);
bail_unlock_alloc:
up_write(&OCFS2_I(inode)->ip_alloc_sem);
bail_unlock:
if (status && inode_locked) {
ocfs2_inode_unlock_tracker(inode, 1, &oh, had_lock);
Expand Down

0 comments on commit 7876026

Please sign in to comment.