diff options
author | Satya Tangirala <satyat@google.com> | 2020-05-14 00:37:19 +0000 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2020-05-14 09:48:03 -0600 |
commit | d145dc23030bbf2de3a8ca5e0c29c2e568f69737 (patch) | |
tree | 31bdf741552b808cfe6ce79dbf191a5087486e06 /block/keyslot-manager.c | |
parent | a892c8d52c02284076fbbacae6692aa5c5807d11 (diff) | |
download | linux-stable-d145dc23030bbf2de3a8ca5e0c29c2e568f69737.tar.gz linux-stable-d145dc23030bbf2de3a8ca5e0c29c2e568f69737.tar.bz2 linux-stable-d145dc23030bbf2de3a8ca5e0c29c2e568f69737.zip |
block: Make blk-integrity preclude hardware inline encryption
Whenever a device supports blk-integrity, make the kernel pretend that
the device doesn't support inline encryption (essentially by setting the
keyslot manager in the request queue to NULL).
There's no hardware currently that supports both integrity and inline
encryption. However, it seems possible that there will be such hardware
in the near future (like the NVMe key per I/O support that might support
both inline encryption and PI).
But properly integrating both features is not trivial, and without
real hardware that implements both, it is difficult to tell if it will
be done correctly by the majority of hardware that support both.
So it seems best not to support both features together right now, and
to decide what to do at probe time.
Signed-off-by: Satya Tangirala <satyat@google.com>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/keyslot-manager.c')
-rw-r--r-- | block/keyslot-manager.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/block/keyslot-manager.c b/block/keyslot-manager.c index fcd3fd469d7c..c2ef41b3147b 100644 --- a/block/keyslot-manager.c +++ b/block/keyslot-manager.c @@ -25,6 +25,9 @@ * Upper layers will call blk_ksm_get_slot_for_key() to program a * key into some slot in the inline encryption hardware. */ + +#define pr_fmt(fmt) "blk-crypto: " fmt + #include <linux/keyslot-manager.h> #include <linux/atomic.h> #include <linux/mutex.h> @@ -376,3 +379,19 @@ void blk_ksm_destroy(struct blk_keyslot_manager *ksm) memzero_explicit(ksm, sizeof(*ksm)); } EXPORT_SYMBOL_GPL(blk_ksm_destroy); + +bool blk_ksm_register(struct blk_keyslot_manager *ksm, struct request_queue *q) +{ + if (blk_integrity_queue_supports_integrity(q)) { + pr_warn("Integrity and hardware inline encryption are not supported together. Disabling hardware inline encryption.\n"); + return false; + } + q->ksm = ksm; + return true; +} +EXPORT_SYMBOL_GPL(blk_ksm_register); + +void blk_ksm_unregister(struct request_queue *q) +{ + q->ksm = NULL; +} |