Commit 6715c98b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

blk-crypto: add a blk_crypto_config_supported_natively helper 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20221114042944.1009870-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent fce3caea

block/blk-crypto.c

+12 −9
Original line number Diff line number Diff line
@@ -267,7 +267,6 @@ bool __blk_crypto_bio_prep(struct bio **bio_ptr) 
{

	struct bio *bio = *bio_ptr;

	const struct blk_crypto_key *bc_key = bio->bi_crypt_context->bc_key;

	struct blk_crypto_profile *profile;



	/* Error if bio has no data. */

	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

	 * in falling back to the crypto API.

	 */

	profile = bdev_get_queue(bio->bi_bdev)->crypto_profile;

	if (__blk_crypto_cfg_supported(profile, &bc_key->crypto_cfg))

	if (blk_crypto_config_supported_natively(bio->bi_bdev,

						 &bc_key->crypto_cfg))

		return true;



	if (blk_crypto_fallback_bio_prep(bio_ptr))

		return true;

fail:
@@ -352,6 +350,13 @@ int blk_crypto_init_key(struct blk_crypto_key *blk_key, const u8 *raw_key, 
	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

 * 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)

{

	return IS_ENABLED(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) ||

	       __blk_crypto_cfg_supported(bdev_get_queue(bdev)->crypto_profile,

					  cfg);

	       blk_crypto_config_supported_natively(bdev, cfg);

}



/**
@@ -383,8 +387,7 @@ bool blk_crypto_config_supported(struct block_device *bdev, 
int blk_crypto_start_using_key(struct block_device *bdev,

			       const struct blk_crypto_key *key)

{

	if (__blk_crypto_cfg_supported(bdev_get_queue(bdev)->crypto_profile,

			&key->crypto_cfg))

	if (blk_crypto_config_supported_natively(bdev, &key->crypto_cfg))

		return 0;

	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);



	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);



	/*

fs/crypto/inline_crypt.c

+2 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * provides the key and IV to use.

 */



#include <linux/blk-crypto-profile.h>

#include <linux/blk-crypto.h>

#include <linux/blkdev.h>

#include <linux/buffer_head.h>

#include <linux/sched/mm.h>
@@ -77,10 +77,8 @@ static void fscrypt_log_blk_crypto_impl(struct fscrypt_mode *mode, 
	unsigned int 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) ||

		    __blk_crypto_cfg_supported(q->crypto_profile, cfg)) {

		    blk_crypto_config_supported_natively(devs[i], cfg)) {

			if (!xchg(&mode->logged_blk_crypto_native, 1))

				pr_info("fscrypt: %s using blk-crypto (native)\n",

					mode->friendly_name);

include/linux/blk-crypto.h

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ int blk_crypto_start_using_key(struct block_device *bdev, 
int blk_crypto_evict_key(struct block_device *bdev,

			 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,

				 const struct blk_crypto_config *cfg);