From nobody Mon Apr 24 23:31:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q51c85dTSz462L4; Mon, 24 Apr 2023 23:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q51c85BG5z462H; Mon, 24 Apr 2023 23:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682379096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ec1C/+ppDN300bif3SeH28JJiiKsIIkc4HUDlR0uOX4=; b=GtR9dovx/7yfC+VR+gQ4bVb9ELZGFxwIiiY/KLQ9Fcf51w5bmHZPYeOnY1BcU1swCM/Wro H60gmuc4awsqV5EA6s8uc60pzjASii6ZlsJ+ta1DJtFkSV+C5J4hzBI3b4CGPxw9Ew4vk0 RWSfTVXlPXsZIZWogu+wwEz+OOaylLF6m2eKp1IUh6Udafsp2AWa3vAPsW7qi20ysukFC7 mg2TRPp15YdXfRlKw/ex+G2qhQNpYKDJHaZWL77Xp4j4PEafRHddgZbMa8G6rk0LTN7xUy F00T3f9LAmUMHNCLwKnRFsqkfe6Hx4zy597HQEdB7Fm45L9koqTIOSrrVsTy5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682379096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ec1C/+ppDN300bif3SeH28JJiiKsIIkc4HUDlR0uOX4=; b=XhO/ip7GOGDe2CUHwzC5yyA0VpFK/FxeRmKHZLJcQpciMnJp9Dpy/QmMb/eaVD68RGVj5l cDEx1Ek4bmex+UnZgsM+fy6RAwk/KHGfHSgX9JuuUSG3l9f4NOWtqkDN0sSvqhjL+TvclA DfEHLSrRGeAy+VuI5R+DBATNCcp7OaaVoJCUzeegbviWhsuGl2kK+yFDLFwis9Lb3R6KDS Xk/Ep8YsNX1D/i5irEKJ1Lok+JQMxhzw6dkn7N5aadQvEP0bpr8i2RiY8Q7RJPPgtfxdzg Q16t+quvJATQw/cmxU7HxWRFvCg8z34OvMf2QlRLhSJTeF8VxaCCzUT5aJQVdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682379096; a=rsa-sha256; cv=none; b=wdOKobD8zwyUG8Jc8yAEJKsfmfYAyGvjiFIJX8cnhjbJLioe3t0W4T5NUIkzoSbvu7EHQu Zk2vElIRB1dRSIXjO88gzsnrLQ51WB2NNdmaC1X6g54EF4LGfXZmnYPQamAUNVHdHAu0p3 jEMsteHeI8737olwM+WxsM0y1EGHl0l5Qgtjo7hL7m1t3dIx6C3tkk5YGv9TDZJQL9Lyup gjmVY7n1RZARqQvmWy1MnDRtE99UolmCPE74Bi72hhHLhNo5TMz92JtE9J034bB88DDUy4 cTq+n0QpO9Y7S/sYUugl5uNeYYuFcZMFDmDIXXZil9Bh1PRF6gmWozvi4sxw+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q51c84GgJzlCd; Mon, 24 Apr 2023 23:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33ONVamB056857; Mon, 24 Apr 2023 23:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33ONVap6056856; Mon, 24 Apr 2023 23:31:36 GMT (envelope-from git) Date: Mon, 24 Apr 2023 23:31:36 GMT Message-Id: <202304242331.33ONVap6056856@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: 1f782fcc0cf1 - main - Remove unused fields in siftr_stats. Thus, update the man page as well. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f782fcc0cf1042c6a08148cde0a81b4c6245e29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=1f782fcc0cf1042c6a08148cde0a81b4c6245e29 commit 1f782fcc0cf1042c6a08148cde0a81b4c6245e29 Author: Cheng Cui AuthorDate: 2023-04-24 07:45:47 +0000 Commit: Cheng Cui 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,