mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 10:37:35 +03:00
Add support for decryption faults in zinject
This patch adds the ability for zinject to trigger decryption and authentication faults in the ZIO and ARC layers. This functionality is exposed via the new "decrypt" error type, which may be provided for "data" object types. This patch also refactors some of the core encryption / decryption functions so that they have consistent prototypes, handle errors consistently, and do not have unused arguments. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes #7474
This commit is contained in:
committed by
Brian Behlendorf
parent
9464b9591e
commit
be9a5c355c
@@ -96,7 +96,7 @@ struct arc_callback {
|
||||
boolean_t acb_encrypted;
|
||||
boolean_t acb_compressed;
|
||||
boolean_t acb_noauth;
|
||||
uint64_t acb_dsobj;
|
||||
zbookmark_phys_t acb_zb;
|
||||
zio_t *acb_zio_dummy;
|
||||
zio_t *acb_zio_head;
|
||||
arc_callback_t *acb_next;
|
||||
|
||||
@@ -216,8 +216,9 @@ int spa_do_crypt_mac_abd(boolean_t generate, spa_t *spa, uint64_t dsobj,
|
||||
abd_t *abd, uint_t datalen, uint8_t *mac);
|
||||
int spa_do_crypt_objset_mac_abd(boolean_t generate, spa_t *spa, uint64_t dsobj,
|
||||
abd_t *abd, uint_t datalen, boolean_t byteswap);
|
||||
int spa_do_crypt_abd(boolean_t encrypt, spa_t *spa, uint64_t dsobj,
|
||||
const blkptr_t *bp, uint64_t txgid, uint_t datalen, abd_t *pabd,
|
||||
abd_t *cabd, uint8_t *iv, uint8_t *mac, uint8_t *salt, boolean_t *no_crypt);
|
||||
int spa_do_crypt_abd(boolean_t encrypt, spa_t *spa, const zbookmark_phys_t *zb,
|
||||
dmu_object_type_t ot, boolean_t dedup, boolean_t bswap, uint8_t *salt,
|
||||
uint8_t *iv, uint8_t *mac, uint_t datalen, abd_t *pabd, abd_t *cabd,
|
||||
boolean_t *no_crypt);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -391,6 +391,7 @@ typedef enum zinject_type {
|
||||
ZINJECT_IGNORED_WRITES,
|
||||
ZINJECT_PANIC,
|
||||
ZINJECT_DELAY_IO,
|
||||
ZINJECT_DECRYPT_FAULT,
|
||||
} zinject_type_t;
|
||||
|
||||
typedef struct zfs_share {
|
||||
|
||||
@@ -640,6 +640,8 @@ extern int zio_inject_list_next(int *id, char *name, size_t buflen,
|
||||
struct zinject_record *record);
|
||||
extern int zio_clear_fault(int id);
|
||||
extern void zio_handle_panic_injection(spa_t *spa, char *tag, uint64_t type);
|
||||
extern int zio_handle_decrypt_injection(spa_t *spa, const zbookmark_phys_t *zb,
|
||||
uint64_t type, int error);
|
||||
extern int zio_handle_fault_injection(zio_t *zio, int error);
|
||||
extern int zio_handle_device_injection(vdev_t *vd, zio_t *zio, int error);
|
||||
extern int zio_handle_device_injections(vdev_t *vd, zio_t *zio, int err1,
|
||||
|
||||
@@ -132,12 +132,13 @@ int zio_crypt_do_hmac(zio_crypt_key_t *key, uint8_t *data, uint_t datalen,
|
||||
uint8_t *digestbuf, uint_t digestlen);
|
||||
int zio_crypt_do_objset_hmacs(zio_crypt_key_t *key, void *data, uint_t datalen,
|
||||
boolean_t byteswap, uint8_t *portable_mac, uint8_t *local_mac);
|
||||
int zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key, uint8_t *salt,
|
||||
dmu_object_type_t ot, uint8_t *iv, uint8_t *mac, uint_t datalen,
|
||||
boolean_t byteswap, uint8_t *plainbuf, uint8_t *cipherbuf,
|
||||
int zio_do_crypt_data(boolean_t encrypt, zio_crypt_key_t *key,
|
||||
dmu_object_type_t ot, boolean_t byteswap, uint8_t *salt, uint8_t *iv,
|
||||
uint8_t *mac, uint_t datalen, uint8_t *plainbuf, uint8_t *cipherbuf,
|
||||
boolean_t *no_crypt);
|
||||
int zio_do_crypt_abd(boolean_t encrypt, zio_crypt_key_t *key,
|
||||
dmu_object_type_t ot, boolean_t byteswap, uint8_t *salt, uint8_t *iv,
|
||||
uint8_t *mac, uint_t datalen, abd_t *pabd, abd_t *cabd,
|
||||
boolean_t *no_crypt);
|
||||
int zio_do_crypt_abd(boolean_t encrypt, zio_crypt_key_t *key, uint8_t *salt,
|
||||
dmu_object_type_t ot, uint8_t *iv, uint8_t *mac, uint_t datalen,
|
||||
boolean_t byteswap, abd_t *pabd, abd_t *cabd, boolean_t *no_crypt);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user