shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

blk-crypto: make blk_crypto_evict_key() return void

Browse Source 
commit 70493a63ba upstream.

blk_crypto_evict_key() is only called in contexts such as inode eviction
where failure is not an option.  So there is nothing the caller can do
with errors except log them.  (dm-table.c does "use" the error code, but
only to pass on to upper layers, so it doesn't really count.)

Just make blk_crypto_evict_key() return void and log errors itself.

Cc: stable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230315183907.53675-2-ebiggers@kernel.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Biggers
2023-05-03 21:03:28 -07:00
committed by Greg Kroah-Hartman
parent d206f79d9c
commit f8d9d6c3ff
3 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
block/blk-crypto.c
View File

@@ -13,6 +13,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/keyslot-manager.h> #include <linux/keyslot-manager.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/ratelimit.h>
#include <linux/slab.h> #include <linux/slab.h>
#include "blk-crypto-internal.h" #include "blk-crypto-internal.h"
@@ -393,20 +394,17 @@ int blk_crypto_start_using_key(const struct blk_crypto_key *key,
* Upper layers (filesystems) must call this function to ensure that a key is * Upper layers (filesystems) must call this function to ensure that a key is
* evicted from any hardware that it might have been programmed into. The key * evicted from any hardware that it might have been programmed into. The key
* must not be in use by any in-flight IO when this function is called. * must not be in use by any in-flight IO when this function is called.
*
* Return: 0 on success or if key is not present in the q's ksm, -err on error.
*/ */
int blk_crypto_evict_key(struct request_queue *q, void blk_crypto_evict_key(struct request_queue *q,
const struct blk_crypto_key *key) const struct blk_crypto_key *key)
{ {
if (blk_ksm_crypto_cfg_supported(q->ksm, &key->crypto_cfg)) int err;
return blk_ksm_evict_key(q->ksm, key);
/* if (blk_ksm_crypto_cfg_supported(q->ksm, &key->crypto_cfg))
* If the request queue's associated inline encryption hardware didn't err = blk_ksm_evict_key(q->ksm, key);
* have support for the key, then the key might have been programmed else
* into the fallback keyslot manager, so try to evict from there. err = blk_crypto_fallback_evict_key(key);
*/ if (err)
return blk_crypto_fallback_evict_key(key); pr_warn_ratelimited("error %d evicting key\n", err);
} }
EXPORT_SYMBOL_GPL(blk_crypto_evict_key); EXPORT_SYMBOL_GPL(blk_crypto_evict_key);

19
drivers/md/dm-table.c
View File

@@ -1191,21 +1191,12 @@ struct dm_keyslot_manager {
struct mapped_device *md; struct mapped_device *md;
}; };
struct dm_keyslot_evict_args {
const struct blk_crypto_key *key;
int err;
};
static int dm_keyslot_evict_callback(struct dm_target *ti, struct dm_dev *dev, static int dm_keyslot_evict_callback(struct dm_target *ti, struct dm_dev *dev,
sector_t start, sector_t len, void *data) sector_t start, sector_t len, void *data)
{ {
struct dm_keyslot_evict_args *args = data; const struct blk_crypto_key *key = data;
int err;
err = blk_crypto_evict_key(bdev_get_queue(dev->bdev), args->key); blk_crypto_evict_key(bdev_get_queue(dev->bdev), key);
if (!args->err)
args->err = err;
/* Always try to evict the key from all devices. */
return 0; return 0;
} }
@@ -1220,7 +1211,6 @@ static int dm_keyslot_evict(struct blk_keyslot_manager *ksm,
struct dm_keyslot_manager, struct dm_keyslot_manager,
ksm); ksm);
struct mapped_device *md = dksm->md; struct mapped_device *md = dksm->md;
struct dm_keyslot_evict_args args = { key };
struct dm_table *t; struct dm_table *t;
int srcu_idx; int srcu_idx;
int i; int i;
@@ -1233,10 +1223,11 @@ static int dm_keyslot_evict(struct blk_keyslot_manager *ksm,
ti = dm_table_get_target(t, i); ti = dm_table_get_target(t, i);
if (!ti->type->iterate_devices) if (!ti->type->iterate_devices)
continue; continue;
ti->type->iterate_devices(ti, dm_keyslot_evict_callback, &args); ti->type->iterate_devices(ti, dm_keyslot_evict_callback,
(void *)key);
} }
dm_put_live_table(md, srcu_idx); dm_put_live_table(md, srcu_idx);
return args.err; return 0;
} }
static const struct blk_ksm_ll_ops dm_ksm_ll_ops = { static const struct blk_ksm_ll_ops dm_ksm_ll_ops = {

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

@@ -97,8 +97,8 @@ int blk_crypto_init_key(struct blk_crypto_key *blk_key, const u8 *raw_key,
int blk_crypto_start_using_key(const struct blk_crypto_key *key, int blk_crypto_start_using_key(const struct blk_crypto_key *key,
struct request_queue *q); struct request_queue *q);
int blk_crypto_evict_key(struct request_queue *q, void blk_crypto_evict_key(struct request_queue *q,
const struct blk_crypto_key *key); const struct blk_crypto_key *key);
bool blk_crypto_config_supported(struct request_queue *q, bool blk_crypto_config_supported(struct request_queue *q,
const struct blk_crypto_config *cfg); const struct blk_crypto_config *cfg);