diff options
author | glebius <glebius@FreeBSD.org> | 2014-02-07 15:18:23 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-02-07 15:18:23 +0000 |
commit | 9d7706f9f4506fb689de9cbadb4452174b30d194 (patch) | |
tree | 4df8f4b91b7dcda62a93b6621f4da6c21c55ae5a /usr.bin | |
parent | c82f5e592c269547df815f28d9667eed62ad7dc1 (diff) | |
download | FreeBSD-src-9d7706f9f4506fb689de9cbadb4452174b30d194.zip FreeBSD-src-9d7706f9f4506fb689de9cbadb4452174b30d194.tar.gz |
o Revamp API between flowtable and netinet, netinet6.
- ip_output() and ip_output6() simply call flowtable_lookup(),
passing mbuf and address family. That's the only code under
#ifdef FLOWTABLE in the protocols code now.
o Revamp statistics gathering and export.
- Remove hand made pcpu stats, and utilize counter(9).
- Snapshot of statistics is available via 'netstat -rs'.
- All sysctls are moved into net.flowtable namespace, since
spreading them over net.inet isn't correct.
o Properly separate at compile time INET and INET6 parts.
o General cleanup.
- Remove chain of multiple flowtables. We simply have one for
IPv4 and one for IPv6.
- Flowtables are allocated in flowtable.c, symbols are static.
- With proper argument to SYSINIT() we no longer need flowtable_ready.
- Hash salt doesn't need to be per-VNET.
- Removed rudimentary debugging, which use quite useless in dtrace era.
The runtime behavior of flowtable shouldn't be changed by this commit.
Sponsored by: Netflix
Sponsored by: Nginx, Inc.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/netstat/Makefile | 3 | ||||
-rw-r--r-- | usr.bin/netstat/flowtable.c | 81 | ||||
-rw-r--r-- | usr.bin/netstat/main.c | 5 | ||||
-rw-r--r-- | usr.bin/netstat/netstat.h | 1 |
4 files changed, 87 insertions, 3 deletions
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 3e25077..2432cfb 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -5,7 +5,8 @@ PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c netisr.c route.c \ - unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c + unix.c atalk.c mroute6.c ipsec.c bpf.c pfkey.c sctp.c \ + flowtable.c WARNS?= 3 CFLAGS+=-fno-strict-aliasing diff --git a/usr.bin/netstat/flowtable.c b/usr.bin/netstat/flowtable.c new file mode 100644 index 0000000..715d343 --- /dev/null +++ b/usr.bin/netstat/flowtable.c @@ -0,0 +1,81 @@ +/*- + * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org> + * + * 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. + * 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. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); +#include <sys/param.h> +#include <sys/sysctl.h> +#include <net/flowtable.h> +#include <err.h> +#include <stdint.h> +#include <stdio.h> +#include "netstat.h" + +/* + * Print flowtable statistics. + */ + +static void +print_stats(struct flowtable_stat *stat) +{ + +#define p(f, m) if (stat->f || sflag <= 1) \ + printf(m, (uintmax_t)stat->f, plural(stat->f)) +#define p2(f, m) if (stat->f || sflag <= 1) \ + printf(m, (uintmax_t)stat->f, plurales(stat->f)) + + p(ft_lookups, "\t%ju lookup%s\n"); + p(ft_hits, "\t%ju hit%s\n"); + p2(ft_misses, "\t%ju miss%s\n"); + p(ft_collisions, "\t%ju collision%s\n"); + p(ft_free_checks, "\t%ju free check%s\n"); + p(ft_frees, "\t%ju free%s\n"); + +#undef p2 +#undef p +} + +void +flowtable_stats(void) +{ + struct flowtable_stat stat; + size_t len = sizeof(stat); + + if (!live) + return; + + if (sysctlbyname("net.flowtable.ip4.stat", &stat, &len, NULL, 0) == 0) { + printf("flowtable for IPv4:\n"); + print_stats(&stat); + } + + if (sysctlbyname("net.flowtable.ip6.stat", &stat, &len, NULL, 0) == 0) { + printf("flowtable for IPv6:\n"); + print_stats(&stat); + } +} diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 2509c4e..88ea55a 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -571,9 +571,10 @@ main(int argc, char *argv[]) exit(0); } if (rflag) { - if (sflag) + if (sflag) { rt_stats(); - else + flowtable_stats(); + } else routepr(fib, af); exit(0); } diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index cf89933..fd4ec96 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -125,6 +125,7 @@ void intpr(int, void (*)(char *), int); void pr_rthdr(int); void pr_family(int); void rt_stats(void); +void flowtable_stats(void); char *ipx_pnet(struct sockaddr *); char *ipx_phost(struct sockaddr *); char *ns_phost(struct sockaddr *); |