From: Siddharth Chintamaneni <sidchintamaneni@gmail.com>
To: Paulo Alcantara <pc@manguebit.org>
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>,
Shyam Prasad N <sprasad@microsoft.com>,
Tom Talpey <tom@talpey.com>, Bharath SM <bharathsm@microsoft.com>,
Allen Pais <apais@microsoft.com>,
Rachel Menge <rachelmenge@linux.microsoft.com>,
Hardik Garg <hargar@linux.microsoft.com>,
Adam Kim <adamkim@microsoft.com>,
Siddharth Chintamaneni <sidchintamaneni@gmail.com>,
linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 2/2] smb: client: fix busy dentry on unmount from persistent handle reopen
Date: Tue, 17 Nov 2026 00:17:33 +0000 [thread overview]
Message-ID: <20261117001733.192399-3-sidchintamaneni@gmail.com> (raw)
In-Reply-To: <20261117001733.192399-1-sidchintamaneni@gmail.com>
During unmount, cifs_kill_sb() waits on cifs_sb->outstanding_rreq for
in-flight netfs I/O requests and oplock breaks to complete before
flushing serverclose_wq and fileinfo_put_wq.
While cifs_kill_sb() is waiting on outstanding_rreq, any cifsFileInfo
referenced by an in-flight request (req->cfile) remains on
tcon->openFileList. On a mount using persistent handles, if a reconnect
runs on cifsiod_wq during this window, smb2_reconnect_server() calls
cifs_reopen_persistent_handles(), which walks tcon->openFileList and
takes a new reference on open_file via cifsFileInfo_get() to reopen the
handle over the network:
Thread 1 (umount) Thread 2 (cifsiod_wq) Thread 3 (workers)
----------------- --------------------- ------------------
cifs_kill_sb()
wait(outstanding_rreq)
[blocks: rreq == 1]
smb2_reconnect_server()
cifs_reopen_persistent_handles()
finds open_file on list
cifsFileInfo_get(open_file)
[cfile->count: 1 -> 2]
cifs_reopen_file()
cifs_free_request()
cifsFileInfo_put()
[cfile->count: 2 -> 1]
dec(outstanding_rreq)
[wakes: rreq == 0]
flush(serverclose_wq)
flush(fileinfo_put_wq)
kill_anon_super(sb)
-> generic_shutdown_super()
BUG: Dentry still in use (1)
VFS: Busy inodes after unmount!
Fix this by incrementing cifs_sb->outstanding_rreq when
cifs_reopen_persistent_handles() takes a reference on open_file and
decrementing it after cifsFileInfo_put(open_file), so wait_var_event()
in cifs_kill_sb() waits for any in-progress persistent handle reopen to
finish and queue its final put before draining fileinfo_put_wq.
Fixes: 340cea84f691 ("cifs: open files should not hold ref on superblock")
Reported-by: Adam Kim <adamkim@microsoft.com>
Signed-off-by: Siddharth Chintamaneni <sidchintamaneni@gmail.com>
---
fs/smb/client/file.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 146ff2adfa244..e0b56c6c2c743 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -2044,6 +2044,7 @@ bool
cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
{
struct cifsFileInfo *open_file, *tmp;
+ struct cifs_sb_info *cifs_sb;
LIST_HEAD(tmp_list);
bool retry = false;
int rc;
@@ -2060,12 +2061,16 @@ cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
list_for_each_entry(open_file, &tcon->openFileList, tlist) {
if (!open_file->invalidHandle)
continue;
+ cifs_sb = CIFS_SB(d_inode(open_file->dentry)->i_sb);
cifsFileInfo_get(open_file);
+ atomic_inc(&cifs_sb->outstanding_rreq);
list_add_tail(&open_file->rlist, &tmp_list);
}
spin_unlock(&tcon->open_file_lock);
list_for_each_entry_safe(open_file, tmp, &tmp_list, rlist) {
+ cifs_sb = CIFS_SB(d_inode(open_file->dentry)->i_sb);
+
/* do not flush */
rc = cifs_reopen_file(open_file, false,
CIFS_REOPEN_BOUND | CIFS_REOPEN_NOWAIT);
@@ -2075,6 +2080,8 @@ cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
}
list_del_init(&open_file->rlist);
cifsFileInfo_put(open_file);
+ if (atomic_dec_and_test(&cifs_sb->outstanding_rreq))
+ wake_up_var(&cifs_sb->outstanding_rreq);
}
return retry;
}
--
2.43.0
prev parent reply other threads:[~2026-11-17 0:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 0:17 [PATCH v1 0/2] smb: client: fix unmount busy dentry/inode races on openFileList Siddharth Chintamaneni
2026-11-17 0:17 ` [PATCH v1 1/2] smb: client: fix busy dentry and inode on unmount from late oplock break Siddharth Chintamaneni
2026-11-17 0:17 ` Siddharth Chintamaneni [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117001733.192399-3-sidchintamaneni@gmail.com \
--to=sidchintamaneni@gmail.com \
--cc=adamkim@microsoft.com \
--cc=apais@microsoft.com \
--cc=bharathsm@microsoft.com \
--cc=hargar@linux.microsoft.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@manguebit.org \
--cc=rachelmenge@linux.microsoft.com \
--cc=ronniesahlberg@gmail.com \
--cc=sprasad@microsoft.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®