From nobody Fri Mar 3 21:28:32 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 4PT1L83mtFz3wMXj; Fri, 3 Mar 2023 21:28:32 +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 4PT1L82xQ4z4C9W; Fri, 3 Mar 2023 21:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878912; 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=AEk/aa6nWqghJiu44JtmoObJrIViaKPiYfPRXH9JT0o=; b=lWg4fD1IjA0g4ZlR7rXwGH7zkBvUEQDD3h0/1XEn31hHBxH0OR7HiJvvrAfljjBS+ATmpp CzWfVEsGqh9ZdKbCzxXl3mTpfZ7xuCRx60/XXY4NVz65EMbpMCLFvHjjdELS6c5yyQqTDb zRXiromLzL7pOE2cQiI01urpYS6QBwUZoOHl8FGlMceulzJ8MpZYE4NJ/G+m0bV0bhm+gu ZRZtkv5kNBqMOzlsyzGmR0dPHXsW6QWNbhFhkB0Q5j5MYjDX8AwIl9iP6kiNqDjYsS3q9t W1rdskKh2drobiQ4jjl5Qmiqes7KVCPzWciOn3ygH8ynDXw7dCpshK7rliTQMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677878912; 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=AEk/aa6nWqghJiu44JtmoObJrIViaKPiYfPRXH9JT0o=; b=P6G63XZUAKqDKNmXBpeh6dl+pW4zIvv/F/TBUS7XmB5u6BVMGsKXUpQT7Kl6u7DBO4BCwt xZkg/iXnkUOVOtlsA4IHDen+HdJmcJWPqT6UpwMZsg9/yuWR1YBIXJRsEOz/AtLLpRfEm3 wZlyw/HoFD2xc7JmKyrFaYcS5tBQ23lF1bZoMV/SCqS4J2zIEYXPBGzO87NKs3yFMM9tD1 7kb8Zx42sNIuALVvcxwe8DgKPbjlwmeWDZfjWxfCFLNGbUMNZRYv4pmZ7Y69lWJVmL/Atk S5+IZevfkzdEYpubtw1CWnln+gXLuuqVbFcbgLEEJi/L/BU/xj+RRpUpVe0EBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677878912; a=rsa-sha256; cv=none; b=CJ7KitWEXw27UfRznYGzTByLAcc2as4yT+MybE93OiHHcTDBUtnybQG4XJ9uCO9U8LXvwl Fcxc/WlD9h6/0snxM4DTHkcr3gvMHKtXFixr7zqK4FPVNkKCvAilAR2Jvj5ZXiCaYJhU77 DF9YQERJc1E/7OzXt2ayLiCqxrZAEdnicdmm8hib10W2zNgnBJz0CJTqHP2Wqa0GlpVSyZ GtDzvYDIANmfZvDzrGeDu44f7S0JT1Hr+KeG4pphLqyiKuOoNGqhxJOo8lv0d+hjFJLCvE DTcIp5gw4c2lJO8zuGvWRmSEo9+PPGrkXqYo6UI+KWCMqfT0iemf2QdyUHW+pw== 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 4PT1L81zthz1CwZ; Fri, 3 Mar 2023 21:28:32 +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 323LSWdA009182; Fri, 3 Mar 2023 21:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 323LSWG8009181; Fri, 3 Mar 2023 21:28:32 GMT (envelope-from git) Date: Fri, 3 Mar 2023 21:28:32 GMT Message-Id: <202303032128.323LSWG8009181@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: 2be7e3df7275 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 2be7e3df72758f46c853c08cd4e35f4e5fb0b187 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=2be7e3df72758f46c853c08cd4e35f4e5fb0b187 commit 2be7e3df72758f46c853c08cd4e35f4e5fb0b187 Author: Richard Scheffenegger AuthorDate: 2023-02-28 18:57:30 +0000 Commit: Richard Scheffenegger CommitDate: 2023-03-02 07:36:21 +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 0706e55f439b..0b9e1841bc0e 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2257,7 +2257,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 @@ -2494,7 +2495,8 @@ unhold: #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);