From patchwork Fri Jul 13 00:48:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 943270 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=none (p=none dis=none) header.from=infradead.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="r/X2OhJp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41RZ1t3JqQz9rxx for ; Fri, 13 Jul 2018 10:49:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387901AbeGMBBJ (ORCPT ); Thu, 12 Jul 2018 21:01:09 -0400 Received: from merlin.infradead.org ([205.233.59.134]:52246 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387827AbeGMBBJ (ORCPT ); Thu, 12 Jul 2018 21:01:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Date:Message-ID:Subject:From:Cc:To:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nwHmH4u1FYAkef5bgvBbrjLCaIs8knC4zd/3crTPXho=; b=r/X2OhJpZ7ug7IAK9x6k5KHD71 g9O1YpSs+b6J8SiwDFjo+b8cJGr5vR2MjX1WhGIAXGteKwOUGvohiUOGceOuT7vywJjhiF0e0u7jX awphoxVkFp4u2t/NG5kRhSNg9zFUdvjV0LuOp1cFYh3kKxecIyrJIU14FkSmMioXD45eFCrBMfOq6 aKdFLIZkhlMbhWVm03z0zPizrg1dBxYeyviAbwgLbPB0yJuYHu8mAv/FR6BSlE+l+YN20gd8csM1o 8oEZGnWBMw5o52LbC74WrFvn7zp+7faLdRqzO/qXopP7YqLxpASQPVKllzMjJM2ndrO9QyQEAii+Q aoPPwL/A==; Received: from static-50-53-52-16.bvtn.or.frontiernet.net ([50.53.52.16] helo=midway.dunlab) by merlin.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fdmGV-00076Q-GJ; Fri, 13 Jul 2018 00:48:56 +0000 To: "netdev@vger.kernel.org" , David Miller , Eric Dumazet Cc: =?utf-8?b?56mN5Li55bC8IERhbiBKYWNvYnNvbg==?= From: Randy Dunlap Subject: [PATCH net-next] TCP: make seq # error messages more readable Message-ID: <48586224-eb36-2489-735c-4946cb0b1c2b@infradead.org> Date: Thu, 12 Jul 2018 17:48:50 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Randy Dunlap Attempt to make cryptic TCP seq number error messages clearer by (1) adding the function name, (2) identifying the errors as "seq # bug", and (3) grouping the field identifiers and values by separating them with commas. E.g., the following message is changed from: recvmsg bug 2: copied 73BCB6CD seq 70F17CBE rcvnxt 73BCB9AA fl 0 WARNING: CPU: 2 PID: 1501 at /linux/net/ipv4/tcp.c:1881 tcp_recvmsg+0x649/0xb90 to: tcp_recvmsg: TCP recvmsg seq # bug 2: copied 73BCB6CD, seq 70F17CBE, rcvnxt 73BCB9AA, fl 0 WARNING: CPU: 2 PID: 1501 at /linux/net/ipv4/tcp.c:2011 tcp_recvmsg+0x694/0xba0 Suggested-by: 積丹尼 Dan Jacobson Signed-off-by: Randy Dunlap --- net/ipv4/tcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- linux-next-20180712.orig/net/ipv4/tcp.c +++ linux-next-20180712/net/ipv4/tcp.c @@ -1994,9 +1994,9 @@ int tcp_recvmsg(struct sock *sk, struct * shouldn't happen. */ if (WARN(before(*seq, TCP_SKB_CB(skb)->seq), - "recvmsg bug: copied %X seq %X rcvnxt %X fl %X\n", - *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, - flags)) + "%s: TCP recvmsg seq # bug: copied %X, seq %X, rcvnxt %X, fl %X\n", + __func__, *seq, + TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags)) break; offset = *seq - TCP_SKB_CB(skb)->seq; @@ -2009,8 +2009,9 @@ int tcp_recvmsg(struct sock *sk, struct if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) goto found_fin_ok; WARN(!(flags & MSG_PEEK), - "recvmsg bug 2: copied %X seq %X rcvnxt %X fl %X\n", - *seq, TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags); + "%s: TCP recvmsg seq # bug 2: copied %X, seq %X, rcvnxt %X, fl %X\n", + __func__, *seq, + TCP_SKB_CB(skb)->seq, tp->rcv_nxt, flags); } /* Well, if we have backlog, try to process it now yet. */