From patchwork Fri Feb 28 14:49:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13996550 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BD2E26E94D for ; Fri, 28 Feb 2025 14:49:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754174; cv=none; b=iQ/hf3z/r2J2YGR5Ark0wwuVeNAFBBm0ZJtShtnTtLB0Ie+HpyHwQ0TFHiRIObu4+8ODrZbiLJvEXqOXLCtEq+HsfTfwDo+OaSS9CNmbX8RhzPW10A6Jlktg1jdq2DInia5QDCZNqUh3RWkfBKsLvHBU2ogUPBnlwyipdEmP0To= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754174; c=relaxed/simple; bh=kD/S6LssMrK1MlIiJ9MOu7xdp/mIAichYP7gqhcotWs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YbFBcoU/ZPAmZ/7eF4aWHHdut4ae9AxWpncKHHmHwG8lTmIbUECV/AZr8O4pNdpYg86Ukab3rA4ZOmKqJ1nMQLp2U317r4vsBEoeDqKcViodreN8uPcXFRg93cCroh0IecQfmNLEZ3sziyA8EXcfYCUok3dVfkR32RDhWpWzcYM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=EScwuuAA; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=EScwuuAA; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="EScwuuAA"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="EScwuuAA" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id BFD031F38F; Fri, 28 Feb 2025 14:49:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754169; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K7VO1cA/KkW7D7hWqF+niKov7bfZX7rmYWAXxRGLOPw=; b=EScwuuAAsbT8nGMTTVYxqbB63ryxSSUmz+YhQ6DsRIqtREr3D8aiDvfit+DqX5ysBxakn4 qsF0YPC2BPhRWxmP41ujR2tUAjBzGnMPUpYqNO/+aRRpfqSk4oqfUgoCYghinzrkih/U2M 3i9EquSY6BnAiDSYXnb4Cpb5oqfDv7A= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754169; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=K7VO1cA/KkW7D7hWqF+niKov7bfZX7rmYWAXxRGLOPw=; b=EScwuuAAsbT8nGMTTVYxqbB63ryxSSUmz+YhQ6DsRIqtREr3D8aiDvfit+DqX5ysBxakn4 qsF0YPC2BPhRWxmP41ujR2tUAjBzGnMPUpYqNO/+aRRpfqSk4oqfUgoCYghinzrkih/U2M 3i9EquSY6BnAiDSYXnb4Cpb5oqfDv7A= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id B9610137AC; Fri, 28 Feb 2025 14:49:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2jNKLfnMwWdQPQAAD6G6ig (envelope-from ); Fri, 28 Feb 2025 14:49:29 +0000 From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 1/5] btrfs: extend trim callchains to pass the operation type Date: Fri, 28 Feb 2025 15:49:29 +0100 Message-ID: <1d52d90b72769dd652253987e2fcc144d865b345.1740753608.git.dsterba@suse.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:mid,suse.com:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Flag: NO X-Spam-Level: Preparatory work for more than trim/discard operation that can be performed on the unused space from an ioctl. As FITRIM is not extensible, we'll need a new one. Now we extend any caller that takes part in the trim/discard to take one parameter defining the type of operation. The operation multiplexer btrfs_issue_clear_op() will be extended in followup patches. Signed-off-by: David Sterba --- fs/btrfs/discard.c | 4 +-- fs/btrfs/extent-tree.c | 51 +++++++++++++++++++++++-------------- fs/btrfs/extent-tree.h | 3 ++- fs/btrfs/free-space-cache.c | 29 +++++++++++---------- fs/btrfs/free-space-cache.h | 8 +++--- fs/btrfs/inode.c | 2 +- fs/btrfs/volumes.c | 3 ++- include/uapi/linux/btrfs.h | 8 ++++++ 8 files changed, 68 insertions(+), 40 deletions(-) diff --git a/fs/btrfs/discard.c b/fs/btrfs/discard.c index e815d165cccc..cd7220465f1f 100644 --- a/fs/btrfs/discard.c +++ b/fs/btrfs/discard.c @@ -518,13 +518,13 @@ static void btrfs_discard_workfn(struct work_struct *work) btrfs_trim_block_group_bitmaps(block_group, &trimmed, block_group->discard_cursor, btrfs_block_group_end(block_group), - minlen, maxlen, true); + minlen, maxlen, true, BTRFS_CLEAR_OP_DISCARD); discard_ctl->discard_bitmap_bytes += trimmed; } else { btrfs_trim_block_group_extents(block_group, &trimmed, block_group->discard_cursor, btrfs_block_group_end(block_group), - minlen, true); + minlen, true, BTRFS_CLEAR_OP_DISCARD); discard_ctl->discard_extent_bytes += trimmed; } diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 5de1a1293c93..df86ffde478b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1247,8 +1247,20 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, return ret; } +static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, + enum btrfs_clear_op_type clear) +{ + switch (clear) { + case BTRFS_CLEAR_OP_DISCARD: + return blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, + size >> SECTOR_SHIFT, GFP_NOFS); + default: + return -EOPNOTSUPP; + } +} + static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, - u64 *discarded_bytes) + u64 *discarded_bytes, enum btrfs_clear_op_type clear) { int j, ret = 0; u64 bytes_left, end; @@ -1293,11 +1305,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, bytes_left = end - start; continue; } - if (size) { - ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, - size >> SECTOR_SHIFT, - GFP_NOFS); + ret = btrfs_issue_clear_op(bdev, start, size, clear); if (!ret) *discarded_bytes += size; else if (ret != -EOPNOTSUPP) @@ -1315,9 +1324,7 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, while (bytes_left) { u64 bytes_to_discard = min(BTRFS_MAX_DISCARD_CHUNK_SIZE, bytes_left); - ret = blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, - bytes_to_discard >> SECTOR_SHIFT, - GFP_NOFS); + ret = btrfs_issue_clear_op(bdev, start, bytes_left, clear); if (ret) { if (ret != -EOPNOTSUPP) @@ -1338,7 +1345,8 @@ static int btrfs_issue_discard(struct block_device *bdev, u64 start, u64 len, return ret; } -static int do_discard_extent(struct btrfs_discard_stripe *stripe, u64 *bytes) +static int do_discard_extent(struct btrfs_discard_stripe *stripe, u64 *bytes, + enum btrfs_clear_op_type clear) { struct btrfs_device *dev = stripe->dev; struct btrfs_fs_info *fs_info = dev->fs_info; @@ -1367,7 +1375,7 @@ static int do_discard_extent(struct btrfs_discard_stripe *stripe, u64 *bytes) &discarded); discarded += src_disc; } else if (bdev_max_discard_sectors(stripe->dev->bdev)) { - ret = btrfs_issue_discard(dev->bdev, phys, len, &discarded); + ret = btrfs_issue_discard(dev->bdev, phys, len, &discarded, clear); } else { ret = 0; *bytes = 0; @@ -1379,7 +1387,8 @@ static int do_discard_extent(struct btrfs_discard_stripe *stripe, u64 *bytes) } int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, - u64 num_bytes, u64 *actual_bytes) + u64 num_bytes, u64 *actual_bytes, + enum btrfs_clear_op_type clear) { int ret = 0; u64 discarded_bytes = 0; @@ -1418,7 +1427,7 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, &stripe->dev->dev_state)) continue; - ret = do_discard_extent(stripe, &bytes); + ret = do_discard_extent(stripe, &bytes, clear); if (ret) { /* * Keep going if discard is not supported by the @@ -2837,7 +2846,8 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) if (btrfs_test_opt(fs_info, DISCARD_SYNC)) ret = btrfs_discard_extent(fs_info, start, - end + 1 - start, NULL); + end + 1 - start, NULL, + BTRFS_CLEAR_OP_DISCARD); clear_extent_dirty(unpin, start, end, &cached_state); ret = unpin_extent_range(fs_info, start, end, true); @@ -2866,7 +2876,8 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans) ret = btrfs_discard_extent(fs_info, block_group->start, block_group->length, - &trimmed); + &trimmed, + BTRFS_CLEAR_OP_DISCARD); list_del_init(&block_group->bg_list); btrfs_unfreeze_block_group(block_group); @@ -6360,7 +6371,8 @@ void btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, u64 start, u6 * it while performing the free space search since we have already * held back allocations. */ -static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) +static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed, + enum btrfs_clear_op_type clear) { u64 start = BTRFS_DEVICE_RANGE_RESERVED, len = 0, end = 0; int ret; @@ -6425,8 +6437,7 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed) break; } - ret = btrfs_issue_discard(device->bdev, start, len, - &bytes); + ret = btrfs_issue_discard(device->bdev, start, len, &bytes, clear); if (!ret) set_extent_bit(&device->alloc_state, start, start + bytes - 1, CHUNK_TRIMMED, NULL); @@ -6508,7 +6519,8 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) &group_trimmed, start, end, - range->minlen); + range->minlen, + BTRFS_CLEAR_OP_DISCARD); trimmed += group_trimmed; if (ret) { @@ -6529,7 +6541,8 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) continue; - ret = btrfs_trim_free_extents(device, &group_trimmed); + ret = btrfs_trim_free_extents(device, &group_trimmed, + BTRFS_CLEAR_OP_DISCARD); trimmed += group_trimmed; if (ret) { diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h index 0ed682d9ed7b..c8e1a30309ab 100644 --- a/fs/btrfs/extent-tree.h +++ b/fs/btrfs/extent-tree.h @@ -163,7 +163,8 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, struct extent_buffer *parent); void btrfs_error_unpin_extent_range(struct btrfs_fs_info *fs_info, u64 start, u64 end); int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, - u64 num_bytes, u64 *actual_bytes); + u64 num_bytes, u64 *actual_bytes, + enum btrfs_clear_op_type clear); int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range); #endif diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c index 3095cce904b5..161fdcab07e4 100644 --- a/fs/btrfs/free-space-cache.c +++ b/fs/btrfs/free-space-cache.c @@ -3652,7 +3652,8 @@ static int do_trimming(struct btrfs_block_group *block_group, u64 *total_trimmed, u64 start, u64 bytes, u64 reserved_start, u64 reserved_bytes, enum btrfs_trim_state reserved_trim_state, - struct btrfs_trim_range *trim_entry) + struct btrfs_trim_range *trim_entry, + enum btrfs_clear_op_type clear) { struct btrfs_space_info *space_info = block_group->space_info; struct btrfs_fs_info *fs_info = block_group->fs_info; @@ -3674,7 +3675,7 @@ static int do_trimming(struct btrfs_block_group *block_group, spin_unlock(&block_group->lock); spin_unlock(&space_info->lock); - ret = btrfs_discard_extent(fs_info, start, bytes, &trimmed); + ret = btrfs_discard_extent(fs_info, start, bytes, &trimmed, clear); if (!ret) { *total_trimmed += trimmed; trim_state = BTRFS_TRIM_STATE_TRIMMED; @@ -3711,7 +3712,7 @@ static int do_trimming(struct btrfs_block_group *block_group, */ static int trim_no_bitmap(struct btrfs_block_group *block_group, u64 *total_trimmed, u64 start, u64 end, u64 minlen, - bool async) + bool async, enum btrfs_clear_op_type clear) { struct btrfs_discard_ctl *discard_ctl = &block_group->fs_info->discard_ctl; @@ -3800,7 +3801,7 @@ static int trim_no_bitmap(struct btrfs_block_group *block_group, ret = do_trimming(block_group, total_trimmed, start, bytes, extent_start, extent_bytes, extent_trim_state, - &trim_entry); + &trim_entry, clear); if (ret) { block_group->discard_cursor = start + bytes; break; @@ -3877,7 +3878,7 @@ static void end_trimming_bitmap(struct btrfs_free_space_ctl *ctl, */ static int trim_bitmaps(struct btrfs_block_group *block_group, u64 *total_trimmed, u64 start, u64 end, u64 minlen, - u64 maxlen, bool async) + u64 maxlen, bool async, enum btrfs_clear_op_type clear) { struct btrfs_discard_ctl *discard_ctl = &block_group->fs_info->discard_ctl; @@ -3986,7 +3987,7 @@ static int trim_bitmaps(struct btrfs_block_group *block_group, mutex_unlock(&ctl->cache_writeout_mutex); ret = do_trimming(block_group, total_trimmed, start, bytes, - start, bytes, 0, &trim_entry); + start, bytes, 0, &trim_entry, clear); if (ret) { reset_trimming_bitmap(ctl, offset); block_group->discard_cursor = @@ -4020,7 +4021,8 @@ static int trim_bitmaps(struct btrfs_block_group *block_group, } int btrfs_trim_block_group(struct btrfs_block_group *block_group, - u64 *trimmed, u64 start, u64 end, u64 minlen) + u64 *trimmed, u64 start, u64 end, u64 minlen, + enum btrfs_clear_op_type clear) { struct btrfs_free_space_ctl *ctl = block_group->free_space_ctl; int ret; @@ -4038,11 +4040,11 @@ int btrfs_trim_block_group(struct btrfs_block_group *block_group, btrfs_freeze_block_group(block_group); spin_unlock(&block_group->lock); - ret = trim_no_bitmap(block_group, trimmed, start, end, minlen, false); + ret = trim_no_bitmap(block_group, trimmed, start, end, minlen, false, clear); if (ret) goto out; - ret = trim_bitmaps(block_group, trimmed, start, end, minlen, 0, false); + ret = trim_bitmaps(block_group, trimmed, start, end, minlen, 0, false, clear); div64_u64_rem(end, BITS_PER_BITMAP * ctl->unit, &rem); /* If we ended in the middle of a bitmap, reset the trimming flag */ if (rem) @@ -4054,7 +4056,7 @@ int btrfs_trim_block_group(struct btrfs_block_group *block_group, int btrfs_trim_block_group_extents(struct btrfs_block_group *block_group, u64 *trimmed, u64 start, u64 end, u64 minlen, - bool async) + bool async, enum btrfs_clear_op_type clear) { int ret; @@ -4068,7 +4070,7 @@ int btrfs_trim_block_group_extents(struct btrfs_block_group *block_group, btrfs_freeze_block_group(block_group); spin_unlock(&block_group->lock); - ret = trim_no_bitmap(block_group, trimmed, start, end, minlen, async); + ret = trim_no_bitmap(block_group, trimmed, start, end, minlen, async, clear); btrfs_unfreeze_block_group(block_group); return ret; @@ -4076,7 +4078,8 @@ int btrfs_trim_block_group_extents(struct btrfs_block_group *block_group, int btrfs_trim_block_group_bitmaps(struct btrfs_block_group *block_group, u64 *trimmed, u64 start, u64 end, u64 minlen, - u64 maxlen, bool async) + u64 maxlen, bool async, + enum btrfs_clear_op_type clear) { int ret; @@ -4091,7 +4094,7 @@ int btrfs_trim_block_group_bitmaps(struct btrfs_block_group *block_group, spin_unlock(&block_group->lock); ret = trim_bitmaps(block_group, trimmed, start, end, minlen, maxlen, - async); + async, clear); btrfs_unfreeze_block_group(block_group); diff --git a/fs/btrfs/free-space-cache.h b/fs/btrfs/free-space-cache.h index 9f1dbfdee8ca..c4c2e5571355 100644 --- a/fs/btrfs/free-space-cache.h +++ b/fs/btrfs/free-space-cache.h @@ -159,13 +159,15 @@ void btrfs_return_cluster_to_free_space( struct btrfs_block_group *block_group, struct btrfs_free_cluster *cluster); int btrfs_trim_block_group(struct btrfs_block_group *block_group, - u64 *trimmed, u64 start, u64 end, u64 minlen); + u64 *trimmed, u64 start, u64 end, u64 minlen, + enum btrfs_clear_op_type clear); int btrfs_trim_block_group_extents(struct btrfs_block_group *block_group, u64 *trimmed, u64 start, u64 end, u64 minlen, - bool async); + bool async, enum btrfs_clear_op_type clear); int btrfs_trim_block_group_bitmaps(struct btrfs_block_group *block_group, u64 *trimmed, u64 start, u64 end, u64 minlen, - u64 maxlen, bool async); + u64 maxlen, bool async, + enum btrfs_clear_op_type clear); bool btrfs_free_space_cache_v1_active(struct btrfs_fs_info *fs_info); int btrfs_set_free_space_cache_v1_active(struct btrfs_fs_info *fs_info, bool active); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f9bd9242acd3..282ccd1869c0 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3289,7 +3289,7 @@ int btrfs_finish_one_ordered(struct btrfs_ordered_extent *ordered_extent) btrfs_discard_extent(fs_info, ordered_extent->disk_bytenr, ordered_extent->disk_num_bytes, - NULL); + NULL, BTRFS_CLEAR_OP_DISCARD); btrfs_free_reserved_extent(fs_info, ordered_extent->disk_bytenr, ordered_extent->disk_num_bytes, 1); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 515003a23e65..b6d007e358d4 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -3534,7 +3534,8 @@ int btrfs_relocate_chunk(struct btrfs_fs_info *fs_info, u64 chunk_offset) * filesystem's point of view. */ if (btrfs_is_zoned(fs_info)) { - ret = btrfs_discard_extent(fs_info, chunk_offset, length, NULL); + ret = btrfs_discard_extent(fs_info, chunk_offset, length, NULL, + BTRFS_CLEAR_OP_DISCARD); if (ret) btrfs_info(fs_info, "failed to reset zone %llu after relocation", diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index d3b222d7af24..64f971a6bcb2 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -1086,6 +1086,14 @@ enum btrfs_err_code { BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET, }; +/* + * Type of operation that will be used to clear unused blocks. + */ +enum btrfs_clear_op_type { + BTRFS_CLEAR_OP_DISCARD, + BTRFS_NR_CLEAR_OP_TYPES, +}; + #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args) #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ From patchwork Fri Feb 28 14:49:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13996552 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E733D2702BE for ; Fri, 28 Feb 2025 14:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754181; cv=none; b=PpUK++JQfy29CFYKuFwI3xCZggcRgSvAod3JZjyJlL0FKnIUTM1X9FC96GCCH033ksnni2BafseaPYiMXqlJHWDmKVE7X4L3YKnlq2H9xFpFma6Kc0cz274DQaRtVgNv4WrEZlqEobQYJ9VQqSpYtJohYSaANNbhk2Lj8LFwZ/Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754181; c=relaxed/simple; bh=CNaAAS3i6eklEWZmqtgSxuFIrEAm4OWhn+JAXTj7WuQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Txmv68b2ikLjU3JGM29y/QMT1DztbZaq6ymHskD4KAWv0X39OHqtCCLw8SyXsYqlkz+cP+5ts0Kz4+mTxrDQy3AlNNhUn0Plg6KsIikpdaQw73Amr4RemK0x3jZQAXGFi2vuhOVaC8EbqsaTHkPboIAMNGGtxIrgrR6IskXM9vw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=IU0tgwEF; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=IU0tgwEF; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="IU0tgwEF"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="IU0tgwEF" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 245DB1F394; Fri, 28 Feb 2025 14:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754172; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=86JF5A3Y1a/QIQE8d/d8KFj9u5yCItGzRTPIOvxSzhw=; b=IU0tgwEF14uTRPhKtNVRo7+a1u5Fg6HBjESGOKhmArLTHxQfFE1dBVPimzHUMneuLpkkQZ Jq/rLP3ksSRz+IS4KwBsuukpZb6RV6C1A1oFoDuidB3zK3GAGvJX2D39chIVgCg9Pmqohc JV6U7oleGF50nNrp7kriVQyPpXAjNDs= Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754172; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=86JF5A3Y1a/QIQE8d/d8KFj9u5yCItGzRTPIOvxSzhw=; b=IU0tgwEF14uTRPhKtNVRo7+a1u5Fg6HBjESGOKhmArLTHxQfFE1dBVPimzHUMneuLpkkQZ Jq/rLP3ksSRz+IS4KwBsuukpZb6RV6C1A1oFoDuidB3zK3GAGvJX2D39chIVgCg9Pmqohc JV6U7oleGF50nNrp7kriVQyPpXAjNDs= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 1DCE9137AC; Fri, 28 Feb 2025 14:49:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id o39FB/zMwWdTPQAAD6G6ig (envelope-from ); Fri, 28 Feb 2025 14:49:32 +0000 From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 2/5] btrfs: add new ioctl CLEAR_FREE Date: Fri, 28 Feb 2025 15:49:31 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Add a new ioctl that is an extensible version of FITRIM. It currently does only the trim/discard and will be extended by other modes like zeroing or block unmapping. We need a new ioctl for that because struct fstrim_range does not provide any existing or reserved member for extensions. The new ioctl also supports TRIM as the operation type. Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 92 ++++++++++++++++++++++++++++++++++++++ fs/btrfs/extent-tree.h | 2 + fs/btrfs/ioctl.c | 42 +++++++++++++++++ include/uapi/linux/btrfs.h | 20 +++++++++ 4 files changed, 156 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index df86ffde478b..4ab9850b7383 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6562,3 +6562,95 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) return bg_ret; return dev_ret; } + +int btrfs_clear_free_space(struct btrfs_fs_info *fs_info, + struct btrfs_ioctl_clear_free_args *args) +{ + struct btrfs_fs_devices *fs_devices = fs_info->fs_devices; + struct btrfs_device *device; + struct btrfs_block_group *cache = NULL; + u64 group_cleared; + u64 range_end = U64_MAX; + u64 start; + u64 end; + u64 cleared = 0; + u64 bg_failed = 0; + u64 dev_failed = 0; + int bg_ret = 0; + int dev_ret = 0; + int ret = 0; + + if (args->start == U64_MAX) + return -EINVAL; + + /* + * Check range overflow if args->length is set. The default args->length + * is U64_MAX. + */ + if (args->length != U64_MAX && + check_add_overflow(args->start, args->length, &range_end)) + return -EINVAL; + + cache = btrfs_lookup_first_block_group(fs_info, args->start); + for (; cache; cache = btrfs_next_block_group(cache)) { + if (cache->start >= range_end) { + btrfs_put_block_group(cache); + break; + } + + start = max(args->start, cache->start); + end = min(range_end, cache->start + cache->length); + + if (end - start >= args->minlen) { + if (!btrfs_block_group_done(cache)) { + ret = btrfs_cache_block_group(cache, true); + if (ret) { + bg_failed++; + bg_ret = ret; + continue; + } + } + ret = btrfs_trim_block_group(cache, &group_cleared, + start, end, args->minlen, + args->type); + + cleared += group_cleared; + if (ret) { + bg_failed++; + bg_ret = ret; + continue; + } + } + } + + if (bg_failed) + btrfs_warn(fs_info, + "failed to clear %llu block group(s), last error %d", + bg_failed, bg_ret); + + mutex_lock(&fs_devices->device_list_mutex); + list_for_each_entry(device, &fs_devices->devices, dev_list) { + if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) + continue; + + ret = btrfs_trim_free_extents(device, &group_cleared, args->type); + if (ret) { + dev_failed++; + dev_ret = ret; + break; + } + + cleared += group_cleared; + } + mutex_unlock(&fs_devices->device_list_mutex); + + if (dev_failed) + btrfs_warn(fs_info, + "failed to trim %llu device(s), last error %d", + dev_failed, dev_ret); + args->length = cleared; + if (bg_ret) + return bg_ret; + + return dev_ret; +} diff --git a/fs/btrfs/extent-tree.h b/fs/btrfs/extent-tree.h index c8e1a30309ab..e0702b276825 100644 --- a/fs/btrfs/extent-tree.h +++ b/fs/btrfs/extent-tree.h @@ -166,5 +166,7 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes, u64 *actual_bytes, enum btrfs_clear_op_type clear); int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range); +int btrfs_clear_free_space(struct btrfs_fs_info *fs_info, + struct btrfs_ioctl_clear_free_args *args); #endif diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index f3ce82d113be..203e8a23d6c2 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -5213,6 +5213,46 @@ static int btrfs_ioctl_subvol_sync(struct btrfs_fs_info *fs_info, void __user *a return 0; } +static int btrfs_ioctl_clear_free(struct file *file, void __user *arg) +{ + struct btrfs_fs_info *fs_info; + struct btrfs_ioctl_clear_free_args args; + u64 total_bytes; + int ret; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + if (copy_from_user(&args, arg, sizeof(args))) + return -EFAULT; + + if (args.type >= BTRFS_NR_CLEAR_OP_TYPES) + return -EOPNOTSUPP; + + ret = mnt_want_write_file(file); + if (ret) + return ret; + + fs_info = inode_to_fs_info(file_inode(file)); + total_bytes = btrfs_super_total_bytes(fs_info->super_copy); + if (args.start > total_bytes) { + ret = -EINVAL; + goto out_drop_write; + } + + ret = btrfs_clear_free_space(fs_info, &args); + if (ret < 0) + goto out_drop_write; + + if (copy_to_user(arg, &args, sizeof(args))) + ret = -EFAULT; + +out_drop_write: + mnt_drop_write_file(file); + + return 0; +} + long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { @@ -5368,6 +5408,8 @@ long btrfs_ioctl(struct file *file, unsigned int #endif case BTRFS_IOC_SUBVOL_SYNC_WAIT: return btrfs_ioctl_subvol_sync(fs_info, argp); + case BTRFS_IOC_CLEAR_FREE: + return btrfs_ioctl_clear_free(file, argp); } return -ENOTTY; diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 64f971a6bcb2..278010aff02e 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -1094,6 +1094,24 @@ enum btrfs_clear_op_type { BTRFS_NR_CLEAR_OP_TYPES, }; +struct btrfs_ioctl_clear_free_args { + /* In, type of clearing operation, enumerated in btrfs_clear_free_op_type. */ + __u32 type; + /* Reserved must be zero. */ + __u32 reserved1; + /* + * In. Starting offset to clear from in the logical address space (same + * as fstrim_range::start). + */ + __u64 start; /* in */ + /* In, out. Length from the start to clear (same as fstrim_range::length). */ + __u64 length; + /* In. Minimal length to clear (same as fstrim_range::minlen). */ + __u64 minlen; + /* Reserved, must be zero. */ + __u64 reserved2[4]; +}; + #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \ struct btrfs_ioctl_vol_args) #define BTRFS_IOC_DEFRAG _IOW(BTRFS_IOCTL_MAGIC, 2, \ @@ -1200,6 +1218,8 @@ enum btrfs_clear_op_type { struct btrfs_ioctl_vol_args_v2) #define BTRFS_IOC_LOGICAL_INO_V2 _IOWR(BTRFS_IOCTL_MAGIC, 59, \ struct btrfs_ioctl_logical_ino_args) +#define BTRFS_IOC_CLEAR_FREE _IOW(BTRFS_IOCTL_MAGIC, 90, \ + struct btrfs_ioctl_clear_free_args) #define BTRFS_IOC_GET_SUBVOL_INFO _IOR(BTRFS_IOCTL_MAGIC, 60, \ struct btrfs_ioctl_get_subvol_info_args) #define BTRFS_IOC_GET_SUBVOL_ROOTREF _IOWR(BTRFS_IOCTL_MAGIC, 61, \ From patchwork Fri Feb 28 14:49:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13996551 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 49B4926E642 for ; Fri, 28 Feb 2025 14:49:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754178; cv=none; b=GuI1MxhiYY1E6dTNG9H35TTR4UppWyLxaWqPGglaBJMhrut1Z3aYIjiNOU7vWsCWjzqqz94UCWS/Ut2BK2Ux32PrriQIdHzThoHm3EvU+OKe+tNJhR5uSmOKueTxyw/Z2grKPMi8S2Tgp1XlZax5v1BZn0ErIHUjWqaJwZsZjZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754178; c=relaxed/simple; bh=o0UaAIa/iCFmYWQvDXQcygNZ2SL1awJlsBPbEJiPoQo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CG7q7K9D8MQFBl47BIDVgJfAxv63UqaZ4yHfAJb2Z/fX71cppd8CYm4qfXRLaON1QSFk2rshuq1M2haUlb6/pINol91MhGLKAAuHrfVnwoi6d30Dl7euqEAjtBiL3OLDDLVKzrbIrussp8uXsS5CZVLPxsApJt4PnyrdtIMeTo4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fIV5NplP; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fIV5NplP; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fIV5NplP"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fIV5NplP" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (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) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 7C60221184; Fri, 28 Feb 2025 14:49:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754174; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aHfsZu4VneLqsuY8fyU6NqzHx4QJAMohxB5CV/wB70c=; b=fIV5NplP24iaSx3pA9zi/6j32btZD8vUbYT1OlAZEOvXv3gNOiriO8Np46t7M4i7dHvvBd ZBx6XrQywhkqPX4j/J5PFKPgNtyxlPKL9T15g09k3fm8uJSl74DpqqH+MhxmljixC1RyU1 v9Sr99PApIWw2slXvcXFhbSBSY4t1QU= Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754174; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aHfsZu4VneLqsuY8fyU6NqzHx4QJAMohxB5CV/wB70c=; b=fIV5NplP24iaSx3pA9zi/6j32btZD8vUbYT1OlAZEOvXv3gNOiriO8Np46t7M4i7dHvvBd ZBx6XrQywhkqPX4j/J5PFKPgNtyxlPKL9T15g09k3fm8uJSl74DpqqH+MhxmljixC1RyU1 v9Sr99PApIWw2slXvcXFhbSBSY4t1QU= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 75E40137AC; Fri, 28 Feb 2025 14:49:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id K0jGHP7MwWdXPQAAD6G6ig (envelope-from ); Fri, 28 Feb 2025 14:49:34 +0000 From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 3/5] btrfs: add zeroout mode to CLEAR_FREE ioctl Date: Fri, 28 Feb 2025 15:49:34 +0100 Message-ID: <20063b99847a5ac0e2d88a2d4b2082f7aa7ec40d.1740753608.git.dsterba@suse.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCPT_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:email,suse.com:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Flag: NO Add new type of clearing that will write zeros to the unused space (similar to what trim/discard would do). The mode is implemented by blkdev_issue_zeroout() that can write zeros to the blocks explicitly unless the hardware implements UNMAP command that unmaps the blocks that effectively appear as zeroed. This is handled transparently. As a special case of thin provisioning device, the UNMAP is usually handled and can free the underlying space. Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 6 ++++++ include/uapi/linux/btrfs.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 4ab9850b7383..6c45625a293a 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1250,10 +1250,16 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, enum btrfs_clear_op_type clear) { + unsigned int flags = BLKDEV_ZERO_KILLABLE; + switch (clear) { case BTRFS_CLEAR_OP_DISCARD: return blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, size >> SECTOR_SHIFT, GFP_NOFS); + case BTRFS_CLEAR_OP_ZERO: + return blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, + size >> SECTOR_SHIFT, GFP_NOFS, + flags); default: return -EOPNOTSUPP; } diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 278010aff02e..65700c289140 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -1091,6 +1091,12 @@ enum btrfs_err_code { */ enum btrfs_clear_op_type { BTRFS_CLEAR_OP_DISCARD, + /* + * Write zeros to the range, either overwrite or with hardware offload + * that can unmap the blocks internally. + * (Same as blkdev_issue_zeroout() with 0 flags). + */ + BTRFS_CLEAR_OP_ZERO, BTRFS_NR_CLEAR_OP_TYPES, }; From patchwork Fri Feb 28 14:49:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13996554 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD72126E955 for ; Fri, 28 Feb 2025 14:49:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754187; cv=none; b=ngqKU6fP/oGOkA7eDpKaCDkxTulEvpL2T70LKr+1eCuXhYmz9VtAAOkIr8GnBTNt2utU8h6lvNWyiNYwlV8JcUW8yo8VIu9PK4y9M3IQg0iO6+9Av0G+/WRUFN3FgZzZaOdrM1UXKgPaUyImJVXVAW3PH8GDqKSopXFqcMSbzE8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754187; c=relaxed/simple; bh=MYbZm73snthsqnbsIekkmhN+a7OFBXBVvRq9S3QpnHM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A6Ng3DP9/wFVBGITlXn44sRlkXIhs4Xo2hOGo93cFwy1ggPVZAdC10wPjPLFec1dlt0CA11B0sHhkkrA49CekSmUU7PFTvQTJqEVT3vgyWkzkG0sd9AECpp0tuQezMP1XN1qCOz1cH01sb523yjvGHLfiCpnxHIE0SWdn9AH774= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fiq/HzmU; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=fiq/HzmU; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fiq/HzmU"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="fiq/HzmU" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D4F801F38F; Fri, 28 Feb 2025 14:49:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754180; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ful1qHwr6ls1KXScQwIFPOdfqbmf3v3+TgxVMpVFRLM=; b=fiq/HzmUBnGfb1a5D6H/3lAZwKZDOd+HqQseM71YZsfoW+97pzWjWAOUZX/2oy478oc09H 9zYV8PYDrz/k+tLnA9kbumtIT2RW40NbHGNyRYszWXCqx2Qa0U/5T6NJGVJNJ31BfR3pAI JQzOBmzX3c7rtZ08VRzU7qNOwGSVdlk= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b="fiq/HzmU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754180; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ful1qHwr6ls1KXScQwIFPOdfqbmf3v3+TgxVMpVFRLM=; b=fiq/HzmUBnGfb1a5D6H/3lAZwKZDOd+HqQseM71YZsfoW+97pzWjWAOUZX/2oy478oc09H 9zYV8PYDrz/k+tLnA9kbumtIT2RW40NbHGNyRYszWXCqx2Qa0U/5T6NJGVJNJ31BfR3pAI JQzOBmzX3c7rtZ08VRzU7qNOwGSVdlk= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id CE89F137AC; Fri, 28 Feb 2025 14:49:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id pZNqMgTNwWdqPQAAD6G6ig (envelope-from ); Fri, 28 Feb 2025 14:49:40 +0000 From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 4/5] btrfs: add secure erase mode to CLEAR_FREE ioctl Date: Fri, 28 Feb 2025 15:49:36 +0100 Message-ID: <696af7c356b7ddae652be8aa997e40a391c170e6.1740753608.git.dsterba@suse.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: D4F801F38F X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.com:dkim,suse.com:mid,suse.com:email,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Flag: NO X-Spam-Level: Add another type of clearing that will do secure erase on the unused space. This requires hardware support and works as a regular discard while also deleting any copied or cached blocks. Same as "blkdiscard --secure". The unused space ranges may not be aligned to the secure erase block or be of a sufficient length, the exact result depends on the device. Some blocks may still contain valid data even after this ioctl. Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 3 +++ include/uapi/linux/btrfs.h | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6c45625a293a..e38760fbf324 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1253,6 +1253,9 @@ static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, unsigned int flags = BLKDEV_ZERO_KILLABLE; switch (clear) { + case BTRFS_CLEAR_OP_SECURE_ERASE: + return blkdev_issue_secure_erase(bdev, start >> SECTOR_SHIFT, + size >> SECTOR_SHIFT, GFP_NOFS); case BTRFS_CLEAR_OP_DISCARD: return blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, size >> SECTOR_SHIFT, GFP_NOFS); diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 65700c289140..018f0f1bbd5f 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -1097,6 +1097,13 @@ enum btrfs_clear_op_type { * (Same as blkdev_issue_zeroout() with 0 flags). */ BTRFS_CLEAR_OP_ZERO, + /* + * Do a secure erase operation on the range. If supported by the + * underlying hardware, this works as regular discard except that all + * copies of the discarded blocks that were possibly created by + * garbage collection must also be erased. + */ + BTRFS_CLEAR_OP_SECURE_ERASE, BTRFS_NR_CLEAR_OP_TYPES, }; From patchwork Fri Feb 28 14:49:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Sterba X-Patchwork-Id: 13996553 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D47E26E94D for ; Fri, 28 Feb 2025 14:49:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754186; cv=none; b=uOIy6bQZkzkBBl4J2NhTcszxRdoNLywznJoMweX2rL21gytvnrJHfu96uYOswcj2XNZ82dGMsKFLKhHSyJDl0rFEc+AXBsMLLvmJHECTt1b538K2dY8okPHHYg00vj18ILVHAnbTDu28BxNwkIgfn2EvnSHa2ph8Kbb+a/Z1lQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740754186; c=relaxed/simple; bh=yPSjoNyI/hLoPpckMYnNOHPiY8CZw3v9BPfmK4fCvlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tg6FlVbo+Oy/P9QJYWs45N+dQKceVHHRSY+5SEsyU5zExwo2Q5dmNeBI6epFJCs7NkzvxXPhJrUCFHm6ab2SgcuP/GM5ytRGoZtUTBCD2zfCLJXayHCsn9p9u4z31gf95S6EJPdBV6x29th+OEaHP9w/EX853K3e5m3VuGCP4i8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=TGy9grTp; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=TGy9grTp; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="TGy9grTp"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="TGy9grTp" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (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) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 3C81321184; Fri, 28 Feb 2025 14:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kWGWqZT3JPMI2DYg/vVqqTRU+qcEqWhH+B/MCBMLr5s=; b=TGy9grTpgy/WEpda9X28n47FeFaRqRS4JWi62HVJGfYomi7PgnaI+B+0tbm6s8kS0i6zQI fk8eVAQxoeSESTD+S6x5uUAgvnxi3aKdCWjGacJPcIoUifvPccwNk7qqtQnQe83/sZG89O 790wWRc1RdVCusLAJ+KdxMF5C6gGxVE= Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=TGy9grTp DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1740754183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kWGWqZT3JPMI2DYg/vVqqTRU+qcEqWhH+B/MCBMLr5s=; b=TGy9grTpgy/WEpda9X28n47FeFaRqRS4JWi62HVJGfYomi7PgnaI+B+0tbm6s8kS0i6zQI fk8eVAQxoeSESTD+S6x5uUAgvnxi3aKdCWjGacJPcIoUifvPccwNk7qqtQnQe83/sZG89O 790wWRc1RdVCusLAJ+KdxMF5C6gGxVE= Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (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) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 355DF137AC; Fri, 28 Feb 2025 14:49:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 75sFDQfNwWduPQAAD6G6ig (envelope-from ); Fri, 28 Feb 2025 14:49:43 +0000 From: David Sterba To: linux-btrfs@vger.kernel.org Cc: David Sterba Subject: [PATCH 5/5] btrfs: add more zeroout modes to CLEAR_FREE ioctl Date: Fri, 28 Feb 2025 15:49:42 +0100 Message-ID: <207cb619230063cd62a5857dc1b98139e1f3a4d6.1740753608.git.dsterba@suse.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-btrfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: 3C81321184 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.com:email,suse.com:dkim,suse.com:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.com:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Flag: NO The zeroing mode BTRFS_CLEAR_OP_ZERO is safe for use regardless of the underlying device capabilities, either zeros are written or the device will unmap the blocks. This a safe behaviour. In case it's desired to do one or the another add modes that can enforce that or fail when unsupported; - CLEAR_OP_ZERO - overwrite by zero blocks, forbid unmapping blocks by the device - CLEAR_OP_ZERO_NOFALLBACK - unmap the blocks by device and do not fall back to overwriting by zeros Implemented by __blkdev_issue_zeroout() and also documented there. Signed-off-by: David Sterba --- fs/btrfs/extent-tree.c | 11 +++++++++-- include/uapi/linux/btrfs.h | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index e38760fbf324..779216aa8ce0 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -1259,10 +1259,17 @@ static int btrfs_issue_clear_op(struct block_device *bdev, u64 start, u64 size, case BTRFS_CLEAR_OP_DISCARD: return blkdev_issue_discard(bdev, start >> SECTOR_SHIFT, size >> SECTOR_SHIFT, GFP_NOFS); + case BTRFS_CLEAR_OP_ZERO_NOUNMAP: + flags |= BLKDEV_ZERO_NOUNMAP; + return blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, + size >> SECTOR_SHIFT, GFP_NOFS, flags); + case BTRFS_CLEAR_OP_ZERO_NOFALLBACK: + flags |= BLKDEV_ZERO_NOFALLBACK; + return blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, + size >> SECTOR_SHIFT, GFP_NOFS, flags); case BTRFS_CLEAR_OP_ZERO: return blkdev_issue_zeroout(bdev, start >> SECTOR_SHIFT, - size >> SECTOR_SHIFT, GFP_NOFS, - flags); + size >> SECTOR_SHIFT, GFP_NOFS, flags); default: return -EOPNOTSUPP; } diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h index 018f0f1bbd5f..12e54f3b0a13 100644 --- a/include/uapi/linux/btrfs.h +++ b/include/uapi/linux/btrfs.h @@ -1104,6 +1104,11 @@ enum btrfs_clear_op_type { * garbage collection must also be erased. */ BTRFS_CLEAR_OP_SECURE_ERASE, + + /* Overwrite by zeros, do not try to unmap blocks. */ + BTRFS_CLEAR_OP_ZERO_NOUNMAP, + /* Request unmapping the blocks and don't fall back to writing zeros. */ + BTRFS_CLEAR_OP_ZERO_NOFALLBACK, BTRFS_NR_CLEAR_OP_TYPES, };