From owner-svn-src-all@FreeBSD.ORG  Thu Aug 29 08:07:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 0383221B;
 Thu, 29 Aug 2013 08:07:36 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E42C92D98;
 Thu, 29 Aug 2013 08:07:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7T87ZGM059518;
 Thu, 29 Aug 2013 08:07:35 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7T87Zs0059517;
 Thu, 29 Aug 2013 08:07:35 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201308290807.r7T87Zs0059517@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Thu, 29 Aug 2013 08:07:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255016 - head/sys/sys
X-SVN-Group: head
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.14
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Aug 2013 08:07:36 -0000

Author: np
Date: Thu Aug 29 08:07:35 2013
New Revision: 255016
URL: http://svnweb.freebsd.org/changeset/base/255016

Log:
  Merge r254736 from user/np/cxl_tuning.
  
  Don't leak tags when M_NOFREE | M_PKTHDR mbufs are freed.
  
  Reviewed by:	andre

Modified:
  head/sys/sys/mbuf.h
Directory Properties:
  head/sys/   (props changed)

Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h	Thu Aug 29 06:26:22 2013	(r255015)
+++ head/sys/sys/mbuf.h	Thu Aug 29 08:07:35 2013	(r255016)
@@ -646,18 +646,6 @@ m_getcl(int how, short type, int flags)
 	return (uma_zalloc_arg(zone_pack, &args, how));
 }
 
-static __inline struct mbuf *
-m_free(struct mbuf *m)
-{
-	struct mbuf *n = m->m_next;
-
-	if (m->m_flags & M_EXT)
-		mb_free_ext(m);
-	else if ((m->m_flags & M_NOFREE) == 0)
-		uma_zfree(zone_mbuf, m);
-	return (n);
-}
-
 static __inline void
 m_clget(struct mbuf *m, int how)
 {
@@ -1124,6 +1112,20 @@ m_tag_find(struct mbuf *m, int type, str
 	    m_tag_locate(m, MTAG_ABI_COMPAT, type, start));
 }
 
+static __inline struct mbuf *
+m_free(struct mbuf *m)
+{
+	struct mbuf *n = m->m_next;
+
+	if ((m->m_flags & (M_PKTHDR|M_NOFREE)) == (M_PKTHDR|M_NOFREE))
+		m_tag_delete_chain(m, NULL);
+	if (m->m_flags & M_EXT)
+		mb_free_ext(m);
+	else if ((m->m_flags & M_NOFREE) == 0)
+		uma_zfree(zone_mbuf, m);
+	return (n);
+}
+
 static int inline
 rt_m_getfib(struct mbuf *m)
 {