linux-toradex.git/drivers/nvme, branch v6.7-rc2

nvme: keyring: fix conditional compilation

2023-11-08T16:07:08+00:00

The keyring and auth functions can be called from both the host and
the target side and are controlled by Kconfig options for each of the
combinations, but the declarations are controlled by #ifdef checks
on the shared Kconfig symbols.

This leads to link failures in combinations where one of the frontends
is built-in and the other one is a module, and the keyring code
ends up in a module that is not reachable from the builtin code:

ld: drivers/nvme/host/core.o: in function `nvme_core_exit':
core.c:(.exit.text+0x4): undefined reference to `nvme_keyring_exit'
ld: drivers/nvme/host/core.o: in function `nvme_core_init':
core.c:(.init.text+0x94): undefined reference to `nvme_keyring_init

ld: drivers/nvme/host/tcp.o: in function `nvme_tcp_setup_ctrl':
tcp.c:(.text+0x4c18): undefined reference to `nvme_tls_psk_default'

Address this by moving nvme_keyring_init()/nvme_keyring_exit() into
module init/exit functions for the keyring module.

Fixes: be8e82caa6859 ("nvme-tcp: enable TLS handshake upcall")
Signed-off-by: Hannes Reinecke 
Cc: Arnd Bergmann 
Reviewed-by: Christoph Hellwig 
Signed-off-by: Keith Busch

nvme: common: make keyring and auth separate modules

2023-11-07T18:05:15+00:00

When only the keyring module is included but auth is not, modpost
complains about the lack of a module license tag:

ERROR: modpost: missing MODULE_LICENSE() in drivers/nvme/common/nvme-common.o

Address this by making both modules buildable standalone,
removing the now unnecessary CONFIG_NVME_COMMON symbol
in the process.

Also, now that NVME_KEYRING config symbol can be either a module or
built-in, the stubs need to check for '#if IS_ENABLED' rather than a
simple '#ifdef'.

Fixes: 9d77eb5277849 ("nvme-keyring: register '.nvme' keyring")
Signed-off-by: Arnd Bergmann 
Signed-off-by: Hannes Reinecke 
Signed-off-by: Christoph Hellwig 
Signed-off-by: Keith Busch

nvme: start keep-alive after admin queue setup

2023-11-06T17:16:10+00:00

Setting up I/O queues might take quite some time on larger and/or
busy setups, so KATO might expire before all I/O queues could be
set up.
Fix this by start keep alive from the ->init_ctrl_finish() callback,
and stopping it when calling nvme_cancel_admin_tagset().

Signed-off-by: Hannes Reinecke 
Tested-by: Mark O'Donovan 
[fixed nvme-fc compile error]
Signed-off-by: Keith Busch

nvme-loop: always quiesce and cancel commands before destroying admin q

2023-11-06T17:00:15+00:00

Once ->init_ctrl_finish() is called there may be commands outstanding,
so we should quiesce the admin queue and cancel all commands prior
to call nvme_loop_destroy_admin_queue().

Signed-off-by: Hannes Reinecke 
Tested-by: Mark O'Donovan 
Signed-off-by: Keith Busch

nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue()

2023-11-06T17:00:13+00:00

nvme_tcp_setup_ctrl() has an open-coded version of
nvme_tcp_teardown_admin_queue().

Signed-off-by: Hannes Reinecke 
Tested-by: Mark O'Donovan 
Signed-off-by: Keith Busch

nvme-auth: always set valid seq_num in dhchap reply

2023-11-06T16:34:20+00:00

Currently a seqnum of zero is sent during uni-directional
authentication. The zero value is reserved for the secure channel
feature which is not yet implemented.

Relevant extract from the spec:
The value 0h is used to indicate that bidirectional authentication
is not performed, but a challenge value C2 is carried in order to
generate a pre-shared key (PSK) for subsequent establishment of a
secure channel

Signed-off-by: Mark O'Donovan 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Hannes Reinecke

nvme-auth: add flag for bi-directional auth

2023-11-06T16:34:17+00:00

Introduces an explicit variable for bi-directional auth.
The currently used variable chap->s2 is incorrectly zeroed for
uni-directional auth. That will be fixed in the next patch so this
needs to change to avoid sending unexpected success2 messages

Signed-off-by: Mark O'Donovan 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Hannes Reinecke

nvme-auth: auth success1 msg always includes resp

2023-11-06T16:34:15+00:00

In cases where RVALID is false, the response is still transmitted,
but is cleared to zero.

Relevant extract from the spec:
Response R2, if valid (i.e., if the RVALID field is set to 01h),
cleared to 0h otherwise

Signed-off-by: Mark O'Donovan 
Reviewed-by: Hannes Reinecke 
Reviewed-by: Sagi Grimberg 
Reviewed-by: Christoph Hellwig

nvme: fix error-handling for io_uring nvme-passthrough

2023-11-06T16:09:31+00:00

Driver may return an error before submitting the command to the device.
Ensure that such error is propagated up.

Fixes: 456cba386e94 ("nvme: wire-up uring-cmd support for io-passthru on char-device.")
Signed-off-by: Anuj Gupta 
Signed-off-by: Kanchan Joshi 
Reviewed-by: Niklas Cassel 
Reviewed-by: Christoph Hellwig 
Signed-off-by: Keith Busch

nvme: update firmware version after commit

2023-11-06T16:08:11+00:00

The firmware version sysfs entry needs to be updated after a successfully
firmware activation.

nvme-cli stopped issuing an Identify Controller command to list the
current firmware information and relies on sysfs showing the current
firmware version.

Reported-by: Kenji Tomonaga 
Signed-off-by: Daniel Wagner 
Tested-by: Kenji Tomonaga 
Reviewed-by: Christoph Hellwig 
Reviewed-by: Niklas Cassel 
[fixed off-by one afi index]
Signed-off-by: Keith Busch