nvmet-tcp: always initialize tls_handshake_tmo_work
Subsystems (2)
PATCH v3 1/1 nvmet-tcp: always initialize tls_handshake_tmo_work
The TLS handshake timeout work item should always be initialized to avoid a crash when cancelling the workqueue.
--- drivers/nvme/target/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/target/tcp.c +3 -1
@@ -1856,6 +1856,8 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue) }return ret; } +#else +static void nvmet_tcp_tls_handshake_timeout (struct work_struct *w) {}#endif static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,
@@ -1913,9 +1915,9 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,list_add_tail (&queue->queue_list, &nvmet_tcp_queue_list);mutex_unlock (&nvmet_tcp_queue_mutex); -#ifdef CONFIG_NVME_TARGET_TCP_TLS INIT_DELAYED_WORK (&queue->tls_handshake_tmo_work, nvmet_tcp_tls_handshake_timeout); +#ifdef CONFIG_NVME_TARGET_TCP_TLS if (queue->state ==NVMET_TCP_Q_TLS_HANDSHAKE ) {struct sock *sk = queue->sock->sk;
Signature · 1 line
2.35.3
Confirmed below issue was fixed by this patch.
https://lore.kernel.org/linux-nvme/CAHj4cs_Lprbh1zWsJ2yT6+qhNoqjrGDrBgx+XOYvU9SLpmLTtw@mail.gmail.com/
Quoted 39 lines · Hannes Reinecke
The TLS handshake timeout work item should always be initialized to avoid a crash when cancelling the workqueue.
Fixes 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")Suggested-by Maurizio Lombardi <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>--- drivers/nvme/target/tcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/nvme/target/tcp.c +3
-2@@ -1856,6 +1856,8 @@ static int nvmet_tcp_tls_handshake(struct nvmet_tcp_queue *queue) }return ret; } +#else +static void nvmet_tcp_tls_handshake_timeout (struct work_struct *w) {}#endif static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,@@ -1913,9 +1915,9 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,list_add_tail (&queue->queue_list, &nvmet_tcp_queue_list);mutex_unlock (&nvmet_tcp_queue_mutex); -#ifdef CONFIG_NVME_TARGET_TCP_TLS INIT_DELAYED_WORK (&queue->tls_handshake_tmo_work, nvmet_tcp_tls_handshake_timeout); +#ifdef CONFIG_NVME_TARGET_TCP_TLS if (queue->state ==NVMET_TCP_Q_TLS_HANDSHAKE ) {struct sock *sk = queue->sock->sk; --2.35.3
Signature · 2 lines
Best Regards, Yi Zhang
Quoted 6 lines · Hannes Reinecke
The TLS handshake timeout work item should always be initialized to avoid a crash when cancelling the workqueue.
Fixes 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")Suggested-by Maurizio Lombardi <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>
I also confirmed that this patch fixes blktests nvme test group failures observed with tcp transport.
Keith Busch
maintainerQuoted 6 lines · Hannes Reinecke
The TLS handshake timeout work item should always be initialized to avoid a crash when cancelling the workqueue.
Fixes 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")Suggested-by Maurizio Lombardi <[email protected]>Signed-off-by Hannes Reinecke <[email protected]>
Applied for nvme-6.7, thanks!