From nobody Wed Nov 20 21:41:15 2024 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 4Xtvtz6jvkz5dnGl; Wed, 20 Nov 2024 21:41:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xtvtz6C6kz4vbX; Wed, 20 Nov 2024 21:41:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732138875; 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=+gjsFn5mCrd4EmWLN9ydFnsnfscIumj8V72Kzznf0U4=; b=PnWfJLpyNJDHPVcDp+24/E3SHnh9OUAfoZj9E6R791l+qhEU/9rSmF3g4AN2tbyMp4zL5B 2c0UQx4l5SlERsw+ye/gLSSQAqGCDz6TdoBJ5WTjqnrK8H2toluKNyuLkG75C0XzBzLz9Q L9n2+UvUusFIEvgt8wOIfKPGDPvteB/G1lvyJprmFlQTDj1Z+oMuU6V/OFQvrgJeLDs4RM lek8eio+t5G3TYsAf6z0vILTEcNq0OWedxBK6ndEtrir2vjd3jKRdOpoEEm4l6WxM6x+Ub cINvP8q/bkaHAAXV5C3mOWGE6lfRRwIN7AsiFHSlqJtXqyML4FWfPLoOVSx8Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732138875; 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=+gjsFn5mCrd4EmWLN9ydFnsnfscIumj8V72Kzznf0U4=; b=wNoDHF80/S4VQgFk7OAqO7VNAKCiLcV7QYQoZI7IX4sa2oQvLJ6MpMIdOFZ7ZCmuDTlLBI FHHn8QImUXWRzkDnIBnOYsMt9u2Bd9lqqHolR7NxIDA4vSdeJSq834yQ+LUnA4BM5Pyoaq a0dRadlHszMBYrbmFeVJ69N8m9b2uQgIauwO92OV+nzf5hp9CcbIkTYgNOGZt4OKw6qhOc Sefzl8vxlq9cWmkTGPuEdHY+IESeW+wQjalr/07jt/368qlTwHOfgqMFU734rPmm08X3m/ PPQ1iXDzVK232uCGRUXmNgV6dN263NCXub1ZT+Q/KR5QHMwewOZ2/Hh3nbxnvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732138875; a=rsa-sha256; cv=none; b=QVAHe5d5/1hlY7fkmlcapk/J5Vi5thaxPG4lyorMF7Hg362/JFILJrvkFMDl2cDngXnRfy yeOa6QReZynIavmxQoSiYwSx9Zi+3kWrrDWSWcpWb1dfd9b7rqpQG/bU87Gpm6HT+smf6M DA+WEb0tqFvC2NxtnsKETN/CUBzjnI+bR+m36ad14G/DRc/WKMpoP8/rYxjxk8820T4jVb fiz8FJ00SWjT55vwPC7EmsHuPhc/TK+wSEyLUSSy7eGOK6YP+TbQt3T2pDVIQWDduS6Ee3 ub4Ha6muevLcSl/HuwGvskop7iROa6IxzJGWTHqdhbyNWilUJc/MMUL2lIOhJQ== 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 4Xtvtz5gz0z19rD; Wed, 20 Nov 2024 21:41:15 +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 4AKLfFTW021942; Wed, 20 Nov 2024 21:41:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AKLfF5u021939; Wed, 20 Nov 2024 21:41:15 GMT (envelope-from git) Date: Wed, 20 Nov 2024 21:41:15 GMT Message-Id: <202411202141.4AKLfF5u021939@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: 91a805447374 - stable/14 - linux sendfile: Fix handling of non-blocking sockets 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 91a80544737486dbe5bbae28c05c2a7a654cb61f Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=91a80544737486dbe5bbae28c05c2a7a654cb61f commit 91a80544737486dbe5bbae28c05c2a7a654cb61f Author: Mark Johnston AuthorDate: 2024-11-13 14:15:47 +0000 Commit: Mark Johnston CommitDate: 2024-11-20 21:41:08 +0000 linux sendfile: Fix handling of non-blocking sockets FreeBSD sendfile() may perform a partial transfer and return EAGAIN if the socket is non-blocking. Linux sendfile() expects no error in this case, so squash EAGAIN. PR: 282495 Tested by: pieter@krikkit.xyz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47447 (cherry picked from commit a43b745aaf4f5bbc96875d2ab3ec9bea8024eda4) --- sys/compat/linux/linux_socket.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 705a64de8ede..d35ff37aee98 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2537,6 +2537,13 @@ sendfile_sendfile(struct thread *td, struct file *fp, l_int out, current_offset = *offset; error = fo_sendfile(fp, out, NULL, NULL, current_offset, count, sbytes, 0, td); + if (error == EAGAIN && *sbytes > 0) { + /* + * The socket is non-blocking and we didn't finish sending. + * Squash the error, since that's what Linux does. + */ + error = 0; + } if (error == 0) { current_offset += *sbytes; if (offset != NULL)