From nobody Wed Feb 5 22:30:54 2025 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 4YpFLk4NPFz5mWns; Wed, 05 Feb 2025 22:30:54 +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 4YpFLk3Ydjz3thT; Wed, 05 Feb 2025 22:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738794654; 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=4iULsdIsugZ17hBfyJ8xRfYPcBZ+bEmYd8HVU1FI0h4=; b=EQNS5orsiVYnBH58LcUsNcPPxwbDFZ+J0pZMrnE3Ob6JiX6VtMnmDfpYmUKvNbQIe3y979 4NsnQOTeAnRnNUUJjyUnEdb/lsdvjyZVn+VJWe/MESeY7fa7OLhs/6HYg1b/+u/30da4BU cisDf2G1rlgXiGEyeOd4vbUTCr4PhO0cmV4nmlgbbI+YRlgAM+EnmqXOkD1ofAq28iPaZX l9JdXGh0DooaHKIDHFz5Whc53gWbcBHtpxbkGoMtu5O8qXrPdr4kmGQoVep9d7Df5mE5H3 AS1JhDVYjXRQhTRchZ5LmyI5GBCcwSx+9ScrVszzfGwEexmcGO/s9KeHBvVjfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738794654; 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=4iULsdIsugZ17hBfyJ8xRfYPcBZ+bEmYd8HVU1FI0h4=; b=wE8qaZKlSmRrZv9apsxP3lTs+guDGb7zMAX9VdhQZp9hMuE4b6qPAVfdMyu18PFc2q5C/8 fQZOTEIcXT8TBE73Ia//1JGqESgRUvpKYINmlgnh7NazcmHVFB0c3dIPXbgn56LjAyfe84 9aY1Yw2Nb2Erw9OcSfDEnrOJ3L/Sz7ZR60eOTdLcIXWWYfB0S8K8HLa+jkA/Bd20V9Qzxi 0O0QHGaGNuubWsUR5yzmyh5euqK5yzXza3vZZ3HiLIOg6KcIsYqnfpRg4Xih1Ec0nJU1bN CFhxVnzm38db8HhFR6/wCOFo+va5pGOtW/YVFDaCUHJx8cO743lnQb3JCL7pdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738794654; a=rsa-sha256; cv=none; b=ine7JPsB5jxwyHXUkC1pzuWBVPOgxbqX6zMEkNuKs/+mUKCkvRIEnANxgcR89Ow4bMEmJV HIAuSU2TriMJul500s8foPG6aDgKhs6cIGAdK6/n4L3mURCOfkECNxz1azAPqfkuUHMc3U JQe4Rhobe7xX1PQuz93cmW8gMX2W5fvDs+KsOHR1XMVxeehR44im6RD3ol119HSJ/hnubS Ow7EUhorLmsL80whFrXuh2uO6yvU5COeihziDEjGQA1YNsH2Gufl0eStiY1S1AdV2u4gMQ u7wwfhGRruzTmUefE4jplZdF4i15eaLBkFJ5sefUMxXs8boPcKejnbVPyaj8IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YpFLk34jTz19Yr; Wed, 05 Feb 2025 22:30:54 +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 515MUsCj082907; Wed, 5 Feb 2025 22:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515MUsOJ082904; Wed, 5 Feb 2025 22:30:54 GMT (envelope-from git) Date: Wed, 5 Feb 2025 22:30:54 GMT Message-Id: <202502052230.515MUsOJ082904@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: 9ef38a01aea8 - main - unix: remove always true check from uipc_attach 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ef38a01aea87afa6a49fc90411cf8de5ac73b28 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=9ef38a01aea87afa6a49fc90411cf8de5ac73b28 commit 9ef38a01aea87afa6a49fc90411cf8de5ac73b28 Author: Gleb Smirnoff AuthorDate: 2025-02-05 22:24:27 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-05 22:24:27 +0000 unix: remove always true check from uipc_attach This is pr_attach method, it is always called on a newborn socket. The condition was always true at least since 6d32873c2930. --- sys/kern/uipc_usrreq.c | 52 ++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index c1f1c07da268..a67e105a1447 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -445,37 +445,35 @@ uipc_attach(struct socket *so, int proto, struct thread *td) bool locked; KASSERT(so->so_pcb == NULL, ("uipc_attach: so_pcb != NULL")); - if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { - switch (so->so_type) { - case SOCK_STREAM: - sendspace = unpst_sendspace; - recvspace = unpst_recvspace; - break; + switch (so->so_type) { + case SOCK_STREAM: + sendspace = unpst_sendspace; + recvspace = unpst_recvspace; + break; - case SOCK_DGRAM: - STAILQ_INIT(&so->so_rcv.uxdg_mb); - STAILQ_INIT(&so->so_snd.uxdg_mb); - TAILQ_INIT(&so->so_rcv.uxdg_conns); - /* - * Since send buffer is either bypassed or is a part - * of one-to-many receive buffer, we assign both space - * limits to unpdg_recvspace. - */ - sendspace = recvspace = unpdg_recvspace; - break; + case SOCK_DGRAM: + STAILQ_INIT(&so->so_rcv.uxdg_mb); + STAILQ_INIT(&so->so_snd.uxdg_mb); + TAILQ_INIT(&so->so_rcv.uxdg_conns); + /* + * Since send buffer is either bypassed or is a part + * of one-to-many receive buffer, we assign both space + * limits to unpdg_recvspace. + */ + sendspace = recvspace = unpdg_recvspace; + break; - case SOCK_SEQPACKET: - sendspace = unpsp_sendspace; - recvspace = unpsp_recvspace; - break; + case SOCK_SEQPACKET: + sendspace = unpsp_sendspace; + recvspace = unpsp_recvspace; + break; - default: - panic("uipc_attach"); - } - error = soreserve(so, sendspace, recvspace); - if (error) - return (error); + default: + panic("uipc_attach"); } + error = soreserve(so, sendspace, recvspace); + if (error) + return (error); unp = uma_zalloc(unp_zone, M_NOWAIT | M_ZERO); if (unp == NULL) return (ENOBUFS);