From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 7C0063EFD02 for ; Sat, 28 Feb 2026 09:06:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269605; cv=none; b=NhsEGVpRNFmyBtOHkFtYRk6do0EwB/NJY6jOE3zpJHgZUMnFPsLsTlQ2ZKPhl2VFdmBFOfyXiJAbYWZwVrVg76xThwIz3fBkrwgeKCZCTY2VS+jc1hF8NdzYyW1Gkt1dHd9v6aKFnCeFN+OuWZKm9sfmApwwrRjzZgFCc8Z0wPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772269605; c=relaxed/simple; bh=SDkZ6OnP0DCX/zk8TiUybEOthpnqyryChtxIxiwvmrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YUakKGiDntiStxd/VLEG314T7URIHxcgi491bPUzDEvNfrRbvLrrUe59cnMMLp+HrLvxR7UBGtkFFnQuq9PEjmvbSNlo4LmzEUX09zrduNzUQu7iqCIcRfSrpp/nrYIG5nm5tfXIgtPuAXc1SHB+yoQ35IXGw9QlVwtIk0CngYk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=d/ZcHzDq; arc=none smtp.client-ip=209.85.216.52 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.b="d/ZcHzDq" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-3591cc98871so1229506a91.3 for ; Sat, 28 Feb 2026 01:06:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772269602; x=1772874402; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MMz6t2oyzUaXSrfBCyX2Xr2xba4aqzpY77uNKPyU2yQ=; b=d/ZcHzDqP0IRBM8Brk0rsUc/PegvEc3xAizPbJVCtqLFn9/gdJCZRmsycffSGIxU0g Q5cETySm/tSB3KaNpLsgIP2EU39gwc346eICHf2ci4ctW5K16nYl6jhUwsDyIN4bpJtb VVvxMLl3Df7MUR6PZelg1VFt3QAnSqYlDINraRrbZVVo1Lca20cmTH/nb6EWSrl6SfNj vazIBNSGmf9iePa16wuZCy2f0KwECcj9Sn3svR/e8uSNtLmZIU+W6zn46dshswSrTE4i eMNhHsKpuncYm6XDyJ7AwtDWehiTdWdXMRQ222Z56eG54IYZuIXIuSF3K2bL5PbKPr5z qrYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772269602; x=1772874402; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MMz6t2oyzUaXSrfBCyX2Xr2xba4aqzpY77uNKPyU2yQ=; b=jAtfQwKNEN3gAqqm2Ldz+AalczVLsbeTKFLZVd7VtgXYKalvTC8UhF0NeBGbuVixTz 7vq19AJwuzJ9+cd3uXQgY8OcxQwGN4bVW1hgH7ottCFWxh2/54iJzRI/IDZu5HAC9MWt 70Ckbypz0wli49Sq2SCqPNk2ve4nG0Xt+mAKEB9zrjBrOwrtiHehbsq7rYXghrDm3BVD GLdqNKKp3RivT6Bnj7YagwnKosZC/2ivq0tPLoJdKSS0HZ18Bov4fwUwWkPJA1V2D/Ar HHyp5KdBO1zP14bz392q92Nx1kL8Ht7RfFSvxLs8OxrF/MqPifmqLBjpVyvmQpASttBG C0jw== X-Forwarded-Encrypted: i=1; AJvYcCXc52qX4q6ghwTytz17IoG8MDn2fKDAe8aRodhUEhnUtJsFcErC9YdFeym/NSxXgqao3pXp4Sf7XiEYP+g=@vger.kernel.org X-Gm-Message-State: AOJu0YzCyHoD1zMt0OA/aKx2plkbf8lftC0S1Q1b9KanaHavenPivSnd 5P2loO0qsoVkjkv258sSWFsZ4Jkn0B7ch7o/U6JIFZd3ROLRqfEes2Jo X-Gm-Gg: ATEYQzyQHDfAFLm2++/FmDnY66udjogVvkFQznTVPz77U+2u2DjoYZDC6SVhA9zUYh7 FnJPsB8awrlbcj1yxXvLsPqCTkynMMoIN+Ffkt9iO9Nnq5VjQBZ9LVmNgEjc5dMuLJqHQLF4Gi+ zYxrdLmVYhJv5E9thF/KQQgsix0Xcq413pnM2aoJ1qmN0ksAbpkTmntLUqx9L7JC1TDL+Z4q5WK z5Z9ES50qyGuEHvxazKO0Cqn1ewuTMb6RgJBWVRCUqVy8aD0iuc71Y2Ug9VoFpOOv2HsFHirbXp VjplEMPreHeMgaX1BCNL64YN18p8F3wCceBI5g0FgCLmYtFqwMJ5a5rhhmyEOz/xDO3rCOzEPMJ TbrRDSaQgfiELKgb+rPWpWGHcaC0acbvMlc5q0KXQtjF4WSAOE4NBA6hqgPeOsoyLc7fOzycDIT UvhejGiCxr359NzhfGuQ004dA1 X-Received: by 2002:a17:90b:47:b0:354:bf10:e69e with SMTP id 98e67ed59e1d1-35965c4164fmr4955190a91.9.1772269601742; Sat, 28 Feb 2026 01:06:41 -0800 (PST) Received: from archlinux ([103.208.68.105]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3593dda5ec8sm7589488a91.12.2026.02.28.01.06.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Feb 2026 01:06:41 -0800 (PST) From: Adarsh Das To: clm@fb.com, dsterba@suse.com Cc: terrelln@fb.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Adarsh Das Subject: [PATCH v2 2/2] btrfs: replace BUG() and BUG_ON() with error handling in extent-tree.c Date: Sat, 28 Feb 2026 14:36:21 +0530 Message-ID: <20260228090621.100841-3-adarshdas950@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260228090621.100841-1-adarshdas950@gmail.com> References: <20260228090621.100841-1-adarshdas950@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit v2: - use ASSERT() instead of btrfs_err() + -EUCLEAN - append ASSERTs in btrfs_add_delayed_data_ref() and btrfs_add_delayed_tree_ref() to validate action at insertion time instead of runtime - fold coding style fixes into this patch Signed-off-by: Adarsh Das --- fs/btrfs/delayed-ref.c | 8 ++++-- fs/btrfs/extent-tree.c | 62 ++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 3766ff29fbbb..d308c70228af 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -1113,7 +1113,9 @@ int btrfs_add_delayed_tree_ref(struct btrfs_trans_handle *trans, struct btrfs_ref *generic_ref, struct btrfs_delayed_extent_op *extent_op) { - ASSERT(generic_ref->type == BTRFS_REF_METADATA && generic_ref->action); + ASSERT(generic_ref->type == BTRFS_REF_METADATA && + (generic_ref->action == BTRFS_ADD_DELAYED_REF || + generic_ref->action == BTRFS_DROP_DELAYED_REF)); return add_delayed_ref(trans, generic_ref, extent_op, 0); } @@ -1124,7 +1126,9 @@ int btrfs_add_delayed_data_ref(struct btrfs_trans_handle *trans, struct btrfs_ref *generic_ref, u64 reserved) { - ASSERT(generic_ref->type == BTRFS_REF_DATA && generic_ref->action); + ASSERT(generic_ref->type == BTRFS_REF_DATA && + (generic_ref->action == BTRFS_ADD_DELAYED_REF || + generic_ref->action == BTRFS_DROP_DELAYED_REF)); return add_delayed_ref(trans, generic_ref, NULL, reserved); } diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 03cf9f242c70..98bdf51774c4 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -604,7 +604,7 @@ static noinline int remove_extent_data_ref(struct btrfs_trans_handle *trans, return -EUCLEAN; } - BUG_ON(num_refs < refs_to_drop); + ASSERT(num_refs >= refs_to_drop); num_refs -= refs_to_drop; if (num_refs == 0) { @@ -863,7 +863,7 @@ int lookup_inline_extent_backref(struct btrfs_trans_handle *trans, if (flags & BTRFS_EXTENT_FLAG_TREE_BLOCK && !skinny_metadata) { ptr += sizeof(struct btrfs_tree_block_info); - BUG_ON(ptr > end); + ASSERT(ptr <= end); } if (owner >= BTRFS_FIRST_FREE_OBJECTID) @@ -1237,7 +1237,7 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, { int ret = 0; - BUG_ON(!is_data && refs_to_drop != 1); + ASSERT(is_data || refs_to_drop == 1); if (iref) ret = update_inline_extent_backref(trans, path, iref, -refs_to_drop, NULL); @@ -1451,10 +1451,9 @@ int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info = trans->fs_info; int ret; - ASSERT(generic_ref->type != BTRFS_REF_NOT_SET && - generic_ref->action); - BUG_ON(generic_ref->type == BTRFS_REF_METADATA && - generic_ref->ref_root == BTRFS_TREE_LOG_OBJECTID); + ASSERT(generic_ref->type != BTRFS_REF_NOT_SET && generic_ref->action); + ASSERT(generic_ref->type != BTRFS_REF_METADATA || + generic_ref->ref_root != BTRFS_TREE_LOG_OBJECTID); if (generic_ref->type == BTRFS_REF_METADATA) ret = btrfs_add_delayed_tree_ref(trans, generic_ref, NULL); @@ -1621,8 +1620,6 @@ static int run_delayed_data_ref(struct btrfs_trans_handle *trans, ret = __btrfs_inc_extent_ref(trans, node, extent_op); } else if (node->action == BTRFS_DROP_DELAYED_REF) { ret = __btrfs_free_extent(trans, href, node, extent_op); - } else { - BUG(); } return ret; } @@ -1639,7 +1636,7 @@ static void __run_delayed_extent_op(struct btrfs_delayed_extent_op *extent_op, if (extent_op->update_key) { struct btrfs_tree_block_info *bi; - BUG_ON(!(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK)); + ASSERT(flags & BTRFS_EXTENT_FLAG_TREE_BLOCK); bi = (struct btrfs_tree_block_info *)(ei + 1); btrfs_set_tree_block_key(leaf, bi, &extent_op->key); } @@ -1774,8 +1771,6 @@ static int run_delayed_tree_ref(struct btrfs_trans_handle *trans, ret = drop_remap_tree_ref(trans, node); else ret = __btrfs_free_extent(trans, href, node, extent_op); - } else { - BUG(); } return ret; } @@ -2088,7 +2083,7 @@ static noinline int __btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, * head */ ret = cleanup_ref_head(trans, locked_ref, &bytes_processed); - if (ret > 0 ) { + if (ret > 0) { /* We dropped our lock, we need to loop. */ ret = 0; continue; @@ -2645,7 +2640,7 @@ int btrfs_pin_extent(struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes struct btrfs_block_group *cache; cache = btrfs_lookup_block_group(trans->fs_info, bytenr); - BUG_ON(!cache); /* Logic error */ + ASSERT(cache); pin_down_extent(trans, cache, bytenr, num_bytes, true); @@ -4119,20 +4114,25 @@ static int do_allocation(struct btrfs_block_group *block_group, struct find_free_extent_ctl *ffe_ctl, struct btrfs_block_group **bg_ret) { + ASSERT(ffe_ctl->policy == BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy == BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return do_allocation_clustered(block_group, ffe_ctl, bg_ret); case BTRFS_EXTENT_ALLOC_ZONED: return do_allocation_zoned(block_group, ffe_ctl, bg_ret); - default: - BUG(); } + return -EUCLEAN; } static void release_block_group(struct btrfs_block_group *block_group, struct find_free_extent_ctl *ffe_ctl, bool delalloc) { + ASSERT(btrfs_bg_flags_to_raid_index(block_group->flags) == + ffe_ctl->index); + ASSERT(ffe_ctl->policy == BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy == BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: ffe_ctl->retry_uncached = false; @@ -4140,12 +4140,8 @@ static void release_block_group(struct btrfs_block_group *block_group, case BTRFS_EXTENT_ALLOC_ZONED: /* Nothing to do */ break; - default: - BUG(); } - BUG_ON(btrfs_bg_flags_to_raid_index(block_group->flags) != - ffe_ctl->index); btrfs_release_block_group(block_group, delalloc); } @@ -4164,6 +4160,8 @@ static void found_extent_clustered(struct find_free_extent_ctl *ffe_ctl, static void found_extent(struct find_free_extent_ctl *ffe_ctl, struct btrfs_key *ins) { + ASSERT(ffe_ctl->policy == BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy == BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: found_extent_clustered(ffe_ctl, ins); @@ -4171,8 +4169,6 @@ static void found_extent(struct find_free_extent_ctl *ffe_ctl, case BTRFS_EXTENT_ALLOC_ZONED: /* Nothing to do */ break; - default: - BUG(); } } @@ -4232,14 +4228,15 @@ static int can_allocate_chunk_zoned(struct btrfs_fs_info *fs_info, static int can_allocate_chunk(struct btrfs_fs_info *fs_info, struct find_free_extent_ctl *ffe_ctl) { + ASSERT(ffe_ctl->policy == BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy == BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return 0; case BTRFS_EXTENT_ALLOC_ZONED: return can_allocate_chunk_zoned(fs_info, ffe_ctl); - default: - BUG(); } + return -EUCLEAN; } /* @@ -4310,8 +4307,7 @@ static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info, if (ret == -ENOSPC) { ret = 0; ffe_ctl->loop++; - } - else if (ret < 0) + } else if (ret < 0) btrfs_abort_transaction(trans, ret); else ret = 0; @@ -4441,15 +4437,16 @@ static int prepare_allocation(struct btrfs_fs_info *fs_info, struct btrfs_space_info *space_info, struct btrfs_key *ins) { + ASSERT(ffe_ctl->policy == BTRFS_EXTENT_ALLOC_CLUSTERED || + ffe_ctl->policy == BTRFS_EXTENT_ALLOC_ZONED); switch (ffe_ctl->policy) { case BTRFS_EXTENT_ALLOC_CLUSTERED: return prepare_allocation_clustered(fs_info, ffe_ctl, space_info, ins); case BTRFS_EXTENT_ALLOC_ZONED: return prepare_allocation_zoned(fs_info, ffe_ctl, space_info); - default: - BUG(); } + return -EUCLEAN; } /* @@ -5260,6 +5257,8 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, bool skinny_metadata = btrfs_fs_incompat(fs_info, SKINNY_METADATA); u64 owning_root; + ASSERT(parent <= 0); + #ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS if (btrfs_is_testing(fs_info)) { buf = btrfs_init_new_buffer(trans, root, root->alloc_bytenr, @@ -5292,8 +5291,7 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, parent = ins.objectid; flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF; owning_root = reloc_src_root; - } else - BUG_ON(parent > 0); + } if (root_objectid != BTRFS_TREE_LOG_OBJECTID) { struct btrfs_delayed_extent_op *extent_op; @@ -5633,7 +5631,7 @@ static int check_ref_exists(struct btrfs_trans_handle *trans, * If we get 0 then we found our reference, return 1, else * return the error if it's not -ENOENT; */ - return (ret < 0 ) ? ret : 1; + return (ret < 0) ? ret : 1; } /* @@ -6437,7 +6435,7 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, int parent_level; int ret = 0; - BUG_ON(btrfs_root_id(root) != BTRFS_TREE_RELOC_OBJECTID); + ASSERT(btrfs_root_id(root) == BTRFS_TREE_RELOC_OBJECTID); path = btrfs_alloc_path(); if (!path) -- 2.53.0