Commit 2d5a333e authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Keith Busch

nvme-tcp: fix link failure for TCP auth

The nvme fabric driver calls the nvme_tls_key_lookup() function from
nvmf_parse_key() when the keyring is enabled, but this is broken in a
configuration with CONFIG_NVME_FABRICS=y and CONFIG_NVME_TCP=m because
this leads to the function definition being in a loadable module:

x86_64-linux-ld: vmlinux.o: in function `nvmf_parse_key':
fabrics.c:(.text+0xb1bdec): undefined reference to `nvme_tls_key_lookup'

Move the 'select' up to CONFIG_NVME_FABRICS itself to force this
part to be built-in as well if needed.

Fixes: 5bc46b49 ("nvme-tcp: check for invalidated or revoked key")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 389e72c5
...@@ -41,6 +41,7 @@ config NVME_HWMON ...@@ -41,6 +41,7 @@ config NVME_HWMON
config NVME_FABRICS config NVME_FABRICS
select NVME_CORE select NVME_CORE
select NVME_KEYRING if NVME_TCP_TLS
tristate tristate
config NVME_RDMA config NVME_RDMA
...@@ -94,7 +95,6 @@ config NVME_TCP ...@@ -94,7 +95,6 @@ config NVME_TCP
config NVME_TCP_TLS config NVME_TCP_TLS
bool "NVMe over Fabrics TCP TLS encryption support" bool "NVMe over Fabrics TCP TLS encryption support"
depends on NVME_TCP depends on NVME_TCP
select NVME_KEYRING
select NET_HANDSHAKE select NET_HANDSHAKE
select KEYS select KEYS
help help
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment