From nobody Mon Dec 27 17:16:31 2021 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 7214A190F16D; Mon, 27 Dec 2021 17:16: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 4JN48J1LPnz3HNP; Mon, 27 Dec 2021 17:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0DCFB21F0D; Mon, 27 Dec 2021 17:16: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 1BRHGVeD078057; Mon, 27 Dec 2021 17:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BRHGVub078056; Mon, 27 Dec 2021 17:16:31 GMT (envelope-from git) Date: Mon, 27 Dec 2021 17:16:31 GMT Message-Id: <202112271716.1BRHGVub078056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: a859e9f9aa25 - main - 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/main X-Git-Reftype: branch X-Git-Commit: a859e9f9aa258841e988d2f6c5f860048e168923 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640625392; 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=m1+Ua0clzM/KW9GvIWZRHc/aJX2JDB3+xeftLnBhOyA=; b=Bo6gk9EagD8Chlg7rJ7whdJfcdrieYNQbQZU4CY3GVRHOfGjrqr1sG/qjItBFs5jLyEP7T fHv3tWIwAQyhmH37uWoqj+5XFCjiUe9Kf/Col+ZqEBUDsqnuHxzYfqrpy2VZAhYC7Nv1KS XPr4uQ3REEjRy9YdfgSZLe4nQWt9vPZj+GTXRoLarTKWfz9GssP3a8k8q10fMIpgJw1w2n 2HXw2Fgag64PkDdlFx5uvxtbOulBoSIEYiEKZlnz17pfy4RixWv5Kg7DXOp+NBk2lTcM+/ HE4xCH5HNKYi2+po/Hnete+tuLTCC17BjclrcKEqqDmaFmoad+dEg4n+2sJdkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640625392; a=rsa-sha256; cv=none; b=h97OteP6L47b5WrrlCIxxsOriD6SAHS5/5WErVlBMroulZLlBdZjX74b3/UjsSsYQxOzbC gddAr9YN5dQmRuDLHb3ZHYBRjQX3GeR0F6O/115LRB+A3i60gJvoYKLKv3gIwCzmNVzjHC hrGn/xJmlVSiL+68Lwl1qyQXj54j+lwtjF+w2PrTKA+B1T/OB4Kw+hMcD9Sd1OWyH9UT/K 7qrynDSO17gOaIzacy33Q5VGWDZ0DPVfnxBKgI6dVAsD3yVa27BZNjFUmqqa9wJBqF5FpN x+rgT4oGWbeBOAIMWwW3HbyT4Iat+Ry3wlO7y0cnoMWVfiV9gGxGQE3GIa2fDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=a859e9f9aa258841e988d2f6c5f860048e168923 commit a859e9f9aa258841e988d2f6c5f860048e168923 Author: Michael Tuexen AuthorDate: 2021-12-27 17:15:29 +0000 Commit: Michael Tuexen CommitDate: 2021-12-27 17:15:29 +0000 sctp: apply limit for socket buffers as indicated in comment MFC after: 3 days --- 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 c5c45a2f2072..f218950feef9 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