From: Jeff Layton <jlayton@kernel.org>
To: Chris Mason <clm@fb.com>, David Sterba <dsterba@suse.com>
Cc: Qu Wenruo <wqu@suse.com>,
linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-team@fb.com, Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v2 0/5] btrfs: handle -ENOMEM errors in some synchronous dirops without aborting
Date: Tue, 04 Aug 2026 11:44:32 -0400 [thread overview]
Message-ID: <20260804-btrfs-enomem-v2-0-4d923170e8c1@kernel.org> (raw)
We've had a (relatively small) number of ENOMEM btrfs aborts occur in
synchronous directory morphing codepaths. It's not terribly common, but
there are a few places where an memory allocation failure results in an
abort.
This patchset reworks the code to do the allocations up front, before the
point where we'd have to abort the fs if it fails.
This does not cover all potential cases where this can currently occur:
In particular, a rename that overwrites the target can still abort the
fs if a memory allocation fails. Fixing that is substantially more work,
unfortunately.
This also doesn't cover orphaning a new inode on failure (which can
trigger new memory allocations), so this series is designed to work in
conjunction with with Boris' GFP_NOFAIL series [1].
AFAICT, these are ancient problems, dating back at least to ~2011. I
didn't bother adding Fixes: tags.
AI disclosure: I made heavy use of an LLM in this patchset, from
drafting the initial series to helping test it.
[1] https://lore.kernel.org/linux-btrfs/cover.1784673567.git.boris@bur.io/
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Changes in v2:
- Use an on-stack btrfs_path in btrfs_insert_orphan_item() so the ENOMEM
recovery does not itself fail on a path allocation.
- Simplify the recovery in btrfs_create_new_inode() to rely on
btrfs_orphan_add()'s internal abort instead of aborting twice.
- Add ALLOW_ERROR_INJECTION() on btrfs_prealloc_delayed_dir_index() and a
new fstest (btrfs/341) to exercise the ENOMEM path.
- Link to v1: https://lore.kernel.org/r/20260717-btrfs-enomem-v1-0-cdc9c0e265d0@kernel.org
---
Jeff Layton (5):
btrfs: use an on-stack path in btrfs_insert_orphan_item()
btrfs: split btrfs_insert_delayed_dir_index() into prealloc and commit phases
btrfs: pre-allocate delayed dir index before btree modification
btrfs: handle ENOMEM from btrfs_insert_dir_item() without aborting
btrfs: pre-allocate delayed dir index for non-overwrite rename
fs/btrfs/btrfs_inode.h | 4 ++-
fs/btrfs/delayed-inode.c | 90 +++++++++++++++++++++++++++++++++++-------------
fs/btrfs/delayed-inode.h | 22 +++++++++---
fs/btrfs/dir-item.c | 30 ++++++++++++----
fs/btrfs/dir-item.h | 5 +--
fs/btrfs/inode.c | 57 ++++++++++++++++++++++++------
fs/btrfs/orphan.c | 11 +++---
fs/btrfs/transaction.c | 2 +-
fs/btrfs/tree-log.c | 4 +--
9 files changed, 168 insertions(+), 57 deletions(-)
---
base-commit: 76a2100a0e8d81636586449024e7558656300481
change-id: 20260715-btrfs-enomem-988f2cc36ffd
Best regards,
--
Jeff Layton <jlayton@kernel.org>
next reply other threads:[~2026-08-04 15:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-04 15:44 Jeff Layton [this message]
2026-08-04 15:44 ` [PATCH v2 1/5] btrfs: use an on-stack path in btrfs_insert_orphan_item() Jeff Layton
2026-08-04 23:18 ` Qu Wenruo
2026-08-04 15:44 ` [PATCH v2 2/5] btrfs: split btrfs_insert_delayed_dir_index() into prealloc and commit phases Jeff Layton
2026-08-04 23:14 ` Qu Wenruo
2026-08-05 11:54 ` Jeff Layton
2026-08-05 22:34 ` Qu Wenruo
2026-08-05 22:43 ` Jeff Layton
2026-08-04 15:44 ` [PATCH v2 3/5] btrfs: pre-allocate delayed dir index before btree modification Jeff Layton
2026-08-04 23:51 ` Qu Wenruo
2026-08-05 12:09 ` Jeff Layton
2026-08-04 15:44 ` [PATCH v2 4/5] btrfs: handle ENOMEM from btrfs_insert_dir_item() without aborting Jeff Layton
2026-08-04 15:44 ` [PATCH v2 5/5] btrfs: pre-allocate delayed dir index for non-overwrite rename Jeff Layton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260804-btrfs-enomem-v2-0-4d923170e8c1@kernel.org \
--to=jlayton@kernel.org \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wqu@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®