From: samho <samho@synology.com>
To: clm@fb.com, dsterba@suse.com
Cc: linux-btrfs@vger.kernel.org, Sam Ho <samho@synology.com>
Subject: [PATCH] btrfs: send: bail out on fatal signals during long-running operations
Date: Fri, 5 Jun 2026 07:02:01 +0000 [thread overview]
Message-ID: <20260605070201.3687844-1-samho@synology.com> (raw)
From: Sam Ho <samho@synology.com>
A send operation can run for a very long time, for example when sending
a large subvolume or one with a huge number of extents and shared
references. While running, the send ioctl spends most of its time in a
few tight loops that never check for pending signals, so the only points
where the task can react to a signal are the occasional memory
allocations down the call chain.
As a result, a user that starts a send and then tries to abort it, even
with a SIGKILL, can be left waiting for a long time (potentially minutes)
until the operation reaches one of those incidental cancellation points
or finishes on its own. The task stays in an uninterruptible-like state
from the user's point of view, which is surprising and inconvenient.
Fix this by adding explicit cancellation points that bail out with
-EINTR when a fatal signal is pending in the main long-running paths of
send:
1) changed_cb() - the per-item callback invoked for every key while
iterating the trees, used by both full and incremental sends. This
covers the main send loop.
2) send_extent_data() - the inner loop that writes out the data of a
single extent. A large extent is written in chunks without going back
through changed_cb(), so it needs its own check.
3) iterate_backrefs() - the callback invoked for every backref found
while resolving clone sources. Backref walking for a heavily shared
extent can be expensive and iterate over many references.
The returned -EINTR propagates up to the ioctl handler, which performs
the normal cleanup, so no resources are leaked.
We only check for fatal signals (fatal_signal_pending()) rather than any
pending signal, so that a send is not aborted by signals the caller may
legitimately use for other purposes, and to match the existing
convention used for cancelling balance and relocation (see
btrfs_should_cancel_balance()).
Signed-off-by: Sam Ho <samho@synology.com>
---
fs/btrfs/send.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 89d72d8cb85f..8e7b27146925 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1310,6 +1310,9 @@ static int iterate_backrefs(u64 ino, u64 offset, u64 num_bytes, u64 root_id,
struct backref_ctx *bctx = ctx_;
struct clone_root *clone_root;
+ if (fatal_signal_pending(current))
+ return -EINTR;
+
/* First check if the root is in the list of accepted clone sources */
clone_root = bsearch((void *)(uintptr_t)root_id, bctx->sctx->clone_roots,
bctx->sctx->clone_roots_cnt,
@@ -5701,6 +5704,9 @@ static int send_extent_data(struct send_ctx *sctx, struct btrfs_path *path,
u64 size = min(len - sent, read_size);
int ret;
+ if (fatal_signal_pending(current))
+ return -EINTR;
+
ret = send_write(sctx, offset + sent, size);
if (ret < 0)
return ret;
@@ -7181,6 +7187,9 @@ static int changed_cb(struct btrfs_path *left_path,
ASSERT(test_bit(EXTENT_BUFFER_UNMAPPED,
&right_path->nodes[0]->bflags));
+ if (fatal_signal_pending(current))
+ return -EINTR;
+
if (result == BTRFS_COMPARE_TREE_SAME) {
if (key->type == BTRFS_INODE_REF_KEY ||
key->type == BTRFS_INODE_EXTREF_KEY) {
--
2.34.1
reply other threads:[~2026-06-05 7:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20260605070201.3687844-1-samho@synology.com \
--to=samho@synology.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/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