From nobody Mon Sep 26 10:39:01 2022 X-Original-To: dev-commits-src-main@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 4MbfPd2zGHz4V0vx; Mon, 26 Sep 2022 10:39: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 4MbfPd284Rz3c4l; Mon, 26 Sep 2022 10:39:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664188741; 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=PurAF/bFr079T7gy+Q3Sznps04GjBKRSggEHgp152DA=; b=haYf1twdX6pgcfrglNMzTICE+wEf1z9ZNLvWeioDEI7ZEU9GZoyN1W4t2n4j6iq7WCvXz8 6g5BB1N9NbTJUDg9eDKT6b9lu1EQeYQN41de4XS5FJRmeFUjqBUrUO5WhZOlZe/G2FFxwz 92F2aC1dtEvDOrIEOZkkFnn4JviAHt5eNNnNzdnbNqEyqWzvPPm3eYB0yNUbFbrhZnrmjP Oia6hDIKuFZ+gIQbrd4FfVRIpr8yee2qJF/nkhn4UXXwdHwBcpHVuWnqY9iSR+A8VIqfw/ F4eLYTyBFq7iKp0fh3epoKyVBAxuE8+bdfGrSAmCTyM5D83ls2ONOPGTZjQ7+w== 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 4MbfPd192hzl6b; Mon, 26 Sep 2022 10:39:01 +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 28QAd1hm072160; Mon, 26 Sep 2022 10:39:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QAd1LZ072159; Mon, 26 Sep 2022 10:39:01 GMT (envelope-from git) Date: Mon, 26 Sep 2022 10:39:01 GMT Message-Id: <202209261039.28QAd1LZ072159@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: 0fdc24727429 - main - tcp: make RACK loadable again using the default configuration List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 0fdc247274293a5f77868e8eed45457ffeaaba29 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664188741; 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=PurAF/bFr079T7gy+Q3Sznps04GjBKRSggEHgp152DA=; b=qDE7ZB0skpqBgEEBy2CaTNvXm4/xoym+XQ77X77pCX7StLeAHI8jBs4sgH1EhUAKsPiwHr Fbxl2hfNLjcJAclLnpL2utGacCv/LuA5Cv24qSrngeS+5BPjhOfxggjElUJHlqPw37Rgq0 rQ9rEirIXSUeo30dE0M7cs5EEVDT28A7o6Z58kLThbNCnKTiL4g9+3w4/8R6BxGhMf5lX5 KWzzbsWIE6Z7512crNCD5bGk18nO1Zx5ztVrcj85NXTqR/mqaQ6opy73ZrkN8Q3vsev6JN coK3fPiHY/xcFrrxTrZJIzPWwkVlUMwC8PpmX3JJrwYdhVYRGk93FwrkQ3SA8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664188741; a=rsa-sha256; cv=none; b=SEKivt48yXCmX0+N+rrNUkWiM/JgqUrhZD1RAzSwQJxamB5lvdWu//FPImvaHQX9jCDB/v 7vqTYEOuYkLu0rzGrJyDMSioTgTlaRJR0amSz3ctVgzuOqC5j2q5YMxE/aUb6haL/LCskJ nsrdeyH3y2V9vDEDbM4B9xl2YrtojrNLsdgu3J3otVzharjF1h+xO5h+rKbGGDGnnzH6dn JecOooKTaSRAq3SywM2Unvo6Xc4nm4ulJh3AdFy0MLK3/UIr1o7PE4HjSKU0kWVLsAF4Fa B2G/4fLBRubVjTG/Uwb8X0x1bTRokS3/tVzjiq9aQx7YNFf9mMo9c7USboBBoA== 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=0fdc247274293a5f77868e8eed45457ffeaaba29 commit 0fdc247274293a5f77868e8eed45457ffeaaba29 Author: Michael Tuexen AuthorDate: 2022-09-26 10:30:50 +0000 Commit: Michael Tuexen CommitDate: 2022-09-26 10:30:50 +0000 tcp: make RACK loadable again using the default configuration Without this patch, loading the RACK stack required the newreno CC module to be compiled into the kernel. This is not the case anymore since CUBIC is the default now. Reviewed by: rscheff@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D36707 --- sys/netinet/cc/cc.c | 1 + sys/netinet/cc/cc_newreno.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index 0c2d6cb0e86d..cd65d5a1a992 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -106,6 +106,7 @@ VNET_DEFINE(struct cc_algo *, default_cc_ptr) = NULL; VNET_DEFINE(uint32_t, newreno_beta) = 50; #define V_newreno_beta VNET(newreno_beta) +VNET_DEFINE(uint32_t, newreno_beta_ecn) = 80; void cc_refer(struct cc_algo *algo) diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 90895e0f6988..43f3d81389f3 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -99,7 +99,7 @@ static size_t newreno_data_sz(void); VNET_DECLARE(uint32_t, newreno_beta); #define V_newreno_beta VNET(newreno_beta) -VNET_DEFINE(uint32_t, newreno_beta_ecn) = 80; +VNET_DECLARE(uint32_t, newreno_beta_ecn); #define V_newreno_beta_ecn VNET(newreno_beta_ecn) struct cc_algo newreno_cc_algo = {