From nobody Mon Apr 20 21:07:08 2026 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 4fzyjS3Cfsz6Zd2q for ; Mon, 20 Apr 2026 21:07:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fzyjS2RSdz44Br for ; Mon, 20 Apr 2026 21:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776719228; 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=TDRWcfIVNggiI/XiUJpYQt+/B3OUITRxwct3V/tKnUs=; b=lBkTSlEIL84AkhcetlGvP0lEz/qMuHmIPIbQQKOqwu0UlPfFcolqFDWmS2EQhDDUgtAVp+ CTAJvc3ad3YpL+uZLokCCX3mq6SCFN22Ynq15l9+oBMaWrBjetRQmlNr8nur314d07U4yq w90pcaMG7C9aSCnkQFh8SMu33fjmxjy6SSsOvfllsre11Zci+NLefHlX20G5XQcmjuyaGG 8MkOTOYch6YdvbdB3W4zGX3XOs3KO3E+MWtY4ac5bwP13mQ24MDkxbzJ/HrEvr65V44+1G ZzcVG18ch073x475htJyyPT2dpjxr+VO7X6rC8wENcBVBlLvavfHXgqTUh54EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776719228; a=rsa-sha256; cv=none; b=FJww8VaWaG8wxhyS4ZaAViUgtrInYM08tac/jt2cw44tX+Z43m88xUxzokdo4PMGhyjhJQ +qtFOPpUaCdz/aVhUVJ0S7NaPPg1YE837nqnDaHFjYVd8NuwbBEGck2Mio+wExz7SClrsX 8JaC2k7WoUbcezjGOOZl9cBs4ud2PQ7LTUy68KSv14CAy0u8TKU9sM+Py8E/HK4WqjgnCS WiEGoBCpCW/cqevkCri9fyP8QbgCURy2K6Fziyi72zvGhnrhyrO3RMVTWoN7hY8iT0eFea 0rr4jJwB5/ON+ikKVECTqPMkc4tIBcr2EbbwXkUnVIQ+AQMQXYGPEIWbBcQS4w== 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=1776719228; 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=TDRWcfIVNggiI/XiUJpYQt+/B3OUITRxwct3V/tKnUs=; b=JjdAh7CQVFOBTwe2YKbxZMGPmnXzuEPjiSLR9YFCzFv43ytXPTTecgOuMuS14Z5yFLJH+0 igkSL0+8X3+L7+XB2G+OaZhrhI5jKP0/yWXC3H98vikeY1fY4VDoqV1YYAvvEZW7x1YqFN gdkUH9PWIZFh2GK8NVOmOMFyfKisArhhUgF3bKK9ZxoV1eyn0NDUtdbUoTt7ZZEumFAlot p+NbatMiIsfutcR4CehSEhTE0c5EZS341KPwIJWWU9zYnr8mPKQ9u9OsTAV2GpzNyG0VHQ 45xze+509S6sM99aD3cVrADRAhiOxCOHEoluTdmaN5yOQi2Ash9p/1k26ACWmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fzyjS21Nnz1Cwn for ; Mon, 20 Apr 2026 21:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26919 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 20 Apr 2026 21:07:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 374548e930bd - main - fusefs: better handling for low-memory conditions 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 374548e930bd9452351059c14e697036d903b1c4 Auto-Submitted: auto-generated Date: Mon, 20 Apr 2026 21:07:08 +0000 Message-Id: <69e6957c.26919.6645a2d6@gitrepo.freebsd.org> The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=374548e930bd9452351059c14e697036d903b1c4 commit 374548e930bd9452351059c14e697036d903b1c4 Author: Alan Somers AuthorDate: 2026-03-30 14:22:07 +0000 Commit: Alan Somers CommitDate: 2026-04-20 21:06:57 +0000 fusefs: better handling for low-memory conditions Under conditions of low memory, getblk can fail. fusefs was not handling those failures very systematically. It was always using PCATCH, which appears to have been originally copy/pasted from the NFS client code, but isn't always appropriate: * During fuse_vnode_setsize_immediate, which can be called from many different VOPs and from the vn_delayed_setsize mechanism, remove PCATCH. Some of these callers cannot tolerate allocate failure. * In fuse_inval_buf_range, don't assume that getblk will always succeed. * When calling fuse_inval_buf_range from VOP_ALLOCATE, VOP_COPY_FILE_RANGE, or VOP_WRITE (with IO_DIRECT), return EINTR if the allocation fails. * When calling fuse_inval_buf_range from VOP_DEALLOCATE, remove PCATCH. This VOP must not fail with EINTR. No new tests, because I can't force any particular getblk call to fail. PR: 293957 Sponsored by: ConnectWise Reported by: zjk7@wp.pl MFC after: 1 week --- sys/fs/fuse/fuse_node.c | 6 +----- sys/fs/fuse/fuse_vnops.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/fs/fuse/fuse_node.c b/sys/fs/fuse/fuse_node.c index f4fb993a7ca1..6768e87fdef1 100644 --- a/sys/fs/fuse/fuse_node.c +++ b/sys/fs/fuse/fuse_node.c @@ -506,11 +506,7 @@ fuse_vnode_setsize_immediate(struct vnode *vp, bool shrink) */ lbn = newsize / iosize; - bp = getblk(vp, lbn, iosize, PCATCH, 0, 0); - if (!bp) { - err = EINTR; - goto out; - } + bp = getblk(vp, lbn, iosize, 0, 0, 0); if (!(bp->b_flags & B_CACHE)) goto out; /* Nothing to do */ MPASS(bp->b_flags & B_VMIO); diff --git a/sys/fs/fuse/fuse_vnops.c b/sys/fs/fuse/fuse_vnops.c index ad7a2dcf84ef..dd3cc5f16092 100644 --- a/sys/fs/fuse/fuse_vnops.c +++ b/sys/fs/fuse/fuse_vnops.c @@ -327,7 +327,8 @@ fuse_fifo_close(struct vop_close_args *ap) /* Invalidate a range of cached data, whether dirty of not */ static int -fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end) +fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end, + int slpflag) { struct buf *bp; daddr_t left_lbn, end_lbn, right_lbn; @@ -339,7 +340,9 @@ fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end) end_lbn = howmany(end, iosize); left_on = start & (iosize - 1); if (left_on != 0) { - bp = getblk(vp, left_lbn, iosize, PCATCH, 0, 0); + bp = getblk(vp, left_lbn, iosize, slpflag, 0, 0); + if (!bp) + return (EINTR); if ((bp->b_flags & B_CACHE) != 0 && bp->b_dirtyend >= left_on) { /* * Flush the dirty buffer, because we don't have a @@ -358,7 +361,9 @@ fuse_inval_buf_range(struct vnode *vp, off_t filesize, off_t start, off_t end) right_lbn = end / iosize; new_filesize = MAX(filesize, end); right_blksize = MIN(iosize, new_filesize - iosize * right_lbn); - bp = getblk(vp, right_lbn, right_blksize, PCATCH, 0, 0); + bp = getblk(vp, right_lbn, right_blksize, slpflag, 0, 0); + if (!bp) + return (EINTR); if ((bp->b_flags & B_CACHE) != 0 && bp->b_dirtyoff < right_on) { /* * Flush the dirty buffer, because we don't have a @@ -726,7 +731,10 @@ fuse_vnop_allocate(struct vop_allocate_args *ap) err = fuse_vnode_size(vp, &filesize, cred, curthread); if (err) return (err); - fuse_inval_buf_range(vp, filesize, *offset, *offset + *len); + err = fuse_inval_buf_range(vp, filesize, *offset, *offset + *len, + PCATCH); + if (err) + return (err); fdisp_init(&fdi, sizeof(*ffi)); fdisp_make_vp(&fdi, FUSE_FALLOCATE, vp, curthread, cred); @@ -1020,7 +1028,7 @@ fuse_vnop_copy_file_range(struct vop_copy_file_range_args *ap) vnode_pager_clean_sync(invp); err = fuse_inval_buf_range(outvp, outfilesize, *ap->a_outoffp, - *ap->a_outoffp + io.uio_resid); + *ap->a_outoffp + io.uio_resid, PCATCH); if (err) goto unlock; @@ -2672,7 +2680,7 @@ fuse_vnop_write(struct vop_write_args *ap) end = start + uio->uio_resid; if (!pages) { err = fuse_inval_buf_range(vp, filesize, start, - end); + end, PCATCH); if (err) goto out; } @@ -3206,7 +3214,9 @@ fuse_vnop_deallocate(struct vop_deallocate_args *ap) err = fuse_vnode_size(vp, &filesize, cred, curthread); if (err) goto out; - fuse_inval_buf_range(vp, filesize, *offset, *offset + *len); + err = fuse_inval_buf_range(vp, filesize, *offset, *offset + *len, 0); + if (err) + goto out; fdisp_init(&fdi, sizeof(*ffi)); fdisp_make_vp(&fdi, FUSE_FALLOCATE, vp, curthread, cred);