From patchwork Fri Feb 15 14:49:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042934 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RNo0NEZ2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQJ2W7Gz9s7T for ; Sat, 16 Feb 2019 01:50:16 +1100 (AEDT) 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; From patchwork Fri Feb 15 14:49:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042935 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FaKLyxGf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQM2tf1z9s5c for ; Sat, 16 Feb 2019 01:50:19 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729357AbfBOOuS (ORCPT ); Fri, 15 Feb 2019 09:50:18 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33399 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuR (ORCPT ); Fri, 15 Feb 2019 09:50:17 -0500 Received: by mail-pf1-f193.google.com with SMTP id c123so4955298pfb.0 for ; Fri, 15 Feb 2019 06:50:16 -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=ZkqtwfokUFc5I4iISMT6Gjm9InpN3fFLQAXzafQBKKs=; b=FaKLyxGfLHaC+Z46t7jYssq0IaRb6eAo6bnEOnOe2ULH3s4f67YIKS/Cr2iMNADuS5 lFE6uE+F5pBwLY/lzurUtWaZym7ZOmssmCKteA7zq7kee8w/Uo+eY0q4TCUlSFAJZdEv kI92ce/4q4r5xVeF1CMzCemQRlIIYXvHFofUGP0dUV5cMTC6xOAcJ6R+qtqvHkH7uvYL ObJibhX0QAVUxt/HYuxppFm9YSiEtp66SZBAzNO1oy48vponO8zoGW3sSX32RfSVvsRQ G8Y9x9lzfwzYcy1DsZmSLjVRJGon5EnKUjyJvW7Elqr6Pv0Qp3R3OqLittD/h3PTOo6D nApQ== 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=ZkqtwfokUFc5I4iISMT6Gjm9InpN3fFLQAXzafQBKKs=; b=XcC2Rctqx6dUSWpPHn4OFTFWIq/rrZPvcv2C9EWW5tD5t0IPyoRK9kjG0/Ncw6Hv8g ENJcgbgYIGTSz0Ggo0vUZdDbQ//Rozn7hDa5opw6Y2EYK36Vmrd8QFJVONhjBm0x+yWs ofUp78Yi5wlIbRGgvmHsq+mlfMVFSeiYDYe3eC0k2FsO0MJ5DysMJBCiEJitO+hzFDTG DK0Or+JjyNqO1K+h5k961mSxhhqT2PQlxMa1Pn5goukLGKRx6tnqCESphpcYHM8CI8dI N6M1bMfT2oNJ/OYWLK8e8qUBGOgE6pUIQ8pr2cfa7GBFAmU2b64efs6pbJwsHCkMNOkU iUnw== X-Gm-Message-State: AHQUAuY5hMVNCC9byQTCd6xQ1V4dJMLtPx9lRPu/94RwcoUpaX8/5FwF P4vH9d9Rmg0YlRjP24zRkXQ= X-Google-Smtp-Source: AHgI3IbR6s9SD/N9Bvv1pvbxoWRYQYflmmN6qcqu0tO0H8XU4hKHq048UAFTiJXeg16o7FvHMDthyA== X-Received: by 2002:a62:5f07:: with SMTP id t7mr10148833pfb.108.1550242216589; Fri, 15 Feb 2019 06:50:16 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:15 -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 2/5] x25: clean up SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:44 +0800 Message-Id: <1550242187-29660-3-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 x25. [1] https://patchwork.ozlabs.org/patch/1035573/ [2] https://patchwork.ozlabs.org/patch/1040533/ Signed-off-by: Yafang Shao --- net/x25/af_x25.c | 12 ------------ net/x25/x25_facilities.c | 32 ++++++++++---------------------- net/x25/x25_out.c | 4 +--- 3 files changed, 11 insertions(+), 37 deletions(-) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 5121729..5892d05 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -705,7 +705,6 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) x25_insert_socket(sk); sock_reset_flag(sk, SOCK_ZAPPED); release_sock(sk); - SOCK_DEBUG(sk, "x25_bind: socket is bound\n"); out: return rc; } @@ -1148,11 +1147,7 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) goto out; } - SOCK_DEBUG(sk, "x25_sendmsg: sendto: Addresses built.\n"); - /* Build a packet */ - SOCK_DEBUG(sk, "x25_sendmsg: sendto: building packet.\n"); - if ((msg->msg_flags & MSG_OOB) && len > 32) len = 32; @@ -1170,8 +1165,6 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) /* * Put the data on the end */ - SOCK_DEBUG(sk, "x25_sendmsg: Copying user data\n"); - skb_reset_transport_header(skb); skb_put(skb, len); @@ -1194,8 +1187,6 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) /* * Push down the X.25 header */ - SOCK_DEBUG(sk, "x25_sendmsg: Building X.25 Header.\n"); - if (msg->msg_flags & MSG_OOB) { if (x25->neighbour->extended) { asmptr = skb_push(skb, X25_STD_MIN_LEN); @@ -1228,9 +1219,6 @@ static int x25_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) skb->data[0] |= X25_Q_BIT; } - SOCK_DEBUG(sk, "x25_sendmsg: Built header.\n"); - SOCK_DEBUG(sk, "x25_sendmsg: Transmitting buffer\n"); - rc = -ENOTCONN; if (sk->sk_state != TCP_ESTABLISHED) goto out_kfree_skb; diff --git a/net/x25/x25_facilities.c b/net/x25/x25_facilities.c index ad1734d..74a5284 100644 --- a/net/x25/x25_facilities.c +++ b/net/x25/x25_facilities.c @@ -286,10 +286,8 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, /* * They want reverse charging, we won't accept it. */ - if ((theirs.reverse & 0x01 ) && (ours->reverse & 0x01)) { - SOCK_DEBUG(sk, "X.25: rejecting reverse charging request\n"); + if ((theirs.reverse & 0x01) && (ours->reverse & 0x01)) return -1; - } new->reverse = theirs.reverse; @@ -298,37 +296,27 @@ int x25_negotiate_facilities(struct sk_buff *skb, struct sock *sk, int theirs_out = theirs.throughput & 0xf0; int ours_in = ours->throughput & 0x0f; int ours_out = ours->throughput & 0xf0; - if (!ours_in || theirs_in < ours_in) { - SOCK_DEBUG(sk, "X.25: inbound throughput negotiated\n"); + if (!ours_in || theirs_in < ours_in) new->throughput = (new->throughput & 0xf0) | theirs_in; - } - if (!ours_out || theirs_out < ours_out) { - SOCK_DEBUG(sk, - "X.25: outbound throughput negotiated\n"); + + if (!ours_out || theirs_out < ours_out) new->throughput = (new->throughput & 0x0f) | theirs_out; - } } if (theirs.pacsize_in && theirs.pacsize_out) { - if (theirs.pacsize_in < ours->pacsize_in) { - SOCK_DEBUG(sk, "X.25: packet size inwards negotiated down\n"); + if (theirs.pacsize_in < ours->pacsize_in) new->pacsize_in = theirs.pacsize_in; - } - if (theirs.pacsize_out < ours->pacsize_out) { - SOCK_DEBUG(sk, "X.25: packet size outwards negotiated down\n"); + + if (theirs.pacsize_out < ours->pacsize_out) new->pacsize_out = theirs.pacsize_out; - } } if (theirs.winsize_in && theirs.winsize_out) { - if (theirs.winsize_in < ours->winsize_in) { - SOCK_DEBUG(sk, "X.25: window size inwards negotiated down\n"); + if (theirs.winsize_in < ours->winsize_in) new->winsize_in = theirs.winsize_in; - } - if (theirs.winsize_out < ours->winsize_out) { - SOCK_DEBUG(sk, "X.25: window size outwards negotiated down\n"); + + if (theirs.winsize_out < ours->winsize_out) new->winsize_out = theirs.winsize_out; - } } return len; diff --git a/net/x25/x25_out.c b/net/x25/x25_out.c index 0144271..2a74f26 100644 --- a/net/x25/x25_out.c +++ b/net/x25/x25_out.c @@ -77,9 +77,7 @@ int x25_output(struct sock *sk, struct sk_buff *skb) kfree_skb(skb); return sent; } - SOCK_DEBUG(sk, "x25_output: fragment alloc" - " failed, err=%d, %d bytes " - "sent\n", err, sent); + return err; } From patchwork Fri Feb 15 14:49:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042936 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bH8TzAtw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQP49cdz9s5c for ; Sat, 16 Feb 2019 01:50:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731925AbfBOOuU (ORCPT ); Fri, 15 Feb 2019 09:50:20 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40405 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuT (ORCPT ); Fri, 15 Feb 2019 09:50:19 -0500 Received: by mail-pl1-f195.google.com with SMTP id bj4so5059511plb.7 for ; Fri, 15 Feb 2019 06:50:19 -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=a9b2e+K4YCb5BqtjgCbZQhHn574o6+YljzA1/Zvl8ns=; b=bH8TzAtwJpT5h0J1I77iwxOfdkbtVAV0KYb1pzGDtSpJLIcHfOoTSTr235wxQOq+Da FmJ6kuJ3HXpqbVMPYeXpD6pY9C936znjWLUq2q1ki/r7PACn0d0iWljvD56QvCqSdEXV XMDPezMpblYL2b8fTSTylFjYf9tj/27aTY2DUivfjC9JnO4jnEwO7/2qyqYj7BV6vpQn 8cZGs53sVzcEZrjfK3BWXiJA9VUInXYYrHWfkzuwZEzwFLn0exGicSPFtSp6QFZULjTv u7q+yi8zHEDvEFKsGLaCXYkj6D+xGwXpRm4ZiwxAp22gG4gZ4o6tyk6t+LR9RjelQ7kv qNVQ== 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=a9b2e+K4YCb5BqtjgCbZQhHn574o6+YljzA1/Zvl8ns=; b=FJRPn7/RQ23VbPF4DzanrkpuUPmqpkASu9YRoepvESEsuPniUCcllV5vKcfGYS0Zi/ IfT/cDktdxrIodje9YApXTguY+na5DQGA8lHBoput/O9dNx6jTEvb9QcIXrDZpEStv8g 2iAnJZO7vsiqZO9uuxpbwZcZ5mu1JXgpH64cCHOyvapxTlwG/yp+sGLvtFzs5Oh6upom gPVVHnNvaEE2dcz0Ku+JPdUTlBJuFyFgOlC8o/+BxRJobDighMnJUY45bXGrn7ZjvXox VN+RvGb6qatwaE03PW/PiXe1x0K5GeyBLxqjOQmg2xgIxGlm1VR1u+YukZz8gdIlH74O kPiw== X-Gm-Message-State: AHQUAuZF1QGtFWxvuw8SLEwLdNjG55CfCtCvhhgtcKwQKXAtuEF0qC1P Cj9q5IJ5LSBCi9zss+IB4sk= X-Google-Smtp-Source: AHgI3IbdCrsujFSJ273i6VZAJfwVhAVWTKDc3ecN/hnJFJJP/EDcaFSU+cRUyzGpSS8Tl3UKPhtmJQ== X-Received: by 2002:a17:902:b701:: with SMTP id d1mr10114052pls.124.1550242219123; Fri, 15 Feb 2019 06:50:19 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:18 -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 3/5] appletalk: clean up SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:45 +0800 Message-Id: <1550242187-29660-4-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 appletalk. [1] https://patchwork.ozlabs.org/patch/1035573/ [2] https://patchwork.ozlabs.org/patch/1040533/ Signed-off-by: Yafang Shao --- net/appletalk/ddp.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c index 9b6bc5a..326c4fd 100644 --- a/net/appletalk/ddp.c +++ b/net/appletalk/ddp.c @@ -1608,8 +1608,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) } /* Build a packet */ - SOCK_DEBUG(sk, "SK %p: Got address.\n", sk); - /* For headers */ size = sizeof(struct ddpehdr) + len + ddp_dl->header_length; @@ -1628,10 +1626,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) goto out; dev = rt->dev; - - SOCK_DEBUG(sk, "SK %p: Size needed %d, device %s\n", - sk, size, dev->name); - size += dev->hard_header_len; release_sock(sk); skb = sock_alloc_send_skb(sk, size, (flags & MSG_DONTWAIT), &err); @@ -1643,8 +1637,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) skb_reserve(skb, dev->hard_header_len); skb->dev = dev; - SOCK_DEBUG(sk, "SK %p: Begin build.\n", sk); - ddp = skb_put(skb, sizeof(struct ddpehdr)); ddp->deh_len_hops = htons(len + sizeof(*ddp)); ddp->deh_dnet = usat->sat_addr.s_net; @@ -1654,8 +1646,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) ddp->deh_dport = usat->sat_port; ddp->deh_sport = at->src_port; - SOCK_DEBUG(sk, "SK %p: Copy user data (%zd bytes).\n", sk, len); - err = memcpy_from_msg(skb_put(skb, len), msg, len); if (err) { kfree_skb(skb); @@ -1678,7 +1668,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) if (skb2) { loopback = 1; - SOCK_DEBUG(sk, "SK %p: send out(copy).\n", sk); /* * If it fails it is queued/sent above in the aarp queue */ @@ -1687,7 +1676,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) } if (dev->flags & IFF_LOOPBACK || loopback) { - SOCK_DEBUG(sk, "SK %p: Loop back.\n", sk); /* loop back */ skb_orphan(skb); if (ddp->deh_dnode == ATADDR_BCAST) { @@ -1707,7 +1695,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) } ddp_dl->request(ddp_dl, skb, dev->dev_addr); } else { - SOCK_DEBUG(sk, "SK %p: send out.\n", sk); if (rt->flags & RTF_GATEWAY) { gsat.sat_addr = rt->gateway; usat = &gsat; @@ -1718,7 +1705,6 @@ static int atalk_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) */ aarp_send_ddp(dev, skb, &usat->sat_addr, NULL); } - SOCK_DEBUG(sk, "SK %p: Done write (%zd).\n", sk, len); out: release_sock(sk); From patchwork Fri Feb 15 14:49:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042937 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ORC6BIAJ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQR6hd3z9s5c for ; Sat, 16 Feb 2019 01:50:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732883AbfBOOuX (ORCPT ); Fri, 15 Feb 2019 09:50:23 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:38949 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuW (ORCPT ); Fri, 15 Feb 2019 09:50:22 -0500 Received: by mail-pl1-f196.google.com with SMTP id 101so5064040pld.6 for ; Fri, 15 Feb 2019 06:50:22 -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=sxnLW4/9WnhEo/uxgQj/bn4NV9NpmmO5f0cNI1WIkok=; b=ORC6BIAJCVv6pj2B0i/FQVr6i0yQYF5lojwbB0sjXaxR9ZiKU9cNWZJhrhyHkTM5b1 JY2ff5KBoMvAgknXFcJzeTjGlGr8n3LefE+daObq8EEcTg9M4l33WtxKz/YukRm4kvxJ 5qNGDx1cG2in52eM1op6Q/GpW0m3hPjjadYjPAeJxMRDIHUrOss/Q6pw4Y1W/zIw7MIx FryaF+UUwbfrIc+I9WuQJKmXaiM5AUHls0MsaaZxI9N1QLQFjWEaq6iNKI5SWNUsvjBZ LkwL9S5KYeDDrAJtCaVQKxP0RD6YoDaL8tuyA7gPu0DuwGzc3zlKA3g6KaXOiCTCmuZD knkw== 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=sxnLW4/9WnhEo/uxgQj/bn4NV9NpmmO5f0cNI1WIkok=; b=L/ZocGqZjX8AU1aYfhoABSS5jycsCFvzbCK9fg5QzVLzmRhLH1MVlBfd20rA/5reog 6uZxpG4liKslLPlJo9KDv9JI2mEFjL8Ek7jzxliKesvC7Vv5BK2r09bBf+gxc+mlTQ1f gaSJPk9J2/HCUXorfnJgrGERdu4Ngw2XPKaa6fcQLis2jz1WIXSbktZj6J7v+BTEoxcY aZj4+wFK54uK0aOMe8BJNJLJMWBafdJZL1kD/nyZSse3Nqssp5WGXkpxqzfFTpdxgZ4D RI5qrgFpJE2NlObjWP4dRbI4mKRHjahibxRZbPE0Ij0SOCxv1RAl0fytfH3ufcsvMln8 bNkg== X-Gm-Message-State: AHQUAuaq/Ii6LZ8Ee+UUrefCmPBW9hZACnvrmV6F3lckEAs5HgBxa3+8 g9fieXZMp3Q4KWWPvzLtZ/8= X-Google-Smtp-Source: AHgI3IZlGkWZ88bS06CHgJzJthkCzA446e2UpoXmGcDNsVKhWH/fr8nUAdsNKL3cu/4lS9DtXjpUEg== X-Received: by 2002:a17:902:bd86:: with SMTP id q6mr10358662pls.16.1550242221814; Fri, 15 Feb 2019 06:50:21 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:21 -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 4/5] dccp: clean up SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:46 +0800 Message-Id: <1550242187-29660-5-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 dccp. [1] https://patchwork.ozlabs.org/patch/1035573/ [2] https://patchwork.ozlabs.org/patch/1040533/ Signed-off-by: Yafang Shao --- net/dccp/ipv6.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index d5740ba..8e72e50 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -878,8 +878,6 @@ static int dccp_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; From patchwork Fri Feb 15 14:49:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042939 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WCflwseo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQV4ZClz9s5c for ; Sat, 16 Feb 2019 01:50:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732927AbfBOOuZ (ORCPT ); Fri, 15 Feb 2019 09:50:25 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41336 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuY (ORCPT ); Fri, 15 Feb 2019 09:50:24 -0500 Received: by mail-pl1-f193.google.com with SMTP id k15so5062088pls.8 for ; Fri, 15 Feb 2019 06:50:24 -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=jZLwEQvEa/hORXtxbnoGIj21yd191QB3t4njHa58Ne0=; b=WCflwseofnzKtp1YXGCELQuwGj3HkAgDguVwxFJWIMe7N3hW7alenBQTeSNixEcaNN IWJQjYin1En2WxQ69Q79Z9W+DxjmUXWYzT2wAOcVB+4Xm1hOfE2GvgDAK7xiWDOUiszl 1mrPkXeRF4CXDjmGhUC/PrSAoh9Hwno5J3RBu9ymEgnbgL2uU2lQKAX/nx4k26lpdjBX FkEDGiTPNK2raE0jnuSbj+3bW6yOgi7hzYWI5hNnBR50KTgMRAHQ8l4Il/X7I9wgA9Ly ubsS5jTtTMIU4/pZJQAoXihDLNbPQj5Ki8/TrBviwd4lVPF26p/0Ge/YXvyoQ7/oKJYr bL5A== 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=jZLwEQvEa/hORXtxbnoGIj21yd191QB3t4njHa58Ne0=; b=hSouA5zQZeLO1EQprbBU8l8LuAEZUBwILrwLQltNRclZj6Bi4U5F6UKMmPLHLmDrTw W0dKLZ4QKTs6oBziFbTQXeoK31SlVpBl+R1pGO9C9Vje2Qo2qgFV4IYh7niC/k17geFl v8vaFUGiqKGIWsP2Ohseuc/4UPljRlx/ZNtdk9qAVUwZYio4UODr+NxxYb0tuEmNQKN4 iDhZo4d1kFsK3I8iqgS0oD0pjy/Ns0EaEP697fmU2Vex50323VTrzwxiq8mNcz1C6C4w BF4Lb5Wf8HTnPYAUuRDQh1obEefPoc0X6SsjIxFcwBKq4Jcr+lpy5FHeD21sv07KPXaR dfZQ== X-Gm-Message-State: AHQUAuakq+UTcvvqCst7gfmRssWxXS6zaZ82Ru3WNe2tdUrXlKZn6/of ECILeKVc3qXMh4md/7WVOS8= X-Google-Smtp-Source: AHgI3IbHu2DIPv1QvFsLgSDhpesuWy9WBYraDmWEGi8DcnWjHPCFf828wFSJcIf745WgdGsPUfpJRw== X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr7333504plp.201.1550242224237; Fri, 15 Feb 2019 06:50:24 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:23 -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 5/5] net: sock: remove the definition of SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:47 +0800 Message-Id: <1550242187-29660-6-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 As SOCK_DEBUG() isn't used any more, we can get ride of it now. Regarding the SO_DEBUG in sock_{s,g}etsockopt, I think it is better to keep as-is, because if we return an errno to tell the application that this optname isn't supported, it may break the application. The application still can use this option but don't take any effect from now on. Signed-off-by: Yafang Shao --- include/net/sock.h | 19 ------------------- net/core/sock.c | 3 +++ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 6679f3c..4c6b599 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -74,25 +74,6 @@ #include #include -/* - * This structure really needs to be cleaned up. - * Most of it is for TCP, and not used by any of - * the other protocols. - */ - -/* Define this to get the SOCK_DBG debugging facility. */ -#define SOCK_DEBUGGING -#ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \ - printk(KERN_DEBUG msg); } while (0) -#else -/* Validate arguments and do nothing */ -static inline __printf(2, 3) -void SOCK_DEBUG(const struct sock *sk, const char *msg, ...) -{ -} -#endif - /* This is the per-socket lock. The spinlock provides a synchronization * between user contexts and software interrupt processing, whereas the * mini-semaphore synchronizes multiple users amongst themselves. diff --git a/net/core/sock.c b/net/core/sock.c index 71ded4d..a980ff3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -753,6 +753,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname, switch (optname) { case SO_DEBUG: + /* This option doesn't take effect now, + * but we need to keep it for backward compatibility. + */ if (val && !capable(CAP_NET_ADMIN)) ret = -EACCES; else