From owner-svn-src-user@FreeBSD.ORG  Fri Aug 23 20:37:44 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 CAD603D9;
 Fri, 23 Aug 2013 20:37:44 +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 B90682270;
 Fri, 23 Aug 2013 20:37:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NKbirW074520;
 Fri, 23 Aug 2013 20:37:44 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NKbiDj074519;
 Fri, 23 Aug 2013 20:37:44 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <201308232037.r7NKbiDj074519@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 23 Aug 2013 20:37:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r254736 - user/np/cxl_tuning/sys/sys
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Aug 2013 20:37:44 -0000

Author: np
Date: Fri Aug 23 20:37:44 2013
New Revision: 254736
URL: http://svnweb.freebsd.org/changeset/base/254736

Log:
  Don't leak tags when M_NOFREE | M_PKTHDR mbufs are freed.

Modified:
  user/np/cxl_tuning/sys/sys/mbuf.h

Modified: user/np/cxl_tuning/sys/sys/mbuf.h
==============================================================================
--- user/np/cxl_tuning/sys/sys/mbuf.h	Fri Aug 23 19:12:29 2013	(r254735)
+++ user/np/cxl_tuning/sys/sys/mbuf.h	Fri Aug 23 20:37:44 2013	(r254736)
@@ -530,18 +530,6 @@ m_free_fast(struct mbuf *m)
 	uma_zfree_arg(zone_mbuf, m, (void *)MB_NOTAGS);
 }
 
-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)
 {
@@ -1000,6 +988,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)
 {