From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.50 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794987412; b=kOuk4yFKlBvHx3mD7/V0VUtVhjDdz2ciAoYpunhUmfWrZgLbbkJ47I5rUwxFd8DGsQ5L VYf2aY9L1VnEXhnuHEWFNxXNxihhqoa3w7nXT4Vz8DZE7y5eo5HHHoogsWM1qR9krgyKs 0Qp+DYiIj8QBE8IVA31ComFQIrlgtfA/IEP0tU1R1JEekmPeO1ccQL7xQtMMNFnNUIzX7 qnzUsfSSLCUPAhcQ6D3pedPJJJfbmvr+UWgIqeTNSMBk9aRgG1eUwbEXp85L9aotcHkaw HULp1hh3lQtB71zM/qx/4Ahc1cQXA9gnt1edPBOHZp5QFgLnYmSwYBy044Wk0b+X6Lw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794987412; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; bh=2AQusGkZeF7By8v8HcNlOm3Ynbjfbz2pOngGJJFpkaE=; b=TYowID/ao/6CBRcNORhAl/5rqpII6hDC7cnXHtxjjoD9kxRvcE39633TqUNh3jvIpfxW TODSSWEyv4IRWh8V1l1y13mVG2OZ+Aw8AJet67X3GWGisrG1tGhM/5x2DpxJMgOJ6Ed25 +yWf9sffdRNCAfHgyOzq18BsBslUCdRy1tFZ6ucP0A6cIDRP/BaGpll3QlhaGRjvLXRtx UBL1ZKrMSKkgd2eKhR1d8dUMtXtkOMhN5xIo8QJay05t9fVojs58KvS7q+Ma7waaC1jZW lw22b6F4/as+YXy5VCjtJkFqbzkySsF6qmXVEKF/IFuV7pLBPCPU7hhdBwARk3/t09Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=UgHKCBli; arc=none smtp.remote-ip=209.85.216.50 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A9B6606A325 for ; Wed, 18 Nov 2026 07:36:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3A9B6606A325 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=UgHKCBli Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-3ae1da332bcso215901a91.2 for ; Tue, 17 Nov 2026 23:36:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794987411; x=1795592211; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=2AQusGkZeF7By8v8HcNlOm3Ynbjfbz2pOngGJJFpkaE=; b=UgHKCBlit4MCzNdLnO6taNF618WnyG2ORTn7sKiAWDsFyTVflRKUWXUeZ7dRCW1aB/ cDG6dWHfCNP7IYsIu08mOWNT7bgV17vIdJP8xJ+gtN5p8fpUgZ3t4kVMRnsjCV7ZWek2 Ms4Y8Th2PaoafXKj7KuSxOTwhJLe2Pquxd00PO/eyLIYwgZpCvCK5C2mFh2vtOl57saQ VwZcwRg7iVQOzE+CN2NcHmluF7rVeXCF4Y/p/PV/4XqGiNBimjkuacE9pr1a67h9HX3y /CQN54ltNSifYR0/4AnF+sNHNglQ3ourhgRJYuSq7Yc09mJRN28uqS+/TCKyu21+um2Z UfXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794987411; x=1795592211; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=2AQusGkZeF7By8v8HcNlOm3Ynbjfbz2pOngGJJFpkaE=; b=hy1m+b0gf2cGtpXZl0fc+C5iFu67uHEUVHhsTsO9Hv0NgXofZ4qL+H7UaOAdkfTsa9 Gjp6wnsPQTtFvpSGGUBLyJy7ym1ETOi6WeXl3INFpJYto1KWkTXf+9nOLwq9rv12Ve+w rYff+hQYaj2kI5p7mt+TJZTS3q4GS95xWJJO1nnb7/mBGpJbT1mOR5KVqTI+6kPflssx LJa5GwioMzhbLzibNtrDvpn74K0FI+unrz+CZUNaQK6FafDhaNfUo8Y5CuxTGBp7pFJR n59oMdobDab91Lt2dettk5r4uaQVasAIJXsVOHJRAil7gYiDxPMJ7vnzprWqWJ4MJXb7 j1Dg== X-Forwarded-Encrypted: i=1; AL+hErG5M8Wt6317nXQaCHNmqk9bOAdbyzntWEr6gP4IgQDi0MT/hMJRxDzzaBlPvyAOzuYeu0H6A3ZinsT7Jzo=@vger.kernel.org X-Gm-Message-State: APuU4Z8IxlMeoT+iGQy8CNz39oz9rLikDAmhav95/Hgsw7gj7x2Wdxc+ tH8Jx/43jpvAN2qwRVMn+MPX5yaECV0ykX7h77BGsFVWgxIe8q6+0g+oqdEoEw== X-Gm-Gg: AZFdTZfh6jkrzn/3Me0JN6mfDYysg3IX55kjT9c2/JM0Xqdo3YbHsW2M2dfj8S7mnns EIYhYhLBB/OJa7EfxilL0kBFXFi6kIcnmzlI9V5ZP6/z68MIYjI/GWkdWVEhTn/V0UY4jSPssoe oV8H5L2ZjRYZjd4zRNkh/X2IWhyicAn9jcyvlSsogHCA8eh4q76qUmwu1pXkTX0fA/CUC67odQG 8x2cEjayTtg7lUTZ/n0s9g/gWcGIDYMwQWk5xSW1omQj0Pe+KIjVRbNWupK0QyEz13gKWVRsJd4 0wBO7y6Kf+UKUmVGzHmECiqnk5svatr0CsO5WiF0NzkoQDNWNm8nYRTwZknuM5v8G8flrQ/JT6E zVnu9TnemF1A3kBvYN/9f6dztCl6hYQYORUtpJ0koRXzags1EPUZaa9EqaC+Dfndo0AMOhf139N 4EL5Hp3wTH3mpBR0MwwbcZO0/TMb4GIscO7j4PNxi/ykUsrFpeCOuYOIJuN9x1r0z5t/ebG9+nB YDNYh1HqV1ZB5abVaU5H70w/lq3W90AG4TC4Mxk2vZCw6X5Pp+gaSF3sFZQGD+K9StmtR/q9k2q tngmOLSkWRvCHVM4Poqkx+raw6jFcr2stjWRYbnw X-Received: by 2002:a17:90b:2b4b:b0:3b1:a1d:3fb6 with SMTP id 98e67ed59e1d1-3b3d07b909amr1784590a91.51.1794987411394; Tue, 17 Nov 2026 23:36:51 -0800 (PST) Received: from localhost ([27.122.242.71]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b3ac2cca15sm7716193a91.11.2026.11.17.23.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2026 23:36:50 -0800 (PST) Date: Wed, 18 Nov 2026 16:36:48 +0900 From: Hyunchul Lee To: Zhan Xusheng Cc: linkinjeon@kernel.org, liubaolin12138@163.com, ntfs@lists.linux.dev, linux-kernel@vger.kernel.org, stable@vger.kernel.org, zhanxusheng@xiaomi.com Subject: Re: [PATCH v6] ntfs: trim the sizes after a short write Message-ID: References: <20261117082021.2947603-1-zhanxusheng1024@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20261117082021.2947603-1-zhanxusheng1024@gmail.com> Hi Zhan, On Tue, Nov 17, 2026 at 04:20:21PM +0800, Zhan Xusheng wrote: > From: Zhan Xusheng > > ntfs_file_write_iter() moves the data size and, for a non-resident > uncompressed file, the initialized size to pos + count before the copy. > __ntfs_extend_initialized_size() only zeroes [old initialized size, pos), > so the range [pos, pos + count) is initialized only by the copy itself. > When iomap_file_buffered_write() copies less than count, it returns a > positive short count and the error rollback at out: does not run. The > file keeps the size pos + count, and [pos + ret, pos + count) reads back > whatever the freed clusters held before, also after a remount. A local > user can read the old contents of freed clusters this way. > > Run the existing rollback for a short write as well, and roll the data > size back to the end of what was written. Keep the initialized size, > as a page fault through a shared mapping may rely on it while the write > is stalled on its source, and zero what the write did not reach, up to > the end of the block holding pos + count. Only if that fails, take the > initialized size back to where the zeroing started, if it is above that. > > Fixes: b041ca562526 ("ntfs: update iomap and address space operations") > Cc: stable@vger.kernel.org > Signed-off-by: Zhan Xusheng > --- > v6: cap that fallback at the current initialized size, which a failed > extension before the write can leave below pos (Baolin). > v5 (Baolin): > - start the zeroing at pos, not at the old initialized size, which > overwrote data stored through a shared mapping below pos > - do the same for a direct write, instead of truncating the page cache > and taking the initialized size back > - if the zeroing fails, take the initialized size back to where it > started, instead of skipping both rollbacks > v4: for a buffered write, zero the unwritten range instead of > truncating the page cache and taking the initialized size back, which > dropped data stored through a shared mapping during the copy (Baolin). > v3: clear the cache up to EOF, not up to the extended initialized > size, which left the rest of the block holding pos + count (Baolin). > v2: also clear the cached tail of the last block, which v1 left in > place when the write stayed inside the old data size (Baolin). > > v5: https://lore.kernel.org/all/20261116091121.2547497-1-zhanxusheng1024@gmail.com/ > v4: https://lore.kernel.org/all/20261113050148.1466682-1-zhanxusheng1024@gmail.com/ > v3: https://lore.kernel.org/all/20261112093233.1118469-1-zhanxusheng1024@gmail.com/ > v2: https://lore.kernel.org/all/20261112030815.982026-1-zhanxusheng1024@gmail.com/ > v1: https://lore.kernel.org/all/20261111093459.660484-1-zhanxusheng1024@gmail.com/ > > Tested in a VM on ntfs-next b025f526c5d0, with all free space filled > with a known pattern first. Short buffered writes of 4M, old data > readable after drop_caches and after remount, 3 runs each: > > unfixed v5 v6 > fallocated, ends block-aligned 3137536 0 0 > fallocated, ends inside a block 3141332 0 0 > fallocated, unaligned start 3137536 0 0 > same, pos + count in that page - 0 0 > append 3137536 0 0 > > Marker stored through a shared mapping at 64K while pwritev() is > stalled on a userfaultfd source page, state after remount, with and > without fallocate(): > > unfixed v5 v6 > buffered 4K at 128K, EFAULT lost lost kept > O_DIRECT 12K at 0, EFAULT lost lost kept > buffered 12K at 0, short 8192 (v3) kept kept kept > > A store into [pos + ret, pos + count) itself during the write is > zeroed, as that range belongs to the write. With iomap_zero_range() > failing (injected -ENOMEM), a 32K write to a 16K file that returns > 12288 leaves the size at 28K with no old data, also after remount. > fsx (buffered, no-mmap, O_DIRECT and mixed), compressed files, > fallocate, insert/collapse range and punch hole give the same results > with v6 as with v5. > --- > fs/ntfs/file.c | 70 +++++++++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 63 insertions(+), 7 deletions(-) > > diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c > index 3213a0c9f96b..866aaca1887e 100644 > --- a/fs/ntfs/file.c > +++ b/fs/ntfs/file.c > @@ -928,10 +928,21 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) > ret = iomap_file_buffered_write(iocb, from, &ntfs_write_iomap_ops, > &ntfs_iomap_folio_ops, NULL); > out: > - if (ret < 0 && ret != -EIOCBQUEUED) { > + /* > + * Both sizes were moved to end before the copy, so a short write, > + * like a failed one, must take back what it did not write. > + */ > + if (ret < count && ret != -EIOCBQUEUED) { > + loff_t new_init_size = old_init_size; > + loff_t new_data_size = old_data_size; > int init_err = 0; > int data_err = 0; > > + if (ret > 0) { > + new_init_size = max(old_init_size, pos + ret); > + new_data_size = max(old_data_size, pos + ret); > + } > + > /* > * Like ntfs_setattr_size(): __ntfs_attr_truncate_vfs() > * expects the invalidate lock held across the size > @@ -939,14 +950,59 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) > */ > filemap_invalidate_lock(vi->i_mapping); > > + /* > + * A page fault through a shared mapping may have used the > + * extended initialized size while the write was stalled on > + * its source, so keep that size and zero what the write did > + * not reach instead. [old_init_size, pos) was zeroed before > + * the write. Past end, zero the rest of the block that a > + * buffered copy may have read from disk, unless such a fault > + * already moved the initialized size past end and zeroed it. > + */ > + if (NInoNonResident(ni) && !NInoCompressed(ni) && > + ni->initialized_size > new_init_size) { > + loff_t zstart = max(pos, new_init_size); > + loff_t zend = ni->initialized_size > end ? end : > + round_up(end, i_blocksize(vi)); > + int err = 0; > + > + zend = min(zend, new_data_size); > + if (zend > zstart) { > + err = iomap_zero_range(vi, zstart, > + zend - zstart, NULL, > + &ntfs_seek_iomap_ops, > + &ntfs_iomap_folio_ops, NULL); > + /* A direct read must not see the old blocks. */ > + if (!err && iocb->ki_flags & IOCB_DIRECT) > + err = filemap_write_and_wait_range( > + vi->i_mapping, zstart, zend - 1); > + } > + if (!err) > + new_init_size = min(ni->initialized_size, > + new_data_size); > + else > + new_init_size = min3(ni->initialized_size, > + zstart, new_data_size); > + } > + > /* ntfs_attr_set_initialized_size() rejects a resident one. */ > - if (ni->initialized_size != old_init_size && > + if (ni->initialized_size != new_init_size && > NInoNonResident(ni)) { > struct ntfs_inode *mrec_ni = ntfs_base_inode(ni); > > + /* > + * Only reached when the zeroing above failed or did > + * not apply. Drop what was cached past the new > + * initialized size, as __ntfs_extend_initialized_size() > + * does. > + */ > + if (ni->initialized_size > new_init_size) > + truncate_pagecache_range(vi, new_init_size, > + max_t(loff_t, i_size_read(vi), > + ni->initialized_size) - 1); > mutex_lock(&mrec_ni->mrec_lock); > init_err = ntfs_attr_set_initialized_size(ni, > - old_init_size); > + new_init_size); > mutex_unlock(&mrec_ni->mrec_lock); > } > /* > @@ -955,13 +1011,13 @@ ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) > * the uninitialized tail, so skip it unless the rollback > * above restored that size. > */ > - if (ni->data_size != old_data_size && !init_err) { > + if (ni->data_size != new_data_size && !init_err) { > struct ntfs_inode *mrec_ni = ntfs_base_inode(ni); > > - truncate_setsize(vi, old_data_size); > + truncate_setsize(vi, new_data_size); > mutex_lock(&mrec_ni->mrec_lock); > - data_err = __ntfs_attr_truncate_vfs(ni, old_data_size, > - old_data_size); > + data_err = __ntfs_attr_truncate_vfs(ni, new_data_size, > + new_data_size); It seems that this could free preallocated space reserved with KEEP_SIZE. > mutex_unlock(&mrec_ni->mrec_lock); > /* Like ntfs_setattr_size(): stay on the durable size. */ > if (data_err) > > base-commit: b025f526c5d04929212c9d5fb7ffc96608f3eacc > -- > 2.43.0 > -- Thanks, Hyunchul