From: Benjamin Marzinski <bmarzins@redhat.com>
To: Qiliang Yuan <qiliang.yuan@linux.dev>,
Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@kernel.org>,
Mikulas Patocka <mpatocka@redhat.com>
Cc: dm-devel@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v2] dm thin: free thins with kfree_rcu() instead of waiting in thin_dtr()
Date: Thu, 19 Nov 2026 00:16:20 -0500 [thread overview]
Message-ID: <20261119051620.507189-1-bmarzins@redhat.com> (raw)
In-Reply-To: <20261116-bug-dm-thin-rcu-gp-v1-2-14ed3567da3e@linux.dev>
From: Qiliang Yuan <qiliang.yuan@linux.dev>
get_first_thin() and get_next_thin() find a thin on pool->active_thins
under rcu_read_lock() and take a reference on it. thin_dtr() removes the
thin from the list and waits for a grace period before dropping its own
reference, so that no walker takes one after the last is gone. Removing
a thin device thus waits for a full grace period in thin_dtr(), before
it waits for the references that are still held.
Additionally, thin_dtr() can take a thin off the active_thins list,
while it's being held by a worker. The refcount keeps it from being
deleted. But once the thin is removed from the list, there's nothing
that guarantees that tc->list.next is still meaningful. If "dmsetup
remove" is called on the thin device that is next in the active_thins
list, that thin_dtr() call can free the thin pointed to by the original
tc->list.next pointer. So when the worker calls get_next_thin(), it
will access freed memory.
Instead of removing thins from the active_thins list at the start of
thin_dtr(), mark them as dying. This keeps active_thins walkers from
grabbing them, while thin_dtr() waits for the refcount to drop to zero.
It's racy, but no more than removing the thin from the list was.
Also, take the references with refcount_inc_not_zero() and skip the
thins who are dying or whose last reference is gone, so that thin_dtr()
only waits for the references already taken. Free the thin with
kfree_rcu(), as requeue_bios() and error_retry_list_with_code() may
still look at it under rcu_read_lock().
Removing 100 thin devices of an idle pool with dmsetup remove takes per
device (mean of five rounds, min-max of the rounds in parentheses). The
queue freeze in del_gendisk() waits for a grace period of its own, which
the one in thin_dtr() used to overlap, so only part of it is saved:
before (ms) after (ms) change
16.9 (15.8-17.3) 14.4 (13.8-15.3) -15%
Fixes: 17181fb7a0c3 ("dm thin: fix a race in thin_dtr")
Signed-off-by: Qiliang Yuan <qiliang.yuan@linux.dev>
Co-developed-by: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---
Qiliang, does this version work for you? Could you rerun the timing?
I'm squashed my changes together with your patch, because my changes
depend on your patch to actually fix 17181fb7a0c3. I just moved the list
removal till after refcount drops to zero (which depends on your
refcount_inc_not_zero changes to be safe), and added a dying variable to
keep active_thins walkers from grabbing the thin, while thin_dtr() is
waiting for the existing holders to drop it (just like what removeing it
from the list did).
If people want this split into a fix and a feature patch, that's fine.
However, the feature patch would just be swapping the synchronize_rcu()
for kfree_rcu(), which seemed to me kind of pointless to move to a
separate patch.
drivers/md/dm-thin.c | 54 +++++++++++++++++++++++++++++---------------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index bdd250d1eb2e..e695fc356c4d 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -355,11 +355,17 @@ struct thin_c {
struct rb_root sort_bio_list; /* sorted list of deferred bios */
/*
- * Ensures the thin is not destroyed until the worker has finished
- * iterating the active_thins list.
+ * Ensures the thin stays on the active_thins list until the workers
+ * have moved past it while iterating the list.
*/
refcount_t refcount;
struct completion can_destroy;
+ struct rcu_head rcu;
+ /*
+ * Keeps new active_thin walkers from grabbing the table while
+ * thin_dtr() is waiting for the existing holders to finish.
+ */
+ bool dying;
};
/*----------------------------------------------------------------*/
@@ -652,8 +658,11 @@ static void error_retry_list_with_code(struct pool *pool, blk_status_t error)
struct thin_c *tc;
rcu_read_lock();
- list_for_each_entry_rcu(tc, &pool->active_thins, list)
+ list_for_each_entry_rcu(tc, &pool->active_thins, list) {
+ if (READ_ONCE(tc->dying))
+ continue;
error_thin_bio_list(tc, &tc->retry_on_resume_list, error);
+ }
rcu_read_unlock();
}
@@ -2318,25 +2327,29 @@ static void process_thin_deferred_cells(struct thin_c *tc)
} while (!list_empty(&cells));
}
-static void thin_get(struct thin_c *tc);
+static bool thin_tryget(struct thin_c *tc);
static void thin_put(struct thin_c *tc);
/*
* We can't hold rcu_read_lock() around code that can block. So we
* find a thin with the rcu lock held; bump a refcount; then drop
- * the lock.
+ * the lock. Skip the thins marked as dying or whose refcount thin_dtr()
+ * already dropped to zero.
*/
static struct thin_c *get_first_thin(struct pool *pool)
{
- struct thin_c *tc = NULL;
+ struct thin_c *tc;
rcu_read_lock();
- tc = list_first_or_null_rcu(&pool->active_thins, struct thin_c, list);
- if (tc)
- thin_get(tc);
+ list_for_each_entry_rcu(tc, &pool->active_thins, list) {
+ if (thin_tryget(tc)) {
+ rcu_read_unlock();
+ return tc;
+ }
+ }
rcu_read_unlock();
- return tc;
+ return NULL;
}
static struct thin_c *get_next_thin(struct pool *pool, struct thin_c *tc)
@@ -2345,7 +2358,8 @@ static struct thin_c *get_next_thin(struct pool *pool, struct thin_c *tc)
rcu_read_lock();
list_for_each_entry_continue_rcu(tc, &pool->active_thins, list) {
- thin_get(tc);
+ if (!thin_tryget(tc))
+ continue;
thin_put(old_tc);
rcu_read_unlock();
return tc;
@@ -2817,6 +2831,8 @@ static void requeue_bios(struct pool *pool)
rcu_read_lock();
list_for_each_entry_rcu(tc, &pool->active_thins, list) {
+ if (READ_ONCE(tc->dying))
+ continue;
spin_lock_irq(&tc->lock);
bio_list_merge(&tc->deferred_bio_list, &tc->retry_on_resume_list);
bio_list_init(&tc->retry_on_resume_list);
@@ -4131,9 +4147,9 @@ static struct target_type pool_target = {
* Thin target methods
*--------------------------------------------------------------
*/
-static void thin_get(struct thin_c *tc)
+static bool thin_tryget(struct thin_c *tc)
{
- refcount_inc(&tc->refcount);
+ return !READ_ONCE(tc->dying) && refcount_inc_not_zero(&tc->refcount);
}
static void thin_put(struct thin_c *tc)
@@ -4146,14 +4162,15 @@ static void thin_dtr(struct dm_target *ti)
{
struct thin_c *tc = ti->private;
- spin_lock_irq(&tc->pool->lock);
- list_del_rcu(&tc->list);
- spin_unlock_irq(&tc->pool->lock);
- synchronize_rcu();
+ WRITE_ONCE(tc->dying, true);
thin_put(tc);
wait_for_completion(&tc->can_destroy);
+ spin_lock_irq(&tc->pool->lock);
+ list_del_rcu(&tc->list);
+ spin_unlock_irq(&tc->pool->lock);
+
mutex_lock(&dm_thin_pool_table.mutex);
__pool_dec(tc->pool);
@@ -4161,7 +4178,8 @@ static void thin_dtr(struct dm_target *ti)
dm_put_device(ti, tc->pool_dev);
if (tc->origin_dev)
dm_put_device(ti, tc->origin_dev);
- kfree(tc);
+ /* Let RCU readers of active_thins finish with tc before freeing it */
+ kfree_rcu(tc, rcu);
mutex_unlock(&dm_thin_pool_table.mutex);
}
--
2.56.0
next prev parent reply other threads:[~2026-11-19 5:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 5:12 [PATCH 0/2] dm thin: stop waiting for grace periods when activating and removing thins Qiliang Yuan
2026-11-16 5:12 ` [PATCH 1/2] dm thin: drop the grace period from thin_ctr() Qiliang Yuan
2026-11-18 0:51 ` Benjamin Marzinski
2026-11-16 5:12 ` [PATCH 2/2] dm thin: free thins with kfree_rcu() instead of waiting in thin_dtr() Qiliang Yuan
2026-11-18 1:13 ` Benjamin Marzinski
2026-11-19 5:16 ` Benjamin Marzinski [this message]
2026-11-19 5:24 ` [PATCH 0/2] dm thin: stop waiting for grace periods when activating and removing thins Benjamin Marzinski
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=20261119051620.507189-1-bmarzins@redhat.com \
--to=bmarzins@redhat.com \
--cc=agk@redhat.com \
--cc=dm-devel@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=mpatocka@redhat.com \
--cc=qiliang.yuan@linux.dev \
--cc=snitzer@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
all inboxes | Powered by JetHome®