From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751519AbdIRUtQ (ORCPT ); Mon, 18 Sep 2017 16:49:16 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:59905 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750815AbdIRUtO (ORCPT ); Mon, 18 Sep 2017 16:49:14 -0400 From: Arnd Bergmann To: "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI Cc: Arnd Bergmann , Eric Dumazet , Neal Cardwell , Yuchung Cheng , Soheil Hassas Yeganeh , Florian Westphal , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] tcp: avoid bogus warning in tcp_clean_rtx_queue Date: Mon, 18 Sep 2017 22:48:47 +0200 Message-Id: <20170918204855.170920-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:UWFTm4/zKe9MspGOn5Me3kr6P9mtS+zFVmcP2bM2qXCwXn7pIlI PJGaejtCap956RU2Gyyx9B6kA3MCO1MQH1aFiyTbBoJ7lIZFc2d2imVweBEgU76TJXpERwY 5bJ9ORYn9iiZHNCHBkpfMvuleRMO2DBfGrzbaCCSIf4TTENRupDrUXHk6LlrDccatNpCeAh sQ6nrrYt20mHjvwxyZwsA== X-UI-Out-Filterresults: notjunk:1;V01:K0:khMucBV2E2o=:z959zD5ySmg/GxBG1f6t1r 4Ja6Ky3EjIN+rA2xfVmlV0W0ictQ6dLiNQz1dVwvqnfUJtFwGqVUR13x8t8d0uuSVeluwmbbc vrmhVxe8VZqbeZjMPLQw1OhD6NICtzjfn5TXRsHYM7VFXolMqzr8Vv/AXA29Et2PPLhSNQGbZ LpFRUKGCokpqAkX4oyCRIJuSVXscdJ9w2kVgtLSV5I3rTGSAKSqgR3GHKpGey7MKpm6bvykO/ A4vMSsr8r+vQeBbxrjQvMVGvCUpGoTjrWFJ+VOkgvr7Jm0Q2XGz8b1ykPBlDqWRagtVHftXew KmqjkQCR5al7NVvGHYsrbREseyoUY1SMxDFpLQCrIbPwcsNZsbmss5UW3P3KpDh1dcFnvBnA6 er6yqUs9f8JbHcD2+IBTfvcInrQcB1gWBteMAll5X66xcugbYRRAdf8Kfz9ogkBkhsxvodE/4 N1bq7MgVLOT0OhEXQL2Z3pPJgorRRKfxfWqDIpKgiI0AeBhoxmn2LeH9YgvhcAXl98JbqCU5I 3rJ0VFbJUc2liU91jQDuP2e4TW1VzUvqGDV581NHuetmdkL7UMher0htLtRNUQcWxyrYA7tIy T3LwpyqTsDhAlhcUZGyMSOnTjPb9GPkI59jDNKyh2/rlIONhGM+G6qHb9Lg2wwID23fnZdbvk FyRkbFLka8kMkAGpO6J4KaBRulnSi8/mVZOBPYw0yTT4AqjyXzGtg7Kg2Wsl1yYsNWX4+oO7x 0gz/ShMNoSZ3Lrtb7phjdCVLsTIZI6CyNndGgA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-4.9 warns that it cannot trace the state of the 'last_ackt' variable since the change to the TCP timestamping code, when CONFIG_PROFILE_ANNOTATED_BRANCHES is set: net/ipv4/tcp_input.c: In function 'tcp_clean_rtx_queue': include/net/tcp.h:757:23: error: 'last_ackt' may be used uninitialized in this function [-Werror=maybe-uninitialized] Other gcc versions, both older and newer do now show this warning. Removing the 'likely' annotation makes it go away, and has no effect on the object code without CONFIG_PROFILE_ANNOTATED_BRANCHES, as tested with gcc-4.9 and gcc-7.1.1, so this seems to be a safe workaround. Fixes: 9a568de4818d ("tcp: switch TCP TS option (RFC 7323) to 1ms clock") Signed-off-by: Arnd Bergmann --- net/ipv4/tcp_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index c5d7656beeee..c52bc8e35d4d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3173,7 +3173,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, int prior_fackets, if (skb && (TCP_SKB_CB(skb)->sacked & TCPCB_SACKED_ACKED)) flag |= FLAG_SACK_RENEGING; - if (likely(first_ackt) && !(flag & FLAG_RETRANS_DATA_ACKED)) { + if (first_ackt && !(flag & FLAG_RETRANS_DATA_ACKED)) { seq_rtt_us = tcp_stamp_us_delta(tp->tcp_mstamp, first_ackt); ca_rtt_us = tcp_stamp_us_delta(tp->tcp_mstamp, last_ackt); } -- 2.9.0