From patchwork Fri Sep 23 11:59:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 12986502 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2955ECAAD8 for ; Fri, 23 Sep 2022 12:06:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231224AbiIWMGi (ORCPT ); Fri, 23 Sep 2022 08:06:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231588AbiIWMES (ORCPT ); Fri, 23 Sep 2022 08:04:18 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5528572B45 for ; Fri, 23 Sep 2022 05:00:07 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0D339219FB for ; Fri, 23 Sep 2022 12:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1663934406; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=no4HX1Cau5Jr7627H2ksfzfHlZVVF0FIXBd0DcjnJSk=; b=UB1RZL5reWr3QG8XdHdR9cmLTQUD0tiEy1vl/Xwnb1yue/3mYDewnDDDD05N2LECuSSAsl Y+ZhkG7UZJAvNI1msMl5bazt9L2ZG54p/Iz+hRzzYWO3H7+tGpWOqprJuqt8iCvXO0rBk1 pYiXgPLCkcQN9Rx30Rpe9tcJL27TK14= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5326113A00 for ; Fri, 23 Sep 2022 12:00:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id wImlBsWfLWMqaAAAMHmgww (envelope-from ) for ; Fri, 23 Sep 2022 12:00:05 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] btrfs-progs: remove unused function extent_io_tree_init_cache_max() Date: Fri, 23 Sep 2022 19:59:44 +0800 Message-Id: X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The function is introduced by commit a5ce5d219822 ("btrfs-progs: extent-cache: actually cache extent buffers") but never got utilized. Thus we can just remove it. Signed-off-by: Qu Wenruo --- kernel-shared/extent_io.c | 7 ------- kernel-shared/extent_io.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/kernel-shared/extent_io.c b/kernel-shared/extent_io.c index 48bcf2cf2f96..a34616c9e783 100644 --- a/kernel-shared/extent_io.c +++ b/kernel-shared/extent_io.c @@ -43,13 +43,6 @@ void extent_io_tree_init(struct extent_io_tree *tree) tree->max_cache_size = (u64)total_memory() / 4; } -void extent_io_tree_init_cache_max(struct extent_io_tree *tree, - u64 max_cache_size) -{ - extent_io_tree_init(tree); - tree->max_cache_size = max_cache_size; -} - static struct extent_state *alloc_extent_state(void) { struct extent_state *state; diff --git a/kernel-shared/extent_io.h b/kernel-shared/extent_io.h index 2148a8112428..ccdf768c1e5d 100644 --- a/kernel-shared/extent_io.h +++ b/kernel-shared/extent_io.h @@ -97,8 +97,6 @@ static inline void extent_buffer_get(struct extent_buffer *eb) } void extent_io_tree_init(struct extent_io_tree *tree); -void extent_io_tree_init_cache_max(struct extent_io_tree *tree, - u64 max_cache_size); void extent_io_tree_cleanup(struct extent_io_tree *tree); int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits); int clear_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits); From patchwork Fri Sep 23 11:59:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 12986499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DDED5C6FA90 for ; Fri, 23 Sep 2022 12:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231384AbiIWMGb (ORCPT ); Fri, 23 Sep 2022 08:06:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231673AbiIWMET (ORCPT ); Fri, 23 Sep 2022 08:04:19 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBB77D1F2 for ; Fri, 23 Sep 2022 05:00:08 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2FBB321A15 for ; Fri, 23 Sep 2022 12:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1663934407; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KmoUjGJDsDW8gleYy63Kx9L8pehGG8kHHs44UClwEg0=; b=rB4ozTcfajrwgW/edOBRi8cbXm3BjdmFfKZUtiZjQpVu7aR5e6P95qMEg7z3GHFgQrelqQ 2S7b2kBEdkMozI3lhdAMSgAjiNWlVxJaR25QzAkeJxVlcqsb0ev1feEw4wtQxzJ3qGKki9 TN7ik1f8/I9IDJACDCtYtaLlXe3PmH0= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 771C813A00 for ; Fri, 23 Sep 2022 12:00:06 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eEWmD8afLWMqaAAAMHmgww (envelope-from ) for ; Fri, 23 Sep 2022 12:00:06 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 2/3] btrfs-progs: remove duplicated leakde extent buffer reporst Date: Fri, 23 Sep 2022 19:59:45 +0800 Message-Id: X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org [BUG] When transaction is aborted halfway, we can have extent buffer leaked, and in that case, the same leaked extent buffer can be reported for multiple times: ERROR: failed to clear free space cache v2: -1 extent buffer leak: start 30441472 len 16384 WARNING: dirty eb leak (aborted trans): start 30441472 len 16384 extent buffer leak: start 30720000 len 16384 extent buffer leak: start 30425088 len 16384 extent buffer leak: start 30425088 len 16384 << Duplicated WARNING: dirty eb leak (aborted trans): start 30425088 len 16384 Note that 30425088 line is reported twice (not accounting the "dirty eb leak" line). [CAUSE] When we detected a leaked eb, we call free_extent_buffer_nocache(), but free_extent_buffer_nocache() can only remove the eb when its reduced refs is 0. If the eb has refs 2, it will need two free_extent_buffer_nocache() calls to remove it from the cache. [FIX] Just reset the eb->refs to 1 so that free_extent_buffer_nocache() can remove it from cache for sure. Signed-off-by: Qu Wenruo --- kernel-shared/extent_io.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel-shared/extent_io.c b/kernel-shared/extent_io.c index a34616c9e783..f10acc3595c3 100644 --- a/kernel-shared/extent_io.c +++ b/kernel-shared/extent_io.c @@ -81,6 +81,11 @@ void extent_io_tree_cleanup(struct extent_io_tree *tree) while(!list_empty(&tree->lru)) { eb = list_entry(tree->lru.next, struct extent_buffer, lru); if (eb->refs) { + /* + * Reset extent buffer refs to 1, so the + * free_extent_buffer_nocache() can free it for sure. + */ + eb->refs = 1; fprintf(stderr, "extent buffer leak: start %llu len %u\n", (unsigned long long)eb->start, eb->len); From patchwork Fri Sep 23 11:59:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 12986500 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C99FBC6FA8E for ; Fri, 23 Sep 2022 12:06:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231279AbiIWMGb (ORCPT ); Fri, 23 Sep 2022 08:06:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231676AbiIWMET (ORCPT ); Fri, 23 Sep 2022 08:04:19 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B4D432B9F for ; Fri, 23 Sep 2022 05:00:09 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 89B941F8C7; Fri, 23 Sep 2022 12:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1663934408; 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=NKDuiuSo991nHhqdDuhdjorezDKnyusUTVLG7Z07CSQ=; b=lnautrDupIpsQuFZtgnFvvbLuaZRcLwQa8lVapRYoFmT7/HLjODJ/pg186s0CzFi2yO5fU UCkTFXf/toYL+bfmqAlcRTeIUzH9dmL0aKUB75++vNlj6InwGHKEb9CUhDMNBsPS5J9Ueq TsvJM5/55SbwuTlEDmRsM0CXDSXK7l4= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9AB4D13A00; Fri, 23 Sep 2022 12:00:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id GKEQGMefLWMqaAAAMHmgww (envelope-from ); Fri, 23 Sep 2022 12:00:07 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: Christoph Anton Mitterer Subject: [PATCH 3/3] btrfs-progs: properly handle write error when writing back tree blocks Date: Fri, 23 Sep 2022 19:59:46 +0800 Message-Id: <3b4a860cd4d9091def2121e0c67d312a99ae0dca.1663934243.git.wqu@suse.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org [BUG] If we emulate a write error during commit transaction, by setting the block device read-only, then we can easily have the following crash using "btrfs check --clear-space-cache v2": Opening filesystem to check... Checking filesystem on /dev/test/scratch1 UUID: 5945915b-37f1-4bfa-9f64-684b318b8f73 Clear free space cache v2 Error writing to device 1 kernel-shared/transaction.c:156: __commit_transaction: BUG_ON `ret` triggered, value 1 ./btrfs(+0x570c9)[0x562ec894f0c9] ./btrfs(+0x57167)[0x562ec894f167] ./btrfs(__commit_transaction+0x13b)[0x562ec894f7f2] ./btrfs(btrfs_commit_transaction+0x214)[0x562ec894fa64] ./btrfs(btrfs_clear_free_space_tree+0x177)[0x562ec8941ae6] ./btrfs(+0xc8958)[0x562ec89c0958] ./btrfs(+0xc9d53)[0x562ec89c1d53] ./btrfs(+0x17ec7)[0x562ec890fec7] ./btrfs(main+0x12f)[0x562ec8910908] /usr/lib/libc.so.6(+0x232d0)[0x7ff917ee82d0] /usr/lib/libc.so.6(__libc_start_main+0x8a)[0x7ff917ee838a] ./btrfs(_start+0x25)[0x562ec890fdc5] Aborted (core dumped) [CAUSE] The call trace has shown it's a BUG_ON(), and it's from __commit_transaction(), which is writing tree blocks back. [FIX] The fix is pretty simple, just return error. In fact we even have an error value check in btrfs_commit_transaction() just after __commit_transaction() call (although not catching the return value from it). And since we're here, also call btrfs_abort_transaction() to prevent newer transactions from being started. Now we won't have a full crash: Opening filesystem to check... Checking filesystem on /dev/test/scratch1 UUID: 5945915b-37f1-4bfa-9f64-684b318b8f73 Clear free space cache v2 Error writing to device 1 ERROR: failed to write bytenr 30425088 length 16384: Operation not permitted ERROR: failed to write tree block 30425088: Operation not permitted ERROR: failed to clear free space cache v2: -1 extent buffer leak: start 30720000 len 16384 Reported-by: Christoph Anton Mitterer Signed-off-by: Qu Wenruo --- kernel-shared/extent_io.c | 2 +- kernel-shared/transaction.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/kernel-shared/extent_io.c b/kernel-shared/extent_io.c index f10acc3595c3..3875b8f61242 100644 --- a/kernel-shared/extent_io.c +++ b/kernel-shared/extent_io.c @@ -1011,7 +1011,7 @@ int write_data_to_disk(struct btrfs_fs_info *info, void *buf, u64 offset, if (ret < 0) { fprintf(stderr, "Error writing to " "device %d\n", errno); - ret = errno; + ret = -errno; kfree(multi); return ret; } else { diff --git a/kernel-shared/transaction.c b/kernel-shared/transaction.c index 8d74016e21d2..28b1684828ee 100644 --- a/kernel-shared/transaction.c +++ b/kernel-shared/transaction.c @@ -153,13 +153,41 @@ again: eb = find_first_extent_buffer(tree, start); BUG_ON(!eb || eb->start != start); ret = write_tree_block(trans, fs_info, eb); - BUG_ON(ret); + if (ret < 0) { + free_extent_buffer(eb); + errno = -ret; + error("failed to write tree block %llu: %m", + eb->start); + goto cleanup; + } start += eb->len; clear_extent_buffer_dirty(eb); free_extent_buffer(eb); } } return 0; +cleanup: + /* + * Mark all remaining dirty ebs clean, as they have no chance to be written + * back anymore. + */ + while (1) { + int find_ret; + + find_ret = find_first_extent_bit(tree, 0, &start, &end, EXTENT_DIRTY); + + if (find_ret) + break; + + while (start <= end) { + eb = find_first_extent_buffer(tree, start); + BUG_ON(!eb || eb->start != start); + start += eb->len; + clear_extent_buffer_dirty(eb); + free_extent_buffer(eb); + } + } + return ret; } int btrfs_commit_transaction(struct btrfs_trans_handle *trans, @@ -219,7 +247,7 @@ commit_tree: if (ret < 0) goto error; } - __commit_transaction(trans, root); + ret = __commit_transaction(trans, root); if (ret < 0) goto error; @@ -244,6 +272,7 @@ commit_tree: } return ret; error: + btrfs_abort_transaction(trans, ret); btrfs_destroy_delayed_refs(trans); free(trans); return ret;