android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blk-crypto: add a blk_crypto_config_supported_natively helper

Browse Source 
commit 6715c98b6cf003f26b1b2f655393134e9d999a05 upstream.

Add a blk_crypto_config_supported_natively helper that wraps
__blk_crypto_cfg_supported to retrieve the crypto_profile from the
request queue.  With this fscrypt can stop including
blk-crypto-profile.h and rely on the public consumer interface in
blk-crypto.h.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20221114042944.1009870-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christoph Hellwig 2023-05-03 20:54:12 -07:00 committed by Greg Kroah-Hartman
parent f0efb23651
commit 3aab3abb85
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
block/blk-crypto.c
View File

@ -267,7 +267,6 @@ bool __blk_crypto_bio_prep(struct bio **bio_ptr)
{ {
struct bio *bio = *bio_ptr; struct bio *bio = *bio_ptr;
const struct blk_crypto_key *bc_key = bio->bi_crypt_context->bc_key; const struct blk_crypto_key *bc_key = bio->bi_crypt_context->bc_key;
struct blk_crypto_profile *profile;
/* Error if bio has no data. */ /* Error if bio has no data. */
if (WARN_ON_ONCE(!bio_has_data(bio))) { if (WARN_ON_ONCE(!bio_has_data(bio))) {
@ -284,10 +283,9 @@ bool __blk_crypto_bio_prep(struct bio **bio_ptr)
* Success if device supports the encryption context, or if we succeeded * Success if device supports the encryption context, or if we succeeded
* in falling back to the crypto API. * in falling back to the crypto API.
*/ */
profile = bdev_get_queue(bio->bi_bdev)->crypto_profile; if (blk_crypto_config_supported_natively(bio->bi_bdev,
if (__blk_crypto_cfg_supported(profile, &bc_key->crypto_cfg)) &bc_key->crypto_cfg))
return true; return true;
if (blk_crypto_fallback_bio_prep(bio_ptr)) if (blk_crypto_fallback_bio_prep(bio_ptr))
return true; return true;
fail: fail:
@ -352,6 +350,13 @@ int blk_crypto_init_key(struct blk_crypto_key *blk_key, const u8 *raw_key,
return 0; return 0;
} }
bool blk_crypto_config_supported_natively(struct block_device *bdev,
const struct blk_crypto_config *cfg)
{
return __blk_crypto_cfg_supported(bdev_get_queue(bdev)->crypto_profile,
cfg);
}
/* /*
* Check if bios with @cfg can be en/decrypted by blk-crypto (i.e. either the * Check if bios with @cfg can be en/decrypted by blk-crypto (i.e. either the
* block_device it's submitted to supports inline crypto, or the * block_device it's submitted to supports inline crypto, or the
@ -361,8 +366,7 @@ bool blk_crypto_config_supported(struct block_device *bdev,
const struct blk_crypto_config *cfg) const struct blk_crypto_config *cfg)
{ {
return IS_ENABLED(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) || return IS_ENABLED(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) ||
__blk_crypto_cfg_supported(bdev_get_queue(bdev)->crypto_profile, blk_crypto_config_supported_natively(bdev, cfg);
cfg);
} }
/** /**
@ -383,8 +387,7 @@ bool blk_crypto_config_supported(struct block_device *bdev,
int blk_crypto_start_using_key(struct block_device *bdev, int blk_crypto_start_using_key(struct block_device *bdev,
const struct blk_crypto_key *key) const struct blk_crypto_key *key)
{ {
if (__blk_crypto_cfg_supported(bdev_get_queue(bdev)->crypto_profile, if (blk_crypto_config_supported_natively(bdev, &key->crypto_cfg))
&key->crypto_cfg))
return 0; return 0;
return blk_crypto_fallback_start_using_mode(key->crypto_cfg.crypto_mode); return blk_crypto_fallback_start_using_mode(key->crypto_cfg.crypto_mode);
} }
@ -407,7 +410,7 @@ int blk_crypto_evict_key(struct block_device *bdev,
{ {
struct request_queue *q = bdev_get_queue(bdev); struct request_queue *q = bdev_get_queue(bdev);
if (__blk_crypto_cfg_supported(q->crypto_profile, &key->crypto_cfg)) if (blk_crypto_config_supported_natively(bdev, &key->crypto_cfg))
return __blk_crypto_evict_key(q->crypto_profile, key); return __blk_crypto_evict_key(q->crypto_profile, key);
/* /*

6
fs/crypto/inline_crypt.c
View File

@ -12,7 +12,7 @@
* provides the key and IV to use. * provides the key and IV to use.
*/ */
#include <linux/blk-crypto-profile.h> #include <linux/blk-crypto.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
@ -77,10 +77,8 @@ static void fscrypt_log_blk_crypto_impl(struct fscrypt_mode *mode,
unsigned int i; unsigned int i;
for (i = 0; i < num_devs; i++) { for (i = 0; i < num_devs; i++) {
struct request_queue *q = bdev_get_queue(devs[i]);
if (!IS_ENABLED(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) || if (!IS_ENABLED(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) ||
__blk_crypto_cfg_supported(q->crypto_profile, cfg)) { blk_crypto_config_supported_natively(devs[i], cfg)) {
if (!xchg(&mode->logged_blk_crypto_native, 1)) if (!xchg(&mode->logged_blk_crypto_native, 1))
pr_info("fscrypt: %s using blk-crypto (native)\n", pr_info("fscrypt: %s using blk-crypto (native)\n",
mode->friendly_name); mode->friendly_name);

2
include/linux/blk-crypto.h
View File

@ -97,6 +97,8 @@ int blk_crypto_start_using_key(struct block_device *bdev,
int blk_crypto_evict_key(struct block_device *bdev, int blk_crypto_evict_key(struct block_device *bdev,
const struct blk_crypto_key *key); const struct blk_crypto_key *key);
bool blk_crypto_config_supported_natively(struct block_device *bdev,
const struct blk_crypto_config *cfg);
bool blk_crypto_config_supported(struct block_device *bdev, bool blk_crypto_config_supported(struct block_device *bdev,
const struct blk_crypto_config *cfg); const struct blk_crypto_config *cfg);