From owner-svn-src-all@freebsd.org  Tue Jul 25 14:38:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 AFC62C7DA20;
 Tue, 25 Jul 2017 14:38:31 +0000 (UTC)
 (envelope-from sbruno@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 7D0B17D8FE;
 Tue, 25 Jul 2017 14:38:31 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6PEcUPX026284;
 Tue, 25 Jul 2017 14:38:30 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6PEcUAC026283;
 Tue, 25 Jul 2017 14:38:30 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201707251438.v6PEcUAC026283@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Tue, 25 Jul 2017 14:38:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r321476 - head/sys/dev/ixgbe
X-SVN-Group: head
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: head/sys/dev/ixgbe
X-SVN-Commit-Revision: 321476
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jul 2017 14:38:31 -0000

Author: sbruno
Date: Tue Jul 25 14:38:30 2017
New Revision: 321476
URL: https://svnweb.freebsd.org/changeset/base/321476

Log:
  Drop ixgbe RX lock during TCP_LRO processing.  This eliminates a "storm"
  of LOR detection and a bit of lock release/acquire collision when using LRO.
  
  Submitted by:   Kevin Bowling <kevin.bowling@kev009.com>
  MFC after:      2 days
  Differential Revision:  https://reviews.freebsd.org/D11712

Modified:
  head/sys/dev/ixgbe/ix_txrx.c

Modified: head/sys/dev/ixgbe/ix_txrx.c
==============================================================================
--- head/sys/dev/ixgbe/ix_txrx.c	Tue Jul 25 14:35:44 2017	(r321475)
+++ head/sys/dev/ixgbe/ix_txrx.c	Tue Jul 25 14:38:30 2017	(r321476)
@@ -1593,9 +1593,7 @@ ixgbe_rx_input(struct rx_ring *rxr, struct ifnet *ifp,
 			if (tcp_lro_rx(&rxr->lro, m, 0) == 0)
 				return;
 	}
-	IXGBE_RX_UNLOCK(rxr);
 	(*ifp->if_input)(ifp, m);
-	IXGBE_RX_LOCK(rxr);
 } /* ixgbe_rx_input */
 
 /************************************************************************
@@ -1880,7 +1878,9 @@ next_desc:
 		/* Now send to the stack or do LRO */
 		if (sendmp != NULL) {
 			rxr->next_to_check = i;
+			IXGBE_RX_UNLOCK(rxr);
 			ixgbe_rx_input(rxr, ifp, sendmp, ptype);
+			IXGBE_RX_LOCK(rxr);
 			i = rxr->next_to_check;
 		}
 
@@ -1897,12 +1897,12 @@ next_desc:
 
 	rxr->next_to_check = i;
 
+	IXGBE_RX_UNLOCK(rxr);
+
 	/*
 	 * Flush any outstanding LRO work
 	 */
 	tcp_lro_flush_all(lro);
-
-	IXGBE_RX_UNLOCK(rxr);
 
 	/*
 	 * Still have cleaning to do?