5d6d7e756b
- 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.
82 lines
2.6 KiB
C
82 lines
2.6 KiB
C
/*-
|
|
* 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);
|
|
}
|
|
}
|