d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make m_freem() just use m_free() instead of duplicating the code. The

Browse Source 
reason for the duplication was that m_freem() was meant to eventually
be optimized to hold the lock of the cache being freed to as long as
possible across frees but the difficulty of implementing said
optimization right now is too high, given that in some cases (see MAC
and non-cluster external buffers), we need to call into other subsytems,
something not permissible when the cache lock is held.

This change minimizes code duplication while keeping at least the
atomic mbuf+cluster free optimization.

Suggested by: luigi
This commit is contained in:
Bosko Milekic 2003-05-10 18:08:23 +00:00
parent 5d8568224e
commit 969bab3efb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=114876
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/kern/subr_mbuf.c
View File

@ -1422,39 +1422,9 @@ m_free(struct mbuf *mb)
void
m_freem(struct mbuf *mb)
{
struct mbuf *m;
int cchnum;
short persist;
while (mb != NULL) {
#ifdef INVARIANTS
if (mb->m_flags & M_FREELIST)
panic("m_freem detected a mbuf double-free");
mb->m_flags |= M_FREELIST;
#endif
if ((mb->m_flags & M_PKTHDR) != 0)
m_tag_delete_chain(mb, NULL);
persist = 0;
m = mb;
mb = mb->m_next;
if ((m->m_flags & M_EXT) != 0) {
MEXT_REM_REF(m);
if (atomic_cmpset_int(m->m_ext.ref_cnt, 0, 1)) {
if (m->m_ext.ext_type == EXT_CLUSTER) {
mb_free(&mb_list_clust,
(caddr_t)m->m_ext.ext_buf,
MT_NOTMBUF, MBP_PERSIST, &cchnum);
persist = MBP_PERSISTENT;
} else {
(*(m->m_ext.ext_free))(m->m_ext.ext_buf,
m->m_ext.ext_args);
_mext_dealloc_ref(m);
persist = 0;
}
}
}
mb_free(&mb_list_mbuf, m, m->m_type, persist, &cchnum);
}
while (mb != NULL)
mb = m_free(mb);
}
/*