Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [net-next,v3] tcp: Improve setsockopt() TCP_USER_TIMEOUT accuracy
To:     Jonathan Maxwell <jmaxwell37@gmail.com>,
        Eric Dumazet <eric.dumazet@gmail.com>
Cc:     David Miller <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Neal Cardwell <ncardwell@google.com>,
        David Laight <David.Laight@aculab.com>,
        kuznet <kuznet@ms2.inr.ac.ru>,
        yoshfuji <yoshfuji@linux-ipv6.org>,
        Netdev <netdev@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Jon Maxwell <jmaxwell@redhat.com>
References: <20180710065147.27647-1-jmaxwell37@gmail.com>
 <3f856638-52bc-6630-a3d2-2b50f1bf7e48@gmail.com>
 <c29f1535-3c5d-e588-862c-ba948363c973@gmail.com>
 <CAGHK07Aoa81QN+LmVttJQ56Sn+R-KyksYqZxSYL5-5reDRt3WA@mail.gmail.com>
From:   Eric Dumazet <eric.dumazet@gmail.com>
Message-ID: <46861e12-1ae5-374f-e907-87ba6241de5f@gmail.com>
Date:   Tue, 10 Jul 2018 19:04:21 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.6.0
MIME-Version: 1.0
In-Reply-To: <CAGHK07Aoa81QN+LmVttJQ56Sn+R-KyksYqZxSYL5-5reDRt3WA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


On 07/10/2018 05:33 PM, Jonathan Maxwell wrote:
> On Tue, Jul 10, 2018 at 10:48 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
>>
>>
>> On 07/10/2018 05:38 AM, Eric Dumazet wrote:
>>
>>> Note that if we always do jiffies_to_msecs(icsk->icsk_user_timeout) in TCP,
>>> we also could change the convention and store msecs in this field instead of jiffies.
>>>
>>> That would eliminate the msecs_to_jiffies() and jiffies_to_msecs() dance.
>>>
>>> (That would be done in a patch of its own, of course)
>>
>> tcp_keepalive_timer() does use icsk->icsk_user_timeout directly in jiffies unit,
>> but considering keeapalive timers are rarely used, this point would have to
>> do the msecs_to_jiffies() conversion.
> 
> and also if icsk->icsk_user_timeout = 0, then timeout in retransmits_timed_out()
> is in jiffies and that would need to addressed.

Absolutely, this is what I was suggesting.

Pseudo code for this part, before your changes.

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 3b3611729928f77934e0298bb248e55c7a7c5def..cae7bbc956ed51e9d381650957f54550cc0967d9 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -183,8 +183,9 @@ static bool retransmits_timed_out(struct sock *sk,
                else
                        timeout = ((2 << linear_backoff_thresh) - 1) * rto_base +
                                (boundary - linear_backoff_thresh) * TCP_RTO_MAX;
+               timeout = jiffies_to_msecs(timeout)'
        }
-       return (tcp_time_stamp(tcp_sk(sk)) - start_ts) >= jiffies_to_msecs(timeout);
+       return (tcp_time_stamp(tcp_sk(sk)) - start_ts) >= timeout;
 }
 
 /* A write timeout has occurred. Process the after effects. */