diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2018-03-20 22:57:06 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2018-03-20 22:57:06 +0000 |
| commit | b2b7ca49dca771f65f281f4b0aa0e3c39eb42837 (patch) | |
| tree | 6c1e0d75b76e34bb3944f606751eaf895208eca4 /sys/net/bpfdesc.h | |
| parent | b7440a86c8dab00377163bf300ae79183c3f5b84 (diff) | |
| download | src-b2b7ca49dca771f65f281f4b0aa0e3c39eb42837.tar.gz src-b2b7ca49dca771f65f281f4b0aa0e3c39eb42837.zip | |
Use count(9) api for the bpf(4) statistics.
Currently each bfp descriptor uses u64 variables to maintain its counters.
On interfaces with high packet rate this leads to unnecessary contention
and inaccurate reporting.
PR: kern/205320
Reported by: elofu17 at hotmail.com
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D14726
Notes
Notes:
svn path=/head/; revision=331275
Diffstat (limited to 'sys/net/bpfdesc.h')
| -rw-r--r-- | sys/net/bpfdesc.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 1d91ffe1ed3f..f72a579f0042 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -45,6 +45,7 @@ #include <sys/selinfo.h> #include <sys/queue.h> #include <sys/conf.h> +#include <sys/counter.h> #include <net/if.h> /* @@ -76,8 +77,8 @@ struct bpf_d { struct bpf_insn *bd_rfilter; /* read filter code */ struct bpf_insn *bd_wfilter; /* write filter code */ void *bd_bfilter; /* binary filter code */ - u_int64_t bd_rcount; /* number of packets received */ - u_int64_t bd_dcount; /* number of packets dropped */ + counter_u64_t bd_rcount; /* number of packets received */ + counter_u64_t bd_dcount; /* number of packets dropped */ u_char bd_promisc; /* true if listening promiscuously */ u_char bd_state; /* idle, waiting, or timed out */ @@ -94,14 +95,14 @@ struct bpf_d { struct mtx bd_lock; /* per-descriptor lock */ struct callout bd_callout; /* for BPF timeouts with select */ struct label *bd_label; /* MAC label for descriptor */ - u_int64_t bd_fcount; /* number of packets which matched filter */ + counter_u64_t bd_fcount; /* number of packets which matched filter */ pid_t bd_pid; /* PID which created descriptor */ int bd_locked; /* true if descriptor is locked */ u_int bd_bufmode; /* Current buffer mode. */ - u_int64_t bd_wcount; /* number of packets written */ - u_int64_t bd_wfcount; /* number of packets that matched write filter */ - u_int64_t bd_wdcount; /* number of packets dropped during a write */ - u_int64_t bd_zcopy; /* number of zero copy operations */ + counter_u64_t bd_wcount; /* number of packets written */ + counter_u64_t bd_wfcount; /* number of packets that matched write filter */ + counter_u64_t bd_wdcount; /* number of packets dropped during a write */ + counter_u64_t bd_zcopy; /* number of zero copy operations */ u_char bd_compat32; /* 32-bit stream on LP64 system */ }; |