From nobody Fri Aug 30 06:46:50 2024 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 4Ww7wp61jgz5TBps; Fri, 30 Aug 2024 06:46:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ww7wp5Cgyz4HXs; Fri, 30 Aug 2024 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725000410; 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=4bSSN6jxfe2hyOxnXa++XWUKpqm+U1br6K6jYhjWsNo=; b=KvMnQPG2shyW02vMa6LAL9HdgqhW3GG+1RfzGQAivOAfn5f5b2u5Ml2DHrYGCthLRyXXhw heTi/ocfcEukH+0MUWR9qFfFs86nZAb8I7wOHt6FuiVUIgCox9q80JphPrVPUAS4VgZAOC /vJAOIgAyfgtf2PbWMF/rY8fJfmcxRF8mJ+Mucw43EpMuN/zRYoQXet4vmyu/gatfM5CBa HbFrvFu0n7/ju98MD9gwzUVyXte7oQRnThhVusKJWE1iExmP//D3naDcoxxhQfCipnmehe 8J+404nIdWxzwAuvZi+HF+W/iezLJE3/JGz+LKeIldCs5/xNtvwbnw0AvUV4og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725000410; a=rsa-sha256; cv=none; b=ThhXTWA4zEwTLuiREZ6kTWR8SoYlJnn3rthGhc5a3FVw2nSR1ju9B7HLq/+WcToseGsKOz /Evma0UMtG8qpyy3/Xx+UqK6JTnnqEd8U2yN3j5air7Y3Ky4eNvGNnvX1KK0HSfzsbt0Qo sBg7SwNzK5GQHy0ZzKkeWxBFOPlzNxgbRgdvgva7u7mSOyj1pK7evP5yqV+kj0wEFZMxue Y/ZQdkwhJXNtfz/4qp5o/qEbXJDOyTVqOLnE38PBzJPNgfemBpTW1coyORK2RGigWnv5MM JKAaQCm52SCkyL96nQmsZxZWeBWF7W8qPyKKlf5GxCzTFqm8UWkwlEOjs7SOmg== 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=1725000410; 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=4bSSN6jxfe2hyOxnXa++XWUKpqm+U1br6K6jYhjWsNo=; b=ZiekmUQBxNDsW6HOzA9B1P+fPadrvX+fAXfFU2Qnag/9o8LVXkH6Krz7Z7QtxlIloH0xqm Iz08S28nf5MylRFdY3dnGNqLm3r81m0htd3V6hd/9mJw7X5uvxQoqY02eTdMhJEQCNOWZg KQUeIX/Sw/QjESf/PPwJEUvEDflgjIUbWqpAFbl2k3V9gT1Tmb9ebJ3wgTyM070PNiMQKA l2wCB7G07Aw/3vozkwKjk79xIZ0nXdPwdu9mB0nJ1TMowuRqJXwgpflJz44jS1JbfE6BFE wnnUohtvK8d9gOexMiMdLT1RPvUtLfYh4OhSOvfMp+p6KtnGvd6XlnFXQUxRmQ== 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 4Ww7wp4hlHzqSy; Fri, 30 Aug 2024 06:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47U6ko6t075132; Fri, 30 Aug 2024 06:46:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47U6kog3075129; Fri, 30 Aug 2024 06:46:50 GMT (envelope-from git) Date: Fri, 30 Aug 2024 06:46:50 GMT Message-Id: <202408300646.47U6kog3075129@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: c467031b6143 - stable/13 - tcp: improve consistency of SYN-cache handling 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: c467031b6143cffae3260812eed4951352567297 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c467031b6143cffae3260812eed4951352567297 commit c467031b6143cffae3260812eed4951352567297 Author: Michael Tuexen AuthorDate: 2024-08-22 20:17:05 +0000 Commit: Michael Tuexen CommitDate: 2024-08-30 06:45:44 +0000 tcp: improve consistency of SYN-cache handling Originally, a SYN-cache entry was always allocated and later freed, when not needed anymore. Then the allocation was avoided, when no SYN-cache entry was needed, and a copy on the stack was used. But the logic regarding freeing was not updated. This patch doesn't re-check conditions (which may have changed) when deciding to insert or free the entry, but uses the result of the earlier check. This simplifies the code and improves also consistency. Reviewed by: glebius Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46410 (cherry picked from commit e41364711ca3f7e214f9607ebedf62e03e51633d) --- sys/netinet/tcp_syncache.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ea5ee033f6e0..54f7f4784490 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -1761,9 +1761,7 @@ skip_alloc: * Do a standard 3-way handshake. */ if (syncache_respond(sc, m, TH_SYN|TH_ACK) == 0) { - if (V_tcp_syncookies && V_tcp_syncookiesonly && sc != &scs) - syncache_free(sc); - else if (sc != &scs) + if (sc != &scs) syncache_insert(sc, sch); /* locks and unlocks sch */ TCPSTAT_INC(tcps_sndacks); TCPSTAT_INC(tcps_sndtotal);