From mboxrd@z Thu Jan 1 00:00:00 1970 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 4FD26C77B7D for ; Sat, 20 May 2023 18:18:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230359AbjETSSA (ORCPT ); Sat, 20 May 2023 14:18:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229852AbjETSR5 (ORCPT ); Sat, 20 May 2023 14:17:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1069412B; Sat, 20 May 2023 11:17:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A0A7360AAD; Sat, 20 May 2023 18:17:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3809AC4339B; Sat, 20 May 2023 18:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684606675; bh=TnL+4ZgRxIJsxCrcCbEjd1jeOGSEhwG1saKzFJkMM8M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b7YMIfPFyVxgSEdzEWtdp44Vjs6oNo0qrY2oIdtyfchjnV8h81buB/cExwJKkmK5+ Mywv3rm9el5UNQLjHOr6+4TAolwHuU0joNzp8tVSkhWXFTdPdRmOnV4tDypEcwRJxL uc8NgUaiINQSEscclAgi3dVcFVf81RZR7fR3JTk5i97whz9sxTJqe0J3TMhgNq0c43 6nc1hZFma/nZer+Y3FO+URfpN+MSe9/2lJCgYM0D8pd1eoO5GswJx8ZCXeFsHnFgTJ y52d+iSOCFIN7NwjtGJLc7tVeqNkLHzIBBZ+KCRN7aYg31ex1CiE/QS5341PQH5tKX avt4Ax54NSenA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Filipe Manana , Qu Wenruo , David Sterba , Sasha Levin , clm@fb.com, josef@toxicpanda.com, linux-btrfs@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 02/18] btrfs: abort transaction when sibling keys check fails for leaves Date: Sat, 20 May 2023 14:17:34 -0400 Message-Id: <20230520181750.823365-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230520181750.823365-1-sashal@kernel.org> References: <20230520181750.823365-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Filipe Manana [ Upstream commit 9ae5afd02a03d4e22a17a9609b19400b77c36273 ] If the sibling keys check fails before we move keys from one sibling leaf to another, we are not aborting the transaction - we leave that to some higher level caller of btrfs_search_slot() (or anything else that uses it to insert items into a b+tree). This means that the transaction abort will provide a stack trace that omits the b+tree modification call chain. So change this to immediately abort the transaction and therefore get a more useful stack trace that shows us the call chain in the bt+tree modification code. It's also important to immediately abort the transaction just in case some higher level caller is not doing it, as this indicates a very serious corruption and we should stop the possibility of doing further damage. Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/ctree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 26bb10b6ca85d..986827370d8e1 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -3222,6 +3222,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root if (check_sibling_keys(left, right)) { ret = -EUCLEAN; + btrfs_abort_transaction(trans, ret); btrfs_tree_unlock(right); free_extent_buffer(right); return ret; @@ -3444,6 +3445,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root if (check_sibling_keys(left, right)) { ret = -EUCLEAN; + btrfs_abort_transaction(trans, ret); goto out; } return __push_leaf_left(trans, path, min_data_size, empty, left, -- 2.39.2