github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 12:11:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

smb: server: make use of smbdirect_socket.idle.immediate_work

Browse Source 
With this commit the server only uses struct smbdirect_socket!

It doesn't use the idle timer yet, but it will be added soon,
from there we'll be ready split common functions.

Cc: Namjae Jeon <linkinjeon@kernel.org>
Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
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-08-15 18:00:36 +02:00 committed by Steve French
parent d0b9b967b3
commit b8c7776583
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/smb/server/transport_rdma.c
View File

@ -91,8 +91,6 @@ struct smb_direct_transport {
struct ksmbd_transport transport;
struct smbdirect_socket socket;
struct work_struct send_immediate_work;
};
#define KSMBD_TRANS(t) (&(t)->transport)
@ -214,8 +212,6 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)
{
struct smbdirect_socket *sc =
container_of(work, struct smbdirect_socket, disconnect_work);
struct smb_direct_transport *t =
container_of(sc, struct smb_direct_transport, socket);
/*
* make sure this and other work is not queued again
@ -224,7 +220,7 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)
*/
disable_work(&sc->disconnect_work);
disable_work(&sc->recv_io.posted.refill_work);
disable_work(&t->send_immediate_work);
disable_work(&sc->idle.immediate_work);
switch (sc->status) {
case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED:
@ -270,9 +266,10 @@ smb_direct_disconnect_rdma_connection(struct smb_direct_transport *t)
static void smb_direct_send_immediate_work(struct work_struct *work)
{
struct smb_direct_transport *t = container_of(work,
struct smb_direct_transport, send_immediate_work);
struct smbdirect_socket *sc = &t->socket;
struct smbdirect_socket *sc =
container_of(work, struct smbdirect_socket, idle.immediate_work);
struct smb_direct_transport *t =
container_of(sc, struct smb_direct_transport, socket);
if (sc->status != SMBDIRECT_SOCKET_CONNECTED)
return;
@ -313,7 +310,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)
INIT_WORK(&sc->recv_io.posted.refill_work,
smb_direct_post_recv_credits);
INIT_WORK(&t->send_immediate_work, smb_direct_send_immediate_work);
INIT_WORK(&sc->idle.immediate_work, smb_direct_send_immediate_work);
conn = ksmbd_conn_alloc();
if (!conn)
@ -348,7 +345,7 @@ static void free_transport(struct smb_direct_transport *t)
wake_up_all(&sc->send_io.pending.zero_wait_queue);
disable_work_sync(&sc->recv_io.posted.refill_work);
disable_work_sync(&t->send_immediate_work);
disable_work_sync(&sc->idle.immediate_work);
if (sc->ib.qp) {
ib_drain_qp(sc->ib.qp);
@ -565,7 +562,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)
if (le16_to_cpu(data_transfer->flags) &
SMBDIRECT_FLAG_RESPONSE_REQUESTED)
queue_work(smb_direct_wq, &t->send_immediate_work);
queue_work(smb_direct_wq, &sc->idle.immediate_work);
if (atomic_read(&sc->send_io.credits.count) > 0)
wake_up(&sc->send_io.credits.wait_queue);
@ -781,7 +778,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work)
}
if (credits)
queue_work(smb_direct_wq, &t->send_immediate_work);
queue_work(smb_direct_wq, &sc->idle.immediate_work);
}
static void send_done(struct ib_cq *cq, struct ib_wc *wc)