From owner-svn-src-head@freebsd.org  Tue Dec  1 06:23:16 2015
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 B2D22A3E77F;
 Tue,  1 Dec 2015 06:23:16 +0000 (UTC)
 (envelope-from arybchik@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 7C62C19BE;
 Tue,  1 Dec 2015 06:23:16 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB16NF4X029422;
 Tue, 1 Dec 2015 06:23:15 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB16NFWr029421;
 Tue, 1 Dec 2015 06:23:15 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201512010623.tB16NFWr029421@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Tue, 1 Dec 2015 06:23:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r291569 - head/sys/dev/sfxge
X-SVN-Group: head
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.20
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: Tue, 01 Dec 2015 06:23:16 -0000

Author: arybchik
Date: Tue Dec  1 06:23:15 2015
New Revision: 291569
URL: https://svnweb.freebsd.org/changeset/base/291569

Log:
  sfxge: avoid TSO packets collapses if packet header uses 2 segments
  
  It is really observed in the case of VLAN over sfxge interface.
  Also this change makes total value equal to 35 which is default assumed
  by the kernel for if_hw_tsomaxsegcount.
  
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      2 days
  Differential Revision: https://reviews.freebsd.org/D4319

Modified:
  head/sys/dev/sfxge/sfxge_tx.h

Modified: head/sys/dev/sfxge/sfxge_tx.h
==============================================================================
--- head/sys/dev/sfxge/sfxge_tx.h	Tue Dec  1 06:22:27 2015	(r291568)
+++ head/sys/dev/sfxge/sfxge_tx.h	Tue Dec  1 06:23:15 2015	(r291569)
@@ -53,11 +53,13 @@
  * TSO, the mbuf length may be just over 64K, divided into 2K mbuf
  * clusters taking into account that the first may be not 2K cluster
  * boundary aligned.
+ * Packet header may be split into two segments because of, for example,
+ * VLAN header insertion.
  * The chain could be longer than this initially, but can be shortened
  * with m_collapse().
  */
 #define	SFXGE_TX_MAPPING_MAX_SEG					\
-	(1 + howmany(SFXGE_TSO_MAX_SIZE, MCLBYTES) + 1)
+	(2 + howmany(SFXGE_TSO_MAX_SIZE, MCLBYTES) + 1)
 
 /*
  * Buffer mapping flags.