From nobody Thu May 12 18:03:04 2022 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 B13511AC4A77; Thu, 12 May 2022 18:03:05 +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 4KzflF3nb5z3k8n; Thu, 12 May 2022 18:03:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652378585; 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=33ov9LfHSLITZFCwkPS84X6mBJX8XoAihm1N6Wvm7tw=; b=kAhiXzp8htOrCB7yqgfpNeKza0UGylqi8PIOQ/4Sum43oip6vEeJJu8mEOyxWxNd/HgHnn gWhoJXrL0Y4pRvf1g1Hbimg1lflJfG73LLY01MTZSP8DQTui2UJ0UA6hh1kbVJFaI2CWRe Tti+jx12ttuEF2tKf85FenWBDWzUakB2B/Bb5SLNnko5pt28MA7A4RCerNm35mRqbK+5Tv DxCHsjvewd0ZkRrpGITgLcrOt+ceHJHeK55w5DWMPQX7k+ZyAafj5soIFAhi/UnHiM4Kb9 ssQHEwiJWKMjBQe2a3f2jyownYt1q384MH0JpCUmhB5sYF/2Wxy24fer0ouxYQ== 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 10972132EE; Thu, 12 May 2022 18:03:05 +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 24CI34V8027999; Thu, 12 May 2022 18:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CI34BT027998; Thu, 12 May 2022 18:03:04 GMT (envelope-from git) Date: Thu, 12 May 2022 18:03:04 GMT Message-Id: <202205121803.24CI34BT027998@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: 1f32cef47189 - main - unix: don't call sbrelease() in uipc_detach() 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f32cef47189403e9e70b1893c731c68b97b964e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652378585; 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=33ov9LfHSLITZFCwkPS84X6mBJX8XoAihm1N6Wvm7tw=; b=QR51HsXAYV6UV+SeMN9485e8IruSerC6NIOy3umQJcSi14JLeqQGMnQFeQ11Sev4TVvdLK FC5O0HwtQYYOl7LPM2zHbtWfVWRX0w4ZEYsibSekdCyronUTTpG5B0ftNDFJgHIa1bQUpk whKOK16IosmgM3nCdApMmnOdn3P03G94mryJ7VemNL7XzrVZgCRR4REDDqPeTDBfkN+pqd 5D9B7ZoIPNUuofNrQn4N5pn7ebjlxKh5sKmR5Qa7z+u/y7St120Y5Ig11Nn9Xg1yaGWgVk jHmTSS2PpJC0riz026yXjrj5S6Ef6SfShNFuklZWY8kFKfJ9oNEdTOx16aCwkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652378585; a=rsa-sha256; cv=none; b=JGkngu0xneKCwDosRyZghL9m0sOP2q444H1iQ48sFqj6ScgHxeutgGMiNgOSAB3xMnujSx 0QFp2wYGe4SfArBR6yvuAeYb9Yn7Aksn/M0OMs13UbgVJreyvOuGzH7CSE9KDK/VOBAwPO 4tFBmSw1/P+f6nTNxljOXiwf91Cx1NRNpZhXd7Uo/Lt3umeDKLrB49yyYfK6jtiHVTLOn0 49IsPnZuY2aYx+/rWL0JdWI+v87Za3Tx+qbgshAyWD2mNJlODAq0tQCdMag7TUGA0n6FiP m8P+WWzzBlAchw2UTQjB5Lmot0hIcqhS8CrEXhIWpcJuigrnrQiWpgKTyVQxlA== 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=1f32cef47189403e9e70b1893c731c68b97b964e commit 1f32cef47189403e9e70b1893c731c68b97b964e Author: Gleb Smirnoff AuthorDate: 2022-05-12 18:02:50 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-12 18:02:50 +0000 unix: don't call sbrelease() in uipc_detach() Since a982ce04428e the socket buffer is already cleared and released in unp_dispose() that is called just before uipc_detach(). --- sys/kern/uipc_usrreq.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 82b291fa835d..db61dba62f1a 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -790,18 +790,6 @@ uipc_detach(struct socket *so) vp = NULL; vplock = NULL; - SOCK_LOCK(so); - if (!SOLISTENING(so)) { - /* - * Once the socket is removed from the global lists, - * uipc_ready() will not be able to locate its socket buffer, so - * clear the buffer now. At this point internalized rights have - * already been disposed of. - */ - sbrelease(&so->so_rcv, so); - } - SOCK_UNLOCK(so); - UNP_LINK_WLOCK(); LIST_REMOVE(unp, unp_link); if (unp->unp_gcflag & UNPGC_DEAD)