From nobody Wed Sep 06 04:53:10 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 4RgVPL5pCRz4sLxx; Wed, 6 Sep 2023 04:53:10 +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 4RgVPL49bGz3V0r; Wed, 6 Sep 2023 04:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975990; 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=PWeZsOOuKJqWzhVIlC2nYBY+ximwpoqki2RvvXNfvZY=; b=lecyMKnPcA2nMksuJrbcaybffuyC+tdS4RGjwpYRNIzTabWwbiwLYgvR1cHVtjsYzXw+cM Px8FGvQ1ckO5cipR8M+osB8aLIoMIDZ5FEFfLB1nPdOIDJKSqkrsSFoDkAcfLi1AMPQu3W VtXoYiZyYNWFHIrFQIuO+1+wyg0eCW72mUFgvcr/V595cjcrXbPggACiOKnfsXAmM5M0hC 1bR4aiFSwbzLlaVYhDl4vGZpEqadFKwi5coA4iBc0rqv+Nbvde6vr3L/UrWXPnWlcj4x9c GFtP40ReZjRaVse69UsJeZvk0k30zOTDhb+F2wKlH2hHUL8I5eYab8wLziD5QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975990; a=rsa-sha256; cv=none; b=RTIwfPBlZBdl7riY4mF5/2WD9vfbc3EcAxhQuUYjurf3eKc2KSlwCLvrqD8C0d4Vec3Aby zraJsxb3qK+u7HltMEIOYYhTJEYufNKPY+ta2Cv2qrVUMFEFl2F45UE1KeySGZb1iqV4Qi rCWbGyNrnzbN4JmuyR9e0BwEajxcLZ/fJes9VwCcwhVJ2dWOefFNazelyFrKWFtKYTqTte T26q/puRDmfq2iSoXO9LjYaAx03RT7SmL8ct9+Lf2uz8YcmRmDQMMRzNpIz02u5hFGEQl7 Kc5kQYe5Hbic4bt7wqEh+qGBSqH4N6xMqInp2W7MGkTGZkQiB4/2AHx8mOUAYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975990; 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=PWeZsOOuKJqWzhVIlC2nYBY+ximwpoqki2RvvXNfvZY=; b=TYYj90nvUiXpAYNuL/k7YjQpyiwI3dXKXtAsTzKWpDCYkCMW3g3FAXD1u+ERmId3TkO/we hDhbUZOJhAvcwpjAgqpSmLaor/jeq+DS0+EZGwNB06x/MMzgT8KQxrVrQ9kMZjKY1w48tM kcxs2LkvCvGDu1Cgv4CrPBE1PTsXdnyKuFGBp6tSNW0e97HK/Kv9lH4WwpnzwELTDexeIM mmtEtMGE0SfExcZRjUS0fF1MvoDbQ+1bUN/aLxjUOuUK7LYW2/ncDAlMKoX+koxf5x1BJj DOyoPLxSrMj32yzVX6+MFSBnsVQO60yWmpewlV/EGeuBybNrO/0E6AIzyGss8Q== 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 4RgVPL357Mz134p; Wed, 6 Sep 2023 04:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864rAZw022517; Wed, 6 Sep 2023 04:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864rAHt022514; Wed, 6 Sep 2023 04:53:10 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:10 GMT Message-Id: <202309060453.3864rAHt022514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: aadedc5b3e4b - stable/12 - tcp: Initialize the maximum number of entries in a client cookie cache bucket 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: aadedc5b3e4b360513f2a950135059ca01035202 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=aadedc5b3e4b360513f2a950135059ca01035202 commit aadedc5b3e4b360513f2a950135059ca01035202 Author: Zhenlei Huang AuthorDate: 2023-09-02 20:34:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 tcp: Initialize the maximum number of entries in a client cookie cache bucket This vnet loader tunable is defined with SYSCTL_PROC, thus will not be initialized by kernel on vnet creating and will always have the default value TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT. Fix by fetching the value from the corresponding kernel environment during vnet constructing. PR: 273509 Reviewed by: #transport, tuexen Fixes: c560df6f12f1 This is an implementation of the client side of TCP Fast Open (TFO) [RFC7413] MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41691 (cherry picked from commit 224aec05e732bb97a0d3c91142973b98a91238d1) (cherry picked from commit 144851777edad9522390036d3073ea656d7b648d) (cherry picked from commit 3fc299d68897a0748d96510de5f191f5a8249216) --- sys/netinet/tcp_fastopen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 396b1c9c3d01..cb78d83a11ba 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -273,7 +273,7 @@ SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, autokey, static int sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, ccache_bucket_limit, - CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN, NULL, 0, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH, NULL, 0, &sysctl_net_inet_tcp_fastopen_ccache_bucket_limit, "IU", "Max entries per bucket in client cookie cache"); @@ -396,7 +396,8 @@ tcp_fastopen_init(void) V_tcp_fastopen_keys.newest = TCP_FASTOPEN_MAX_KEYS - 1; V_tcp_fastopen_keys.newest_psk = TCP_FASTOPEN_MAX_PSKS - 1; - /* May already be non-zero if kernel tunable was set */ + TUNABLE_INT_FETCH("net.inet.tcp.fastopen.ccache_bucket_limit", + &V_tcp_fastopen_ccache.bucket_limit); if (V_tcp_fastopen_ccache.bucket_limit == 0) V_tcp_fastopen_ccache.bucket_limit = TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT;