samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Don't allow waiting for exiting tasks

Browse Source 
[ Upstream commit 8d3ca331026a7f9700d3747eed59a67b8f828cdc ]

Once a task calls exit_signals() it can no longer be signalled. So do
not allow it to do killable waits.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust
2025-03-28 13:19:18 -04:00
committed by Greg Kroah-Hartman
parent a81dd69f85
commit c72826efbb
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/inode.c
View File

@@ -74,6 +74,8 @@ nfs_fattr_to_ino_t(struct nfs_fattr *fattr)
int nfs_wait_bit_killable(struct wait_bit_key *key, int mode) int nfs_wait_bit_killable(struct wait_bit_key *key, int mode)
{ {
if (unlikely(nfs_current_task_exiting()))
return -EINTR;
schedule(); schedule();
if (signal_pending_state(mode, current)) if (signal_pending_state(mode, current))
return -ERESTARTSYS; return -ERESTARTSYS;

5
fs/nfs/internal.h
View File

@@ -865,6 +865,11 @@ static inline u32 nfs_stateid_hash(const nfs4_stateid *stateid)
NFS4_STATEID_OTHER_SIZE); NFS4_STATEID_OTHER_SIZE);
} }
static inline bool nfs_current_task_exiting(void)
{
return (current->flags & PF_EXITING) != 0;
}
static inline bool nfs_error_is_fatal(int err) static inline bool nfs_error_is_fatal(int err)
{ {
switch (err) { switch (err) {

2
fs/nfs/nfs3proc.c
View File

@@ -39,7 +39,7 @@ nfs3_rpc_wrapper(struct rpc_clnt *clnt, struct rpc_message *msg, int flags)
__set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE); __set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);
schedule_timeout(NFS_JUKEBOX_RETRY_TIME); schedule_timeout(NFS_JUKEBOX_RETRY_TIME);
res = -ERESTARTSYS; res = -ERESTARTSYS;
} while (!fatal_signal_pending(current)); } while (!fatal_signal_pending(current) && !nfs_current_task_exiting());
return res; return res;
} }

9
fs/nfs/nfs4proc.c
View File

@@ -422,6 +422,8 @@ static int nfs4_delay_killable(long *timeout)
{ {
might_sleep(); might_sleep();
if (unlikely(nfs_current_task_exiting()))
return -EINTR;
__set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE); __set_current_state(TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);
schedule_timeout(nfs4_update_delay(timeout)); schedule_timeout(nfs4_update_delay(timeout));
if (!__fatal_signal_pending(current)) if (!__fatal_signal_pending(current))
@@ -433,6 +435,8 @@ static int nfs4_delay_interruptible(long *timeout)
{ {
might_sleep(); might_sleep();
if (unlikely(nfs_current_task_exiting()))
return -EINTR;
__set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE_UNSAFE); __set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE_UNSAFE);
schedule_timeout(nfs4_update_delay(timeout)); schedule_timeout(nfs4_update_delay(timeout));
if (!signal_pending(current)) if (!signal_pending(current))
@@ -1712,7 +1716,8 @@ static void nfs_set_open_stateid_locked(struct nfs4_state *state,
rcu_read_unlock(); rcu_read_unlock();
trace_nfs4_open_stateid_update_wait(state->inode, stateid, 0); trace_nfs4_open_stateid_update_wait(state->inode, stateid, 0);
if (!fatal_signal_pending(current)) { if (!fatal_signal_pending(current) &&
!nfs_current_task_exiting()) {
if (schedule_timeout(5*HZ) == 0) if (schedule_timeout(5*HZ) == 0)
status = -EAGAIN; status = -EAGAIN;
else else
@@ -3494,7 +3499,7 @@ static bool nfs4_refresh_open_old_stateid(nfs4_stateid *dst,
write_sequnlock(&state->seqlock); write_sequnlock(&state->seqlock);
trace_nfs4_close_stateid_update_wait(state->inode, dst, 0); trace_nfs4_close_stateid_update_wait(state->inode, dst, 0);
if (fatal_signal_pending(current)) if (fatal_signal_pending(current) || nfs_current_task_exiting())
status = -EINTR; status = -EINTR;
else else
if (schedule_timeout(5*HZ) != 0) if (schedule_timeout(5*HZ) != 0)