diff options
| author | Paul Dagnelie <paulcd2000@gmail.com> | 2021-12-07 10:27:59 -0800 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2021-12-07 17:03:17 -0800 |
| commit | 1fbfc022c919ba2bec2985232f7ba5ad382cca96 (patch) | |
| tree | 87a237537984bce07cadc4c504bafe6a5f5b589a | |
| parent | 2a21853b75050e7381eefdc7ae0cd0da47805718 (diff) | |
ZFS send/recv with ashift 9->12 leads to data corruption
Improve the ability of zfs send to determine if a block is compressed
or not by using information contained in the blkptr.
Reviewed-by: Rich Ercolani <rincebrain@gmail.com>
Reviewed-by: Matthew Ahrens <matthew.ahrens@delphix.com>
Signed-off-by: Paul Dagnelie <pcd@delphix.com>
Closes #12770
| -rw-r--r-- | module/zfs/arc.c | 1 | ||||
| -rw-r--r-- | module/zfs/dmu_send.c | 23 |
2 files changed, 17 insertions, 7 deletions
diff --git a/module/zfs/arc.c b/module/zfs/arc.c index e70b37d4b..4f59d1616 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -2089,7 +2089,6 @@ arc_buf_fill(arc_buf_t *buf, spa_t *spa, const zbookmark_phys_t *zb, } else { ASSERT(hdr_compressed); ASSERT(!compressed); - ASSERT3U(HDR_GET_LSIZE(hdr), !=, HDR_GET_PSIZE(hdr)); /* * If the buf is sharing its data with the hdr, unlink it and diff --git a/module/zfs/dmu_send.c b/module/zfs/dmu_send.c index d65438223..52f01408e 100644 --- a/module/zfs/dmu_send.c +++ b/module/zfs/dmu_send.c @@ -165,6 +165,7 @@ struct send_range { kmutex_t lock; kcondvar_t cv; boolean_t io_outstanding; + boolean_t io_compressed; int io_err; } data; struct srh { @@ -450,7 +451,8 @@ dump_redact(dmu_send_cookie_t *dscp, uint64_t object, uint64_t offset, static int dmu_dump_write(dmu_send_cookie_t *dscp, dmu_object_type_t type, uint64_t object, - uint64_t offset, int lsize, int psize, const blkptr_t *bp, void *data) + uint64_t offset, int lsize, int psize, const blkptr_t *bp, + boolean_t io_compressed, void *data) { uint64_t payload_size; boolean_t raw = (dscp->dsc_featureflags & DMU_BACKUP_FEATURE_RAW); @@ -487,7 +489,10 @@ dmu_dump_write(dmu_send_cookie_t *dscp, dmu_object_type_t type, uint64_t object, drrw->drr_logical_size = lsize; /* only set the compression fields if the buf is compressed or raw */ - if (raw || lsize != psize) { + boolean_t compressed = + (bp != NULL ? BP_GET_COMPRESS(bp) != ZIO_COMPRESS_OFF && + io_compressed : lsize != psize); + if (raw || compressed) { ASSERT(raw || dscp->dsc_featureflags & DMU_BACKUP_FEATURE_COMPRESSED); ASSERT(!BP_IS_EMBEDDED(bp)); @@ -1014,7 +1019,8 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range) int n = MIN(srdp->datablksz, SPA_OLD_MAXBLOCKSIZE); err = dmu_dump_write(dscp, srdp->obj_type, - range->object, offset, n, n, NULL, data); + range->object, offset, n, n, NULL, B_FALSE, + data); offset += n; /* * When doing dry run, data==NULL is used as a @@ -1028,7 +1034,8 @@ do_dump(dmu_send_cookie_t *dscp, struct send_range *range) } else { err = dmu_dump_write(dscp, srdp->obj_type, range->object, offset, - srdp->datablksz, srdp->datasz, bp, data); + srdp->datablksz, srdp->datasz, bp, + srdp->io_compressed, data); } return (err); } @@ -1081,6 +1088,7 @@ range_alloc(enum type type, uint64_t object, uint64_t start_blkid, cv_init(&range->sru.data.cv, NULL, CV_DEFAULT, NULL); range->sru.data.io_outstanding = 0; range->sru.data.io_err = 0; + range->sru.data.io_compressed = B_FALSE; } return (range); } @@ -1646,10 +1654,13 @@ issue_data_read(struct send_reader_thread_arg *srta, struct send_range *range) enum zio_flag zioflags = ZIO_FLAG_CANFAIL; - if (srta->featureflags & DMU_BACKUP_FEATURE_RAW) + if (srta->featureflags & DMU_BACKUP_FEATURE_RAW) { zioflags |= ZIO_FLAG_RAW; - else if (request_compressed) + srdp->io_compressed = B_TRUE; + } else if (request_compressed) { zioflags |= ZIO_FLAG_RAW_COMPRESS; + srdp->io_compressed = B_TRUE; + } srdp->datasz = (zioflags & ZIO_FLAG_RAW_COMPRESS) ? BP_GET_PSIZE(bp) : BP_GET_LSIZE(bp); |