From owner-svn-src-head@freebsd.org  Thu Dec 21 01:22:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2DDCE8E027;
 Thu, 21 Dec 2017 01:22:37 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FD0C6C59F;
 Thu, 21 Dec 2017 01:22:37 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBL1Magq046070;
 Thu, 21 Dec 2017 01:22:36 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBL1Maqw046069;
 Thu, 21 Dec 2017 01:22:36 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201712210122.vBL1Maqw046069@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
 shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Thu, 21 Dec 2017 01:22:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327052 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 327052
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Dec 2017 01:22:37 -0000

Author: shurd
Date: Thu Dec 21 01:22:36 2017
New Revision: 327052
URL: https://svnweb.freebsd.org/changeset/base/327052

Log:
  Don't call tcp_lro_rx() unless hardware verified TCP/UDP csum
  
  It seems that tcp_lro_rx() doesn't verify TCP checksums, so
  if there are bad checksums in the packets caused by invalid data, the
  invalid data will pass through without errors.
  
  This was noticed with the igb driver and a specific internet host:
  fetch http://www.mpfr.org/mpfr-current/mpfr-3.1.6.tar.xz -o test.bin && sha256 test.bin
  Would result in a different value sometimes.
  
  This ends up making LRO require RXCSUM to be enabled, and RXCSUM to
  support TCP and UDP checksums.
  
  PR:		224346
  Reported by:	gjb
  Reviewed by:	sbruno
  Sponsored by:	Limelight Networks
  Differential Revision:	https://reviews.freebsd.org/D13561

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Thu Dec 21 00:35:14 2017	(r327051)
+++ head/sys/net/iflib.c	Thu Dec 21 01:22:36 2017	(r327052)
@@ -2632,8 +2632,11 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
 					mt = mf = NULL;
 				}
 			}
-			if (lro_possible && tcp_lro_rx(&rxq->ifr_lc, m, 0) == 0)
+			if ((m->m_pkthdr.csum_flags & (CSUM_L4_CALC|CSUM_L4_VALID)) ==
+			    (CSUM_L4_CALC|CSUM_L4_VALID)) {
+				if (lro_possible && tcp_lro_rx(&rxq->ifr_lc, m, 0) == 0)
 				continue;
+			}
 		}
 #endif
 		if (lro_possible) {