2001-12-23 22:04:08 +00:00
|
|
|
/*-
|
2002-07-23 14:55:33 +00:00
|
|
|
* Copyright (c) 2001, 2002
|
2001-12-23 22:04:08 +00:00
|
|
|
* Bosko Milekic <bmilekic@FreeBSD.org>. All rights reserved.
|
2001-06-22 06:35:32 +00:00
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
|
|
* derived from this software without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* $FreeBSD$
|
|
|
|
*/
|
|
|
|
|
2002-07-31 01:42:19 +00:00
|
|
|
#include "opt_mac.h"
|
2001-06-22 06:35:32 +00:00
|
|
|
#include "opt_param.h"
|
2002-07-31 01:42:19 +00:00
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
|
|
|
#include <sys/malloc.h>
|
2002-07-31 01:42:19 +00:00
|
|
|
#include <sys/mac.h>
|
2001-06-22 06:35:32 +00:00
|
|
|
#include <sys/mbuf.h>
|
|
|
|
#include <sys/lock.h>
|
|
|
|
#include <sys/mutex.h>
|
|
|
|
#include <sys/condvar.h>
|
|
|
|
#include <sys/smp.h>
|
|
|
|
#include <sys/kernel.h>
|
|
|
|
#include <sys/sysctl.h>
|
|
|
|
#include <sys/domain.h>
|
|
|
|
#include <sys/protosw.h>
|
2001-12-23 22:04:08 +00:00
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
#include <vm/vm.h>
|
|
|
|
#include <vm/vm_kern.h>
|
|
|
|
#include <vm/vm_extern.h>
|
2002-06-13 23:53:42 +00:00
|
|
|
#include <vm/pmap.h>
|
|
|
|
#include <vm/vm_map.h>
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/******************************************************************************
|
|
|
|
* mb_alloc mbuf and cluster allocator.
|
|
|
|
*
|
2001-06-22 06:35:32 +00:00
|
|
|
* Maximum number of PCPU containers. If you know what you're doing you could
|
|
|
|
* explicitly define MBALLOC_NCPU to be exactly the number of CPUs on your
|
2001-07-26 18:47:46 +00:00
|
|
|
* system during compilation, and thus prevent kernel structure bloat.
|
|
|
|
*
|
2001-12-23 22:04:08 +00:00
|
|
|
* SMP and non-SMP kernels clearly have a different number of possible CPUs,
|
2001-07-26 18:47:46 +00:00
|
|
|
* but because we cannot assume a dense array of CPUs, we always allocate
|
|
|
|
* and traverse PCPU containers up to NCPU amount and merely check for
|
|
|
|
* CPU availability.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
#ifdef MBALLOC_NCPU
|
2001-06-22 06:35:32 +00:00
|
|
|
#define NCPU MBALLOC_NCPU
|
|
|
|
#else
|
|
|
|
#define NCPU MAXCPU
|
|
|
|
#endif
|
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
/*-
|
2001-06-22 06:35:32 +00:00
|
|
|
* The mbuf allocator is heavily based on Alfred Perlstein's
|
|
|
|
* (alfred@FreeBSD.org) "memcache" allocator which is itself based
|
|
|
|
* on concepts from several per-CPU memory allocators. The difference
|
|
|
|
* between this allocator and memcache is that, among other things:
|
|
|
|
*
|
|
|
|
* (i) We don't free back to the map from the free() routine - we leave the
|
|
|
|
* option of implementing lazy freeing (from a kproc) in the future.
|
|
|
|
*
|
|
|
|
* (ii) We allocate from separate sub-maps of kmem_map, thus limiting the
|
|
|
|
* maximum number of allocatable objects of a given type. Further,
|
|
|
|
* we handle blocking on a cv in the case that the map is starved and
|
|
|
|
* we have to rely solely on cached (circulating) objects.
|
|
|
|
*
|
|
|
|
* The mbuf allocator keeps all objects that it allocates in mb_buckets.
|
|
|
|
* The buckets keep a page worth of objects (an object can be an mbuf or an
|
|
|
|
* mbuf cluster) and facilitate moving larger sets of contiguous objects
|
|
|
|
* from the per-CPU lists to the main list for the given object. The buckets
|
|
|
|
* also have an added advantage in that after several moves from a per-CPU
|
|
|
|
* list to the main list and back to the per-CPU list, contiguous objects
|
|
|
|
* are kept together, thus trying to put the TLB cache to good use.
|
|
|
|
*
|
|
|
|
* The buckets are kept on singly-linked lists called "containers." A container
|
2001-12-23 22:04:08 +00:00
|
|
|
* is protected by a mutex lock in order to ensure consistency. The mutex lock
|
2002-05-16 22:43:20 +00:00
|
|
|
* itself is allocated separately and attached to the container at boot time,
|
2001-12-23 22:04:08 +00:00
|
|
|
* thus allowing for certain containers to share the same mutex lock. Per-CPU
|
2001-06-22 06:35:32 +00:00
|
|
|
* containers for mbufs and mbuf clusters all share the same per-CPU
|
2001-12-23 22:04:08 +00:00
|
|
|
* lock whereas the "general system" containers (i.e., the "main lists") for
|
2001-06-22 06:35:32 +00:00
|
|
|
* these objects share one global lock.
|
|
|
|
*/
|
|
|
|
struct mb_bucket {
|
2001-12-23 22:04:08 +00:00
|
|
|
SLIST_ENTRY(mb_bucket) mb_blist;
|
|
|
|
int mb_owner;
|
|
|
|
int mb_numfree;
|
|
|
|
void *mb_free[0];
|
2001-06-22 06:35:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct mb_container {
|
2001-12-23 22:04:08 +00:00
|
|
|
SLIST_HEAD(mc_buckethd, mb_bucket) mc_bhead;
|
|
|
|
struct mtx *mc_lock;
|
|
|
|
int mc_numowner;
|
|
|
|
u_int mc_starved;
|
|
|
|
long *mc_types;
|
|
|
|
u_long *mc_objcount;
|
|
|
|
u_long *mc_numpgs;
|
2001-06-22 06:35:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct mb_gen_list {
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_container mb_cont;
|
|
|
|
struct cv mgl_mstarved;
|
2001-06-22 06:35:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
struct mb_pcpu_list {
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_container mb_cont;
|
2001-06-22 06:35:32 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Boot-time configurable object counts that will determine the maximum
|
2001-12-23 22:04:08 +00:00
|
|
|
* number of permitted objects in the mbuf and mcluster cases. In the
|
2001-06-22 06:35:32 +00:00
|
|
|
* ext counter (nmbcnt) case, it's just an indicator serving to scale
|
|
|
|
* kmem_map size properly - in other words, we may be allowed to allocate
|
|
|
|
* more than nmbcnt counters, whereas we will never be allowed to allocate
|
|
|
|
* more than nmbufs mbufs or nmbclusters mclusters.
|
|
|
|
* As for nsfbufs, it is used to indicate how many sendfile(2) buffers will be
|
|
|
|
* allocatable by the sfbuf allocator (found in uipc_syscalls.c)
|
|
|
|
*/
|
|
|
|
#ifndef NMBCLUSTERS
|
2001-07-26 23:08:31 +00:00
|
|
|
#define NMBCLUSTERS (1024 + maxusers * 64)
|
2001-06-22 06:35:32 +00:00
|
|
|
#endif
|
2001-12-23 22:04:08 +00:00
|
|
|
#ifndef NMBUFS
|
2001-07-26 23:08:31 +00:00
|
|
|
#define NMBUFS (nmbclusters * 2)
|
2001-06-22 06:35:32 +00:00
|
|
|
#endif
|
2001-12-23 22:04:08 +00:00
|
|
|
#ifndef NSFBUFS
|
2001-07-26 23:08:31 +00:00
|
|
|
#define NSFBUFS (512 + maxusers * 16)
|
2001-06-22 06:35:32 +00:00
|
|
|
#endif
|
2001-12-23 22:04:08 +00:00
|
|
|
#ifndef NMBCNTS
|
2001-07-26 23:08:31 +00:00
|
|
|
#define NMBCNTS (nmbclusters + nsfbufs)
|
2001-06-22 06:35:32 +00:00
|
|
|
#endif
|
2001-07-26 23:08:31 +00:00
|
|
|
int nmbufs;
|
|
|
|
int nmbclusters;
|
|
|
|
int nmbcnt;
|
|
|
|
int nsfbufs;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform sanity checks of tunables declared above.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
tunable_mbinit(void *dummy)
|
|
|
|
{
|
2001-07-26 23:08:31 +00:00
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
|
|
|
* This has to be done before VM init.
|
|
|
|
*/
|
2001-07-26 23:08:31 +00:00
|
|
|
nmbclusters = NMBCLUSTERS;
|
|
|
|
TUNABLE_INT_FETCH("kern.ipc.nmbclusters", &nmbclusters);
|
|
|
|
nmbufs = NMBUFS;
|
|
|
|
TUNABLE_INT_FETCH("kern.ipc.nmbufs", &nmbufs);
|
|
|
|
nsfbufs = NSFBUFS;
|
|
|
|
TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs);
|
|
|
|
nmbcnt = NMBCNTS;
|
|
|
|
TUNABLE_INT_FETCH("kern.ipc.nmbcnt", &nmbcnt);
|
|
|
|
/* Sanity checks */
|
2001-06-22 06:35:32 +00:00
|
|
|
if (nmbufs < nmbclusters * 2)
|
|
|
|
nmbufs = nmbclusters * 2;
|
|
|
|
if (nmbcnt < nmbclusters + nsfbufs)
|
|
|
|
nmbcnt = nmbclusters + nsfbufs;
|
|
|
|
}
|
|
|
|
SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL);
|
|
|
|
|
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* The freelist structures and mutex locks. The number statically declared
|
2001-06-22 06:35:32 +00:00
|
|
|
* here depends on the number of CPUs.
|
|
|
|
*
|
2001-12-23 22:04:08 +00:00
|
|
|
* We set up in such a way that all the objects (mbufs, clusters)
|
|
|
|
* share the same mutex lock. It has been established that we do not benefit
|
2001-06-22 06:35:32 +00:00
|
|
|
* from different locks for different objects, so we use the same lock,
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
* regardless of object type. This also allows us to do optimised
|
|
|
|
* multi-object allocations without dropping the lock in between.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
|
|
|
struct mb_lstmngr {
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_gen_list *ml_genlist;
|
|
|
|
struct mb_pcpu_list *ml_cntlst[NCPU];
|
|
|
|
struct mb_bucket **ml_btable;
|
|
|
|
vm_map_t ml_map;
|
|
|
|
vm_offset_t ml_mapbase;
|
|
|
|
vm_offset_t ml_maptop;
|
|
|
|
int ml_mapfull;
|
|
|
|
u_int ml_objsize;
|
|
|
|
u_int *ml_wmhigh;
|
2001-06-22 06:35:32 +00:00
|
|
|
};
|
2001-12-23 22:04:08 +00:00
|
|
|
static struct mb_lstmngr mb_list_mbuf, mb_list_clust;
|
|
|
|
static struct mtx mbuf_gen, mbuf_pcpu[NCPU];
|
2002-07-30 21:06:27 +00:00
|
|
|
u_int *cl_refcntmap;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Local macros for internal allocator structure manipulations.
|
|
|
|
*/
|
2001-08-01 00:54:00 +00:00
|
|
|
#ifdef SMP
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_GET_PCPU_LIST(mb_lst) (mb_lst)->ml_cntlst[PCPU_GET(cpuid)]
|
2001-08-01 00:54:00 +00:00
|
|
|
#else
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_GET_PCPU_LIST(mb_lst) (mb_lst)->ml_cntlst[0]
|
2001-08-01 00:54:00 +00:00
|
|
|
#endif
|
2001-06-22 06:35:32 +00:00
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_GET_GEN_LIST(mb_lst) (mb_lst)->ml_genlist
|
2001-06-22 06:35:32 +00:00
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_LOCK_CONT(mb_cnt) mtx_lock((mb_cnt)->mb_cont.mc_lock)
|
2001-06-22 06:35:32 +00:00
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_UNLOCK_CONT(mb_cnt) mtx_unlock((mb_cnt)->mb_cont.mc_lock)
|
2001-06-22 06:35:32 +00:00
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
#define MB_GET_PCPU_LIST_NUM(mb_lst, num) \
|
|
|
|
(mb_lst)->ml_cntlst[(num)]
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
#define MB_BUCKET_INDX(mb_obj, mb_lst) \
|
|
|
|
(int)(((caddr_t)(mb_obj) - (caddr_t)(mb_lst)->ml_mapbase) / PAGE_SIZE)
|
|
|
|
|
|
|
|
#define MB_GET_OBJECT(mb_objp, mb_bckt, mb_lst) \
|
|
|
|
{ \
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mc_buckethd *_mchd = &((mb_lst)->mb_cont.mc_bhead); \
|
2001-06-22 06:35:32 +00:00
|
|
|
\
|
|
|
|
(mb_bckt)->mb_numfree--; \
|
|
|
|
(mb_objp) = (mb_bckt)->mb_free[((mb_bckt)->mb_numfree)]; \
|
|
|
|
(*((mb_lst)->mb_cont.mc_objcount))--; \
|
|
|
|
if ((mb_bckt)->mb_numfree == 0) { \
|
|
|
|
SLIST_REMOVE_HEAD(_mchd, mb_blist); \
|
|
|
|
SLIST_NEXT((mb_bckt), mb_blist) = NULL; \
|
|
|
|
(mb_bckt)->mb_owner |= MB_BUCKET_FREE; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define MB_PUT_OBJECT(mb_objp, mb_bckt, mb_lst) \
|
|
|
|
(mb_bckt)->mb_free[((mb_bckt)->mb_numfree)] = (mb_objp); \
|
|
|
|
(mb_bckt)->mb_numfree++; \
|
|
|
|
(*((mb_lst)->mb_cont.mc_objcount))++;
|
|
|
|
|
2001-09-30 01:58:39 +00:00
|
|
|
#define MB_MBTYPES_INC(mb_cnt, mb_type, mb_num) \
|
|
|
|
if ((mb_type) != MT_NOTMBUF) \
|
|
|
|
(*((mb_cnt)->mb_cont.mc_types + (mb_type))) += (mb_num)
|
|
|
|
|
|
|
|
#define MB_MBTYPES_DEC(mb_cnt, mb_type, mb_num) \
|
|
|
|
if ((mb_type) != MT_NOTMBUF) \
|
|
|
|
(*((mb_cnt)->mb_cont.mc_types + (mb_type))) -= (mb_num)
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Ownership of buckets/containers is represented by integers. The PCPU
|
|
|
|
* lists range from 0 to NCPU-1. We need a free numerical id for the general
|
|
|
|
* list (we use NCPU). We also need a non-conflicting free bit to indicate
|
2001-06-22 06:35:32 +00:00
|
|
|
* that the bucket is free and removed from a container, while not losing
|
2001-12-23 22:04:08 +00:00
|
|
|
* the bucket's originating container id. We use the highest bit
|
2001-06-22 06:35:32 +00:00
|
|
|
* for the free marker.
|
|
|
|
*/
|
|
|
|
#define MB_GENLIST_OWNER (NCPU)
|
|
|
|
#define MB_BUCKET_FREE (1 << (sizeof(int) * 8 - 1))
|
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
/* Statistics structures for allocator (per-CPU and general). */
|
|
|
|
static struct mbpstat mb_statpcpu[NCPU + 1];
|
|
|
|
struct mbstat mbstat;
|
|
|
|
|
|
|
|
/* Sleep time for wait code (in ticks). */
|
|
|
|
static int mbuf_wait = 64;
|
|
|
|
|
|
|
|
static u_int mbuf_limit = 512; /* Upper limit on # of mbufs per CPU. */
|
|
|
|
static u_int clust_limit = 128; /* Upper limit on # of clusters per CPU. */
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Objects exported by sysctl(8).
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
|
|
|
SYSCTL_DECL(_kern_ipc);
|
|
|
|
SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RD, &nmbclusters, 0,
|
|
|
|
"Maximum number of mbuf clusters available");
|
|
|
|
SYSCTL_INT(_kern_ipc, OID_AUTO, nmbufs, CTLFLAG_RD, &nmbufs, 0,
|
|
|
|
"Maximum number of mbufs available");
|
|
|
|
SYSCTL_INT(_kern_ipc, OID_AUTO, nmbcnt, CTLFLAG_RD, &nmbcnt, 0,
|
|
|
|
"Number used to scale kmem_map to ensure sufficient space for counters");
|
|
|
|
SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RD, &nsfbufs, 0,
|
|
|
|
"Maximum number of sendfile(2) sf_bufs available");
|
|
|
|
SYSCTL_INT(_kern_ipc, OID_AUTO, mbuf_wait, CTLFLAG_RW, &mbuf_wait, 0,
|
|
|
|
"Sleep time of mbuf subsystem wait allocations during exhaustion");
|
|
|
|
SYSCTL_UINT(_kern_ipc, OID_AUTO, mbuf_limit, CTLFLAG_RW, &mbuf_limit, 0,
|
|
|
|
"Upper limit of number of mbufs allowed on each PCPU list");
|
|
|
|
SYSCTL_UINT(_kern_ipc, OID_AUTO, clust_limit, CTLFLAG_RW, &clust_limit, 0,
|
|
|
|
"Upper limit of number of mbuf clusters allowed on each PCPU list");
|
|
|
|
SYSCTL_STRUCT(_kern_ipc, OID_AUTO, mbstat, CTLFLAG_RD, &mbstat, mbstat,
|
|
|
|
"Mbuf general information and statistics");
|
|
|
|
SYSCTL_OPAQUE(_kern_ipc, OID_AUTO, mb_statpcpu, CTLFLAG_RD, mb_statpcpu,
|
|
|
|
sizeof(mb_statpcpu), "S,", "Mbuf allocator per CPU statistics");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Prototypes of local allocator routines.
|
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
static void *mb_alloc_wait(struct mb_lstmngr *, short);
|
|
|
|
static struct mb_bucket *mb_pop_cont(struct mb_lstmngr *, int,
|
2001-06-22 06:35:32 +00:00
|
|
|
struct mb_pcpu_list *);
|
2001-12-23 22:04:08 +00:00
|
|
|
static void mb_reclaim(void);
|
|
|
|
static void mbuf_init(void *);
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Initial allocation numbers. Each parameter represents the number of buckets
|
2001-06-22 06:35:32 +00:00
|
|
|
* of each object that will be placed initially in each PCPU container for
|
|
|
|
* said object.
|
|
|
|
*/
|
|
|
|
#define NMB_MBUF_INIT 4
|
|
|
|
#define NMB_CLUST_INIT 16
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Internal flags that allow for cache locks to remain "persistent" across
|
|
|
|
* allocation and free calls. They may be used in combination.
|
|
|
|
*/
|
|
|
|
#define MBP_PERSIST 0x1 /* Return with lock still held. */
|
|
|
|
#define MBP_PERSISTENT 0x2 /* Cache lock is already held coming in. */
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
|
|
|
* Initialize the mbuf subsystem.
|
|
|
|
*
|
|
|
|
* We sub-divide the kmem_map into several submaps; this way, we don't have
|
|
|
|
* to worry about artificially limiting the number of mbuf or mbuf cluster
|
|
|
|
* allocations, due to fear of one type of allocation "stealing" address
|
|
|
|
* space initially reserved for another.
|
|
|
|
*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Set up both the general containers and all the PCPU containers. Populate
|
2001-06-22 06:35:32 +00:00
|
|
|
* the PCPU containers with initial numbers.
|
|
|
|
*/
|
|
|
|
MALLOC_DEFINE(M_MBUF, "mbufmgr", "mbuf subsystem management structures");
|
2001-08-03 05:05:32 +00:00
|
|
|
SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL)
|
2001-06-22 06:35:32 +00:00
|
|
|
void
|
2001-08-03 05:05:32 +00:00
|
|
|
mbuf_init(void *dummy)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_pcpu_list *pcpu_cnt;
|
|
|
|
vm_size_t mb_map_size;
|
|
|
|
int i, j;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Set up all the submaps, for each type of object that we deal
|
2002-07-30 21:06:27 +00:00
|
|
|
* with in this allocator. We also allocate space for the cluster
|
|
|
|
* ref. counts in the mbuf map (and not the cluster map) in order to
|
|
|
|
* give clusters a nice contiguous address space without any holes.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
2002-07-30 21:06:27 +00:00
|
|
|
mb_map_size = (vm_size_t)(nmbufs * MSIZE + nmbclusters * sizeof(u_int));
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_map_size = rounddown(mb_map_size, PAGE_SIZE);
|
|
|
|
mb_list_mbuf.ml_btable = malloc((unsigned long)mb_map_size / PAGE_SIZE *
|
|
|
|
sizeof(struct mb_bucket *), M_MBUF, M_NOWAIT);
|
|
|
|
if (mb_list_mbuf.ml_btable == NULL)
|
|
|
|
goto bad;
|
|
|
|
mb_list_mbuf.ml_map = kmem_suballoc(kmem_map,&(mb_list_mbuf.ml_mapbase),
|
|
|
|
&(mb_list_mbuf.ml_maptop), mb_map_size);
|
2002-06-13 23:53:42 +00:00
|
|
|
mb_list_mbuf.ml_map->system_map = 1;
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_list_mbuf.ml_mapfull = 0;
|
|
|
|
mb_list_mbuf.ml_objsize = MSIZE;
|
|
|
|
mb_list_mbuf.ml_wmhigh = &mbuf_limit;
|
|
|
|
|
|
|
|
mb_map_size = (vm_size_t)(nmbclusters * MCLBYTES);
|
|
|
|
mb_map_size = rounddown(mb_map_size, PAGE_SIZE);
|
|
|
|
mb_list_clust.ml_btable = malloc((unsigned long)mb_map_size / PAGE_SIZE
|
|
|
|
* sizeof(struct mb_bucket *), M_MBUF, M_NOWAIT);
|
|
|
|
if (mb_list_clust.ml_btable == NULL)
|
|
|
|
goto bad;
|
|
|
|
mb_list_clust.ml_map = kmem_suballoc(kmem_map,
|
|
|
|
&(mb_list_clust.ml_mapbase), &(mb_list_clust.ml_maptop),
|
|
|
|
mb_map_size);
|
2002-06-13 23:53:42 +00:00
|
|
|
mb_list_clust.ml_map->system_map = 1;
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_list_clust.ml_mapfull = 0;
|
|
|
|
mb_list_clust.ml_objsize = MCLBYTES;
|
|
|
|
mb_list_clust.ml_wmhigh = &clust_limit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate required general (global) containers for each object type.
|
|
|
|
*/
|
|
|
|
mb_list_mbuf.ml_genlist = malloc(sizeof(struct mb_gen_list), M_MBUF,
|
|
|
|
M_NOWAIT);
|
|
|
|
mb_list_clust.ml_genlist = malloc(sizeof(struct mb_gen_list), M_MBUF,
|
|
|
|
M_NOWAIT);
|
|
|
|
if ((mb_list_mbuf.ml_genlist == NULL) ||
|
|
|
|
(mb_list_clust.ml_genlist == NULL))
|
|
|
|
goto bad;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize condition variables and general container mutex locks.
|
|
|
|
*/
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&mbuf_gen, "mbuf subsystem general lists lock", NULL, 0);
|
2001-06-22 06:35:32 +00:00
|
|
|
cv_init(&(mb_list_mbuf.ml_genlist->mgl_mstarved), "mbuf pool starved");
|
|
|
|
cv_init(&(mb_list_clust.ml_genlist->mgl_mstarved),
|
|
|
|
"mcluster pool starved");
|
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_lock =
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_lock = &mbuf_gen;
|
|
|
|
|
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Set up the general containers for each object.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_numowner =
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_numowner = MB_GENLIST_OWNER;
|
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_starved =
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_starved = 0;
|
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_objcount =
|
|
|
|
&(mb_statpcpu[MB_GENLIST_OWNER].mb_mbfree);
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_objcount =
|
|
|
|
&(mb_statpcpu[MB_GENLIST_OWNER].mb_clfree);
|
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_numpgs =
|
|
|
|
&(mb_statpcpu[MB_GENLIST_OWNER].mb_mbpgs);
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_numpgs =
|
|
|
|
&(mb_statpcpu[MB_GENLIST_OWNER].mb_clpgs);
|
2001-09-30 01:58:39 +00:00
|
|
|
mb_list_mbuf.ml_genlist->mb_cont.mc_types =
|
|
|
|
&(mb_statpcpu[MB_GENLIST_OWNER].mb_mbtypes[0]);
|
|
|
|
mb_list_clust.ml_genlist->mb_cont.mc_types = NULL;
|
2001-06-22 06:35:32 +00:00
|
|
|
SLIST_INIT(&(mb_list_mbuf.ml_genlist->mb_cont.mc_bhead));
|
|
|
|
SLIST_INIT(&(mb_list_clust.ml_genlist->mb_cont.mc_bhead));
|
|
|
|
|
2002-07-30 21:06:27 +00:00
|
|
|
/*
|
|
|
|
* Allocate all the required counters for clusters. This makes
|
|
|
|
* cluster allocations/deallocations much faster.
|
|
|
|
*/
|
|
|
|
cl_refcntmap = (u_int *)kmem_malloc(mb_list_clust.ml_map,
|
|
|
|
roundup(nmbclusters * sizeof(u_int), MSIZE), M_NOWAIT);
|
|
|
|
if (cl_refcntmap == NULL)
|
|
|
|
goto bad;
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Initialize general mbuf statistics.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
|
|
|
mbstat.m_msize = MSIZE;
|
|
|
|
mbstat.m_mclbytes = MCLBYTES;
|
|
|
|
mbstat.m_minclsize = MINCLSIZE;
|
|
|
|
mbstat.m_mlen = MLEN;
|
|
|
|
mbstat.m_mhlen = MHLEN;
|
2001-09-30 01:58:39 +00:00
|
|
|
mbstat.m_numtypes = MT_NTYPES;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate and initialize PCPU containers.
|
|
|
|
*/
|
2001-07-26 18:47:46 +00:00
|
|
|
for (i = 0; i < NCPU; i++) {
|
|
|
|
if (CPU_ABSENT(i))
|
|
|
|
continue;
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_list_mbuf.ml_cntlst[i] = malloc(sizeof(struct mb_pcpu_list),
|
|
|
|
M_MBUF, M_NOWAIT);
|
|
|
|
mb_list_clust.ml_cntlst[i] = malloc(sizeof(struct mb_pcpu_list),
|
|
|
|
M_MBUF, M_NOWAIT);
|
|
|
|
if ((mb_list_mbuf.ml_cntlst[i] == NULL) ||
|
|
|
|
(mb_list_clust.ml_cntlst[i] == NULL))
|
|
|
|
goto bad;
|
|
|
|
|
2002-04-04 21:03:38 +00:00
|
|
|
mtx_init(&mbuf_pcpu[i], "mbuf PCPU list lock", NULL, 0);
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_lock =
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_lock = &mbuf_pcpu[i];
|
|
|
|
|
2001-07-26 18:47:46 +00:00
|
|
|
mb_statpcpu[i].mb_active = 1;
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_numowner =
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_numowner = i;
|
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_starved =
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_starved = 0;
|
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_objcount =
|
|
|
|
&(mb_statpcpu[i].mb_mbfree);
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_objcount =
|
|
|
|
&(mb_statpcpu[i].mb_clfree);
|
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_numpgs =
|
|
|
|
&(mb_statpcpu[i].mb_mbpgs);
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_numpgs =
|
|
|
|
&(mb_statpcpu[i].mb_clpgs);
|
2001-09-30 01:58:39 +00:00
|
|
|
mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_types =
|
|
|
|
&(mb_statpcpu[i].mb_mbtypes[0]);
|
|
|
|
mb_list_clust.ml_cntlst[i]->mb_cont.mc_types = NULL;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
SLIST_INIT(&(mb_list_mbuf.ml_cntlst[i]->mb_cont.mc_bhead));
|
|
|
|
SLIST_INIT(&(mb_list_clust.ml_cntlst[i]->mb_cont.mc_bhead));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perform initial allocations.
|
|
|
|
*/
|
|
|
|
pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_mbuf, i);
|
|
|
|
MB_LOCK_CONT(pcpu_cnt);
|
|
|
|
for (j = 0; j < NMB_MBUF_INIT; j++) {
|
|
|
|
if (mb_pop_cont(&mb_list_mbuf, M_DONTWAIT, pcpu_cnt)
|
|
|
|
== NULL)
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
MB_UNLOCK_CONT(pcpu_cnt);
|
|
|
|
|
|
|
|
pcpu_cnt = MB_GET_PCPU_LIST_NUM(&mb_list_clust, i);
|
|
|
|
MB_LOCK_CONT(pcpu_cnt);
|
|
|
|
for (j = 0; j < NMB_CLUST_INIT; j++) {
|
|
|
|
if (mb_pop_cont(&mb_list_clust, M_DONTWAIT, pcpu_cnt)
|
|
|
|
== NULL)
|
|
|
|
goto bad;
|
|
|
|
}
|
|
|
|
MB_UNLOCK_CONT(pcpu_cnt);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
bad:
|
2001-08-03 05:05:32 +00:00
|
|
|
panic("mbuf_init(): failed to initialize mbuf subsystem!");
|
2001-06-22 06:35:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Populate a given mbuf PCPU container with a bucket full of fresh new
|
2001-12-23 22:04:08 +00:00
|
|
|
* buffers. Return a pointer to the new bucket (already in the container if
|
2001-06-22 06:35:32 +00:00
|
|
|
* successful), or return NULL on failure.
|
|
|
|
*
|
|
|
|
* LOCKING NOTES:
|
|
|
|
* PCPU container lock must be held when this is called.
|
|
|
|
* The lock is dropped here so that we can cleanly call the underlying VM
|
2001-12-23 22:04:08 +00:00
|
|
|
* code. If we fail, we return with no locks held. If we succeed (i.e., return
|
2001-06-22 06:35:32 +00:00
|
|
|
* non-NULL), we return with the PCPU lock held, ready for allocation from
|
|
|
|
* the returned bucket.
|
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
static struct mb_bucket *
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_pop_cont(struct mb_lstmngr *mb_list, int how, struct mb_pcpu_list *cnt_lst)
|
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_bucket *bucket;
|
|
|
|
caddr_t p;
|
|
|
|
int i;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* If our object's (finite) map is starved now (i.e., no more address
|
2001-06-22 06:35:32 +00:00
|
|
|
* space), bail out now.
|
|
|
|
*/
|
|
|
|
if (mb_list->ml_mapfull)
|
|
|
|
return (NULL);
|
|
|
|
|
|
|
|
bucket = malloc(sizeof(struct mb_bucket) +
|
|
|
|
PAGE_SIZE / mb_list->ml_objsize * sizeof(void *), M_MBUF,
|
|
|
|
how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
|
|
|
|
if (bucket == NULL)
|
|
|
|
return (NULL);
|
|
|
|
|
|
|
|
p = (caddr_t)kmem_malloc(mb_list->ml_map, PAGE_SIZE,
|
|
|
|
how == M_TRYWAIT ? M_WAITOK : M_NOWAIT);
|
|
|
|
if (p == NULL) {
|
|
|
|
free(bucket, M_MBUF);
|
2001-11-25 04:42:54 +00:00
|
|
|
if (how == M_TRYWAIT)
|
|
|
|
mb_list->ml_mapfull = 1;
|
2001-06-22 06:35:32 +00:00
|
|
|
return (NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
bucket->mb_numfree = 0;
|
|
|
|
mb_list->ml_btable[MB_BUCKET_INDX(p, mb_list)] = bucket;
|
|
|
|
for (i = 0; i < (PAGE_SIZE / mb_list->ml_objsize); i++) {
|
|
|
|
bucket->mb_free[i] = p;
|
|
|
|
bucket->mb_numfree++;
|
|
|
|
p += mb_list->ml_objsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
bucket->mb_owner = cnt_lst->mb_cont.mc_numowner;
|
|
|
|
SLIST_INSERT_HEAD(&(cnt_lst->mb_cont.mc_bhead), bucket, mb_blist);
|
|
|
|
(*(cnt_lst->mb_cont.mc_numpgs))++;
|
|
|
|
*(cnt_lst->mb_cont.mc_objcount) += bucket->mb_numfree;
|
|
|
|
|
|
|
|
return (bucket);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate an mbuf-subsystem type object.
|
2001-12-23 22:04:08 +00:00
|
|
|
* The general case is very easy. Complications only arise if our PCPU
|
|
|
|
* container is empty. Things get worse if the PCPU container is empty,
|
2001-06-22 06:35:32 +00:00
|
|
|
* the general container is empty, and we've run out of address space
|
|
|
|
* in our map; then we try to block if we're willing to (M_TRYWAIT).
|
|
|
|
*/
|
|
|
|
static __inline
|
|
|
|
void *
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb_alloc(struct mb_lstmngr *mb_list, int how, short type, short persist,
|
|
|
|
int *pers_list)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
static int last_report;
|
|
|
|
struct mb_pcpu_list *cnt_lst;
|
|
|
|
struct mb_bucket *bucket;
|
|
|
|
void *m;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
m = NULL;
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
if ((persist & MBP_PERSISTENT) != 0) {
|
|
|
|
/*
|
|
|
|
* If we're a "persistent" call, then the per-CPU #(pers_list)
|
|
|
|
* cache lock is already held, and we just need to refer to
|
|
|
|
* the correct cache descriptor.
|
|
|
|
*/
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST_NUM(mb_list, *pers_list);
|
|
|
|
} else {
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
if ((bucket = SLIST_FIRST(&(cnt_lst->mb_cont.mc_bhead))) != NULL) {
|
|
|
|
/*
|
|
|
|
* This is the easy allocation case. We just grab an object
|
|
|
|
* from a bucket in the PCPU container. At worst, we
|
|
|
|
* have just emptied the bucket and so we remove it
|
|
|
|
* from the container.
|
|
|
|
*/
|
|
|
|
MB_GET_OBJECT(m, bucket, cnt_lst);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
MB_MBTYPES_INC(cnt_lst, type, 1);
|
|
|
|
|
|
|
|
/* If asked to persist, do not drop the lock. */
|
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list = cnt_lst->mb_cont.mc_numowner;
|
2001-06-22 06:35:32 +00:00
|
|
|
} else {
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_gen_list *gen_list;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the less-common more difficult case. We must
|
|
|
|
* first verify if the general list has anything for us
|
|
|
|
* and if that also fails, we must allocate a page from
|
|
|
|
* the map and create a new bucket to place in our PCPU
|
|
|
|
* container (already locked). If the map is starved then
|
|
|
|
* we're really in for trouble, as we have to wait on
|
|
|
|
* the general container's condition variable.
|
|
|
|
*/
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
|
|
|
|
if ((bucket = SLIST_FIRST(&(gen_list->mb_cont.mc_bhead)))
|
|
|
|
!= NULL) {
|
|
|
|
/*
|
|
|
|
* Give ownership of the bucket to our CPU's
|
|
|
|
* container, but only actually put the bucket
|
|
|
|
* in the container if it doesn't become free
|
|
|
|
* upon removing an mbuf from it.
|
|
|
|
*/
|
|
|
|
SLIST_REMOVE_HEAD(&(gen_list->mb_cont.mc_bhead),
|
|
|
|
mb_blist);
|
|
|
|
bucket->mb_owner = cnt_lst->mb_cont.mc_numowner;
|
|
|
|
(*(gen_list->mb_cont.mc_numpgs))--;
|
|
|
|
(*(cnt_lst->mb_cont.mc_numpgs))++;
|
|
|
|
*(gen_list->mb_cont.mc_objcount) -= bucket->mb_numfree;
|
|
|
|
bucket->mb_numfree--;
|
|
|
|
m = bucket->mb_free[(bucket->mb_numfree)];
|
|
|
|
if (bucket->mb_numfree == 0) {
|
|
|
|
SLIST_NEXT(bucket, mb_blist) = NULL;
|
|
|
|
bucket->mb_owner |= MB_BUCKET_FREE;
|
|
|
|
} else {
|
|
|
|
SLIST_INSERT_HEAD(&(cnt_lst->mb_cont.mc_bhead),
|
|
|
|
bucket, mb_blist);
|
|
|
|
*(cnt_lst->mb_cont.mc_objcount) +=
|
|
|
|
bucket->mb_numfree;
|
|
|
|
}
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_INC(cnt_lst, type, 1);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
|
|
|
|
/* If asked to persist, do not drop the lock. */
|
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list = cnt_lst->mb_cont.mc_numowner;
|
2001-06-22 06:35:32 +00:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* We'll have to allocate a new page.
|
|
|
|
*/
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
bucket = mb_pop_cont(mb_list, how, cnt_lst);
|
|
|
|
if (bucket != NULL) {
|
2002-03-03 22:10:04 +00:00
|
|
|
MB_GET_OBJECT(m, bucket, cnt_lst);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_INC(cnt_lst, type, 1);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
|
|
|
|
/* If asked to persist, do not drop the lock. */
|
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list=cnt_lst->mb_cont.mc_numowner;
|
2001-06-22 06:35:32 +00:00
|
|
|
} else {
|
|
|
|
if (how == M_TRYWAIT) {
|
2001-12-01 00:21:30 +00:00
|
|
|
/*
|
2001-12-23 22:04:08 +00:00
|
|
|
* Absolute worst-case scenario.
|
|
|
|
* We block if we're willing to, but
|
|
|
|
* only after trying to steal from
|
|
|
|
* other lists.
|
2001-12-01 00:21:30 +00:00
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
m = mb_alloc_wait(mb_list, type);
|
|
|
|
} else {
|
2001-06-22 06:35:32 +00:00
|
|
|
/* XXX: No consistency. */
|
|
|
|
mbstat.m_drops++;
|
2001-12-23 22:04:08 +00:00
|
|
|
|
2001-12-01 00:21:30 +00:00
|
|
|
if (ticks < last_report ||
|
|
|
|
(ticks - last_report) >= hz) {
|
|
|
|
last_report = ticks;
|
|
|
|
printf(
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
"All mbufs or mbuf clusters exhausted, please see tuning(7).\n");
|
2001-12-01 00:21:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
if (m != NULL && (persist & MBP_PERSIST) != 0) {
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
*pers_list=cnt_lst->mb_cont.mc_numowner;
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return (m);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This is the worst-case scenario called only if we're allocating with
|
2001-12-23 22:04:08 +00:00
|
|
|
* M_TRYWAIT. We first drain all the protocols, then try to find an mbuf
|
|
|
|
* by looking in every PCPU container. If we're still unsuccesful, we
|
2001-06-22 06:35:32 +00:00
|
|
|
* try the general container one last time and possibly block on our
|
|
|
|
* starved cv.
|
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
static void *
|
2001-09-30 01:58:39 +00:00
|
|
|
mb_alloc_wait(struct mb_lstmngr *mb_list, short type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_pcpu_list *cnt_lst;
|
|
|
|
struct mb_gen_list *gen_list;
|
|
|
|
struct mb_bucket *bucket;
|
|
|
|
void *m;
|
|
|
|
int i, cv_ret;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to reclaim mbuf-related objects (mbufs, clusters).
|
|
|
|
*/
|
|
|
|
mb_reclaim();
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Cycle all the PCPU containers. Increment starved counts if found
|
|
|
|
* empty.
|
|
|
|
*/
|
2001-07-26 18:47:46 +00:00
|
|
|
for (i = 0; i < NCPU; i++) {
|
|
|
|
if (CPU_ABSENT(i))
|
|
|
|
continue;
|
2001-06-22 06:35:32 +00:00
|
|
|
cnt_lst = MB_GET_PCPU_LIST_NUM(mb_list, i);
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If container is non-empty, get a single object from it.
|
|
|
|
* If empty, increment starved count.
|
|
|
|
*/
|
|
|
|
if ((bucket = SLIST_FIRST(&(cnt_lst->mb_cont.mc_bhead))) !=
|
|
|
|
NULL) {
|
|
|
|
MB_GET_OBJECT(m, bucket, cnt_lst);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_INC(cnt_lst, type, 1);
|
2001-06-22 06:35:32 +00:00
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
mbstat.m_wait++; /* XXX: No consistency. */
|
|
|
|
return (m);
|
|
|
|
} else
|
|
|
|
cnt_lst->mb_cont.mc_starved++;
|
|
|
|
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We're still here, so that means it's time to get the general
|
|
|
|
* container lock, check it one more time (now that mb_reclaim()
|
|
|
|
* has been called) and if we still get nothing, block on the cv.
|
|
|
|
*/
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
if ((bucket = SLIST_FIRST(&(gen_list->mb_cont.mc_bhead))) != NULL) {
|
|
|
|
MB_GET_OBJECT(m, bucket, gen_list);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_INC(gen_list, type, 1);
|
2001-06-22 06:35:32 +00:00
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
mbstat.m_wait++; /* XXX: No consistency. */
|
|
|
|
return (m);
|
|
|
|
}
|
|
|
|
|
|
|
|
gen_list->mb_cont.mc_starved++;
|
|
|
|
cv_ret = cv_timedwait(&(gen_list->mgl_mstarved),
|
|
|
|
gen_list->mb_cont.mc_lock, mbuf_wait);
|
|
|
|
gen_list->mb_cont.mc_starved--;
|
|
|
|
|
|
|
|
if ((cv_ret == 0) &&
|
|
|
|
((bucket = SLIST_FIRST(&(gen_list->mb_cont.mc_bhead))) != NULL)) {
|
|
|
|
MB_GET_OBJECT(m, bucket, gen_list);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_INC(gen_list, type, 1);
|
2001-06-22 06:35:32 +00:00
|
|
|
mbstat.m_wait++; /* XXX: No consistency. */
|
|
|
|
} else {
|
|
|
|
mbstat.m_drops++; /* XXX: No consistency. */
|
|
|
|
m = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
|
|
|
|
return (m);
|
|
|
|
}
|
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
/*-
|
2001-06-22 06:35:32 +00:00
|
|
|
* Free an object to its rightful container.
|
|
|
|
* In the very general case, this operation is really very easy.
|
|
|
|
* Complications arise primarily if:
|
|
|
|
* (a) We've hit the high limit on number of free objects allowed in
|
|
|
|
* our PCPU container.
|
|
|
|
* (b) We're in a critical situation where our container has been
|
|
|
|
* marked 'starved' and we need to issue wakeups on the starved
|
|
|
|
* condition variable.
|
|
|
|
* (c) Minor (odd) cases: our bucket has migrated while we were
|
|
|
|
* waiting for the lock; our bucket is in the general container;
|
|
|
|
* our bucket is empty.
|
|
|
|
*/
|
|
|
|
static __inline
|
|
|
|
void
|
2002-07-23 14:55:33 +00:00
|
|
|
mb_free(struct mb_lstmngr *mb_list, void *m, short type, short persist,
|
|
|
|
int *pers_list)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_pcpu_list *cnt_lst;
|
|
|
|
struct mb_gen_list *gen_list;
|
|
|
|
struct mb_bucket *bucket;
|
|
|
|
u_int owner;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
bucket = mb_list->ml_btable[MB_BUCKET_INDX(m, mb_list)];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure that if after we lock the bucket's present container the
|
|
|
|
* bucket has migrated, that we drop the lock and get the new one.
|
|
|
|
*/
|
|
|
|
retry_lock:
|
|
|
|
owner = bucket->mb_owner & ~MB_BUCKET_FREE;
|
|
|
|
switch (owner) {
|
|
|
|
case MB_GENLIST_OWNER:
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
2002-07-23 14:55:33 +00:00
|
|
|
if (((persist & MBP_PERSISTENT) != 0) && (*pers_list >= 0)) {
|
|
|
|
if (*pers_list != MB_GENLIST_OWNER) {
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST_NUM(mb_list,
|
|
|
|
*pers_list);
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
if (owner != (bucket->mb_owner & ~MB_BUCKET_FREE)) {
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
2002-07-23 14:55:33 +00:00
|
|
|
*pers_list = -1;
|
2001-06-22 06:35:32 +00:00
|
|
|
goto retry_lock;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we're intended for the general container, this is
|
|
|
|
* real easy: no migrating required. The only `bogon'
|
|
|
|
* is that we're now contending with all the threads
|
|
|
|
* dealing with the general list, but this is expected.
|
|
|
|
*/
|
|
|
|
MB_PUT_OBJECT(m, bucket, gen_list);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_DEC(gen_list, type, 1);
|
2001-06-22 06:35:32 +00:00
|
|
|
if (gen_list->mb_cont.mc_starved > 0)
|
|
|
|
cv_signal(&(gen_list->mgl_mstarved));
|
2002-07-23 14:55:33 +00:00
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
else
|
|
|
|
*pers_list = MB_GENLIST_OWNER;
|
2001-06-22 06:35:32 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST_NUM(mb_list, owner);
|
2002-07-23 14:55:33 +00:00
|
|
|
if (((persist & MBP_PERSISTENT) != 0) && (*pers_list >= 0)) {
|
|
|
|
if (*pers_list == MB_GENLIST_OWNER) {
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
} else {
|
|
|
|
cnt_lst = MB_GET_PCPU_LIST_NUM(mb_list,
|
|
|
|
*pers_list);
|
|
|
|
owner = *pers_list;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
MB_LOCK_CONT(cnt_lst);
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
if (owner != (bucket->mb_owner & ~MB_BUCKET_FREE)) {
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
2002-07-23 14:55:33 +00:00
|
|
|
*pers_list = -1;
|
2001-06-22 06:35:32 +00:00
|
|
|
goto retry_lock;
|
|
|
|
}
|
|
|
|
|
|
|
|
MB_PUT_OBJECT(m, bucket, cnt_lst);
|
2001-09-30 01:58:39 +00:00
|
|
|
MB_MBTYPES_DEC(cnt_lst, type, 1);
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
if (cnt_lst->mb_cont.mc_starved > 0) {
|
|
|
|
/*
|
|
|
|
* This is a tough case. It means that we've
|
|
|
|
* been flagged at least once to indicate that
|
|
|
|
* we're empty, and that the system is in a critical
|
|
|
|
* situation, so we ought to migrate at least one
|
|
|
|
* bucket over to the general container.
|
|
|
|
* There may or may not be a thread blocking on
|
|
|
|
* the starved condition variable, but chances
|
|
|
|
* are that one will eventually come up soon so
|
|
|
|
* it's better to migrate now than never.
|
|
|
|
*/
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
KASSERT((bucket->mb_owner & MB_BUCKET_FREE) != 0,
|
|
|
|
("mb_free: corrupt bucket %p\n", bucket));
|
|
|
|
SLIST_INSERT_HEAD(&(gen_list->mb_cont.mc_bhead),
|
|
|
|
bucket, mb_blist);
|
|
|
|
bucket->mb_owner = MB_GENLIST_OWNER;
|
|
|
|
(*(cnt_lst->mb_cont.mc_objcount))--;
|
|
|
|
(*(gen_list->mb_cont.mc_objcount))++;
|
|
|
|
(*(cnt_lst->mb_cont.mc_numpgs))--;
|
|
|
|
(*(gen_list->mb_cont.mc_numpgs))++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine whether or not to keep transferring
|
|
|
|
* buckets to the general list or whether we've
|
|
|
|
* transferred enough already.
|
|
|
|
* We realize that although we may flag another
|
|
|
|
* bucket to be migrated to the general container
|
|
|
|
* that in the meantime, the thread that was
|
|
|
|
* blocked on the cv is already woken up and
|
|
|
|
* long gone. But in that case, the worst
|
|
|
|
* consequence is that we will end up migrating
|
|
|
|
* one bucket too many, which is really not a big
|
|
|
|
* deal, especially if we're close to a critical
|
|
|
|
* situation.
|
|
|
|
*/
|
|
|
|
if (gen_list->mb_cont.mc_starved > 0) {
|
|
|
|
cnt_lst->mb_cont.mc_starved--;
|
|
|
|
cv_signal(&(gen_list->mgl_mstarved));
|
|
|
|
} else
|
|
|
|
cnt_lst->mb_cont.mc_starved = 0;
|
|
|
|
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
2002-07-23 14:55:33 +00:00
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list = owner;
|
2001-06-22 06:35:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*(cnt_lst->mb_cont.mc_objcount) > *(mb_list->ml_wmhigh)) {
|
|
|
|
/*
|
|
|
|
* We've hit the high limit of allowed numbers of mbufs
|
|
|
|
* on this PCPU list. We must now migrate a bucket
|
|
|
|
* over to the general container.
|
|
|
|
*/
|
|
|
|
gen_list = MB_GET_GEN_LIST(mb_list);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
if ((bucket->mb_owner & MB_BUCKET_FREE) == 0) {
|
|
|
|
bucket =
|
|
|
|
SLIST_FIRST(&(cnt_lst->mb_cont.mc_bhead));
|
|
|
|
SLIST_REMOVE_HEAD(&(cnt_lst->mb_cont.mc_bhead),
|
|
|
|
mb_blist);
|
|
|
|
}
|
|
|
|
SLIST_INSERT_HEAD(&(gen_list->mb_cont.mc_bhead),
|
|
|
|
bucket, mb_blist);
|
|
|
|
bucket->mb_owner = MB_GENLIST_OWNER;
|
|
|
|
*(cnt_lst->mb_cont.mc_objcount) -= bucket->mb_numfree;
|
|
|
|
*(gen_list->mb_cont.mc_objcount) += bucket->mb_numfree;
|
|
|
|
(*(cnt_lst->mb_cont.mc_numpgs))--;
|
|
|
|
(*(gen_list->mb_cont.mc_numpgs))++;
|
|
|
|
|
2001-09-30 01:58:39 +00:00
|
|
|
/*
|
|
|
|
* While we're at it, transfer some of the mbtypes
|
|
|
|
* "count load" onto the general list's mbtypes
|
|
|
|
* array, seeing as how we're moving the bucket
|
|
|
|
* there now, meaning that the freeing of objects
|
|
|
|
* there will now decrement the _general list's_
|
|
|
|
* mbtypes counters, and no longer our PCPU list's
|
|
|
|
* mbtypes counters. We do this for the type presently
|
|
|
|
* being freed in an effort to keep the mbtypes
|
|
|
|
* counters approximately balanced across all lists.
|
|
|
|
*/
|
|
|
|
MB_MBTYPES_DEC(cnt_lst, type, (PAGE_SIZE /
|
|
|
|
mb_list->ml_objsize) - bucket->mb_numfree);
|
|
|
|
MB_MBTYPES_INC(gen_list, type, (PAGE_SIZE /
|
|
|
|
mb_list->ml_objsize) - bucket->mb_numfree);
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
MB_UNLOCK_CONT(gen_list);
|
2002-07-23 14:55:33 +00:00
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list = owner;
|
2001-06-22 06:35:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bucket->mb_owner & MB_BUCKET_FREE) {
|
|
|
|
SLIST_INSERT_HEAD(&(cnt_lst->mb_cont.mc_bhead),
|
|
|
|
bucket, mb_blist);
|
|
|
|
bucket->mb_owner = cnt_lst->mb_cont.mc_numowner;
|
|
|
|
}
|
|
|
|
|
2002-07-23 14:55:33 +00:00
|
|
|
if ((persist & MBP_PERSIST) == 0)
|
|
|
|
MB_UNLOCK_CONT(cnt_lst);
|
|
|
|
else
|
|
|
|
*pers_list = owner;
|
2001-06-22 06:35:32 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Drain protocols in hopes to free up some resources.
|
|
|
|
*
|
|
|
|
* LOCKING NOTES:
|
2001-12-23 22:04:08 +00:00
|
|
|
* No locks should be held when this is called. The drain routines have to
|
2001-06-22 06:35:32 +00:00
|
|
|
* presently acquire some locks which raises the possibility of lock order
|
|
|
|
* violation if we're holding any mutex if that mutex is acquired in reverse
|
|
|
|
* order relative to one of the locks in the drain routines.
|
|
|
|
*/
|
2001-12-23 22:04:08 +00:00
|
|
|
static void
|
2001-06-22 06:35:32 +00:00
|
|
|
mb_reclaim(void)
|
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct domain *dp;
|
|
|
|
struct protosw *pr;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX: Argh, we almost always trip here with witness turned on now-a-days
|
|
|
|
* XXX: because we often come in with Giant held. For now, there's no way
|
|
|
|
* XXX: to avoid this.
|
|
|
|
*/
|
|
|
|
#ifdef WITNESS
|
2001-09-12 08:38:13 +00:00
|
|
|
KASSERT(witness_list(curthread) == 0,
|
2001-06-22 06:35:32 +00:00
|
|
|
("mb_reclaim() called with locks held"));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
mbstat.m_drain++; /* XXX: No consistency. */
|
|
|
|
|
2001-12-23 22:04:08 +00:00
|
|
|
for (dp = domains; dp != NULL; dp = dp->dom_next)
|
2001-06-22 06:35:32 +00:00
|
|
|
for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++)
|
2001-12-23 22:04:08 +00:00
|
|
|
if (pr->pr_drain != NULL)
|
2001-06-22 06:35:32 +00:00
|
|
|
(*pr->pr_drain)();
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/******************************************************************************
|
|
|
|
* Internal setup macros.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
|
|
|
|
#define _mb_setup(m, type) do { \
|
|
|
|
(m)->m_type = (type); \
|
|
|
|
(m)->m_next = NULL; \
|
|
|
|
(m)->m_nextpkt = NULL; \
|
|
|
|
(m)->m_data = (m)->m_dat; \
|
|
|
|
(m)->m_flags = 0; \
|
2001-06-22 06:35:32 +00:00
|
|
|
} while (0)
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
#define _mbhdr_setup(m, type) do { \
|
|
|
|
(m)->m_type = (type); \
|
|
|
|
(m)->m_next = NULL; \
|
|
|
|
(m)->m_nextpkt = NULL; \
|
|
|
|
(m)->m_data = (m)->m_pktdat; \
|
|
|
|
(m)->m_flags = M_PKTHDR; \
|
|
|
|
(m)->m_pkthdr.rcvif = NULL; \
|
|
|
|
(m)->m_pkthdr.csum_flags = 0; \
|
|
|
|
(m)->m_pkthdr.aux = NULL; \
|
2001-06-22 06:35:32 +00:00
|
|
|
} while (0)
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
#define _mcl_setup(m) do { \
|
|
|
|
(m)->m_data = (m)->m_ext.ext_buf; \
|
|
|
|
(m)->m_flags |= M_EXT; \
|
|
|
|
(m)->m_ext.ext_free = NULL; \
|
|
|
|
(m)->m_ext.ext_args = NULL; \
|
|
|
|
(m)->m_ext.ext_size = MCLBYTES; \
|
|
|
|
(m)->m_ext.ext_type = EXT_CLUSTER; \
|
2001-06-22 06:35:32 +00:00
|
|
|
} while (0)
|
|
|
|
|
2002-07-30 21:06:27 +00:00
|
|
|
#define _mext_init_ref(m, ref) do { \
|
2002-08-08 13:29:32 +00:00
|
|
|
(m)->m_ext.ref_cnt = ((ref) == NULL) ? \
|
2002-08-08 13:31:57 +00:00
|
|
|
malloc(sizeof(u_int), M_MBUF, M_NOWAIT) : (u_int *)(ref); \
|
2001-06-22 06:35:32 +00:00
|
|
|
if ((m)->m_ext.ref_cnt != NULL) { \
|
|
|
|
*((m)->m_ext.ref_cnt) = 0; \
|
|
|
|
MEXT_ADD_REF((m)); \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2002-07-30 21:06:27 +00:00
|
|
|
#define cl2ref(cl) \
|
|
|
|
(((uintptr_t)(cl) - (uintptr_t)cl_refcntmap) >> MCLSHIFT)
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
#define _mext_dealloc_ref(m) \
|
|
|
|
free((m)->m_ext.ref_cnt, M_MBUF)
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/******************************************************************************
|
|
|
|
* Internal routines.
|
|
|
|
*
|
|
|
|
* Because mb_alloc() and mb_free() are inlines (to keep the common
|
|
|
|
* cases down to a maximum of one function call), below are a few
|
|
|
|
* routines used only internally for the sole purpose of making certain
|
|
|
|
* functions smaller.
|
|
|
|
*
|
|
|
|
* - _mext_free(): frees associated storage when the ref. count is
|
|
|
|
* exactly one and we're freeing.
|
|
|
|
*
|
|
|
|
* - _mgetm_internal(): common "persistent-lock" routine that allocates
|
|
|
|
* an mbuf and a cluster in one shot, but where the lock is already
|
|
|
|
* held coming in (which is what makes it different from the exported
|
|
|
|
* m_getcl()). The lock is dropped when done. This is used by m_getm()
|
|
|
|
* and, therefore, is very m_getm()-specific.
|
|
|
|
*/
|
2002-07-23 14:55:33 +00:00
|
|
|
static struct mbuf *_mgetm_internal(int, short, short, int);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
void
|
|
|
|
_mext_free(struct mbuf *mb)
|
|
|
|
{
|
|
|
|
|
2002-07-30 21:06:27 +00:00
|
|
|
if (mb->m_ext.ext_type == EXT_CLUSTER) {
|
2002-07-23 14:55:33 +00:00
|
|
|
mb_free(&mb_list_clust, (caddr_t)mb->m_ext.ext_buf, MT_NOTMBUF,
|
|
|
|
0, NULL);
|
2002-07-30 21:06:27 +00:00
|
|
|
} else {
|
2001-06-22 06:35:32 +00:00
|
|
|
(*(mb->m_ext.ext_free))(mb->m_ext.ext_buf, mb->m_ext.ext_args);
|
2002-07-30 21:06:27 +00:00
|
|
|
_mext_dealloc_ref(mb);
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
static struct mbuf *
|
2002-07-23 14:55:33 +00:00
|
|
|
_mgetm_internal(int how, short type, short persist, int cchnum)
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
{
|
|
|
|
struct mbuf *mb;
|
|
|
|
|
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, persist,&cchnum);
|
|
|
|
if (mb == NULL)
|
|
|
|
return NULL;
|
|
|
|
_mb_setup(mb, type);
|
|
|
|
|
|
|
|
if ((persist & MBP_PERSIST) != 0) {
|
|
|
|
mb->m_ext.ext_buf = (caddr_t)mb_alloc(&mb_list_clust,
|
|
|
|
how, MT_NOTMBUF, MBP_PERSISTENT, &cchnum);
|
|
|
|
if (mb->m_ext.ext_buf == NULL) {
|
|
|
|
(void)m_free(mb);
|
|
|
|
mb = NULL;
|
|
|
|
}
|
2002-07-30 21:06:27 +00:00
|
|
|
_mcl_setup(mb);
|
|
|
|
_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
}
|
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
* Exported buffer allocation and de-allocation routines.
|
|
|
|
*/
|
|
|
|
|
2001-06-22 06:35:32 +00:00
|
|
|
/*
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
* Allocate and return a single (normal) mbuf. NULL is returned on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
2001-06-22 06:35:32 +00:00
|
|
|
*/
|
|
|
|
struct mbuf *
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
m_get(int how, short type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mbuf *mb;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL);
|
|
|
|
if (mb != NULL)
|
|
|
|
_mb_setup(mb, type);
|
2001-06-22 06:35:32 +00:00
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Allocate a given length worth of mbufs and/or clusters (whatever fits
|
|
|
|
* best) and return a pointer to the top of the allocated chain. If an
|
|
|
|
* existing mbuf chain is provided, then we will append the new chain
|
|
|
|
* to the existing one and return the top of the provided (existing)
|
|
|
|
* chain. NULL is returned on failure, in which case the [optional]
|
|
|
|
* provided chain is left untouched, and any memory already allocated
|
|
|
|
* is freed.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - m: existing chain to which to append new chain (optional).
|
|
|
|
* - len: total length of data to append, either in mbufs or clusters
|
|
|
|
* (we allocate whatever combination yields the best fit).
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
|
|
|
*/
|
|
|
|
struct mbuf *
|
|
|
|
m_getm(struct mbuf *m, int len, int how, short type)
|
|
|
|
{
|
|
|
|
struct mbuf *mb, *top, *cur, *mtail;
|
2002-07-23 14:55:33 +00:00
|
|
|
int num, rem, cchnum;
|
|
|
|
short persist;
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
KASSERT(len >= 0, ("m_getm(): len is < 0"));
|
|
|
|
|
|
|
|
/* If m != NULL, we will append to the end of that chain. */
|
|
|
|
if (m != NULL)
|
|
|
|
for (mtail = m; mtail->m_next != NULL; mtail = mtail->m_next);
|
|
|
|
else
|
|
|
|
mtail = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In the best-case scenario (which should be the common case
|
|
|
|
* unless we're in a starvation situation), we will be able to
|
|
|
|
* go through the allocation of all the desired mbufs and clusters
|
|
|
|
* here without dropping our per-CPU cache lock in between.
|
|
|
|
*/
|
|
|
|
num = len / MCLBYTES;
|
|
|
|
rem = len % MCLBYTES;
|
|
|
|
persist = 0;
|
|
|
|
cchnum = -1;
|
|
|
|
top = cur = NULL;
|
|
|
|
for (i = 0; i < num; i++) {
|
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type,
|
|
|
|
MBP_PERSIST | persist, &cchnum);
|
|
|
|
if (mb == NULL)
|
|
|
|
goto failed;
|
|
|
|
_mb_setup(mb, type);
|
|
|
|
|
|
|
|
persist = (i != (num - 1) || rem > 0) ? MBP_PERSIST : 0;
|
|
|
|
mb->m_ext.ext_buf = (caddr_t)mb_alloc(&mb_list_clust,
|
|
|
|
how, MT_NOTMBUF, persist | MBP_PERSISTENT, &cchnum);
|
|
|
|
if (mb->m_ext.ext_buf == NULL) {
|
|
|
|
(void)m_free(mb);
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
_mcl_setup(mb);
|
2002-07-30 21:06:27 +00:00
|
|
|
_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
persist = MBP_PERSISTENT;
|
|
|
|
|
|
|
|
if (cur == NULL)
|
|
|
|
top = cur = mb;
|
|
|
|
else
|
|
|
|
cur->m_next = mb;
|
|
|
|
}
|
|
|
|
if (rem > 0) {
|
|
|
|
if (cchnum >= 0) {
|
|
|
|
persist = MBP_PERSISTENT;
|
|
|
|
persist |= (rem > MINCLSIZE) ? MBP_PERSIST : 0;
|
|
|
|
mb = _mgetm_internal(how, type, persist, cchnum);
|
|
|
|
if (mb == NULL)
|
|
|
|
goto failed;
|
|
|
|
} else if (rem > MINCLSIZE) {
|
|
|
|
mb = m_getcl(how, type, 0);
|
|
|
|
} else {
|
|
|
|
mb = m_get(how, type);
|
|
|
|
}
|
|
|
|
if (mb != NULL) {
|
|
|
|
if (cur == NULL)
|
|
|
|
top = mb;
|
|
|
|
else
|
|
|
|
cur->m_next = mb;
|
|
|
|
} else
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mtail != NULL)
|
|
|
|
mtail->m_next = top;
|
|
|
|
else
|
|
|
|
mtail = top;
|
|
|
|
return mtail;
|
|
|
|
failed:
|
|
|
|
if (top != NULL)
|
|
|
|
m_freem(top);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate and return a single M_PKTHDR mbuf. NULL is returned on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
struct mbuf *
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
m_gethdr(int how, short type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mbuf *mb;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL);
|
2002-07-31 01:42:19 +00:00
|
|
|
if (mb != NULL) {
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
_mbhdr_setup(mb, type);
|
2002-07-31 01:42:19 +00:00
|
|
|
#ifdef MAC
|
|
|
|
if (mac_init_mbuf(mb, how) != 0) {
|
2002-08-01 14:24:41 +00:00
|
|
|
m_free(mb);
|
|
|
|
return NULL;
|
2002-07-31 01:42:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Allocate and return a single (normal) pre-zero'd mbuf. NULL is
|
|
|
|
* returned on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
struct mbuf *
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
m_get_clrd(int how, short type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mbuf *mb;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL);
|
|
|
|
if (mb != NULL) {
|
|
|
|
_mb_setup(mb, type);
|
2001-06-22 06:35:32 +00:00
|
|
|
bzero(mtod(mb, caddr_t), MLEN);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Allocate and return a single M_PKTHDR pre-zero'd mbuf. NULL is
|
|
|
|
* returned on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
struct mbuf *
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
m_gethdr_clrd(int how, short type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mbuf *mb;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type, 0, NULL);
|
|
|
|
if (mb != NULL) {
|
|
|
|
_mbhdr_setup(mb, type);
|
2002-07-31 01:42:19 +00:00
|
|
|
#ifdef MAC
|
|
|
|
if (mac_init_mbuf(mb, how) != 0) {
|
2002-08-01 14:24:41 +00:00
|
|
|
m_free(mb);
|
|
|
|
return NULL;
|
2002-07-31 01:42:19 +00:00
|
|
|
}
|
|
|
|
#endif
|
2001-06-22 06:35:32 +00:00
|
|
|
bzero(mtod(mb, caddr_t), MHLEN);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
}
|
2001-06-22 06:35:32 +00:00
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Free a single mbuf and any associated storage that it may have attached
|
|
|
|
* to it. The associated storage may not be immediately freed if its
|
|
|
|
* reference count is above 1. Returns the next mbuf in the chain following
|
|
|
|
* the mbuf being freed.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - mb: the mbuf to free.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
struct mbuf *
|
|
|
|
m_free(struct mbuf *mb)
|
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mbuf *nb;
|
2002-07-23 14:55:33 +00:00
|
|
|
int cchnum;
|
|
|
|
short persist = 0;
|
2001-06-22 06:35:32 +00:00
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/* XXX: This check is bogus... please fix (see KAME). */
|
|
|
|
if ((mb->m_flags & M_PKTHDR) != 0 && mb->m_pkthdr.aux) {
|
|
|
|
m_freem(mb->m_pkthdr.aux);
|
|
|
|
mb->m_pkthdr.aux = NULL;
|
|
|
|
}
|
2002-08-01 14:24:41 +00:00
|
|
|
#ifdef MAC
|
|
|
|
if ((mb->m_flags & M_PKTHDR) &&
|
|
|
|
(mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
|
|
|
|
mac_destroy_mbuf(mb);
|
|
|
|
#endif
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
nb = mb->m_next;
|
2002-07-23 14:55:33 +00:00
|
|
|
if ((mb->m_flags & M_EXT) != 0) {
|
|
|
|
MEXT_REM_REF(mb);
|
|
|
|
if (atomic_cmpset_int(mb->m_ext.ref_cnt, 0, 1)) {
|
|
|
|
if (mb->m_ext.ext_type == EXT_CLUSTER) {
|
|
|
|
mb_free(&mb_list_clust,
|
|
|
|
(caddr_t)mb->m_ext.ext_buf, MT_NOTMBUF,
|
|
|
|
MBP_PERSIST, &cchnum);
|
|
|
|
persist = MBP_PERSISTENT;
|
|
|
|
} else {
|
|
|
|
(*(mb->m_ext.ext_free))(mb->m_ext.ext_buf,
|
|
|
|
mb->m_ext.ext_args);
|
2002-07-30 21:06:27 +00:00
|
|
|
_mext_dealloc_ref(mb);
|
2002-07-23 14:55:33 +00:00
|
|
|
persist = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mb_free(&mb_list_mbuf, mb, mb->m_type, persist, &cchnum);
|
2001-06-22 06:35:32 +00:00
|
|
|
return (nb);
|
|
|
|
}
|
|
|
|
|
2002-07-24 15:11:23 +00:00
|
|
|
/*
|
|
|
|
* Free an entire chain of mbufs and associated external buffers, if
|
|
|
|
* applicable. Right now, we only optimize a little so that the cache
|
|
|
|
* lock may be held across a single mbuf+cluster free. Hopefully,
|
|
|
|
* we'll eventually be holding the lock across more than merely two
|
|
|
|
* consecutive frees but right now this is hard to implement because of
|
|
|
|
* things like _mext_dealloc_ref (may do a free()) and atomic ops in the
|
|
|
|
* loop, as well as the fact that we may recurse on m_freem() in
|
|
|
|
* m_pkthdr.aux != NULL cases.
|
|
|
|
*
|
|
|
|
* - mb: the mbuf chain to free.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
m_freem(struct mbuf *mb)
|
|
|
|
{
|
|
|
|
struct mbuf *m;
|
|
|
|
int cchnum;
|
|
|
|
short persist;
|
|
|
|
|
|
|
|
while (mb != NULL) {
|
|
|
|
/* XXX: This check is bogus... please fix (see KAME). */
|
|
|
|
if ((mb->m_flags & M_PKTHDR) != 0 && mb->m_pkthdr.aux) {
|
|
|
|
m_freem(mb->m_pkthdr.aux);
|
|
|
|
mb->m_pkthdr.aux = NULL;
|
|
|
|
}
|
2002-08-01 14:24:41 +00:00
|
|
|
#ifdef MAC
|
|
|
|
if ((mb->m_flags & M_PKTHDR) &&
|
|
|
|
(mb->m_pkthdr.label.l_flags & MAC_FLAG_INITIALIZED))
|
|
|
|
mac_destroy_mbuf(mb);
|
|
|
|
#endif
|
2002-07-24 15:11:23 +00:00
|
|
|
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);
|
2002-07-30 21:06:27 +00:00
|
|
|
_mext_dealloc_ref(m);
|
2002-07-24 15:11:23 +00:00
|
|
|
persist = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mb_free(&mb_list_mbuf, m, m->m_type, persist, &cchnum);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Fetch an mbuf with a cluster attached to it. If one of the
|
|
|
|
* allocations fails, the entire allocation fails. This routine is
|
|
|
|
* the preferred way of fetching both the mbuf and cluster together,
|
|
|
|
* as it avoids having to unlock/relock between allocations. Returns
|
|
|
|
* NULL on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
* - type: the type of the mbuf being allocated.
|
|
|
|
* - flags: any flags to pass to the mbuf being allocated; if this includes
|
|
|
|
* the M_PKTHDR bit, then the mbuf is configured as a M_PKTHDR mbuf.
|
|
|
|
*/
|
|
|
|
struct mbuf *
|
|
|
|
m_getcl(int how, short type, int flags)
|
|
|
|
{
|
|
|
|
struct mbuf *mb;
|
|
|
|
int cchnum;
|
|
|
|
|
|
|
|
mb = (struct mbuf *)mb_alloc(&mb_list_mbuf, how, type,
|
|
|
|
MBP_PERSIST, &cchnum);
|
|
|
|
if (mb == NULL)
|
|
|
|
return NULL;
|
|
|
|
mb->m_type = type;
|
|
|
|
mb->m_next = NULL;
|
|
|
|
mb->m_flags = flags;
|
|
|
|
if ((flags & M_PKTHDR) != 0) {
|
|
|
|
mb->m_nextpkt = NULL;
|
|
|
|
mb->m_pkthdr.rcvif = NULL;
|
|
|
|
mb->m_pkthdr.csum_flags = 0;
|
|
|
|
mb->m_pkthdr.aux = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
mb->m_ext.ext_buf = (caddr_t)mb_alloc(&mb_list_clust, how,
|
|
|
|
MT_NOTMBUF, MBP_PERSISTENT, &cchnum);
|
|
|
|
if (mb->m_ext.ext_buf == NULL) {
|
|
|
|
(void)m_free(mb);
|
|
|
|
mb = NULL;
|
|
|
|
} else {
|
2002-07-30 21:06:27 +00:00
|
|
|
_mcl_setup(mb);
|
|
|
|
_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
}
|
2002-08-01 14:24:41 +00:00
|
|
|
#ifdef MAC
|
2002-08-07 20:15:29 +00:00
|
|
|
if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, how) != 0)) {
|
2002-08-01 14:24:41 +00:00
|
|
|
m_free(mb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#endif
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
return (mb);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetch a single mbuf cluster and attach it to an existing mbuf. If
|
|
|
|
* successfull, configures the provided mbuf to have mbuf->m_ext.ext_buf
|
|
|
|
* pointing to the cluster, and sets the M_EXT bit in the mbuf's flags.
|
|
|
|
* The M_EXT bit is not set on failure.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - mb: the existing mbuf to which to attach the allocated cluster.
|
|
|
|
* - how: M_TRYWAIT to try to block for kern.ipc.mbuf_wait number of ticks
|
|
|
|
* if really starved for memory. M_DONTWAIT to never block.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
void
|
|
|
|
m_clget(struct mbuf *mb, int how)
|
|
|
|
{
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
mb->m_ext.ext_buf= (caddr_t)mb_alloc(&mb_list_clust,how,MT_NOTMBUF,
|
|
|
|
0, NULL);
|
2001-06-22 06:35:32 +00:00
|
|
|
if (mb->m_ext.ext_buf != NULL) {
|
2002-07-30 21:06:27 +00:00
|
|
|
_mcl_setup(mb);
|
|
|
|
_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
|
2001-06-22 06:35:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
/*
|
|
|
|
* Configure a provided mbuf to refer to the provided external storage
|
|
|
|
* buffer and setup a reference count for said buffer. If the setting
|
|
|
|
* up of the reference count fails, the M_EXT bit will not be set. If
|
|
|
|
* successfull, the M_EXT bit is set in the mbuf's flags.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - mb: the existing mbuf to which to attach the provided buffer.
|
|
|
|
* - buf: the address of the provided external storage buffer.
|
|
|
|
* - size: the size of the provided buffer.
|
|
|
|
* - freef: a pointer to a routine that is responsible for freeing the
|
|
|
|
* provided external storage buffer.
|
|
|
|
* - args: a pointer to an argument structure (of any type) to be passed
|
|
|
|
* to the provided freef routine (may be NULL).
|
|
|
|
* - flags: any other flags to be passed to the provided mbuf.
|
|
|
|
* - type: the type that the external storage buffer should be labeled with.
|
|
|
|
*/
|
2001-06-22 06:35:32 +00:00
|
|
|
void
|
|
|
|
m_extadd(struct mbuf *mb, caddr_t buf, u_int size,
|
2002-06-29 00:01:46 +00:00
|
|
|
void (*freef)(void *, void *), void *args, short flags, int type)
|
2001-06-22 06:35:32 +00:00
|
|
|
{
|
|
|
|
|
2002-07-30 21:06:27 +00:00
|
|
|
_mext_init_ref(mb, ((type != EXT_CLUSTER) ?
|
|
|
|
NULL : &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]));
|
2001-06-22 06:35:32 +00:00
|
|
|
if (mb->m_ext.ref_cnt != NULL) {
|
|
|
|
mb->m_flags |= (M_EXT | flags);
|
|
|
|
mb->m_ext.ext_buf = buf;
|
|
|
|
mb->m_data = mb->m_ext.ext_buf;
|
|
|
|
mb->m_ext.ext_size = size;
|
|
|
|
mb->m_ext.ext_free = freef;
|
|
|
|
mb->m_ext.ext_args = args;
|
|
|
|
mb->m_ext.ext_type = type;
|
|
|
|
}
|
|
|
|
}
|
2001-09-30 01:58:39 +00:00
|
|
|
|
|
|
|
/*
|
o Introduce new m_getcl() interface routine that allocates an mbuf
and a cluster in one shot.
o Introduce MBP_PERSIST and MBP_PERSISTENT control bits to mb_alloc();
MBP_PERSIST means "if you can allocate, then keep the cache lock
held on exit," and MBP_PERSISTENT means "a cache lock is alredy held
on entry, so allocate from the specified (already locked) cache."
They may be used in combination.
o m_getcl() uses the MBP_PERSIST/MBP_PERSISTENT interface so that it
doesn't drop the cache lock in between the mbuf and cluster allocations.
o m_getm(), which takes a size and allocates an mbuf + cluster "best fit"
chain, has been moved from uipc_mbuf.c to subr_mbuf.c and shown how to
use MBP_PERSIST/MBP_PERSISTENT to attempt to do a grouped allocation
without dropping the cache lock in between.
Why this is good: much less bus-locked lock acquires/drops when they're
not needed. Also, prototype for m_getcl():
struct mbuf * m_getcl(int how, short type, int flags);
"how" and "type" are self-explanatory. "flags" may be M_PKTHDR, in
which case m_getcl() will make the mbuf a pkthdr-mbuf.
While I'm in subr_mbuf.c:
o Every exported routine now has a nice comment with a description of
the expected arguments. Eventually, mbuf(9) needs to be re-vamped
but there's still more code to write/finalize before I get to that.
o internal macros have been changed a bit.
o consistently use 'short' for "type." This somehow slipped through
before (that 'type' was sometimes declared as int).
Alfred has been pushing for the MBP_PERSIST{,ENT} thing for almost a
year now. Luigi asked for m_getcl(), and will probably MFC that
part of this commit.
TODO [Related]: teach mb_free() about MBP_PERSIST{, ENT}.
2002-07-15 15:32:59 +00:00
|
|
|
* Change type of provided mbuf. This is a relatively expensive operation
|
|
|
|
* (due to the cost of statistics manipulations) and should be avoided, where
|
|
|
|
* possible.
|
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - mb: the provided mbuf for which the type needs to be changed.
|
|
|
|
* - new_type: the new type to change the mbuf to.
|
2001-09-30 01:58:39 +00:00
|
|
|
*/
|
|
|
|
void
|
|
|
|
m_chtype(struct mbuf *mb, short new_type)
|
|
|
|
{
|
2001-12-23 22:04:08 +00:00
|
|
|
struct mb_gen_list *gen_list;
|
2001-09-30 01:58:39 +00:00
|
|
|
|
|
|
|
gen_list = MB_GET_GEN_LIST(&mb_list_mbuf);
|
|
|
|
MB_LOCK_CONT(gen_list);
|
|
|
|
MB_MBTYPES_DEC(gen_list, mb->m_type, 1);
|
|
|
|
MB_MBTYPES_INC(gen_list, new_type, 1);
|
|
|
|
MB_UNLOCK_CONT(gen_list);
|
|
|
|
mb->m_type = new_type;
|
|
|
|
}
|