lkml.org 
[lkml]   [2015]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] inet: Clean up inet_csk_wait_for_connect() vs. might_sleep()
On Mon, Mar 16, 2015 at 12:19:24PM -0700, Eric Dumazet wrote:
>
> In commit 26cabd31259ba43f68026ce3f62b78094124333f
> Peter added a sched_annotate_sleep() in sk_wait_event()
>
> Is the following patch needed as well ?

Yes this is fine.

If we had indeed gone through the schedule and got woken we'd have had
TASK_RUNNING here, also when we retry the loop the prepare_to_wait call
will (re)set the TASK_INTERRUPTIBLE state.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>

> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
> net/ipv4/inet_connection_sock.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
> index 14d02ea905b6..3e44b9b0b78e 100644
> --- a/net/ipv4/inet_connection_sock.c
> +++ b/net/ipv4/inet_connection_sock.c
> @@ -268,6 +268,7 @@ static int inet_csk_wait_for_connect(struct sock *sk, long timeo)
> release_sock(sk);
> if (reqsk_queue_empty(&icsk->icsk_accept_queue))
> timeo = schedule_timeout(timeo);
> + sched_annotate_sleep();
> lock_sock(sk);
> err = 0;
> if (!reqsk_queue_empty(&icsk->icsk_accept_queue))
>
>
>


\
 
 \ /
  Last update: 2015-03-17 08:41    [W:0.077 / U:1.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site