From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 643BCC43381 for ; Fri, 15 Feb 2019 14:50:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3200021B18 for ; Fri, 15 Feb 2019 14:50:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RNo0NEZ2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729117AbfBOOuP (ORCPT ); Fri, 15 Feb 2019 09:50:15 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:35502 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuO (ORCPT ); Fri, 15 Feb 2019 09:50:14 -0500 Received: by mail-pl1-f194.google.com with SMTP id p8so5075444plo.2 for ; Fri, 15 Feb 2019 06:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wrvCyLpVcc14RGOLJ6bm3CXM/YLKpH4ZZr0Srl0beXo=; b=RNo0NEZ20q4bB8IphfhX9oOAxwLQ0ZMrMe73kJ+BviXiPbjPAskpmMPAYrSqTH2Nbl hi6M2Q3nSO6YfMbg0RzNLiDUUi5XN/kkgg/LFmr7XjmaNp7IwOVYXcZF/2slhTgZ9GQw rmGYDJ6/i5F+dVhRf0BOqhjElXOFSNyKe9NxJdQJd9lcWFUwu79CU5EgBQBNV90pVQI9 5UTTUhTZcjnJVnYmEiibZ63z5IeUjsKkRPOQwx4xZgcZEx26bcUvoVeenNqywZ3Q0kVS +jkJMHqBQhVAbJqm8/LAxfNfVx2DZfrEwcy4poJBVpBihtnmXWL1iiHj2dHTNRI2YUYx Pzaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wrvCyLpVcc14RGOLJ6bm3CXM/YLKpH4ZZr0Srl0beXo=; b=jkoYLaHRlI8lR1weu3P6mgIn85j/v0Umlo9bCp9WfAqJrJJZJNBTvwY6S5KBhcZedi IIPobyuot3VwC5j4C/AH65COBrcuMc89YxneknPumKUpNBy55fVjZGY2dlm1Ll2TFrdN OJR03aG7uRm7wDG8NGTVjAfzpeuXOIWIBAUWJTK9dMVabakhSD/AzYWHZEjl8tI/ex2/ 35JHuERSWK0J/ysO09QbYFT/4pTQs+dt8D2aetC40FQnQl7jUiG/InLsaTQdg5FSoPs3 vXvf0YXGHMl8hyGRMvluSTHrGFL84Ax7nGIHPtQ5RGJ0yMFVEYQhZF1B0pwRakKo4sM6 QNcA== X-Gm-Message-State: AHQUAubM0DjPNtHo4rKdMPVlkvYFIL/FmpBEDCcAZEjv03WzMkUsroHG GOW/olgAdBVPiF+8pmJBN64= X-Google-Smtp-Source: AHgI3IasLnHbvG3fnyekxBn08NiZui9ss9QMjorn1MjULj8VAE1h2soyDeH7oZd4NdiRmfPTPePsWg== X-Received: by 2002:a17:902:6686:: with SMTP id e6mr10554592plk.208.1550242213991; Fri, 15 Feb 2019 06:50:13 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:13 -0800 (PST) From: Yafang Shao To: davem@davemloft.net Cc: daniel@iogearbox.net, edumazet@google.com, netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [net-next 1/5] tcp: clean up SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:43 +0800 Message-Id: <1550242187-29660-2-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550242187-29660-1-git-send-email-laoar.shao@gmail.com> References: <1550242187-29660-1-git-send-email-laoar.shao@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Per discussion with Daniel[1] and Eric[2], the SOCK_DEBUG() is a very ancient interface, which is not very useful for debugging. So we'd better clean up it. This patch cleans up it for TCP. [1] https://patchwork.ozlabs.org/patch/1035573/ [2] https://patchwork.ozlabs.org/patch/1040533/ Signed-off-by: Yafang Shao --- net/ipv4/tcp_input.c | 19 +------------------ net/ipv6/tcp_ipv6.c | 2 -- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 7a027dec..6d2750e 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3595,7 +3595,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) * this segment (RFC793 Section 3.9). */ if (after(ack, tp->snd_nxt)) - goto invalid_ack; + return -1; if (after(ack, prior_snd_una)) { flag |= FLAG_SND_UNA_ADVANCED; @@ -3714,10 +3714,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_process_tlp_ack(sk, ack, flag); return 1; -invalid_ack: - SOCK_DEBUG(sk, "Ack %u after %u:%u\n", ack, tp->snd_una, tp->snd_nxt); - return -1; - old_ack: /* If data was SACKed, tag it and see if we should send more data. * If data was DSACKed, see if we can undo a cwnd reduction. @@ -3731,7 +3727,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_xmit_recovery(sk, rexmit); } - SOCK_DEBUG(sk, "Ack %u before %u:%u\n", ack, tp->snd_una, tp->snd_nxt); return 0; } @@ -4432,13 +4427,9 @@ static void tcp_ofo_queue(struct sock *sk) rb_erase(&skb->rbnode, &tp->out_of_order_queue); if (unlikely(!after(TCP_SKB_CB(skb)->end_seq, tp->rcv_nxt))) { - SOCK_DEBUG(sk, "ofo packet was already received\n"); tcp_drop(sk, skb); continue; } - SOCK_DEBUG(sk, "ofo requeuing : rcv_next %X seq %X - %X\n", - tp->rcv_nxt, TCP_SKB_CB(skb)->seq, - TCP_SKB_CB(skb)->end_seq); tail = skb_peek_tail(&sk->sk_receive_queue); eaten = tail && tcp_try_coalesce(sk, tail, skb, &fragstolen); @@ -4502,8 +4493,6 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOQUEUE); seq = TCP_SKB_CB(skb)->seq; end_seq = TCP_SKB_CB(skb)->end_seq; - SOCK_DEBUG(sk, "out of order segment: rcv_next %X seq %X - %X\n", - tp->rcv_nxt, seq, end_seq); p = &tp->out_of_order_queue.rb_node; if (RB_EMPTY_ROOT(&tp->out_of_order_queue)) { @@ -4779,10 +4768,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) if (before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt)) { /* Partial packet, seq < rcv_next < end_seq */ - SOCK_DEBUG(sk, "partial packet: rcv_next %X seq %X - %X\n", - tp->rcv_nxt, TCP_SKB_CB(skb)->seq, - TCP_SKB_CB(skb)->end_seq); - tcp_dsack_set(sk, TCP_SKB_CB(skb)->seq, tp->rcv_nxt); /* If window is closed, drop tail of packet. But after @@ -5061,8 +5046,6 @@ static int tcp_prune_queue(struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); - SOCK_DEBUG(sk, "prune_queue: c=%x\n", tp->copied_seq); - NET_INC_STATS(sock_net(sk), LINUX_MIB_PRUNECALLED); if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index e51cda7..57ef69a1 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -220,8 +220,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, u32 exthdrlen = icsk->icsk_ext_hdr_len; struct sockaddr_in sin; - SOCK_DEBUG(sk, "connect: ipv4 mapped\n"); - if (__ipv6_only_sock(sk)) return -ENETUNREACH; -- 1.8.3.1