{"id":812229,"url":"http://patchwork.ozlabs.org/api/1.2/patches/812229/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505111262-12620-1-git-send-email-liujian56@huawei.com/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505111262-12620-1-git-send-email-liujian56@huawei.com>","list_archive_url":null,"date":"2017-09-11T06:27:42","name":"tcp: TCP_USER_TIMEOUT can not work in tcp_probe_timer()","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"83d6edf9100762764684c0574c0fcab7a194b978","submitter":{"id":71967,"url":"http://patchwork.ozlabs.org/api/1.2/people/71967/?format=json","name":"liujian \\(CE\\)","email":"liujian56@huawei.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505111262-12620-1-git-send-email-liujian56@huawei.com/mbox/","series":[{"id":2442,"url":"http://patchwork.ozlabs.org/api/1.2/series/2442/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=2442","date":"2017-09-11T06:27:42","name":"tcp: TCP_USER_TIMEOUT can not work in tcp_probe_timer()","version":1,"mbox":"http://patchwork.ozlabs.org/series/2442/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/812229/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/812229/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xrJ1W66qPz9s7g\n\tfor ;\n\tMon, 11 Sep 2017 16:29:35 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1750992AbdIKG3b (ORCPT );\n\tMon, 11 Sep 2017 02:29:31 -0400","from szxga04-in.huawei.com ([45.249.212.190]:6002 \"EHLO\n\tszxga04-in.huawei.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1750742AbdIKG3a (ORCPT\n\t); Mon, 11 Sep 2017 02:29:30 -0400","from 172.30.72.60 (EHLO DGGEMS409-HUB.china.huawei.com)\n\t([172.30.72.60])\n\tby dggrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued)\n\twith ESMTP id DGZ48832; Mon, 11 Sep 2017 14:29:24 +0800 (CST)","from localhost (10.177.97.126) by DGGEMS409-HUB.china.huawei.com\n\t(10.3.19.209) with Microsoft SMTP Server id 14.3.301.0;\n\tMon, 11 Sep 2017 14:29:14 +0800"],"From":"","To":", ,\n\t, ,\n\t, ","CC":", ,\n\t","Subject":"[PATCH] tcp: TCP_USER_TIMEOUT can not work in tcp_probe_timer()","Date":"Mon, 11 Sep 2017 14:27:42 +0800","Message-ID":"<1505111262-12620-1-git-send-email-liujian56@huawei.com>","X-Mailer":"git-send-email 1.9.5.msysgit.1","MIME-Version":"1.0","Content-Type":"text/plain","X-Originating-IP":"[10.177.97.126]","X-CFilter-Loop":"Reflected","X-Mirapoint-Virus-RAPID-Raw":"score=unknown(0),\n\trefid=str=0001.0A020204.59B62D45.0061, ss=1, re=0.000, recu=0.000,\n\treip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0,\n\tso=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32","X-Mirapoint-Loop-Id":"1a96cc081e45281cef2448934e641139","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: liujian \n\nAfter the tcp socket go to ESTABLISHED stat, change IP address (server\nside),\nthen the tcp socket will go tcp_probe_timer process.\n\n[root@localhost net]# netstat -toe\nActive Internet connections (w/o servers)\nProto Recv-Q Send-Q Local Address Foreign Address State User Inode Timer\ntcp 0 1104 9.81.254:personal-agent 9.84.201.213:23597 ESTABLISHED root 12819 probe (4.36/0/7)\n[root@localhost net]# cat /proc/net/tcp\n sl local_address rem_address st tx_queue rx_queue tr tm->when retrnsmt uid timeout inode \n 3: B1FE5109:15B3 D5C95409:5C2D 01 00000495:00000000 04:0000005E 00000000 0 7 12819 2 ffff95cdcf45a000 20 4 1 10 -1 \n\nIn my test case, tcp_write_queue_head(sk) and tcp_send_head(sk) is same\nSKB.\nAnd ((s32)(tcp_time_stamp(tp) - start_ts) >\njiffies_to_msecs(icsk->icsk_user_timeout))\n always is false.\n Here use keepalive_time_elapsed(tp) to do the compare as\ntcp_keepalive_timer do.\n\nSigned-off-by: liujian \n---\n net/ipv4/tcp_timer.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)","diff":"diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c\nindex 655dd8d..2a28a03 100644\n--- a/net/ipv4/tcp_timer.c\n+++ b/net/ipv4/tcp_timer.c\n@@ -325,7 +325,7 @@ static void tcp_probe_timer(struct sock *sk)\n \tif (!start_ts)\n \t\ttcp_send_head(sk)->skb_mstamp = tp->tcp_mstamp;\n \telse if (icsk->icsk_user_timeout &&\n-\t\t (s32)(tcp_time_stamp(tp) - start_ts) >\n+\t\t keepalive_time_elapsed(tp) >=\n \t\t jiffies_to_msecs(icsk->icsk_user_timeout))\n \t\tgoto abort;\n \n","prefixes":[]}