From nobody Sun Dec 26 16:49:32 2021 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 A53F91922E60; Sun, 26 Dec 2021 16:49:33 +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 4JMRbc4XYMz4tws; Sun, 26 Dec 2021 16:49: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 48C8C5E96; Sun, 26 Dec 2021 16:49: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 1BQGnWgU014228; Sun, 26 Dec 2021 16:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BQGnWjh014227; Sun, 26 Dec 2021 16:49:32 GMT (envelope-from git) Date: Sun, 26 Dec 2021 16:49:32 GMT Message-Id: <202112261649.1BQGnWjh014227@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: dbbcc777de40 - main - rack: rack_do_compressed_ack_processing() can call tcp_drop() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbbcc777de40cb3e3e2919049b02e3f9782de078 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640537372; 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=BLyOuJ9GfuJ2mc9VxLfMnm2ooBGHKERvcv+/WNrB3a0=; b=yrmOrf3rg+cgasXCV9RD1D+64Z+p38Kaxsxj/J2Ma+jtxpqx5mbAGid+P1p/UxePTPZm/P O2jMbNyPa9yF5AQS2Gn22NJ4amp7umGS/RnxhuzDz0QCJfA+3TeGCZE3/tj7YMLZv6jqck HxmvVrQ9+c8YJZj6FCiT3Ov+WYGYmqGziOkE6MDr/YAQ8LN9Xp+dODk5fcF2PyJn9vYAsy 4x+CweS4kR8YtvSs+DzxZwmRzUBL5O2DSrWOTDd+/zG6OLSCIaPPWZ4+URoq+P5n++9F1o H4uQW7APfV2NH58/EGEI7Y9rGn4tLZXjmONrSFw0dsvLQ7nGN+hyAqV9ehTL+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640537372; a=rsa-sha256; cv=none; b=lqyEve54CkRaAzqkOfblBBsTCPaV5bmV1VeVK/QAk5QBFdTYbnXvDd13WbZRYoFt1UEslf lNgJUzlGrDJ59LeNPZAyeMIitM3LfjQPQEaEbp+jcAceBq1SO153viJWtQGSLgWsX9jUwp f8C5vzdIdL5P2/fNcEqZI5YYD0K6fX9vCdS6H5CWf1+lnD20OucB33w2YPctGVQrlH2WOw cPBBMVgsl9MDMTK6QAahQdWeW4VuxH1cKe6WPBpv4eDmrAUh6wYiXcpS40wKNiThQDp2Yh 8c9MzrUx1C2pEmIMsOa+0u4OSlAoThrX1oD19oiI+C5FMrCc7wNrLKzFMw61eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=dbbcc777de40cb3e3e2919049b02e3f9782de078 commit dbbcc777de40cb3e3e2919049b02e3f9782de078 Author: Gleb Smirnoff AuthorDate: 2021-12-26 16:48:15 +0000 Commit: Gleb Smirnoff CommitDate: 2021-12-26 16:48:15 +0000 rack: rack_do_compressed_ack_processing() can call tcp_drop() Reviewed by: rrs, tuexen Differential revision: https://reviews.freebsd.org/D33369 --- sys/netinet/tcp_stacks/rack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index 4aa98443f55e..cd198e11babe 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14043,7 +14043,6 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb if (ctf_progress_timeout_check(tp, true)) { rack_log_progress_event((struct tcp_rack *)tp->t_fb_ptr, tp, tick, PROGRESS_DROP, __LINE__); - tcp_set_inp_to_drop(tp->t_inpcb, ETIMEDOUT); /* * We cheat here and don't send a RST, we should send one * when the pacer drops the connection. @@ -14059,7 +14058,7 @@ rack_do_compressed_ack_processing(struct tcpcb *tp, struct socket *so, struct mb } sched_unpin(); #endif - INP_WUNLOCK(rack->rc_inp); + (void)tcp_drop(tp, ETIMEDOUT); m_freem(m); return (1); }