f7574a2276
mbuma is an Mbuf & Cluster allocator built on top of a number of extensions to the UMA framework, all included herein. Extensions to UMA worth noting: - Better layering between slab <-> zone caches; introduce Keg structure which splits off slab cache away from the zone structure and allows multiple zones to be stacked on top of a single Keg (single type of slab cache); perhaps we should look into defining a subset API on top of the Keg for special use by malloc(9), for example. - UMA_ZONE_REFCNT zones can now be added, and reference counters automagically allocated for them within the end of the associated slab structures. uma_find_refcnt() does a kextract to fetch the slab struct reference from the underlying page, and lookup the corresponding refcnt. mbuma things worth noting: - integrates mbuf & cluster allocations with extended UMA and provides caches for commonly-allocated items; defines several zones (two primary, one secondary) and two kegs. - change up certain code paths that always used to do: m_get() + m_clget() to instead just use m_getcl() and try to take advantage of the newly defined secondary Packet zone. - netstat(1) and systat(1) quickly hacked up to do basic stat reporting but additional stats work needs to be done once some other details within UMA have been taken care of and it becomes clearer to how stats will work within the modified framework. From the user perspective, one implication is that the NMBCLUSTERS compile-time option is no longer used. The maximum number of clusters is still capped off according to maxusers, but it can be made unlimited by setting the kern.ipc.nmbclusters boot-time tunable to zero. Work should be done to write an appropriate sysctl handler allowing dynamic tuning of kern.ipc.nmbclusters at runtime. Additional things worth noting/known issues (READ): - One report of 'ips' (ServeRAID) driver acting really slow in conjunction with mbuma. Need more data. Latest report is that ips is equally sucking with and without mbuma. - Giant leak in NFS code sometimes occurs, can't reproduce but currently analyzing; brueffer is able to reproduce but THIS IS NOT an mbuma-specific problem and currently occurs even WITHOUT mbuma. - Issues in network locking: there is at least one code path in the rip code where one or more locks are acquired and we end up in m_prepend() with M_WAITOK, which causes WITNESS to whine from within UMA. Current temporary solution: force all UMA allocations to be M_NOWAIT from within UMA for now to avoid deadlocks unless WITNESS is defined and we can determine with certainty that we're not holding any locks when we're M_WAITOK. - I've seen at least one weird socketbuffer empty-but- mbuf-still-attached panic. I don't believe this to be related to mbuma but please keep your eyes open, turn on debugging, and capture crash dumps. This change removes more code than it adds. A paper is available detailing the change and considering various performance issues, it was presented at BSDCan2004: http://www.unixdaemons.com/~bmilekic/netbuf_bmilekic.pdf Please read the paper for Future Work and implementation details, as well as credits. Testing and Debugging: rwatson, brueffer, Ketrien I. Saihr-Kesenchedra, ... Reviewed by: Lots of people (for different parts)
154 lines
5.5 KiB
C
154 lines
5.5 KiB
C
/*
|
|
* Copyright (c) 1992, 1993
|
|
* Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
|
|
*
|
|
* @(#)netstat.h 8.2 (Berkeley) 1/4/94
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
extern int Aflag; /* show addresses of protocol control block */
|
|
extern int aflag; /* show all sockets (including servers) */
|
|
extern int bflag; /* show i/f total bytes in/out */
|
|
extern int dflag; /* show i/f dropped packets */
|
|
extern int gflag; /* show group (multicast) routing or stats */
|
|
extern int iflag; /* show interfaces */
|
|
extern int Lflag; /* show size of listen queues */
|
|
extern int mflag; /* show memory stats */
|
|
extern int numeric_addr; /* show addresses numerically */
|
|
extern int numeric_port; /* show ports numerically */
|
|
extern int rflag; /* show routing tables (or routing stats) */
|
|
extern int sflag; /* show protocol statistics */
|
|
extern int tflag; /* show i/f watchdog timers */
|
|
extern int Wflag; /* wide display */
|
|
extern int zflag; /* zero stats */
|
|
|
|
extern int interval; /* repeat interval for i/f stats */
|
|
|
|
extern char *interface; /* desired i/f for stats, or NULL for all i/fs */
|
|
extern int unit; /* unit number for above */
|
|
|
|
extern int af; /* address family */
|
|
|
|
int kread(u_long addr, char *buf, int size);
|
|
const char *plural(int);
|
|
const char *plurales(int);
|
|
const char *pluralies(int);
|
|
|
|
void protopr(u_long, const char *, int);
|
|
void tcp_stats(u_long, const char *, int);
|
|
void udp_stats(u_long, const char *, int);
|
|
void ip_stats(u_long, const char *, int);
|
|
void icmp_stats(u_long, const char *, int);
|
|
void igmp_stats(u_long, const char *, int);
|
|
void pim_stats(u_long, const char *, int);
|
|
#ifdef IPSEC
|
|
void ipsec_stats(u_long, const char *, int);
|
|
#endif
|
|
|
|
#ifdef INET6
|
|
void ip6_stats(u_long, const char *, int);
|
|
void ip6_ifstats(char *);
|
|
void icmp6_stats(u_long, const char *, int);
|
|
void icmp6_ifstats(char *);
|
|
void pim6_stats(u_long, const char *, int);
|
|
void rip6_stats(u_long, const char *, int);
|
|
void mroute6pr(u_long, u_long);
|
|
void mrt6_stats(u_long);
|
|
|
|
struct sockaddr_in6;
|
|
struct in6_addr;
|
|
char *routename6(struct sockaddr_in6 *);
|
|
const char *netname6(struct sockaddr_in6 *, struct in6_addr *);
|
|
void inet6print(struct in6_addr *, int, const char *, int);
|
|
#endif /*INET6*/
|
|
|
|
#ifdef IPSEC
|
|
void pfkey_stats(u_long, const char *, int);
|
|
#endif
|
|
|
|
void bdg_stats(u_long, const char *, int);
|
|
|
|
void mbpr(u_long, u_long, u_long, u_long, u_long, u_long,
|
|
u_long, u_long, u_long, u_long, u_long);
|
|
|
|
void hostpr(u_long, u_long);
|
|
void impstats(u_long, u_long);
|
|
|
|
void intpr(int, u_long, void (*)(char *));
|
|
|
|
void pr_rthdr(int);
|
|
void pr_family(int);
|
|
void rt_stats(u_long, u_long);
|
|
char *ipx_pnet(struct sockaddr *);
|
|
char *ipx_phost(struct sockaddr *);
|
|
char *ns_phost(struct sockaddr *);
|
|
void upHex(char *);
|
|
|
|
char *routename(u_long);
|
|
char *netname(u_long, u_long);
|
|
char *atalk_print(struct sockaddr *, int);
|
|
char *atalk_print2(struct sockaddr *, struct sockaddr *, int);
|
|
char *ipx_print(struct sockaddr *);
|
|
char *ns_print(struct sockaddr *);
|
|
void routepr(u_long);
|
|
|
|
void ipxprotopr(u_long, const char *, int);
|
|
void spx_stats(u_long, const char *, int);
|
|
void ipx_stats(u_long, const char *, int);
|
|
void ipxerr_stats(u_long, const char *, int);
|
|
|
|
void nsprotopr(u_long, const char *, int);
|
|
void spp_stats(u_long, const char *, int);
|
|
void idp_stats(u_long, const char *, int);
|
|
void nserr_stats(u_long, const char *, int);
|
|
|
|
void atalkprotopr(u_long, const char *, int);
|
|
void ddp_stats(u_long, const char *, int);
|
|
|
|
void netgraphprotopr(u_long, const char *, int);
|
|
|
|
void unixpr(void);
|
|
|
|
void esis_stats(u_long, const char *, int);
|
|
void clnp_stats(u_long, const char *, int);
|
|
void cltp_stats(u_long, const char *, int);
|
|
void iso_protopr(u_long, const char *, int);
|
|
void iso_protopr1(u_long, int);
|
|
void tp_protopr(u_long, const char *, int);
|
|
void tp_inproto(u_long);
|
|
void tp_stats(caddr_t, caddr_t);
|
|
|
|
void ifmalist_dump(void);
|
|
void mroutepr(u_long, u_long);
|
|
void mrt_stats(u_long);
|