From nobody Sat Dec 16 10:29:47 2023 X-Original-To: dev-commits-src-branches@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 4Ssj575xr7z53jgh; Sat, 16 Dec 2023 10:29:47 +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 4Ssj574Swtz4Fgv; Sat, 16 Dec 2023 10:29:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702722587; 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=7O19AEHWfiyYYEmMepzv9BNPstNk/e+Tayv6q6FedRo=; b=pj6z2sP9LF6M0jHRaHlSnt9qeWyXo8rDwWR24eUvAJ/SYVQhtP3S6PgooGD/wTL0G6itFb wPiL7NTQZ9Fsa0RN+uc9UaCs43Fynl+V3QR1Mn//BO42G6xYPTAmAcieyHE4GZaWbm3PQ8 T5836b3s8G8fBpgMxKPFUlWcsb7EB4yP8R3T7SonYFRYMtGH7sikQNMF1JzpTABOEUP9jo lbkJtqSCQvtC6Z1BxqtKLJ2AfYOEEfQihqsIKbEtDgjtnJts1Dq6OM+th0x6LyMcA6/wUR uAoqXopS5JRP9QUyedyBMWLMRL3vsgZslpc6E9tzELSp58e3prR6Xa4CWRXnsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702722587; a=rsa-sha256; cv=none; b=oZLrvSA7JLnpA13iH4yJmP2ta+nGgmE92Ejv0zQ9H6/6v6HUOQ1sCE9mNKSYXAvam4/Vs6 uW7O5VT0PG0Bdh/f6tDQYiczrNaP5vnkzF+1G6R5isL5cG9DgcMkgCNgY1FEo6L7CaHiKc Gj9o92Jdbd88taqp9eZgsv+2LPKjtM+4FTQc173Mu0pKZKr9hSduRFnPLnwpN/Z5dhEG3q bmXZDzKRoT/48Aqo1S7IhDuWDkNFC0+tUUyMjAlMOj/IDnsd1unhK2FH9bjjN/v4V9nS4J cvvBan7TIdd6gxBUfduij5/m8YEqkiPK/Tu4TxyYBb2QiMcsQ71DU0VY1VrjKw== 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=1702722587; 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=7O19AEHWfiyYYEmMepzv9BNPstNk/e+Tayv6q6FedRo=; b=qvxO31IFYzjACBNmK1GgK2ap1fwWS6nSJMoG9Z7qDJXoWbkbeMnEHRUeb/afMJtYI1eMzJ MbYI7o7sj+RGuWiZMVDFFdrTjCBxum2naAnO5jcywG54DEAkfrajzwob/6Vk/g+PRtp4qT YqlnGDmReLoKFLAwMLI8Dq2HEmN7WLcSs5HniAWgveiMn7cDQ5qcgBOiiMoGWN5k7ZQF/u 69SfKl0buDJAine/bUfyTs8E1ZeEOuY9Yv+MQU1ZSzO7KUEQGTNp8TDBIGU+YIqT9H8um0 wg2YHnzGvFXNRvdsNGfotjC0mOEjcILb+azlJ8jPxTeo5mK7LZkAG3VVuFhC3w== 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 4Ssj573S07zqH6; Sat, 16 Dec 2023 10:29:47 +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 3BGATlHW077916; Sat, 16 Dec 2023 10:29:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BGATlYU077913; Sat, 16 Dec 2023 10:29:47 GMT (envelope-from git) Date: Sat, 16 Dec 2023 10:29:47 GMT Message-Id: <202312161029.3BGATlYU077913@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 544bfa7cea3b - stable/14 - tcp: properly initialize LRD while accepting session in syncache List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 544bfa7cea3bb9e9525d84fad42a406912f42e17 Auto-Submitted: auto-generated The branch stable/14 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=544bfa7cea3bb9e9525d84fad42a406912f42e17 commit 544bfa7cea3bb9e9525d84fad42a406912f42e17 Author: Richard Scheffenegger AuthorDate: 2023-12-02 11:15:37 +0000 Commit: Richard Scheffenegger CommitDate: 2023-12-15 08:23:45 +0000 tcp: properly initialize LRD while accepting session in syncache Inherit the setting from the listener socket in syncache_socket. MFC after: 2 weeks Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D42874 (cherry picked from commit f071abd92e726fc12e9256662e1f286f364252ee) --- sys/netinet/tcp_syncache.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index ffde6a4b88c9..2c381ef600d6 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -952,7 +952,8 @@ syncache_socket(struct syncache *sc, struct socket *lso, struct mbuf *m) tp->rcv_adv += tp->rcv_wnd; tp->last_ack_sent = tp->rcv_nxt; - tp->t_flags = sototcpcb(lso)->t_flags & (TF_NOPUSH|TF_NODELAY); + tp->t_flags = sototcpcb(lso)->t_flags & + (TF_LRD|TF_NOPUSH|TF_NODELAY); if (sc->sc_flags & SCF_NOOPT) tp->t_flags |= TF_NOOPT; else {