iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mptcp: drop WORKER_RUNNING status bit

Browse Source 
Only mptcp_close() can actually cancel the workqueue,
no need to add and use this flag.

Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Paolo Abeni 2020-11-19 11:45:54 -08:00 committed by Jakub Kicinski
parent 3cd336c517
commit b2771d2419
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mptcp/protocol.c
View File

@ -1862,7 +1862,6 @@ static void mptcp_worker(struct work_struct *work)
int state, ret; int state, ret;
lock_sock(sk); lock_sock(sk);
set_bit(MPTCP_WORKER_RUNNING, &msk->flags);
state = sk->sk_state; state = sk->sk_state;
if (unlikely(state == TCP_CLOSE)) if (unlikely(state == TCP_CLOSE))
goto unlock; goto unlock;
@ -1940,7 +1939,6 @@ reset_unlock:
mptcp_reset_timer(sk); mptcp_reset_timer(sk);
unlock: unlock:
clear_bit(MPTCP_WORKER_RUNNING, &msk->flags);
release_sock(sk); release_sock(sk);
sock_put(sk); sock_put(sk);
} }
@ -2011,11 +2009,7 @@ static void mptcp_cancel_work(struct sock *sk)
{ {
struct mptcp_sock *msk = mptcp_sk(sk); struct mptcp_sock *msk = mptcp_sk(sk);
/* if called by the work itself, do not try to cancel the work, or if (cancel_work_sync(&msk->work))
* we will hang.
*/
if (!test_bit(MPTCP_WORKER_RUNNING, &msk->flags) &&
cancel_work_sync(&msk->work))
__sock_put(sk); __sock_put(sk);
} }

1
net/mptcp/protocol.h
View File

@ -91,7 +91,6 @@
#define MPTCP_WORK_EOF 3 #define MPTCP_WORK_EOF 3
#define MPTCP_FALLBACK_DONE 4 #define MPTCP_FALLBACK_DONE 4
#define MPTCP_WORK_CLOSE_SUBFLOW 5 #define MPTCP_WORK_CLOSE_SUBFLOW 5
#define MPTCP_WORKER_RUNNING 6
static inline bool before64(__u64 seq1, __u64 seq2) static inline bool before64(__u64 seq1, __u64 seq2)
{ {