From nobody Tue Feb 22 23:55:00 2022 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 12C9319CEB21; Tue, 22 Feb 2022 23:55:01 +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 4K3GHm74j4z4S0s; Tue, 22 Feb 2022 23:55:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574101; 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=TWA7YhBke7sysy9jjGtKUtV+CuzLh49DxziiOETw63U=; b=ZFBeiTymkf6+mcdwbCnVjehD1j8deH98UKfGZhl4Jp2Gi8tTAfldo8rg4y3R2GVybyKH9c WXQ/OD2g0CMuxCnK0htsXogQdJ/0mwyvASqKUnBx3vLf4xHnbFOyF9+EnYAyGMf3ha++kE zKnbev5QudZ2EzWyajn+Lxpg1MBSAJ53yn32uIFCpw1/W2S/QbHqElb1o4MgZ+t7i0LMj8 LeNOb7NskXNv00L5NjoDS0Cy/Mvxhcq0aZtxLaQV/nhQXPsGGAIGr6k7UYKTGwItPLqz9E C8qZfa5vyWLkfYOWjCiapEm8GIA3ZLUs30akItPbUVjRrh7HA157UNpCFwg9MQ== 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 D2C165BC6; Tue, 22 Feb 2022 23:55:00 +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 21MNt00w051277; Tue, 22 Feb 2022 23:55:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21MNt0U3051276; Tue, 22 Feb 2022 23:55:00 GMT (envelope-from git) Date: Tue, 22 Feb 2022 23:55:00 GMT Message-Id: <202202222355.21MNt0U3051276@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 4abd7785da8b - stable/13 - sctp: apply limit for socket buffers as indicated in comment 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4abd7785da8b4706a4ec6648092f096495112f19 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645574101; 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=TWA7YhBke7sysy9jjGtKUtV+CuzLh49DxziiOETw63U=; b=e3du8utCNUdcZP/77zjBZx25BzyLfIrn9zJVXlI3WzX6/6l532CXRNClNH7Bz6ziTDmGBK 96wH+BB3dk8RFyGvIGdp7lhSHmuxQ5MBbw2RLr1B5MN56zgWU52NUmFt2DzlVqsCEqXWbE oM/Z/B61KCDUlvfyLt0NbPHDtaTLwLxeSsdS9g7JA5G5mjuzu5lWsJd/ZK50ypdS1txUTf 2IwzPWPnqD4D9lB6DUr/nwX+WeYcsAleIvack1SCFfHzSv2Y3+EwA0wKcdhAd/UROkj631 oUznyMKrKqxjDv2y8AjZp2zz2bEpBBhry0nKt9fV17b1QncPSMPuT1c0p8mznQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645574101; a=rsa-sha256; cv=none; b=PAGDxo/oLZyJDyRC7lSrGF5cqdeirA4lIvgMOiV+5ZVDUyMXR+AyZO8qrdiXKej+jQLSfh GF7Wk2Pw6sCEkz7sO2lWjlYVs07wozzzhvorshDGZk7cbQ7pXsLSHODvg8LJ6Cf0yR/5jd R9yntMeQwGrDpOmMC+F7va7oiDX4wIxr4zHRaDTbOIMySZ7Rs344NfUglLK8OjVeLNuzFj ECmt2OZyiPFwrUwM5aqQL94qoJHdJF2uWX9MpJdlcQaqy0zIAZ7pihwHj0QzAs8T6zrRXb 97EXo6Gln13pVujMm339u0QQxYwjbL2Tt++Ijpn8eseZOwFjPimrR/DQydrSKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4abd7785da8b4706a4ec6648092f096495112f19 commit 4abd7785da8b4706a4ec6648092f096495112f19 Author: Michael Tuexen AuthorDate: 2021-12-27 17:15:29 +0000 Commit: Michael Tuexen CommitDate: 2022-02-22 23:53:31 +0000 sctp: apply limit for socket buffers as indicated in comment (cherry picked from commit a859e9f9aa258841e988d2f6c5f860048e168923) --- sys/netinet/sctp_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 850639d4b486..2450bde02986 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -73,7 +73,7 @@ sctp_init(void) */ sb_max_adj = (u_long)((u_quad_t)(SB_MAX) * MCLBYTES / (MSIZE + MCLBYTES)); SCTP_BASE_SYSCTL(sctp_sendspace) = min(sb_max_adj, - (((uint32_t)nmbclusters / 2) * SCTP_DEFAULT_MAXSEGMENT)); + (((uint32_t)nmbclusters / 2) * MCLBYTES)); /* * Now for the recv window, should we take the same amount? or * should I do 1/2 the SB_MAX instead in the SB_MAX min above. For