From nobody Mon Feb 14 17:23:02 2022 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 40A52194DF88; Mon, 14 Feb 2022 17:23:03 +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 4Jy9zC1Kfzz3lMt; Mon, 14 Feb 2022 17:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644859383; 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=1hRdR1ZA/rx1Tc/DN2glfKB8apvfK+60w/v2e/b7Lac=; b=otq6c0D9pfjT5aiJKW7o5ruP881lYmgaa41DCad61jJCLLB9qeKhXglZTvINHjQW29Hatx +tl3eOCJn8NFkRZ1VGFLJ3Hit3fy780Ss284gRpBOU2sxahza98Ef2Gj0XqgRlwN5N5XE+ IWSm/QeGGzPef5X7B2mF8z2Z2mS1YrcpoBF69UNtkfCaCNiB2bVghVoxLuHLonYCsoeq6D sYcEKbLWCaOYcnH+Wfa+jzJ1JZ7HxPDJy4/brUlcwhROgawjjHlVFwayXc+s4guNEP77Bn rL2XR7AH3197G8WMrrPYSB1Np11+8Q5RtEHDUDhp0aA+es6IVRzb6vt0+JzpCg== 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 0E06112E0D; Mon, 14 Feb 2022 17:23:03 +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 21EHN2C5047019; Mon, 14 Feb 2022 17:23:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21EHN2a0047018; Mon, 14 Feb 2022 17:23:02 GMT (envelope-from git) Date: Mon, 14 Feb 2022 17:23:02 GMT Message-Id: <202202141723.21EHN2a0047018@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: 65572cade35a - main - unix/dgram: return EAGAIN instead of ENOBUFS when O_NONBLOCK set 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: 65572cade35a93add2168a7a012f808ac499218b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644859383; 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=1hRdR1ZA/rx1Tc/DN2glfKB8apvfK+60w/v2e/b7Lac=; b=fvBB22y/ABjHMDqlMe1m6bl/+1t74pfxV0kLXu6J5N2Wen2C6d3HAESZyr5tpdDH8Ct8lH OVYN5J0fGoLg+d4NH8y4FngeZs38v12anW0yzkN+oqRDBHoXczeyZGLt6szSKYEGF8ywSS v7GSuuxa6vxBz+nPBfco6b2urfjwG5QcS0f5UCoNtsAqO8wTNtISCP9T0ATWwwgSdhVAyz 6cZn8fojBD0N3tgirrrDc1/wAZF3YsxPD2SdPJ3C9Pvh/pQBpBCexybOsk2WrcI2/VC2JM MMGaodnrr2zETd3UFivg7CSq51tcJaytjRzGkvEM5vhgxCqb7F33WW0wEIZZ7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644859383; a=rsa-sha256; cv=none; b=hEuo1ivgJ8qO3WtIksiC1bOmTYwrEBH7HuNx+ospVwlVaTL4WitqJzfjykKSGjj9Xlrjxt 6LzH9IFA+iCPUkyQjjvvvYHsx8l/8WN3g6GXovWypj11h99qLu0U6gEl9a2ctNV4OZLyJG z89OQurBQI9oKbaKpOXCH7A/EXKFl9QpJ1YeC+kkChVkOpEA2no27sDTiLclKCJ35yJQWb WQ0tsc5yLhZSf/zGZ6CaoIoPR1ec8A9llo4zhwst0lYfNmEjIYx+OJyvztNzqaB4Gghi/X 1OezbQkWr/8V2UIQ89/DMT1sA/lADgxcIZX5jyaOtNkXwllGvm0zC4xCLb2rLw== 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=65572cade35a93add2168a7a012f808ac499218b commit 65572cade35a93add2168a7a012f808ac499218b Author: Gleb Smirnoff AuthorDate: 2022-02-14 17:21:55 +0000 Commit: Gleb Smirnoff CommitDate: 2022-02-14 17:21:55 +0000 unix/dgram: return EAGAIN instead of ENOBUFS when O_NONBLOCK set This is behavior what some programs expect and what Linux does. For example nginx expects EAGAIN when sending messages to /var/run/log, which it connects to with O_NONBLOCK. Particularly with nginx the problem is magnified by the fact that a ENOBUFS on send(2) is also logged, so situation creates a log-bomb - a failed log message triggers another log message. Reviewed by: markj Differential revision: https://reviews.freebsd.org/D34187 --- sys/kern/uipc_usrreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 89d4198652c3..360cd5424924 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -1062,7 +1062,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, control = NULL; } else { soroverflow_locked(so2); - error = ENOBUFS; + error = (so->so_state & SS_NBIO) ? EAGAIN : ENOBUFS; } if (nam != NULL) unp_disconnect(unp, unp2);