diff options
author | bmilekic <bmilekic@FreeBSD.org> | 2001-06-22 06:35:32 +0000 |
---|---|---|
committer | bmilekic <bmilekic@FreeBSD.org> | 2001-06-22 06:35:32 +0000 |
commit | 5d710b296b16892625e76899c986dd7697754050 (patch) | |
tree | d56e06b359d94f82a565ce2544371429eb0c93ae /usr.bin | |
parent | 44d1723f45fa955b68fb90fc3e7604ceeea6f0d3 (diff) | |
download | FreeBSD-src-5d710b296b16892625e76899c986dd7697754050.zip FreeBSD-src-5d710b296b16892625e76899c986dd7697754050.tar.gz |
Introduce numerous SMP friendly changes to the mbuf allocator. Namely,
introduce a modified allocation mechanism for mbufs and mbuf clusters; one
which can scale under SMP and which offers the possibility of resource
reclamation to be implemented in the future. Notable advantages:
o Reduce contention for SMP by offering per-CPU pools and locks.
o Better use of data cache due to per-CPU pools.
o Much less code cache pollution due to excessively large allocation macros.
o Framework for `grouping' objects from same page together so as to be able
to possibly free wired-down pages back to the system if they are no longer
needed by the network stacks.
Additional things changed with this addition:
- Moved some mbuf specific declarations and initializations from
sys/conf/param.c into mbuf-specific code where they belong.
- m_getclr() has been renamed to m_get_clrd() because the old name is really
confusing. m_getclr() HAS been preserved though and is defined to the new
name. No tree sweep has been done "to change the interface," as the old
name will continue to be supported and is not depracated. The change was
merely done because m_getclr() sounds too much like "m_get a cluster."
- TEMPORARILY disabled mbtypes statistics displaying in netstat(1) and
systat(1) (see TODO below).
- Fixed systat(1) to display number of "free mbufs" based on new per-CPU
stat structures.
- Fixed netstat(1) to display new per-CPU stats based on sysctl-exported
per-CPU stat structures. All infos are fetched via sysctl.
TODO (in order of priority):
- Re-enable mbtypes statistics in both netstat(1) and systat(1) after
introducing an SMP friendly way to collect the mbtypes stats under the
already introduced per-CPU locks (i.e. hopefully don't use atomic() - it
seems too costly for a mere stat update, especially when other locks are
already present).
- Optionally have systat(1) display not only "total free mbufs" but also
"total free mbufs per CPU pool."
- Fix minor length-fetching issues in netstat(1) related to recently
re-enabled option to read mbuf stats from a core file.
- Move reference counters at least for mbuf clusters into an unused portion
of the cluster itself, to save space and need to allocate a counter.
- Look into introducing resource freeing possibly from a kproc.
Reviewed by (in parts): jlemon, jake, silby, terry
Tested by: jlemon (Intel & Alpha), mjacob (Intel & Alpha)
Preliminary performance measurements: jlemon (and me, obviously)
URL: http://people.freebsd.org/~bmilekic/mb_alloc/
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/netstat/main.c | 19 | ||||
-rw-r--r-- | usr.bin/netstat/mbuf.c | 227 | ||||
-rw-r--r-- | usr.bin/netstat/netstat.h | 3 | ||||
-rw-r--r-- | usr.bin/systat/mbufs.c | 76 |
4 files changed, 236 insertions, 89 deletions
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 05f41c6..15736f9 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -153,6 +153,16 @@ static struct nlist nl[] = { { "_nmbclusters" }, #define N_NMBUFS 41 { "_nmbufs" }, +#define N_MBLIM 42 + { "_mbuf_limit" }, +#define N_CLLIM 43 + { "_clust_limit" }, +#define N_NCPUS 44 + { "_smp_cpus" }, +#define N_PAGESZ 45 + { "_pagesize" }, +#define N_MBPSTAT 46 + { "_mb_statpcpu" }, { "" }, }; @@ -486,9 +496,14 @@ main(argc, argv) mbpr(nl[N_MBSTAT].n_value, nl[N_MBTYPES].n_value, nl[N_NMBCLUSTERS].n_value, - nl[N_NMBUFS].n_value); + nl[N_NMBUFS].n_value, + nl[N_MBLIM].n_value, + nl[N_CLLIM].n_value, + nl[N_NCPUS].n_value, + nl[N_PAGESZ].n_value, + nl[N_MBPSTAT].n_value); } else - mbpr(0, 0, 0, 0); + mbpr(0, 0, 0, 0, 0, 0, 0, 0, 0); exit(0); } #if 0 diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c index 3829cd8..e7de17e 100644 --- a/usr.bin/netstat/mbuf.c +++ b/usr.bin/netstat/mbuf.c @@ -48,11 +48,14 @@ static const char rcsid[] = #include <err.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "netstat.h" #define YES 1 typedef int bool; +/* XXX: mbtypes stats temporarily disactivated. */ +#if 0 static struct mbtypenames { int mt_type; char *mt_name; @@ -89,24 +92,30 @@ static struct mbtypenames { #endif { 0, 0 } }; +#endif /* 0 */ /* * Print mbuf statistics. */ void -mbpr(u_long mbaddr, u_long mbtaddr, u_long nmbcaddr, u_long nmbufaddr) +mbpr(u_long mbaddr, u_long mbtaddr, u_long nmbcaddr, u_long nmbufaddr, + u_long mblimaddr, u_long cllimaddr, u_long cpusaddr, u_long pgsaddr, + u_long mbpaddr) { - u_long totmem, totpossible, totmbufs; - register int i; - struct mbstat mbstat; - struct mbtypenames *mp; - int name[3], nmbclusters, nmbufs, nmbcnt, nmbtypes; - size_t nmbclen, nmbuflen, nmbcntlen, mbstatlen, mbtypeslen; - u_long *mbtypes; - bool *seen; /* "have we seen this type yet?" */ + int i, nmbufs, nmbclusters, ncpu, page_size, num_objs; + u_int mbuf_limit, clust_limit; + u_long totspace, totnum, totfree; + size_t mlen; + struct mbstat *mbstat = NULL; + struct mbpstat **mbpstat = NULL; - mbtypes = NULL; - seen = NULL; +/* XXX: mbtypes stats temporarily disabled. */ +#if 0 + int nmbtypes; + size_t mbtypeslen; + struct mbtypenames *mp; + u_long *mbtypes = NULL; + bool *seen = NULL; /* * XXX @@ -127,92 +136,182 @@ mbpr(u_long mbaddr, u_long mbtaddr, u_long nmbcaddr, u_long nmbufaddr) warn("calloc"); goto err; } +#endif + + mlen = sizeof mbstat; + if ((mbstat = malloc(mlen)) == NULL) { + warn("malloc: cannot allocate memory for mbstat"); + goto err; + } + + /* + * XXX: Unfortunately, for the time being, we have to fetch + * the total length of the per-CPU stats area via sysctl + * (regardless of whether we're looking at a core or not. + */ + if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &mlen, NULL, 0) < 0) { + warn("sysctl: retrieving mb_statpcpu len"); + goto err; + } + num_objs = (int)(mlen / sizeof(struct mbpstat)); + if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { + warn("calloc: cannot allocate memory for mbpstats pointers"); + goto err; + } + if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { + warn("calloc: cannot allocate memory for mbpstats"); + goto err; + } if (mbaddr) { - if (kread(mbaddr, (char *)&mbstat, sizeof mbstat)) + if (kread(mbpaddr, (char *)mbpstat[0], mlen)) + goto err; + if (kread(mbaddr, (char *)mbstat, sizeof mbstat)) goto err; +#if 0 if (kread(mbtaddr, (char *)mbtypes, mbtypeslen)) goto err; +#endif if (kread(nmbcaddr, (char *)&nmbclusters, sizeof(int))) goto err; if (kread(nmbufaddr, (char *)&nmbufs, sizeof(int))) goto err; + if (kread(mblimaddr, (char *)&mbuf_limit, sizeof(u_int))) + goto err; + if (kread(cllimaddr, (char *)&clust_limit, sizeof(u_int))) + goto err; + if (kread(cpusaddr, (char *)&ncpu, sizeof(int))) + goto err; + if (kread(pgsaddr, (char *)&page_size, sizeof(int))) + goto err; } else { - name[0] = CTL_KERN; - name[1] = KERN_IPC; - name[2] = KIPC_MBSTAT; - mbstatlen = sizeof mbstat; - if (sysctl(name, 3, &mbstat, &mbstatlen, 0, 0) < 0) { + if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &mlen, + NULL, 0) < 0) { + warn("sysctl: retrieving mb_statpcpu"); + goto err; + } + if (sysctlbyname("kern.ipc.mbstat", mbstat, &mlen, NULL, 0) + < 0) { warn("sysctl: retrieving mbstat"); goto err; } - +#if 0 if (sysctlbyname("kern.ipc.mbtypes", mbtypes, &mbtypeslen, NULL, 0) < 0) { warn("sysctl: retrieving mbtypes"); goto err; } - - name[2] = KIPC_NMBCLUSTERS; - nmbclen = sizeof(int); - if (sysctl(name, 3, &nmbclusters, &nmbclen, 0, 0) < 0) { +#endif + mlen = sizeof(int); + if (sysctlbyname("kern.ipc.nmbclusters", &nmbclusters, &mlen, + NULL, 0) < 0) { warn("sysctl: retrieving nmbclusters"); goto err; } - - nmbuflen = sizeof(int); - if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &nmbuflen, 0, 0) < 0) { + mlen = sizeof(int); + if (sysctlbyname("kern.ipc.nmbufs", &nmbufs, &mlen, NULL, 0) + < 0) { warn("sysctl: retrieving nmbufs"); goto err; } + mlen = sizeof(u_int); + if (sysctlbyname("kern.ipc.mbuf_limit", &mbuf_limit, &mlen, + NULL, 0) < 0) { + warn("sysctl: retrieving mbuf_limit"); + goto err; + } + mlen = sizeof(u_int); + if (sysctlbyname("kern.ipc.clust_limit", &clust_limit, &mlen, + NULL, 0) < 0) { + warn("sysctl: retrieving clust_limit"); + goto err; + } + mlen = sizeof(int); + if (sysctlbyname("kern.smp.cpus", &ncpu, &mlen, NULL, 0) < 0) { + warn("sysctl: retrieving kern.smp.cpus"); + goto err; + } + mlen = sizeof(int); + if (sysctlbyname("hw.pagesize", &page_size, &mlen, NULL, 0) + < 0) { + warn("sysctl: retrieving hw.pagesize"); + goto err; + } } - nmbcntlen = sizeof(int); - if (sysctlbyname("kern.ipc.nmbcnt", &nmbcnt, &nmbcntlen, 0, 0) < 0) { - warn("sysctl: retrieving nmbcnt"); - goto err; - } + for (i = 0; i < num_objs; i++) + mbpstat[i] = mbpstat[0] + i; #undef MSIZE -#define MSIZE (mbstat.m_msize) +#define MSIZE (mbstat->m_msize) #undef MCLBYTES -#define MCLBYTES (mbstat.m_mclbytes) - - totmbufs = 0; - for (mp = mbtypenames; mp->mt_name; mp++) - totmbufs += mbtypes[mp->mt_type]; - printf("%lu/%lu/%u mbufs in use (current/peak/max):\n", totmbufs, - mbstat.m_mbufs, nmbufs); - for (mp = mbtypenames; mp->mt_name; mp++) - if (mbtypes[mp->mt_type]) { - seen[mp->mt_type] = YES; - printf("\t%lu mbufs allocated to %s\n", - mbtypes[mp->mt_type], mp->mt_name); - } - seen[MT_FREE] = YES; - for (i = 0; i < nmbtypes; i++) - if (!seen[i] && mbtypes[i]) { - printf("\t%lu mbufs allocated to <mbuf type %d>\n", - mbtypes[i], i); - } - printf("%lu/%lu/%u mbuf clusters in use (current/peak/max)\n", - mbstat.m_clusters - mbstat.m_clfree, mbstat.m_clusters, - nmbclusters); - printf("%lu/%lu m_ext reference counters (in use/allocated)\n", - mbstat.m_refcnt - mbstat.m_refree, mbstat.m_refcnt); - totmem = mbstat.m_mbufs * MSIZE + mbstat.m_clusters * MCLBYTES + - mbstat.m_refcnt * sizeof(union mext_refcnt); - totpossible = nmbclusters * MCLBYTES + nmbufs * MSIZE + - nmbcnt * sizeof(union mext_refcnt); - printf("%lu Kbytes allocated to network (%lu%% of mb_map in use)\n", - totmem / 1024, (totmem * 100) / totpossible); - printf("%lu requests for memory denied\n", mbstat.m_drops); - printf("%lu requests for memory delayed\n", mbstat.m_wait); - printf("%lu calls to protocol drain routines\n", mbstat.m_drain); +#define MCLBYTES (mbstat->m_mclbytes) +#define MBPERPG (page_size / MSIZE) +#define CLPERPG (page_size / MCLBYTES) +#define GENLST (num_objs - 1) + + printf("mbuf usage:\n"); + printf("\tGEN list:\t%lu/%lu (in use/in pool)\n", + (mbpstat[GENLST]->mb_mbpgs * MBPERPG - mbpstat[GENLST]->mb_mbfree), + (mbpstat[GENLST]->mb_mbpgs * MBPERPG)); + totnum = mbpstat[GENLST]->mb_mbpgs * MBPERPG; + totfree = mbpstat[GENLST]->mb_mbfree; + totspace = mbpstat[GENLST]->mb_mbpgs * page_size; + for (i = 0; i < ncpu; i++) { + printf("\tCPU #%d list:\t%lu/%lu (in use/in pool)\n", i, + (mbpstat[i]->mb_mbpgs * MBPERPG - mbpstat[i]->mb_mbfree), + (mbpstat[i]->mb_mbpgs * MBPERPG)); + totspace += mbpstat[i]->mb_mbpgs * page_size; + totnum += mbpstat[i]->mb_mbpgs * MBPERPG; + totfree += mbpstat[i]->mb_mbfree; + } + printf("\tTotal:\t\t%lu/%lu (in use/in pool)\n", (totnum - totfree), + totnum); + printf("\tMaximum number allowed on each CPU list: %d\n", mbuf_limit); + printf("\tMaximum possible: %d\n", nmbufs); + printf("\t%lu%% of mbuf map consumed\n", ((totspace * 100) / (nmbufs + * MSIZE))); + + printf("mbuf cluster usage:\n"); + printf("\tGEN list:\t%lu/%lu (in use/in pool)\n", + (mbpstat[GENLST]->mb_clpgs * CLPERPG - mbpstat[GENLST]->mb_clfree), + (mbpstat[GENLST]->mb_clpgs * CLPERPG)); + totnum = mbpstat[GENLST]->mb_clpgs * CLPERPG; + totfree = mbpstat[GENLST]->mb_clfree; + totspace = mbpstat[GENLST]->mb_clpgs * page_size; + for (i = 0; i < ncpu; i++) { + printf("\tCPU #%d list:\t%lu/%lu (in use/in pool)\n", i, + (mbpstat[i]->mb_clpgs * CLPERPG - mbpstat[i]->mb_clfree), + (mbpstat[i]->mb_clpgs * CLPERPG)); + totspace += mbpstat[i]->mb_clpgs * page_size; + totnum += mbpstat[i]->mb_clpgs * CLPERPG; + totfree += mbpstat[i]->mb_clfree; + } + printf("\tTotal:\t\t%lu/%lu (in use/in pool)\n", (totnum - totfree), + totnum); + printf("\tMaximum number allowed on each CPU list: %d\n", clust_limit); + printf("\tMaximum possible: %d\n", nmbclusters); + printf("\t%lu%% of cluster map consumed\n", ((totspace * 100) / + (nmbclusters * MCLBYTES))); + + printf("%lu requests for memory denied\n", mbstat->m_drops); + printf("%lu requests for memory delayed\n", mbstat->m_wait); + printf("%lu calls to protocol drain routines\n", mbstat->m_drain); err: +#if 0 if (mbtypes != NULL) free(mbtypes); if (seen != NULL) free(seen); +#endif + if (mbstat != NULL) + free(mbstat); + if (mbpstat != NULL) { + if (mbpstat[0] != NULL) + free(mbpstat[0]); + free(mbpstat); + } + + return; } diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index e590c48..fffcfd6 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -95,7 +95,8 @@ void pfkey_stats (u_long, char *, int); void bdg_stats (u_long, char *, int); -void mbpr (u_long, u_long, u_long, u_long); +void mbpr (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); diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c index c4957b9..f793053 100644 --- a/usr.bin/systat/mbufs.c +++ b/usr.bin/systat/mbufs.c @@ -49,7 +49,12 @@ static const char rcsid[] = #include "systat.h" #include "extern.h" -static struct mbstat *mb; +static struct mbpstat **mbpstat; +static int num_objs, ncpu; +#define GENLST (num_objs - 1) + +/* XXX: mbtypes stats temporarily disabled. */ +#if 0 static u_long *m_mbtypes; static int nmbtypes; @@ -66,6 +71,7 @@ static struct mtnames { }; #define NNAMES (sizeof (mtnames) / sizeof (mtnames[0])) +#endif WINDOW * openmbufs() @@ -95,12 +101,13 @@ labelmbufs() void showmbufs() { - register int i, j, max, index; + int i, j, max, index; + u_long totfree; char buf[10]; char *mtname; - if (mb == 0) - return; +/* XXX: mbtypes stats temporarily disabled (will be back soon!) */ +#if 0 for (j = 0; j < wnd->_maxy; j++) { max = 0, index = -1; for (i = 0; i < wnd->_maxy; i++) { @@ -135,19 +142,27 @@ showmbufs() while (max--) waddch(wnd, 'X'); wclrtoeol(wnd); - mb->m_mbufs -= m_mbtypes[index]; m_mbtypes[index] = 0; } - if (mb->m_mbufs) { +#endif + + /* + * Print total number of free mbufs. + */ + totfree = mbpstat[GENLST]->mb_mbfree; + for (i = 0; i < ncpu; i++) + totfree += mbpstat[i]->mb_mbfree; + j = 0; /* XXX */ + if (totfree > 0) { mvwprintw(wnd, 1+j, 0, "%-10.10s", "free"); - if (mb->m_mbufs > 60) { - snprintf(buf, sizeof(buf), " %ld", mb->m_mbufs); - mb->m_mbufs = 60; - while (mb->m_mbufs--) + if (totfree > 60) { + snprintf(buf, sizeof(buf), " %lu", totfree); + totfree = 60; + while(totfree--) waddch(wnd, 'X'); waddstr(wnd, buf); } else { - while(mb->m_mbufs--) + while(totfree--) waddch(wnd, 'X'); } wclrtoeol(wnd); @@ -159,7 +174,10 @@ showmbufs() int initmbufs() { - size_t len, mbtypeslen; + int i; + size_t len; +#if 0 + size_t mbtypeslen; if (sysctlbyname("kern.ipc.mbtypes", NULL, &mbtypeslen, NULL, 0) < 0) { error("sysctl getting mbtypes size failed"); @@ -170,15 +188,28 @@ initmbufs() return 0; } nmbtypes = mbtypeslen / sizeof(*m_mbtypes); - - len = 0; - if (sysctlbyname("kern.ipc.mbstat", 0, &len, 0, 0) < 0) { - error("sysctl getting mbstat size failed"); +#endif + len = sizeof(int); + if (sysctlbyname("kern.smp.cpus", &ncpu, &len, NULL, 0) < 0) { + error("sysctl getting number of cpus"); + return 0; + } + if (sysctlbyname("kern.ipc.mb_statpcpu", NULL, &len, NULL, 0) < 0) { + error("sysctl getting mbpstat total size failed"); return 0; } + num_objs = (int)(len / sizeof(struct mbpstat)); + if ((mbpstat = calloc(num_objs, sizeof(struct mbpstat *))) == NULL) { + error("calloc mbpstat pointers failed"); + return 0; + } + if ((mbpstat[0] = calloc(num_objs, sizeof(struct mbpstat))) == NULL) { + error("calloc mbpstat structures failed"); + return 0; + } + for (i = 0; i < num_objs; i++) + mbpstat[i] = mbpstat[0] + i; - if (mb == 0) - mb = (struct mbstat *)calloc(1, sizeof *mb); return 1; } @@ -187,11 +218,12 @@ fetchmbufs() { size_t len; - len = sizeof *mb; - if (sysctlbyname("kern.ipc.mbstat", mb, &len, 0, 0) < 0) - printw("sysctl: mbstat: %s", strerror(errno)); - + len = num_objs * sizeof(struct mbpstat); + if (sysctlbyname("kern.ipc.mb_statpcpu", mbpstat[0], &len, NULL, 0) < 0) + printw("sysctl: mbpstat: %s", strerror(errno)); +#if 0 len = nmbtypes * sizeof *m_mbtypes; if (sysctlbyname("kern.ipc.mbtypes", m_mbtypes, &len, 0, 0) < 0) printw("sysctl: mbtypes: %s", strerror(errno)); +#endif } |