nvme: rework NVME_AUTH Kconfig selection
Subsystems (2)
PATCH 1/1 nvme: rework NVME_AUTH Kconfig selection
Having a single Kconfig symbol NVME_AUTH conflates the selection of the authentication functions from nvme/common and nvme/host, causing kbuild robot to complain when building the nvme target only. So introduce a Kconfig symbol NVME_HOST_AUTH for the nvme host bits and use NVME_AUTH for the common functions only. And move the CRYPTO selection into nvme/common to make it easier to read.
--- drivers/nvme/common/Kconfig | 9 +++++++++ drivers/nvme/host/Kconfig | 9 ++------- drivers/nvme/host/Makefile | 2 +- drivers/nvme/host/core.c | 2 +- drivers/nvme/host/nvme.h | 4 ++-- drivers/nvme/host/sysfs.c | 6 +++--- drivers/nvme/target/Kconfig | 7 +------ 7 files changed, 19 insertions(+), 20 deletions(-)
drivers/nvme/common/Kconfig +9 -0
@@ -6,3 +6,12 @@ config NVME_COMMON config NVME_KEYRING bool select KEYS + +config NVME_AUTH + bool + select CRYPTO + select CRYPTO_HMAC + select CRYPTO_SHA256 + select CRYPTO_SHA512 + select CRYPTO_DH + select CRYPTO_DH_RFC7919_GROUPS
drivers/nvme/host/Kconfig +2 -7
@@ -107,16 +107,11 @@ config NVME_TCP_TLS If unsure, say N. -config NVME_AUTH +config NVME_HOST_AUTH bool "NVM Express over Fabrics In-Band Authentication" depends on NVME_CORE select NVME_COMMON - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_SHA256 - select CRYPTO_SHA512 - select CRYPTO_DH - select CRYPTO_DH_RFC7919_GROUPS + select NVME_AUTH help This provides support for NVMe over Fabrics In-Band Authentication.
drivers/nvme/host/Makefile +1 -1
@@ -17,7 +17,7 @@ nvme-core-$(CONFIG_NVME_MULTIPATH) += multipath.o nvme-core-$(CONFIG_BLK_DEV_ZONED) += zns.o nvme-core-$(CONFIG_FAULT_INJECTION_DEBUG_FS) += fault_inject.o nvme-core-$(CONFIG_NVME_HWMON) += hwmon.o -nvme-core-$(CONFIG_NVME_AUTH) += auth.o +nvme-core-$(CONFIG_NVME_HOST_AUTH) += auth.o nvme-y += pci.o
drivers/nvme/host/core.c +1 -1
@@ -421,7 +421,7 @@ void nvme_complete_rq(struct request *req)nvme_failover_req (req);return ;case AUTHENTICATE : -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH queue_work (nvme_wq, &ctrl->dhchap_auth_work);nvme_retry_req (req);#else
drivers/nvme/host/nvme.h +2 -2
@@ -349,7 +349,7 @@ struct nvme_ctrl {struct work_struct ana_work;#endif -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH struct work_struct dhchap_auth_work;struct mutex dhchap_auth_mutex;struct nvme_dhchap_queue_context *dhchap_ctxs;
@@ -1049,7 +1049,7 @@ static inline bool nvme_ctrl_sgl_supported(struct nvme_ctrl *ctrl)return ctrl->sgls & ((1 <<0 ) | (1 <<1 )); } -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH int __init nvme_init_auth (void ); void __exit nvme_exit_auth(void);int nvme_auth_init_ctrl (struct nvme_ctrl *ctrl);
drivers/nvme/host/sysfs.c +3 -3
@@ -409,7 +409,7 @@ static ssize_t dctype_show(struct device *dev, }static DEVICE_ATTR_RO (dctype); -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH static ssize_t nvme_ctrl_dhchap_secret_show (struct device *dev,struct device_attribute *attr,char *buf) {
@@ -563,7 +563,7 @@ static struct attribute *nvme_dev_attrs[] = { &dev_attr_kato.attr, &dev_attr_cntrltype.attr, &dev_attr_dctype.attr, -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH &dev_attr_dhchap_secret.attr, &dev_attr_dhchap_ctrl_secret.attr, #endif
@@ -593,7 +593,7 @@ static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj,return 0 ;if (a == &dev_attr_fast_io_fail_tmo.attr && !ctrl->opts)return 0 ; -#ifdef CONFIG_NVME_AUTH +#ifdef CONFIG_NVME_HOST_AUTH if (a == &dev_attr_dhchap_secret.attr && !ctrl->opts)return 0 ;if (a == &dev_attr_dhchap_ctrl_secret.attr && !ctrl->opts)
drivers/nvme/target/Kconfig +1 -6
@@ -103,12 +103,7 @@ config NVME_TARGET_AUTH bool "NVMe over Fabrics In-band Authentication support" depends on NVME_TARGET select NVME_COMMON - select CRYPTO - select CRYPTO_HMAC - select CRYPTO_SHA256 - select CRYPTO_SHA512 - select CRYPTO_DH - select CRYPTO_DH_RFC7919_GROUPS + select NVME_AUTH help This enables support for NVMe over Fabrics In-band Authentication
Signature · 1 line
2.35.3
Keith Busch
maintainerQuoted 11 lines · Hannes Reinecke
Having a single
KconfigsymbolNVME_AUTHconflates the selection of the authentication functions from nvme/common and nvme/host, causing kbuild robot to complain when building the nvme target only. So introduce aKconfigsymbolNVME_HOST_AUTHfor the nvme host bits and useNVME_AUTHfor the common functions only. And move the CRYPTO selection into nvme/common to make it easier to read.
Applie on nvme-6.7, thanks!