net: fix sleeping for sk_wait_event()

Similar to commit 14135f30e33c ("inet: fix sleeping inside inet_wait_for_connect()"),
sk_wait_event() needs to fix too, because release_sock() is blocking,
it changes the process state back to running after sleep, which breaks
the previous prepare_to_wait().

Switch to the new wait API.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 3 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index cf617ee16723..9d905ed0cd25 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -915,14 +915,16 @@ static inline void sock_rps_reset_rxhash(struct sock *sk)
 #endif
 }
 
-#define sk_wait_event(__sk, __timeo, __condition)                       \
+#define sk_wait_event(__sk, __timeo, __condition, __wait)               \
         ({      int __rc;                                               \
                 release_sock(__sk);                                     \
                 __rc = __condition;                                     \
                 if (!__rc) {                                            \
-                        *(__timeo) = schedule_timeout(*(__timeo));      \
+                        *(__timeo) = wait_woken(__wait,                 \
+                                                TASK_INTERRUPTIBLE,     \
+                                                *(__timeo));            \
                 }                                                       \
-                sched_annotate_sleep();                                         \
+                sched_annotate_sleep();                                 \
                 lock_sock(__sk);                                        \
                 __rc = __condition;                                     \
                 __rc;                                                   \