From nobody Sat Aug 3 22:33:21 2024
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 4WbyCQ1Wm3z5RSc1;
Sat, 03 Aug 2024 22:33:22 +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 4WbyCQ0x3Jz4Hpp;
Sat, 3 Aug 2024 22:33:22 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1722724402;
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=zmwQW6nOClf/X4gD6MXpL+h2D5NUIQgEJ4XXMw316Eo=;
b=ZtdkPpev7I4tt5GdVweKSaJfNV6mk5illUiu98WVcDRGI9yxhtJcQPC2vdwTWsf1AZ8Vxs
OymWpeDKsCcV8ugGG4jl9QUKvfKo67x6VR3VzQI26ZrwDsTw7mUX4ZT3YW2dDmMBmzsgSh
iXMPXP0DxO7P9K+Gxj6mHH8HFZYgzVSPVc7ptBqjHMbrAzJud4AVQIuSy27OaHitME2qwu
HkdmCfz8DAp+sI7B90y+sTUcvOq6hRPc24iJgQfj9k7Fv86SdEeDPpqReOimU1B/uDvVGj
nWWfo27inEEeRiJ/hQRnLYE6yQ5QNhFcoeizJTFF7zRzIhQBA8WfhYJyGrsBmQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722724402; a=rsa-sha256; cv=none;
b=VSod3XArhuVynQAksgKbP4cKR9F272327Qgs3qu2Quv4YKrRiIL05146rxWDN2YAhPVGqn
KiTs7XIWDzJYI37GQhWxdJ3Bcb1KvqylIzL+lTusXvu/dsaywiXwpty8id79CvyRDDwbRo
6zWykfAG+ciYBqmdnV3MYg4INZ+FAMTwWjFkrI8YGMTQcGinLxJ7N4MK4Iz8iZI35eJV7W
Q3NgaLBpiOJWyStATg3dgG5mt/hDUY8BOHVvENoizLV9/lqrwVdMTG/Umx3SElA5q6K6Z/
BPLIXFQW3EgSxsBvft13VqiHka5IRQb4dabaGNryceBLs2ORw1K4wt7gXRpw5A==
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=1722724402;
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=zmwQW6nOClf/X4gD6MXpL+h2D5NUIQgEJ4XXMw316Eo=;
b=Knq1puVgUmzfb4FmDd6vsZy3bmUS4iEGYC68v2yvKMLyErqpIURsL9OsBeK0Mteths0GAC
ZpJEbOu6s5BU2Spel+biWNeigqS8xRG0W3HS+mXn01AmnNHJl7R/JtHzM1b8ZzfUpmBioP
ihPGz3P1fMbEJ9wycnHVSCC3BLgP+LEQNAboSaNGLjEp4NsZVrxKeRTQYiUP6+S+6zDeP9
30NMhTFmv6RuLP7D15Tumu42unI0RL24TdwgTXPq4YujNuNP/1jjpZlhNB2KRC1r5tBKym
NAEm83H47Oy1owOBDNJwgkwhKqDO+IJ9Wc3cGC9bNTguyFNu0ATQPtjtWh0//g==
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 4WbyCQ0QD9zWFk;
Sat, 3 Aug 2024 22:33:22 +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 473MXLIv042763;
Sat, 3 Aug 2024 22:33:21 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 473MXL6C042760;
Sat, 3 Aug 2024 22:33:21 GMT
(envelope-from git)
Date: Sat, 3 Aug 2024 22:33:21 GMT
Message-Id: <202408032233.473MXL6C042760@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Michael Tuexen <tuexen@FreeBSD.org>
Subject: git: d48fcf99c450 - stable/14 - tcp: improve inp locking
in setsockopt
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-branches@freebsd.org
Sender: owner-dev-commits-src-branches@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/14
X-Git-Reftype: branch
X-Git-Commit: d48fcf99c4504b52f8ade5f7d47bfe67920f6e35
Auto-Submitted: auto-generated
The branch stable/14 has been updated by tuexen:
URL: https://cgit.FreeBSD.org/src/commit/?id=d48fcf99c4504b52f8ade5f7d47bfe67920f6e35
commit d48fcf99c4504b52f8ade5f7d47bfe67920f6e35
Author: Michael Tuexen <tuexen@FreeBSD.org>
AuthorDate: 2024-05-23 20:14:27 +0000
Commit: Michael Tuexen <tuexen@FreeBSD.org>
CommitDate: 2024-08-03 22:32:45 +0000
tcp: improve inp locking in setsockopt
Ensure that the inp is not dropped when starting a stack switch.
While there, clean-up the code by using INP_WLOCK_RECHECK, which
also re-assigns tp.
Reviewed by: glebius
Sponsored by: Netflix, Inc.
Differential Revision: https://reviews.freebsd.org/D45241
(cherry picked from commit fe136aecc2a0ae9d9cc5f78b2d1430cd33b6b7c4)
---
sys/netinet/tcp_usrreq.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index f65b09f17a5f..a76a185474df 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1696,11 +1696,7 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt)
default:
return (error);
}
- INP_WLOCK(inp);
- if (inp->inp_flags & INP_DROPPED) {
- INP_WUNLOCK(inp);
- return (ECONNRESET);
- }
+ INP_WLOCK_RECHECK(inp);
} else if (sopt->sopt_name == TCP_FUNCTION_BLK) {
/*
* Protect the TCP option TCP_FUNCTION_BLK so
@@ -1715,8 +1711,7 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt)
if (error)
return (error);
- INP_WLOCK(inp);
- tp = intotcpcb(inp);
+ INP_WLOCK_RECHECK(inp);
blk = find_and_ref_tcp_functions(&fsn);
if (blk == NULL) {