From nobody Thu Sep 28 20:41:27 2023 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 4RxQPM4VYpz4vZC6; Thu, 28 Sep 2023 20:41:27 +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 4RxQPM2y6Bz4v7j; Thu, 28 Sep 2023 20:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695933687; 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=SNDidHEKeJn6XatY3mn7QWjjo0CrT0hWA/SPfBQ+Gn8=; b=VzfYjC+sClzlwG6dfVfQdtdxIThkMkiTOXP/iSlKUGBUof2T9oVSjzd0y6z2YmDjtS6lgT euH+Mz/Xh758OebgNScXrfS0S/hkHGPBnE1fbDzBY6+93Po2oYdboQUEJu2AluzrGo4azl vigO8s/iI6BQ9YyIm+qFc8qUFk1Dc0YGDI4ERrhpWLMS8KP5J8E3lj22nSXfO7zXHXNc4r YzIz3cWCxCyYxqnoHbRsGlB6K+61QnDli3rdXu316RO/A1exn1S4sSXL/oO4wdIHxcojZn eP1ZYTa8JvxDrfglWxKCdnVJnJ3SjTTWPxcQdsCb1QnSOcJjb6KwPbHoawpncA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695933687; a=rsa-sha256; cv=none; b=AtIa59+e+UVTCC5CJa4Yz/yywlWZQ03oXd8HxmnvO3r1BQ+dY4wQnZo+VKT4EVQysXgoFN e5M5LSO85jrHKZEa7lE3iFTYEcEIuvY3IaTeYtDvQ7uq5AVy63ArXjFIDyCYnTyUJEatkY sxzbaYuNW9VXN8JPPSjCPzbAeL7Vgk7RFsu6xiSsOzvjNZ1SXqc5mTI0QuVg2FGEMeoOwu VuKwQ1hp51EJUwuK/D0YvJadpsWD6TnqCBCLIzvlMDtlkWJKml2EmzzDMedGXRyb8uMsJT pvGNTdS93WqfkS7MSPkujqc3VMXMQeWPu31MQUORdFH7BUokJ/qGq1XWeydXLA== 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=1695933687; 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=SNDidHEKeJn6XatY3mn7QWjjo0CrT0hWA/SPfBQ+Gn8=; b=qBkK4SqCYujPulh9GYo/74E+0KKh5pfsk2LKbkwmuPKEKuPMXajxEUNh8h5kdWqJaqxnfg mVkKaYiFMUa1vrWL3hJdWT+AhFaDapWJV80EMO5+jzhW+oIRZ95uEz4WaDBjSWkiEoBHda kzaIqX554XplhUMHFOCknhbI+3zKVfFSXAusxi4uvhxESjzv4v0a5AgL4LQxIct0e/5DzY hPn5dV/eUx+DUOY3Z1Jd7YUPZTtEk+uhWCW7B2kDUPCuReew1lnAWd1GT5BuUIe5aXLtui mG3JDMlg4aU3vZkB6pKLrPZgymJhpGf7ZKVKqtOyacLCEZFYUEsZZ+lQNTCqRw== 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 4RxQPM222Qzch0; Thu, 28 Sep 2023 20:41:27 +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 38SKfRkE002954; Thu, 28 Sep 2023 20:41:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38SKfRca002952; Thu, 28 Sep 2023 20:41:27 GMT (envelope-from git) Date: Thu, 28 Sep 2023 20:41:27 GMT Message-Id: <202309282041.38SKfRca002952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d7ee24d0d5ae - releng/14.0 - sockets: re-check socket state after call to pr_rcvd() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d7ee24d0d5aed1180e9f65058c3a5ff45a52210e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ee24d0d5aed1180e9f65058c3a5ff45a52210e commit d7ee24d0d5aed1180e9f65058c3a5ff45a52210e Author: Greg Becker AuthorDate: 2023-09-09 23:38:24 +0000 Commit: Mark Johnston CommitDate: 2023-09-28 20:41:09 +0000 sockets: re-check socket state after call to pr_rcvd() Socket state may have changed after dropping the receive buffer lock in order to call pr_rcvd(). If the buffer is empty, re-check the state after reaquiring the lock and skip calling sbwait() if the socket is in error or the peer has closed. Approved by: re (gjb) PR: 212716 Reviewed by: markj, glebius MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41783 (cherry picked from commit f44102411e1b16363e91a074c9c403069c550e4d) (cherry picked from commit caaea455773898bee9a0c59466a84256192e0980) --- sys/kern/uipc_socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index ffd5e06c34b7..3c7e5c4cb4bb 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2429,6 +2429,10 @@ dontblock: VNET_SO_ASSERT(so); pr->pr_rcvd(so, flags); SOCKBUF_LOCK(&so->so_rcv); + if (__predict_false(so->so_rcv.sb_mb == NULL && + (so->so_error || so->so_rerror || + so->so_rcv.sb_state & SBS_CANTRCVMORE))) + break; } SBLASTRECORDCHK(&so->so_rcv); SBLASTMBUFCHK(&so->so_rcv);