Date: Mon, 24 Apr 2023 23:31:36 GMT From: Cheng Cui <cc@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1f782fcc0cf1 - main - Remove unused fields in siftr_stats. Thus, update the man page as well. Message-ID: <202304242331.33ONVap6056856@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=1f782fcc0cf1042c6a08148cde0a81b4c6245e29 commit 1f782fcc0cf1042c6a08148cde0a81b4c6245e29 Author: Cheng Cui <cc@FreeBSD.org> AuthorDate: 2023-04-24 07:45:47 +0000 Commit: Cheng Cui <cc@FreeBSD.org> CommitDate: 2023-04-24 19:31:15 +0000 Remove unused fields in siftr_stats. Thus, update the man page as well. Summary: Remove unused fields in siftr_stats. Thus, update the man page as well. Test Plan: Tested in Emulab testbed. Reviewers: rscheff, tuexen Approved by: rscheff, tuexen Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D39776 --- share/man/man4/siftr.4 | 15 ++------------- sys/netinet/siftr.c | 16 +++------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4 index be5bf7d5411b..0406a38779b6 100644 --- a/share/man/man4/siftr.4 +++ b/share/man/man4/siftr.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 7, 2022 +.Dd April 24, 2023 .Dt SIFTR 4 .Os .Sh NAME @@ -370,8 +370,7 @@ operations since the module was most recently enabled. disable_time_secs=1238556197 disable_time_usecs=933607 \\ num_inbound_tcp_pkts=356 num_outbound_tcp_pkts=627 \\ total_tcp_pkts=983 num_inbound_skipped_pkts_malloc=0 \\ -num_outbound_skipped_pkts_malloc=0 num_inbound_skipped_pkts_mtx=0 \\ -num_outbound_skipped_pkts_mtx=0 num_inbound_skipped_pkts_tcb=0 \\ +num_outbound_skipped_pkts_malloc=0 num_inbound_skipped_pkts_tcb=0 \\ num_outbound_skipped_pkts_tcb=0 num_inbound_skipped_pkts_icb=0 \\ num_outbound_skipped_pkts_icb=0 total_skipped_tcp_pkts=0 \\ flow_list=172.16.7.28;22-172.16.2.5;55931, @@ -417,16 +416,6 @@ Number of outbound packets that were not processed because of failed calls. .El .Bl -tag -offset indent -width Va -.It Va num_inbound_skipped_pkts_mtx -Number of inbound packets that were not processed because of failure to add the -packet to the packet processing queue. -.El -.Bl -tag -offset indent -width Va -.It Va num_outbound_skipped_pkts_mtx -Number of outbound packets that were not processed because of failure to add the -packet to the packet processing queue. -.El -.Bl -tag -offset indent -width Va .It Va num_inbound_skipped_pkts_tcb Number of inbound packets that were not processed because of failure to find the TCP control block associated with the packet. diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c index 7861031b724b..a23980704e17 100644 --- a/sys/netinet/siftr.c +++ b/sys/netinet/siftr.c @@ -112,8 +112,8 @@ __FBSDID("$FreeBSD$"); * Z is bumped to mark backwards compatible changes */ #define V_MAJOR 1 -#define V_BACKBREAK 2 -#define V_BACKCOMPAT 4 +#define V_BACKBREAK 3 +#define V_BACKCOMPAT 0 #define MODVERSION __CONCAT(V_MAJOR, __CONCAT(V_BACKBREAK, V_BACKCOMPAT)) #define MODVERSION_STR __XSTRING(V_MAJOR) "." __XSTRING(V_BACKBREAK) "." \ __XSTRING(V_BACKCOMPAT) @@ -257,9 +257,6 @@ struct siftr_stats /* # pkts skipped due to failed malloc calls. */ uint32_t nskip_in_malloc; uint32_t nskip_out_malloc; - /* # pkts skipped due to failed mtx acquisition. */ - uint32_t nskip_in_mtx; - uint32_t nskip_out_mtx; /* # pkts skipped due to failed inpcb lookups. */ uint32_t nskip_in_inpcb; uint32_t nskip_out_inpcb; @@ -1314,16 +1311,13 @@ siftr_manage_ops(uint8_t action) totalss.n_out = DPCPU_VARSUM(ss, n_out); totalss.nskip_in_malloc = DPCPU_VARSUM(ss, nskip_in_malloc); totalss.nskip_out_malloc = DPCPU_VARSUM(ss, nskip_out_malloc); - totalss.nskip_in_mtx = DPCPU_VARSUM(ss, nskip_in_mtx); - totalss.nskip_out_mtx = DPCPU_VARSUM(ss, nskip_out_mtx); totalss.nskip_in_tcpcb = DPCPU_VARSUM(ss, nskip_in_tcpcb); totalss.nskip_out_tcpcb = DPCPU_VARSUM(ss, nskip_out_tcpcb); totalss.nskip_in_inpcb = DPCPU_VARSUM(ss, nskip_in_inpcb); totalss.nskip_out_inpcb = DPCPU_VARSUM(ss, nskip_out_inpcb); total_skipped_pkts = totalss.nskip_in_malloc + - totalss.nskip_out_malloc + totalss.nskip_in_mtx + - totalss.nskip_out_mtx + totalss.nskip_in_tcpcb + + totalss.nskip_out_malloc + totalss.nskip_in_tcpcb + totalss.nskip_out_tcpcb + totalss.nskip_in_inpcb + totalss.nskip_out_inpcb; @@ -1334,8 +1328,6 @@ siftr_manage_ops(uint8_t action) "num_inbound_tcp_pkts=%ju\tnum_outbound_tcp_pkts=%ju\t" "total_tcp_pkts=%ju\tnum_inbound_skipped_pkts_malloc=%u\t" "num_outbound_skipped_pkts_malloc=%u\t" - "num_inbound_skipped_pkts_mtx=%u\t" - "num_outbound_skipped_pkts_mtx=%u\t" "num_inbound_skipped_pkts_tcpcb=%u\t" "num_outbound_skipped_pkts_tcpcb=%u\t" "num_inbound_skipped_pkts_inpcb=%u\t" @@ -1348,8 +1340,6 @@ siftr_manage_ops(uint8_t action) (uintmax_t)(totalss.n_in + totalss.n_out), totalss.nskip_in_malloc, totalss.nskip_out_malloc, - totalss.nskip_in_mtx, - totalss.nskip_out_mtx, totalss.nskip_in_tcpcb, totalss.nskip_out_tcpcb, totalss.nskip_in_inpcb,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304242331.33ONVap6056856>