Skip to content

zio: use a separate allocation for io_bp_copy and io_bp_orig #17637

New issue

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

#

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

Already on GitHub? # to your account

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

zio: use a separate allocation for io_bp_copy and io_bp_orig #17637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b22d109
zio: introduce zio_bp_cache
robn Aug 13, 2025
32e8a43
zio: make io_bp_copy be a separate allocation
robn Aug 13, 2025
b7b44a6
zio: make io_bp_orig a separate allocation
robn Aug 13, 2025
7b9e904
REVIEW ONLY: zio: add counters for total zio and bp allocations
robn Aug 13, 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
6 changes: 4 additions & 2 deletions include/sys/zio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ struct zio {
spa_t *io_spa;
blkptr_t *io_bp;
blkptr_t *io_bp_override;
blkptr_t io_bp_copy;
blkptr_t *io_bp_copy;
list_t io_parent_list;
list_t io_child_list;
zio_t *io_logical;
Expand All @@ -498,7 +498,7 @@ struct zio {
zio_done_func_t *io_done;
void *io_private;
int64_t io_prev_space_delta; /* DMU private */
blkptr_t io_bp_orig;
blkptr_t *io_bp_orig;
/* io_lsize != io_orig_size iff this is a raw write */
uint64_t io_lsize;

Expand Down Expand Up @@ -688,6 +688,8 @@ extern void zio_resume_wait(spa_t *spa);
extern int zfs_blkptr_verify(spa_t *spa, const blkptr_t *bp,
enum blk_config_flag blk_config, enum blk_verify_flag blk_verify);

extern void zio_force_bp(zio_t *zio, const blkptr_t *bp);

/*
* Initial setup and teardown.
*/
Expand Down
7 changes: 3 additions & 4 deletions module/zfs/arc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6985,7 +6985,7 @@ arc_write_done(zio_t *zio)
* buffers from the hash table when we arc_free().
*/
if (zio->io_flags & ZIO_FLAG_IO_REWRITE) {
if (!BP_EQUAL(&zio->io_bp_orig, zio->io_bp))
if (!BP_EQUAL(zio->io_bp_orig, zio->io_bp))
panic("bad overwrite, hdr=%p exists=%p",
(void *)hdr, (void *)exists);
ASSERT(zfs_refcount_is_zero(
Expand All @@ -6998,7 +6998,7 @@ arc_write_done(zio_t *zio)
} else if (zio->io_flags & ZIO_FLAG_NOPWRITE) {
/* nopwrite */
ASSERT(zio->io_prop.zp_nopwrite);
if (!BP_EQUAL(&zio->io_bp_orig, zio->io_bp))
if (!BP_EQUAL(zio->io_bp_orig, zio->io_bp))
panic("bad nopwrite, hdr=%p exists=%p",
(void *)hdr, (void *)exists);
} else {
Expand Down Expand Up @@ -8964,8 +8964,7 @@ l2arc_read_done(zio_t *zio)
*/
ASSERT(zio->io_abd == hdr->b_l1hdr.b_pabd ||
(HDR_HAS_RABD(hdr) && zio->io_abd == hdr->b_crypt_hdr.b_rabd));
zio->io_bp_copy = cb->l2rcb_bp; /* XXX fix in L2ARC 2.0 */
zio->io_bp = &zio->io_bp_copy; /* XXX fix in L2ARC 2.0 */
zio_force_bp(zio, &cb->l2rcb_bp); /* XXX fix in L2ARC 2.0 */
zio->io_prop.zp_complevel = hdr->b_complevel;

valid_cksum = arc_cksum_is_equal(hdr, zio);
Expand Down
8 changes: 4 additions & 4 deletions module/zfs/dbuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4667,10 +4667,10 @@ dbuf_lightweight_done(zio_t *zio)
dmu_tx_t *tx = os->os_synctx;

if (zio->io_flags & (ZIO_FLAG_IO_REWRITE | ZIO_FLAG_NOPWRITE)) {
ASSERT(BP_EQUAL(zio->io_bp, &zio->io_bp_orig));
ASSERT(BP_EQUAL(zio->io_bp, zio->io_bp_orig));
} else {
dsl_dataset_t *ds = os->os_dsl_dataset;
(void) dsl_dataset_block_kill(ds, &zio->io_bp_orig, tx, B_TRUE);
(void) dsl_dataset_block_kill(ds, zio->io_bp_orig, tx, B_TRUE);
dsl_dataset_block_born(ds, zio->io_bp, tx);
}

Expand Down Expand Up @@ -4929,7 +4929,7 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb)
dmu_buf_impl_t *db = vdb;
dnode_t *dn;
blkptr_t *bp = zio->io_bp;
blkptr_t *bp_orig = &zio->io_bp_orig;
blkptr_t *bp_orig = zio->io_bp_orig;
spa_t *spa = zio->io_spa;
int64_t delta;
uint64_t fill = 0;
Expand Down Expand Up @@ -5077,7 +5077,7 @@ dbuf_write_done(zio_t *zio, arc_buf_t *buf, void *vdb)
{
(void) buf;
dmu_buf_impl_t *db = vdb;
blkptr_t *bp_orig = &zio->io_bp_orig;
blkptr_t *bp_orig = zio->io_bp_orig;
blkptr_t *bp = db->db_blkptr;
objset_t *os = db->db_objset;
dmu_tx_t *tx = os->os_synctx;
Expand Down
4 changes: 2 additions & 2 deletions module/zfs/dmu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ dmu_sync_done(zio_t *zio, arc_buf_t *buf, void *varg)
dr->dt.dl.dr_nopwrite = !!(zio->io_flags & ZIO_FLAG_NOPWRITE);
if (dr->dt.dl.dr_nopwrite) {
blkptr_t *bp = zio->io_bp;
blkptr_t *bp_orig = &zio->io_bp_orig;
blkptr_t *bp_orig = zio->io_bp_orig;
uint8_t chksum = BP_GET_CHECKSUM(bp_orig);

ASSERT(BP_EQUAL(bp, bp_orig));
Expand Down Expand Up @@ -1963,7 +1963,7 @@ dmu_sync_late_arrival_done(zio_t *zio)
zil_lwb_add_block(zgd->zgd_lwb, zgd->zgd_bp);

if (!BP_IS_HOLE(bp)) {
blkptr_t *bp_orig __maybe_unused = &zio->io_bp_orig;
blkptr_t *bp_orig __maybe_unused = zio->io_bp_orig;
ASSERT(!(zio->io_flags & ZIO_FLAG_NOPWRITE));
ASSERT(BP_IS_HOLE(bp_orig) || !BP_EQUAL(bp, bp_orig));
ASSERT(BP_GET_BIRTH(zio->io_bp) == zio->io_txg);
Expand Down
2 changes: 1 addition & 1 deletion module/zfs/dmu_objset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,7 +1528,7 @@ dmu_objset_write_done(zio_t *zio, arc_buf_t *abuf, void *arg)
{
(void) abuf;
blkptr_t *bp = zio->io_bp;
blkptr_t *bp_orig = &zio->io_bp_orig;
blkptr_t *bp_orig = zio->io_bp_orig;
objset_t *os = arg;

if (zio->io_flags & ZIO_FLAG_IO_REWRITE) {
Expand Down
Loading
Loading