smb: smbdirect: introduce smbdirect_socket_destroy[_sync]()

This will be used in common between client and server in
order to destroy all resources attached to a connection.

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
This commit is contained in:
Stefan Metzmacher 2025-10-13 16:13:15 +02:00 committed by Steve French
parent ea4151222a
commit 422a243669
4 changed files with 142 additions and 5 deletions

View File

@ -77,8 +77,6 @@ static u32 smbdirect_rdma_rw_send_wrs(struct ib_device *dev,
return factor * attr->cap.max_rdma_ctxs;
}
static void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc);
__maybe_unused /* this is temporary while this file is included in others */
static int smbdirect_connection_create_qp(struct smbdirect_socket *sc)
{
@ -258,8 +256,6 @@ static void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc)
}
}
static void smbdirect_connection_destroy_mem_pools(struct smbdirect_socket *sc);
__maybe_unused /* this is temporary while this file is included in others */
static int smbdirect_connection_create_mem_pools(struct smbdirect_socket *sc)
{

View File

@ -39,6 +39,14 @@ static int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc,
atomic_t *total_credits,
int needed);
static void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc);
static void smbdirect_connection_destroy_mem_pools(struct smbdirect_socket *sc);
static void smbdirect_connection_put_recv_io(struct smbdirect_recv_io *msg);
static void smbdirect_connection_idle_timer_work(struct work_struct *work);
static void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc);
#endif /* __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ */

View File

@ -6,7 +6,6 @@
#include "smbdirect_internal.h"
static void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc);
static void smbdirect_connection_mr_io_recovery_work(struct work_struct *work);
/*

View File

@ -251,6 +251,140 @@ static void smbdirect_socket_cleanup_work(struct work_struct *work)
smbdirect_socket_wake_up_all(sc);
}
static void smbdirect_socket_destroy(struct smbdirect_socket *sc)
{
struct smbdirect_recv_io *recv_io;
struct smbdirect_recv_io *recv_tmp;
LIST_HEAD(all_list);
unsigned long flags;
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"status=%s first_error=%1pe",
smbdirect_socket_status_string(sc->status),
SMBDIRECT_DEBUG_ERR_PTR(sc->first_error));
/*
* This should not never be called in an interrupt!
*/
WARN_ON_ONCE(in_interrupt());
if (sc->status == SMBDIRECT_SOCKET_DESTROYED)
return;
WARN_ONCE(sc->status != SMBDIRECT_SOCKET_DISCONNECTED,
"status=%s first_error=%1pe",
smbdirect_socket_status_string(sc->status),
SMBDIRECT_DEBUG_ERR_PTR(sc->first_error));
/*
* Wake up all waiters in all wait queues
* in order to notice the broken connection.
*
* Most likely this was already called via
* smbdirect_socket_cleanup_work(), but call it again...
*/
smbdirect_socket_wake_up_all(sc);
disable_work_sync(&sc->disconnect_work);
disable_work_sync(&sc->connect.work);
disable_work_sync(&sc->recv_io.posted.refill_work);
disable_work_sync(&sc->mr_io.recovery_work);
disable_work_sync(&sc->idle.immediate_work);
disable_delayed_work_sync(&sc->idle.timer_work);
if (sc->rdma.cm_id)
rdma_lock_handler(sc->rdma.cm_id);
if (sc->ib.qp) {
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"drain qp\n");
ib_drain_qp(sc->ib.qp);
}
/* It's not possible for upper layer to get to reassembly */
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"drain the reassembly queue\n");
spin_lock_irqsave(&sc->recv_io.reassembly.lock, flags);
list_splice_tail_init(&sc->recv_io.reassembly.list, &all_list);
spin_unlock_irqrestore(&sc->recv_io.reassembly.lock, flags);
list_for_each_entry_safe(recv_io, recv_tmp, &all_list, list)
smbdirect_connection_put_recv_io(recv_io);
sc->recv_io.reassembly.data_length = 0;
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"freeing mr list\n");
smbdirect_connection_destroy_mr_list(sc);
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"destroying qp\n");
smbdirect_connection_destroy_qp(sc);
if (sc->rdma.cm_id) {
rdma_unlock_handler(sc->rdma.cm_id);
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"destroying cm_id\n");
rdma_destroy_id(sc->rdma.cm_id);
sc->rdma.cm_id = NULL;
}
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"destroying mem pools\n");
smbdirect_connection_destroy_mem_pools(sc);
sc->status = SMBDIRECT_SOCKET_DESTROYED;
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"rdma session destroyed\n");
}
__maybe_unused /* this is temporary while this file is included in others */
static void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc)
{
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"status=%s first_error=%1pe",
smbdirect_socket_status_string(sc->status),
SMBDIRECT_DEBUG_ERR_PTR(sc->first_error));
/*
* This should not never be called in an interrupt!
*/
WARN_ON_ONCE(in_interrupt());
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"cancelling and disable disconnect_work\n");
disable_work_sync(&sc->disconnect_work);
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"destroying rdma session\n");
if (sc->status < SMBDIRECT_SOCKET_DISCONNECTING) {
/*
* SMBDIRECT_LOG_INFO is enough here
* as this is the typical case where
* we terminate the connection ourself.
*/
smbdirect_socket_schedule_cleanup_lvl(sc,
SMBDIRECT_LOG_INFO,
-ESHUTDOWN);
smbdirect_socket_cleanup_work(&sc->disconnect_work);
}
if (sc->status < SMBDIRECT_SOCKET_DISCONNECTED) {
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"wait for transport being disconnected\n");
wait_event(sc->status_wait, sc->status == SMBDIRECT_SOCKET_DISCONNECTED);
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"waited for transport being disconnected\n");
}
/*
* Once we reached SMBDIRECT_SOCKET_DISCONNECTED,
* we should call smbdirect_socket_destroy()
*/
smbdirect_socket_destroy(sc);
smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
"status=%s first_error=%1pe",
smbdirect_socket_status_string(sc->status),
SMBDIRECT_DEBUG_ERR_PTR(sc->first_error));
}
__maybe_unused /* this is temporary while this file is included in others */
static int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc,
enum smbdirect_socket_status expected_status,