proxmox-mirrors/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs synced 2025-04-27 21:27:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix FDT rollback to not overwrite unnecessary fields (#17205)

Browse Source 
When a dedup write fails, we try to roll the DDT entry back to a known
good state. However, this also rolls the refcounts and the last-update
time back to the state they were at when we started this write. This
doesn't appear to be able to cause any refcount leaks (after the fix in
17123). This PR prevents that from happening by only rolling back the
parts of the DDT entry that have been updated by the write so far.

Sponsored-by: iXsystems, Inc.
Sponsored-by: Klara, Inc.

Signed-off-by: Paul Dagnelie <paul.dagnelie@klarasystems.com>
Co-authored-by: Paul Dagnelie <paul.dagnelie@klarasystems.com>

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
This commit is contained in:
Paul Dagnelie 2025-04-04 11:10:44 -07:00 committed by GitHub
parent c050b7315d
commit b14b3e3985
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/ddt.h
View File

@ -339,6 +339,8 @@ extern void ddt_bp_create(enum zio_checksum checksum, const ddt_key_t *ddk,
extern void ddt_phys_extend(ddt_univ_phys_t *ddp, ddt_phys_variant_t v,
const blkptr_t *bp);
extern void ddt_phys_unextend(ddt_univ_phys_t *cur, ddt_univ_phys_t *orig,
ddt_phys_variant_t v);
extern void ddt_phys_copy(ddt_univ_phys_t *dst, const ddt_univ_phys_t *src,
ddt_phys_variant_t v);
extern void ddt_phys_clear(ddt_univ_phys_t *ddp, ddt_phys_variant_t v);

21
module/zfs/ddt.c
View File

@ -731,6 +731,27 @@ ddt_phys_extend(ddt_univ_phys_t *ddp, ddt_phys_variant_t v, const blkptr_t *bp)
}
}
void
ddt_phys_unextend(ddt_univ_phys_t *cur, ddt_univ_phys_t *orig,
ddt_phys_variant_t v)
{
ASSERT3U(v, <, DDT_PHYS_NONE);
dva_t *cur_dvas = (v == DDT_PHYS_FLAT) ?
cur->ddp_flat.ddp_dva : cur->ddp_trad[v].ddp_dva;
dva_t *orig_dvas = (v == DDT_PHYS_FLAT) ?
orig->ddp_flat.ddp_dva : orig->ddp_trad[v].ddp_dva;
for (int d = 0; d < SPA_DVAS_PER_BP; d++)
cur_dvas[d] = orig_dvas[d];
if (ddt_phys_birth(orig, v) == 0) {
if (v == DDT_PHYS_FLAT)
cur->ddp_flat.ddp_phys_birth = 0;
else
cur->ddp_trad[v].ddp_phys_birth = 0;
}
}
void
ddt_phys_copy(ddt_univ_phys_t *dst, const ddt_univ_phys_t *src,
ddt_phys_variant_t v)

2
module/zfs/zio.c
View File

@ -3607,7 +3607,7 @@ zio_ddt_child_write_done(zio_t *zio)
* chain. We need to revert the entry back to what it was at
* the last time it was successfully extended.
*/
ddt_phys_copy(ddp, orig, v);
ddt_phys_unextend(ddp, orig, v);
ddt_phys_clear(orig, v);
ddt_exit(ddt);