diff options
| author | Tom Caputi <[email protected]> | 2017-09-28 11:49:13 -0400 |
|---|---|---|
| committer | Tom Caputi <[email protected]> | 2017-10-11 16:55:50 -0400 |
| commit | 440a3eb939441a42ab5029e5e64498d802fa276b (patch) | |
| tree | 5b2b958c6d4d96d4f4f9a930b0c291318fad51ff /include/sys/arc_impl.h | |
| parent | 4807c0badb130ae70cf6f0887b4be1648f217f1a (diff) | |
Fixes for #6639
Several issues were uncovered by running stress tests with zfs
encryption and raw sends in particular. The issues and their
associated fixes are as follows:
* arc_read_done() has the ability to chain several requests for
the same block of data via the arc_callback_t struct. In these
cases, the ARC would only use the first request's dsobj from
the bookmark to decrypt the data. This is problematic because
the first request might be a prefetch zio which is able to
handle the key not being loaded, while the second might use a
different key that it is sure will work. The fix here is to
pass the dsobj with each individual arc_callback_t so that each
request can attempt to decrypt the data separately.
* DRR_FREE and DRR_FREEOBJECT records in a send file were not
having their transactions properly tagged as raw during raw
sends, which caused a panic when the dbuf code attempted to
decrypt these blocks.
* traverse_prefetch_metadata() did not properly set
ZIO_FLAG_SPECULATIVE when issuing prefetch IOs.
* Added a few asserts and code cleanups to ensure these issues
are more detectable in the future.
Signed-off-by: Tom Caputi <[email protected]>
Diffstat (limited to 'include/sys/arc_impl.h')
| -rw-r--r-- | include/sys/arc_impl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sys/arc_impl.h b/include/sys/arc_impl.h index 361468583..e39cf6a8f 100644 --- a/include/sys/arc_impl.h +++ b/include/sys/arc_impl.h @@ -96,6 +96,7 @@ struct arc_callback { boolean_t acb_encrypted; boolean_t acb_compressed; boolean_t acb_noauth; + uint64_t acb_dsobj; zio_t *acb_zio_dummy; arc_callback_t *acb_next; }; |