Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

BRT: Relax brt_pending_apply() locking 

Since brt_pending_apply() is running in syncing context, no other
brt_pending_tree accesses are possible for the TXG.  We don't need
to acquire brt_pending_lock here.

Reviewed-by: Pawel Jakub Dawidek <pawel@dawidek.net>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Brian Atkinson <batkinson@lanl.gov>
Reviewed-by: Rob Norris <robn@despairlabs.com>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes #15955
This commit is contained in:
Alexander Motin 2024-03-25 17:59:55 -04:00 committed by GitHub
parent 80cc516295
commit 4616b96a64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module/zfs/brt.c
View File

@ -1473,26 +1473,23 @@ brt_pending_remove(spa_t *spa, const blkptr_t *bp, dmu_tx_t *tx)
void void
brt_pending_apply(spa_t *spa, uint64_t txg) brt_pending_apply(spa_t *spa, uint64_t txg)
{ {
brt_t *brt; brt_t *brt = spa->spa_brt;
brt_pending_entry_t *bpe; brt_pending_entry_t *bpe;
avl_tree_t *pending_tree; avl_tree_t *pending_tree;
kmutex_t *pending_lock;
void *c; void *c;
ASSERT3U(txg, !=, 0); ASSERT3U(txg, !=, 0);
brt = spa->spa_brt; /*
* We are in syncing context, so no other brt_pending_tree accesses
* are possible for the TXG. Don't need to acquire brt_pending_lock.
*/
pending_tree = &brt->brt_pending_tree[txg & TXG_MASK]; pending_tree = &brt->brt_pending_tree[txg & TXG_MASK];
pending_lock = &brt->brt_pending_lock[txg & TXG_MASK];
mutex_enter(pending_lock);
c = NULL; c = NULL;
while ((bpe = avl_destroy_nodes(pending_tree, &c)) != NULL) { while ((bpe = avl_destroy_nodes(pending_tree, &c)) != NULL) {
boolean_t added_to_ddt; boolean_t added_to_ddt;
mutex_exit(pending_lock);
for (int i = 0; i < bpe->bpe_count; i++) { for (int i = 0; i < bpe->bpe_count; i++) {
/* /*
* If the block has DEDUP bit set, it means that it * If the block has DEDUP bit set, it means that it
@ -1510,10 +1507,7 @@ brt_pending_apply(spa_t *spa, uint64_t txg)
} }
kmem_cache_free(brt_pending_entry_cache, bpe); kmem_cache_free(brt_pending_entry_cache, bpe);
mutex_enter(pending_lock);
} }
mutex_exit(pending_lock);
} }
static void static void