From nobody Wed Apr 30 17:06:04 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 4Znk985550z5tggx; Wed, 30 Apr 2025 17:06:04 +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 4Znk983j7Hz3DjV; Wed, 30 Apr 2025 17:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746032764; 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=u9LQK2B2jZYuVNISpgsUOcBksW+rOsD1Lr0RdSgWhdQ=; b=ZJpJIvBW0X3FT59WHQBLPLlbCAyA+jkm1gCot2PLRJncqVvbyGkrhai/BmsYXdGW5bG0/X g9a5KIJnw1S2IIq5orm4wmLd+hAVIeWGQQ14ihp/9VpgKLPkS9vPAyPWUi+t6JmFyfYY8V tsDgGbQiZoYQbFQ5ECHCf4V6g3JvuDlb8JkQKtsDKSSdJoKPUvJO/FCGq9HHOOM7HiK4sF BqvZ9BFAljKSOYeobPqR4B8htZY+OMkXo4GgeiD+Z7qA4eBPVT/G6Q+L8jY5MU+5KYkdKf 76k/e2Jiqq0/8DWIzhxtJWwhMJTt88hzwHpMdCFw5kHYl4nAxnRJkFAXIiPPMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746032764; a=rsa-sha256; cv=none; b=hobV9wQHnPWhuDAoLQHXLGXk5aNsY1sIFPe2dYRWhnmQhc6q3wLXbGPyJm6YaLmmPdC1QN b/fQQG9DrPZIobvV7AvKacrOzkqG/vTUjFTB8v5LVYBN1EJKgCQXZs28ONPgD+xhvtHQnO nnmrfkt3rJEXy7yKlGxIUJ4sQHAmxLyRphKK4OBE+KRtP7Ju+EYOqOMUDg3BQl3mZTDfpc QTjxC9fMqGUc9gQTNKWwaPgvYDGz3dowuj8TfShMH2MM6cytGinK6XYjpAse1u5UU+/xyG 5QXuxuJxwiRQQgy0iLsZs0WTz2vCW5et1RuAhfjRcYK9b9SRLnFGNOW1A8JhCw== 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=1746032764; 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=u9LQK2B2jZYuVNISpgsUOcBksW+rOsD1Lr0RdSgWhdQ=; b=Uu88zEAdRh9Tnq3iywobYT8ot8QLn+d7GBogV3h6/xpDQWC0IFkxrNctIgPVvdoyShzeIz uw1LPR1QqFepOGZmuey2q9FIbDBkv/5cUhB47yl9J/8HIWN+ixnaG7eadZCMWSOXJ5WUwQ dsnPxCnvzHxFoYB04Q8KjVMTGWibBzYTVr8xT0EGjcNimaLXpACGAj2t2FE1hT5NmZAGzQ Nvb6KXcQgIorL1dwwUHY/u7L1j41eaxpgwfbZlCLqScADJ5IDpif0KAJFp2MZaZDpSNIyg 4ZHsOPQd4Y4ukIOfEiuGRLjk6zOlTWA2+JLhwnbf4zBL5eU+2wTzgSqinmC+yA== 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 4Znk98332gz1Cld; Wed, 30 Apr 2025 17:06:04 +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 53UH64jk060321; Wed, 30 Apr 2025 17:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53UH6469060318; Wed, 30 Apr 2025 17:06:04 GMT (envelope-from git) Date: Wed, 30 Apr 2025 17:06:04 GMT Message-Id: <202504301706.53UH6469060318@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: b21104487324 - main - sendfile: ensure that the low water mark is at least a page size 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: b2110448732434841fc30bb0af0d28902a6621b3 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b2110448732434841fc30bb0af0d28902a6621b3 commit b2110448732434841fc30bb0af0d28902a6621b3 Author: Jonathan T. Looney AuthorDate: 2025-04-30 17:03:04 +0000 Commit: Gleb Smirnoff CommitDate: 2025-04-30 17:05:47 +0000 sendfile: ensure that the low water mark is at least a page size , when possible, to cut down on the possibility of short I/Os. This change has been at Netflix for several years already. --- sys/kern/kern_sendfile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index 05a820fe5ac1..d409f41824ad 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -779,6 +779,9 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, SOCKBUF_LOCK(&so->so_snd); if (so->so_snd.sb_lowat < so->so_snd.sb_hiwat / 2) so->so_snd.sb_lowat = so->so_snd.sb_hiwat / 2; + if (so->so_snd.sb_lowat < PAGE_SIZE && + so->so_snd.sb_hiwat >= PAGE_SIZE) + so->so_snd.sb_lowat = PAGE_SIZE; retry_space: if (so->so_snd.sb_state & SBS_CANTSENDMORE) { error = EPIPE;