From nobody Fri Mar 3 21:29:19 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 4PT1M33ZKzz3wMbB; Fri, 3 Mar 2023 21:29:19 +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 4PT1M32gPyz4D74; Fri, 3 Mar 2023 21:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878959; 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=0JBVhn8KmuFqiJEI0zYKWw7OZzVy0NYvY41fYSHOhe8=; b=GF6dqUx0UmSGiq1wNnzaKJ1w9LgKgMIxo5Jlg5fcLzK+g4o+jGPuUg4mZJKoOta1M0bzm2 9uU4dHniAO+HRqZk81MIL5hojUGuHI1Y8dwDhVH/tkcyC82U5qyN8J6MtJPgvkX33S1r02 cQYMpjjkGP7UG9uRyFBnGkPbNmaKFBjTIccs+ARZErULbFZh/nvK2f+2ct++cupBwV/OB5 c0sSiq1us0WLOm9CgVscQm/LA7X13/KEmtxO8H+x5JIFSTvOe94oEQ3uoimyVhkQxbg4Xk Kgs0E77TYVSu0JiUslCCgilihBDx0c4d++6xb/vqWLkYa1573OwrxyzIHbFJ4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878959; 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=0JBVhn8KmuFqiJEI0zYKWw7OZzVy0NYvY41fYSHOhe8=; b=Ecgd1aXxC2lZK53rm/DU87Fb7C9K5iSVbex3YTLRbzxudUHknm46ZXw9Vc/FsBzesnKBaI QmC+LIvII+a6UijLDJuMQ9vBSldw2gwyf4nw+oZh6TpL+y2jps/FYF0Md+DKk0GLuIk+5J mkBKObRCxx9eu+OWE9Au7Hlmg6jTxq8NtOC2nQG9dXETRYDJbi5OoHX82qXPp4U1Viifyy JfKwtubSvXGkpE3RLhztEYIho+O2uAp0Y9WIdpcd0gpAJI3cthGHEEHadT4FenEyUOPrCE 2elZr68ZQRgLv4kgOPHpeNpdQst/r17cnjRSTb/Pe3NZtp7UqOR0elz9Af5JeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677878959; a=rsa-sha256; cv=none; b=otVf1nnRaYBr1zzoyx7tWL0ugVQ+rss6r2fw/5zl22WFnNrsBG4tCXFiZjeWSgfGels3nt XP43FjmDsrRLCMgauUavWjtLvAetXujade5mDrzGWqL7zcaHIxvOW2lRlDg8TaAjaOoGdp pn8h2oXrN0+oEvsqFeqRUGFlx2fUNs/ny5DqbU6U8eKUxYkElTpX1ExSYhj9YLw8QlB6+6 D0cuzRHm/3Qs8n7TKPx2A5pj/1pfn2U11ZDdvU9q9J5EippQIH6NZOZoHAW+ERI6ijoB6Y aJRwAYW0aQL8nyFuvFRFoxFReZtbqZNVWbZpKmxnny4qzUMkwIkrqPz2uAzjAw== 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 4PT1M31kGBz1Cwb; Fri, 3 Mar 2023 21:29:19 +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 323LTJj9009389; Fri, 3 Mar 2023 21:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323LTJ6t009388; Fri, 3 Mar 2023 21:29:19 GMT (envelope-from git) Date: Fri, 3 Mar 2023 21:29:19 GMT Message-Id: <202303032129.323LTJ6t009388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 9b3d6127716e - stable/12 - tcp: Make TCP PCAP buffer properly configurable. 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: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9b3d6127716ec0fcc22a5794ffceebdf9220db3e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=9b3d6127716ec0fcc22a5794ffceebdf9220db3e commit 9b3d6127716ec0fcc22a5794ffceebdf9220db3e Author: Richard Scheffenegger AuthorDate: 2023-02-28 18:57:30 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-02 02:30:07 +0000 tcp: Make TCP PCAP buffer properly configurable. Reviewed By: tuexen, cc, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D38824 (cherry picked from commit 399a5655e6edf69a63f1c37e66fdad19dcfdb5cf) --- sys/netinet/tcp_usrreq.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 968b1f4c5e30..33c8ed715581 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2076,7 +2076,8 @@ unlock_and_done: INP_WLOCK_RECHECK(inp); if (optval >= 0) - tcp_pcap_set_sock_max(TCP_PCAP_OUT ? + tcp_pcap_set_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts), optval); else @@ -2260,7 +2261,8 @@ unlock_and_done: #ifdef TCPPCAP case TCP_PCAP_OUT: case TCP_PCAP_IN: - optval = tcp_pcap_get_sock_max(TCP_PCAP_OUT ? + optval = tcp_pcap_get_sock_max( + (sopt->sopt_name == TCP_PCAP_OUT) ? &(tp->t_outpkts) : &(tp->t_inpkts)); INP_WUNLOCK(inp); error = sooptcopyout(sopt, &optval, sizeof optval);