Skip to content

More aggressively assert that db_mtx protects db.db_data #17209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

More aggressively assert that db_mtx protects db.db_data #17209

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a66ab3
More aggressively assert that db_mtx protects db.db_data
asomers Apr 1, 2025
7f572ec
Remove a db_mtx assertion in dmu_object_cached_size
asomers Apr 7, 2025
7151741
Refactor dbuf_hold_copy to eliminiate the db_rwlock
asomers Apr 30, 2025
37b48b9
Refactor dbuf_read_hole
asomers Apr 30, 2025
3460c6c
Apply @amotin's suggestions
asomers May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions module/zfs/dbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,28 +1437,30 @@
static int
dbuf_read_bonus(dmu_buf_impl_t *db, dnode_t *dn)
{
void* db_data;
int bonuslen, max_bonuslen;

bonuslen = MIN(dn->dn_bonuslen, dn->dn_phys->dn_bonuslen);
max_bonuslen = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots);
ASSERT(MUTEX_HELD(&db->db_mtx));
ASSERT(DB_DNODE_HELD(db));
ASSERT3U(bonuslen, <=, db->db.db_size);
db->db.db_data = kmem_alloc(max_bonuslen, KM_SLEEP);
db_data = kmem_alloc(max_bonuslen, KM_SLEEP);
arc_space_consume(max_bonuslen, ARC_SPACE_BONUS);
if (bonuslen < max_bonuslen)
memset(db->db.db_data, 0, max_bonuslen);
memset(db_data, 0, max_bonuslen);
if (bonuslen)
memcpy(db->db.db_data, DN_BONUS(dn->dn_phys), bonuslen);
memcpy(db_data, DN_BONUS(dn->dn_phys), bonuslen);
db->db.db_data = db_data;
db->db_state = DB_CACHED;
DTRACE_SET_STATE(db, "bonus buffer filled");
return (0);
}

static void
dbuf_handle_indirect_hole(dmu_buf_impl_t *db, dnode_t *dn, blkptr_t *dbbp)
dbuf_handle_indirect_hole(arc_buf_t *db_data, dnode_t *dn, blkptr_t *dbbp)
{
blkptr_t *bps = db->db.db_data;
blkptr_t *bps = (blkptr_t*)db_data;

Check failure on line 1463 in module/zfs/dbuf.c

View workflow job for this annotation

GitHub Actions / checkstyle 

missing space between type name and *
uint32_t indbs = 1ULL << dn->dn_indblkshift;
int n_bps = indbs >> SPA_BLKPTRSHIFT;

Expand All @@ -1483,6 +1485,7 @@
dbuf_read_hole(dmu_buf_impl_t *db, dnode_t *dn, blkptr_t *bp)
{
ASSERT(MUTEX_HELD(&db->db_mtx));
arc_buf_t *db_data;

int is_hole = bp == NULL || BP_IS_HOLE(bp);
/*
Expand All @@ -1495,13 +1498,14 @@
is_hole = dnode_block_freed(dn, db->db_blkid) || BP_IS_HOLE(bp);

if (is_hole) {
dbuf_set_data(db, dbuf_alloc_arcbuf(db));
memset(db->db.db_data, 0, db->db.db_size);
db_data = dbuf_alloc_arcbuf(db);
memset(db_data->b_data, 0, db->db.db_size);

if (bp != NULL && db->db_level > 0 && BP_IS_HOLE(bp) &&
BP_GET_LOGICAL_BIRTH(bp) != 0) {
dbuf_handle_indirect_hole(db, dn, bp);
dbuf_handle_indirect_hole(db_data->b_data, dn, bp);
}
dbuf_set_data(db, db_data);
db->db_state = DB_CACHED;
DTRACE_SET_STATE(db, "hole read satisfied");
return (0);
Expand Down Expand Up @@ -2520,6 +2524,7 @@
{
dmu_buf_impl_t *db = dr->dr_dbuf;

ASSERT(MUTEX_HELD(&db->db_mtx));
if (dr->dt.dl.dr_data != db->db.db_data) {
struct dnode *dn = dr->dr_dnode;
int max_bonuslen = DN_SLOTS_TO_BONUSLEN(dn->dn_num_slots);
Expand Down Expand Up @@ -3851,6 +3856,7 @@
{
dbuf_dirty_record_t *dr = db->db_data_pending;
arc_buf_t *data = dr->dt.dl.dr_data;
arc_buf_t *db_data;
enum zio_compress compress_type = arc_get_compression(data);
uint8_t complevel = arc_get_complevel(data);

Expand All @@ -3861,22 +3867,22 @@
uint8_t mac[ZIO_DATA_MAC_LEN];

arc_get_raw_params(data, &byteorder, salt, iv, mac);
dbuf_set_data(db, arc_alloc_raw_buf(dn->dn_objset->os_spa, db,
db_data = arc_alloc_raw_buf(dn->dn_objset->os_spa, db,
dmu_objset_id(dn->dn_objset), byteorder, salt, iv, mac,
dn->dn_type, arc_buf_size(data), arc_buf_lsize(data),
compress_type, complevel));
compress_type, complevel);
} else if (compress_type != ZIO_COMPRESS_OFF) {
dbuf_set_data(db, arc_alloc_compressed_buf(
db_data = arc_alloc_compressed_buf(
dn->dn_objset->os_spa, db, arc_buf_size(data),
arc_buf_lsize(data), compress_type, complevel));
arc_buf_lsize(data), compress_type, complevel);
} else {
dbuf_set_data(db, arc_alloc_buf(dn->dn_objset->os_spa, db,
DBUF_GET_BUFC_TYPE(db), db->db.db_size));
db_data = arc_alloc_buf(dn->dn_objset->os_spa, db,
DBUF_GET_BUFC_TYPE(db), db->db.db_size);
}
memcpy(db_data->b_data, data->b_data, arc_buf_size(data));

rw_enter(&db->db_rwlock, RW_WRITER);
memcpy(db->db.db_data, data->b_data, arc_buf_size(data));
rw_exit(&db->db_rwlock);
ASSERT(MUTEX_HELD(&db->db_mtx));
dbuf_set_data(db, db_data);
}

/*
Expand Down Expand Up @@ -3937,6 +3943,7 @@

if (db->db_buf != NULL) {
arc_buf_access(db->db_buf);
ASSERT(MUTEX_HELD(&db->db_mtx));
ASSERT3P(db->db.db_data, ==, db->db_buf->b_data);
}

Expand Down
4 changes: 3 additions & 1 deletion module/zfs/dmu_objset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2263,8 +2263,10 @@ dmu_objset_userquota_find_data(dmu_buf_impl_t *db, dmu_tx_t *tx)
dbuf_dirty_record_t *dr;
void *data;

if (db->db_dirtycnt == 0)
if (db->db_dirtycnt == 0) {
ASSERT(MUTEX_HELD(&db->db_mtx));
return (db->db.db_data); /* Nothing is changing */
}

dr = dbuf_find_dirty_eq(db, tx->tx_txg);

Expand Down
Loading