From owner-svn-src-all@FreeBSD.ORG Sun Mar 17 07:44:17 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 63EA9271; Sun, 17 Mar 2013 07:44:17 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) by mx1.freebsd.org (Postfix) with ESMTP id E6D796D6; Sun, 17 Mar 2013 07:44:16 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.6/8.14.6) with ESMTP id r2H7iFS5061846; Sun, 17 Mar 2013 11:44:15 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.6/8.14.6/Submit) id r2H7iFTE061845; Sun, 17 Mar 2013 11:44:15 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Sun, 17 Mar 2013 11:44:14 +0400 From: Gleb Smirnoff To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r248418 - head/sys/kern Message-ID: <20130317074414.GS48089@FreeBSD.org> References: <201303170741.r2H7fE18000812@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <201303170741.r2H7fE18000812@svn.freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Mar 2013 07:44:17 -0000 In r248418 and r248417 another change from my tree leaked: - Removing M_FREELIST flag, that comes from historical mbuf allocator predating FreeBSD 5.x. On Sun, Mar 17, 2013 at 07:41:14AM +0000, Gleb Smirnoff wrote: T> Author: glebius T> Date: Sun Mar 17 07:41:14 2013 T> New Revision: 248418 T> URL: http://svnweb.freebsd.org/changeset/base/248418 T> T> Log: T> In m_align() add assertions that mbuf is virgin, similar to assertions T> in M_ALIGN(), MH_ALIGN, MEXT_ALIGN() macros. T> T> Modified: T> head/sys/kern/uipc_mbuf.c T> T> Modified: head/sys/kern/uipc_mbuf.c T> ============================================================================== T> --- head/sys/kern/uipc_mbuf.c Sun Mar 17 07:39:45 2013 (r248417) T> +++ head/sys/kern/uipc_mbuf.c Sun Mar 17 07:41:14 2013 (r248418) T> @@ -395,7 +395,7 @@ m_demote(struct mbuf *m0, int all) T> m_freem(m->m_nextpkt); T> m->m_nextpkt = NULL; T> } T> - m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_FREELIST|M_NOFREE); T> + m->m_flags = m->m_flags & (M_EXT|M_RDONLY|M_NOFREE); T> } T> } T> T> @@ -1877,14 +1877,22 @@ m_mbuftouio(struct uio *uio, struct mbuf T> void T> m_align(struct mbuf *m, int len) T> { T> +#ifdef INVARIANTS T> + const char *msg = "%s: not a virgin mbuf"; T> +#endif T> int adjust; T> T> - if (m->m_flags & M_EXT) T> + if (m->m_flags & M_EXT) { T> + KASSERT(m->m_data == m->m_ext.ext_buf, (msg, __func__)); T> adjust = m->m_ext.ext_size - len; T> - else if (m->m_flags & M_PKTHDR) T> + } else if (m->m_flags & M_PKTHDR) { T> + KASSERT(m->m_data == m->m_pktdat, (msg, __func__)); T> adjust = MHLEN - len; T> - else T> + } else { T> + KASSERT(m->m_data == m->m_dat, (msg, __func__)); T> adjust = MLEN - len; T> + } T> + T> m->m_data += adjust &~ (sizeof(long)-1); T> } T> -- Totus tuus, Glebius.