From patchwork Sun Feb 21 07:12:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konstantin Khlebnikov X-Patchwork-Id: 585843 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7C0A31409B7 for ; Mon, 22 Feb 2016 04:43:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=yandex-team.ru header.i=@yandex-team.ru header.b=l13OS+nk; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750733AbcBURn3 (ORCPT ); Sun, 21 Feb 2016 12:43:29 -0500 Received: from forward-corp1f.mail.yandex.net ([95.108.130.40]:48864 "EHLO forward-corp1f.mail.yandex.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750955AbcBURn0 (ORCPT ); Sun, 21 Feb 2016 12:43:26 -0500 Received: from smtpcorp4.mail.yandex.net (smtpcorp4.mail.yandex.net [95.108.252.2]) by forward-corp1f.mail.yandex.net (Yandex) with ESMTP id 898362420269; Sun, 21 Feb 2016 10:12:42 +0300 (MSK) Received: from smtpcorp4.mail.yandex.net (localhost [127.0.0.1]) by smtpcorp4.mail.yandex.net (Yandex) with ESMTP id 6B0992C0310; Sun, 21 Feb 2016 10:12:42 +0300 (MSK) Received: from 130.193.34.175-iva.dhcp.yndx.net (130.193.34.175-iva.dhcp.yndx.net [130.193.34.175]) by smtpcorp4.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 7XJIOdgXkZ-CgBmxkwu; Sun, 21 Feb 2016 10:12:42 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1456038762; bh=vrVS4PjRFo+NiFKhXNUdZjcJid/PNe5xctnb1CXEUeo=; h=Subject:From:To:Date:Message-ID:User-Agent:MIME-Version: Content-Type:Content-Transfer-Encoding; b=l13OS+nkiRiNBUhAoUjElS5nlNRz2EgJyf3z2NuuUxtNRQywXUmcA0+Pz1bOdAaiB 4scMED1DR5bRFktTbVQa17tDNMGFzF8Zx4NMskGjczeLINNgC8lYbw7WtAExOH3htY EcK7AZ75IAtB8b66TQ5C59w1Wlw8BrFRF9h9QpLo= Authentication-Results: smtpcorp4.mail.yandex.net; dkim=pass header.i=@yandex-team.ru Subject: [PATCH] tcp: convert cached rtt from usec to jiffies when feeding initial rto From: Konstantin Khlebnikov To: netdev@vger.kernel.org, Eric Dumazet , "David S. Miller" Date: Sun, 21 Feb 2016 10:12:39 +0300 Message-ID: <20160221071239.9977.45366.stgit@buzz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Currently it's converted into msecs, thus HZ=1000 intact. Signed-off-by: Konstantin Khlebnikov Fixes: 740b0f1841f6 ("tcp: switch rtt estimations to usec resolution") --- net/ipv4/tcp_metrics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c index c8cbc2b4b792..a726d7853ce5 100644 --- a/net/ipv4/tcp_metrics.c +++ b/net/ipv4/tcp_metrics.c @@ -550,7 +550,7 @@ reset: */ if (crtt > tp->srtt_us) { /* Set RTO like tcp_rtt_estimator(), but from cached RTT. */ - crtt /= 8 * USEC_PER_MSEC; + crtt /= 8 * USEC_PER_SEC / HZ; inet_csk(sk)->icsk_rto = crtt + max(2 * crtt, tcp_rto_min(sk)); } else if (tp->srtt_us == 0) { /* RFC6298: 5.7 We've failed to get a valid RTT sample from