smb: smbdirect/client/server: make use of common structures
Subsystems (3)
Stefan Metzmacher
reviewerv4 cover smb: smbdirect/client/server: make use of common structures
Hi,
this is the next step towards a common smbdirect layer between cifs.ko and ksmbd.ko, with the aim to provide a socket layer for userspace usage at the end of the road.
Note the patchset is based on v6.17-rc3 plus the following
patches from sfrench-cifs-2.6/for-next:21d14611210d0bdf6b0c6db45c2361e96e6673d4
smb3 client: fix return code mapping of remap_file_range a21e20edf966db8d3e0e0748a9201fbd62fd961a
smb: client: Fix mount deadlock by avoiding super block iteration in DFS reconnect plus the client and server fixes for the IRD/ORD negotiation:
https://lore.kernel.org/linux-cifs/[email protected]/
https://lore.kernel.org/linux-cifs/[email protected]/
But only the IRD/ORD patches are really required in order to
apply the patchset. It can also be found as branch for-6.18/fs-smb-20250825-v4 in https://git.samba.org/metze/linux/wip.git, see
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250825-v4
This patchset introduces more common structures and elements to struct smbdirect_socket[_parameters]. (Patches 001-018)
The client side is modified in tiny steps in order to use the new common structures. At the end struct smbd_connection is only a simple container arround struct smbdirect_socket. For now I left
it that way in order to avoid changing the smb layer to use struct smbdirect_socket. In the end I'd like to expose only an anonymous structure to the smb layer and struct smbdirect_socket will become a private structure. (Patches 019-075). In between there are some fixes for the keepalive and timeout handling.
Note that 047 smb: client: make use of smbdirect_socket.statistics generates the following warnings from scripts/checkpatch.pl --quiet
WARNING: quoted string split across lines
#40: FILE: fs/smb/client/cifs_debug.c:464:
+ seq_printf(m, "\nDebug count_get_receive_buffer: %llx "
+ "count_put_receive_buffer: %llx count_send_empty: %llx",
WARNING: quoted string split across lines
#47: FILE: fs/smb/client/cifs_debug.c:469:
seq_printf(m, "\nRead Queue "
+ "count_enqueue_reassembly_queue: %llx "
WARNING: quoted string split across lines
#48: FILE: fs/smb/client/cifs_debug.c:470:
+ "count_enqueue_reassembly_queue: %llx "
+ "count_dequeue_reassembly_queue: %llx "
total: 0 errors, 3 warnings, 83 lines checked
scripts/checkpatch.pl: FAILED
But I left them in in order to keep the strange style like the other code before and after...
The server is also changed in tiny steps in order to make use of the common structures only. Patches 076-142. We only have this left at the end of the patchset:
struct smb_direct_transport {
struct ksmbd_transport transport;struct smbdirect_socket socket;
};
The server also got patches to implement keepalive and timeout handling in order to match the client code.
The client patches and server patches are independent from each other, but both need their own IRD/ORD negotiation fix plus the common smbdirect patches.
From here I'll start to split out common functions. In the first step as static __maybe_unused functions in a common smbdirect_connection.c file that will be included in client/smbdirect.c and server/transport_rdma.c. This is strange, but it will allow me to continue in tiny steps until only common code it used.
If it's too strange I can use a smbdirect_connection.h and rename it later from .h to .c
At that point I'll introduce an smbdirect.ko and export some public functions which will replace the include of the .c. Then I can finally start to add the struct socket/sock glue in order to provide smbdirect support to userspace.
I used the following xfstests as regression tests:
cifs/001 generic/001 generic/002 generic/005 generic/006 generic/007 generic/010 generic/011
Between cifs.ko against ksmbd.ko via siw.ko and also the client via siw.ko against Windows 2025 using a Chelsio T520-BT card. I tested the modules once before and after the applied patches and also the combination.
V4:
rebased on v6.17-rc3 and current sfrench-cifs-2.6/for-next A lot of additional patches are added in order to use struct smbdirect_socket almost everywhere.
V3:smbd_disconnect_rdma_work() needed to handle more than SMBDIRECT_SOCKET_CONNECTED in order to call rdma_disconnect.
V2:init_waitqueue_head(&info->status_wait); was moved to the beginning so that it is correctly initialized in smbd_create_id().
Stefan Metzmacher (142):
smb: smbdirect: introduce smbdirect_socket.status_wait
smb: smbdirect: introduce smbdirect_socket_init()
smb: smbdirect: introduce smbdirect_socket.disconnect_work
smb: smbdirect: introduce
smbdirect_socket.send_io.pending.{count,wait_queue}
smb: smbdirect: introduce
smbdirect_socket.send_io.credits.{count,wait_queue}
smb: smbdirect: introduce struct smbdirect_send_batch
smb: smbdirect: introduce smbdirect_socket.rw_io.credits
smb: smbdirect: introduce struct smbdirect_rw_io
smb: smbdirect: introduce smbdirect_socket.recv_io.{posted,credits}
smb: smbdirect: introduce
smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec
smb: smbdirect: introduce
smbdirect_socket_parameters.{initiator_depth,responder_resources}
smb: smbdirect: introduce smbdirect_socket.rdma.legacy_iwarp
smb: smbdirect: introduce
smbdirect_socket.idle.{keepalive,immediate_work,timer_work}
smb: smbdirect: introduce smbdirect_socket.statistics
smb: smbdirect: introduce smbdirect_socket.workqueue
smb: smbdirect: introduce struct smbdirect_mr_io
smb: smbdirect: introduce smbdirect_socket_parameters.max_frmr_depth
smb: smbdirect: introduce smbdirect_socket.mr_io.*
smb: client/smbdirect: replace SMBDIRECT_SOCKET_CONNECTING with more
detailed states
smb: client: use status_wait and SMBDIRECT_SOCKET_NEGOTIATE_RUNNING
for completion
smb: client: use status_wait and
SMBDIRECT_SOCKET_RESOLVE_{ADDR,ROUTE}_RUNNING for completion
smb: client: make use of smbdirect_socket.status_wait
smb: client: make only use of wake_up[_all]() in smbdirect.c
smb: client: make use of smbdirect_socket_init()
smb: client: make use of smbdirect_socket.disconnect_work
smb: client: make use of
smbdirect_socket.send_io.pending.{count,wait_queue}
smb: client: make use of
smbdirect_socket.send_io.credits.{count,wait_queue}
smb: client: make sure smbd_disconnect_rdma_work() doesn't run after
smbd_destroy() took over
smb: client: use disable[_delayed]_work_sync in smbdirect.c
smb: client: let smbd_destroy() call
disable_work_sync(&info->post_send_credits_work)
smb: client: queue post_recv_credits_work also if the peer raises the
credit target
smb: client: make use of ib_wc_status_msg() and skip
IB_WC_WR_FLUSH_ERR logging
smb: client: remove info->wait_receive_queues handling in
smbd_destroy()
smb: client: limit the range of info->receive_credit_target
smb: client: count the number of posted recv_io messages in order to
calculated credits
smb: client: make use of smbdirect_socket.recv_io.{posted,credits}
smb: client: remove useless smbd_connection.send_immediate
smb: client: fill smbdirect_socket_parameters at the beginning and use
the values from there
smb: client: make use of
smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec
smb: client: make use of
smbdirect_socket_parameters.{initiator_depth,responder_resources}
smb: client: make use of smbdirect_socket.rdma.legacy_iwarp
smb: client: send empty packets via send_immediate_work
smb: client: fix smbdirect keep alive handling to match the
documentation
smb: client: make use of
smbdirect_socket.idle.{keepalive,immediate_work,timer_work}
smb: client: remove unused smbd_connection->protocol
smb: client: remove unused smbd_connection.count_reassembly_queue
smb: client: make use of smbdirect_socket.statistics
smb: client: don't check sc->send_io.pending.count is below
sp->send_credit_target
smb: client: move rdma_readwrite_threshold from smbd_connection to
TCP_Server_Info
smb: client: make use of smbdirect_socket.workqueue
smb: client: add and use smbd_get_parameters()
smb: client: make use of struct smbdirect_mr_io
smb: client: make use of smbdirect_socket_parameters.max_frmr_depth
smb: client: make use of smbdirect_socket.mr_io
smb: client: pass struct smbdirect_socket to
{get,put}_receive_buffer()
smb: client: pass struct smbdirect_socket to
{allocate,destroy}_receive_buffers()
smb: client: pass struct smbdirect_socket to
{allocate,destroy}_caches_and_workqueue()
smb: client: pass struct smbdirect_socket to
{enqueue,_get_first}_reassembly()
smb: client: pass struct smbdirect_socket to
{allocate,destroy}_mr_list()
smb: client: pass struct smbdirect_socket to
smbd_disconnect_rdma_connection()
smb: client: pass struct smbdirect_socket to smbd_post_recv()
smb: client: pass struct smbdirect_socket to
manage_credits_prior_sending()
smb: client: pass struct smbdirect_socket to smbd_post_send()
smb: client: pass struct smbdirect_socket to
manage_keep_alive_before_sending()
smb: client: pass struct smbdirect_socket to smbd_post_send_iter()
smb: client: pass struct smbdirect_socket to smbd_post_send_empty()
smb: client: pass struct smbdirect_socket to
smbd_post_send_full_iter()
smb: client: pass struct smbdirect_socket to smbd_conn_upcall()
smb: client: pass struct smbdirect_socket to
smbd_qp_async_error_upcall()
smb: client: pass struct smbdirect_socket to smbd_create_id()
smb: client: pass struct smbdirect_socket to smbd_ia_open()
smb: client: pass struct smbdirect_socket to
smbd_post_send_negotiate_req()
smb: client: pass struct smbdirect_socket to smbd_negotiate()
smb: client: pass struct smbdirect_socket to get_mr()
smb: client: remove unused struct smbdirect_socket argument of
smbd_iter_to_mr()
smb: server: make use of common smbdirect_pdu.h
smb: server: make use of common smbdirect.h
smb: server: make use of common smbdirect_socket
smb: server: make use of common smbdirect_socket_parameters
smb: server: make use of smbdirect_socket->recv_io.expected
smb: server: make use of struct smbdirect_recv_io
smb: server: make use of smbdirect_socket.recv_io.free.{list,lock}
smb: server: make use of smbdirect_socket.recv_io.reassembly.*
smb: server: make use of SMBDIRECT_RECV_IO_MAX_SGE
smb: server: make use of struct smbdirect_send_io
smb: server: make use of
smbdirect_socket.{send,recv}_io.mem.{cache,pool}
smb: server: make only use of wake_up[_all]() in transport_rdma.c
smb: server: add a pr_info() when the server starts running
smb: server: don't use delayed_work for post_recv_credits_work
smb: server: queue post_recv_credits_work in put_recvmsg() and avoid
count_avail_recvmsg
smb: server: make use of smbdirect_socket.status_wait
smb: server: only turn into SMBDIRECT_SOCKET_CONNECTED when
negotiation is done
smb: server: use disable_work_sync in transport_rdma.c
smb: server: move smb_direct_disconnect_rdma_work() into
free_transport()
smb: server: don't wait for info->send_pending == 0 on error
smb: server: make use of smbdirect_socket_init()
smb: server: make use of smbdirect_socket.disconnect_work
smb: server: make use of
smbdirect_socket.send_io.pending.{count,wait_queue}
smb: server: make use of
smbdirect_socket.send_io.credits.{count,wait_queue}
smb: server: make use of struct smbdirect_send_batch
smb: server: make use smbdirect_socket.rw_io.credits
smb: server: make use of struct smbdirect_rw_io
smb: server: take the recv_credit_target from the negotiate req and
always limit the range
smb: server: manage recv credits by counting posted recv_io and
granted credits
smb: server: make use of smbdirect_socket.recv_io.{posted,credits}
smb: server: replace smb_trans_direct_transfort() with SMBD_TRANS()
smb: server: remove useless casts from KSMBD_TRANS/SMBD_TRANS
smb: server: pass ksmbd_transport to get_smbd_max_read_write_size()
smb: server: fill smbdirect_socket_parameters at the beginning and use
the values from there
smb: server: make use of
smbdirect_socket_parameters.negotiate_timeout_msec and change to 5s
smb: server: make use of
smbdirect_socket_parameters.{initiator_depth,responder_resources} smb: server: make use of smbdirect_socket.rdma.legacy_iwarp
smb: server: make use of smbdirect_socket.idle.immediate_work
smb: server: implement correct keepalive and timeout handling for
smbdirect
smb: server: make use of smbdirect_socket.workqueue
smb: server: pass struct smbdirect_socket to {get_free,put}_recvmsg()
smb: server: pass struct smbdirect_socket to
smb_direct_{create,destroy}_pools()
smb: server: pass struct smbdirect_socket to
smb_direct_get_max_fr_pages()
smb: server: pass struct smbdirect_socket to smb_direct_init_params()
smb: server: pass struct smbdirect_socket to
smb_direct_disconnect_rdma_connection()
smb: server: pass struct smbdirect_socket to smb_direct_cm_handler()
smb: server: pass struct smbdirect_socket to
smb_direct_qpair_handler()
smb: server: pass struct smbdirect_socket to smb_direct_create_qpair()
smb: server: pass struct smbdirect_socket to smb_direct_post_recv()
smb: server: pass struct smbdirect_socket to
smb_direct_accept_client()
smb: server: pass struct smbdirect_socket to
smb_direct_prepare_negotiation()
smb: server: pass struct smbdirect_socket to smb_direct_connect()
smb: server: pass struct smbdirect_socket to
smb_direct_{alloc,free}_sendmsg()
smb: server: remove unused struct struct smb_direct_transport argument
from smb_direct_send_ctx_init()
smb: server: pass struct smbdirect_socket to smb_direct_post_send()
smb: server: pass struct smbdirect_socket to
smb_direct_flush_send_list()
smb: server: pass struct smbdirect_socket to wait_for_credits()
smb: server: pass struct smbdirect_socket to wait_for_send_credits()
smb: server: pass struct smbdirect_socket to wait_for_rw_credits()
smb: server: pass struct smbdirect_socket to calc_rw_credits()
smb: server: pass struct smbdirect_socket to
manage_credits_prior_sending()
smb: server: pass struct smbdirect_socket to
manage_keep_alive_before_sending()
smb: server: pass struct smbdirect_socket to
smb_direct_create_header()
smb: server: pass struct smbdirect_socket to post_sendmsg()
smb: server: pass struct smbdirect_socket to
smb_direct_post_send_data()
smb: server: pass struct smbdirect_socket to
{enqueue,get_first}_reassembly()
smb: server: pass struct smbdirect_socket to
smb_direct_send_negotiate_response()
fs/smb/client/cifs_debug.c | 48 +- fs/smb/client/cifsglob.h | 9 +- fs/smb/client/file.c | 16 +- fs/smb/client/smb2ops.c | 8 +- fs/smb/client/smb2pdu.c | 2 +- fs/smb/client/smbdirect.c | 943 +++++++------ fs/smb/client/smbdirect.h | 104 +- fs/smb/common/smbdirect/smbdirect.h | 7 + fs/smb/common/smbdirect/smbdirect_socket.h | 242 +++- fs/smb/server/connection.c | 4 +- fs/smb/server/connection.h | 10 +- fs/smb/server/server.c | 1 + fs/smb/server/smb2pdu.c | 23 +- fs/smb/server/smb2pdu.h | 6 - fs/smb/server/transport_rdma.c | 1434 ++++++++++---------- fs/smb/server/transport_rdma.h | 45 +- 16 files changed, 1565 insertions(+), 1337 deletions(-)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 1/142 smb: smbdirect: introduce smbdirect_socket.status_wait
This will be used by server and client soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 1 + 1 file changed, 1 insertion(+)
fs/smb/common/smbdirect/smbdirect_socket.h +1 -0
@@ -18,6 +18,7 @@ enum smbdirect_socket_status {struct smbdirect_socket {enum smbdirect_socket_status status; +wait_queue_head_t status_wait;/* RDMA related */ struct {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 2/142 smb: smbdirect: introduce smbdirect_socket_init()
In reply to Stefan MetzmacherThis will make it easier to keep the initialization in a single place.
For now it's an __always_inline function as we only share the header files. Once move to common functions we'll have a dedicated smbdirect.ko that exports functions...
--- fs/smb/common/smbdirect/smbdirect_socket.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +16 -0
@@ -113,6 +113,22 @@ struct smbdirect_socket { } recv_io; }; +static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) +{ + *sc = (struct smbdirect_socket ) { + .status =SMBDIRECT_SOCKET_CREATED , + }; + +init_waitqueue_head (&sc->status_wait); + +INIT_LIST_HEAD (&sc->recv_io.free.list); +spin_lock_init (&sc->recv_io.free.lock); + +INIT_LIST_HEAD (&sc->recv_io.reassembly.list); +spin_lock_init (&sc->recv_io.reassembly.lock); +init_waitqueue_head (&sc->recv_io.reassembly.wait_queue); +} +struct smbdirect_send_io {struct smbdirect_socket *socket;struct ib_cqe cqe;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 3/142 smb: smbdirect: introduce smbdirect_socket.disconnect_work
In reply to Stefan Metzmacher--- fs/smb/common/smbdirect/smbdirect_socket.h | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +2 -0
@@ -20,6 +20,8 @@ struct smbdirect_socket {enum smbdirect_socket_status status;wait_queue_head_t status_wait; +struct work_struct disconnect_work; +/* RDMA related */ struct {struct rdma_cm_id *cm_id;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 4/142 smb: smbdirect: introduce smbdirect_socket.send_io.pending.{count,wait_queue}
In reply to Stefan MetzmacherThis will be shared between client and server soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +11 -0
@@ -54,6 +54,14 @@ struct smbdirect_socket {struct kmem_cache *cache;mempool_t *pool; } mem; + +/* +* The state about posted/pending sends +*/ +struct { +atomic_t count; +wait_queue_head_t wait_queue; + } pending; } send_io;/*
@@ -123,6 +131,9 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)init_waitqueue_head (&sc->status_wait); +atomic_set (&sc->send_io.pending.count,0 ); +init_waitqueue_head (&sc->send_io.pending.wait_queue); +INIT_LIST_HEAD (&sc->recv_io.free.list);spin_lock_init (&sc->recv_io.free.lock);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 5/142 smb: smbdirect: introduce smbdirect_socket.send_io.credits.{count,wait_queue}
In reply to Stefan MetzmacherThis will be shared between client and server soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +11 -0
@@ -55,6 +55,14 @@ struct smbdirect_socket {mempool_t *pool; } mem; +/* +* The credit state for the send side +*/ +struct { +atomic_t count; +wait_queue_head_t wait_queue; + } credits; +/* * The state about posted/pending sends */
@@ -131,6 +139,9 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)init_waitqueue_head (&sc->status_wait); +atomic_set (&sc->send_io.credits.count,0 ); +init_waitqueue_head (&sc->send_io.credits.wait_queue); +atomic_set (&sc->send_io.pending.count,0 );init_waitqueue_head (&sc->send_io.pending.wait_queue);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 6/142 smb: smbdirect: introduce struct smbdirect_send_batch
In reply to Stefan MetzmacherThis will replace struct smb_direct_send_ctx in the server and allow us move code to the common smbdirect layer soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +17 -0
@@ -177,6 +177,23 @@ struct smbdirect_send_io {u8 packet[]; }; +struct smbdirect_send_batch { +/* +* List of smbdirect_send_io messages +*/ +struct list_head msg_list; +/* +* Number of list entries +*/ +size_t wr_cnt; + +/* +* Possible remote key invalidation state +*/ +bool need_invalidate_rkey; +u32 remote_key; +}; +struct smbdirect_recv_io {struct smbdirect_socket *socket;struct ib_cqe cqe;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 7/142 smb: smbdirect: introduce smbdirect_socket.rw_io.credits
In reply to Stefan MetzmacherThis will be used by the server to manage the state for RDMA read/write requests.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +24 -0
@@ -129,6 +129,27 @@ struct smbdirect_socket {bool full_packet_received; } reassembly; } recv_io; + +/* +* The state for RDMA read/write requests on the server +*/ +struct { +/* +* The credit state for the send side +*/ +struct { +/* +* The maximum number of rw credits +*/ +size_t max; +/* +* The number of pages per credit +*/ +size_t num_pages; +atomic_t count; +wait_queue_head_t wait_queue; + } credits; + } rw_io; }; static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)
@@ -151,6 +172,9 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)INIT_LIST_HEAD (&sc->recv_io.reassembly.list);spin_lock_init (&sc->recv_io.reassembly.lock);init_waitqueue_head (&sc->recv_io.reassembly.wait_queue); + +atomic_set (&sc->rw_io.credits.count,0 ); +init_waitqueue_head (&sc->rw_io.credits.wait_queue); }struct smbdirect_send_io {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 8/142 smb: smbdirect: introduce struct smbdirect_rw_io
In reply to Stefan MetzmacherThis will be used by the server in order to manage RDMA reads and writes.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +16 -0
@@ -6,6 +6,8 @@#ifndef __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_SOCKET_H__#define __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_SOCKET_H__ +#include <rdma/rw.h> +enum smbdirect_socket_status {SMBDIRECT_SOCKET_CREATED , SMBDIRECT_SOCKET_CONNECTING,
@@ -240,4 +242,18 @@ struct smbdirect_recv_io { u8 packet[]; }; +struct smbdirect_rw_io { +struct smbdirect_socket *socket; +struct ib_cqe cqe; + +struct list_head list; + +int error; +struct completion *completion; + +struct rdma_rw_ctx rdma_ctx; +struct sg_table sgt; +struct scatterlist sg_list[]; +}; +#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_SOCKET_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 9/142 smb: smbdirect: introduce smbdirect_socket.recv_io.{posted,credits}
In reply to Stefan MetzmacherThis will be used by client and server soon in order to maintain the state of posted recv_io messages and granted credits.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +21 -0
@@ -105,6 +105,23 @@ struct smbdirect_socket {spinlock_t lock; } free; +/* +* The state for posted recv_io messages +* and the refill work struct. +*/ +struct { +atomic_t count; +struct work_struct refill_work; + } posted; + +/* +* The credit state for the recv side +*/ +struct { +u16 target; +atomic_t count; + } credits; +/* * The list of arrived non-empty smbdirect_recv_io * structures
@@ -171,6 +188,10 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)INIT_LIST_HEAD (&sc->recv_io.free.list);spin_lock_init (&sc->recv_io.free.lock); +atomic_set (&sc->recv_io.posted.count,0 ); + +atomic_set (&sc->recv_io.credits.count,0 ); +INIT_LIST_HEAD (&sc->recv_io.reassembly.list);spin_lock_init (&sc->recv_io.reassembly.lock);init_waitqueue_head (&sc->recv_io.reassembly.wait_queue);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 10/142 smb: smbdirect: introduce smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec
In reply to Stefan MetzmacherThese will be used instead of hardcoded values in client and server.
--- fs/smb/common/smbdirect/smbdirect.h | 4 ++++ 1 file changed, 4 insertions(+)
fs/smb/common/smbdirect/smbdirect.h +4 -0
@@ -23,6 +23,10 @@ struct smbdirect_buffer_descriptor_v1 {* Some values are important for the upper layer. */ struct smbdirect_socket_parameters { +__u32 resolve_addr_timeout_msec; +__u32 resolve_route_timeout_msec; +__u32 rdma_connect_timeout_msec; +__u32 negotiate_timeout_msec;__u16 recv_credit_max;__u16 send_credit_target;__u32 max_send_size;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 11/142 smb: smbdirect: introduce smbdirect_socket_parameters.{initiator_depth,responder_resources}
In reply to Stefan MetzmacherThis will make it easier to specify these from the outside of the core code later.
--- fs/smb/common/smbdirect/smbdirect.h | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/common/smbdirect/smbdirect.h +2 -0
@@ -27,6 +27,8 @@ struct smbdirect_socket_parameters {__u32 resolve_route_timeout_msec;__u32 rdma_connect_timeout_msec;__u32 negotiate_timeout_msec; +__u8 initiator_depth; +__u8 responder_resources;__u16 recv_credit_max;__u16 send_credit_target;__u32 max_send_size;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 12/142 smb: smbdirect: introduce smbdirect_socket.rdma.legacy_iwarp
In reply to Stefan MetzmacherThis will be used by client and server soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 4 ++++ 1 file changed, 4 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +4 -0
@@ -27,6 +27,10 @@ struct smbdirect_socket {/* RDMA related */ struct {struct rdma_cm_id *cm_id; +/* +* This is for iWarp MPA v1 +*/ +bool legacy_iwarp; } rdma;/* IB verbs related */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 13/142 smb: smbdirect: introduce smbdirect_socket.idle.{keepalive,immediate_work,timer_work}
In reply to Stefan MetzmacherThis will allow client and server to use the common structures in order to share common functions later.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +15 -0
@@ -18,6 +18,12 @@ enum smbdirect_socket_status {SMBDIRECT_SOCKET_DESTROYED }; +enum smbdirect_keepalive_status { +SMBDIRECT_KEEPALIVE_NONE , +SMBDIRECT_KEEPALIVE_PENDING , +SMBDIRECT_KEEPALIVE_SENT +}; +struct smbdirect_socket {enum smbdirect_socket_status status;wait_queue_head_t status_wait;
@@ -48,6 +54,15 @@ struct smbdirect_socket {struct smbdirect_socket_parameters parameters; +/* +* The state for keepalive and timeout handling +*/ +struct { +enum smbdirect_keepalive_status keepalive; +struct work_struct immediate_work; +struct delayed_work timer_work; + } idle; +/* * The state for posted send buffers */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 14/142 smb: smbdirect: introduce smbdirect_socket.statistics
In reply to Stefan MetzmacherThese will be used by the client and maybe shared code in future.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +11 -0
@@ -188,6 +188,17 @@ struct smbdirect_socket {wait_queue_head_t wait_queue; } credits; } rw_io; + +/* +* For debug purposes +*/ +struct { +u64 get_receive_buffer; +u64 put_receive_buffer; +u64 enqueue_reassembly_queue; +u64 dequeue_reassembly_queue; +u64 send_empty; + } statistics; }; static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 15/142 smb: smbdirect: introduce smbdirect_socket.workqueue
In reply to Stefan MetzmacherThe client currently used a per socket workqueue
because it can block in a work function
waiting for credits.
So we use a per socket pointer in order to prepare common code.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +8 -0
@@ -28,6 +28,14 @@ struct smbdirect_socket {enum smbdirect_socket_status status;wait_queue_head_t status_wait; +/* +* This points to the workqueue to +* be used for this socket. +* It can be per socket (on the client) +* or point to a global workqueue (on the server) +*/ +struct workqueue_struct *workqueue; +struct work_struct disconnect_work;/* RDMA related */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 16/142 smb: smbdirect: introduce struct smbdirect_mr_io
In reply to Stefan MetzmacherThis will be used by the client in order to maintain memory registrations.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +26 -0
@@ -301,6 +301,32 @@ struct smbdirect_recv_io {u8 packet[]; }; +enum smbdirect_mr_state { +SMBDIRECT_MR_READY , +SMBDIRECT_MR_REGISTERED , +SMBDIRECT_MR_INVALIDATED , +SMBDIRECT_MR_ERROR +}; + +struct smbdirect_mr_io { +struct smbdirect_socket *socket; +struct ib_cqe cqe; + +struct list_head list; + +enum smbdirect_mr_state state; +struct ib_mr *mr; +struct sg_table sgt; +enum dma_data_direction dir; +union { +struct ib_reg_wr wr; +struct ib_send_wr inv_wr; + }; + +bool need_invalidate; +struct completion invalidate_done; +}; +struct smbdirect_rw_io {struct smbdirect_socket *socket;struct ib_cqe cqe;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 17/142 smb: smbdirect: introduce smbdirect_socket_parameters.max_frmr_depth
In reply to Stefan MetzmacherThis will be used by the client...
--- fs/smb/common/smbdirect/smbdirect.h | 1 + 1 file changed, 1 insertion(+)
fs/smb/common/smbdirect/smbdirect.h +1 -0
@@ -36,6 +36,7 @@ struct smbdirect_socket_parameters {__u32 max_recv_size;__u32 max_fragmented_recv_size;__u32 max_read_write_size; +__u32 max_frmr_depth;__u32 keepalive_interval_msec;__u32 keepalive_timeout_msec; } __packed;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 18/142 smb: smbdirect: introduce smbdirect_socket.mr_io.*
In reply to Stefan MetzmacherThis will be used by the client and will allow us to move to common code...
--- fs/smb/common/smbdirect/smbdirect_socket.h | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +45 -0
@@ -176,6 +176,44 @@ struct smbdirect_socket { } reassembly; } recv_io; +/* +* The state for Memory registrations on the client +*/ +struct { +enum ib_mr_type type; + +/* +* The list of free smbdirect_mr_io +* structures +*/ +struct { +struct list_head list; +spinlock_t lock; + } all; + +/* +* The number of available MRs ready for memory registration +*/ +struct { +atomic_t count; +wait_queue_head_t wait_queue; + } ready; + +/* +* The number of used MRs +*/ +struct { +atomic_t count; + } used; + +struct work_struct recovery_work; + +/* Used by transport to wait until all MRs are returned */ +struct { +wait_queue_head_t wait_queue; + } cleanup; + } mr_io; +/* * The state for RDMA read/write requests on the server */
@@ -236,6 +274,13 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)atomic_set (&sc->rw_io.credits.count,0 );init_waitqueue_head (&sc->rw_io.credits.wait_queue); + +spin_lock_init (&sc->mr_io.all.lock); +INIT_LIST_HEAD (&sc->mr_io.all.list); +atomic_set (&sc->mr_io.ready.count,0 ); +init_waitqueue_head (&sc->mr_io.ready.wait_queue); +atomic_set (&sc->mr_io.used.count,0 ); +init_waitqueue_head (&sc->mr_io.cleanup.wait_queue); }struct smbdirect_send_io {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 19/142 smb: client/smbdirect: replace SMBDIRECT_SOCKET_CONNECTING with more detailed states
In reply to Stefan MetzmacherThe process of reaching a functional connection represented by SMBDIRECT_SOCKET_CONNECTED, is more complex than using a single SMBDIRECT_SOCKET_CONNECTING state.
This will allow us to remove a lot of special variables and completions in the following commits.
--- fs/smb/client/smbdirect.c | 73 ++++++++++++++++++++-- fs/smb/common/smbdirect/smbdirect_socket.h | 14 ++++- 2 files changed, 79 insertions(+), 8 deletions(-)
fs/smb/client/smbdirect.c +67 -6
@@ -161,9 +161,36 @@ static void smbd_disconnect_rdma_work(struct work_struct *work) container_of(work, struct smbd_connection, disconnect_work);struct smbdirect_socket *sc = &info->socket; -if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) { +switch (sc->status) { +case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : +case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : +case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : +case SMBDIRECT_SOCKET_CONNECTED : sc->status =SMBDIRECT_SOCKET_DISCONNECTING ;rdma_disconnect (sc->rdma.cm_id); +break ; + +case SMBDIRECT_SOCKET_CREATED : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : +case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : +case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : +case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : +/* +* rdma_connect() never reached +* RDMA_CM_EVENT_ESTABLISHED +*/ + sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +break ; + +case SMBDIRECT_SOCKET_DISCONNECTING : +case SMBDIRECT_SOCKET_DISCONNECTED : +case SMBDIRECT_SOCKET_DESTROYED : +break ; } }
@@ -187,19 +214,31 @@ static int smbd_conn_upcall(switch (event->event) {case RDMA_CM_EVENT_ADDR_RESOLVED : +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ; + info->ri_rc =0 ; +complete (&info->ri_done); +break ; +case RDMA_CM_EVENT_ROUTE_RESOLVED : +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); + sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; info->ri_rc =0 ;complete (&info->ri_done);break ;case RDMA_CM_EVENT_ADDR_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ; info->ri_rc = -EHOSTUNREACH ;complete (&info->ri_done);break ;case RDMA_CM_EVENT_ROUTE_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED ; info->ri_rc = -ENETUNREACH ;complete (&info->ri_done);break ;
@@ -259,7 +298,8 @@ static int smbd_conn_upcall(min_t (u8, info->responder_resources, peer_responder_resources); - sc->status =SMBDIRECT_SOCKET_CONNECTED ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ;wake_up_interruptible (&info->status_wait);break ;
@@ -267,7 +307,8 @@ static int smbd_conn_upcall(case RDMA_CM_EVENT_UNREACHABLE :case RDMA_CM_EVENT_REJECTED :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name); - sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); + sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED ;wake_up_interruptible (&info->status_wait);break ;
@@ -536,6 +577,12 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) info->negotiate_done =process_negotiation_response (response, wc->byte_len);put_receive_buffer (info, response); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ); +if (!info->negotiate_done) + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ; +else + sc->status =SMBDIRECT_SOCKET_CONNECTED ; +complete (&info->negotiate_completion);return ;
@@ -611,6 +658,7 @@ static struct rdma_cm_id *smbd_create_id(struct smbd_connection *info, struct sockaddr *dstaddr, int port) { + struct smbdirect_socket *sc = &info->socket;struct rdma_cm_id *id;int rc;__be16 *sport;
@@ -633,6 +681,8 @@ static struct rdma_cm_id *smbd_create_id(init_completion (&info->ri_done); info->ri_rc = -ETIMEDOUT ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ; rc =rdma_resolve_addr (id,NULL , (struct sockaddr *)dstaddr,RDMA_RESOLVE_TIMEOUT );if (rc) {
@@ -653,6 +703,8 @@ static struct rdma_cm_id *smbd_create_id( } info->ri_rc = -ETIMEDOUT ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ; rc =rdma_resolve_route (id,RDMA_RESOLVE_TIMEOUT );if (rc) {log_rdma_event (ERR ,"rdma_resolve_route() failed %i\n" , rc);
@@ -699,6 +751,9 @@ static int smbd_ia_open(struct smbdirect_socket *sc = &info->socket;int rc; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED ); + sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ; + sc->rdma.cm_id =smbd_create_id (info, dstaddr, port);if (IS_ERR (sc->rdma.cm_id)) { rc =PTR_ERR (sc->rdma.cm_id);
@@ -1140,6 +1195,9 @@ static int smbd_negotiate(struct smbd_connection *info)int rc;struct smbdirect_recv_io *response =get_receive_buffer (info); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ); + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ; + sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REP ; rc =smbd_post_recv (info, response); log_rdma_event(INFO, "smbd_post_recv rc=%d iov.addr=0x%llx iov.length=%u iov.lkey=0x%x\n",
@@ -1594,7 +1652,7 @@ static struct smbd_connection *_smbd_get_connection( info->initiator_depth =1 ; info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; - sc->status =SMBDIRECT_SOCKET_CONNECTING ; + sc->status =SMBDIRECT_SOCKET_CREATED ; rc =smbd_ia_open (info, dstaddr, port);if (rc) {log_rdma_event (INFO ,"smbd_ia_open rc=%d\n" , rc);
@@ -1706,6 +1764,9 @@ static struct smbd_connection *_smbd_get_connection(init_waitqueue_head (&info->status_wait);init_waitqueue_head (&sc->recv_io.reassembly.wait_queue); + +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); + sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; rc =rdma_connect (sc->rdma.cm_id, &conn_param);if (rc) {log_rdma_event (ERR ,"rdma_connect() failed with %i\n" , rc);
@@ -1714,10 +1775,10 @@ static struct smbd_connection *_smbd_get_connection(wait_event_interruptible_timeout ( info->status_wait, - sc->status !=SMBDIRECT_SOCKET_CONNECTING , + sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { +if (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ) {log_rdma_event (ERR ,"rdma_connect failed port=%d\n" , port); goto rdma_connect_failed; }
fs/smb/common/smbdirect/smbdirect_socket.h +12 -2
@@ -10,9 +10,19 @@enum smbdirect_socket_status {SMBDIRECT_SOCKET_CREATED , -SMBDIRECT_SOCKET_CONNECTING , -SMBDIRECT_SOCKET_CONNECTED , +SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED , +SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING , +SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED , +SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED , +SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING , +SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED , +SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED , +SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING , +SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED , +SMBDIRECT_SOCKET_NEGOTIATE_NEEDED , +SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ,SMBDIRECT_SOCKET_NEGOTIATE_FAILED , +SMBDIRECT_SOCKET_CONNECTED ,SMBDIRECT_SOCKET_DISCONNECTING ,SMBDIRECT_SOCKET_DISCONNECTED ,SMBDIRECT_SOCKET_DESTROYED
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 20/142 smb: client: use status_wait and SMBDIRECT_SOCKET_NEGOTIATE_RUNNING for completion
In reply to Stefan MetzmacherWe can use the state change from SMBDIRECT_SOCKET_NEGOTIATE_RUNNING to SMBDIRECT_SOCKET_CONNECTED or SMBDIRECT_SOCKET_NEGOTIATE_FAILED in order to notify the caller if the negotiation is over.
--- fs/smb/client/smbdirect.c | 19 ++++++++++--------- fs/smb/client/smbdirect.h | 3 --- 2 files changed, 10 insertions(+), 12 deletions(-)
fs/smb/client/smbdirect.c +10 -9
@@ -552,6 +552,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbd_connection *info = container_of(sc, struct smbd_connection, socket);int data_length =0 ; +bool negotiate_done = false; log_rdma_recv(INFO, "response=0x%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%u\n", response, sc->recv_io.expected, wc->status, wc->opcode,
@@ -574,16 +575,16 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMBDIRECT_EXPECT_NEGOTIATE_REP :dump_smbdirect_negotiate_resp (smbdirect_recv_io_payload (response)); sc->recv_io.reassembly.full_packet_received = true; - info->negotiate_done = + negotiate_done =process_negotiation_response (response, wc->byte_len);put_receive_buffer (info, response);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ); -if (!info->negotiate_done) +if (!negotiate_done) sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;else sc->status =SMBDIRECT_SOCKET_CONNECTED ; -complete (&info->negotiate_completion); +wake_up_interruptible (&info->status_wait);return ;/* SMBD data transfer packet */
@@ -1206,17 +1207,17 @@ static int smbd_negotiate(struct smbd_connection *info)if (rc)return rc; -init_completion (&info->negotiate_completion); - info->negotiate_done = false; rc =smbd_post_send_negotiate_req (info);if (rc)return rc; - rc =wait_for_completion_interruptible_timeout ( - &info->negotiate_completion,SMBD_NEGOTIATE_TIMEOUT *HZ ); -log_rdma_event (INFO ,"wait_for_completion_timeout rc=%d\n" , rc); + rc =wait_event_interruptible_timeout ( + info->status_wait, + sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING , +secs_to_jiffies (SMBD_NEGOTIATE_TIMEOUT )); +log_rdma_event (INFO ,"wait_event_interruptible_timeout rc=%d\n" , rc); -if (info->negotiate_done) +if (sc->status ==SMBDIRECT_SOCKET_CONNECTED )return 0 ;if (rc ==0 )
fs/smb/client/smbdirect.h +0 -3
@@ -49,9 +49,6 @@ struct smbd_connection {struct completion ri_done;wait_queue_head_t status_wait; -struct completion negotiate_completion; -bool negotiate_done; -struct work_struct disconnect_work;struct work_struct post_send_credits_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 21/142 smb: client: use status_wait and SMBDIRECT_SOCKET_RESOLVE_{ADDR,ROUTE}_RUNNING for completion
In reply to Stefan MetzmacherWe can use the state change from SMBDIRECT_SOCKET_RESOLVE_{ADDR,ROUTE}_RUNNING
to the next state in order to wake the caller to do the next step.
--- fs/smb/client/smbdirect.c | 49 ++++++++++++++++++++++----------------- fs/smb/client/smbdirect.h | 2 -- 2 files changed, 28 insertions(+), 23 deletions(-)
fs/smb/client/smbdirect.c +28 -21
@@ -216,31 +216,27 @@ static int smbd_conn_upcall(case RDMA_CM_EVENT_ADDR_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ; - info->ri_rc =0 ; -complete (&info->ri_done); +wake_up_interruptible (&info->status_wait);break ;case RDMA_CM_EVENT_ROUTE_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; - info->ri_rc =0 ; -complete (&info->ri_done); +wake_up_interruptible (&info->status_wait);break ;case RDMA_CM_EVENT_ADDR_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ; - info->ri_rc = -EHOSTUNREACH ; -complete (&info->ri_done); +wake_up_interruptible (&info->status_wait);break ;case RDMA_CM_EVENT_ROUTE_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED ; - info->ri_rc = -ENETUNREACH ; -complete (&info->ri_done); +wake_up_interruptible (&info->status_wait);break ;case RDMA_CM_EVENT_ESTABLISHED :
@@ -679,9 +675,6 @@ static struct rdma_cm_id *smbd_create_id( *sport =htons (port); -init_completion (&info->ri_done); - info->ri_rc = -ETIMEDOUT ; -WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ; rc = rdma_resolve_addr(id, NULL, (struct sockaddr *)dstaddr,
@@ -690,20 +683,26 @@ static struct rdma_cm_id *smbd_create_id(log_rdma_event (ERR ,"rdma_resolve_addr() failed %i\n" , rc); goto out; } - rc =wait_for_completion_interruptible_timeout ( - &info->ri_done,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); + rc =wait_event_interruptible_timeout ( + info->status_wait, + sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING , +msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT ));/* e.g. if interrupted returns -ERESTARTSYS */ if (rc <0 ) {log_rdma_event (ERR ,"rdma_resolve_addr timeout rc: %i\n" , rc); goto out; } - rc = info->ri_rc; -if (rc) { +if (sc->status ==SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ) { + rc = -ETIMEDOUT ; +log_rdma_event (ERR ,"rdma_resolve_addr() completed %i\n" , rc); + goto out; + } +if (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ) { + rc = -EHOSTUNREACH ;log_rdma_event (ERR ,"rdma_resolve_addr() completed %i\n" , rc); goto out; } - info->ri_rc = -ETIMEDOUT ;WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ; rc =rdma_resolve_route (id,RDMA_RESOLVE_TIMEOUT );
@@ -711,15 +710,22 @@ static struct rdma_cm_id *smbd_create_id(log_rdma_event (ERR ,"rdma_resolve_route() failed %i\n" , rc); goto out; } - rc =wait_for_completion_interruptible_timeout ( - &info->ri_done,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); + rc =wait_event_interruptible_timeout ( + info->status_wait, + sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING , +msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT ));/* e.g. if interrupted returns -ERESTARTSYS */ if (rc <0 ) {log_rdma_event (ERR ,"rdma_resolve_addr timeout rc: %i\n" , rc); goto out; } - rc = info->ri_rc; -if (rc) { +if (sc->status ==SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ) { + rc = -ETIMEDOUT ; +log_rdma_event (ERR ,"rdma_resolve_route() completed %i\n" , rc); + goto out; + } +if (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ) { + rc = -ENETUNREACH ;log_rdma_event (ERR ,"rdma_resolve_route() completed %i\n" , rc); goto out; }
@@ -1653,6 +1659,8 @@ static struct smbd_connection *_smbd_get_connection( info->initiator_depth =1 ; info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; +init_waitqueue_head (&info->status_wait); + sc->status =SMBDIRECT_SOCKET_CREATED ; rc =smbd_ia_open (info, dstaddr, port);if (rc) {
@@ -1763,7 +1771,6 @@ static struct smbd_connection *_smbd_get_connection(log_rdma_event (INFO ,"connecting to IP %pI4 port %d\n" , &addr_in->sin_addr, port); -init_waitqueue_head (&info->status_wait);init_waitqueue_head (&sc->recv_io.reassembly.wait_queue);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED );
fs/smb/client/smbdirect.h +0 -2
@@ -45,8 +45,6 @@ enum keep_alive_status {struct smbd_connection {struct smbdirect_socket socket; -int ri_rc; -struct completion ri_done;wait_queue_head_t status_wait;struct work_struct disconnect_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 22/142 smb: client: make use of smbdirect_socket.status_wait
In reply to Stefan MetzmacherThis will allow us to have common helper functions soon.
--- fs/smb/client/smbdirect.c | 32 ++++++++++++++++---------------- fs/smb/client/smbdirect.h | 2 -- 2 files changed, 16 insertions(+), 18 deletions(-)
fs/smb/client/smbdirect.c +16 -16
@@ -216,27 +216,27 @@ static int smbd_conn_upcall(case RDMA_CM_EVENT_ADDR_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_ROUTE_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_ADDR_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_ROUTE_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_ESTABLISHED :
@@ -296,7 +296,7 @@ static int smbd_conn_upcall(WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_CONNECT_ERROR :
@@ -305,7 +305,7 @@ static int smbd_conn_upcall(log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);break ;case RDMA_CM_EVENT_DEVICE_REMOVAL :
@@ -314,12 +314,12 @@ static int smbd_conn_upcall(if (sc->status ==SMBDIRECT_SOCKET_NEGOTIATE_FAILED ) {log_rdma_event (ERR ,"event=%s during negotiation\n" , event_name); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up (&info->status_wait); +wake_up (&sc->status_wait);break ; } sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);wake_up_interruptible (&sc->recv_io.reassembly.wait_queue);wake_up_interruptible_all (&info->wait_send_queue);break ;
@@ -580,7 +580,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)else sc->status =SMBDIRECT_SOCKET_CONNECTED ; -wake_up_interruptible (&info->status_wait); +wake_up_interruptible (&sc->status_wait);return ;/* SMBD data transfer packet */
@@ -684,7 +684,7 @@ static struct rdma_cm_id *smbd_create_id( goto out; } rc =wait_event_interruptible_timeout ( - info->status_wait, + sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT ));/* e.g. if interrupted returns -ERESTARTSYS */
@@ -711,7 +711,7 @@ static struct rdma_cm_id *smbd_create_id( goto out; } rc =wait_event_interruptible_timeout ( - info->status_wait, + sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT ));/* e.g. if interrupted returns -ERESTARTSYS */
@@ -1218,7 +1218,7 @@ static int smbd_negotiate(struct smbd_connection *info)return rc; rc =wait_event_interruptible_timeout ( - info->status_wait, + sc->status_wait, sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ,secs_to_jiffies (SMBD_NEGOTIATE_TIMEOUT ));log_rdma_event (INFO ,"wait_event_interruptible_timeout rc=%d\n" , rc);
@@ -1445,7 +1445,7 @@ void smbd_destroy(struct TCP_Server_Info *server)rdma_disconnect (sc->rdma.cm_id);log_rdma_event (INFO ,"wait for transport being disconnected\n" );wait_event_interruptible ( - info->status_wait, + sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); }
@@ -1659,7 +1659,7 @@ static struct smbd_connection *_smbd_get_connection( info->initiator_depth =1 ; info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; -init_waitqueue_head (&info->status_wait); +init_waitqueue_head (&sc->status_wait); sc->status =SMBDIRECT_SOCKET_CREATED ; rc =smbd_ia_open (info, dstaddr, port);
@@ -1782,7 +1782,7 @@ static struct smbd_connection *_smbd_get_connection( }wait_event_interruptible_timeout ( - info->status_wait, + sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ,msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT ));
@@ -1839,7 +1839,7 @@ static struct smbd_connection *_smbd_get_connection(destroy_caches_and_workqueue (info); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;rdma_disconnect (sc->rdma.cm_id); -wait_event (info->status_wait, +wait_event (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); allocate_cache_failed:
fs/smb/client/smbdirect.h +0 -2
@@ -45,8 +45,6 @@ enum keep_alive_status {struct smbd_connection {struct smbdirect_socket socket; -wait_queue_head_t status_wait; -struct work_struct disconnect_work;struct work_struct post_send_credits_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 23/142 smb: client: make only use of wake_up[_all]() in smbdirect.c
In reply to Stefan Metzmacherwake_up_interruptible[_all]() doesn't wake up tasks waiting with wait_event().
So we better wake_up[_all]() in order to wake up all tasks in order to simplify the logic.
As we currently don't use any wait_event_*_exclusive() it doesn't really matter if we use wake_up() or wake_up_all(). But in this patch I try to use wake_up() for expected situations and wake_up_all() for situations of a broken connection. So don't need to adjust things in future when we
may use wait_event_*_exclusive() in order to wake up only one process that should make progress.
Changing the wait_event_*() code in order to keepwait_event(), wait_event_interruptible() andwait_event_interruptible_timeout() or
changing them to wait_event_killable(),wait_event_killable_timeout(),wait_event_killable_exclusive()
is something to think about in a future patch.
The goal here is to avoid that some tasks are not
woken and freeze forever.
Also note that this patch only changes the existing wake_up*() calls. Adding more wake_up*() calls for other wait queues is also deferred to a future patch.
--- fs/smb/client/smbdirect.c | 40 ++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-)
fs/smb/client/smbdirect.c +21 -19
@@ -216,27 +216,27 @@ static int smbd_conn_upcall(case RDMA_CM_EVENT_ADDR_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ; -wake_up_interruptible (&sc->status_wait); +wake_up (&sc->status_wait);break ;case RDMA_CM_EVENT_ROUTE_RESOLVED :WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; -wake_up_interruptible (&sc->status_wait); +wake_up (&sc->status_wait);break ;case RDMA_CM_EVENT_ADDR_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ; -wake_up_interruptible (&sc->status_wait); +wake_up_all (&sc->status_wait);break ;case RDMA_CM_EVENT_ROUTE_ERROR :log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED ; -wake_up_interruptible (&sc->status_wait); +wake_up_all (&sc->status_wait);break ;case RDMA_CM_EVENT_ESTABLISHED :
@@ -296,7 +296,7 @@ static int smbd_conn_upcall(WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ; -wake_up_interruptible (&sc->status_wait); +wake_up (&sc->status_wait);break ;case RDMA_CM_EVENT_CONNECT_ERROR :
@@ -305,7 +305,7 @@ static int smbd_conn_upcall(log_rdma_event (ERR ,"connecting failed event=%s\n" , event_name);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED ; -wake_up_interruptible (&sc->status_wait); +wake_up_all (&sc->status_wait);break ;case RDMA_CM_EVENT_DEVICE_REMOVAL :
@@ -314,14 +314,14 @@ static int smbd_conn_upcall(if (sc->status ==SMBDIRECT_SOCKET_NEGOTIATE_FAILED ) {log_rdma_event (ERR ,"event=%s during negotiation\n" , event_name); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up (&sc->status_wait); +wake_up_all (&sc->status_wait);break ; } sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_interruptible (&sc->status_wait); -wake_up_interruptible (&sc->recv_io.reassembly.wait_queue); -wake_up_interruptible_all (&info->wait_send_queue); +wake_up_all (&sc->status_wait); +wake_up_all (&sc->recv_io.reassembly.wait_queue); +wake_up_all (&info->wait_send_queue);break ;default :
@@ -498,7 +498,7 @@ static void smbd_post_send_credits(struct work_struct *work)struct smbdirect_socket *sc = &info->socket;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { -wake_up (&info->wait_receive_queues); +wake_up_all (&info->wait_receive_queues);return ; }
@@ -575,12 +575,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)process_negotiation_response (response, wc->byte_len);put_receive_buffer (info, response);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ); -if (!negotiate_done) +if (!negotiate_done) { sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ; -else +wake_up_all (&sc->status_wait); + }else { sc->status =SMBDIRECT_SOCKET_CONNECTED ; +wake_up (&sc->status_wait); + } -wake_up_interruptible (&sc->status_wait);return ;/* SMBD data transfer packet */
@@ -608,7 +610,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* We have new send credits granted from remote peer * If any sender is waiting for credits, unblock it */ -wake_up_interruptible (&info->wait_send_queue); +wake_up (&info->wait_send_queue); } log_incoming(INFO, "data flags %d data_offset %d data_length %d remaining_data_length %d\n",
@@ -630,7 +632,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)*/ if (data_length) {enqueue_reassembly (info, response, data_length); -wake_up_interruptible (&sc->recv_io.reassembly.wait_queue); +wake_up (&sc->recv_io.reassembly.wait_queue); }else put_receive_buffer (info, response);
@@ -1486,7 +1488,7 @@ void smbd_destroy(struct TCP_Server_Info *server)* path when sending data, and then release memory registrations. */ log_rdma_event (INFO ,"freeing mr list\n" ); -wake_up_interruptible_all (&info->wait_mr); +wake_up_all (&info->wait_mr);while (atomic_read (&info->mr_used_count)) {cifs_server_unlock (server);msleep (1000 );
@@ -2185,7 +2187,7 @@ static void smbd_mr_recovery_work(struct work_struct *work)* get_mr() from the I/O issuing CPUs */ if (atomic_inc_return (&info->mr_ready_count) ==1 ) -wake_up_interruptible (&info->wait_mr); +wake_up (&info->wait_mr); } }
@@ -2496,7 +2498,7 @@ int smbd_deregister_mr(struct smbd_mr *smbdirect_mr) smbdirect_mr->dir); smbdirect_mr->state =MR_READY ;if (atomic_inc_return (&info->mr_ready_count) ==1 ) -wake_up_interruptible (&info->wait_mr); +wake_up (&info->wait_mr); }else /* * Schedule the work to do MR recovery for future I/Os MR
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 24/142 smb: client: make use of smbdirect_socket_init()
In reply to Stefan MetzmacherIt's much safer to initialize the whole structure at the beginning than doing it all over the place and then miss to move it if code changes.
--- fs/smb/client/smbdirect.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
fs/smb/client/smbdirect.c +1 -12
@@ -1351,13 +1351,6 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)struct smbdirect_recv_io *response;int i; -INIT_LIST_HEAD (&sc->recv_io.reassembly.list); -spin_lock_init (&sc->recv_io.reassembly.lock); - sc->recv_io.reassembly.data_length =0 ; - sc->recv_io.reassembly.queue_length =0 ; - -INIT_LIST_HEAD (&sc->recv_io.free.list); -spin_lock_init (&sc->recv_io.free.lock); info->count_receive_queue =0 ;init_waitqueue_head (&info->wait_receive_queues);
@@ -1656,14 +1649,12 @@ static struct smbd_connection *_smbd_get_connection(if (!info)return NULL ; sc = &info->socket; +smbdirect_socket_init (sc); sp = &sc->parameters; info->initiator_depth =1 ; info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; -init_waitqueue_head (&sc->status_wait); - - sc->status =SMBDIRECT_SOCKET_CREATED ; rc =smbd_ia_open (info, dstaddr, port);if (rc) {log_rdma_event (INFO ,"smbd_ia_open rc=%d\n" , rc);
@@ -1773,8 +1764,6 @@ static struct smbd_connection *_smbd_get_connection(log_rdma_event (INFO ,"connecting to IP %pI4 port %d\n" , &addr_in->sin_addr, port); -init_waitqueue_head (&sc->recv_io.reassembly.wait_queue); -WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; rc =rdma_connect (sc->rdma.cm_id, &conn_param);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 25/142 smb: client: make use of smbdirect_socket.disconnect_work
In reply to Stefan Metzmacher--- fs/smb/client/smbdirect.c | 12 +++++++----- fs/smb/client/smbdirect.h | 1 - 2 files changed, 7 insertions(+), 6 deletions(-)
fs/smb/client/smbdirect.c +7 -5
@@ -157,9 +157,8 @@ do { \static void smbd_disconnect_rdma_work (struct work_struct *work) { -struct smbd_connection *info = - container_of(work, struct smbd_connection, disconnect_work); -struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, disconnect_work);switch (sc->status) {case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED :
@@ -196,7 +195,9 @@ static void smbd_disconnect_rdma_work(struct work_struct *work)static void smbd_disconnect_rdma_connection (struct smbd_connection *info) { -queue_work (info->workqueue, &info->disconnect_work); +struct smbdirect_socket *sc = &info->socket; + +queue_work (info->workqueue, &sc->disconnect_work); }/* Upcall from RDMA CM */
@@ -1655,6 +1656,8 @@ static struct smbd_connection *_smbd_get_connection( info->initiator_depth =1 ; info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; +INIT_WORK (&sc->disconnect_work, smbd_disconnect_rdma_work); + rc =smbd_ia_open (info, dstaddr, port);if (rc) {log_rdma_event (INFO ,"smbd_ia_open rc=%d\n" , rc);
@@ -1800,7 +1803,6 @@ static struct smbd_connection *_smbd_get_connection(init_waitqueue_head (&info->wait_post_send); -INIT_WORK (&info->disconnect_work, smbd_disconnect_rdma_work);INIT_WORK (&info->post_send_credits_work, smbd_post_send_credits); info->new_credits_offered =0 ;spin_lock_init (&info->lock_new_credits_offered);
fs/smb/client/smbdirect.h +0 -1
@@ -45,7 +45,6 @@ enum keep_alive_status {struct smbd_connection {struct smbdirect_socket socket; -struct work_struct disconnect_work;struct work_struct post_send_credits_work;spinlock_t lock_new_credits_offered;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 26/142 smb: client: make use of smbdirect_socket.send_io.pending.{count,wait_queue}
In reply to Stefan MetzmacherThis will be used by the server too and will allow to create common helper functions.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/smbdirect.c | 25 +++++++++++-------------- fs/smb/client/smbdirect.h | 2 -- 3 files changed, 12 insertions(+), 17 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -480,7 +480,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)atomic_read (&server->smbd_conn->receive_credits), server->smbd_conn->receive_credit_target);seq_printf (m,"\nPending send_pending: %x " , -atomic_read (&server->smbd_conn->send_pending)); +atomic_read (&sc->send_io.pending.count));seq_printf (m,"\nReceive buffers count_receive_queue: %x " , server->smbd_conn->count_receive_queue); seq_printf(m, "\nMR responder_resources: %x "
fs/smb/client/smbdirect.c +11 -14
@@ -391,8 +391,8 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)return ; } -if (atomic_dec_and_test (&info->send_pending)) -wake_up (&info->wait_send_pending); +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.wait_queue);wake_up (&info->wait_post_send);
@@ -863,14 +863,14 @@ static int smbd_post_send_negotiate_req(struct smbd_connection *info) request->sge[0 ].addr, request->sge[0].length, request->sge[0].lkey); -atomic_inc (&info->send_pending); +atomic_inc (&sc->send_io.pending.count); rc =ib_post_send (sc->ib.qp, &send_wr,NULL );if (!rc)return 0 ;/* if we reach here, post send failed */ log_rdma_send (ERR ,"ib_post_send failed rc=%d\n" , rc); -atomic_dec (&info->send_pending); +atomic_dec (&sc->send_io.pending.count);ib_dma_unmap_single (sc->ib.dev, request->sge[0 ].addr, request->sge[0 ].length,DMA_TO_DEVICE );
@@ -994,7 +994,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, wait_send_queue:wait_event (info->wait_post_send, -atomic_read (&info->send_pending) < sp->send_credit_target || +atomic_read (&sc->send_io.pending.count) < sp->send_credit_target || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) {
@@ -1003,9 +1003,9 @@ static int smbd_post_send_iter(struct smbd_connection *info, goto err_wait_send_queue; } -if (unlikely (atomic_inc_return (&info->send_pending) > +if (unlikely (atomic_inc_return (&sc->send_io.pending.count) > sp->send_credit_target)) { -atomic_dec (&info->send_pending); +atomic_dec (&sc->send_io.pending.count); goto wait_send_queue; }
@@ -1112,8 +1112,8 @@ static int smbd_post_send_iter(struct smbd_connection *info,atomic_sub (new_credits, &info->receive_credits); err_alloc: -if (atomic_dec_and_test (&info->send_pending)) -wake_up (&info->wait_send_pending); +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.wait_queue); err_wait_send_queue:/* roll back send credits and pending */
@@ -1798,9 +1798,6 @@ static struct smbd_connection *_smbd_get_connection(queue_delayed_work (info->workqueue, &info->idle_timer_work,msecs_to_jiffies (sp->keepalive_interval_msec)); -init_waitqueue_head (&info->wait_send_pending); -atomic_set (&info->send_pending,0 ); -init_waitqueue_head (&info->wait_post_send);INIT_WORK (&info->post_send_credits_work, smbd_post_send_credits);
@@ -2101,8 +2098,8 @@ int smbd_send(struct TCP_Server_Info *server,* that means all the I/Os have been out and we are good to return */ -wait_event (info->wait_send_pending, -atomic_read (&info->send_pending) ==0 || +wait_event (sc->send_io.pending.wait_queue, +atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (sc->status !=SMBDIRECT_SOCKET_CONNECTED && rc ==0 )
fs/smb/client/smbdirect.h +0 -2
@@ -83,8 +83,6 @@ struct smbd_connection {wait_queue_head_t wait_for_mr_cleanup;/* Activity accounting */ -atomic_t send_pending; -wait_queue_head_t wait_send_pending;wait_queue_head_t wait_post_send;/* Receive queue */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 27/142 smb: client: make use of smbdirect_socket.send_io.credits.{count,wait_queue}
In reply to Stefan MetzmacherThis will be used by the server too and will allow to create common helper functions.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/smbdirect.c | 19 +++++++++---------- fs/smb/client/smbdirect.h | 3 --- 3 files changed, 10 insertions(+), 14 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -476,7 +476,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) sc->recv_io.reassembly.queue_length);seq_printf (m,"\nCurrent Credits send_credits: %x " "receive_credits: %x receive_credit_target: %x" , -atomic_read (&server->smbd_conn->send_credits), +atomic_read (&sc->send_io.credits.count),atomic_read (&server->smbd_conn->receive_credits), server->smbd_conn->receive_credit_target); seq_printf(m, "\nPending send_pending: %x ",
fs/smb/client/smbdirect.c +9 -10
@@ -322,7 +322,7 @@ static int smbd_conn_upcall( sc->status =SMBDIRECT_SOCKET_DISCONNECTED ;wake_up_all (&sc->status_wait);wake_up_all (&sc->recv_io.reassembly.wait_queue); -wake_up_all (&info->wait_send_queue); +wake_up_all (&sc->send_io.credits.wait_queue);break ;default :
@@ -446,7 +446,7 @@ static bool process_negotiation_response(log_rdma_event (ERR ,"error: credits_granted==0\n" );return false; } -atomic_set (&info->send_credits,le16_to_cpu (packet->credits_granted)); +atomic_set (&sc->send_io.credits.count,le16_to_cpu (packet->credits_granted));atomic_set (&info->receive_credits,0 );
@@ -606,12 +606,12 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)le16_to_cpu (data_transfer->credits_requested);if (le16_to_cpu (data_transfer->credits_granted)) {atomic_add (le16_to_cpu (data_transfer->credits_granted), - &info->send_credits); + &sc->send_io.credits.count);/* * We have new send credits granted from remote peer * If any sender is waiting for credits, unblock it */ -wake_up (&info->wait_send_queue); +wake_up (&sc->send_io.credits.wait_queue); } log_incoming(INFO, "data flags %d data_offset %d data_length %d remaining_data_length %d\n",
@@ -976,8 +976,8 @@ static int smbd_post_send_iter(struct smbd_connection *info, wait_credit:/* Wait for send credits. A SMBD packet needs one credit */ - rc =wait_event_interruptible (info->wait_send_queue, -atomic_read (&info->send_credits) >0 || + rc =wait_event_interruptible (sc->send_io.credits.wait_queue, +atomic_read (&sc->send_io.credits.count) >0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (rc) goto err_wait_credit;
@@ -987,8 +987,8 @@ static int smbd_post_send_iter(struct smbd_connection *info, rc = -EAGAIN ; goto err_wait_credit; } -if (unlikely (atomic_dec_return (&info->send_credits) <0 )) { -atomic_inc (&info->send_credits); +if (unlikely (atomic_dec_return (&sc->send_io.credits.count) <0 )) { +atomic_inc (&sc->send_io.credits.count); goto wait_credit; }
@@ -1117,7 +1117,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, err_wait_send_queue:/* roll back send credits and pending */ -atomic_inc (&info->send_credits); +atomic_inc (&sc->send_io.credits.count); err_wait_credit:return rc;
@@ -1793,7 +1793,6 @@ static struct smbd_connection *_smbd_get_connection( goto allocate_cache_failed; } -init_waitqueue_head (&info->wait_send_queue);INIT_DELAYED_WORK (&info->idle_timer_work, idle_connection_timer);queue_delayed_work (info->workqueue, &info->idle_timer_work,msecs_to_jiffies (sp->keepalive_interval_msec));
fs/smb/client/smbdirect.h +0 -3
@@ -53,7 +53,6 @@ struct smbd_connection {/* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ enum keep_alive_status keep_alive_requested;int protocol; -atomic_t send_credits;atomic_t receive_credits;int receive_credit_target;
@@ -91,8 +90,6 @@ struct smbd_connection {bool send_immediate; -wait_queue_head_t wait_send_queue; -struct workqueue_struct *workqueue;struct delayed_work idle_timer_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 28/142 smb: client: make sure smbd_disconnect_rdma_work() doesn't run after smbd_destroy() took over
In reply to Stefan MetzmacherIf we're already disconnecting we don't need to queue the disconnect_work again. disable_work() turns the next queue_work() into a no-op.
Also let smbd_destroy() cancel(and disable) queued disconnect_work and call smbd_disconnect_rdma_work() inline.
The makes it more obvious that disconnect_work is never queued again after smbd_destroy() called smbd_disconnect_rdma_work().
It also means we have a single place to call rdma_disconnect().
While there we better also disable all other [delayed_]work.
--- fs/smb/client/smbdirect.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)
fs/smb/client/smbdirect.c +19 -2
@@ -159,6 +159,18 @@ static void smbd_disconnect_rdma_work(struct work_struct *work) {struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, disconnect_work); +struct smbd_connection *info = + container_of(sc, struct smbd_connection, socket); + +/* +* make sure this and other work is not queued again +* but here we don't block and avoid +* disable[_delayed]_work_ync() +*/ +disable_work (&sc->disconnect_work); +disable_work (&info->post_send_credits_work); +disable_work (&info->mr_recovery_work); +disable_delayed_work (&info->idle_timer_work);switch (sc->status) {case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED :
@@ -315,11 +327,13 @@ static int smbd_conn_upcall(if (sc->status ==SMBDIRECT_SOCKET_NEGOTIATE_FAILED ) {log_rdma_event (ERR ,"event=%s during negotiation\n" , event_name); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +smbd_disconnect_rdma_work (&sc->disconnect_work);wake_up_all (&sc->status_wait);break ; } sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +smbd_disconnect_rdma_work (&sc->disconnect_work);wake_up_all (&sc->status_wait);wake_up_all (&sc->recv_io.reassembly.wait_queue);wake_up_all (&sc->send_io.credits.wait_queue);
@@ -1436,9 +1450,12 @@ void smbd_destroy(struct TCP_Server_Info *server) sc = &info->socket; sp = &sc->parameters; +log_rdma_event (INFO ,"cancelling and disable disconnect_work\n" ); +disable_work_sync (&sc->disconnect_work); +log_rdma_event (INFO ,"destroying rdma session\n" ); -if (sc->status !=SMBDIRECT_SOCKET_DISCONNECTED ) { -rdma_disconnect (sc->rdma.cm_id); +if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) { +smbd_disconnect_rdma_work (&sc->disconnect_work);log_rdma_event (INFO ,"wait for transport being disconnected\n" ); wait_event_interruptible( sc->status_wait,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 29/142 smb: client: use disable[_delayed]_work_sync in smbdirect.c
In reply to Stefan MetzmacherThis makes it safer during the disconnect and avoids requeueing.
It's ok to call disable[delayed_]work[_sync]() more than once.
--- fs/smb/client/smbdirect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +3 -3
@@ -1468,7 +1468,7 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->ib.qp =NULL ;log_rdma_event (INFO ,"cancelling idle timer\n" ); -cancel_delayed_work_sync (&info->idle_timer_work); +disable_delayed_work_sync (&info->idle_timer_work);/* It's not possible for upper layer to get to reassembly */ log_rdma_event (INFO ,"drain the reassembly queue\n" );
@@ -1841,7 +1841,7 @@ static struct smbd_connection *_smbd_get_connection(return NULL ; negotiation_failed: -cancel_delayed_work_sync (&info->idle_timer_work); +disable_delayed_work_sync (&info->idle_timer_work);destroy_caches_and_workqueue (info); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;rdma_disconnect (sc->rdma.cm_id);
@@ -2200,7 +2200,7 @@ static void destroy_mr_list(struct smbd_connection *info)struct smbdirect_socket *sc = &info->socket;struct smbd_mr *mr, *tmp; -cancel_work_sync (&info->mr_recovery_work); +disable_work_sync (&info->mr_recovery_work);list_for_each_entry_safe (mr, tmp, &info->mr_list, list) {if (mr->state ==MR_INVALIDATED ) ib_dma_unmap_sg(sc->ib.dev, mr->sgt.sgl,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 30/142 smb: client: let smbd_destroy() call disable_work_sync(&info->post_send_credits_work)
In reply to Stefan MetzmacherWe already called disable_work(&info->post_send_credits_work) in smbd_disconnect_rdma_work().
But in smbd_destroy() we may destroy the memory so we better wait until post_send_credits_work is no longer pending.
--- fs/smb/client/smbdirect.c | 3 +++ 1 file changed, 3 insertions(+)
fs/smb/client/smbdirect.c +3 -0
@@ -1462,6 +1462,9 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->status == SMBDIRECT_SOCKET_DISCONNECTED); } +log_rdma_event (INFO ,"cancelling post_send_credits_work\n" ); +disable_work_sync (&info->post_send_credits_work); +log_rdma_event (INFO ,"destroying qp\n" );ib_drain_qp (sc->ib.qp);rdma_destroy_qp (sc->rdma.cm_id);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 31/142 smb: client: queue post_recv_credits_work also if the peer raises the credit target
In reply to Stefan MetzmacherThis is already handled in the server, but currently it done in a very complex way there. So we do it much simpler.
Note that put_receive_buffer() will take care of it in case data_length is 0.
--- fs/smb/client/smbdirect.c | 5 +++++ 1 file changed, 5 insertions(+)
fs/smb/client/smbdirect.c +5 -0
@@ -562,6 +562,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_socket *sc = response->socket;struct smbd_connection *info = container_of(sc, struct smbd_connection, socket); +int old_recv_credit_target;int data_length =0 ;bool negotiate_done = false;
@@ -616,6 +617,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) }atomic_dec (&info->receive_credits); + old_recv_credit_target = info->receive_credit_target; info->receive_credit_target =le16_to_cpu (data_transfer->credits_requested);if (le16_to_cpu (data_transfer->credits_granted)) {
@@ -646,6 +648,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* reassembly queue and wake up the reading thread */ if (data_length) { +if (info->receive_credit_target > old_recv_credit_target) +queue_work (info->workqueue, &info->post_send_credits_work); +enqueue_reassembly (info, response, data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 32/142 smb: client: make use of ib_wc_status_msg() and skip IB_WC_WR_FLUSH_ERR logging
In reply to Stefan MetzmacherThere's no need to get log message for every IB_WC_WR_FLUSH_ERR completion, but any other error should be logged at level ERR.
--- fs/smb/client/smbdirect.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
fs/smb/client/smbdirect.c +12 -8
@@ -388,8 +388,8 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)struct smbd_connection *info = container_of(sc, struct smbd_connection, socket); -log_rdma_send (INFO ,"smbdirect_send_io 0x%p completed wc->status=%d\n" , - request, wc->status); +log_rdma_send (INFO ,"smbdirect_send_io 0x%p completed wc->status=%s\n" , + request,ib_wc_status_msg (wc->status));for (i =0 ; i < request->num_sge; i++) ib_dma_unmap_single(sc->ib.dev,
@@ -398,8 +398,9 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) DMA_TO_DEVICE);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_SEND ) { -log_rdma_send (ERR ,"wc->status=%d wc->opcode=%d\n" , - wc->status, wc->opcode); +if (wc->status !=IB_WC_WR_FLUSH_ERR ) +log_rdma_send (ERR ,"wc->status=%s wc->opcode=%d\n" , +ib_wc_status_msg (wc->status), wc->opcode);mempool_free (request, sc->send_io.mem.pool);smbd_disconnect_rdma_connection (info);return ;
@@ -566,13 +567,16 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)int data_length =0 ;bool negotiate_done = false; -log_rdma_recv (INFO ,"response=0x%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%u\n" , - response, sc->recv_io.expected, wc->status, wc->opcode, +log_rdma_recv (INFO , +"response=0x%p type=%d wc status=%s wc opcode %d byte_len=%d pkey_index=%u\n" , + response, sc->recv_io.expected, +ib_wc_status_msg (wc->status), wc->opcode, wc->byte_len, wc->pkey_index);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) { -log_rdma_recv (INFO ,"wc->status=%d opcode=%d\n" , - wc->status, wc->opcode); +if (wc->status !=IB_WC_WR_FLUSH_ERR ) +log_rdma_recv (ERR ,"wc->status=%s opcode=%d\n" , +ib_wc_status_msg (wc->status), wc->opcode); goto error; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 33/142 smb: client: remove info->wait_receive_queues handling in smbd_destroy()
In reply to Stefan MetzmacherWe already call ib_drain_qp() before, which is an sync operation that only returns in the queues are fully drained.
ib_drain_qp() completes pending requests with IB_WC_WR_FLUSH_ERR so we have already called put_receive_buffer().
So all smbdirect_recv_io objects are either in the smbdirect_socket.recv_io.free.list or smbdirect_socket.recv_io.reassembly.list.
Then we explicitly iterate smbdirect_socket.recv_io.reassembly.list and call put_receive_buffer(), so every object is
in smbdirect_socket.recv_io.free.list.
It means info->count_receive_queue == sp->recv_credit_max was already true and calling wait_event(info->wait_receive_queues... is pointless.
--- fs/smb/client/cifs_debug.c | 2 -- fs/smb/client/smbdirect.c | 13 ------------- fs/smb/client/smbdirect.h | 4 ---- 3 files changed, 19 deletions(-)
fs/smb/client/cifs_debug.c +0 -2
@@ -481,8 +481,6 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) server->smbd_conn->receive_credit_target);seq_printf (m,"\nPending send_pending: %x " ,atomic_read (&sc->send_io.pending.count)); -seq_printf (m,"\nReceive buffers count_receive_queue: %x " , - server->smbd_conn->count_receive_queue); seq_printf(m, "\nMR responder_resources: %x " "max_frmr_depth: %x mr_type: %x", server->smbd_conn->responder_resources,
fs/smb/client/smbdirect.c +0 -13
@@ -514,7 +514,6 @@ static void smbd_post_send_credits(struct work_struct *work)struct smbdirect_socket *sc = &info->socket;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { -wake_up_all (&info->wait_receive_queues);return ; }
@@ -1331,7 +1330,6 @@ static struct smbdirect_recv_io *get_receive_buffer(struct smbd_connection *info &sc->recv_io.free.list, struct smbdirect_recv_io, list);list_del (&ret->list); - info->count_receive_queue--; info->count_get_receive_buffer++; }spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);
@@ -1361,7 +1359,6 @@ static void put_receive_buffer(spin_lock_irqsave (&sc->recv_io.free.lock, flags);list_add_tail (&response->list, &sc->recv_io.free.list); - info->count_receive_queue++; info->count_put_receive_buffer++;spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);
@@ -1375,10 +1372,6 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)struct smbdirect_recv_io *response;int i; - info->count_receive_queue =0 ; - -init_waitqueue_head (&info->wait_receive_queues); -for (i =0 ; i < num_buf; i++) { response =mempool_alloc (sc->recv_io.mem.pool,GFP_KERNEL );if (!response)
@@ -1387,7 +1380,6 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf) response->socket = sc; response->sge.length =0 ;list_add_tail (&response->list, &sc->recv_io.free.list); - info->count_receive_queue++; }return 0 ;
@@ -1398,7 +1390,6 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf) &sc->recv_io.free.list, struct smbdirect_recv_io, list);list_del (&response->list); - info->count_receive_queue--;mempool_free (response, sc->recv_io.mem.pool); }
@@ -1448,7 +1439,6 @@ void smbd_destroy(struct TCP_Server_Info *server) {struct smbd_connection *info = server->smbd_conn;struct smbdirect_socket *sc; -struct smbdirect_socket_parameters *sp;struct smbdirect_recv_io *response;unsigned long flags;
@@ -1457,7 +1447,6 @@ void smbd_destroy(struct TCP_Server_Info *server)return ; } sc = &info->socket; - sp = &sc->parameters;log_rdma_event (INFO ,"cancelling and disable disconnect_work\n" );disable_work_sync (&sc->disconnect_work);
@@ -1499,8 +1488,6 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->recv_io.reassembly.data_length =0 ;log_rdma_event (INFO ,"free receive buffers\n" ); -wait_event (info->wait_receive_queues, - info->count_receive_queue == sp->recv_credit_max);destroy_receive_buffers (info);/*
fs/smb/client/smbdirect.h +0 -4
@@ -84,10 +84,6 @@ struct smbd_connection {/* Activity accounting */ wait_queue_head_t wait_post_send; -/* Receive queue */ -int count_receive_queue; -wait_queue_head_t wait_receive_queues; -bool send_immediate;struct workqueue_struct *workqueue;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 34/142 smb: client: limit the range of info->receive_credit_target
In reply to Stefan MetzmacherThis simplifies further changes...
--- fs/smb/client/smbdirect.c | 8 +++++++- fs/smb/client/smbdirect.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/smb/client/smbdirect.c +7 -1
@@ -456,6 +456,7 @@ static bool process_negotiation_response(return false; } info->receive_credit_target =le16_to_cpu (packet->credits_requested); + info->receive_credit_target =min_t (u16, info->receive_credit_target, sp->recv_credit_max);if (packet->credits_granted ==0 ) {log_rdma_event (ERR ,"error: credits_granted==0\n" );
@@ -560,9 +561,10 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_recv_io *response = container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe);struct smbdirect_socket *sc = response->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbd_connection *info = container_of(sc, struct smbd_connection, socket); -int old_recv_credit_target; +u16 old_recv_credit_target;int data_length =0 ;bool negotiate_done = false;
@@ -623,6 +625,10 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) old_recv_credit_target = info->receive_credit_target; info->receive_credit_target =le16_to_cpu (data_transfer->credits_requested); + info->receive_credit_target = +min_t (u16, info->receive_credit_target, sp->recv_credit_max); + info->receive_credit_target = +max_t (u16, info->receive_credit_target,1 );if (le16_to_cpu (data_transfer->credits_granted)) {atomic_add (le16_to_cpu (data_transfer->credits_granted), &sc->send_io.credits.count);
fs/smb/client/smbdirect.h +1 -1
@@ -54,7 +54,7 @@ struct smbd_connection {enum keep_alive_status keep_alive_requested;int protocol;atomic_t receive_credits; -int receive_credit_target; +u16 receive_credit_target;/* Memory registrations */ /* Maximum number of RDMA read/write outstanding on this connection */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 35/142 smb: client: count the number of posted recv_io messages in order to calculated credits
In reply to Stefan Metzmacher(At least for me) the logic maintaining the count of posted recv_io messages and the count of granted credits is much easier to understand.
From there we can easily calculate the number of new_credits we'll grant to the peer in outgoing send_io messages.
This will simplify the move to common logic that can be shared between client and server in the following patches.
--- fs/smb/client/smbdirect.c | 30 ++++++++++++++---------------- fs/smb/client/smbdirect.h | 4 +--- 2 files changed, 15 insertions(+), 19 deletions(-)
fs/smb/client/smbdirect.c +14 -16
@@ -465,6 +465,7 @@ static bool process_negotiation_response(atomic_set (&sc->send_io.credits.count,le16_to_cpu (packet->credits_granted));atomic_set (&info->receive_credits,0 ); +atomic_set (&info->receive_posted,0 );if (le32_to_cpu (packet->preferred_send_size) > sp->max_recv_size) { log_rdma_event(ERR, "error: preferred_send_size=%d\n",
@@ -506,7 +507,6 @@ static bool process_negotiation_response(static void smbd_post_send_credits (struct work_struct *work) { -int ret =0 ;int rc;struct smbdirect_recv_io *response; struct smbd_connection *info =
@@ -534,14 +534,10 @@ static void smbd_post_send_credits(struct work_struct *work)break ; } - ret++; +atomic_inc (&info->receive_posted); } } -spin_lock (&info->lock_new_credits_offered); - info->new_credits_offered += ret; -spin_unlock (&info->lock_new_credits_offered); -/* Promptly send an immediate packet as defined in [MS-SMBD] 3.1.1.1 */ info->send_immediate = true; if (atomic_read(&info->receive_credits) <
@@ -621,6 +617,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; } +atomic_dec (&info->receive_posted);atomic_dec (&info->receive_credits); old_recv_credit_target = info->receive_credit_target; info->receive_credit_target =
@@ -921,10 +918,16 @@ static int manage_credits_prior_sending(struct smbd_connection *info) {int new_credits; -spin_lock (&info->lock_new_credits_offered); - new_credits = info->new_credits_offered; - info->new_credits_offered =0 ; -spin_unlock (&info->lock_new_credits_offered); +if (atomic_read (&info->receive_credits) >= info->receive_credit_target) +return 0 ; + + new_credits =atomic_read (&info->receive_posted); +if (new_credits ==0 ) +return 0 ; + + new_credits -=atomic_read (&info->receive_credits); +if (new_credits <=0 ) +return 0 ;return new_credits; }
@@ -1133,10 +1136,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, DMA_TO_DEVICE);mempool_free (request, sc->send_io.mem.pool); -/* roll back receive credits and credits to be offered */ -spin_lock (&info->lock_new_credits_offered); - info->new_credits_offered += new_credits; -spin_unlock (&info->lock_new_credits_offered); +/* roll back the granted receive credits */ atomic_sub (new_credits, &info->receive_credits); err_alloc:
@@ -1822,8 +1822,6 @@ static struct smbd_connection *_smbd_get_connection(init_waitqueue_head (&info->wait_post_send);INIT_WORK (&info->post_send_credits_work, smbd_post_send_credits); - info->new_credits_offered =0 ; -spin_lock_init (&info->lock_new_credits_offered); rc =smbd_negotiate (info);if (rc) {
fs/smb/client/smbdirect.h +1 -3
@@ -46,9 +46,7 @@ struct smbd_connection {struct smbdirect_socket socket;struct work_struct post_send_credits_work; - -spinlock_t lock_new_credits_offered; -int new_credits_offered; +atomic_t receive_posted;/* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ enum keep_alive_status keep_alive_requested;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 36/142 smb: client: make use of smbdirect_socket.recv_io.{posted,credits}
In reply to Stefan MetzmacherThis will make it possible to introduce common helper functions in future.
--- fs/smb/client/cifs_debug.c | 4 +-- fs/smb/client/smbdirect.c | 64 ++++++++++++++++++-------------------- fs/smb/client/smbdirect.h | 5 --- 3 files changed, 33 insertions(+), 40 deletions(-)
fs/smb/client/cifs_debug.c +2 -2
@@ -477,8 +477,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nCurrent Credits send_credits: %x " "receive_credits: %x receive_credit_target: %x" ,atomic_read (&sc->send_io.credits.count), -atomic_read (&server->smbd_conn->receive_credits), - server->smbd_conn->receive_credit_target); +atomic_read (&sc->recv_io.credits.count), + sc->recv_io.credits.target);seq_printf (m,"\nPending send_pending: %x " ,atomic_read (&sc->send_io.pending.count)); seq_printf(m, "\nMR responder_resources: %x "
fs/smb/client/smbdirect.c +31 -33
161 lines not on this page · raw message
fs/smb/client/smbdirect.h +0 -5
@@ -45,14 +45,9 @@ enum keep_alive_status {struct smbd_connection {struct smbdirect_socket socket; -struct work_struct post_send_credits_work; -atomic_t receive_posted; -/* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ enum keep_alive_status keep_alive_requested;int protocol; -atomic_t receive_credits; -u16 receive_credit_target;/* Memory registrations */ /* Maximum number of RDMA read/write outstanding on this connection */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 37/142 smb: client: remove useless smbd_connection.send_immediate
In reply to Stefan MetzmacherWe always set it to true before having an if statement that checks it is true...
--- fs/smb/client/smbdirect.c | 10 ++-------- fs/smb/client/smbdirect.h | 2 -- 2 files changed, 2 insertions(+), 10 deletions(-)
fs/smb/client/smbdirect.c +2 -8
@@ -536,14 +536,10 @@ static void smbd_post_send_credits(struct work_struct *work) }/* Promptly send an immediate packet as defined in [MS-SMBD] 3.1.1.1 */ - info->send_immediate = true;if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target -1 ) { -if (info->keep_alive_requested ==KEEP_ALIVE_PENDING || - info->send_immediate) { -log_keep_alive (INFO ,"send an empty message\n" ); -smbd_post_send_empty (info); - } +log_keep_alive (INFO ,"send an empty message\n" ); +smbd_post_send_empty (info); } }
@@ -1080,8 +1076,6 @@ static int smbd_post_send_iter(struct smbd_connection *info,atomic_add (new_credits, &sc->recv_io.credits.count); packet->credits_granted =cpu_to_le16 (new_credits); - info->send_immediate = false; - packet->flags =0 ;if (manage_keep_alive_before_sending (info)) packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED );
fs/smb/client/smbdirect.h +0 -2
@@ -77,8 +77,6 @@ struct smbd_connection {/* Activity accounting */ wait_queue_head_t wait_post_send; -bool send_immediate; -struct workqueue_struct *workqueue;struct delayed_work idle_timer_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 38/142 smb: client: fill smbdirect_socket_parameters at the beginning and use the values from there
In reply to Stefan MetzmacherThis is what we should do and it also simplifies the following changes.
--- fs/smb/client/smbdirect.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
fs/smb/client/smbdirect.c +13 -13
@@ -1672,37 +1672,37 @@ static struct smbd_connection *_smbd_get_connection(INIT_WORK (&sc->disconnect_work, smbd_disconnect_rdma_work); + sp->recv_credit_max = smbd_receive_credit_max; + sp->send_credit_target = smbd_send_credit_target; + sp->max_send_size = smbd_max_send_size; + sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size; + sp->max_recv_size = smbd_max_receive_size; + sp->keepalive_interval_msec = smbd_keep_alive_interval *1000 ; + rc =smbd_ia_open (info, dstaddr, port);if (rc) {log_rdma_event (INFO ,"smbd_ia_open rc=%d\n" , rc); goto create_id_failed; } -if (smbd_send_credit_target > sc->ib.dev->attrs.max_cqe || - smbd_send_credit_target > sc->ib.dev->attrs.max_qp_wr) { +if (sp->send_credit_target > sc->ib.dev->attrs.max_cqe || + sp->send_credit_target > sc->ib.dev->attrs.max_qp_wr) {log_rdma_event (ERR ,"consider lowering send_credit_target = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n" , - smbd_send_credit_target, + sp->send_credit_target, sc->ib.dev->attrs.max_cqe, sc->ib.dev->attrs.max_qp_wr); goto config_failed; } -if (smbd_receive_credit_max > sc->ib.dev->attrs.max_cqe || - smbd_receive_credit_max > sc->ib.dev->attrs.max_qp_wr) { +if (sp->recv_credit_max > sc->ib.dev->attrs.max_cqe || + sp->recv_credit_max > sc->ib.dev->attrs.max_qp_wr) {log_rdma_event (ERR ,"consider lowering receive_credit_max = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n" , - smbd_receive_credit_max, + sp->recv_credit_max, sc->ib.dev->attrs.max_cqe, sc->ib.dev->attrs.max_qp_wr); goto config_failed; } - sp->recv_credit_max = smbd_receive_credit_max; - sp->send_credit_target = smbd_send_credit_target; - sp->max_send_size = smbd_max_send_size; - sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size; - sp->max_recv_size = smbd_max_receive_size; - sp->keepalive_interval_msec = smbd_keep_alive_interval *1000 ; -if (sc->ib.dev->attrs.max_send_sge <SMBDIRECT_SEND_IO_MAX_SGE || sc->ib.dev->attrs.max_recv_sge <SMBDIRECT_RECV_IO_MAX_SGE ) { log_rdma_event(ERR,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 39/142 smb: client: make use of smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec
In reply to Stefan MetzmacherThis will make future changes to these values much saner.
--- fs/smb/client/smbdirect.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
fs/smb/client/smbdirect.c +16 -6
@@ -57,6 +57,9 @@ static ssize_t smb_extract_iter_to_rdma(struct iov_iter *iter, size_t len,/* SMBD negotiation timeout in seconds */ #define SMBD_NEGOTIATE_TIMEOUT 120 +/* The timeout to wait for a keepalive message from peer in seconds */ +#define KEEPALIVE_RECV_TIMEOUT 5 +/* SMBD minimum receive size and fragmented sized defined in [MS-SMBD] */ #define SMBD_MIN_RECEIVE_SIZE 128#define SMBD_MIN_FRAGMENTED_SIZE 131072
@@ -677,6 +680,7 @@ static struct rdma_cm_id *smbd_create_id( struct sockaddr *dstaddr, int port) {struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct rdma_cm_id *id;int rc;__be16 *sport;
@@ -699,7 +703,7 @@ static struct rdma_cm_id *smbd_create_id(WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ; rc =rdma_resolve_addr (id,NULL , (struct sockaddr *)dstaddr, -RDMA_RESOLVE_TIMEOUT ); + sp->resolve_addr_timeout_msec);if (rc) {log_rdma_event (ERR ,"rdma_resolve_addr() failed %i\n" , rc); goto out;
@@ -707,7 +711,7 @@ static struct rdma_cm_id *smbd_create_id( rc =wait_event_interruptible_timeout ( sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING , -msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); +msecs_to_jiffies (sp->resolve_addr_timeout_msec));/* e.g. if interrupted returns -ERESTARTSYS */ if (rc <0 ) {log_rdma_event (ERR ,"rdma_resolve_addr timeout rc: %i\n" , rc);
@@ -726,7 +730,7 @@ static struct rdma_cm_id *smbd_create_id(WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING ; - rc =rdma_resolve_route (id,RDMA_RESOLVE_TIMEOUT ); + rc =rdma_resolve_route (id, sp->resolve_route_timeout_msec);if (rc) {log_rdma_event (ERR ,"rdma_resolve_route() failed %i\n" , rc); goto out;
@@ -734,7 +738,7 @@ static struct rdma_cm_id *smbd_create_id( rc =wait_event_interruptible_timeout ( sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING , -msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); +msecs_to_jiffies (sp->resolve_route_timeout_msec));/* e.g. if interrupted returns -ERESTARTSYS */ if (rc <0 ) {log_rdma_event (ERR ,"rdma_resolve_addr timeout rc: %i\n" , rc);
@@ -1222,6 +1226,7 @@ static int smbd_post_recv(static int smbd_negotiate (struct smbd_connection *info) {struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;int rc;struct smbdirect_recv_io *response =get_receive_buffer (info);
@@ -1243,7 +1248,7 @@ static int smbd_negotiate(struct smbd_connection *info) rc =wait_event_interruptible_timeout ( sc->status_wait, sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING , -secs_to_jiffies (SMBD_NEGOTIATE_TIMEOUT )); +msecs_to_jiffies (sp->negotiate_timeout_msec));log_rdma_event (INFO ,"wait_event_interruptible_timeout rc=%d\n" , rc);if (sc->status ==SMBDIRECT_SOCKET_CONNECTED )
@@ -1672,12 +1677,17 @@ static struct smbd_connection *_smbd_get_connection(INIT_WORK (&sc->disconnect_work, smbd_disconnect_rdma_work); + sp->resolve_addr_timeout_msec =RDMA_RESOLVE_TIMEOUT ; + sp->resolve_route_timeout_msec =RDMA_RESOLVE_TIMEOUT ; + sp->rdma_connect_timeout_msec =RDMA_RESOLVE_TIMEOUT ; + sp->negotiate_timeout_msec =SMBD_NEGOTIATE_TIMEOUT *1000 ; sp->recv_credit_max = smbd_receive_credit_max; sp->send_credit_target = smbd_send_credit_target; sp->max_send_size = smbd_max_send_size; sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size; sp->max_recv_size = smbd_max_receive_size; sp->keepalive_interval_msec = smbd_keep_alive_interval *1000 ; + sp->keepalive_timeout_msec =KEEPALIVE_RECV_TIMEOUT *1000 ; rc =smbd_ia_open (info, dstaddr, port);if (rc) {
@@ -1792,7 +1802,7 @@ static struct smbd_connection *_smbd_get_connection(wait_event_interruptible_timeout ( sc->status_wait, sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING , -msecs_to_jiffies (RDMA_RESOLVE_TIMEOUT )); +msecs_to_jiffies (sp->rdma_connect_timeout_msec));if (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ) {log_rdma_event (ERR ,"rdma_connect failed port=%d\n" , port);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 40/142 smb: client: make use of smbdirect_socket_parameters.{initiator_depth,responder_resources}
In reply to Stefan MetzmacherThis will make it easier to specify these from the outside of the core code first and then negotiate the value with the peer.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/smbdirect.c | 29 +++++++++++++++-------------- fs/smb/client/smbdirect.h | 2 -- 3 files changed, 16 insertions(+), 17 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -483,7 +483,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) atomic_read(&sc->send_io.pending.count));seq_printf (m,"\nMR responder_resources: %x " "max_frmr_depth: %x mr_type: %x" , - server->smbd_conn->responder_resources, + sp->responder_resources, server->smbd_conn->max_frmr_depth, server->smbd_conn->mr_type); seq_printf(m, "\nMR mr_ready_count: %x mr_used_count: %x",
fs/smb/client/smbdirect.c +15 -14
@@ -221,6 +221,7 @@ static int smbd_conn_upcall( {struct smbd_connection *info = id->context;struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;const char *event_name =rdma_event_msg (event->event);u8 peer_initiator_depth;u8 peer_responder_resources;
@@ -303,11 +304,11 @@ static int smbd_conn_upcall( } } - info->initiator_depth = -min_t (u8, info->initiator_depth, + sp->initiator_depth = +min_t (u8, sp->initiator_depth, peer_initiator_depth); - info->responder_resources = -min_t (u8, info->responder_resources, + sp->responder_resources = +min_t (u8, sp->responder_resources, peer_responder_resources);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING );
@@ -1672,15 +1673,14 @@ static struct smbd_connection *_smbd_get_connection(smbdirect_socket_init (sc); sp = &sc->parameters; - info->initiator_depth =1 ; - info->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; -INIT_WORK (&sc->disconnect_work, smbd_disconnect_rdma_work); sp->resolve_addr_timeout_msec =RDMA_RESOLVE_TIMEOUT ; sp->resolve_route_timeout_msec =RDMA_RESOLVE_TIMEOUT ; sp->rdma_connect_timeout_msec =RDMA_RESOLVE_TIMEOUT ; sp->negotiate_timeout_msec =SMBD_NEGOTIATE_TIMEOUT *1000 ; + sp->initiator_depth =1 ; + sp->responder_resources =SMBD_CM_RESPONDER_RESOURCES ; sp->recv_credit_max = smbd_receive_credit_max; sp->send_credit_target = smbd_send_credit_target; sp->max_send_size = smbd_max_send_size;
@@ -1761,15 +1761,15 @@ static struct smbd_connection *_smbd_get_connection( } sc->ib.qp = sc->rdma.cm_id->qp; - info->responder_resources = -min_t (u8, info->responder_resources, + sp->responder_resources = +min_t (u8, sp->responder_resources, sc->ib.dev->attrs.max_qp_rd_atom);log_rdma_mr (INFO ,"responder_resources=%d\n" , - info->responder_resources); + sp->responder_resources);memset (&conn_param,0 ,sizeof (conn_param)); - conn_param.initiator_depth = info->initiator_depth; - conn_param.responder_resources = info->responder_resources; + conn_param.initiator_depth = sp->initiator_depth; + conn_param.responder_resources = sp->responder_resources;/* Need to send IRD/ORD in private data for iWARP */ sc->ib.dev->ops.get_port_immutable(
@@ -2226,6 +2226,7 @@ static void destroy_mr_list(struct smbd_connection *info)static int allocate_mr_list (struct smbd_connection *info) {struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;int i;struct smbd_mr *smbdirect_mr, *tmp;
@@ -2237,13 +2238,13 @@ static int allocate_mr_list(struct smbd_connection *info)init_waitqueue_head (&info->wait_for_mr_cleanup);INIT_WORK (&info->mr_recovery_work, smbd_mr_recovery_work); -if (info->responder_resources ==0 ) { +if (sp->responder_resources ==0 ) {log_rdma_mr (ERR ,"responder_resources negotiated as 0\n" );return -EINVAL ; }/* Allocate more MRs (2x) than hardware responder_resources */ -for (i =0 ; i < info->responder_resources *2 ; i++) { +for (i =0 ; i < sp->responder_resources *2 ; i++) { smbdirect_mr =kzalloc (sizeof (*smbdirect_mr),GFP_KERNEL );if (!smbdirect_mr) goto cleanup_entries;
fs/smb/client/smbdirect.h +0 -2
@@ -52,8 +52,6 @@ struct smbd_connection {/* Memory registrations */ /* Maximum number of RDMA read/write outstanding on this connection */ bool legacy_iwarp; -u8 initiator_depth; -u8 responder_resources;/* Maximum number of pages in a single RDMA write/read on this connection */ int max_frmr_depth;/*
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 41/142 smb: client: make use of smbdirect_socket.rdma.legacy_iwarp
In reply to Stefan MetzmacherCurrently it's write only for the client, but it will likely be use for debugging later.
--- fs/smb/client/smbdirect.c | 2 +- fs/smb/client/smbdirect.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
fs/smb/client/smbdirect.c +1 -1
@@ -298,7 +298,7 @@ static int smbd_conn_upcall( ird32 =min_t (u32, ird32,U8_MAX ); ord32 =min_t (u32, ord32,U8_MAX ); - info->legacy_iwarp = true; + sc->rdma.legacy_iwarp = true; peer_initiator_depth = (u8 )ird32; peer_responder_resources = (u8 )ord32; }
fs/smb/client/smbdirect.h +0 -2
@@ -50,8 +50,6 @@ struct smbd_connection {int protocol;/* Memory registrations */ -/* Maximum number of RDMA read/write outstanding on this connection */ -bool legacy_iwarp;/* Maximum number of pages in a single RDMA write/read on this connection */ int max_frmr_depth;/*
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 42/142 smb: client: send empty packets via send_immediate_work
In reply to Stefan MetzmacherThis is what the server already does and it makes refactoring for common structures and functions much easier.
--- fs/smb/client/smbdirect.c | 25 +++++++++++++++++++++---- fs/smb/client/smbdirect.h | 1 + 2 files changed, 22 insertions(+), 4 deletions(-)
fs/smb/client/smbdirect.c +21 -4
@@ -173,6 +173,7 @@ static void smbd_disconnect_rdma_work(struct work_struct *work)disable_work (&sc->disconnect_work);disable_work (&sc->recv_io.posted.refill_work);disable_work (&info->mr_recovery_work); +disable_work (&info->send_immediate_work);disable_delayed_work (&info->idle_timer_work);switch (sc->status) {
@@ -542,8 +543,8 @@ static void smbd_post_send_credits(struct work_struct *work)/* Promptly send an immediate packet as defined in [MS-SMBD] 3.1.1.1 */ if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target -1 ) { -log_keep_alive (INFO ,"send an empty message\n" ); -smbd_post_send_empty (info); +log_keep_alive (INFO ,"schedule send of an empty message\n" ); +queue_work (info->workqueue, &info->send_immediate_work); } }
@@ -1409,6 +1410,19 @@ static void destroy_receive_buffers(struct smbd_connection *info)mempool_free (response, sc->recv_io.mem.pool); } +static void send_immediate_empty_message (struct work_struct *work) +{ +struct smbd_connection *info = + container_of(work, struct smbd_connection, send_immediate_work); +struct smbdirect_socket *sc = &info->socket; + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) +return ; + +log_keep_alive (INFO ,"send an empty message\n" ); +smbd_post_send_empty (info); +} +/* Implement idle connection timer [MS-SMBD] 3.1.6.2 */ static void idle_connection_timer (struct work_struct *work) {
@@ -1426,8 +1440,8 @@ static void idle_connection_timer(struct work_struct *work)return ; } -log_keep_alive (INFO ,"about to send an empty idle message\n" ); -smbd_post_send_empty (info); +log_keep_alive (INFO ,"schedule send of empty idle message\n" ); +queue_work (info->workqueue, &info->send_immediate_work);/* Setup the next idle timeout work */ queue_delayed_work(info->workqueue, &info->idle_timer_work,
@@ -1474,6 +1488,8 @@ void smbd_destroy(struct TCP_Server_Info *server)log_rdma_event (INFO ,"cancelling idle timer\n" );disable_delayed_work_sync (&info->idle_timer_work); +log_rdma_event (INFO ,"cancelling send immediate work\n" ); +disable_work_sync (&info->send_immediate_work);/* It's not possible for upper layer to get to reassembly */ log_rdma_event (INFO ,"drain the reassembly queue\n" );
@@ -1817,6 +1833,7 @@ static struct smbd_connection *_smbd_get_connection( goto allocate_cache_failed; } +INIT_WORK (&info->send_immediate_work, send_immediate_empty_message);INIT_DELAYED_WORK (&info->idle_timer_work, idle_connection_timer);queue_delayed_work (info->workqueue, &info->idle_timer_work,msecs_to_jiffies (sp->keepalive_interval_msec));
fs/smb/client/smbdirect.h +1 -0
@@ -74,6 +74,7 @@ struct smbd_connection {wait_queue_head_t wait_post_send;struct workqueue_struct *workqueue; +struct work_struct send_immediate_work;struct delayed_work idle_timer_work;/* for debug purposes */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 43/142 smb: client: fix smbdirect keep alive handling to match the documentation
In reply to Stefan MetzmacherWe setup the first timer with the negotiate timeout and set KEEP_ALIVE_PENDING, so that the expired timer disconnects.
On every incoming message we need to reset the timer to the keepalive interval (120s).
On SMBDIRECT_FLAG_RESPONSE_REQUESTED we need to schedule a response instead of setting KEEP_ALIVE_PENDING. Doing both would mean we would also set SMBDIRECT_FLAG_RESPONSE_REQUESTED in that response. If both ends would do that we'd play ping pong in a busy loop.
If we move to KEEP_ALIVE_SENT and send the keepalive request with SMBDIRECT_FLAG_RESPONSE_REQUESTED, we need to setup the timer with keepalive timeout (5s) in order to disconnect if no incoming message reset the timer.
The fired timer sets KEEP_ALIVE_PENDING and also setup timer with keepalive timeout (5s) in order to disconnect if no incoming message reset the timer.
We do that before queueing the send_immediate_work and have that timer in case we didn't reach the send code that typically sets the timer to keepalive timeout.
--- fs/smb/client/smbdirect.c | 52 ++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 14 deletions(-)
fs/smb/client/smbdirect.c +38 -14
@@ -581,6 +581,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) response->sge.length, DMA_FROM_DEVICE); +/* +* Reset timer to the keepalive interval in +* order to trigger our next keepalive message. +*/ + info->keep_alive_requested =KEEP_ALIVE_NONE ; +mod_delayed_work (info->workqueue, &info->idle_timer_work, +msecs_to_jiffies (sp->keepalive_interval_msec)); +switch (sc->recv_io.expected) {/* SMBD negotiation response */ case SMBDIRECT_EXPECT_NEGOTIATE_REP :
@@ -640,11 +648,11 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)le32_to_cpu (data_transfer->data_length), le32_to_cpu(data_transfer->remaining_data_length)); -/* Send a KEEP_ALIVE response right away if requested */ - info->keep_alive_requested =KEEP_ALIVE_NONE ; +/* Send an immediate response right away if requested */ if (le16_to_cpu (data_transfer->flags) &SMBDIRECT_FLAG_RESPONSE_REQUESTED ) { - info->keep_alive_requested =KEEP_ALIVE_PENDING ; +log_keep_alive (INFO ,"schedule send of immediate response\n" ); +queue_work (info->workqueue, &info->send_immediate_work); }/*
@@ -943,8 +951,17 @@ static int manage_credits_prior_sending(struct smbd_connection *info)*/ static int manage_keep_alive_before_sending (struct smbd_connection *info) { +struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters; +if (info->keep_alive_requested ==KEEP_ALIVE_PENDING ) { info->keep_alive_requested =KEEP_ALIVE_SENT ; +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ +mod_delayed_work (info->workqueue, &info->idle_timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec));return 1 ; }return 0 ;
@@ -955,7 +972,6 @@ static int smbd_post_send(struct smbd_connection *info, struct smbdirect_send_io *request) {struct smbdirect_socket *sc = &info->socket; -struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_send_wr send_wr;int rc, i;
@@ -984,10 +1000,7 @@ static int smbd_post_send(struct smbd_connection *info,log_rdma_send (ERR ,"ib_post_send failed rc=%d\n" , rc);smbd_disconnect_rdma_connection (info); rc = -EAGAIN ; - }else -/* Reset timer for idle connection after packet is sent */ -mod_delayed_work (info->workqueue, &info->idle_timer_work, -msecs_to_jiffies (sp->keepalive_interval_msec)); + }return rc; }
@@ -1440,12 +1453,18 @@ static void idle_connection_timer(struct work_struct *work)return ; } +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) +return ; + +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ + info->keep_alive_requested =KEEP_ALIVE_PENDING ; +mod_delayed_work (info->workqueue, &info->idle_timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec));log_keep_alive (INFO ,"schedule send of empty idle message\n" );queue_work (info->workqueue, &info->send_immediate_work); - -/* Setup the next idle timeout work */ -queue_delayed_work (info->workqueue, &info->idle_timer_work, -msecs_to_jiffies (sp->keepalive_interval_msec)); }/*
@@ -1835,8 +1854,13 @@ static struct smbd_connection *_smbd_get_connection(INIT_WORK (&info->send_immediate_work, send_immediate_empty_message);INIT_DELAYED_WORK (&info->idle_timer_work, idle_connection_timer); -queue_delayed_work (info->workqueue, &info->idle_timer_work, -msecs_to_jiffies (sp->keepalive_interval_msec)); +/* +* start with the negotiate timeout and KEEP_ALIVE_PENDING +* so that the timer will cause a disconnect. +*/ + info->keep_alive_requested =KEEP_ALIVE_PENDING ; +mod_delayed_work (info->workqueue, &info->idle_timer_work, +msecs_to_jiffies (sp->negotiate_timeout_msec));init_waitqueue_head (&info->wait_post_send);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 44/142 smb: client: make use of smbdirect_socket.idle.{keepalive,immediate_work,timer_work}
In reply to Stefan MetzmacherThis will allow client and server to use the common structures in order to share common functions later.
--- fs/smb/client/smbdirect.c | 59 ++++++++++++++++++++------------------- fs/smb/client/smbdirect.h | 9 ------ 2 files changed, 30 insertions(+), 38 deletions(-)
fs/smb/client/smbdirect.c +30 -29
@@ -173,8 +173,8 @@ static void smbd_disconnect_rdma_work(struct work_struct *work)disable_work (&sc->disconnect_work);disable_work (&sc->recv_io.posted.refill_work);disable_work (&info->mr_recovery_work); -disable_work (&info->send_immediate_work); -disable_delayed_work (&info->idle_timer_work); +disable_work (&sc->idle.immediate_work); +disable_delayed_work (&sc->idle.timer_work);switch (sc->status) {case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED :
@@ -544,7 +544,7 @@ static void smbd_post_send_credits(struct work_struct *work)if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target -1 ) {log_keep_alive (INFO ,"schedule send of an empty message\n" ); -queue_work (info->workqueue, &info->send_immediate_work); +queue_work (info->workqueue, &sc->idle.immediate_work); } }
@@ -585,8 +585,8 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* Reset timer to the keepalive interval in * order to trigger our next keepalive message. */ - info->keep_alive_requested =KEEP_ALIVE_NONE ; -mod_delayed_work (info->workqueue, &info->idle_timer_work, + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; +mod_delayed_work (info->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec));switch (sc->recv_io.expected) {
@@ -652,7 +652,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (le16_to_cpu (data_transfer->flags) &SMBDIRECT_FLAG_RESPONSE_REQUESTED ) {log_keep_alive (INFO ,"schedule send of immediate response\n" ); -queue_work (info->workqueue, &info->send_immediate_work); +queue_work (info->workqueue, &sc->idle.immediate_work); }/*
@@ -954,13 +954,13 @@ static int manage_keep_alive_before_sending(struct smbd_connection *info)struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -if (info->keep_alive_requested ==KEEP_ALIVE_PENDING ) { - info->keep_alive_requested =KEEP_ALIVE_SENT ; +if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) { + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_SENT ;/* * Now use the keepalive timeout (instead of keepalive interval) * in order to wait for a response */ -mod_delayed_work (info->workqueue, &info->idle_timer_work, +mod_delayed_work (info->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));return 1 ; }
@@ -1425,9 +1425,10 @@ static void destroy_receive_buffers(struct smbd_connection *info)static void send_immediate_empty_message (struct work_struct *work) { +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, idle.immediate_work);struct smbd_connection *info = - container_of(work, struct smbd_connection, send_immediate_work); -struct smbdirect_socket *sc = &info->socket; + container_of(sc, struct smbd_connection, socket);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ;
@@ -1439,16 +1440,16 @@ static void send_immediate_empty_message(struct work_struct *work)/* Implement idle connection timer [MS-SMBD] 3.1.6.2 */ static void idle_connection_timer (struct work_struct *work) { -struct smbd_connection *info =container_of ( - work, struct smbd_connection, - idle_timer_work.work); -struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, idle.timer_work.work);struct smbdirect_socket_parameters *sp = &sc->parameters; +struct smbd_connection *info = + container_of(sc, struct smbd_connection, socket); -if (info->keep_alive_requested !=KEEP_ALIVE_NONE ) { +if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) {log_keep_alive (ERR , -"error status info->keep_alive_requested=%d\n" , - info->keep_alive_requested); +"error status sc->idle.keepalive=%d\n" , + sc->idle.keepalive);smbd_disconnect_rdma_connection (info);return ; }
@@ -1460,11 +1461,11 @@ static void idle_connection_timer(struct work_struct *work)* Now use the keepalive timeout (instead of keepalive interval) * in order to wait for a response */ - info->keep_alive_requested =KEEP_ALIVE_PENDING ; -mod_delayed_work (info->workqueue, &info->idle_timer_work, + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (info->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));log_keep_alive (INFO ,"schedule send of empty idle message\n" ); -queue_work (info->workqueue, &info->send_immediate_work); +queue_work (info->workqueue, &sc->idle.immediate_work); }/*
@@ -1506,9 +1507,9 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->ib.qp =NULL ;log_rdma_event (INFO ,"cancelling idle timer\n" ); -disable_delayed_work_sync (&info->idle_timer_work); +disable_delayed_work_sync (&sc->idle.timer_work);log_rdma_event (INFO ,"cancelling send immediate work\n" ); -disable_work_sync (&info->send_immediate_work); +disable_work_sync (&sc->idle.immediate_work);/* It's not possible for upper layer to get to reassembly */ log_rdma_event (INFO ,"drain the reassembly queue\n" );
@@ -1852,14 +1853,14 @@ static struct smbd_connection *_smbd_get_connection( goto allocate_cache_failed; } -INIT_WORK (&info->send_immediate_work, send_immediate_empty_message); -INIT_DELAYED_WORK (&info->idle_timer_work, idle_connection_timer); +INIT_WORK (&sc->idle.immediate_work, send_immediate_empty_message); +INIT_DELAYED_WORK (&sc->idle.timer_work, idle_connection_timer);/* -* start with the negotiate timeout and KEEP_ALIVE_PENDING +* start with the negotiate timeout and SMBDIRECT_KEEPALIVE_PENDING * so that the timer will cause a disconnect. */ - info->keep_alive_requested =KEEP_ALIVE_PENDING ; -mod_delayed_work (info->workqueue, &info->idle_timer_work, + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (info->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->negotiate_timeout_msec));init_waitqueue_head (&info->wait_post_send);
@@ -1887,7 +1888,7 @@ static struct smbd_connection *_smbd_get_connection(return NULL ; negotiation_failed: -disable_delayed_work_sync (&info->idle_timer_work); +disable_delayed_work_sync (&sc->idle.timer_work);destroy_caches_and_workqueue (info); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;rdma_disconnect (sc->rdma.cm_id);
fs/smb/client/smbdirect.h +0 -9
@@ -27,12 +27,6 @@ extern int smbd_max_send_size;extern int smbd_send_credit_target;extern int smbd_receive_credit_max; -enum keep_alive_status { -KEEP_ALIVE_NONE , -KEEP_ALIVE_PENDING , -KEEP_ALIVE_SENT , -}; -/* * The context for the SMBDirect transport * Everything related to the transport is here. It has several logical parts
@@ -46,7 +40,6 @@ struct smbd_connection {struct smbdirect_socket socket;/* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ -enum keep_alive_status keep_alive_requested;int protocol;/* Memory registrations */
@@ -74,8 +67,6 @@ struct smbd_connection {wait_queue_head_t wait_post_send;struct workqueue_struct *workqueue; -struct work_struct send_immediate_work; -struct delayed_work idle_timer_work;/* for debug purposes */ unsigned int count_get_receive_buffer;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 45/142 smb: client: remove unused smbd_connection->protocol
In reply to Stefan MetzmacherThere is only one protocol version for smbdirect yet and this variable is write only.
--- fs/smb/client/cifs_debug.c | 5 +++-- fs/smb/client/smbdirect.c | 1 - fs/smb/client/smbdirect.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-)
fs/smb/client/cifs_debug.c +3 -2
@@ -24,6 +24,7 @@#endif #ifdef CONFIG_CIFS_SMB_DIRECT #include "smbdirect.h" +#include "../common/smbdirect/smbdirect_pdu.h" #endif #include "cifs_swn.h" #include "cached_dir.h"
@@ -442,8 +443,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nSMBDirect (in hex) protocol version: %x " "transport status: %x" , - server->smbd_conn->protocol, - server->smbd_conn->socket.status); +SMBDIRECT_V1 , + sc->status); seq_printf(m, "\nConn receive_credit_max: %x " "send_credit_target: %x max_send_size: %x", sp->recv_credit_max,
fs/smb/client/smbdirect.c +0 -1
@@ -454,7 +454,6 @@ static bool process_negotiation_response( le16_to_cpu(packet->negotiated_version));return false; } - info->protocol =le16_to_cpu (packet->negotiated_version);if (packet->credits_requested ==0 ) {log_rdma_event (ERR ,"error: credits_requested==0\n" );
fs/smb/client/smbdirect.h +0 -2
@@ -39,8 +39,6 @@ extern int smbd_receive_credit_max;struct smbd_connection {struct smbdirect_socket socket; -/* dynamic connection parameters defined in [MS-SMBD] 3.1.1.1 */ -int protocol;/* Memory registrations */ /* Maximum number of pages in a single RDMA write/read on this connection */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 46/142 smb: client: remove unused smbd_connection.count_reassembly_queue
In reply to Stefan MetzmacherThis basically represents the same information assc->recv_io.reassembly.queue_length.
The only thing that's different is that smbd_connection.count_reassembly_queue was updated in each loop step, while sc->recv_io.reassembly.queue_length is only updated once after the loop in smbd_recv.
Also sc->recv_io.reassembly.queue_length is updated under a spinlock.
--- fs/smb/client/cifs_debug.c | 3 +-- fs/smb/client/smbdirect.c | 2 -- fs/smb/client/smbdirect.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-)
fs/smb/client/cifs_debug.c +1 -2
@@ -465,12 +465,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) server->smbd_conn->count_get_receive_buffer, server->smbd_conn->count_put_receive_buffer, server->smbd_conn->count_send_empty); - seq_printf(m, "\nRead Queue count_reassembly_queue: %x " + seq_printf(m, "\nRead Queue " "count_enqueue_reassembly_queue: %x " "count_dequeue_reassembly_queue: %x " "reassembly_data_length: %x " "reassembly_queue_length: %x", - server->smbd_conn->count_reassembly_queue, server->smbd_conn->count_enqueue_reassembly_queue, server->smbd_conn->count_dequeue_reassembly_queue, sc->recv_io.reassembly.data_length,
fs/smb/client/smbdirect.c +0 -2
@@ -1307,7 +1307,6 @@ static void enqueue_reassembly(virt_wmb (); sc->recv_io.reassembly.data_length += data_length;spin_unlock (&sc->recv_io.reassembly.lock); - info->count_reassembly_queue++; info->count_enqueue_reassembly_queue++; }
@@ -2035,7 +2034,6 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg) &sc->recv_io.reassembly.lock); } queue_removed++; - info->count_reassembly_queue--; info->count_dequeue_reassembly_queue++;put_receive_buffer (info, response); offset =0 ;
fs/smb/client/smbdirect.h +0 -1
@@ -69,7 +69,6 @@ struct smbd_connection {/* for debug purposes */ unsigned int count_get_receive_buffer;unsigned int count_put_receive_buffer; -unsigned int count_reassembly_queue;unsigned int count_enqueue_reassembly_queue;unsigned int count_dequeue_reassembly_queue;unsigned int count_send_empty;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 47/142 smb: client: make use of smbdirect_socket.statistics
In reply to Stefan MetzmacherThis will allow us to use common functions soon.
Note this generates the following warnings fromscripts/checkpatch.pl --quiet:
WARNING: quoted string split across lines
#40: FILE: fs/smb/client/cifs_debug.c:464:
+ seq_printf(m, "\nDebug count_get_receive_buffer: %llx "
+ "count_put_receive_buffer: %llx count_send_empty: %llx",
WARNING: quoted string split across lines
#47: FILE: fs/smb/client/cifs_debug.c:469:
seq_printf(m, "\nRead Queue "
+ "count_enqueue_reassembly_queue: %llx "
WARNING: quoted string split across lines
#48: FILE: fs/smb/client/cifs_debug.c:470:
+ "count_enqueue_reassembly_queue: %llx "
+ "count_dequeue_reassembly_queue: %llx "
total: 0 errors, 3 warnings, 83 lines checked
scripts/checkpatch.pl: FAILED
But I left them in there, because it matches the code arround it...
--- fs/smb/client/cifs_debug.c | 18 +++++++++--------- fs/smb/client/smbdirect.c | 11 ++++++----- fs/smb/client/smbdirect.h | 7 ------- 3 files changed, 15 insertions(+), 21 deletions(-)
fs/smb/client/cifs_debug.c +9 -9
@@ -460,18 +460,18 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) sp->keepalive_interval_msec *1000 , sp->max_read_write_size, server->smbd_conn->rdma_readwrite_threshold); -seq_printf (m,"\nDebug count_get_receive_buffer: %x " -"count_put_receive_buffer: %x count_send_empty: %x" , - server->smbd_conn->count_get_receive_buffer, - server->smbd_conn->count_put_receive_buffer, - server->smbd_conn->count_send_empty); +seq_printf (m,"\nDebug count_get_receive_buffer: %llx " +"count_put_receive_buffer: %llx count_send_empty: %llx" , + sc->statistics.get_receive_buffer, + sc->statistics.put_receive_buffer, + sc->statistics.send_empty);seq_printf (m,"\nRead Queue " -"count_enqueue_reassembly_queue: %x " -"count_dequeue_reassembly_queue: %x " +"count_enqueue_reassembly_queue: %llx " +"count_dequeue_reassembly_queue: %llx " "reassembly_data_length: %x " "reassembly_queue_length: %x" , - server->smbd_conn->count_enqueue_reassembly_queue, - server->smbd_conn->count_dequeue_reassembly_queue, + sc->statistics.enqueue_reassembly_queue, + sc->statistics.dequeue_reassembly_queue, sc->recv_io.reassembly.data_length, sc->recv_io.reassembly.queue_length); seq_printf(m, "\nCurrent Credits send_credits: %x "
fs/smb/client/smbdirect.c +6 -5
@@ -1168,9 +1168,10 @@ static int smbd_post_send_iter(struct smbd_connection *info,*/ static int smbd_post_send_empty (struct smbd_connection *info) { +struct smbdirect_socket *sc = &info->socket;int remaining_data_length =0 ; - info->count_send_empty++; + sc->statistics.send_empty++;return smbd_post_send_iter (info,NULL , &remaining_data_length); }
@@ -1307,7 +1308,7 @@ static void enqueue_reassembly(virt_wmb (); sc->recv_io.reassembly.data_length += data_length;spin_unlock (&sc->recv_io.reassembly.lock); - info->count_enqueue_reassembly_queue++; + sc->statistics.enqueue_reassembly_queue++; }/*
@@ -1346,7 +1347,7 @@ static struct smbdirect_recv_io *get_receive_buffer(struct smbd_connection *info &sc->recv_io.free.list, struct smbdirect_recv_io, list);list_del (&ret->list); - info->count_get_receive_buffer++; + sc->statistics.get_receive_buffer++; }spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);
@@ -1375,7 +1376,7 @@ static void put_receive_buffer(spin_lock_irqsave (&sc->recv_io.free.lock, flags);list_add_tail (&response->list, &sc->recv_io.free.list); - info->count_put_receive_buffer++; + sc->statistics.put_receive_buffer++;spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);queue_work (info->workqueue, &sc->recv_io.posted.refill_work);
@@ -2034,7 +2035,7 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg) &sc->recv_io.reassembly.lock); } queue_removed++; - info->count_dequeue_reassembly_queue++; + sc->statistics.dequeue_reassembly_queue++;put_receive_buffer (info, response); offset =0 ;log_read (INFO ,"put_receive_buffer offset=0\n" );
fs/smb/client/smbdirect.h +0 -7
@@ -65,13 +65,6 @@ struct smbd_connection {wait_queue_head_t wait_post_send;struct workqueue_struct *workqueue; - -/* for debug purposes */ -unsigned int count_get_receive_buffer; -unsigned int count_put_receive_buffer; -unsigned int count_enqueue_reassembly_queue; -unsigned int count_dequeue_reassembly_queue; -unsigned int count_send_empty; };/* Create a SMBDirect session */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 48/142 smb: client: don't check sc->send_io.pending.count is below sp->send_credit_target
In reply to Stefan MetzmacherIf we were able to get a credit we don't need to prove and wait that sc->send_io.pending.count is below sp->send_credit_target.
This just adds useless complixity. The same code on the server also doesn't do this, so we should remove it from the client.
This will make it easier to momve to common code later.
--- fs/smb/client/smbdirect.c | 28 ++++------------------------ fs/smb/client/smbdirect.h | 3 --- 2 files changed, 4 insertions(+), 27 deletions(-)
fs/smb/client/smbdirect.c +4 -24
@@ -414,8 +414,6 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)if (atomic_dec_and_test (&sc->send_io.pending.count))wake_up (&sc->send_io.pending.wait_queue); -wake_up (&info->wait_post_send); -mempool_free (request, sc->send_io.mem.pool); }
@@ -1035,23 +1033,6 @@ static int smbd_post_send_iter(struct smbd_connection *info, goto wait_credit; } -wait_send_queue: -wait_event (info->wait_post_send, -atomic_read (&sc->send_io.pending.count) < sp->send_credit_target || - sc->status !=SMBDIRECT_SOCKET_CONNECTED ); - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { -log_outgoing (ERR ,"disconnected not sending on wait_send_queue\n" ); - rc = -EAGAIN ; - goto err_wait_send_queue; - } - -if (unlikely (atomic_inc_return (&sc->send_io.pending.count) > - sp->send_credit_target)) { -atomic_dec (&sc->send_io.pending.count); - goto wait_send_queue; - } - request =mempool_alloc (sc->send_io.mem.pool,GFP_KERNEL );if (!request) { rc = -ENOMEM ;
@@ -1133,10 +1114,14 @@ static int smbd_post_send_iter(struct smbd_connection *info, request->sge[0 ].length = header_length; request->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; +atomic_inc (&sc->send_io.pending.count); rc =smbd_post_send (info, request);if (!rc)return 0 ; +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.wait_queue); + err_dma:for (i =0 ; i < request->num_sge; i++)if (request->sge[i].addr)
@@ -1150,10 +1135,7 @@ static int smbd_post_send_iter(struct smbd_connection *info,atomic_sub (new_credits, &sc->recv_io.credits.count); err_alloc: -if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); -err_wait_send_queue:/* roll back send credits and pending */ atomic_inc (&sc->send_io.credits.count);
@@ -1862,8 +1844,6 @@ static struct smbd_connection *_smbd_get_connection(mod_delayed_work (info->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->negotiate_timeout_msec)); -init_waitqueue_head (&info->wait_post_send); -INIT_WORK (&sc->recv_io.posted.refill_work, smbd_post_send_credits); rc =smbd_negotiate (info);
fs/smb/client/smbdirect.h +0 -3
@@ -61,9 +61,6 @@ struct smbd_connection {/* Used by transport to wait until all MRs are returned */ wait_queue_head_t wait_for_mr_cleanup; -/* Activity accounting */ -wait_queue_head_t wait_post_send; -struct workqueue_struct *workqueue; };
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 49/142 smb: client: move rdma_readwrite_threshold from smbd_connection to TCP_Server_Info
In reply to Stefan MetzmacherThis belongs to the SMB layer not to the transport layer, it just uses the negotiated transport parameters to adjust the value if needed.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/cifsglob.h | 7 +++++++ fs/smb/client/smb2pdu.c | 2 +- fs/smb/client/smbdirect.c | 15 +++++++++++---- fs/smb/client/smbdirect.h | 7 ------- 5 files changed, 20 insertions(+), 13 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -459,7 +459,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)"max_readwrite_size: %x rdma_readwrite_threshold: %x" , sp->keepalive_interval_msec *1000 , sp->max_read_write_size, - server->smbd_conn->rdma_readwrite_threshold); + server->rdma_readwrite_threshold); seq_printf(m, "\nDebug count_get_receive_buffer: %llx " "count_put_receive_buffer: %llx count_send_empty: %llx", sc->statistics.get_receive_buffer,
fs/smb/client/cifsglob.h +7 -0
@@ -814,6 +814,13 @@ struct TCP_Server_Info {unsigned int max_read;unsigned int max_write;unsigned int min_offload; +/* +* If payload is less than or equal to the threshold, +* use RDMA send/recv to send upper layer I/O. +* If payload is more than the threshold, +* use RDMA read/write through memory registration for I/O. +*/ +unsigned int rdma_readwrite_threshold;unsigned int retrans;struct {bool requested;/* "compress" mount option set*/
fs/smb/client/smb2pdu.c +1 -1
@@ -4411,7 +4411,7 @@ static inline bool smb3_use_rdma_offload(struct cifs_io_parms *io_parms)return false;/* offload also has its overhead, so only do it if desired */ -if (io_parms->length < server->smbd_conn->rdma_readwrite_threshold) +if (io_parms->length < server->rdma_readwrite_threshold)return false;return true;
fs/smb/client/smbdirect.c +11 -4
@@ -489,10 +489,6 @@ static bool process_negotiation_response( } sp->max_fragmented_send_size =le32_to_cpu (packet->max_fragmented_size); - info->rdma_readwrite_threshold = - rdma_readwrite_threshold > sp->max_fragmented_send_size ? - sp->max_fragmented_send_size : - rdma_readwrite_threshold; sp->max_read_write_size = min_t(u32,
@@ -1898,6 +1894,7 @@ struct smbd_connection *smbd_get_connection( struct TCP_Server_Info *server, struct sockaddr *dstaddr) { struct smbd_connection *ret; +const struct smbdirect_socket_parameters *sp;int port =SMBD_PORT ; try_again:
@@ -1908,6 +1905,16 @@ struct smbd_connection *smbd_get_connection( port =SMB_PORT ; goto try_again; } +if (!ret) +return NULL ; + + sp = &ret->socket.parameters; + + server->rdma_readwrite_threshold = + rdma_readwrite_threshold > sp->max_fragmented_send_size ? + sp->max_fragmented_send_size : + rdma_readwrite_threshold; +return ret; }
fs/smb/client/smbdirect.h +0 -7
@@ -43,13 +43,6 @@ struct smbd_connection {/* Memory registrations */ /* Maximum number of pages in a single RDMA write/read on this connection */ int max_frmr_depth; -/* -* If payload is less than or equal to the threshold, -* use RDMA send/recv to send upper layer I/O. -* If payload is more than the threshold, -* use RDMA read/write through memory registration for I/O. -*/ -int rdma_readwrite_threshold;enum ib_mr_type mr_type;struct list_head mr_list;spinlock_t mr_list_lock;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 50/142 smb: client: make use of smbdirect_socket.workqueue
In reply to Stefan MetzmacherThis will simplify the move to common code...
--- fs/smb/client/smbdirect.c | 32 ++++++++++++++++---------------- fs/smb/client/smbdirect.h | 2 -- 2 files changed, 16 insertions(+), 18 deletions(-)
fs/smb/client/smbdirect.c +16 -16
@@ -213,7 +213,7 @@ static void smbd_disconnect_rdma_connection(struct smbd_connection *info) {struct smbdirect_socket *sc = &info->socket; -queue_work (info->workqueue, &sc->disconnect_work); +queue_work (sc->workqueue, &sc->disconnect_work); }/* Upcall from RDMA CM */
@@ -537,7 +537,7 @@ static void smbd_post_send_credits(struct work_struct *work)if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target -1 ) {log_keep_alive (INFO ,"schedule send of an empty message\n" ); -queue_work (info->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueue, &sc->idle.immediate_work); } }
@@ -579,7 +579,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* order to trigger our next keepalive message. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (info->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec));switch (sc->recv_io.expected) {
@@ -645,7 +645,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (le16_to_cpu (data_transfer->flags) &SMBDIRECT_FLAG_RESPONSE_REQUESTED ) {log_keep_alive (INFO ,"schedule send of immediate response\n" ); -queue_work (info->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueue, &sc->idle.immediate_work); }/*
@@ -654,7 +654,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)*/ if (data_length) {if (sc->recv_io.credits.target > old_recv_credit_target) -queue_work (info->workqueue, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueue, &sc->recv_io.posted.refill_work);enqueue_reassembly (info, response, data_length);wake_up (&sc->recv_io.reassembly.wait_queue);
@@ -953,7 +953,7 @@ static int manage_keep_alive_before_sending(struct smbd_connection *info)* Now use the keepalive timeout (instead of keepalive interval) * in order to wait for a response */ -mod_delayed_work (info->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));return 1 ; }
@@ -1357,7 +1357,7 @@ static void put_receive_buffer( sc->statistics.put_receive_buffer++;spin_unlock_irqrestore (&sc->recv_io.free.lock, flags); -queue_work (info->workqueue, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); }/* Preallocate all receive buffer on transport establishment */
@@ -1439,10 +1439,10 @@ static void idle_connection_timer(struct work_struct *work)* in order to wait for a response */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (info->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));log_keep_alive (INFO ,"schedule send of empty idle message\n" ); -queue_work (info->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueue, &sc->idle.immediate_work); }/*
@@ -1537,7 +1537,7 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->status =SMBDIRECT_SOCKET_DESTROYED ; -destroy_workqueue (info->workqueue); +destroy_workqueue (sc->workqueue);log_rdma_event (INFO ,"rdma session destroyed\n" );kfree (info); server->smbd_conn =NULL ;
@@ -1584,7 +1584,7 @@ static void destroy_caches_and_workqueue(struct smbd_connection *info)struct smbdirect_socket *sc = &info->socket;destroy_receive_buffers (info); -destroy_workqueue (info->workqueue); +destroy_workqueue (sc->workqueue);mempool_destroy (sc->recv_io.mem.pool);kmem_cache_destroy (sc->recv_io.mem.cache);mempool_destroy (sc->send_io.mem.pool);
@@ -1640,8 +1640,8 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info) goto out3;scnprintf (name,MAX_NAME_LEN ,"smbd_%p" , info); - info->workqueue =create_workqueue (name); -if (!info->workqueue) + sc->workqueue =create_workqueue (name); +if (!sc->workqueue) goto out4; rc =allocate_receive_buffers (info, sp->recv_credit_max);
@@ -1653,7 +1653,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)return 0 ; out5: -destroy_workqueue (info->workqueue); +destroy_workqueue (sc->workqueue); out4:mempool_destroy (sc->recv_io.mem.pool); out3:
@@ -1837,7 +1837,7 @@ static struct smbd_connection *_smbd_get_connection(* so that the timer will cause a disconnect. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (info->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->negotiate_timeout_msec));INIT_WORK (&sc->recv_io.posted.refill_work, smbd_post_send_credits);
@@ -2541,7 +2541,7 @@ int smbd_deregister_mr(struct smbd_mr *smbdirect_mr)* Schedule the work to do MR recovery for future I/Os MR * recovery is slow and don't want it to block current I/O */ -queue_work (info->workqueue, &info->mr_recovery_work); +queue_work (sc->workqueue, &info->mr_recovery_work); done:if (atomic_dec_and_test (&info->mr_used_count))
fs/smb/client/smbdirect.h +0 -2
@@ -53,8 +53,6 @@ struct smbd_connection {struct work_struct mr_recovery_work;/* Used by transport to wait until all MRs are returned */ wait_queue_head_t wait_for_mr_cleanup; - -struct workqueue_struct *workqueue; };/* Create a SMBDirect session */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 51/142 smb: client: add and use smbd_get_parameters()
In reply to Stefan MetzmacherIn future struct smbdirect_socket_parameters will be the only public structure for the smb layer. This prepares this...
--- fs/smb/client/smb2ops.c | 8 ++++---- fs/smb/client/smbdirect.c | 7 +++++++ fs/smb/client/smbdirect.h | 2 ++ 3 files changed, 13 insertions(+), 4 deletions(-)
fs/smb/client/smb2ops.c +4 -4
@@ -504,8 +504,8 @@ smb3_negotiate_wsize(struct cifs_tcon *tcon, struct smb3_fs_context *ctx) wsize = min_t(unsigned int, wsize, server->max_write);#ifdef CONFIG_CIFS_SMB_DIRECT if (server->rdma) { -struct smbdirect_socket_parameters *sp = - &server->smbd_conn->socket.parameters; +const struct smbdirect_socket_parameters *sp = +smbd_get_parameters (server->smbd_conn);if (server->sign)/*
@@ -555,8 +555,8 @@ smb3_negotiate_rsize(struct cifs_tcon *tcon, struct smb3_fs_context *ctx) rsize = min_t(unsigned int, rsize, server->max_read);#ifdef CONFIG_CIFS_SMB_DIRECT if (server->rdma) { -struct smbdirect_socket_parameters *sp = - &server->smbd_conn->socket.parameters; +const struct smbdirect_socket_parameters *sp = +smbd_get_parameters (server->smbd_conn);if (server->sign)/*
fs/smb/client/smbdirect.c +7 -0
@@ -13,6 +13,13 @@#include "cifsproto.h" #include "smb2proto.h" +const struct smbdirect_socket_parameters *smbd_get_parameters (struct smbd_connection *conn) +{ +struct smbdirect_socket *sc = &conn->socket; + +return &sc->parameters; +} +static struct smbdirect_recv_io *get_receive_buffer (struct smbd_connection *info); static void put_receive_buffer(
fs/smb/client/smbdirect.h +2 -0
@@ -59,6 +59,8 @@ struct smbd_connection {struct smbd_connection *smbd_get_connection (struct TCP_Server_Info *server,struct sockaddr *dstaddr); +const struct smbdirect_socket_parameters *smbd_get_parameters (struct smbd_connection *conn); +/* Reconnect SMBDirect session */ int smbd_reconnect (struct TCP_Server_Info *server);/* Destroy SMBDirect session */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 52/142 smb: client: make use of struct smbdirect_mr_io
In reply to Stefan MetzmacherThis will allow us to move to common functions in future too.
--- fs/smb/client/cifsglob.h | 2 +- fs/smb/client/smbdirect.c | 66 ++++++++++++++++++++------------------- fs/smb/client/smbdirect.h | 27 ++-------------- 3 files changed, 37 insertions(+), 58 deletions(-)
fs/smb/client/cifsglob.h +1 -1
@@ -1547,7 +1547,7 @@ struct cifs_io_subrequest {struct kvec iov[2 ];struct TCP_Server_Info *server;#ifdef CONFIG_CIFS_SMB_DIRECT -struct smbd_mr *mr; +struct smbdirect_mr_io *mr;#endif struct cifs_credits credits; };
fs/smb/client/smbdirect.c +34 -32
178 lines not on this page · raw message
fs/smb/client/smbdirect.h +2 -25
@@ -71,34 +71,11 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg);int smbd_send (struct TCP_Server_Info *server,int num_rqst,struct smb_rqst *rqst); -enum mr_state { -MR_READY , -MR_REGISTERED , -MR_INVALIDATED , -MR_ERROR -}; - -struct smbd_mr { -struct smbd_connection *conn; -struct list_head list; -enum mr_state state; -struct ib_mr *mr; -struct sg_table sgt; -enum dma_data_direction dir; -union { -struct ib_reg_wr wr; -struct ib_send_wr inv_wr; - }; -struct ib_cqe cqe; -bool need_invalidate; -struct completion invalidate_done; -}; -/* Interfaces to register and deregister MR for RDMA read/write */ -struct smbd_mr *smbd_register_mr ( +struct smbdirect_mr_io *smbd_register_mr (struct smbd_connection *info,struct iov_iter *iter,bool writing,bool need_invalidate); -int smbd_deregister_mr (struct smbd_mr *mr); +int smbd_deregister_mr (struct smbdirect_mr_io *mr);#else #define cifs_rdma_enabled (server) 0
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 53/142 smb: client: make use of smbdirect_socket_parameters.max_frmr_depth
In reply to Stefan MetzmacherThis make it easier to have common code later.
--- fs/smb/client/cifs_debug.c | 2 +- fs/smb/client/file.c | 16 ++++++++++++---- fs/smb/client/smbdirect.c | 34 ++++++++++++++++++---------------- fs/smb/client/smbdirect.h | 2 -- 4 files changed, 31 insertions(+), 23 deletions(-)
fs/smb/client/cifs_debug.c +1 -1
@@ -484,7 +484,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nMR responder_resources: %x " "max_frmr_depth: %x mr_type: %x" , sp->responder_resources, - server->smbd_conn->max_frmr_depth, + sp->max_frmr_depth, server->smbd_conn->mr_type); seq_printf(m, "\nMR mr_ready_count: %x mr_used_count: %x", atomic_read(&server->smbd_conn->mr_ready_count),
fs/smb/client/file.c +12 -4
@@ -97,8 +97,12 @@ static void cifs_prepare_write(struct netfs_io_subrequest *subreq) cifs_trace_rw_credits_write_prepare);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->smbd_conn) - stream->sreq_max_segs = server->smbd_conn->max_frmr_depth; +if (server->smbd_conn) { +const struct smbdirect_socket_parameters *sp = +smbd_get_parameters (server->smbd_conn); + + stream->sreq_max_segs = sp->max_frmr_depth; + }#endif }
@@ -187,8 +191,12 @@ static int cifs_prepare_read(struct netfs_io_subrequest *subreq) cifs_trace_rw_credits_read_submit);#ifdef CONFIG_CIFS_SMB_DIRECT -if (server->smbd_conn) - rreq->io_streams[0 ].sreq_max_segs = server->smbd_conn->max_frmr_depth; +if (server->smbd_conn) { +const struct smbdirect_socket_parameters *sp = +smbd_get_parameters (server->smbd_conn); + + rreq->io_streams[0 ].sreq_max_segs = sp->max_frmr_depth; + }#endif return 0 ; }
fs/smb/client/smbdirect.c +18 -16
@@ -443,8 +443,6 @@ static bool process_negotiation_response( struct smbdirect_recv_io *response, int packet_length) {struct smbdirect_socket *sc = response->socket; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_negotiate_resp *packet =smbdirect_recv_io_payload (response);
@@ -500,8 +498,8 @@ static bool process_negotiation_response( sp->max_read_write_size =min_t (u32,le32_to_cpu (packet->max_readwrite_size), - info->max_frmr_depth *PAGE_SIZE ); - info->max_frmr_depth = sp->max_read_write_size /PAGE_SIZE ; + sp->max_frmr_depth *PAGE_SIZE ); + sp->max_frmr_depth = sp->max_read_write_size /PAGE_SIZE ; sc->recv_io.expected =SMBDIRECT_EXPECT_DATA_TRANSFER ;return true;
@@ -791,6 +789,7 @@ static int smbd_ia_open( struct sockaddr *dstaddr, int port) {struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;int rc;WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED );
@@ -811,8 +810,8 @@ static int smbd_ia_open( rc = -EPROTONOSUPPORT ; goto out2; } - info->max_frmr_depth =min_t (int, - smbd_max_frmr_depth, + sp->max_frmr_depth =min_t (u32, + sp->max_frmr_depth, sc->ib.dev->attrs.max_fast_reg_page_list_len); info->mr_type =IB_MR_TYPE_MEM_REG ;if (sc->ib.dev->attrs.kernel_cap_flags &IBK_SG_GAPS_REG )
@@ -1706,6 +1705,7 @@ static struct smbd_connection *_smbd_get_connection( sp->max_send_size = smbd_max_send_size; sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size; sp->max_recv_size = smbd_max_receive_size; + sp->max_frmr_depth = smbd_max_frmr_depth; sp->keepalive_interval_msec = smbd_keep_alive_interval *1000 ; sp->keepalive_timeout_msec =KEEPALIVE_RECV_TIMEOUT *1000 ;
@@ -2191,6 +2191,7 @@ static void smbd_mr_recovery_work(struct work_struct *work)struct smbd_connection *info = container_of(work, struct smbd_connection, mr_recovery_work);struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_mr_io *smbdirect_mr;int rc;
@@ -2209,11 +2210,11 @@ static void smbd_mr_recovery_work(struct work_struct *work) smbdirect_mr->mr =ib_alloc_mr ( sc->ib.pd, info->mr_type, - info->max_frmr_depth); + sp->max_frmr_depth);if (IS_ERR (smbdirect_mr->mr)) {log_rdma_mr (ERR ,"ib_alloc_mr failed mr_type=%x max_frmr_depth=%x\n" , info->mr_type, - info->max_frmr_depth); + sp->max_frmr_depth);smbd_disconnect_rdma_connection (info);continue ; }
@@ -2284,13 +2285,13 @@ static int allocate_mr_list(struct smbd_connection *info)if (!smbdirect_mr) goto cleanup_entries; smbdirect_mr->mr =ib_alloc_mr (sc->ib.pd, info->mr_type, - info->max_frmr_depth); + sp->max_frmr_depth);if (IS_ERR (smbdirect_mr->mr)) {log_rdma_mr (ERR ,"ib_alloc_mr failed mr_type=%x max_frmr_depth=%x\n" , - info->mr_type, info->max_frmr_depth); + info->mr_type, sp->max_frmr_depth); goto out; } - smbdirect_mr->sgt.sgl =kcalloc (info->max_frmr_depth, + smbdirect_mr->sgt.sgl =kcalloc (sp->max_frmr_depth,sizeof (struct scatterlist ),GFP_KERNEL );if (!smbdirect_mr->sgt.sgl) {
@@ -2395,15 +2396,16 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info, bool writing, bool need_invalidate) {struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_mr_io *smbdirect_mr;int rc, num_pages;enum dma_data_direction dir;struct ib_reg_wr *reg_wr; - num_pages =iov_iter_npages (iter, info->max_frmr_depth +1 ); -if (num_pages > info->max_frmr_depth) { + num_pages =iov_iter_npages (iter, sp->max_frmr_depth +1 ); +if (num_pages > sp->max_frmr_depth) {log_rdma_mr (ERR ,"num_pages=%d max_frmr_depth=%d\n" , - num_pages, info->max_frmr_depth); + num_pages, sp->max_frmr_depth);WARN_ON_ONCE (1 );return NULL ; }
@@ -2421,8 +2423,8 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info, smbdirect_mr->sgt.orig_nents =0 ;log_rdma_mr (INFO ,"num_pages=0x%x count=0x%zx depth=%u\n" , - num_pages,iov_iter_count (iter), info->max_frmr_depth); -smbd_iter_to_mr (info, iter, &smbdirect_mr->sgt, info->max_frmr_depth); + num_pages,iov_iter_count (iter), sp->max_frmr_depth); +smbd_iter_to_mr (info, iter, &smbdirect_mr->sgt, sp->max_frmr_depth); rc =ib_dma_map_sg (sc->ib.dev, smbdirect_mr->sgt.sgl, smbdirect_mr->sgt.nents, dir);
fs/smb/client/smbdirect.h +0 -2
@@ -41,8 +41,6 @@ struct smbd_connection {/* Memory registrations */ -/* Maximum number of pages in a single RDMA write/read on this connection */ -int max_frmr_depth;enum ib_mr_type mr_type;struct list_head mr_list;spinlock_t mr_list_lock;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 54/142 smb: client: make use of smbdirect_socket.mr_io
In reply to Stefan MetzmacherNow struct smbd_connection only contains struct smbdirect_socket, this is an important step towards having common functions as well.
--- fs/smb/client/cifs_debug.c | 6 +-- fs/smb/client/smbdirect.c | 81 +++++++++++++++++--------------------- fs/smb/client/smbdirect.h | 13 ------ 3 files changed, 40 insertions(+), 60 deletions(-)
fs/smb/client/cifs_debug.c +3 -3
@@ -485,10 +485,10 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)"max_frmr_depth: %x mr_type: %x" , sp->responder_resources, sp->max_frmr_depth, - server->smbd_conn->mr_type); + sc->mr_io.type);seq_printf (m,"\nMR mr_ready_count: %x mr_used_count: %x" , -atomic_read (&server->smbd_conn->mr_ready_count), -atomic_read (&server->smbd_conn->mr_used_count)); +atomic_read (&sc->mr_io.ready.count), +atomic_read (&sc->mr_io.used.count)); skip_rdma: #endif seq_printf(m, "\nNumber of credits: %d,%d,%d Dialect 0x%x",
fs/smb/client/smbdirect.c +37 -44
201 lines not on this page · raw message
fs/smb/client/smbdirect.h +0 -13
@@ -38,19 +38,6 @@ extern int smbd_receive_credit_max;*/ struct smbd_connection {struct smbdirect_socket socket; - - -/* Memory registrations */ -enum ib_mr_type mr_type; -struct list_head mr_list; -spinlock_t mr_list_lock; -/* The number of available MRs ready for memory registration */ -atomic_t mr_ready_count; -atomic_t mr_used_count; -wait_queue_head_t wait_mr; -struct work_struct mr_recovery_work; -/* Used by transport to wait until all MRs are returned */ -wait_queue_head_t wait_for_mr_cleanup; };/* Create a SMBDirect session */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 55/142 smb: client: pass struct smbdirect_socket to {get,put}_receive_buffer()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
fs/smb/client/smbdirect.c +13 -15
@@ -21,9 +21,9 @@ const struct smbdirect_socket_parameters *smbd_get_parameters(struct smbd_connec }static struct smbdirect_recv_io *get_receive_buffer ( -struct smbd_connection *info); +struct smbdirect_socket *sc);static void put_receive_buffer ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct smbdirect_recv_io *response);static int allocate_receive_buffers (struct smbd_connection *info,int num_buf);static void destroy_receive_buffers (struct smbd_connection *info);
@@ -519,7 +519,7 @@ static void smbd_post_send_credits(struct work_struct *work)if (sc->recv_io.credits.target >atomic_read (&sc->recv_io.credits.count)) {while (true) { - response =get_receive_buffer (info); + response =get_receive_buffer (sc);if (!response)break ;
@@ -528,7 +528,7 @@ static void smbd_post_send_credits(struct work_struct *work)if (rc) {log_rdma_recv (ERR ,"post_recv failed rc=%d\n" , rc); -put_receive_buffer (info, response); +put_receive_buffer (sc, response);break ; }
@@ -592,7 +592,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; negotiate_done =process_negotiation_response (response, wc->byte_len); -put_receive_buffer (info, response); +put_receive_buffer (sc, response);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING );if (!negotiate_done) { sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;
@@ -662,7 +662,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)enqueue_reassembly (info, response, data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else -put_receive_buffer (info, response); +put_receive_buffer (sc, response);return ;
@@ -677,7 +677,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)log_rdma_recv (ERR ,"unexpected response type=%d\n" , sc->recv_io.expected);WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER ); error: -put_receive_buffer (info, response); +put_receive_buffer (sc, response);smbd_disconnect_rdma_connection (info); }
@@ -1225,7 +1225,7 @@ static int smbd_negotiate(struct smbd_connection *info)struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int rc; -struct smbdirect_recv_io *response =get_receive_buffer (info); +struct smbdirect_recv_io *response =get_receive_buffer (sc);WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ;
@@ -1317,9 +1317,8 @@ static struct smbdirect_recv_io *_get_first_reassembly(struct smbd_connection *i* pre-allocated in advance. * return value: the receive buffer, NULL if none is available */ -static struct smbdirect_recv_io *get_receive_buffer (struct smbd_connection *info) +static struct smbdirect_recv_io *get_receive_buffer (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *ret =NULL ;unsigned long flags;
@@ -1343,9 +1342,8 @@ static struct smbdirect_recv_io *get_receive_buffer(struct smbd_connection *info* receive buffer is returned. */ static void put_receive_buffer ( -struct smbd_connection *info,struct smbdirect_recv_io *response) +struct smbdirect_socket *sc,struct smbdirect_recv_io *response) { -struct smbdirect_socket *sc = &info->socket;unsigned long flags;if (likely (response->sge.length !=0 )) {
@@ -1400,7 +1398,7 @@ static void destroy_receive_buffers(struct smbd_connection *info)struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *response; -while ((response =get_receive_buffer (info))) +while ((response =get_receive_buffer (sc)))mempool_free (response, sc->recv_io.mem.pool); }
@@ -1501,7 +1499,7 @@ void smbd_destroy(struct TCP_Server_Info *server)list_del (&response->list);spin_unlock_irqrestore ( &sc->recv_io.reassembly.lock, flags); -put_receive_buffer (info, response); +put_receive_buffer (sc, response); }else spin_unlock_irqrestore ( &sc->recv_io.reassembly.lock, flags);
@@ -2028,7 +2026,7 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg) } queue_removed++; sc->statistics.dequeue_reassembly_queue++; -put_receive_buffer (info, response); +put_receive_buffer (sc, response); offset =0 ;log_read (INFO ,"put_receive_buffer offset=0\n" ); }else
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 56/142 smb: client: pass struct smbdirect_socket to {allocate,destroy}_receive_buffers()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
fs/smb/client/smbdirect.c +7 -9
@@ -25,8 +25,8 @@ static struct smbdirect_recv_io *get_receive_buffer(static void put_receive_buffer (struct smbdirect_socket *sc,struct smbdirect_recv_io *response); -static int allocate_receive_buffers (struct smbd_connection *info,int num_buf); -static void destroy_receive_buffers (struct smbd_connection *info); +static int allocate_receive_buffers (struct smbdirect_socket *sc,int num_buf); +static void destroy_receive_buffers (struct smbdirect_socket *sc); static void enqueue_reassembly( struct smbd_connection *info,
@@ -1363,9 +1363,8 @@ static void put_receive_buffer( }/* Preallocate all receive buffer on transport establishment */ -static int allocate_receive_buffers (struct smbd_connection *info,int num_buf) +static int allocate_receive_buffers (struct smbdirect_socket *sc,int num_buf) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *response;int i;
@@ -1393,9 +1392,8 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)return -ENOMEM ; } -static void destroy_receive_buffers (struct smbd_connection *info) +static void destroy_receive_buffers (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *response;while ((response =get_receive_buffer (sc)))
@@ -1507,7 +1505,7 @@ void smbd_destroy(struct TCP_Server_Info *server) sc->recv_io.reassembly.data_length =0 ;log_rdma_event (INFO ,"free receive buffers\n" ); -destroy_receive_buffers (info); +destroy_receive_buffers (sc);/* * For performance reasons, memory registration and deregistration
@@ -1585,7 +1583,7 @@ static void destroy_caches_and_workqueue(struct smbd_connection *info) {struct smbdirect_socket *sc = &info->socket; -destroy_receive_buffers (info); +destroy_receive_buffers (sc);destroy_workqueue (sc->workqueue);mempool_destroy (sc->recv_io.mem.pool);kmem_cache_destroy (sc->recv_io.mem.cache);
@@ -1646,7 +1644,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)if (!sc->workqueue) goto out4; - rc =allocate_receive_buffers (info, sp->recv_credit_max); + rc =allocate_receive_buffers (sc, sp->recv_credit_max);if (rc) {log_rdma_event (ERR ,"failed to allocate receive buffers\n" ); goto out5;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 57/142 smb: client: pass struct smbdirect_socket to {allocate,destroy}_caches_and_workqueue()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
fs/smb/client/smbdirect.c +7 -10
@@ -1579,10 +1579,8 @@ int smbd_reconnect(struct TCP_Server_Info *server)return -ENOENT ; } -static void destroy_caches_and_workqueue (struct smbd_connection *info) +static void destroy_caches_and_workqueue (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket; -destroy_receive_buffers (sc);destroy_workqueue (sc->workqueue);mempool_destroy (sc->recv_io.mem.pool);
@@ -1592,9 +1590,8 @@ static void destroy_caches_and_workqueue(struct smbd_connection *info) }#define MAX_NAME_LEN 80 -static int allocate_caches_and_workqueue (struct smbd_connection *info) +static int allocate_caches_and_workqueue (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;char name[MAX_NAME_LEN ];int rc;
@@ -1602,7 +1599,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)if (WARN_ON_ONCE (sp->max_recv_size <sizeof (struct smbdirect_data_transfer )))return -ENOMEM ; -scnprintf (name,MAX_NAME_LEN ,"smbdirect_send_io_%p" , info); +scnprintf (name,MAX_NAME_LEN ,"smbdirect_send_io_%p" , sc); sc->send_io.mem.cache = kmem_cache_create( name,
@@ -1618,7 +1615,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)if (!sc->send_io.mem.pool) goto out1; -scnprintf (name,MAX_NAME_LEN ,"smbdirect_recv_io_%p" , info); +scnprintf (name,MAX_NAME_LEN ,"smbdirect_recv_io_%p" , sc);struct kmem_cache_args response_args = { .align = __alignof__(struct smbdirect_recv_io ),
@@ -1639,7 +1636,7 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)if (!sc->recv_io.mem.pool) goto out3; -scnprintf (name,MAX_NAME_LEN ,"smbd_%p" , info); +scnprintf (name,MAX_NAME_LEN ,"smbd_%p" , sc); sc->workqueue =create_workqueue (name);if (!sc->workqueue) goto out4;
@@ -1825,7 +1822,7 @@ static struct smbd_connection *_smbd_get_connection(log_rdma_event (INFO ,"rdma_connect connected\n" ); - rc =allocate_caches_and_workqueue (info); + rc =allocate_caches_and_workqueue (sc);if (rc) {log_rdma_event (ERR ,"cache allocation failed\n" ); goto allocate_cache_failed;
@@ -1865,7 +1862,7 @@ static struct smbd_connection *_smbd_get_connection( negotiation_failed:disable_delayed_work_sync (&sc->idle.timer_work); -destroy_caches_and_workqueue (info); +destroy_caches_and_workqueue (sc); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ;rdma_disconnect (sc->rdma.cm_id); wait_event(sc->status_wait,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 58/142 smb: client: pass struct smbdirect_socket to {enqueue,_get_first}_reassembly()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
fs/smb/client/smbdirect.c +7 -10
@@ -29,10 +29,10 @@ static int allocate_receive_buffers(struct smbdirect_socket *sc, int num_buf);static void destroy_receive_buffers (struct smbdirect_socket *sc);static void enqueue_reassembly ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct smbdirect_recv_io *response,int data_length);static struct smbdirect_recv_io *_get_first_reassembly ( -struct smbd_connection *info); +struct smbdirect_socket *sc); static int smbd_post_recv( struct smbd_connection *info,
@@ -659,7 +659,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (sc->recv_io.credits.target > old_recv_credit_target)queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); -enqueue_reassembly (info, response, data_length); +enqueue_reassembly (sc, response, data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else put_receive_buffer (sc, response);
@@ -1272,12 +1272,10 @@ static int smbd_negotiate(struct smbd_connection *info)* data_length: the size of payload in this packet */ static void enqueue_reassembly ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct smbdirect_recv_io *response,int data_length) { -struct smbdirect_socket *sc = &info->socket; -spin_lock (&sc->recv_io.reassembly.lock);list_add_tail (&response->list, &sc->recv_io.reassembly.list); sc->recv_io.reassembly.queue_length++;
@@ -1298,9 +1296,8 @@ static void enqueue_reassembly(* Caller is responsible for locking * return value: the first entry if any, NULL if queue is empty */ -static struct smbdirect_recv_io *_get_first_reassembly (struct smbd_connection *info) +static struct smbdirect_recv_io *_get_first_reassembly (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *ret =NULL ;if (!list_empty (&sc->recv_io.reassembly.list)) {
@@ -1492,7 +1489,7 @@ void smbd_destroy(struct TCP_Server_Info *server)log_rdma_event (INFO ,"drain the reassembly queue\n" ); do { spin_lock_irqsave(&sc->recv_io.reassembly.lock, flags); - response = _get_first_reassembly(info); + response = _get_first_reassembly(sc); if (response) { list_del(&response->list); spin_unlock_irqrestore(
@@ -1968,7 +1965,7 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg) to_read = size; offset = sc->recv_io.reassembly.first_entry_offset;while (data_read < size) { - response =_get_first_reassembly (info); + response =_get_first_reassembly (sc); data_transfer =smbdirect_recv_io_payload (response); data_length =le32_to_cpu (data_transfer->data_length); remaining_data_length =
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 59/142 smb: client: pass struct smbdirect_socket to {allocate,destroy}_mr_list()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
fs/smb/client/smbdirect.c +6 -8
@@ -40,8 +40,8 @@ static int smbd_post_recv(static int smbd_post_send_empty (struct smbd_connection *info); -static void destroy_mr_list (struct smbd_connection *info); -static int allocate_mr_list (struct smbd_connection *info); +static void destroy_mr_list (struct smbdirect_socket *sc); +static int allocate_mr_list (struct smbdirect_socket *sc);struct smb_extract_to_rdma {struct ib_sge *sge;
@@ -1518,7 +1518,7 @@ void smbd_destroy(struct TCP_Server_Info *server)msleep (1000 );cifs_server_lock (server); } -destroy_mr_list (info); +destroy_mr_list (sc);ib_free_cq (sc->ib.send_cq);ib_free_cq (sc->ib.recv_cq);
@@ -1843,7 +1843,7 @@ static struct smbd_connection *_smbd_get_connection( goto negotiation_failed; } - rc =allocate_mr_list (info); + rc =allocate_mr_list (sc);if (rc) {log_rdma_mr (ERR ,"memory registration allocation failed\n" ); goto allocate_mr_failed;
@@ -2225,9 +2225,8 @@ static void smbd_mr_recovery_work(struct work_struct *work) } } -static void destroy_mr_list (struct smbd_connection *info) +static void destroy_mr_list (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_mr_io *mr, *tmp;disable_work_sync (&sc->mr_io.recovery_work);
@@ -2248,9 +2247,8 @@ static void destroy_mr_list(struct smbd_connection *info)* Recovery is done in smbd_mr_recovery_work. The content of list entry changes * as MRs are used and recovered for I/O, but the list links will not change */ -static int allocate_mr_list (struct smbd_connection *info) +static int allocate_mr_list (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int i;struct smbdirect_mr_io *smbdirect_mr, *tmp;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 60/142 smb: client: pass struct smbdirect_socket to smbd_disconnect_rdma_connection()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 41 +++++++++++++-------------------------- 1 file changed, 14 insertions(+), 27 deletions(-)
fs/smb/client/smbdirect.c +14 -27
@@ -214,10 +214,8 @@ static void smbd_disconnect_rdma_work(struct work_struct *work) } } -static void smbd_disconnect_rdma_connection (struct smbd_connection *info) +static void smbd_disconnect_rdma_connection (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket; -queue_work (sc->workqueue, &sc->disconnect_work); }
@@ -363,6 +361,7 @@ static void smbd_qp_async_error_upcall(struct ib_event *event, void *context) { struct smbd_connection *info = context; +struct smbdirect_socket *sc = &info->socket;log_rdma_event (ERR ,"%s on device %s info %p\n" ,ib_event_msg (event->event), event->device->name, info);
@@ -370,7 +369,7 @@ smbd_qp_async_error_upcall(struct ib_event *event, void *context)switch (event->event) {case IB_EVENT_CQ_ERR :case IB_EVENT_QP_FATAL : -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);break ;default :
@@ -395,8 +394,6 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_send_io *request = container_of(wc->wr_cqe, struct smbdirect_send_io, cqe);struct smbdirect_socket *sc = request->socket; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);log_rdma_send (INFO ,"smbdirect_send_io 0x%p completed wc->status=%s\n" , request,ib_wc_status_msg (wc->status));
@@ -412,7 +409,7 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)log_rdma_send (ERR ,"wc->status=%s wc->opcode=%d\n" ,ib_wc_status_msg (wc->status), wc->opcode);mempool_free (request, sc->send_io.mem.pool); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);return ; }
@@ -552,8 +549,6 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe);struct smbdirect_socket *sc = response->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);u16 old_recv_credit_target;int data_length =0 ;bool negotiate_done = false;
@@ -678,7 +673,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER ); error:put_receive_buffer (sc, response); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc); } static struct rdma_cm_id *smbd_create_id(
@@ -903,7 +898,7 @@ static int smbd_post_send_negotiate_req(struct smbd_connection *info)ib_dma_unmap_single (sc->ib.dev, request->sge[0 ].addr, request->sge[0 ].length,DMA_TO_DEVICE ); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc); dma_mapping_failed:mempool_free (request, sc->send_io.mem.pool);
@@ -995,7 +990,7 @@ static int smbd_post_send(struct smbd_connection *info, rc =ib_post_send (sc->ib.qp, &send_wr,NULL );if (rc) {log_rdma_send (ERR ,"ib_post_send failed rc=%d\n" , rc); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc); rc = -EAGAIN ; }
@@ -1212,7 +1207,7 @@ static int smbd_post_recv(ib_dma_unmap_single (sc->ib.dev, response->sge.addr, response->sge.length,DMA_FROM_DEVICE ); response->sge.length =0 ; -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);log_rdma_recv (ERR ,"ib_post_recv failed rc=%d\n" , rc); }
@@ -1417,14 +1412,12 @@ static void idle_connection_timer(struct work_struct *work)struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, idle.timer_work.work);struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) {log_keep_alive (ERR ,"error status sc->idle.keepalive=%d\n" , sc->idle.keepalive); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);return ; }
@@ -2156,12 +2149,10 @@ static void register_mr_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_mr_io *mr = container_of(wc->wr_cqe, struct smbdirect_mr_io, cqe);struct smbdirect_socket *sc = mr->socket; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);if (wc->status) {log_rdma_mr (ERR ,"status=%d\n" , wc->status); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc); } }
@@ -2179,8 +2170,6 @@ static void smbd_mr_recovery_work(struct work_struct *work)struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, mr_io.recovery_work);struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);struct smbdirect_mr_io *smbdirect_mr;int rc;
@@ -2193,7 +2182,7 @@ static void smbd_mr_recovery_work(struct work_struct *work)log_rdma_mr (ERR ,"ib_dereg_mr failed rc=%x\n" , rc); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);continue ; }
@@ -2204,7 +2193,7 @@ static void smbd_mr_recovery_work(struct work_struct *work)log_rdma_mr (ERR ,"ib_alloc_mr failed mr_type=%x max_frmr_depth=%x\n" , sc->mr_io.type, sp->max_frmr_depth); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);continue ; } }else
@@ -2460,7 +2449,7 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info,if (atomic_dec_and_test (&sc->mr_io.used.count))wake_up (&sc->mr_io.cleanup.wait_queue); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc);return NULL ; }
@@ -2490,8 +2479,6 @@ int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr) {struct ib_send_wr *wr;struct smbdirect_socket *sc = smbdirect_mr->socket; -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);int rc =0 ;if (smbdirect_mr->need_invalidate) {
@@ -2508,7 +2495,7 @@ int smbd_deregister_mr(struct smbdirect_mr_io *smbdirect_mr) rc =ib_post_send (sc->ib.qp, wr,NULL );if (rc) {log_rdma_mr (ERR ,"ib_post_send failed rc=%x\n" , rc); -smbd_disconnect_rdma_connection (info); +smbd_disconnect_rdma_connection (sc); goto done; }wait_for_completion (&smbdirect_mr->invalidate_done);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 61/142 smb: client: pass struct smbdirect_socket to smbd_post_recv()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
fs/smb/client/smbdirect.c +4 -7
@@ -35,7 +35,7 @@ static struct smbdirect_recv_io *_get_first_reassembly( struct smbdirect_socket *sc);static int smbd_post_recv ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct smbdirect_recv_io *response);static int smbd_post_send_empty (struct smbd_connection *info);
@@ -506,8 +506,6 @@ static void smbd_post_send_credits(struct work_struct *work)struct smbdirect_recv_io *response;struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, recv_io.posted.refill_work); -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) {return ;
@@ -521,7 +519,7 @@ static void smbd_post_send_credits(struct work_struct *work)break ; response->first_segment = false; - rc =smbd_post_recv (info, response); + rc =smbd_post_recv (sc, response);if (rc) {log_rdma_recv (ERR ,"post_recv failed rc=%d\n" , rc);
@@ -1179,9 +1177,8 @@ static int smbd_post_send_full_iter(struct smbd_connection *info,* The interaction is controlled by send/receive credit system */ static int smbd_post_recv ( -struct smbd_connection *info,struct smbdirect_recv_io *response) +struct smbdirect_socket *sc,struct smbdirect_recv_io *response) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_recv_wr recv_wr;int rc = -EIO ;
@@ -1226,7 +1223,7 @@ static int smbd_negotiate(struct smbd_connection *info) sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ; sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REP ; - rc =smbd_post_recv (info, response); + rc =smbd_post_recv (sc, response);log_rdma_event (INFO ,"smbd_post_recv rc=%d iov.addr=0x%llx iov.length=%u iov.lkey=0x%x\n" , rc, response->sge.addr, response->sge.length, response->sge.lkey);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 62/142 smb: client: pass struct smbdirect_socket to manage_credits_prior_sending()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -911,9 +911,8 @@ static int smbd_post_send_negotiate_req(struct smbd_connection *info)* buffer as possible, and extend the receive credits to remote peer * return value: the new credtis being granted. */ -static int manage_credits_prior_sending (struct smbd_connection *info) +static int manage_credits_prior_sending (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;int new_credits;if (atomic_read (&sc->recv_io.credits.count) >= sc->recv_io.credits.target)
@@ -1064,7 +1063,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, packet =smbdirect_send_io_payload (request); packet->credits_requested =cpu_to_le16 (sp->send_credit_target); - new_credits =manage_credits_prior_sending (info); + new_credits =manage_credits_prior_sending (sc);atomic_add (new_credits, &sc->recv_io.credits.count); packet->credits_granted =cpu_to_le16 (new_credits);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 63/142 smb: client: pass struct smbdirect_socket to smbd_post_send()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -957,10 +957,9 @@ static int manage_keep_alive_before_sending(struct smbd_connection *info) }/* Post the send request */ -static int smbd_post_send (struct smbd_connection *info, +static int smbd_post_send (struct smbdirect_socket *sc,struct smbdirect_send_io *request) { -struct smbdirect_socket *sc = &info->socket;struct ib_send_wr send_wr;int rc, i;
@@ -1107,7 +1106,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, request->sge[0 ].lkey = sc->ib.pd->local_dma_lkey;atomic_inc (&sc->send_io.pending.count); - rc =smbd_post_send (info, request); + rc =smbd_post_send (sc, request);if (!rc)return 0 ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 64/142 smb: client: pass struct smbdirect_socket to manage_keep_alive_before_sending()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -938,9 +938,8 @@ static int manage_credits_prior_sending(struct smbdirect_socket *sc)* 1 if SMBDIRECT_FLAG_RESPONSE_REQUESTED needs to be set * 0: otherwise */ -static int manage_keep_alive_before_sending (struct smbd_connection *info) +static int manage_keep_alive_before_sending (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) {
@@ -1067,7 +1066,7 @@ static int smbd_post_send_iter(struct smbd_connection *info, packet->credits_granted =cpu_to_le16 (new_credits); packet->flags =0 ; -if (manage_keep_alive_before_sending (info)) +if (manage_keep_alive_before_sending (sc)) packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); packet->reserved =0 ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 65/142 smb: client: pass struct smbdirect_socket to smbd_post_send_iter()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/smb/client/smbdirect.c +4 -4
@@ -992,11 +992,10 @@ static int smbd_post_send(struct smbdirect_socket *sc,return rc; } -static int smbd_post_send_iter (struct smbd_connection *info, +static int smbd_post_send_iter (struct smbdirect_socket *sc,struct iov_iter *iter,int *_remaining_data_length) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int i, rc;int header_length;
@@ -1144,13 +1143,14 @@ static int smbd_post_send_empty(struct smbd_connection *info)int remaining_data_length =0 ; sc->statistics.send_empty++; -return smbd_post_send_iter (info,NULL , &remaining_data_length); +return smbd_post_send_iter (sc,NULL , &remaining_data_length); }static int smbd_post_send_full_iter (struct smbd_connection *info,struct iov_iter *iter,int *_remaining_data_length) { +struct smbdirect_socket *sc = &info->socket;int rc =0 ;/*
@@ -1160,7 +1160,7 @@ static int smbd_post_send_full_iter(struct smbd_connection *info,*/ while (iov_iter_count (iter) >0 ) { - rc =smbd_post_send_iter (info, iter, _remaining_data_length); + rc =smbd_post_send_iter (sc, iter, _remaining_data_length);if (rc <0 )break ; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 66/142 smb: client: pass struct smbdirect_socket to smbd_post_send_empty()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
fs/smb/client/smbdirect.c +3 -6
@@ -38,7 +38,7 @@ static int smbd_post_recv(struct smbdirect_socket *sc, struct smbdirect_recv_io *response); -static int smbd_post_send_empty (struct smbd_connection *info); +static int smbd_post_send_empty (struct smbdirect_socket *sc);static void destroy_mr_list (struct smbdirect_socket *sc);static int allocate_mr_list (struct smbdirect_socket *sc);
@@ -1137,9 +1137,8 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc,* Empty message is used to extend credits to peer to for keep live * while there is no upper layer payload to send at the time */ -static int smbd_post_send_empty (struct smbd_connection *info) +static int smbd_post_send_empty (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;int remaining_data_length =0 ; sc->statistics.send_empty++;
@@ -1390,14 +1389,12 @@ static void send_immediate_empty_message(struct work_struct *work) {struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, idle.immediate_work); -struct smbd_connection *info = - container_of(sc, struct smbd_connection, socket);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ;log_keep_alive (INFO ,"send an empty message\n" ); -smbd_post_send_empty (info); +smbd_post_send_empty (sc); }/* Implement idle connection timer [MS-SMBD] 3.1.6.2 */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 67/142 smb: client: pass struct smbdirect_socket to smbd_post_send_full_iter()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/client/smbdirect.c +3 -4
@@ -1145,11 +1145,10 @@ static int smbd_post_send_empty(struct smbdirect_socket *sc)return smbd_post_send_iter (sc,NULL , &remaining_data_length); } -static int smbd_post_send_full_iter (struct smbd_connection *info, +static int smbd_post_send_full_iter (struct smbdirect_socket *sc,struct iov_iter *iter,int *_remaining_data_length) { -struct smbdirect_socket *sc = &info->socket;int rc =0 ;/*
@@ -2104,13 +2103,13 @@ int smbd_send(struct TCP_Server_Info *server, klen += rqst->rq_iov[i].iov_len;iov_iter_kvec (&iter,ITER_SOURCE , rqst->rq_iov, rqst->rq_nvec, klen); - rc =smbd_post_send_full_iter (info, &iter, &remaining_data_length); + rc =smbd_post_send_full_iter (sc, &iter, &remaining_data_length);if (rc <0 )break ;if (iov_iter_count (&rqst->rq_iter) >0 ) {/* And then the data pages if there are any */ - rc =smbd_post_send_full_iter (info, &rqst->rq_iter, + rc =smbd_post_send_full_iter (sc, &rqst->rq_iter, &remaining_data_length);if (rc <0 )break ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 68/142 smb: client: pass struct smbdirect_socket to smbd_conn_upcall()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -223,8 +223,7 @@ static void smbd_disconnect_rdma_connection(struct smbdirect_socket *sc)static int smbd_conn_upcall (struct rdma_cm_id *id,struct rdma_cm_event *event) { -struct smbd_connection *info = id->context; -struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket *sc = id->context;struct smbdirect_socket_parameters *sp = &sc->parameters;const char *event_name =rdma_event_msg (event->event);u8 peer_initiator_depth;
@@ -684,7 +683,7 @@ static struct rdma_cm_id *smbd_create_id(int rc;__be16 *sport; - id =rdma_create_id (&init_net, smbd_conn_upcall, info, + id =rdma_create_id (&init_net, smbd_conn_upcall, sc,RDMA_PS_TCP ,IB_QPT_RC );if (IS_ERR (id)) { rc =PTR_ERR (id);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 69/142 smb: client: pass struct smbdirect_socket to smbd_qp_async_error_upcall()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
fs/smb/client/smbdirect.c +6 -7
@@ -359,11 +359,10 @@ static int smbd_conn_upcall(static void smbd_qp_async_error_upcall (struct ib_event *event,void *context) { -struct smbd_connection *info = context; -struct smbdirect_socket *sc = &info->socket; +struct smbdirect_socket *sc = context; -log_rdma_event (ERR ,"%s on device %s info %p\n" , -ib_event_msg (event->event), event->device->name, info); +log_rdma_event (ERR ,"%s on device %s socket %p\n" , +ib_event_msg (event->event), event->device->name, sc);switch (event->event) {case IB_EVENT_CQ_ERR :
@@ -1715,7 +1714,7 @@ static struct smbd_connection *_smbd_get_connection( } sc->ib.send_cq = -ib_alloc_cq_any (sc->ib.dev, info, +ib_alloc_cq_any (sc->ib.dev, sc, sp->send_credit_target,IB_POLL_SOFTIRQ );if (IS_ERR (sc->ib.send_cq)) { sc->ib.send_cq =NULL ;
@@ -1723,7 +1722,7 @@ static struct smbd_connection *_smbd_get_connection( } sc->ib.recv_cq = -ib_alloc_cq_any (sc->ib.dev, info, +ib_alloc_cq_any (sc->ib.dev, sc, sp->recv_credit_max,IB_POLL_SOFTIRQ );if (IS_ERR (sc->ib.recv_cq)) { sc->ib.recv_cq =NULL ;
@@ -1732,7 +1731,7 @@ static struct smbd_connection *_smbd_get_connection(memset (&qp_attr,0 ,sizeof (qp_attr)); qp_attr.event_handler = smbd_qp_async_error_upcall; - qp_attr.qp_context = info; + qp_attr.qp_context = sc; qp_attr.cap.max_send_wr = sp->send_credit_target; qp_attr.cap.max_recv_wr = sp->recv_credit_max; qp_attr.cap.max_send_sge =SMBDIRECT_SEND_IO_MAX_SGE ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 70/142 smb: client: pass struct smbdirect_socket to smbd_create_id()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -673,10 +673,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) }static struct rdma_cm_id *smbd_create_id ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct sockaddr *dstaddr,int port) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct rdma_cm_id *id;int rc;
@@ -784,7 +783,7 @@ static int smbd_ia_open(WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED ); sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ; - sc->rdma.cm_id =smbd_create_id (info, dstaddr, port); + sc->rdma.cm_id =smbd_create_id (sc, dstaddr, port);if (IS_ERR (sc->rdma.cm_id)) { rc =PTR_ERR (sc->rdma.cm_id); goto out1;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 71/142 smb: client: pass struct smbdirect_socket to smbd_ia_open()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -773,10 +773,9 @@ static bool frwr_is_supported(struct ib_device_attr *attrs) }static int smbd_ia_open ( -struct smbd_connection *info, +struct smbdirect_socket *sc,struct sockaddr *dstaddr,int port) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int rc;
@@ -1677,7 +1676,7 @@ static struct smbd_connection *_smbd_get_connection( sp->keepalive_interval_msec = smbd_keep_alive_interval *1000 ; sp->keepalive_timeout_msec =KEEPALIVE_RECV_TIMEOUT *1000 ; - rc =smbd_ia_open (info, dstaddr, port); + rc =smbd_ia_open (sc, dstaddr, port);if (rc) {log_rdma_event (INFO ,"smbd_ia_open rc=%d\n" , rc); goto create_id_failed;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 72/142 smb: client: pass struct smbdirect_socket to smbd_post_send_negotiate_req()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -827,9 +827,8 @@ static int smbd_ia_open(* After negotiation, the transport is connected and ready for * carrying upper layer SMB payload */ -static int smbd_post_send_negotiate_req (struct smbd_connection *info) +static int smbd_post_send_negotiate_req (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_send_wr send_wr;int rc = -ENOMEM ;
@@ -1221,7 +1220,7 @@ static int smbd_negotiate(struct smbd_connection *info)if (rc)return rc; - rc =smbd_post_send_negotiate_req (info); + rc =smbd_post_send_negotiate_req (sc);if (rc)return rc;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 73/142 smb: client: pass struct smbdirect_socket to smbd_negotiate()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -1202,9 +1202,8 @@ static int smbd_post_recv( }/* Perform SMBD negotiate according to [MS-SMBD] 3.1.5.2 */ -static int smbd_negotiate (struct smbd_connection *info) +static int smbd_negotiate (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int rc;struct smbdirect_recv_io *response =get_receive_buffer (sc);
@@ -1815,7 +1814,7 @@ static struct smbd_connection *_smbd_get_connection(INIT_WORK (&sc->recv_io.posted.refill_work, smbd_post_send_credits); - rc =smbd_negotiate (info); + rc =smbd_negotiate (sc);if (rc) {log_rdma_event (ERR ,"smbd_negotiate rc=%d\n" , rc); goto negotiation_failed;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 74/142 smb: client: pass struct smbdirect_socket to get_mr()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -2281,9 +2281,8 @@ static int allocate_mr_list(struct smbdirect_socket *sc)* issuing I/O trying to get MR at the same time, mr_list_lock is used to * protect this situation. */ -static struct smbdirect_mr_io *get_mr (struct smbd_connection *info) +static struct smbdirect_mr_io *get_mr (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &info->socket;struct smbdirect_mr_io *ret;int rc; again:
@@ -2364,7 +2363,7 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info,return NULL ; } - smbdirect_mr =get_mr (info); + smbdirect_mr =get_mr (sc);if (!smbdirect_mr) {log_rdma_mr (ERR ,"get_mr returning NULL\n" );return NULL ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 75/142 smb: client: remove unused struct smbdirect_socket argument of smbd_iter_to_mr()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/client/smbdirect.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/client/smbdirect.c +2 -3
@@ -2321,8 +2321,7 @@ static struct smbdirect_mr_io *get_mr(struct smbdirect_socket *sc)/* * Transcribe the pages from an iterator into an MR scatterlist. */ -static int smbd_iter_to_mr (struct smbd_connection *info, -struct iov_iter *iter, +static int smbd_iter_to_mr (struct iov_iter *iter,struct sg_table *sgt,unsigned int max_sg) {
@@ -2377,7 +2376,7 @@ struct smbdirect_mr_io *smbd_register_mr(struct smbd_connection *info,log_rdma_mr (INFO ,"num_pages=0x%x count=0x%zx depth=%u\n" , num_pages,iov_iter_count (iter), sp->max_frmr_depth); -smbd_iter_to_mr (info, iter, &smbdirect_mr->sgt, sp->max_frmr_depth); +smbd_iter_to_mr (iter, &smbdirect_mr->sgt, sp->max_frmr_depth); rc =ib_dma_map_sg (sc->ib.dev, smbdirect_mr->sgt.sgl, smbdirect_mr->sgt.nents, dir);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 76/142 smb: server: make use of common smbdirect_pdu.h
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 49 +++++++++++++++++----------------- fs/smb/server/transport_rdma.h | 41 ---------------------------- 2 files changed, 25 insertions(+), 65 deletions(-)
fs/smb/server/transport_rdma.c +25 -24
@@ -23,12 +23,13 @@#include "connection.h" #include "smb_common.h" #include "../common/smb2status.h" +#include "../common/smbdirect/smbdirect_pdu.h" #include "transport_rdma.h" #define SMB_DIRECT_PORT_IWARP 5445#define SMB_DIRECT_PORT_INFINIBAND 445 -#define SMB_DIRECT_VERSION_LE cpu_to_le16(0x0100) +#define SMB_DIRECT_VERSION_LE cpu_to_le16(SMBDIRECT_V1)/* SMB_DIRECT negotiation timeout in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 120
@@ -479,8 +480,8 @@ static int smb_direct_check_recvmsg(struct smb_direct_recvmsg *recvmsg) {switch (recvmsg->type) {case SMB_DIRECT_MSG_DATA_TRANSFER : { -struct smb_direct_data_transfer *req = - (struct smb_direct_data_transfer *)recvmsg->packet; +struct smbdirect_data_transfer *req = + (struct smbdirect_data_transfer *)recvmsg->packet;struct smb2_hdr *hdr = (struct smb2_hdr *)(recvmsg->packet +le32_to_cpu (req->data_offset)); ksmbd_debug(RDMA,
@@ -492,8 +493,8 @@ static int smb_direct_check_recvmsg(struct smb_direct_recvmsg *recvmsg)break ; }case SMB_DIRECT_MSG_NEGOTIATE_REQ : { -struct smb_direct_negotiate_req *req = - (struct smb_direct_negotiate_req *)recvmsg->packet; +struct smbdirect_negotiate_req *req = + (struct smbdirect_negotiate_req *)recvmsg->packet; ksmbd_debug(RDMA, "MinVersion: %u, MaxVersion: %u, CreditRequested: %u, MaxSendSize: %u, MaxRecvSize: %u, MaxFragmentedSize: %u\n", le16_to_cpu(req->min_version),
@@ -547,7 +548,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)switch (recvmsg->type) {case SMB_DIRECT_MSG_NEGOTIATE_REQ : -if (wc->byte_len <sizeof (struct smb_direct_negotiate_req )) { +if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) {put_recvmsg (t, recvmsg);smb_direct_disconnect_rdma_connection (t);return ;
@@ -559,13 +560,13 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)wake_up_interruptible (&t->wait_status);return ;case SMB_DIRECT_MSG_DATA_TRANSFER : { -struct smb_direct_data_transfer *data_transfer = - (struct smb_direct_data_transfer *)recvmsg->packet; +struct smbdirect_data_transfer *data_transfer = + (struct smbdirect_data_transfer *)recvmsg->packet;unsigned int data_length;int avail_recvmsg_count, receive_credits;if (wc->byte_len < - offsetof(struct smb_direct_data_transfer , padding)) { + offsetof(struct smbdirect_data_transfer , padding)) {put_recvmsg (t, recvmsg);smb_direct_disconnect_rdma_connection (t);return ;
@@ -573,7 +574,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) data_length =le32_to_cpu (data_transfer->data_length);if (data_length) { -if (wc->byte_len <sizeof (struct smb_direct_data_transfer ) + +if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + (u64 )data_length) {put_recvmsg (t, recvmsg);smb_direct_disconnect_rdma_connection (t);
@@ -605,7 +606,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) &t->send_credits);if (le16_to_cpu (data_transfer->flags) & -SMB_DIRECT_RESPONSE_REQUESTED ) +SMBDIRECT_FLAG_RESPONSE_REQUESTED )queue_work (smb_direct_wq, &t->send_immediate_work);if (atomic_read (&t->send_credits) >0 )
@@ -671,7 +672,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, unsigned int size, int unused) {struct smb_direct_recvmsg *recvmsg; -struct smb_direct_data_transfer *data_transfer; +struct smbdirect_data_transfer *data_transfer;int to_copy, to_read, data_read, offset;u32 data_length, remaining_data_length, data_offset;int rc;
@@ -1008,7 +1009,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, struct smb_direct_sendmsg **sendmsg_out) {struct smb_direct_sendmsg *sendmsg; -struct smb_direct_data_transfer *packet; +struct smbdirect_data_transfer *packet;int header_length;int ret;
@@ -1017,7 +1018,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t,return PTR_ERR (sendmsg);/* Fill in the packet header */ - packet = (struct smb_direct_data_transfer *)sendmsg->packet; + packet = (struct smbdirect_data_transfer *)sendmsg->packet; packet->credits_requested =cpu_to_le16 (t->send_credit_target); packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t));
@@ -1040,11 +1041,11 @@ static int smb_direct_create_header(struct smb_direct_transport *t, le32_to_cpu(packet->remaining_data_length));/* Map the packet to DMA */ - header_length =sizeof (struct smb_direct_data_transfer ); + header_length =sizeof (struct smbdirect_data_transfer );/* If this is a packet without payload, don't send padding */ if (!size) header_length = - offsetof(struct smb_direct_data_transfer , padding); + offsetof(struct smbdirect_data_transfer , padding); sendmsg->sge[0].addr = ib_dma_map_single(t->cm_id->device, (void *)packet,
@@ -1219,7 +1220,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,int remaining_data_length;int start, i, j;int max_iov_size = st->max_send_size - -sizeof (struct smb_direct_data_transfer ); +sizeof (struct smbdirect_data_transfer );int ret;struct kvec vec;struct smb_direct_send_ctx send_ctx;
@@ -1567,18 +1568,18 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, int failed) {struct smb_direct_sendmsg *sendmsg; -struct smb_direct_negotiate_resp *resp; +struct smbdirect_negotiate_resp *resp;int ret; sendmsg =smb_direct_alloc_sendmsg (t);if (IS_ERR (sendmsg))return -ENOMEM ; - resp = (struct smb_direct_negotiate_resp *)sendmsg->packet; + resp = (struct smbdirect_negotiate_resp *)sendmsg->packet;if (failed) {memset (resp,0 ,sizeof (*resp)); - resp->min_version =cpu_to_le16 (0x0100 ); - resp->max_version =cpu_to_le16 (0x0100 ); + resp->min_version =SMB_DIRECT_VERSION_LE ; + resp->max_version =SMB_DIRECT_VERSION_LE ; resp->status =STATUS_NOT_SUPPORTED ; }else { resp->status =STATUS_SUCCESS ;
@@ -1810,7 +1811,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)snprintf (name,sizeof (name),"smb_direct_rqst_pool_%p" , t); t->sendmsg_cache =kmem_cache_create (name,sizeof (struct smb_direct_sendmsg ) + -sizeof (struct smb_direct_negotiate_resp ), +sizeof (struct smbdirect_negotiate_resp ),0 ,SLAB_HWCACHE_ALIGN ,NULL );if (!t->sendmsg_cache)return -ENOMEM ;
@@ -1943,7 +1944,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) {struct smb_direct_transport *st =smb_trans_direct_transfort (t);struct smb_direct_recvmsg *recvmsg; -struct smb_direct_negotiate_req *req; +struct smbdirect_negotiate_req *req;int ret;ksmbd_debug (RDMA ,"Waiting for SMB_DIRECT negotiate request\n" );
@@ -1962,7 +1963,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)if (ret == -ECONNABORTED ) goto out; - req = (struct smb_direct_negotiate_req *)recvmsg->packet; + req = (struct smbdirect_negotiate_req *)recvmsg->packet; st->max_recv_size =min_t (int, st->max_recv_size,le32_to_cpu (req->preferred_send_size)); st->max_send_size = min_t(int, st->max_send_size,
fs/smb/server/transport_rdma.h +0 -41
47 lines not on this page · raw message
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 77/142 smb: server: make use of common smbdirect.h
In reply to Stefan Metzmacher--- fs/smb/server/connection.c | 4 ++-- fs/smb/server/connection.h | 10 ++++++---- fs/smb/server/smb2pdu.c | 11 ++++++----- fs/smb/server/smb2pdu.h | 6 ------ fs/smb/server/transport_rdma.c | 7 ++++--- 5 files changed, 18 insertions(+), 20 deletions(-)
fs/smb/server/connection.c +2 -2
@@ -243,7 +243,7 @@ int ksmbd_conn_write(struct ksmbd_work *work)int ksmbd_conn_rdma_read (struct ksmbd_conn *conn,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len) {int ret = -EINVAL ;
@@ -257,7 +257,7 @@ int ksmbd_conn_rdma_read(struct ksmbd_conn *conn,int ksmbd_conn_rdma_write (struct ksmbd_conn *conn,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len) {int ret = -EINVAL ;
fs/smb/server/connection.h +6 -4
@@ -19,6 +19,8 @@#include "smb_common.h" #include "ksmbd_work.h" +struct smbdirect_buffer_descriptor_v1 ; +#define KSMBD_SOCKET_BACKLOG 16enum {
@@ -133,11 +135,11 @@ struct ksmbd_transport_ops { unsigned int remote_key);int (*rdma_read)(struct ksmbd_transport *t,void *buf,unsigned int len, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len);int (*rdma_write)(struct ksmbd_transport *t,void *buf,unsigned int len, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len);void (*free_transport)(struct ksmbd_transport *kt); };
@@ -163,11 +165,11 @@ bool ksmbd_conn_lookup_dialect(struct ksmbd_conn *c);int ksmbd_conn_write (struct ksmbd_work *work);int ksmbd_conn_rdma_read (struct ksmbd_conn *conn,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len);int ksmbd_conn_rdma_write (struct ksmbd_conn *conn,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len);void ksmbd_conn_enqueue_request (struct ksmbd_work *work);void ksmbd_conn_try_dequeue_request (struct ksmbd_work *work);
fs/smb/server/smb2pdu.c +6 -5
@@ -23,6 +23,7 @@#include "asn1.h" #include "connection.h" #include "transport_ipc.h" +#include "../common/smbdirect/smbdirect.h" #include "transport_rdma.h" #include "vfs.h" #include "vfs_cache.h"
@@ -6662,7 +6663,7 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work) }static int smb2_set_remote_key_for_rdma (struct ksmbd_work *work, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,__le32 Channel,__le16 ChannelInfoLength) {
@@ -6698,7 +6699,7 @@ static ssize_t smb2_read_rdma_channel(struct ksmbd_work *work,int err; err =ksmbd_conn_rdma_write (work->conn, data_buf, length, - (struct smb2_buffer_desc_v1 *) + (struct smbdirect_buffer_descriptor_v1 *) ((char *)req +le16_to_cpu (req->ReadChannelInfoOffset)),le16_to_cpu (req->ReadChannelInfoLength));if (err)
@@ -6769,7 +6770,7 @@ int smb2_read(struct ksmbd_work *work) goto out; } err =smb2_set_remote_key_for_rdma (work, - (struct smb2_buffer_desc_v1 *) + (struct smbdirect_buffer_descriptor_v1 *) ((char *)req + ch_offset), req->Channel, req->ReadChannelInfoLength);
@@ -6964,7 +6965,7 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work,return -ENOMEM ; ret =ksmbd_conn_rdma_read (work->conn, data_buf, length, - (struct smb2_buffer_desc_v1 *) + (struct smbdirect_buffer_descriptor_v1 *) ((char *)req +le16_to_cpu (req->WriteChannelInfoOffset)),le16_to_cpu (req->WriteChannelInfoLength));if (ret <0 ) {
@@ -7029,7 +7030,7 @@ int smb2_write(struct ksmbd_work *work) goto out; } err =smb2_set_remote_key_for_rdma (work, - (struct smb2_buffer_desc_v1 *) + (struct smbdirect_buffer_descriptor_v1 *) ((char *)req + ch_offset), req->Channel, req->WriteChannelInfoLength);
fs/smb/server/smb2pdu.h +0 -6
@@ -136,12 +136,6 @@ struct create_posix_rsp {u8 SidBuffer[44 ]; } __packed; -struct smb2_buffer_desc_v1 { -__le64 offset; -__le32 token; -__le32 length; -} __packed; -#define SMB2_0_IOCTL_IS_FSCTL 0x00000001struct smb_sockaddr_in {
fs/smb/server/transport_rdma.c +4 -3
@@ -23,6 +23,7 @@#include "connection.h" #include "smb_common.h" #include "../common/smb2status.h" +#include "../common/smbdirect/smbdirect.h" #include "../common/smbdirect/smbdirect_pdu.h" #include "transport_rdma.h"
@@ -1342,7 +1343,7 @@ static void write_done(struct ib_cq *cq, struct ib_wc *wc)static int smb_direct_rdma_xmit (struct smb_direct_transport *t,void *buf,int buf_len, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len,bool is_read) {
@@ -1472,7 +1473,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,static int smb_direct_rdma_write (struct ksmbd_transport *t,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len) { return smb_direct_rdma_xmit(smb_trans_direct_transfort(t), buf, buflen,
@@ -1481,7 +1482,7 @@ static int smb_direct_rdma_write(struct ksmbd_transport *t,static int smb_direct_rdma_read (struct ksmbd_transport *t,void *buf,unsigned int buflen, -struct smb2_buffer_desc_v1 *desc, +struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len) { return smb_direct_rdma_xmit(smb_trans_direct_transfort(t), buf, buflen,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 78/142 smb: server: make use of common smbdirect_socket
In reply to Stefan MetzmacherThis is the next step in the direction of a common smbdirect layer. Currently only structures are shared, but that will change over time until everything is shared.
--- fs/smb/server/transport_rdma.c | 241 ++++++++++++++++++--------------- 1 file changed, 133 insertions(+), 108 deletions(-)
fs/smb/server/transport_rdma.c +133 -108
@@ -25,6 +25,7 @@#include "../common/smb2status.h" #include "../common/smbdirect/smbdirect.h" #include "../common/smbdirect/smbdirect_pdu.h" +#include "../common/smbdirect/smbdirect_socket.h" #include "transport_rdma.h" #define SMB_DIRECT_PORT_IWARP 5445
@@ -89,26 +90,14 @@ static struct smb_direct_listener {static struct workqueue_struct *smb_direct_wq; -enum smb_direct_status { -SMB_DIRECT_CS_NEW =0 , -SMB_DIRECT_CS_CONNECTED , -SMB_DIRECT_CS_DISCONNECTING , -SMB_DIRECT_CS_DISCONNECTED , -}; -struct smb_direct_transport {struct ksmbd_transport transport; -enum smb_direct_status status; +struct smbdirect_socket socket; +bool full_packet_received;wait_queue_head_t wait_status; -struct rdma_cm_id *cm_id; -struct ib_cq *send_cq; -struct ib_cq *recv_cq; -struct ib_pd *pd; -struct ib_qp *qp; -int max_send_size;int max_recv_size;int max_fragmented_send_size;
@@ -271,8 +260,10 @@ smb_direct_recvmsg *get_free_recvmsg(struct smb_direct_transport *t)static void put_recvmsg (struct smb_direct_transport *t,struct smb_direct_recvmsg *recvmsg) { +struct smbdirect_socket *sc = &t->socket; +if (likely (recvmsg->sge.length !=0 )) { -ib_dma_unmap_single (t->cm_id->device, +ib_dma_unmap_single (sc->ib.dev, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE );
@@ -316,17 +307,20 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)struct smb_direct_transport *t = container_of(work, struct smb_direct_transport, disconnect_work); +struct smbdirect_socket *sc = &t->socket; -if (t->status ==SMB_DIRECT_CS_CONNECTED ) { - t->status =SMB_DIRECT_CS_DISCONNECTING ; -rdma_disconnect (t->cm_id); +if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) { + sc->status =SMBDIRECT_SOCKET_DISCONNECTING ; +rdma_disconnect (sc->rdma.cm_id); } }static void smb_direct_disconnect_rdma_connection (struct smb_direct_transport *t) { -if (t->status ==SMB_DIRECT_CS_CONNECTED ) +struct smbdirect_socket *sc = &t->socket; + +if (sc->status ==SMBDIRECT_SOCKET_CONNECTED )queue_work (smb_direct_wq, &t->disconnect_work); }
@@ -334,8 +328,9 @@ 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; -if (t->status !=SMB_DIRECT_CS_CONNECTED ) +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ;smb_direct_post_send_data (t,NULL ,NULL ,0 ,0 );
@@ -344,19 +339,23 @@ static void smb_direct_send_immediate_work(struct work_struct *work)static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) {struct smb_direct_transport *t; +struct smbdirect_socket *sc;struct ksmbd_conn *conn; t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );if (!t)return NULL ; + sc = &t->socket; - t->cm_id = cm_id; + sc->rdma.cm_id = cm_id; cm_id->context = t; t->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; t->responder_resources =1 ; - t->status =SMB_DIRECT_CS_NEW ; + sc->ib.dev = sc->rdma.cm_id->device; + + sc->status =SMBDIRECT_SOCKET_CREATED ;init_waitqueue_head (&t->wait_status);spin_lock_init (&t->reassembly_queue_lock);
@@ -400,6 +399,7 @@ static void smb_direct_free_transport(struct ksmbd_transport *kt)static void free_transport (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;struct smb_direct_recvmsg *recvmsg;wake_up_interruptible (&t->wait_send_credits);
@@ -412,11 +412,11 @@ static void free_transport(struct smb_direct_transport *t)cancel_delayed_work_sync (&t->post_recv_credits_work);cancel_work_sync (&t->send_immediate_work); -if (t->qp) { -ib_drain_qp (t->qp); -ib_mr_pool_destroy (t->qp, &t->qp->rdma_mrs); - t->qp =NULL ; -rdma_destroy_qp (t->cm_id); +if (sc->ib.qp) { +ib_drain_qp (sc->ib.qp); +ib_mr_pool_destroy (sc->ib.qp, &sc->ib.qp->rdma_mrs); + sc->ib.qp =NULL ; +rdma_destroy_qp (sc->rdma.cm_id); }ksmbd_debug (RDMA ,"drain the reassembly queue\n" );
@@ -433,14 +433,14 @@ static void free_transport(struct smb_direct_transport *t) }while (recvmsg); t->reassembly_data_length =0 ; -if (t->send_cq) -ib_free_cq (t->send_cq); -if (t->recv_cq) -ib_free_cq (t->recv_cq); -if (t->pd) -ib_dealloc_pd (t->pd); -if (t->cm_id) -rdma_destroy_id (t->cm_id); +if (sc->ib.send_cq) +ib_free_cq (sc->ib.send_cq); +if (sc->ib.recv_cq) +ib_free_cq (sc->ib.recv_cq); +if (sc->ib.pd) +ib_dealloc_pd (sc->ib.pd); +if (sc->rdma.cm_id) +rdma_destroy_id (sc->rdma.cm_id);smb_direct_destroy_pools (t);ksmbd_conn_free (KSMBD_TRANS (t)->conn);
@@ -463,14 +463,15 @@ static struct smb_direct_sendmsgstatic void smb_direct_free_sendmsg (struct smb_direct_transport *t,struct smb_direct_sendmsg *msg) { +struct smbdirect_socket *sc = &t->socket;int i;if (msg->num_sge >0 ) { -ib_dma_unmap_single (t->cm_id->device, +ib_dma_unmap_single (sc->ib.dev, msg->sge[0 ].addr, msg->sge[0 ].length,DMA_TO_DEVICE );for (i =1 ; i < msg->num_sge; i++) -ib_dma_unmap_page (t->cm_id->device, +ib_dma_unmap_page (sc->ib.dev, msg->sge[i].addr, msg->sge[i].length,DMA_TO_DEVICE ); }
@@ -525,9 +526,11 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) {struct smb_direct_recvmsg *recvmsg;struct smb_direct_transport *t; +struct smbdirect_socket *sc; recvmsg = container_of(wc->wr_cqe, struct smb_direct_recvmsg, cqe); t = recvmsg->transport; + sc = &t->socket;if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) {put_recvmsg (t, recvmsg);
@@ -556,7 +559,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) } t->negotiation_requested = true; t->full_packet_received = true; - t->status =SMB_DIRECT_CS_CONNECTED ; + sc->status =SMBDIRECT_SOCKET_CONNECTED ;enqueue_reassembly (t, recvmsg,0 );wake_up_interruptible (&t->wait_status);return ;
@@ -638,17 +641,18 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)static int smb_direct_post_recv (struct smb_direct_transport *t,struct smb_direct_recvmsg *recvmsg) { +struct smbdirect_socket *sc = &t->socket;struct ib_recv_wr wr;int ret; - recvmsg->sge.addr =ib_dma_map_single (t->cm_id->device, + recvmsg->sge.addr =ib_dma_map_single (sc->ib.dev, recvmsg->packet, t->max_recv_size,DMA_FROM_DEVICE ); - ret =ib_dma_mapping_error (t->cm_id->device, recvmsg->sge.addr); + ret =ib_dma_mapping_error (sc->ib.dev, recvmsg->sge.addr);if (ret)return ret; recvmsg->sge.length = t->max_recv_size; - recvmsg->sge.lkey = t->pd->local_dma_lkey; + recvmsg->sge.lkey = sc->ib.pd->local_dma_lkey; recvmsg->cqe.done = recv_done; wr.wr_cqe = &recvmsg->cqe;
@@ -656,10 +660,10 @@ static int smb_direct_post_recv(struct smb_direct_transport *t, wr.sg_list = &recvmsg->sge; wr.num_sge =1 ; - ret =ib_post_recv (t->qp, &wr,NULL ); + ret =ib_post_recv (sc->ib.qp, &wr,NULL );if (ret) {pr_err ("Can't post recv: %d\n" , ret); -ib_dma_unmap_single (t->cm_id->device, +ib_dma_unmap_single (sc->ib.dev, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE ); recvmsg->sge.length =0 ;
@@ -678,9 +682,10 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,u32 data_length, remaining_data_length, data_offset;int rc;struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smbdirect_socket *sc = &st->socket; again: -if (st->status !=SMB_DIRECT_CS_CONNECTED ) { +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) {pr_err ("disconnected\n" );return -ENOTCONN ; }
@@ -790,7 +795,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,ksmbd_debug (RDMA ,"wait_event on more data\n" ); rc =wait_event_interruptible (st->wait_reassembly_queue, st->reassembly_data_length >= size || - st->status !=SMB_DIRECT_CS_CONNECTED ); + sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (rc)return -EINTR ;
@@ -892,10 +897,11 @@ static int manage_credits_prior_sending(struct smb_direct_transport *t)static int smb_direct_post_send (struct smb_direct_transport *t,struct ib_send_wr *wr) { +struct smbdirect_socket *sc = &t->socket;int ret;atomic_inc (&t->send_pending); - ret =ib_post_send (t->qp, wr,NULL ); + ret =ib_post_send (sc->ib.qp, wr,NULL );if (ret) {pr_err ("failed to post send: %d\n" , ret);if (atomic_dec_and_test (&t->send_pending))
@@ -960,6 +966,7 @@ static int wait_for_credits(struct smb_direct_transport *t, wait_queue_head_t *waitq, atomic_t *total_credits, int needed) { +struct smbdirect_socket *sc = &t->socket;int ret; do {
@@ -969,9 +976,9 @@ static int wait_for_credits(struct smb_direct_transport *t,atomic_add (needed, total_credits); ret =wait_event_interruptible (*waitq,atomic_read (total_credits) >= needed || - t->status !=SMB_DIRECT_CS_CONNECTED ); + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); -if (t->status !=SMB_DIRECT_CS_CONNECTED ) +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;else if (ret <0 )return ret;
@@ -1009,6 +1016,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, int size, int remaining_data_length, struct smb_direct_sendmsg **sendmsg_out) { + struct smbdirect_socket *sc = &t->socket;struct smb_direct_sendmsg *sendmsg;struct smbdirect_data_transfer *packet;int header_length;
@@ -1048,11 +1056,11 @@ static int smb_direct_create_header(struct smb_direct_transport *t, header_length = offsetof(struct smbdirect_data_transfer , padding); - sendmsg->sge[0 ].addr =ib_dma_map_single (t->cm_id->device, + sendmsg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, (void *)packet, header_length,DMA_TO_DEVICE ); - ret =ib_dma_mapping_error (t->cm_id->device, sendmsg->sge[0 ].addr); + ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) {smb_direct_free_sendmsg (t, sendmsg);return ret;
@@ -1060,7 +1068,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, sendmsg->num_sge =1 ; sendmsg->sge[0 ].length = header_length; - sendmsg->sge[0 ].lkey = t->pd->local_dma_lkey; + sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; *sendmsg_out = sendmsg;return 0 ;
@@ -1114,10 +1122,11 @@ static int post_sendmsg(struct smb_direct_transport *t,struct smb_direct_send_ctx *send_ctx, struct smb_direct_sendmsg *msg) { + struct smbdirect_socket *sc = &t->socket;int i;for (i =0 ; i < msg->num_sge; i++) -ib_dma_sync_single_for_device (t->cm_id->device, +ib_dma_sync_single_for_device (sc->ib.dev, msg->sge[i].addr, msg->sge[i].length,DMA_TO_DEVICE );
@@ -1153,6 +1162,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, struct kvec *iov, int niov, int remaining_data_length) { + struct smbdirect_socket *sc = &t->socket;int i, j, ret;struct smb_direct_sendmsg *msg;int data_length;
@@ -1178,7 +1188,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t,int sg_cnt;sg_init_table (sg,SMB_DIRECT_MAX_SEND_SGES -1 ); - sg_cnt =get_mapped_sg_list (t->cm_id->device, + sg_cnt =get_mapped_sg_list (sc->ib.dev, iov[i].iov_base, iov[i].iov_len, sg,SMB_DIRECT_MAX_SEND_SGES -1 ,DMA_TO_DEVICE );
@@ -1189,7 +1199,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, }else if (sg_cnt + msg->num_sge >SMB_DIRECT_MAX_SEND_SGES ) {pr_err ("buffer not fitted into sges\n" ); ret = -E2BIG ; -ib_dma_unmap_sg (t->cm_id->device, sg, sg_cnt, +ib_dma_unmap_sg (sc->ib.dev, sg, sg_cnt,DMA_TO_DEVICE ); goto err; }
@@ -1198,7 +1208,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, sge = &msg->sge[msg->num_sge]; sge->addr =sg_dma_address (&sg[j]); sge->length =sg_dma_len (&sg[j]); - sge->lkey = t->pd->local_dma_lkey; + sge->lkey = sc->ib.pd->local_dma_lkey; msg->num_sge++; } }
@@ -1218,6 +1228,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, bool need_invalidate, unsigned int remote_key) { struct smb_direct_transport *st = smb_trans_direct_transfort(t); +struct smbdirect_socket *sc = &st->socket;int remaining_data_length;int start, i, j; int max_iov_size = st->max_send_size -
@@ -1226,7 +1237,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,struct kvec vec;struct smb_direct_send_ctx send_ctx; -if (st->status !=SMB_DIRECT_CS_CONNECTED ) +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;//FIXME: skip RFC1002 header..
@@ -1307,7 +1318,9 @@ static void smb_direct_free_rdma_rw_msg(struct smb_direct_transport *t, struct smb_direct_rdma_rw_msg *msg, enum dma_data_direction dir) { - rdma_rw_ctx_destroy(&msg->rw_ctx, t->qp, t->qp->port, +struct smbdirect_socket *sc = &t->socket; + +rdma_rw_ctx_destroy (&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, msg->sgt.sgl, msg->sgt.nents, dir);sg_free_table_chained (&msg->sgt,SG_CHUNK_SIZE );kfree (msg);
@@ -1347,6 +1360,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, unsigned int desc_len, bool is_read) { +struct smbdirect_socket *sc = &t->socket;struct smb_direct_rdma_rw_msg *msg, *next_msg;int i, ret;DECLARE_COMPLETION_ONSTACK (completion);
@@ -1356,7 +1370,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,int credits_needed;unsigned int desc_buf_len, desc_num =0 ; -if (t->status !=SMB_DIRECT_CS_CONNECTED ) +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;if (buf_len > t->max_rdma_rw_size)
@@ -1426,7 +1440,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, goto out; } - ret = rdma_rw_ctx_init(&msg->rw_ctx, t->qp, t->qp->port, + ret = rdma_rw_ctx_init(&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, msg->sgt.sgl, get_buf_page_count(desc_buf, desc_buf_len), 0,
@@ -1447,11 +1461,11 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,/* concatenate work requests of rdma_rw_ctxs */ first_wr =NULL ;list_for_each_entry_reverse (msg, &msg_list, list) { - first_wr =rdma_rw_ctx_wrs (&msg->rw_ctx, t->qp, t->qp->port, + first_wr =rdma_rw_ctx_wrs (&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, &msg->cqe, first_wr); } - ret =ib_post_send (t->qp, first_wr,NULL ); + ret =ib_post_send (sc->ib.qp, first_wr,NULL );if (ret) {pr_err ("failed to post send wr for RDMA R/W: %d\n" , ret); goto out;
@@ -1492,20 +1506,22 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,static void smb_direct_disconnect (struct ksmbd_transport *t) {struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smbdirect_socket *sc = &st->socket; -ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , st->cm_id); +ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , sc->rdma.cm_id);smb_direct_disconnect_rdma_work (&st->disconnect_work);wait_event_interruptible (st->wait_status, - st->status ==SMB_DIRECT_CS_DISCONNECTED ); + sc->status ==SMBDIRECT_SOCKET_DISCONNECTED );free_transport (st); }static void smb_direct_shutdown (struct ksmbd_transport *t) {struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smbdirect_socket *sc = &st->socket; -ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , st->cm_id); +ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id);smb_direct_disconnect_rdma_work (&st->disconnect_work); }
@@ -1514,28 +1530,29 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id, struct rdma_cm_event *event) {struct smb_direct_transport *t = cm_id->context; +struct smbdirect_socket *sc = &t->socket;ksmbd_debug (RDMA ,"RDMA CM event. cm_id=%p event=%s (%d)\n" , cm_id,rdma_event_msg (event->event), event->event);switch (event->event) {case RDMA_CM_EVENT_ESTABLISHED : { - t->status =SMB_DIRECT_CS_CONNECTED ; + sc->status =SMBDIRECT_SOCKET_CONNECTED ;wake_up_interruptible (&t->wait_status);break ; }case RDMA_CM_EVENT_DEVICE_REMOVAL :case RDMA_CM_EVENT_DISCONNECTED : { -ib_drain_qp (t->qp); +ib_drain_qp (sc->ib.qp); - t->status =SMB_DIRECT_CS_DISCONNECTED ; + sc->status =SMBDIRECT_SOCKET_DISCONNECTED ;wake_up_interruptible (&t->wait_status);wake_up_interruptible (&t->wait_reassembly_queue);wake_up (&t->wait_send_credits);break ; }case RDMA_CM_EVENT_CONNECT_ERROR : { - t->status =SMB_DIRECT_CS_DISCONNECTED ; + sc->status =SMBDIRECT_SOCKET_DISCONNECTED ;wake_up_interruptible (&t->wait_status);break ; }
@@ -1551,9 +1568,10 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,static void smb_direct_qpair_handler (struct ib_event *event,void *context) {struct smb_direct_transport *t = context; +struct smbdirect_socket *sc = &t->socket;ksmbd_debug (RDMA ,"Received QP event. cm_id=%p, event=%s (%d)\n" , - t->cm_id,ib_event_msg (event->event), event->event); + sc->rdma.cm_id,ib_event_msg (event->event), event->event);switch (event->event) {case IB_EVENT_CQ_ERR :
@@ -1568,6 +1586,7 @@ static void smb_direct_qpair_handler(struct ib_event *event, void *context)static int smb_direct_send_negotiate_response (struct smb_direct_transport *t,int failed) { +struct smbdirect_socket *sc = &t->socket;struct smb_direct_sendmsg *sendmsg;struct smbdirect_negotiate_resp *resp;int ret;
@@ -1598,10 +1617,10 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,cpu_to_le32 (t->max_fragmented_recv_size); } - sendmsg->sge[0 ].addr =ib_dma_map_single (t->cm_id->device, + sendmsg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, (void *)resp,sizeof (*resp),DMA_TO_DEVICE ); - ret =ib_dma_mapping_error (t->cm_id->device, sendmsg->sge[0 ].addr); + ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) {smb_direct_free_sendmsg (t, sendmsg);return ret;
@@ -1609,7 +1628,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, sendmsg->num_sge =1 ; sendmsg->sge[0 ].length =sizeof (*resp); - sendmsg->sge[0 ].lkey = t->pd->local_dma_lkey; + sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; ret =post_sendmsg (t,NULL , sendmsg);if (ret) {
@@ -1624,6 +1643,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,static int smb_direct_accept_client (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;struct rdma_conn_param conn_param;__be32 ird_ord_hdr[2 ];int ret;
@@ -1650,7 +1670,7 @@ static int smb_direct_accept_client(struct smb_direct_transport *t) conn_param.rnr_retry_count =SMB_DIRECT_CM_RNR_RETRY ; conn_param.flow_control =0 ; - ret =rdma_accept (t->cm_id, &conn_param); + ret =rdma_accept (sc->rdma.cm_id, &conn_param);if (ret) {pr_err ("error at rdma_accept: %d\n" , ret);return ret;
@@ -1690,15 +1710,18 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t)static unsigned int smb_direct_get_max_fr_pages (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket; + return min_t(unsigned int, - t->cm_id->device->attrs.max_fast_reg_page_list_len, + sc->ib.dev->attrs.max_fast_reg_page_list_len,256 ); }static int smb_direct_init_params (struct smb_direct_transport *t,struct ib_qp_cap *cap) { -struct ib_device *device = t->cm_id->device; +struct smbdirect_socket *sc = &t->socket; +struct ib_device *device = sc->ib.dev;int max_send_sges, max_rw_wrs, max_send_wrs;unsigned int max_sge_per_wr, wrs_per_credit;
@@ -1858,34 +1881,35 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)static int smb_direct_create_qpair (struct smb_direct_transport *t,struct ib_qp_cap *cap) { +struct smbdirect_socket *sc = &t->socket;int ret;struct ib_qp_init_attr qp_attr;int pages_per_rw; - t->pd =ib_alloc_pd (t->cm_id->device,0 ); -if (IS_ERR (t->pd)) { + sc->ib.pd =ib_alloc_pd (sc->ib.dev,0 ); +if (IS_ERR (sc->ib.pd)) {pr_err ("Can't create RDMA PD\n" ); - ret =PTR_ERR (t->pd); - t->pd =NULL ; + ret =PTR_ERR (sc->ib.pd); + sc->ib.pd =NULL ;return ret; } - t->send_cq =ib_alloc_cq (t->cm_id->device, t, + sc->ib.send_cq =ib_alloc_cq (sc->ib.dev, t, smb_direct_send_credit_target + cap->max_rdma_ctxs,0 ,IB_POLL_WORKQUEUE ); -if (IS_ERR (t->send_cq)) { +if (IS_ERR (sc->ib.send_cq)) {pr_err ("Can't create RDMA send CQ\n" ); - ret =PTR_ERR (t->send_cq); - t->send_cq =NULL ; + ret =PTR_ERR (sc->ib.send_cq); + sc->ib.send_cq =NULL ; goto err; } - t->recv_cq =ib_alloc_cq (t->cm_id->device, t, + sc->ib.recv_cq =ib_alloc_cq (sc->ib.dev, t, t->recv_credit_max,0 ,IB_POLL_WORKQUEUE ); -if (IS_ERR (t->recv_cq)) { +if (IS_ERR (sc->ib.recv_cq)) {pr_err ("Can't create RDMA recv CQ\n" ); - ret =PTR_ERR (t->recv_cq); - t->recv_cq =NULL ; + ret =PTR_ERR (sc->ib.recv_cq); + sc->ib.recv_cq =NULL ; goto err; }
@@ -1895,22 +1919,22 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, qp_attr.cap = *cap; qp_attr.sq_sig_type =IB_SIGNAL_REQ_WR ; qp_attr.qp_type =IB_QPT_RC ; - qp_attr.send_cq = t->send_cq; - qp_attr.recv_cq = t->recv_cq; + qp_attr.send_cq = sc->ib.send_cq; + qp_attr.recv_cq = sc->ib.recv_cq; qp_attr.port_num = ~0 ; - ret =rdma_create_qp (t->cm_id, t->pd, &qp_attr); + ret =rdma_create_qp (sc->rdma.cm_id, sc->ib.pd, &qp_attr);if (ret) {pr_err ("Can't create RDMA QP: %d\n" , ret); goto err; } - t->qp = t->cm_id->qp; - t->cm_id->event_handler = smb_direct_cm_handler; + sc->ib.qp = sc->rdma.cm_id->qp; + sc->rdma.cm_id->event_handler = smb_direct_cm_handler; pages_per_rw =DIV_ROUND_UP (t->max_rdma_rw_size,PAGE_SIZE ) +1 ; -if (pages_per_rw > t->cm_id->device->attrs.max_sgl_rd) { - ret =ib_mr_pool_init (t->qp, &t->qp->rdma_mrs, +if (pages_per_rw > sc->ib.dev->attrs.max_sgl_rd) { + ret =ib_mr_pool_init (sc->ib.qp, &sc->ib.qp->rdma_mrs, t->max_rw_credits,IB_MR_TYPE_MEM_REG , t->pages_per_rw_credit,0 );if (ret) {
@@ -1922,21 +1946,21 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t,return 0 ; err: -if (t->qp) { - t->qp =NULL ; -rdma_destroy_qp (t->cm_id); +if (sc->ib.qp) { + sc->ib.qp =NULL ; +rdma_destroy_qp (sc->rdma.cm_id); } -if (t->recv_cq) { -ib_destroy_cq (t->recv_cq); - t->recv_cq =NULL ; +if (sc->ib.recv_cq) { +ib_destroy_cq (sc->ib.recv_cq); + sc->ib.recv_cq =NULL ; } -if (t->send_cq) { -ib_destroy_cq (t->send_cq); - t->send_cq =NULL ; +if (sc->ib.send_cq) { +ib_destroy_cq (sc->ib.send_cq); + sc->ib.send_cq =NULL ; } -if (t->pd) { -ib_dealloc_pd (t->pd); - t->pd =NULL ; +if (sc->ib.pd) { +ib_dealloc_pd (sc->ib.pd); + sc->ib.pd =NULL ; }return ret; }
@@ -1944,6 +1968,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t,static int smb_direct_prepare (struct ksmbd_transport *t) {struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smbdirect_socket *sc = &st->socket;struct smb_direct_recvmsg *recvmsg;struct smbdirect_negotiate_req *req;int ret;
@@ -1951,9 +1976,9 @@ static int smb_direct_prepare(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"Waiting for SMB_DIRECT negotiate request\n" ); ret =wait_event_interruptible_timeout (st->wait_status, st->negotiation_requested || - st->status ==SMB_DIRECT_CS_DISCONNECTED , + sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ,SMB_DIRECT_NEGOTIATE_TIMEOUT *HZ ); -if (ret <=0 || st->status ==SMB_DIRECT_CS_DISCONNECTED ) +if (ret <=0 || sc->status ==SMBDIRECT_SOCKET_DISCONNECTED )return ret <0 ? ret : -ETIMEDOUT ; recvmsg =get_first_reassembly (st);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 79/142 smb: server: make use of common smbdirect_socket_parameters
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 85 ++++++++++++++++++---------------- 1 file changed, 44 insertions(+), 41 deletions(-)
fs/smb/server/transport_rdma.c +44 -41
@@ -98,12 +98,6 @@ struct smb_direct_transport {bool full_packet_received;wait_queue_head_t wait_status; -int max_send_size; -int max_recv_size; -int max_fragmented_send_size; -int max_fragmented_recv_size; -int max_rdma_rw_size; -spinlock_t reassembly_queue_lock;struct list_head reassembly_queue;int reassembly_data_length;
@@ -114,13 +108,11 @@ struct smb_direct_transport {spinlock_t receive_credit_lock;int recv_credits;int count_avail_recvmsg; -int recv_credit_max;int recv_credit_target;spinlock_t recvmsg_queue_lock;struct list_head recvmsg_queue; -int send_credit_target;atomic_t send_credits;spinlock_t lock_new_recv_credits;int new_recv_credits;
@@ -642,16 +634,18 @@ static int smb_direct_post_recv(struct smb_direct_transport *t, struct smb_direct_recvmsg *recvmsg) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_recv_wr wr;int ret; recvmsg->sge.addr =ib_dma_map_single (sc->ib.dev, - recvmsg->packet, t->max_recv_size, + recvmsg->packet, + sp->max_recv_size,DMA_FROM_DEVICE ); ret =ib_dma_mapping_error (sc->ib.dev, recvmsg->sge.addr);if (ret)return ret; - recvmsg->sge.length = t->max_recv_size; + recvmsg->sge.length = sp->max_recv_size; recvmsg->sge.lkey = sc->ib.pd->local_dma_lkey; recvmsg->cqe.done = recv_done;
@@ -1017,6 +1011,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, struct smb_direct_sendmsg **sendmsg_out) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smb_direct_sendmsg *sendmsg;struct smbdirect_data_transfer *packet;int header_length;
@@ -1028,7 +1023,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t,/* Fill in the packet header */ packet = (struct smbdirect_data_transfer *)sendmsg->packet; - packet->credits_requested =cpu_to_le16 (t->send_credit_target); + packet->credits_requested =cpu_to_le16 (sp->send_credit_target); packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); packet->flags =0 ;
@@ -1229,9 +1224,10 @@ static int smb_direct_writev(struct ksmbd_transport *t, {struct smb_direct_transport *st =smb_trans_direct_transfort (t);struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;int remaining_data_length;int start, i, j; -int max_iov_size = st->max_send_size - +int max_iov_size = sp->max_send_size -sizeof (struct smbdirect_data_transfer );int ret;struct kvec vec;
@@ -1361,6 +1357,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, bool is_read) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smb_direct_rdma_rw_msg *msg, *next_msg;int i, ret;DECLARE_COMPLETION_ONSTACK (completion);
@@ -1373,7 +1370,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ; -if (buf_len > t->max_rdma_rw_size) +if (buf_len > sp->max_read_write_size)return -EINVAL ;/* calculate needed credits */
@@ -1587,6 +1584,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, int failed) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smb_direct_sendmsg *sendmsg;struct smbdirect_negotiate_resp *resp;int ret;
@@ -1608,13 +1606,13 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, resp->negotiated_version =SMB_DIRECT_VERSION_LE ; resp->reserved =0 ; resp->credits_requested = -cpu_to_le16 (t->send_credit_target); +cpu_to_le16 (sp->send_credit_target); resp->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); - resp->max_readwrite_size =cpu_to_le32 (t->max_rdma_rw_size); - resp->preferred_send_size =cpu_to_le32 (t->max_send_size); - resp->max_receive_size =cpu_to_le32 (t->max_recv_size); + resp->max_readwrite_size =cpu_to_le32 (sp->max_read_write_size); + resp->preferred_send_size =cpu_to_le32 (sp->max_send_size); + resp->max_receive_size =cpu_to_le32 (sp->max_recv_size); resp->max_fragmented_size = -cpu_to_le32 (t->max_fragmented_recv_size); +cpu_to_le32 (sp->max_fragmented_recv_size); } sendmsg->sge[0].addr = ib_dma_map_single(sc->ib.dev,
@@ -1721,6 +1719,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, struct ib_qp_cap *cap) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_device *device = sc->ib.dev;int max_send_sges, max_rw_wrs, max_send_wrs;unsigned int max_sge_per_wr, wrs_per_credit;
@@ -1728,10 +1727,10 @@ static int smb_direct_init_params(struct smb_direct_transport *t,/* need 3 more sge. because a SMB_DIRECT header, SMB2 header, * SMB2 response could be mapped. */ - t->max_send_size = smb_direct_max_send_size; - max_send_sges =DIV_ROUND_UP (t->max_send_size,PAGE_SIZE ) +3 ; + sp->max_send_size = smb_direct_max_send_size; + max_send_sges =DIV_ROUND_UP (sp->max_send_size,PAGE_SIZE ) +3 ;if (max_send_sges >SMB_DIRECT_MAX_SEND_SGES ) { -pr_err ("max_send_size %d is too large\n" , t->max_send_size); +pr_err ("max_send_size %d is too large\n" , sp->max_send_size);return -EINVAL ; }
@@ -1742,9 +1741,9 @@ static int smb_direct_init_params(struct smb_direct_transport *t,* are needed for MR registration, RDMA R/W, local & remote * MR invalidation. */ - t->max_rdma_rw_size = smb_direct_max_read_write_size; + sp->max_read_write_size = smb_direct_max_read_write_size; t->pages_per_rw_credit =smb_direct_get_max_fr_pages (t); - t->max_rw_credits =DIV_ROUND_UP (t->max_rdma_rw_size, + t->max_rw_credits =DIV_ROUND_UP (sp->max_read_write_size, (t->pages_per_rw_credit -1 ) *PAGE_SIZE );
@@ -1785,20 +1784,20 @@ static int smb_direct_init_params(struct smb_direct_transport *t, t->recv_credits =0 ; t->count_avail_recvmsg =0 ; - t->recv_credit_max = smb_direct_receive_credit_max; + sp->recv_credit_max = smb_direct_receive_credit_max; t->recv_credit_target =10 ; t->new_recv_credits =0 ; - t->send_credit_target = smb_direct_send_credit_target; + sp->send_credit_target = smb_direct_send_credit_target;atomic_set (&t->send_credits,0 );atomic_set (&t->rw_credits, t->max_rw_credits); - t->max_send_size = smb_direct_max_send_size; - t->max_recv_size = smb_direct_max_receive_size; - t->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; + sp->max_send_size = smb_direct_max_send_size; + sp->max_recv_size = smb_direct_max_receive_size; + sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; cap->max_send_wr = max_send_wrs; - cap->max_recv_wr = t->recv_credit_max; + cap->max_recv_wr = sp->recv_credit_max; cap->max_send_sge = max_sge_per_wr; cap->max_recv_sge =SMB_DIRECT_MAX_RECV_SGES ; cap->max_inline_data =0 ;
@@ -1828,6 +1827,8 @@ static void smb_direct_destroy_pools(struct smb_direct_transport *t)static int smb_direct_create_pools (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;char name[80 ];int i;struct smb_direct_recvmsg *recvmsg;
@@ -1840,7 +1841,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)if (!t->sendmsg_cache)return -ENOMEM ; - t->sendmsg_mempool =mempool_create (t->send_credit_target, + t->sendmsg_mempool =mempool_create (sp->send_credit_target, mempool_alloc_slab, mempool_free_slab, t->sendmsg_cache);if (!t->sendmsg_mempool)
@@ -1849,20 +1850,20 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)snprintf (name,sizeof (name),"smb_direct_resp_%p" , t); t->recvmsg_cache =kmem_cache_create (name,sizeof (struct smb_direct_recvmsg ) + - t->max_recv_size, + sp->max_recv_size,0 ,SLAB_HWCACHE_ALIGN ,NULL );if (!t->recvmsg_cache) goto err; t->recvmsg_mempool = -mempool_create (t->recv_credit_max, mempool_alloc_slab, +mempool_create (sp->recv_credit_max, mempool_alloc_slab, mempool_free_slab, t->recvmsg_cache);if (!t->recvmsg_mempool) goto err;INIT_LIST_HEAD (&t->recvmsg_queue); -for (i =0 ; i < t->recv_credit_max; i++) { +for (i =0 ; i < sp->recv_credit_max; i++) { recvmsg =mempool_alloc (t->recvmsg_mempool,KSMBD_DEFAULT_GFP );if (!recvmsg) goto err;
@@ -1870,7 +1871,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t) recvmsg->sge.length =0 ;list_add (&recvmsg->list, &t->recvmsg_queue); } - t->count_avail_recvmsg = t->recv_credit_max; + t->count_avail_recvmsg = sp->recv_credit_max;return 0 ; err:
@@ -1882,6 +1883,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, struct ib_qp_cap *cap) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;int ret;struct ib_qp_init_attr qp_attr;int pages_per_rw;
@@ -1905,7 +1907,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, } sc->ib.recv_cq =ib_alloc_cq (sc->ib.dev, t, - t->recv_credit_max,0 ,IB_POLL_WORKQUEUE ); + sp->recv_credit_max,0 ,IB_POLL_WORKQUEUE );if (IS_ERR (sc->ib.recv_cq)) {pr_err ("Can't create RDMA recv CQ\n" ); ret =PTR_ERR (sc->ib.recv_cq);
@@ -1932,7 +1934,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, sc->ib.qp = sc->rdma.cm_id->qp; sc->rdma.cm_id->event_handler = smb_direct_cm_handler; - pages_per_rw =DIV_ROUND_UP (t->max_rdma_rw_size,PAGE_SIZE ) +1 ; + pages_per_rw =DIV_ROUND_UP (sp->max_read_write_size,PAGE_SIZE ) +1 ;if (pages_per_rw > sc->ib.dev->attrs.max_sgl_rd) { ret = ib_mr_pool_init(sc->ib.qp, &sc->ib.qp->rdma_mrs, t->max_rw_credits, IB_MR_TYPE_MEM_REG,
@@ -1969,6 +1971,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) {struct smb_direct_transport *st =smb_trans_direct_transfort (t);struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct smb_direct_recvmsg *recvmsg;struct smbdirect_negotiate_req *req;int ret;
@@ -1990,14 +1993,14 @@ static int smb_direct_prepare(struct ksmbd_transport *t) goto out; req = (struct smbdirect_negotiate_req *)recvmsg->packet; - st->max_recv_size =min_t (int, st->max_recv_size, + sp->max_recv_size =min_t (int, sp->max_recv_size,le32_to_cpu (req->preferred_send_size)); - st->max_send_size =min_t (int, st->max_send_size, + sp->max_send_size =min_t (int, sp->max_send_size,le32_to_cpu (req->max_receive_size)); - st->max_fragmented_send_size = + sp->max_fragmented_send_size =le32_to_cpu (req->max_fragmented_size); - st->max_fragmented_recv_size = - (st->recv_credit_max * st->max_recv_size) /2 ; + sp->max_fragmented_recv_size = + (sp->recv_credit_max * sp->max_recv_size) /2 ; ret =smb_direct_send_negotiate_response (st, ret); out:
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 80/142 smb: server: make use of smbdirect_socket->recv_io.expected
In reply to Stefan MetzmacherThe expected incoming message type can be per connection.
--- fs/smb/server/transport_rdma.c | 44 +++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 19 deletions(-)
fs/smb/server/transport_rdma.c +25 -19
@@ -145,10 +145,6 @@ struct smb_direct_transport {#define KSMBD_TRANS (t) ((struct ksmbd_transport *)&((t)->transport))#define SMBD_TRANS (t) ((struct smb_direct_transport *)container_of(t, \ struct smb_direct_transport, transport)) -enum { -SMB_DIRECT_MSG_NEGOTIATE_REQ =0 , -SMB_DIRECT_MSG_DATA_TRANSFER -};static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops;
@@ -172,7 +168,6 @@ struct smb_direct_sendmsg {struct smb_direct_recvmsg {struct smb_direct_transport *transport;struct list_head list; -int type;struct ib_sge sge;struct ib_cqe cqe;bool first_segment;
@@ -472,8 +467,10 @@ static void smb_direct_free_sendmsg(struct smb_direct_transport *t,static int smb_direct_check_recvmsg (struct smb_direct_recvmsg *recvmsg) { -switch (recvmsg->type) { -case SMB_DIRECT_MSG_DATA_TRANSFER : { +struct smbdirect_socket *sc = &recvmsg->transport->socket; + +switch (sc->recv_io.expected) { +case SMBDIRECT_EXPECT_DATA_TRANSFER : {struct smbdirect_data_transfer *req = (struct smbdirect_data_transfer *)recvmsg->packet; struct smb2_hdr *hdr = (struct smb2_hdr *)(recvmsg->packet
@@ -484,9 +481,9 @@ static int smb_direct_check_recvmsg(struct smb_direct_recvmsg *recvmsg)le16_to_cpu (req->credits_requested), req->data_length, req->remaining_data_length, hdr->ProtocolId, hdr->Command); -break ; +return 0 ; } -case SMB_DIRECT_MSG_NEGOTIATE_REQ : { +case SMBDIRECT_EXPECT_NEGOTIATE_REQ : {struct smbdirect_negotiate_req *req = (struct smbdirect_negotiate_req *)recvmsg->packet; ksmbd_debug(RDMA,
@@ -506,12 +503,15 @@ static int smb_direct_check_recvmsg(struct smb_direct_recvmsg *recvmsg) 128 * 1024)return -ECONNABORTED ; -break ; +return 0 ; } -default : -return -EINVAL ; +case SMBDIRECT_EXPECT_NEGOTIATE_REP : +/* client only */ +break ; } -return 0 ; + +/* This is an internal error */ +return -EINVAL ; }static void recv_done (struct ib_cq *cq,struct ib_wc *wc)
@@ -542,8 +542,8 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)ib_dma_sync_single_for_cpu (wc->qp->device, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE ); -switch (recvmsg->type) { -case SMB_DIRECT_MSG_NEGOTIATE_REQ : +switch (sc->recv_io.expected) { +case SMBDIRECT_EXPECT_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) {put_recvmsg (t, recvmsg);smb_direct_disconnect_rdma_connection (t);
@@ -555,7 +555,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)enqueue_reassembly (t, recvmsg,0 );wake_up_interruptible (&t->wait_status);return ; -case SMB_DIRECT_MSG_DATA_TRANSFER : { +case SMBDIRECT_EXPECT_DATA_TRANSFER : {struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet;unsigned int data_length;
@@ -620,12 +620,15 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } +case SMBDIRECT_EXPECT_NEGOTIATE_REP : +/* client only */ +break ; }/* * This is an internal error! */ -WARN_ON_ONCE (recvmsg->type !=SMB_DIRECT_MSG_DATA_TRANSFER ); +WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER );put_recvmsg (t, recvmsg);smb_direct_disconnect_rdma_connection (t); }
@@ -814,7 +817,6 @@ static void smb_direct_post_recv_credits(struct work_struct *work)if (!recvmsg)break ; - recvmsg->type =SMB_DIRECT_MSG_DATA_TRANSFER ; recvmsg->first_segment = false; ret =smb_direct_post_recv (t, recvmsg);
@@ -1613,6 +1615,8 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, resp->max_receive_size =cpu_to_le32 (sp->max_recv_size); resp->max_fragmented_size =cpu_to_le32 (sp->max_fragmented_recv_size); + + sc->recv_io.expected =SMBDIRECT_EXPECT_DATA_TRANSFER ; } sendmsg->sge[0].addr = ib_dma_map_single(sc->ib.dev,
@@ -1678,13 +1682,15 @@ static int smb_direct_accept_client(struct smb_direct_transport *t)static int smb_direct_prepare_negotiation (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;int ret;struct smb_direct_recvmsg *recvmsg; + sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ; + recvmsg =get_free_recvmsg (t);if (!recvmsg)return -ENOMEM ; - recvmsg->type =SMB_DIRECT_MSG_NEGOTIATE_REQ ; ret =smb_direct_post_recv (t, recvmsg);if (ret) {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 81/142 smb: server: make use of struct smbdirect_recv_io
In reply to Stefan MetzmacherThis will allow us to move helper functions into common code soon as the client already uses smbdirect_recv_io.
--- fs/smb/server/transport_rdma.c | 61 +++++++++++++++------------------- 1 file changed, 26 insertions(+), 35 deletions(-)
fs/smb/server/transport_rdma.c +26 -35
@@ -165,15 +165,6 @@ struct smb_direct_sendmsg {u8 packet[]; }; -struct smb_direct_recvmsg { -struct smb_direct_transport *transport; -struct list_head list; -struct ib_sge sge; -struct ib_cqe cqe; -bool first_segment; -u8 packet[]; -}; -struct smb_direct_rdma_rw_msg {struct smb_direct_transport *t;struct ib_cqe cqe;
@@ -216,7 +207,7 @@ smb_trans_direct_transfort(struct ksmbd_transport *t) }static inline void -*smb_direct_recvmsg_payload (struct smb_direct_recvmsg *recvmsg) +*smbdirect_recv_io_payload (struct smbdirect_recv_io *recvmsg) {return (void *)recvmsg->packet; }
@@ -229,14 +220,14 @@ static inline bool is_receive_credit_post_required(int receive_credits, }static struct -smb_direct_recvmsg *get_free_recvmsg (struct smb_direct_transport *t) +smbdirect_recv_io *get_free_recvmsg (struct smb_direct_transport *t) { -struct smb_direct_recvmsg *recvmsg =NULL ; +struct smbdirect_recv_io *recvmsg =NULL ;spin_lock (&t->recvmsg_queue_lock);if (!list_empty (&t->recvmsg_queue)) { recvmsg =list_first_entry (&t->recvmsg_queue, - struct smb_direct_recvmsg, + struct smbdirect_recv_io, list);list_del (&recvmsg->list); }
@@ -245,7 +236,7 @@ smb_direct_recvmsg *get_free_recvmsg(struct smb_direct_transport *t) }static void put_recvmsg (struct smb_direct_transport *t, -struct smb_direct_recvmsg *recvmsg) +struct smbdirect_recv_io *recvmsg) {struct smbdirect_socket *sc = &t->socket;
@@ -263,7 +254,7 @@ static void put_recvmsg(struct smb_direct_transport *t, }static void enqueue_reassembly (struct smb_direct_transport *t, -struct smb_direct_recvmsg *recvmsg, +struct smbdirect_recv_io *recvmsg,int data_length) {spin_lock (&t->reassembly_queue_lock);
@@ -280,11 +271,11 @@ static void enqueue_reassembly(struct smb_direct_transport *t,spin_unlock (&t->reassembly_queue_lock); } -static struct smb_direct_recvmsg *get_first_reassembly (struct smb_direct_transport *t) +static struct smbdirect_recv_io *get_first_reassembly (struct smb_direct_transport *t) {if (!list_empty (&t->reassembly_queue))return list_first_entry (&t->reassembly_queue, - struct smb_direct_recvmsg, list); + struct smbdirect_recv_io, list);else return NULL ; }
@@ -387,7 +378,7 @@ static void smb_direct_free_transport(struct ksmbd_transport *kt)static void free_transport (struct smb_direct_transport *t) {struct smbdirect_socket *sc = &t->socket; -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;wake_up_interruptible (&t->wait_send_credits);
@@ -465,9 +456,9 @@ static void smb_direct_free_sendmsg(struct smb_direct_transport *t,mempool_free (msg, t->sendmsg_mempool); } -static int smb_direct_check_recvmsg (struct smb_direct_recvmsg *recvmsg) +static int smb_direct_check_recvmsg (struct smbdirect_recv_io *recvmsg) { -struct smbdirect_socket *sc = &recvmsg->transport->socket; +struct smbdirect_socket *sc = recvmsg->socket;switch (sc->recv_io.expected) {case SMBDIRECT_EXPECT_DATA_TRANSFER : {
@@ -516,13 +507,13 @@ static int smb_direct_check_recvmsg(struct smb_direct_recvmsg *recvmsg)static void recv_done (struct ib_cq *cq,struct ib_wc *wc) { -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;struct smb_direct_transport *t;struct smbdirect_socket *sc; - recvmsg = container_of(wc->wr_cqe, struct smb_direct_recvmsg, cqe); - t = recvmsg->transport; - sc = &t->socket; + recvmsg = container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe); + sc = recvmsg->socket; + t = container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) {put_recvmsg (t, recvmsg);
@@ -634,7 +625,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) }static int smb_direct_post_recv (struct smb_direct_transport *t, -struct smb_direct_recvmsg *recvmsg) +struct smbdirect_recv_io *recvmsg) {struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -673,7 +664,7 @@ static int smb_direct_post_recv(struct smb_direct_transport *t,static int smb_direct_read (struct ksmbd_transport *t,char *buf,unsigned int size,int unused) { -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;struct smbdirect_data_transfer *data_transfer;int to_copy, to_read, data_read, offset;u32 data_length, remaining_data_length, data_offset;
@@ -710,7 +701,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, offset = st->first_entry_offset;while (data_read < size) { recvmsg =get_first_reassembly (st); - data_transfer =smb_direct_recvmsg_payload (recvmsg); + data_transfer =smbdirect_recv_io_payload (recvmsg); data_length =le32_to_cpu (data_transfer->data_length); remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length);
@@ -803,7 +794,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) {struct smb_direct_transport *t =container_of (work, struct smb_direct_transport, post_recv_credits_work.work); -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;int receive_credits, credits =0 ;int ret;
@@ -1684,7 +1675,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) {struct smbdirect_socket *sc = &t->socket;int ret; -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg; sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ;
@@ -1813,7 +1804,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t,static void smb_direct_destroy_pools (struct smb_direct_transport *t) { -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;while ((recvmsg =get_free_recvmsg (t)))mempool_free (recvmsg, t->recvmsg_mempool);
@@ -1837,7 +1828,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)struct smbdirect_socket_parameters *sp = &sc->parameters;char name[80 ];int i; -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;snprintf (name,sizeof (name),"smb_direct_rqst_pool_%p" , t); t->sendmsg_cache = kmem_cache_create(name,
@@ -1853,9 +1844,9 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)if (!t->sendmsg_mempool) goto err; -snprintf (name,sizeof (name),"smb_direct_resp_%p" , t); +snprintf (name,sizeof (name),"smbdirect_recv_io_pool_%p" , t); t->recvmsg_cache =kmem_cache_create (name, -sizeof (struct smb_direct_recvmsg ) + +sizeof (struct smbdirect_recv_io ) + sp->max_recv_size,0 ,SLAB_HWCACHE_ALIGN ,NULL );if (!t->recvmsg_cache)
@@ -1873,7 +1864,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t) recvmsg =mempool_alloc (t->recvmsg_mempool,KSMBD_DEFAULT_GFP );if (!recvmsg) goto err; - recvmsg->transport = t; + recvmsg->socket = sc; recvmsg->sge.length =0 ;list_add (&recvmsg->list, &t->recvmsg_queue); }
@@ -1978,7 +1969,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)struct smb_direct_transport *st =smb_trans_direct_transfort (t);struct smbdirect_socket *sc = &st->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smb_direct_recvmsg *recvmsg; +struct smbdirect_recv_io *recvmsg;struct smbdirect_negotiate_req *req;int ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 82/142 smb: server: make use of smbdirect_socket.recv_io.free.{list,lock}
In reply to Stefan MetzmacherThis is already used by the client and will allow us to add common helper functions soon.
--- fs/smb/server/transport_rdma.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
fs/smb/server/transport_rdma.c +12 -15
@@ -110,9 +110,6 @@ struct smb_direct_transport {int count_avail_recvmsg;int recv_credit_target; -spinlock_t recvmsg_queue_lock; -struct list_head recvmsg_queue; -atomic_t send_credits;spinlock_t lock_new_recv_credits;int new_recv_credits;
@@ -222,16 +219,17 @@ static inline bool is_receive_credit_post_required(int receive_credits,static struct smbdirect_recv_io *get_free_recvmsg (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg =NULL ; -spin_lock (&t->recvmsg_queue_lock); -if (!list_empty (&t->recvmsg_queue)) { - recvmsg =list_first_entry (&t->recvmsg_queue, +spin_lock (&sc->recv_io.free.lock); +if (!list_empty (&sc->recv_io.free.list)) { + recvmsg =list_first_entry (&sc->recv_io.free.list, struct smbdirect_recv_io, list);list_del (&recvmsg->list); } -spin_unlock (&t->recvmsg_queue_lock); +spin_unlock (&sc->recv_io.free.lock);return recvmsg; }
@@ -248,9 +246,9 @@ static void put_recvmsg(struct smb_direct_transport *t, recvmsg->sge.length =0 ; } -spin_lock (&t->recvmsg_queue_lock); -list_add (&recvmsg->list, &t->recvmsg_queue); -spin_unlock (&t->recvmsg_queue_lock); +spin_lock (&sc->recv_io.free.lock); +list_add (&recvmsg->list, &sc->recv_io.free.list); +spin_unlock (&sc->recv_io.free.lock); } static void enqueue_reassembly(struct smb_direct_transport *t,
@@ -333,6 +331,9 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; +INIT_LIST_HEAD (&sc->recv_io.free.list); +spin_lock_init (&sc->recv_io.free.lock); + sc->status =SMBDIRECT_SOCKET_CREATED ;init_waitqueue_head (&t->wait_status);
@@ -345,8 +346,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)init_waitqueue_head (&t->wait_rw_credits);spin_lock_init (&t->receive_credit_lock); -spin_lock_init (&t->recvmsg_queue_lock); -INIT_LIST_HEAD (&t->recvmsg_queue);init_waitqueue_head (&t->wait_send_pending);atomic_set (&t->send_pending,0 );
@@ -1858,15 +1857,13 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)if (!t->recvmsg_mempool) goto err; -INIT_LIST_HEAD (&t->recvmsg_queue); -for (i =0 ; i < sp->recv_credit_max; i++) { recvmsg =mempool_alloc (t->recvmsg_mempool,KSMBD_DEFAULT_GFP );if (!recvmsg) goto err; recvmsg->socket = sc; recvmsg->sge.length =0 ; -list_add (&recvmsg->list, &t->recvmsg_queue); +list_add (&recvmsg->list, &sc->recv_io.free.list); } t->count_avail_recvmsg = sp->recv_credit_max;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 83/142 smb: server: make use of smbdirect_socket.recv_io.reassembly.*
In reply to Stefan MetzmacherThis is also used by the client and will allow us to introduce common helper functions soon.
--- fs/smb/server/transport_rdma.c | 90 ++++++++++++++++------------------ 1 file changed, 43 insertions(+), 47 deletions(-)
fs/smb/server/transport_rdma.c +43 -47
@@ -95,16 +95,8 @@ struct smb_direct_transport {struct smbdirect_socket socket; -bool full_packet_received;wait_queue_head_t wait_status; -spinlock_t reassembly_queue_lock; -struct list_head reassembly_queue; -int reassembly_data_length; -int reassembly_queue_length; -int first_entry_offset; -wait_queue_head_t wait_reassembly_queue; -spinlock_t receive_credit_lock;int recv_credits;int count_avail_recvmsg;
@@ -255,9 +247,11 @@ static void enqueue_reassembly(struct smb_direct_transport *t, struct smbdirect_recv_io *recvmsg, int data_length) { -spin_lock (&t->reassembly_queue_lock); -list_add_tail (&recvmsg->list, &t->reassembly_queue); - t->reassembly_queue_length++; +struct smbdirect_socket *sc = &t->socket; + +spin_lock (&sc->recv_io.reassembly.lock); +list_add_tail (&recvmsg->list, &sc->recv_io.reassembly.list); + sc->recv_io.reassembly.queue_length++;/* * Make sure reassembly_data_length is updated after list and * reassembly_queue_length are updated. On the dequeue side
@@ -265,14 +259,16 @@ static void enqueue_reassembly(struct smb_direct_transport *t,* if reassembly_queue_length and list is up to date */ virt_wmb (); - t->reassembly_data_length += data_length; -spin_unlock (&t->reassembly_queue_lock); + sc->recv_io.reassembly.data_length += data_length; +spin_unlock (&sc->recv_io.reassembly.lock); }static struct smbdirect_recv_io *get_first_reassembly (struct smb_direct_transport *t) { -if (!list_empty (&t->reassembly_queue)) -return list_first_entry (&t->reassembly_queue, +struct smbdirect_socket *sc = &t->socket; + +if (!list_empty (&sc->recv_io.reassembly.list)) +return list_first_entry (&sc->recv_io.reassembly.list, struct smbdirect_recv_io, list);else return NULL ;
@@ -337,11 +333,11 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->status =SMBDIRECT_SOCKET_CREATED ;init_waitqueue_head (&t->wait_status); -spin_lock_init (&t->reassembly_queue_lock); -INIT_LIST_HEAD (&t->reassembly_queue); - t->reassembly_data_length =0 ; - t->reassembly_queue_length =0 ; -init_waitqueue_head (&t->wait_reassembly_queue); +spin_lock_init (&sc->recv_io.reassembly.lock); +INIT_LIST_HEAD (&sc->recv_io.reassembly.list); + sc->recv_io.reassembly.data_length =0 ; + sc->recv_io.reassembly.queue_length =0 ; +init_waitqueue_head (&sc->recv_io.reassembly.wait_queue);init_waitqueue_head (&t->wait_send_credits);init_waitqueue_head (&t->wait_rw_credits);
@@ -398,17 +394,17 @@ static void free_transport(struct smb_direct_transport *t)ksmbd_debug (RDMA ,"drain the reassembly queue\n" );do { -spin_lock (&t->reassembly_queue_lock); +spin_lock (&sc->recv_io.reassembly.lock); recvmsg =get_first_reassembly (t);if (recvmsg) {list_del (&recvmsg->list); -spin_unlock (&t->reassembly_queue_lock); +spin_unlock (&sc->recv_io.reassembly.lock);put_recvmsg (t, recvmsg); }else { -spin_unlock (&t->reassembly_queue_lock); +spin_unlock (&sc->recv_io.reassembly.lock); } }while (recvmsg); - t->reassembly_data_length =0 ; + sc->recv_io.reassembly.data_length =0 ;if (sc->ib.send_cq)ib_free_cq (sc->ib.send_cq);
@@ -540,7 +536,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } t->negotiation_requested = true; - t->full_packet_received = true; + sc->recv_io.reassembly.full_packet_received = true; sc->status =SMBDIRECT_SOCKET_CONNECTED ;enqueue_reassembly (t, recvmsg,0 );wake_up_interruptible (&t->wait_status);
@@ -567,13 +563,13 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } -if (t->full_packet_received) +if (sc->recv_io.reassembly.full_packet_received) recvmsg->first_segment = true;if (le32_to_cpu (data_transfer->remaining_data_length)) - t->full_packet_received = false; + sc->recv_io.reassembly.full_packet_received = false;else - t->full_packet_received = true; + sc->recv_io.reassembly.full_packet_received = true;spin_lock (&t->receive_credit_lock); receive_credits = --(t->recv_credits);
@@ -604,7 +600,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (data_length) {enqueue_reassembly (t, recvmsg, (int )data_length); -wake_up_interruptible (&t->wait_reassembly_queue); +wake_up_interruptible (&sc->recv_io.reassembly.wait_queue); }else put_recvmsg (t, recvmsg);
@@ -682,7 +678,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,* the only one reading from the front of the queue. The transport * may add more entries to the back of the queue at the same time */ -if (st->reassembly_data_length >= size) { +if (sc->recv_io.reassembly.data_length >= size) {int queue_length;int queue_removed =0 ;
@@ -694,10 +690,10 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,* updated in SOFTIRQ as more data is received */ virt_rmb (); - queue_length = st->reassembly_queue_length; + queue_length = sc->recv_io.reassembly.queue_length; data_read =0 ; to_read = size; - offset = st->first_entry_offset; + offset = sc->recv_io.reassembly.first_entry_offset;while (data_read < size) { recvmsg =get_first_reassembly (st); data_transfer =smbdirect_recv_io_payload (recvmsg);
@@ -740,9 +736,9 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,if (queue_length) {list_del (&recvmsg->list); }else { -spin_lock_irq (&st->reassembly_queue_lock); +spin_lock_irq (&sc->recv_io.reassembly.lock);list_del (&recvmsg->list); -spin_unlock_irq (&st->reassembly_queue_lock); +spin_unlock_irq (&sc->recv_io.reassembly.lock); } queue_removed++;put_recvmsg (st, recvmsg);
@@ -755,10 +751,10 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, data_read += to_copy; } -spin_lock_irq (&st->reassembly_queue_lock); - st->reassembly_data_length -= data_read; - st->reassembly_queue_length -= queue_removed; -spin_unlock_irq (&st->reassembly_queue_lock); +spin_lock_irq (&sc->recv_io.reassembly.lock); + sc->recv_io.reassembly.data_length -= data_read; + sc->recv_io.reassembly.queue_length -= queue_removed; +spin_unlock_irq (&sc->recv_io.reassembly.lock);spin_lock (&st->receive_credit_lock); st->count_avail_recvmsg += queue_removed;
@@ -770,18 +766,18 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,spin_unlock (&st->receive_credit_lock); } - st->first_entry_offset = offset; + sc->recv_io.reassembly.first_entry_offset = offset;ksmbd_debug (RDMA ,"returning to thread data_read=%d reassembly_data_length=%d first_entry_offset=%d\n" , - data_read, st->reassembly_data_length, - st->first_entry_offset); + data_read, sc->recv_io.reassembly.data_length, + sc->recv_io.reassembly.first_entry_offset); read_rfc1002_done:return data_read; }ksmbd_debug (RDMA ,"wait_event on more data\n" ); - rc =wait_event_interruptible (st->wait_reassembly_queue, - st->reassembly_data_length >= size || + rc =wait_event_interruptible (sc->recv_io.reassembly.wait_queue, + sc->recv_io.reassembly.data_length >= size || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (rc)return -EINTR ;
@@ -1536,7 +1532,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id, sc->status =SMBDIRECT_SOCKET_DISCONNECTED ;wake_up_interruptible (&t->wait_status); -wake_up_interruptible (&t->wait_reassembly_queue); +wake_up_interruptible (&sc->recv_io.reassembly.wait_queue);wake_up (&t->wait_send_credits);break ; }
@@ -1998,10 +1994,10 @@ static int smb_direct_prepare(struct ksmbd_transport *t) ret =smb_direct_send_negotiate_response (st, ret); out: -spin_lock_irq (&st->reassembly_queue_lock); - st->reassembly_queue_length--; +spin_lock_irq (&sc->recv_io.reassembly.lock); + sc->recv_io.reassembly.queue_length--;list_del (&recvmsg->list); -spin_unlock_irq (&st->reassembly_queue_lock); +spin_unlock_irq (&sc->recv_io.reassembly.lock);put_recvmsg (st, recvmsg);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 84/142 smb: server: make use of SMBDIRECT_RECV_IO_MAX_SGE
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -37,7 +37,6 @@#define SMB_DIRECT_NEGOTIATE_TIMEOUT 120#define SMB_DIRECT_MAX_SEND_SGES 6 -#define SMB_DIRECT_MAX_RECV_SGES 1/* * Default maximum number of RDMA read/write outstanding on this connection
@@ -1767,7 +1766,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t,return -EINVAL ; } -if (device->attrs.max_recv_sge <SMB_DIRECT_MAX_RECV_SGES ) { +if (device->attrs.max_recv_sge <SMBDIRECT_RECV_IO_MAX_SGE ) {pr_err ("warning: device max_recv_sge = %d too small\n" , device->attrs.max_recv_sge);return -EINVAL ;
@@ -1791,7 +1790,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, cap->max_send_wr = max_send_wrs; cap->max_recv_wr = sp->recv_credit_max; cap->max_send_sge = max_sge_per_wr; - cap->max_recv_sge =SMB_DIRECT_MAX_RECV_SGES ; + cap->max_recv_sge =SMBDIRECT_RECV_IO_MAX_SGE ; cap->max_inline_data =0 ; cap->max_rdma_ctxs = t->max_rw_credits;return 0 ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 85/142 smb: server: make use of struct smbdirect_send_io
In reply to Stefan MetzmacherThis is already used by the client and will allow us to use common helper functions soon.
--- fs/smb/server/transport_rdma.c | 81 +++++++++++++++------------------- 1 file changed, 36 insertions(+), 45 deletions(-)
fs/smb/server/transport_rdma.c +36 -45
@@ -36,8 +36,6 @@/* SMB_DIRECT negotiation timeout in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 120 -#define SMB_DIRECT_MAX_SEND_SGES 6 -/* * Default maximum number of RDMA read/write outstanding on this connection * This value is possibly decreased during QP creation on hardware limit
@@ -143,16 +141,6 @@ struct smb_direct_send_ctx {unsigned int remote_key; }; -struct smb_direct_sendmsg { -struct smb_direct_transport *transport; -struct ib_send_wr wr; -struct list_head list; -int num_sge; -struct ib_sge sge[SMB_DIRECT_MAX_SEND_SGES ]; -struct ib_cqe cqe; -u8 packet[]; -}; -struct smb_direct_rdma_rw_msg {struct smb_direct_transport *t;struct ib_cqe cqe;
@@ -418,22 +406,23 @@ static void free_transport(struct smb_direct_transport *t)ksmbd_conn_free (KSMBD_TRANS (t)->conn); } -static struct smb_direct_sendmsg +static struct smbdirect_send_io *smb_direct_alloc_sendmsg (struct smb_direct_transport *t) { -struct smb_direct_sendmsg *msg; +struct smbdirect_socket *sc = &t->socket; +struct smbdirect_send_io *msg; msg =mempool_alloc (t->sendmsg_mempool,KSMBD_DEFAULT_GFP );if (!msg)return ERR_PTR (-ENOMEM ); - msg->transport = t; -INIT_LIST_HEAD (&msg->list); + msg->socket = sc; +INIT_LIST_HEAD (&msg->sibling_list); msg->num_sge =0 ;return msg; }static void smb_direct_free_sendmsg (struct smb_direct_transport *t, -struct smb_direct_sendmsg *msg) +struct smbdirect_send_io *msg) {struct smbdirect_socket *sc = &t->socket;int i;
@@ -829,12 +818,14 @@ static void smb_direct_post_recv_credits(struct work_struct *work)static void send_done (struct ib_cq *cq,struct ib_wc *wc) { -struct smb_direct_sendmsg *sendmsg, *sibling; +struct smbdirect_send_io *sendmsg, *sibling;struct smb_direct_transport *t; +struct smbdirect_socket *sc;struct list_head *pos, *prev, *end; - sendmsg = container_of(wc->wr_cqe, struct smb_direct_sendmsg, cqe); - t = sendmsg->transport; + sendmsg = container_of(wc->wr_cqe, struct smbdirect_send_io, cqe); + sc = sendmsg->socket; + t = container_of(sc, struct smb_direct_transport, socket); ksmbd_debug(RDMA, "Send completed. status='%s (%d)', opcode=%d\n", ib_wc_status_msg(wc->status), wc->status,
@@ -853,13 +844,13 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)/* iterate and free the list of messages in reverse. the list's head * is invalid. */ -for (pos = &sendmsg->list, prev = pos->prev, end = sendmsg->list.next; +for (pos = &sendmsg->sibling_list, prev = pos->prev, end = sendmsg->sibling_list.next; prev != end; pos = prev, prev = prev->prev) { - sibling = container_of(pos, struct smb_direct_sendmsg, list); + sibling = container_of(pos, struct smbdirect_send_io, sibling_list);smb_direct_free_sendmsg (t, sibling); } - sibling = container_of(pos, struct smb_direct_sendmsg, list); + sibling = container_of(pos, struct smbdirect_send_io, sibling_list);smb_direct_free_sendmsg (t, sibling); }
@@ -907,18 +898,18 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t, struct smb_direct_send_ctx *send_ctx, bool is_last) { -struct smb_direct_sendmsg *first, *last; +struct smbdirect_send_io *first, *last;int ret;if (list_empty (&send_ctx->msg_list))return 0 ; first =list_first_entry (&send_ctx->msg_list, - struct smb_direct_sendmsg, - list); + struct smbdirect_send_io, + sibling_list); last =list_last_entry (&send_ctx->msg_list, - struct smb_direct_sendmsg, - list); + struct smbdirect_send_io, + sibling_list); last->wr.send_flags =IB_SEND_SIGNALED ; last->wr.wr_cqe = &last->cqe;
@@ -936,7 +927,7 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t,atomic_add (send_ctx->wr_cnt, &t->send_credits);wake_up (&t->wait_send_credits);list_for_each_entry_safe (first, last, &send_ctx->msg_list, - list) { + sibling_list) {smb_direct_free_sendmsg (t, first); } }
@@ -995,11 +986,11 @@ static int calc_rw_credits(struct smb_direct_transport *t,static int smb_direct_create_header (struct smb_direct_transport *t,int size,int remaining_data_length, -struct smb_direct_sendmsg **sendmsg_out) +struct smbdirect_send_io **sendmsg_out) {struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smb_direct_sendmsg *sendmsg; +struct smbdirect_send_io *sendmsg;struct smbdirect_data_transfer *packet;int header_length;int ret;
@@ -1102,7 +1093,7 @@ static int get_mapped_sg_list(struct ib_device *device, void *buf, int size,static int post_sendmsg (struct smb_direct_transport *t,struct smb_direct_send_ctx *send_ctx, -struct smb_direct_sendmsg *msg) +struct smbdirect_send_io *msg) {struct smbdirect_socket *sc = &t->socket;int i;
@@ -1122,14 +1113,14 @@ static int post_sendmsg(struct smb_direct_transport *t, msg->wr.wr_cqe =NULL ; msg->wr.send_flags =0 ;if (!list_empty (&send_ctx->msg_list)) { -struct smb_direct_sendmsg *last; +struct smbdirect_send_io *last; last =list_last_entry (&send_ctx->msg_list, - struct smb_direct_sendmsg, - list); + struct smbdirect_send_io, + sibling_list); last->wr.next = &msg->wr; } -list_add_tail (&msg->list, &send_ctx->msg_list); +list_add_tail (&msg->sibling_list, &send_ctx->msg_list); send_ctx->wr_cnt++;return 0 ; }
@@ -1146,9 +1137,9 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, {struct smbdirect_socket *sc = &t->socket;int i, j, ret; -struct smb_direct_sendmsg *msg; +struct smbdirect_send_io *msg;int data_length; -struct scatterlist sg[SMB_DIRECT_MAX_SEND_SGES -1 ]; +struct scatterlist sg[SMBDIRECT_SEND_IO_MAX_SGE -1 ]; ret =wait_for_send_credits (t, send_ctx);if (ret)
@@ -1169,16 +1160,16 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t,struct ib_sge *sge;int sg_cnt; -sg_init_table (sg,SMB_DIRECT_MAX_SEND_SGES -1 ); +sg_init_table (sg,SMBDIRECT_SEND_IO_MAX_SGE -1 ); sg_cnt =get_mapped_sg_list (sc->ib.dev, iov[i].iov_base, iov[i].iov_len, - sg,SMB_DIRECT_MAX_SEND_SGES -1 , + sg,SMBDIRECT_SEND_IO_MAX_SGE -1 ,DMA_TO_DEVICE );if (sg_cnt <=0 ) {pr_err ("failed to map buffer\n" ); ret = -ENOMEM ; goto err; - }else if (sg_cnt + msg->num_sge >SMB_DIRECT_MAX_SEND_SGES ) { + }else if (sg_cnt + msg->num_sge >SMBDIRECT_SEND_IO_MAX_SGE ) {pr_err ("buffer not fitted into sges\n" ); ret = -E2BIG ; ib_dma_unmap_sg(sc->ib.dev, sg, sg_cnt,
@@ -1572,7 +1563,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, {struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smb_direct_sendmsg *sendmsg; +struct smbdirect_send_io *sendmsg;struct smbdirect_negotiate_resp *resp;int ret;
@@ -1720,7 +1711,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t,*/ sp->max_send_size = smb_direct_max_send_size; max_send_sges =DIV_ROUND_UP (sp->max_send_size,PAGE_SIZE ) +3 ; -if (max_send_sges >SMB_DIRECT_MAX_SEND_SGES ) { +if (max_send_sges >SMBDIRECT_SEND_IO_MAX_SGE ) {pr_err ("max_send_size %d is too large\n" , sp->max_send_size);return -EINVAL ; }
@@ -1824,9 +1815,9 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)int i;struct smbdirect_recv_io *recvmsg; -snprintf (name,sizeof (name),"smb_direct_rqst_pool_%p" , t); +snprintf (name,sizeof (name),"smbdirect_send_io_pool_%p" , t); t->sendmsg_cache =kmem_cache_create (name, -sizeof (struct smb_direct_sendmsg ) + +sizeof (struct smbdirect_send_io ) +sizeof (struct smbdirect_negotiate_resp ),0 ,SLAB_HWCACHE_ALIGN ,NULL );if (!t->sendmsg_cache)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 86/142 smb: server: make use of smbdirect_socket.{send,recv}_io.mem.{cache,pool}
In reply to Stefan MetzmacherThis will allow common helper functions to be created later.
--- fs/smb/server/transport_rdma.c | 50 ++++++++++++++++------------------ 1 file changed, 23 insertions(+), 27 deletions(-)
fs/smb/server/transport_rdma.c +23 -27
@@ -109,11 +109,6 @@ struct smb_direct_transport {wait_queue_head_t wait_send_credits;wait_queue_head_t wait_rw_credits; -mempool_t *sendmsg_mempool; -struct kmem_cache *sendmsg_cache; -mempool_t *recvmsg_mempool; -struct kmem_cache *recvmsg_cache; -wait_queue_head_t wait_send_pending;atomic_t send_pending;
@@ -412,7 +407,7 @@ static struct smbdirect_send_iostruct smbdirect_socket *sc = &t->socket;struct smbdirect_send_io *msg; - msg =mempool_alloc (t->sendmsg_mempool,KSMBD_DEFAULT_GFP ); + msg =mempool_alloc (sc->send_io.mem.pool,KSMBD_DEFAULT_GFP );if (!msg)return ERR_PTR (-ENOMEM ); msg->socket = sc;
@@ -436,7 +431,7 @@ static void smb_direct_free_sendmsg(struct smb_direct_transport *t, msg->sge[i].addr, msg->sge[i].length, DMA_TO_DEVICE); } -mempool_free (msg, t->sendmsg_mempool); +mempool_free (msg, sc->send_io.mem.pool); }static int smb_direct_check_recvmsg (struct smbdirect_recv_io *recvmsg)
@@ -1789,22 +1784,23 @@ static int smb_direct_init_params(struct smb_direct_transport *t,static void smb_direct_destroy_pools (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg;while ((recvmsg =get_free_recvmsg (t))) -mempool_free (recvmsg, t->recvmsg_mempool); +mempool_free (recvmsg, sc->recv_io.mem.pool); -mempool_destroy (t->recvmsg_mempool); - t->recvmsg_mempool =NULL ; +mempool_destroy (sc->recv_io.mem.pool); + sc->recv_io.mem.pool =NULL ; -kmem_cache_destroy (t->recvmsg_cache); - t->recvmsg_cache =NULL ; +kmem_cache_destroy (sc->recv_io.mem.cache); + sc->recv_io.mem.cache =NULL ; -mempool_destroy (t->sendmsg_mempool); - t->sendmsg_mempool =NULL ; +mempool_destroy (sc->send_io.mem.pool); + sc->send_io.mem.pool =NULL ; -kmem_cache_destroy (t->sendmsg_cache); - t->sendmsg_cache =NULL ; +kmem_cache_destroy (sc->send_io.mem.cache); + sc->send_io.mem.cache =NULL ; }static int smb_direct_create_pools (struct smb_direct_transport *t)
@@ -1816,35 +1812,35 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)struct smbdirect_recv_io *recvmsg;snprintf (name,sizeof (name),"smbdirect_send_io_pool_%p" , t); - t->sendmsg_cache =kmem_cache_create (name, + sc->send_io.mem.cache =kmem_cache_create (name,sizeof (struct smbdirect_send_io ) +sizeof (struct smbdirect_negotiate_resp ),0 ,SLAB_HWCACHE_ALIGN ,NULL ); -if (!t->sendmsg_cache) +if (!sc->send_io.mem.cache)return -ENOMEM ; - t->sendmsg_mempool =mempool_create (sp->send_credit_target, + sc->send_io.mem.pool =mempool_create (sp->send_credit_target, mempool_alloc_slab, mempool_free_slab, - t->sendmsg_cache); -if (!t->sendmsg_mempool) + sc->send_io.mem.cache); +if (!sc->send_io.mem.pool) goto err;snprintf (name,sizeof (name),"smbdirect_recv_io_pool_%p" , t); - t->recvmsg_cache =kmem_cache_create (name, + sc->recv_io.mem.cache =kmem_cache_create (name,sizeof (struct smbdirect_recv_io ) + sp->max_recv_size,0 ,SLAB_HWCACHE_ALIGN ,NULL ); -if (!t->recvmsg_cache) +if (!sc->recv_io.mem.cache) goto err; - t->recvmsg_mempool = + sc->recv_io.mem.pool =mempool_create (sp->recv_credit_max, mempool_alloc_slab, - mempool_free_slab, t->recvmsg_cache); -if (!t->recvmsg_mempool) + mempool_free_slab, sc->recv_io.mem.cache); +if (!sc->recv_io.mem.pool) goto err;for (i =0 ; i < sp->recv_credit_max; i++) { - recvmsg =mempool_alloc (t->recvmsg_mempool,KSMBD_DEFAULT_GFP ); + recvmsg =mempool_alloc (sc->recv_io.mem.pool,KSMBD_DEFAULT_GFP );if (!recvmsg) goto err; recvmsg->socket = sc;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 87/142 smb: server: make only use of wake_up[_all]() in transport_rdma.c
In reply to Stefan Metzmacherwake_up_interruptible(() doesn't wake up tasks waiting with wait_event().
So we better wake_up[_all]() in order to wake up all tasks in order to simplify the logic.
As we currently don't use any wait_event_*_exclusive() it doesn't really matter if we use wake_up() or wake_up_all(). But in this patch I try to use wake_up() for expected situations and wake_up_all() for situations of a broken connection. So don't need to adjust things in future when we
may use wait_event_*_exclusive() in order to wake up only one process that should make progress.
Changing the wait_event_*() code in order to keepwait_event(), wait_event_interruptible() andwait_event_interruptible_timeout() or
changing them to wait_event_killable(),wait_event_killable_timeout(),wait_event_killable_exclusive()
is something to think about in a future patch.
The goal here is to avoid that some tasks are not
woken and freeze forever.
Also note that this patch only changes the existing wake_up*() calls. Adding more wake_up*() calls for other wait queues is also deferred to a future patch.
--- fs/smb/server/transport_rdma.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
fs/smb/server/transport_rdma.c +9 -9
@@ -357,7 +357,7 @@ static void free_transport(struct smb_direct_transport *t)struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg; -wake_up_interruptible (&t->wait_send_credits); +wake_up_all (&t->wait_send_credits);ksmbd_debug (RDMA ,"wait for all send posted to IB to finish\n" ); wait_event(t->wait_send_pending,
@@ -522,7 +522,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; sc->status =SMBDIRECT_SOCKET_CONNECTED ;enqueue_reassembly (t, recvmsg,0 ); -wake_up_interruptible (&t->wait_status); +wake_up (&t->wait_status);return ;case SMBDIRECT_EXPECT_DATA_TRANSFER : { struct smbdirect_data_transfer *data_transfer =
@@ -575,7 +575,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)queue_work (smb_direct_wq, &t->send_immediate_work);if (atomic_read (&t->send_credits) >0 ) -wake_up_interruptible (&t->wait_send_credits); +wake_up (&t->wait_send_credits);if (is_receive_credit_post_required (receive_credits, avail_recvmsg_count)) mod_delayed_work(smb_direct_wq,
@@ -583,7 +583,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (data_length) {enqueue_reassembly (t, recvmsg, (int )data_length); -wake_up_interruptible (&sc->recv_io.reassembly.wait_queue); +wake_up (&sc->recv_io.reassembly.wait_queue); }else put_recvmsg (t, recvmsg);
@@ -1508,7 +1508,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,switch (event->event) {case RDMA_CM_EVENT_ESTABLISHED : { sc->status =SMBDIRECT_SOCKET_CONNECTED ; -wake_up_interruptible (&t->wait_status); +wake_up (&t->wait_status);break ; }case RDMA_CM_EVENT_DEVICE_REMOVAL :
@@ -1516,14 +1516,14 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,ib_drain_qp (sc->ib.qp); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_interruptible (&t->wait_status); -wake_up_interruptible (&sc->recv_io.reassembly.wait_queue); -wake_up (&t->wait_send_credits); +wake_up_all (&t->wait_status); +wake_up_all (&sc->recv_io.reassembly.wait_queue); +wake_up_all (&t->wait_send_credits);break ; }case RDMA_CM_EVENT_CONNECT_ERROR : { sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_interruptible (&t->wait_status); +wake_up_all (&t->wait_status);break ; }default :
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 88/142 smb: server: add a pr_info() when the server starts running
In reply to Stefan MetzmacherWe already have a message like:
ksmbd: kill command received
when the server stops running.
This makes it easier for debugging in order to match any possible warnings/errors in dmesg with restarted server.
--- fs/smb/server/server.c | 1 + 1 file changed, 1 insertion(+)
fs/smb/server/server.c +1 -0
@@ -365,6 +365,7 @@ static void server_ctrl_handle_init(struct server_ctrl_struct *ctrl)return ; } +pr_info ("running\n" );WRITE_ONCE (server_conf.state,SERVER_STATE_RUNNING ); }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 89/142 smb: server: don't use delayed_work for post_recv_credits_work
In reply to Stefan MetzmacherIf we are using a hardcoded delay of 0 there's no point in using delayed_work it only adds confusion.
The client also uses a normal work_struct and now it is easier to move it to the common smbdirect_socket.
--- fs/smb/server/transport_rdma.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
fs/smb/server/transport_rdma.c +8 -10
@@ -112,7 +112,7 @@ struct smb_direct_transport {wait_queue_head_t wait_send_pending;atomic_t send_pending; -struct delayed_work post_recv_credits_work; +struct work_struct post_recv_credits_work;struct work_struct send_immediate_work;struct work_struct disconnect_work;
@@ -330,8 +330,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)spin_lock_init (&t->lock_new_recv_credits); -INIT_DELAYED_WORK (&t->post_recv_credits_work, - smb_direct_post_recv_credits); +INIT_WORK (&t->post_recv_credits_work, + smb_direct_post_recv_credits);INIT_WORK (&t->send_immediate_work, smb_direct_send_immediate_work);INIT_WORK (&t->disconnect_work, smb_direct_disconnect_rdma_work);
@@ -364,7 +364,7 @@ static void free_transport(struct smb_direct_transport *t) atomic_read(&t->send_pending) == 0);cancel_work_sync (&t->disconnect_work); -cancel_delayed_work_sync (&t->post_recv_credits_work); +cancel_work_sync (&t->post_recv_credits_work);cancel_work_sync (&t->send_immediate_work);if (sc->ib.qp) {
@@ -578,8 +578,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)wake_up (&t->wait_send_credits);if (is_receive_credit_post_required (receive_credits, avail_recvmsg_count)) -mod_delayed_work (smb_direct_wq, - &t->post_recv_credits_work,0 ); +queue_work (smb_direct_wq, &t->post_recv_credits_work);if (data_length) {enqueue_reassembly (t, recvmsg, (int )data_length);
@@ -743,8 +742,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, st->count_avail_recvmsg += queue_removed;if (is_receive_credit_post_required (st->recv_credits, st->count_avail_recvmsg)) {spin_unlock (&st->receive_credit_lock); -mod_delayed_work (smb_direct_wq, - &st->post_recv_credits_work,0 ); +queue_work (smb_direct_wq, &st->post_recv_credits_work); }else {spin_unlock (&st->receive_credit_lock); }
@@ -771,7 +769,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,static void smb_direct_post_recv_credits (struct work_struct *work) {struct smb_direct_transport *t =container_of (work, - struct smb_direct_transport, post_recv_credits_work.work); + struct smb_direct_transport, post_recv_credits_work);struct smbdirect_recv_io *recvmsg;int receive_credits, credits =0 ;int ret;
@@ -1676,7 +1674,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) goto out_err; } -smb_direct_post_recv_credits (&t->post_recv_credits_work.work); +smb_direct_post_recv_credits (&t->post_recv_credits_work);return 0 ; out_err:put_recvmsg (t, recvmsg);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 90/142 smb: server: queue post_recv_credits_work in put_recvmsg() and avoid count_avail_recvmsg
In reply to Stefan MetzmacherThis is basically what the client is doing in put_receive_buffer().
It means we don't need complicated work to maintain count_avail_recvmsg.
But we keep the logic to queue post_recv_credits_work if the peer raises the requested credit_target and put_receive_buffer() is not called.
--- fs/smb/server/transport_rdma.c | 45 +++++++++------------------------- 1 file changed, 11 insertions(+), 34 deletions(-)
fs/smb/server/transport_rdma.c +11 -34
@@ -96,7 +96,6 @@ struct smb_direct_transport {spinlock_t receive_credit_lock;int recv_credits; -int count_avail_recvmsg;int recv_credit_target;atomic_t send_credits;
@@ -183,13 +182,6 @@ static inline voidreturn (void *)recvmsg->packet; } -static inline bool is_receive_credit_post_required (int receive_credits, -int avail_recvmsg_count) -{ -return receive_credits <= (smb_direct_receive_credit_max >>3 ) && - avail_recvmsg_count >= (receive_credits >>2 ); -} -static struct smbdirect_recv_io *get_free_recvmsg (struct smb_direct_transport *t) {
@@ -223,6 +215,8 @@ static void put_recvmsg(struct smb_direct_transport *t,spin_lock (&sc->recv_io.free.lock);list_add (&recvmsg->list, &sc->recv_io.free.list);spin_unlock (&sc->recv_io.free.lock); + +queue_work (smb_direct_wq, &t->post_recv_credits_work); } static void enqueue_reassembly(struct smb_direct_transport *t,
@@ -528,7 +522,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet;unsigned int data_length; -int avail_recvmsg_count, receive_credits; +int old_recv_credit_target;if (wc->byte_len < offsetof(struct smbdirect_data_transfer , padding)) {
@@ -553,18 +547,13 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = false; else sc->recv_io.reassembly.full_packet_received = true; - -spin_lock (&t->receive_credit_lock); - receive_credits = --(t->recv_credits); - avail_recvmsg_count = t->count_avail_recvmsg; -spin_unlock (&t->receive_credit_lock); - }else { -spin_lock (&t->receive_credit_lock); - receive_credits = --(t->recv_credits); - avail_recvmsg_count = ++(t->count_avail_recvmsg); -spin_unlock (&t->receive_credit_lock); } +spin_lock (&t->receive_credit_lock); + t->recv_credits -=1 ; +spin_unlock (&t->receive_credit_lock); + + old_recv_credit_target = t->recv_credit_target; t->recv_credit_target =le16_to_cpu (data_transfer->credits_requested); atomic_add(le16_to_cpu(data_transfer->credits_granted),
@@ -577,10 +566,10 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (atomic_read (&t->send_credits) >0 )wake_up (&t->wait_send_credits); -if (is_receive_credit_post_required (receive_credits, avail_recvmsg_count)) -queue_work (smb_direct_wq, &t->post_recv_credits_work); -if (data_length) { +if (t->recv_credit_target > old_recv_credit_target) +queue_work (smb_direct_wq, &t->post_recv_credits_work); +enqueue_reassembly (t, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else
@@ -738,15 +727,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, sc->recv_io.reassembly.queue_length -= queue_removed;spin_unlock_irq (&sc->recv_io.reassembly.lock); -spin_lock (&st->receive_credit_lock); - st->count_avail_recvmsg += queue_removed; -if (is_receive_credit_post_required (st->recv_credits, st->count_avail_recvmsg)) { -spin_unlock (&st->receive_credit_lock); -queue_work (smb_direct_wq, &st->post_recv_credits_work); - }else { -spin_unlock (&st->receive_credit_lock); - } - sc->recv_io.reassembly.first_entry_offset = offset; ksmbd_debug(RDMA, "returning to thread data_read=%d reassembly_data_length=%d first_entry_offset=%d\n",
@@ -798,7 +778,6 @@ static void smb_direct_post_recv_credits(struct work_struct *work)spin_lock (&t->receive_credit_lock); t->recv_credits += credits; - t->count_avail_recvmsg -= credits;spin_unlock (&t->receive_credit_lock);spin_lock (&t->lock_new_recv_credits);
@@ -1757,7 +1736,6 @@ static int smb_direct_init_params(struct smb_direct_transport *t, } t->recv_credits =0 ; - t->count_avail_recvmsg =0 ; sp->recv_credit_max = smb_direct_receive_credit_max; t->recv_credit_target =10 ;
@@ -1845,7 +1823,6 @@ static int smb_direct_create_pools(struct smb_direct_transport *t) recvmsg->sge.length =0 ;list_add (&recvmsg->list, &sc->recv_io.free.list); } - t->count_avail_recvmsg = sp->recv_credit_max;return 0 ; err:
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 91/142 smb: server: make use of smbdirect_socket.status_wait
In reply to Stefan MetzmacherThis will allow us to have common helper functions soon.
--- fs/smb/server/transport_rdma.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
fs/smb/server/transport_rdma.c +7 -9
@@ -92,8 +92,6 @@ struct smb_direct_transport {struct smbdirect_socket socket; -wait_queue_head_t wait_status; -spinlock_t receive_credit_lock;int recv_credits;int recv_credit_target;
@@ -307,7 +305,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)spin_lock_init (&sc->recv_io.free.lock); sc->status =SMBDIRECT_SOCKET_CREATED ; -init_waitqueue_head (&t->wait_status); +init_waitqueue_head (&sc->status_wait);spin_lock_init (&sc->recv_io.reassembly.lock);INIT_LIST_HEAD (&sc->recv_io.reassembly.list);
@@ -516,7 +514,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; sc->status =SMBDIRECT_SOCKET_CONNECTED ;enqueue_reassembly (t, recvmsg,0 ); -wake_up (&t->wait_status); +wake_up (&sc->status_wait);return ;case SMBDIRECT_EXPECT_DATA_TRANSFER : { struct smbdirect_data_transfer *data_transfer =
@@ -1458,7 +1456,7 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , sc->rdma.cm_id);smb_direct_disconnect_rdma_work (&st->disconnect_work); -wait_event_interruptible (st->wait_status, +wait_event_interruptible (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED );free_transport (st); }
@@ -1485,7 +1483,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,switch (event->event) {case RDMA_CM_EVENT_ESTABLISHED : { sc->status =SMBDIRECT_SOCKET_CONNECTED ; -wake_up (&t->wait_status); +wake_up (&sc->status_wait);break ; }case RDMA_CM_EVENT_DEVICE_REMOVAL :
@@ -1493,14 +1491,14 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,ib_drain_qp (sc->ib.qp); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_all (&t->wait_status); +wake_up_all (&sc->status_wait);wake_up_all (&sc->recv_io.reassembly.wait_queue);wake_up_all (&t->wait_send_credits);break ; }case RDMA_CM_EVENT_CONNECT_ERROR : { sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -wake_up_all (&t->wait_status); +wake_up_all (&sc->status_wait);break ; }default :
@@ -1928,7 +1926,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)int ret;ksmbd_debug (RDMA ,"Waiting for SMB_DIRECT negotiate request\n" ); - ret =wait_event_interruptible_timeout (st->wait_status, + ret =wait_event_interruptible_timeout (sc->status_wait, st->negotiation_requested || sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ,SMB_DIRECT_NEGOTIATE_TIMEOUT *HZ );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 92/142 smb: server: only turn into SMBDIRECT_SOCKET_CONNECTED when negotiation is done
In reply to Stefan MetzmacherFrom SMBDIRECT_SOCKET_CREATED we now go via the following stages:
1. SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED This indicated rdma_accept needs to be called
2. SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING This waits for RDMA_CM_EVENT_ESTABLISHED to arrive
3. SMBDIRECT_SOCKET_NEGOTIATE_NEEDED
This waits for the negotiate request to arrive
4. SMBDIRECT_SOCKET_NEGOTIATE_RUNNING
This indicates the negotiate request arrived and needs to be processed
5. SMBDIRECT_SOCKET_CONNECTED
The connection is ready to use
This avoids the extra 'bool negotiation_requested' and makes the steps more clear.
In future we may want to add trace points when changing the states, which would be useful for debugging.
--- fs/smb/server/transport_rdma.c | 83 ++++++++++++++++++++++++++++------ 1 file changed, 68 insertions(+), 15 deletions(-)
fs/smb/server/transport_rdma.c +68 -15
@@ -113,8 +113,6 @@ struct smb_direct_transport {struct work_struct send_immediate_work;struct work_struct disconnect_work; -bool negotiation_requested; -bool legacy_iwarp;u8 initiator_depth;u8 responder_resources;
@@ -255,19 +253,52 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work) disconnect_work);struct smbdirect_socket *sc = &t->socket; -if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) { +/* +* make sure this and other work is not queued again +* but here we don't block and avoid +* disable[_delayed]_work_sync() +*/ +disable_work (&t->disconnect_work); +disable_work (&t->post_recv_credits_work); +disable_work (&t->send_immediate_work); + +switch (sc->status) { +case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : +case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : +case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : +case SMBDIRECT_SOCKET_CONNECTED : sc->status =SMBDIRECT_SOCKET_DISCONNECTING ;rdma_disconnect (sc->rdma.cm_id); +break ; + +case SMBDIRECT_SOCKET_CREATED : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : +case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : +case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : +case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : +case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : +/* +* rdma_accept() never reached +* RDMA_CM_EVENT_ESTABLISHED +*/ + sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +break ; + +case SMBDIRECT_SOCKET_DISCONNECTING : +case SMBDIRECT_SOCKET_DISCONNECTED : +case SMBDIRECT_SOCKET_DESTROYED : +break ; } }static void smb_direct_disconnect_rdma_connection (struct smb_direct_transport *t) { -struct smbdirect_socket *sc = &t->socket; - -if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) -queue_work (smb_direct_wq, &t->disconnect_work); +queue_work (smb_direct_wq, &t->disconnect_work); }static void smb_direct_send_immediate_work (struct work_struct *work)
@@ -510,9 +541,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)smb_direct_disconnect_rdma_connection (t);return ; } - t->negotiation_requested = true; sc->recv_io.reassembly.full_packet_received = true; - sc->status =SMBDIRECT_SOCKET_CONNECTED ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ); + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ;enqueue_reassembly (t, recvmsg,0 );wake_up (&sc->status_wait);return ;
@@ -1482,7 +1513,8 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,switch (event->event) {case RDMA_CM_EVENT_ESTABLISHED : { - sc->status =SMBDIRECT_SOCKET_CONNECTED ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ); + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ;wake_up (&sc->status_wait);break ; }
@@ -1491,6 +1523,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,ib_drain_qp (sc->ib.qp); sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; +smb_direct_disconnect_rdma_work (&sc->disconnect_work);wake_up_all (&sc->status_wait);wake_up_all (&sc->recv_io.reassembly.wait_queue);wake_up_all (&t->wait_send_credits);
@@ -1547,6 +1580,8 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, resp->min_version =SMB_DIRECT_VERSION_LE ; resp->max_version =SMB_DIRECT_VERSION_LE ; resp->status =STATUS_NOT_SUPPORTED ; + + sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ; }else { resp->status =STATUS_SUCCESS ; resp->min_version =SMB_DIRECT_VERSION_LE ;
@@ -1563,6 +1598,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,cpu_to_le32 (sp->max_fragmented_recv_size); sc->recv_io.expected =SMBDIRECT_EXPECT_DATA_TRANSFER ; + sc->status =SMBDIRECT_SOCKET_CONNECTED ; } sendmsg->sge[0].addr = ib_dma_map_single(sc->ib.dev,
@@ -1618,6 +1654,8 @@ static int smb_direct_accept_client(struct smb_direct_transport *t) conn_param.rnr_retry_count =SMB_DIRECT_CM_RNR_RETRY ; conn_param.flow_control =0 ; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); + sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; ret =rdma_accept (sc->rdma.cm_id, &conn_param);if (ret) {pr_err ("error at rdma_accept: %d\n" , ret);
@@ -1632,6 +1670,9 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t)int ret;struct smbdirect_recv_io *recvmsg; +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED ); + sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; + sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ; recvmsg =get_free_recvmsg (t);
@@ -1644,7 +1685,6 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) goto out_err; } - t->negotiation_requested = false; ret =smb_direct_accept_client (t);if (ret) {pr_err ("Can't accept client\n" );
@@ -1925,12 +1965,25 @@ static int smb_direct_prepare(struct ksmbd_transport *t)struct smbdirect_negotiate_req *req;int ret; +/* +* We are waiting to pass the following states: +* +* SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED +* SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING +* SMBDIRECT_SOCKET_NEGOTIATE_NEEDED +* +* To finally get to SMBDIRECT_SOCKET_NEGOTIATE_RUNNING +* in order to continue below. +* +* Everything else is unexpected and an error. +*/ ksmbd_debug (RDMA ,"Waiting for SMB_DIRECT negotiate request\n" ); ret =wait_event_interruptible_timeout (sc->status_wait, - st->negotiation_requested || - sc->status ==SMBDIRECT_SOCKET_DISCONNECTED , -SMB_DIRECT_NEGOTIATE_TIMEOUT *HZ ); -if (ret <=0 || sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ) + sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED && + sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING && + sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED , +SMB_DIRECT_NEGOTIATE_TIMEOUT *HZ ); +if (ret <=0 || sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING )return ret <0 ? ret : -ETIMEDOUT ; recvmsg =get_first_reassembly (st);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 93/142 smb: server: use disable_work_sync in transport_rdma.c
In reply to Stefan MetzmacherThis makes it safer during the disconnect and avoids requeueing.
It's ok to call disable_work[_sync]() more than once.
--- fs/smb/server/transport_rdma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +3 -3
@@ -386,9 +386,9 @@ static void free_transport(struct smb_direct_transport *t)wait_event (t->wait_send_pending,atomic_read (&t->send_pending) ==0 ); -cancel_work_sync (&t->disconnect_work); -cancel_work_sync (&t->post_recv_credits_work); -cancel_work_sync (&t->send_immediate_work); +disable_work_sync (&t->disconnect_work); +disable_work_sync (&t->post_recv_credits_work); +disable_work_sync (&t->send_immediate_work);if (sc->ib.qp) {ib_drain_qp (sc->ib.qp);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 94/142 smb: server: move smb_direct_disconnect_rdma_work() into free_transport()
In reply to Stefan MetzmacherThe logic is also needed when smb_direct_handle_connect_request() calls free_transport(), because rdma_accept() and RDMA_CM_EVENT_ESTABLISHED could already be reached.
--- fs/smb/server/transport_rdma.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +7 -4
@@ -380,13 +380,19 @@ static void free_transport(struct smb_direct_transport *t)struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg; +disable_work_sync (&t->disconnect_work); +if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) { +smb_direct_disconnect_rdma_work (&t->disconnect_work); +wait_event_interruptible (sc->status_wait, + sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); + } +wake_up_all (&t->wait_send_credits);ksmbd_debug (RDMA ,"wait for all send posted to IB to finish\n" );wait_event (t->wait_send_pending,atomic_read (&t->send_pending) ==0 ); -disable_work_sync (&t->disconnect_work);disable_work_sync (&t->post_recv_credits_work);disable_work_sync (&t->send_immediate_work);
@@ -1486,9 +1492,6 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , sc->rdma.cm_id); -smb_direct_disconnect_rdma_work (&st->disconnect_work); -wait_event_interruptible (sc->status_wait, - sc->status ==SMBDIRECT_SOCKET_DISCONNECTED );free_transport (st); }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 95/142 smb: server: don't wait for info->send_pending == 0 on error
In reply to Stefan MetzmacherInstead we just wake up the waiters and let them return -ENOTCONN.
--- fs/smb/server/transport_rdma.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
fs/smb/server/transport_rdma.c +11 -6
@@ -388,10 +388,7 @@ static void free_transport(struct smb_direct_transport *t) }wake_up_all (&t->wait_send_credits); - -ksmbd_debug (RDMA ,"wait for all send posted to IB to finish\n" ); -wait_event (t->wait_send_pending, -atomic_read (&t->send_pending) ==0 ); +wake_up_all (&t->wait_send_pending);disable_work_sync (&t->post_recv_credits_work);disable_work_sync (&t->send_immediate_work);
@@ -1291,7 +1288,11 @@ static int smb_direct_writev(struct ksmbd_transport *t,*/ wait_event (st->wait_send_pending, -atomic_read (&st->send_pending) ==0 ); +atomic_read (&st->send_pending) ==0 || + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED && ret ==0 ) + ret = -ENOTCONN ; +return ret; }
@@ -1624,7 +1625,11 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, }wait_event (t->wait_send_pending, -atomic_read (&t->send_pending) ==0 ); +atomic_read (&t->send_pending) ==0 || + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) +return -ENOTCONN ; +return 0 ; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 96/142 smb: server: make use of smbdirect_socket_init()
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
fs/smb/server/transport_rdma.c +1 -11
@@ -323,6 +323,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)if (!t)return NULL ; sc = &t->socket; +smbdirect_socket_init (sc); sc->rdma.cm_id = cm_id; cm_id->context = t;
@@ -332,17 +333,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -INIT_LIST_HEAD (&sc->recv_io.free.list); -spin_lock_init (&sc->recv_io.free.lock); - - sc->status =SMBDIRECT_SOCKET_CREATED ; -init_waitqueue_head (&sc->status_wait); - -spin_lock_init (&sc->recv_io.reassembly.lock); -INIT_LIST_HEAD (&sc->recv_io.reassembly.list); - sc->recv_io.reassembly.data_length =0 ; - sc->recv_io.reassembly.queue_length =0 ; -init_waitqueue_head (&sc->recv_io.reassembly.wait_queue);init_waitqueue_head (&t->wait_send_credits);init_waitqueue_head (&t->wait_rw_credits);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 97/142 smb: server: make use of smbdirect_socket.disconnect_work
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
fs/smb/server/transport_rdma.c +12 -10
@@ -111,7 +111,6 @@ struct smb_direct_transport {struct work_struct post_recv_credits_work;struct work_struct send_immediate_work; -struct work_struct disconnect_work;bool legacy_iwarp;u8 initiator_depth;
@@ -248,17 +247,17 @@ static struct smbdirect_recv_io *get_first_reassembly(struct smb_direct_transporstatic 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(work, struct smb_direct_transport, - disconnect_work); -struct smbdirect_socket *sc = &t->socket; + container_of(sc, struct smb_direct_transport, socket);/* * make sure this and other work is not queued again * but here we don't block and avoid * disable[_delayed]_work_sync() */ -disable_work (&t->disconnect_work); +disable_work (&sc->disconnect_work);disable_work (&t->post_recv_credits_work);disable_work (&t->send_immediate_work);
@@ -298,7 +297,9 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)static void smb_direct_disconnect_rdma_connection (struct smb_direct_transport *t) { -queue_work (smb_direct_wq, &t->disconnect_work); +struct smbdirect_socket *sc = &t->socket; + +queue_work (smb_direct_wq, &sc->disconnect_work); }static void smb_direct_send_immediate_work (struct work_struct *work)
@@ -325,6 +326,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc = &t->socket;smbdirect_socket_init (sc); +INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); + sc->rdma.cm_id = cm_id; cm_id->context = t;
@@ -346,7 +349,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)INIT_WORK (&t->post_recv_credits_work, smb_direct_post_recv_credits);INIT_WORK (&t->send_immediate_work, smb_direct_send_immediate_work); -INIT_WORK (&t->disconnect_work, smb_direct_disconnect_rdma_work); conn =ksmbd_conn_alloc ();if (!conn)
@@ -370,9 +372,9 @@ static void free_transport(struct smb_direct_transport *t)struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg; -disable_work_sync (&t->disconnect_work); +disable_work_sync (&sc->disconnect_work);if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) { -smb_direct_disconnect_rdma_work (&t->disconnect_work); +smb_direct_disconnect_rdma_work (&sc->disconnect_work);wait_event_interruptible (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); }
@@ -1493,7 +1495,7 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id); -smb_direct_disconnect_rdma_work (&st->disconnect_work); +smb_direct_disconnect_rdma_work (&sc->disconnect_work); } static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 98/142 smb: server: make use of smbdirect_socket.send_io.pending.{count,wait_queue}
In reply to Stefan MetzmacherThis will is used by the client already and will allow to create common helper functions.
--- fs/smb/server/transport_rdma.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
fs/smb/server/transport_rdma.c +10 -16
@@ -106,9 +106,6 @@ struct smb_direct_transport {wait_queue_head_t wait_send_credits;wait_queue_head_t wait_rw_credits; -wait_queue_head_t wait_send_pending; -atomic_t send_pending; -struct work_struct post_recv_credits_work;struct work_struct send_immediate_work;
@@ -341,9 +338,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)spin_lock_init (&t->receive_credit_lock); -init_waitqueue_head (&t->wait_send_pending); -atomic_set (&t->send_pending,0 ); -spin_lock_init (&t->lock_new_recv_credits); INIT_WORK(&t->post_recv_credits_work,
@@ -380,7 +374,7 @@ static void free_transport(struct smb_direct_transport *t) }wake_up_all (&t->wait_send_credits); -wake_up_all (&t->wait_send_pending); +wake_up_all (&sc->send_io.pending.wait_queue);disable_work_sync (&t->post_recv_credits_work);disable_work_sync (&t->send_immediate_work);
@@ -834,8 +828,8 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)smb_direct_disconnect_rdma_connection (t); } -if (atomic_dec_and_test (&t->send_pending)) -wake_up (&t->wait_send_pending); +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.wait_queue);/* iterate and free the list of messages in reverse. the list's head * is invalid.
@@ -868,12 +862,12 @@ static int smb_direct_post_send(struct smb_direct_transport *t,struct smbdirect_socket *sc = &t->socket;int ret; -atomic_inc (&t->send_pending); +atomic_inc (&sc->send_io.pending.count); ret =ib_post_send (sc->ib.qp, wr,NULL );if (ret) {pr_err ("failed to post send: %d\n" , ret); -if (atomic_dec_and_test (&t->send_pending)) -wake_up (&t->wait_send_pending); +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.wait_queue);smb_direct_disconnect_rdma_connection (t); }return ret;
@@ -1279,8 +1273,8 @@ static int smb_direct_writev(struct ksmbd_transport *t,* that means all the I/Os have been out and we are good to return */ -wait_event (st->wait_send_pending, -atomic_read (&st->send_pending) ==0 || +wait_event (sc->send_io.pending.wait_queue, +atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (sc->status !=SMBDIRECT_SOCKET_CONNECTED && ret ==0 ) ret = -ENOTCONN ;
@@ -1616,8 +1610,8 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,return ret; } -wait_event (t->wait_send_pending, -atomic_read (&t->send_pending) ==0 || +wait_event (sc->send_io.pending.wait_queue, +atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 99/142 smb: server: make use of smbdirect_socket.send_io.credits.{count,wait_queue}
In reply to Stefan MetzmacherThis will is used by the client already and will allow to create common helper functions.
--- fs/smb/server/transport_rdma.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
fs/smb/server/transport_rdma.c +13 -15
@@ -96,14 +96,12 @@ struct smb_direct_transport {int recv_credits;int recv_credit_target; -atomic_t send_credits;spinlock_t lock_new_recv_credits;int new_recv_credits;int max_rw_credits;int pages_per_rw_credit;atomic_t rw_credits; -wait_queue_head_t wait_send_credits;wait_queue_head_t wait_rw_credits;struct work_struct post_recv_credits_work;
@@ -333,7 +331,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -init_waitqueue_head (&t->wait_send_credits);init_waitqueue_head (&t->wait_rw_credits);spin_lock_init (&t->receive_credit_lock);
@@ -373,7 +370,7 @@ static void free_transport(struct smb_direct_transport *t) sc->status == SMBDIRECT_SOCKET_DISCONNECTED); } -wake_up_all (&t->wait_send_credits); +wake_up_all (&sc->send_io.credits.wait_queue);wake_up_all (&sc->send_io.pending.wait_queue);disable_work_sync (&t->post_recv_credits_work);
@@ -575,14 +572,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) t->recv_credit_target =le16_to_cpu (data_transfer->credits_requested);atomic_add (le16_to_cpu (data_transfer->credits_granted), - &t->send_credits); + &sc->send_io.credits.count);if (le16_to_cpu (data_transfer->flags) &SMBDIRECT_FLAG_RESPONSE_REQUESTED )queue_work (smb_direct_wq, &t->send_immediate_work); -if (atomic_read (&t->send_credits) >0 ) -wake_up (&t->wait_send_credits); +if (atomic_read (&sc->send_io.credits.count) >0 ) +wake_up (&sc->send_io.credits.wait_queue);if (data_length) {if (t->recv_credit_target > old_recv_credit_target)
@@ -888,6 +885,7 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t, struct smb_direct_send_ctx *send_ctx, bool is_last) { +struct smbdirect_socket *sc = &t->socket;struct smbdirect_send_io *first, *last;int ret;
@@ -914,8 +912,8 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t, send_ctx->need_invalidate_rkey, send_ctx->remote_key); }else { -atomic_add (send_ctx->wr_cnt, &t->send_credits); -wake_up (&t->wait_send_credits); +atomic_add (send_ctx->wr_cnt, &sc->send_io.credits.count); +wake_up (&sc->send_io.credits.wait_queue);list_for_each_entry_safe (first, last, &send_ctx->msg_list, sibling_list) {smb_direct_free_sendmsg (t, first);
@@ -950,16 +948,17 @@ static int wait_for_credits(struct smb_direct_transport *t,static int wait_for_send_credits (struct smb_direct_transport *t,struct smb_direct_send_ctx *send_ctx) { +struct smbdirect_socket *sc = &t->socket;int ret;if (send_ctx && - (send_ctx->wr_cnt >=16 ||atomic_read (&t->send_credits) <=1 )) { + (send_ctx->wr_cnt >=16 ||atomic_read (&sc->send_io.credits.count) <=1 )) { ret =smb_direct_flush_send_list (t, send_ctx, false);if (ret)return ret; } -return wait_for_credits (t, &t->wait_send_credits, &t->send_credits,1 ); +return wait_for_credits (t, &sc->send_io.credits.wait_queue, &sc->send_io.credits.count,1 ); }static int wait_for_rw_credits (struct smb_direct_transport *t,int credits)
@@ -1142,7 +1141,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, ret =smb_direct_create_header (t, data_length, remaining_data_length, &msg);if (ret) { -atomic_inc (&t->send_credits); +atomic_inc (&sc->send_io.credits.count);return ret; }
@@ -1182,7 +1181,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t,return 0 ; err:smb_direct_free_sendmsg (t, msg); -atomic_inc (&t->send_credits); +atomic_inc (&sc->send_io.credits.count);return ret; }
@@ -1516,7 +1515,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,smb_direct_disconnect_rdma_work (&sc->disconnect_work);wake_up_all (&sc->status_wait);wake_up_all (&sc->recv_io.reassembly.wait_queue); -wake_up_all (&t->wait_send_credits); +wake_up_all (&sc->send_io.credits.wait_queue);break ; }case RDMA_CM_EVENT_CONNECT_ERROR : {
@@ -1774,7 +1773,6 @@ static int smb_direct_init_params(struct smb_direct_transport *t, t->new_recv_credits =0 ; sp->send_credit_target = smb_direct_send_credit_target; -atomic_set (&t->send_credits,0 );atomic_set (&t->rw_credits, t->max_rw_credits); sp->max_send_size = smb_direct_max_send_size;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 100/142 smb: server: make use of struct smbdirect_send_batch
In reply to Stefan MetzmacherThis makes it easier to move functions to the common smbdirect code in future.
--- fs/smb/server/transport_rdma.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
fs/smb/server/transport_rdma.c +7 -14
@@ -118,13 +118,6 @@ struct smb_direct_transport {static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops; -struct smb_direct_send_ctx { -struct list_head msg_list; -int wr_cnt; -bool need_invalidate_rkey; -unsigned int remote_key; -}; -struct smb_direct_rdma_rw_msg {struct smb_direct_transport *t;struct ib_cqe cqe;
@@ -156,7 +149,7 @@ static inline int get_buf_page_count(void *buf, int size)static void smb_direct_destroy_pools (struct smb_direct_transport *transport);static void smb_direct_post_recv_credits (struct work_struct *work);static int smb_direct_post_send_data (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx, +struct smbdirect_send_batch *send_ctx,struct kvec *iov,int niov,int remaining_data_length);
@@ -871,7 +864,7 @@ static int smb_direct_post_send(struct smb_direct_transport *t, }static void smb_direct_send_ctx_init (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx, +struct smbdirect_send_batch *send_ctx,bool need_invalidate_rkey,unsigned int remote_key) {
@@ -882,7 +875,7 @@ static void smb_direct_send_ctx_init(struct smb_direct_transport *t, }static int smb_direct_flush_send_list (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx, +struct smbdirect_send_batch *send_ctx,bool is_last) {struct smbdirect_socket *sc = &t->socket;
@@ -946,7 +939,7 @@ static int wait_for_credits(struct smb_direct_transport *t, }static int wait_for_send_credits (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx) +struct smbdirect_send_batch *send_ctx) {struct smbdirect_socket *sc = &t->socket;int ret;
@@ -1081,7 +1074,7 @@ static int get_mapped_sg_list(struct ib_device *device, void *buf, int size, }static int post_sendmsg (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx, +struct smbdirect_send_batch *send_ctx,struct smbdirect_send_io *msg) {struct smbdirect_socket *sc = &t->socket;
@@ -1120,7 +1113,7 @@ static int post_sendmsg(struct smb_direct_transport *t, }static int smb_direct_post_send_data (struct smb_direct_transport *t, -struct smb_direct_send_ctx *send_ctx, +struct smbdirect_send_batch *send_ctx,struct kvec *iov,int niov,int remaining_data_length) {
@@ -1198,7 +1191,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,sizeof (struct smbdirect_data_transfer );int ret;struct kvec vec; -struct smb_direct_send_ctx send_ctx; +struct smbdirect_send_batch send_ctx;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 101/142 smb: server: make use smbdirect_socket.rw_io.credits
In reply to Stefan MetzmacherThis will allow to us to have functions moved into common code in future (even if it's only used by the server).
--- fs/smb/server/transport_rdma.c | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-)
fs/smb/server/transport_rdma.c +22 -22
@@ -98,11 +98,6 @@ struct smb_direct_transport {spinlock_t lock_new_recv_credits;int new_recv_credits; -int max_rw_credits; -int pages_per_rw_credit; -atomic_t rw_credits; - -wait_queue_head_t wait_rw_credits;struct work_struct post_recv_credits_work;struct work_struct send_immediate_work;
@@ -324,8 +319,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -init_waitqueue_head (&t->wait_rw_credits); -spin_lock_init (&t->receive_credit_lock);spin_lock_init (&t->lock_new_recv_credits);
@@ -956,14 +949,21 @@ static int wait_for_send_credits(struct smb_direct_transport *t,static int wait_for_rw_credits (struct smb_direct_transport *t,int credits) { -return wait_for_credits (t, &t->wait_rw_credits, &t->rw_credits, credits); +struct smbdirect_socket *sc = &t->socket; + +return wait_for_credits (t, + &sc->rw_io.credits.wait_queue, + &sc->rw_io.credits.count, + credits); }static int calc_rw_credits (struct smb_direct_transport *t,char *buf,unsigned int len) { +struct smbdirect_socket *sc = &t->socket; +return DIV_ROUND_UP (get_buf_page_count (buf, len), - t->pages_per_rw_credit); + sc->rw_io.credits.num_pages); } static int smb_direct_create_header(struct smb_direct_transport *t,
@@ -1441,8 +1441,8 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,smb_direct_free_rdma_rw_msg (t, msg, is_read ?DMA_FROM_DEVICE :DMA_TO_DEVICE ); } -atomic_add (credits_needed, &t->rw_credits); -wake_up (&t->wait_rw_credits); +atomic_add (credits_needed, &sc->rw_io.credits.count); +wake_up (&sc->rw_io.credits.wait_queue);return ret; }
@@ -1720,9 +1720,9 @@ static int smb_direct_init_params(struct smb_direct_transport *t,* MR invalidation. */ sp->max_read_write_size = smb_direct_max_read_write_size; - t->pages_per_rw_credit =smb_direct_get_max_fr_pages (t); - t->max_rw_credits =DIV_ROUND_UP (sp->max_read_write_size, - (t->pages_per_rw_credit -1 ) * + sc->rw_io.credits.num_pages =smb_direct_get_max_fr_pages (t); + sc->rw_io.credits.max =DIV_ROUND_UP (sp->max_read_write_size, + (sc->rw_io.credits.num_pages -1 ) *PAGE_SIZE ); max_sge_per_wr = min_t(unsigned int, device->attrs.max_send_sge,
@@ -1730,9 +1730,9 @@ static int smb_direct_init_params(struct smb_direct_transport *t, max_sge_per_wr = max_t(unsigned int, max_sge_per_wr, max_send_sges); wrs_per_credit = max_t(unsigned int, 4, -DIV_ROUND_UP (t->pages_per_rw_credit, +DIV_ROUND_UP (sc->rw_io.credits.num_pages, max_sge_per_wr) +1 ); - max_rw_wrs = t->max_rw_credits * wrs_per_credit; + max_rw_wrs = sc->rw_io.credits.max * wrs_per_credit; max_send_wrs = smb_direct_send_credit_target + max_rw_wrs; if (max_send_wrs > device->attrs.max_cqe ||
@@ -1766,7 +1766,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, t->new_recv_credits =0 ; sp->send_credit_target = smb_direct_send_credit_target; -atomic_set (&t->rw_credits, t->max_rw_credits); +atomic_set (&sc->rw_io.credits.count, sc->rw_io.credits.max); sp->max_send_size = smb_direct_max_send_size; sp->max_recv_size = smb_direct_max_receive_size;
@@ -1777,7 +1777,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, cap->max_send_sge = max_sge_per_wr; cap->max_recv_sge =SMBDIRECT_RECV_IO_MAX_SGE ; cap->max_inline_data =0 ; - cap->max_rdma_ctxs = t->max_rw_credits; + cap->max_rdma_ctxs = sc->rw_io.credits.max;return 0 ; }
@@ -1911,11 +1911,11 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, pages_per_rw =DIV_ROUND_UP (sp->max_read_write_size,PAGE_SIZE ) +1 ;if (pages_per_rw > sc->ib.dev->attrs.max_sgl_rd) { ret =ib_mr_pool_init (sc->ib.qp, &sc->ib.qp->rdma_mrs, - t->max_rw_credits,IB_MR_TYPE_MEM_REG , - t->pages_per_rw_credit,0 ); + sc->rw_io.credits.max,IB_MR_TYPE_MEM_REG , + sc->rw_io.credits.num_pages,0 );if (ret) { -pr_err ("failed to init mr pool count %d pages %d\n" , - t->max_rw_credits, t->pages_per_rw_credit); +pr_err ("failed to init mr pool count %zu pages %zu\n" , + sc->rw_io.credits.max, sc->rw_io.credits.num_pages); goto err; } }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 102/142 smb: server: make use of struct smbdirect_rw_io
In reply to Stefan MetzmacherThis will allow us to create functions in the common smbdirect code to be used by the server in future.
--- fs/smb/server/transport_rdma.c | 37 +++++++++++++--------------------- 1 file changed, 14 insertions(+), 23 deletions(-)
fs/smb/server/transport_rdma.c +14 -23
@@ -113,17 +113,6 @@ struct smb_direct_transport {static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops; -struct smb_direct_rdma_rw_msg { -struct smb_direct_transport *t; -struct ib_cqe cqe; -int status; -struct completion *completion; -struct list_head list; -struct rdma_rw_ctx rw_ctx; -struct sg_table sgt; -struct scatterlist sg_list[]; -}; -void init_smbd_max_io_size (unsigned int sz) { sz =clamp_val (sz,SMBD_MIN_IOSIZE ,SMBD_MAX_IOSIZE );
@@ -1275,12 +1264,12 @@ static int smb_direct_writev(struct ksmbd_transport *t, }static void smb_direct_free_rdma_rw_msg (struct smb_direct_transport *t, -struct smb_direct_rdma_rw_msg *msg, +struct smbdirect_rw_io *msg,enum dma_data_direction dir) {struct smbdirect_socket *sc = &t->socket; -rdma_rw_ctx_destroy (&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, +rdma_rw_ctx_destroy (&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, msg->sgt.sgl, msg->sgt.nents, dir);sg_free_table_chained (&msg->sgt,SG_CHUNK_SIZE );kfree (msg);
@@ -1289,12 +1278,14 @@ static void smb_direct_free_rdma_rw_msg(struct smb_direct_transport *t,static void read_write_done (struct ib_cq *cq,struct ib_wc *wc,enum dma_data_direction dir) { -struct smb_direct_rdma_rw_msg *msg =container_of (wc->wr_cqe, - struct smb_direct_rdma_rw_msg, cqe); -struct smb_direct_transport *t = msg->t; +struct smbdirect_rw_io *msg = + container_of(wc->wr_cqe, struct smbdirect_rw_io, cqe); +struct smbdirect_socket *sc = msg->socket; +struct smb_direct_transport *t = + container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS ) { - msg->status = -EIO ; + msg->error = -EIO ;pr_err ("read/write error. opcode = %d, status = %s(%d)\n" , wc->opcode,ib_wc_status_msg (wc->status), wc->status);if (wc->status !=IB_WC_WR_FLUSH_ERR )
@@ -1322,7 +1313,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, {struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smb_direct_rdma_rw_msg *msg, *next_msg; +struct smbdirect_rw_io *msg, *next_msg;int i, ret;DECLARE_COMPLETION_ONSTACK (completion);struct ib_send_wr *first_wr;
@@ -1379,7 +1370,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, desc_buf_len =le32_to_cpu (desc[i].length); - msg->t = t; + msg->socket = sc; msg->cqe.done = is_read ? read_done : write_done; msg->completion = &completion;
@@ -1401,7 +1392,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, goto out; } - ret = rdma_rw_ctx_init(&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, + ret = rdma_rw_ctx_init(&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, msg->sgt.sgl, get_buf_page_count(desc_buf, desc_buf_len), 0,
@@ -1422,7 +1413,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,/* concatenate work requests of rdma_rw_ctxs */ first_wr =NULL ;list_for_each_entry_reverse (msg, &msg_list, list) { - first_wr =rdma_rw_ctx_wrs (&msg->rw_ctx, sc->ib.qp, sc->ib.qp->port, + first_wr =rdma_rw_ctx_wrs (&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, &msg->cqe, first_wr); }
@@ -1432,9 +1423,9 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, goto out; } - msg = list_last_entry(&msg_list, struct smb_direct_rdma_rw_msg, list); + msg = list_last_entry(&msg_list, struct smbdirect_rw_io, list);wait_for_completion (&completion); - ret = msg->status; + ret = msg->error; out:list_for_each_entry_safe (msg, next_msg, &msg_list, list) {list_del (&msg->list);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 103/142 smb: server: take the recv_credit_target from the negotiate req and always limit the range
In reply to Stefan MetzmacherThe clients sends the initial recv_credit_target in the negotiate req, so we should use that.
We also limit the range between 1 and our local defined sp->recv_credit_max. This will simplify further logic changes.
--- fs/smb/server/transport_rdma.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +12 -3
@@ -94,7 +94,7 @@ struct smb_direct_transport {spinlock_t receive_credit_lock;int recv_credits; -int recv_credit_target; +u16 recv_credit_target;spinlock_t lock_new_recv_credits;int new_recv_credits;
@@ -472,9 +472,11 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_recv_io *recvmsg;struct smb_direct_transport *t;struct smbdirect_socket *sc; +struct smbdirect_socket_parameters *sp; recvmsg = container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe); sc = recvmsg->socket; + sp = &sc->parameters; t = container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) {
@@ -512,7 +514,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet;unsigned int data_length; -int old_recv_credit_target; +u16 old_recv_credit_target;if (wc->byte_len < offsetof(struct smbdirect_data_transfer , padding)) {
@@ -546,6 +548,10 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) old_recv_credit_target = t->recv_credit_target; t->recv_credit_target =le16_to_cpu (data_transfer->credits_requested); + t->recv_credit_target = +min_t (u16, t->recv_credit_target, sp->recv_credit_max); + t->recv_credit_target = +max_t (u16, t->recv_credit_target,1 );atomic_add (le16_to_cpu (data_transfer->credits_granted), &sc->send_io.credits.count);
@@ -1753,7 +1759,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, t->recv_credits =0 ; sp->recv_credit_max = smb_direct_receive_credit_max; - t->recv_credit_target =10 ; + t->recv_credit_target =1 ; t->new_recv_credits =0 ; sp->send_credit_target = smb_direct_send_credit_target;
@@ -1979,6 +1985,9 @@ static int smb_direct_prepare(struct ksmbd_transport *t)le32_to_cpu (req->max_fragmented_size); sp->max_fragmented_recv_size = (sp->recv_credit_max * sp->max_recv_size) /2 ; + st->recv_credit_target =le16_to_cpu (req->credits_requested); + st->recv_credit_target =min_t (u16, st->recv_credit_target, sp->recv_credit_max); + st->recv_credit_target =max_t (u16, st->recv_credit_target,1 ); ret =smb_direct_send_negotiate_response (st, ret); out:
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 104/142 smb: server: manage recv credits by counting posted recv_io and granted credits
In reply to Stefan Metzmacher(At least for me) the logic maintaining the count of posted recv_io messages and the count of granted credits is much easier to understand.
From there we can easily calculate the number of new_credits we'll grant to the peer in outgoing send_io messages.
This will simplify the move to common logic that can be shared between client and server in the following patches.
--- fs/smb/server/transport_rdma.c | 53 ++++++++++++++-------------------- 1 file changed, 21 insertions(+), 32 deletions(-)
fs/smb/server/transport_rdma.c +21 -32
@@ -92,13 +92,10 @@ struct smb_direct_transport {struct smbdirect_socket socket; -spinlock_t receive_credit_lock; -int recv_credits; +atomic_t recv_credits;u16 recv_credit_target; -spinlock_t lock_new_recv_credits; -int new_recv_credits; - +atomic_t recv_posted;struct work_struct post_recv_credits_work;struct work_struct send_immediate_work;
@@ -308,9 +305,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -spin_lock_init (&t->receive_credit_lock); - -spin_lock_init (&t->lock_new_recv_credits); +atomic_set (&t->recv_posted,0 ); +atomic_set (&t->recv_credits,0 );INIT_WORK (&t->post_recv_credits_work, smb_direct_post_recv_credits);
@@ -541,9 +537,8 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; } -spin_lock (&t->receive_credit_lock); - t->recv_credits -=1 ; -spin_unlock (&t->receive_credit_lock); +atomic_dec (&t->recv_posted); +atomic_dec (&t->recv_credits); old_recv_credit_target = t->recv_credit_target; t->recv_credit_target =
@@ -747,14 +742,10 @@ static void smb_direct_post_recv_credits(struct work_struct *work)struct smb_direct_transport *t =container_of (work, struct smb_direct_transport, post_recv_credits_work);struct smbdirect_recv_io *recvmsg; -int receive_credits, credits =0 ; +int credits =0 ;int ret; -spin_lock (&t->receive_credit_lock); - receive_credits = t->recv_credits; -spin_unlock (&t->receive_credit_lock); - -if (receive_credits < t->recv_credit_target) { +if (atomic_read (&t->recv_credits) < t->recv_credit_target) {while (true) { recvmsg =get_free_recvmsg (t);if (!recvmsg)
@@ -769,17 +760,11 @@ static void smb_direct_post_recv_credits(struct work_struct *work)break ; } credits++; + +atomic_inc (&t->recv_posted); } } -spin_lock (&t->receive_credit_lock); - t->recv_credits += credits; -spin_unlock (&t->receive_credit_lock); - -spin_lock (&t->lock_new_recv_credits); - t->new_recv_credits += credits; -spin_unlock (&t->lock_new_recv_credits); -if (credits)queue_work (smb_direct_wq, &t->send_immediate_work); }
@@ -826,11 +811,18 @@ static int manage_credits_prior_sending(struct smb_direct_transport *t) {int new_credits; -spin_lock (&t->lock_new_recv_credits); - new_credits = t->new_recv_credits; - t->new_recv_credits =0 ; -spin_unlock (&t->lock_new_recv_credits); +if (atomic_read (&t->recv_credits) >= t->recv_credit_target) +return 0 ; + + new_credits =atomic_read (&t->recv_posted); +if (new_credits ==0 ) +return 0 ; + new_credits -=atomic_read (&t->recv_credits); +if (new_credits <=0 ) +return 0 ; + +atomic_add (new_credits, &t->recv_credits);return new_credits; }
@@ -1756,11 +1748,8 @@ static int smb_direct_init_params(struct smb_direct_transport *t,return -EINVAL ; } - t->recv_credits =0 ; - sp->recv_credit_max = smb_direct_receive_credit_max; t->recv_credit_target =1 ; - t->new_recv_credits =0 ; sp->send_credit_target = smb_direct_send_credit_target;atomic_set (&sc->rw_io.credits.count, sc->rw_io.credits.max);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 105/142 smb: server: make use of smbdirect_socket.recv_io.{posted,credits}
In reply to Stefan MetzmacherThis will make it possible to introduce common helper functions in future.
--- fs/smb/server/transport_rdma.c | 65 ++++++++++++++++------------------ 1 file changed, 30 insertions(+), 35 deletions(-)
fs/smb/server/transport_rdma.c +30 -35
@@ -92,11 +92,6 @@ struct smb_direct_transport {struct smbdirect_socket socket; -atomic_t recv_credits; -u16 recv_credit_target; - -atomic_t recv_posted; -struct work_struct post_recv_credits_work;struct work_struct send_immediate_work;bool legacy_iwarp;
@@ -180,7 +175,7 @@ static void put_recvmsg(struct smb_direct_transport *t,list_add (&recvmsg->list, &sc->recv_io.free.list);spin_unlock (&sc->recv_io.free.lock); -queue_work (smb_direct_wq, &t->post_recv_credits_work); +queue_work (smb_direct_wq, &sc->recv_io.posted.refill_work); } static void enqueue_reassembly(struct smb_direct_transport *t,
@@ -227,7 +222,7 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)* disable[_delayed]_work_sync() */ disable_work (&sc->disconnect_work); -disable_work (&t->post_recv_credits_work); +disable_work (&sc->recv_io.posted.refill_work);disable_work (&t->send_immediate_work);switch (sc->status) {
@@ -305,10 +300,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -atomic_set (&t->recv_posted,0 ); -atomic_set (&t->recv_credits,0 ); - -INIT_WORK (&t->post_recv_credits_work, +INIT_WORK (&sc->recv_io.posted.refill_work, smb_direct_post_recv_credits);INIT_WORK (&t->send_immediate_work, smb_direct_send_immediate_work);
@@ -344,7 +336,7 @@ static void free_transport(struct smb_direct_transport *t)wake_up_all (&sc->send_io.credits.wait_queue);wake_up_all (&sc->send_io.pending.wait_queue); -disable_work_sync (&t->post_recv_credits_work); +disable_work_sync (&sc->recv_io.posted.refill_work);disable_work_sync (&t->send_immediate_work);if (sc->ib.qp) {
@@ -537,16 +529,16 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true; } -atomic_dec (&t->recv_posted); -atomic_dec (&t->recv_credits); +atomic_dec (&sc->recv_io.posted.count); +atomic_dec (&sc->recv_io.credits.count); - old_recv_credit_target = t->recv_credit_target; - t->recv_credit_target = + old_recv_credit_target = sc->recv_io.credits.target; + sc->recv_io.credits.target =le16_to_cpu (data_transfer->credits_requested); - t->recv_credit_target = -min_t (u16, t->recv_credit_target, sp->recv_credit_max); - t->recv_credit_target = -max_t (u16, t->recv_credit_target,1 ); + sc->recv_io.credits.target = +min_t (u16, sc->recv_io.credits.target, sp->recv_credit_max); + sc->recv_io.credits.target = +max_t (u16, sc->recv_io.credits.target,1 );atomic_add (le16_to_cpu (data_transfer->credits_granted), &sc->send_io.credits.count);
@@ -558,8 +550,8 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)wake_up (&sc->send_io.credits.wait_queue);if (data_length) { -if (t->recv_credit_target > old_recv_credit_target) -queue_work (smb_direct_wq, &t->post_recv_credits_work); +if (sc->recv_io.credits.target > old_recv_credit_target) +queue_work (smb_direct_wq, &sc->recv_io.posted.refill_work);enqueue_reassembly (t, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue);
@@ -739,13 +731,15 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,static void smb_direct_post_recv_credits (struct work_struct *work) { -struct smb_direct_transport *t =container_of (work, - struct smb_direct_transport, post_recv_credits_work); +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, recv_io.posted.refill_work); +struct smb_direct_transport *t = + container_of(sc, struct smb_direct_transport, socket);struct smbdirect_recv_io *recvmsg;int credits =0 ;int ret; -if (atomic_read (&t->recv_credits) < t->recv_credit_target) { +if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target) {while (true) { recvmsg =get_free_recvmsg (t);if (!recvmsg)
@@ -761,7 +755,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) } credits++; -atomic_inc (&t->recv_posted); +atomic_inc (&sc->recv_io.posted.count); } }
@@ -809,20 +803,21 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)static int manage_credits_prior_sending (struct smb_direct_transport *t) { +struct smbdirect_socket *sc = &t->socket;int new_credits; -if (atomic_read (&t->recv_credits) >= t->recv_credit_target) +if (atomic_read (&sc->recv_io.credits.count) >= sc->recv_io.credits.target)return 0 ; - new_credits =atomic_read (&t->recv_posted); + new_credits =atomic_read (&sc->recv_io.posted.count);if (new_credits ==0 )return 0 ; - new_credits -=atomic_read (&t->recv_credits); + new_credits -=atomic_read (&sc->recv_io.credits.count);if (new_credits <=0 )return 0 ; -atomic_add (new_credits, &t->recv_credits); +atomic_add (new_credits, &sc->recv_io.credits.count);return new_credits; }
@@ -1666,7 +1661,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) goto out_err; } -smb_direct_post_recv_credits (&t->post_recv_credits_work); +smb_direct_post_recv_credits (&sc->recv_io.posted.refill_work);return 0 ; out_err:put_recvmsg (t, recvmsg);
@@ -1749,7 +1744,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t, } sp->recv_credit_max = smb_direct_receive_credit_max; - t->recv_credit_target =1 ; + sc->recv_io.credits.target =1 ; sp->send_credit_target = smb_direct_send_credit_target;atomic_set (&sc->rw_io.credits.count, sc->rw_io.credits.max);
@@ -1974,9 +1969,9 @@ static int smb_direct_prepare(struct ksmbd_transport *t)le32_to_cpu (req->max_fragmented_size); sp->max_fragmented_recv_size = (sp->recv_credit_max * sp->max_recv_size) /2 ; - st->recv_credit_target =le16_to_cpu (req->credits_requested); - st->recv_credit_target =min_t (u16, st->recv_credit_target, sp->recv_credit_max); - st->recv_credit_target =max_t (u16, st->recv_credit_target,1 ); + sc->recv_io.credits.target =le16_to_cpu (req->credits_requested); + sc->recv_io.credits.target =min_t (u16, sc->recv_io.credits.target, sp->recv_credit_max); + sc->recv_io.credits.target =max_t (u16, sc->recv_io.credits.target,1 ); ret =smb_direct_send_negotiate_response (st, ret); out:
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 106/142 smb: server: replace smb_trans_direct_transfort() with SMBD_TRANS()
In reply to Stefan MetzmacherThe spelling of smb_trans_direct_transfort was wrong anyway and we don't need the logic twice.
--- fs/smb/server/transport_rdma.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
fs/smb/server/transport_rdma.c +7 -13
@@ -129,12 +129,6 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, struct kvec *iov, int niov, int remaining_data_length); -static inline struct smb_direct_transport * -smb_trans_direct_transfort (struct ksmbd_transport *t) -{ - return container_of(t, struct smb_direct_transport, transport); -} -static inline void *smbdirect_recv_io_payload (struct smbdirect_recv_io *recvmsg) {
@@ -618,7 +612,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,int to_copy, to_read, data_read, offset;u32 data_length, remaining_data_length, data_offset;int rc; -struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket; again:
@@ -1164,7 +1158,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, struct kvec *iov, int niovs, int buflen, bool need_invalidate, unsigned int remote_key) { - struct smb_direct_transport *st = smb_trans_direct_transfort(t); + struct smb_direct_transport *st = SMBD_TRANS(t);struct smbdirect_socket *sc = &st->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int remaining_data_length;
@@ -1435,7 +1429,7 @@ static int smb_direct_rdma_write(struct ksmbd_transport *t,struct smbdirect_buffer_descriptor_v1 *desc, unsigned int desc_len) { - return smb_direct_rdma_xmit(smb_trans_direct_transfort(t), buf, buflen, + return smb_direct_rdma_xmit(SMBD_TRANS(t), buf, buflen,desc ,desc_len ,false ); }
@@ -1444,13 +1438,13 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,struct smbdirect_buffer_descriptor_v1 *desc, unsigned int desc_len) { - return smb_direct_rdma_xmit(smb_trans_direct_transfort(t), buf, buflen, + return smb_direct_rdma_xmit(SMBD_TRANS(t), buf, buflen,desc ,desc_len ,true ); }static void smb_direct_disconnect (struct ksmbd_transport *t) { -struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket;ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , sc->rdma.cm_id);
@@ -1460,7 +1454,7 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)static void smb_direct_shutdown (struct ksmbd_transport *t) { -struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket;ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id);
@@ -1924,7 +1918,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t,static int smb_direct_prepare (struct ksmbd_transport *t) { -struct smb_direct_transport *st =smb_trans_direct_transfort (t); +struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_recv_io *recvmsg;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 107/142 smb: server: remove useless casts from KSMBD_TRANS/SMBD_TRANS
In reply to Stefan MetzmacherAt best they gain nothing, at worst we procude real bugs. Note container_of() already casts to a pointer of the given type.
--- fs/smb/server/transport_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/server/transport_rdma.c +2 -2
@@ -99,8 +99,8 @@ struct smb_direct_transport {u8 responder_resources; }; -#define KSMBD_TRANS (t) ((struct ksmbd_transport *)&((t)->transport)) -#define SMBD_TRANS (t) ((struct smb_direct_transport *)container_of(t, \ +#define KSMBD_TRANS (t) (&(t)->transport) +#define SMBD_TRANS (t) (container_of(t, \ struct smb_direct_transport, transport))static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 108/142 smb: server: pass ksmbd_transport to get_smbd_max_read_write_size()
In reply to Stefan MetzmacherWe should use the per connection value.
And for TCP return NT_STATUS_INVALID_PARAMETER if any SMB2_CHANNEL_RDMA_V1* is used.
--- fs/smb/server/smb2pdu.c | 12 ++++++++++-- fs/smb/server/transport_rdma.c | 15 +++++++++++++-- fs/smb/server/transport_rdma.h | 4 ++-- 3 files changed, 25 insertions(+), 6 deletions(-)
fs/smb/server/smb2pdu.c +10 -2
@@ -6759,7 +6759,11 @@ int smb2_read(struct ksmbd_work *work)if (req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE || req->Channel ==SMB2_CHANNEL_RDMA_V1 ) { is_rdma_channel = true; - max_read_size =get_smbd_max_read_write_size (); + max_read_size =get_smbd_max_read_write_size (work->conn->transport); +if (max_read_size ==0 ) { + err = -EINVAL ; + goto out; + } }if (is_rdma_channel == true) {
@@ -7017,7 +7021,11 @@ int smb2_write(struct ksmbd_work *work)if (req->Channel ==SMB2_CHANNEL_RDMA_V1 || req->Channel ==SMB2_CHANNEL_RDMA_V1_INVALIDATE ) { is_rdma_channel = true; - max_write_size =get_smbd_max_read_write_size (); + max_write_size =get_smbd_max_read_write_size (work->conn->transport); +if (max_write_size ==0 ) { + err = -EINVAL ; + goto out; + } length =le32_to_cpu (req->RemainingBytes); }
fs/smb/server/transport_rdma.c +13 -2
@@ -111,9 +111,20 @@ void init_smbd_max_io_size(unsigned int sz) smb_direct_max_read_write_size = sz; } -unsigned int get_smbd_max_read_write_size (void ) +unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) { -return smb_direct_max_read_write_size; +struct smb_direct_transport *t; +struct smbdirect_socket *sc; +struct smbdirect_socket_parameters *sp; + +if (kt->ops != &ksmbd_smb_direct_transport_ops) +return 0 ; + + t =SMBD_TRANS (kt); + sc = &t->socket; + sp = &sc->parameters; + +return sp->max_read_write_size; }static inline int get_buf_page_count (void *buf,int size)
fs/smb/server/transport_rdma.h +2 -2
@@ -17,14 +17,14 @@ void ksmbd_rdma_stop_listening(void);void ksmbd_rdma_destroy (void );bool ksmbd_rdma_capable_netdev (struct net_device *netdev);void init_smbd_max_io_size (unsigned int sz); -unsigned int get_smbd_max_read_write_size (void ); +unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt);#else static inline int ksmbd_rdma_init (void ) {return 0 ; }static inline void ksmbd_rdma_stop_listening (void ) { }static inline void ksmbd_rdma_destroy (void ) { }static inline bool ksmbd_rdma_capable_netdev (struct net_device *netdev) {return false; }static inline void init_smbd_max_io_size (unsigned int sz) { } -static inline unsigned int get_smbd_max_read_write_size (void ) {return 0 ; } +static inline unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {return 0 ; }#endif #endif /* __KSMBD_TRANSPORT_RDMA_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 109/142 smb: server: fill smbdirect_socket_parameters at the beginning and use the values from there
In reply to Stefan MetzmacherThis is what we should do and it also simplifies the following changes.
--- fs/smb/server/transport_rdma.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
fs/smb/server/transport_rdma.c +15 -14
@@ -287,6 +287,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) {struct smb_direct_transport *t;struct smbdirect_socket *sc; +struct smbdirect_socket_parameters *sp;struct ksmbd_conn *conn; t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );
@@ -294,9 +295,17 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)return NULL ; sc = &t->socket;smbdirect_socket_init (sc); + sp = &sc->parameters;INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); + sp->recv_credit_max = smb_direct_receive_credit_max; + sp->send_credit_target = smb_direct_send_credit_target; + sp->max_send_size = smb_direct_max_send_size; + sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; + sp->max_recv_size = smb_direct_max_receive_size; + sp->max_read_write_size = smb_direct_max_read_write_size; + sc->rdma.cm_id = cm_id; cm_id->context = t;
@@ -1694,7 +1703,6 @@ static int smb_direct_init_params(struct smb_direct_transport *t,/* need 3 more sge. because a SMB_DIRECT header, SMB2 header, * SMB2 response could be mapped. */ - sp->max_send_size = smb_direct_max_send_size; max_send_sges =DIV_ROUND_UP (sp->max_send_size,PAGE_SIZE ) +3 ;if (max_send_sges >SMBDIRECT_SEND_IO_MAX_SGE ) {pr_err ("max_send_size %d is too large\n" , sp->max_send_size);
@@ -1708,7 +1716,6 @@ static int smb_direct_init_params(struct smb_direct_transport *t,* are needed for MR registration, RDMA R/W, local & remote * MR invalidation. */ - sp->max_read_write_size = smb_direct_max_read_write_size; sc->rw_io.credits.num_pages =smb_direct_get_max_fr_pages (t); sc->rw_io.credits.max = DIV_ROUND_UP(sp->max_read_write_size, (sc->rw_io.credits.num_pages - 1) *
@@ -1723,20 +1730,20 @@ static int smb_direct_init_params(struct smb_direct_transport *t, max_sge_per_wr) + 1); max_rw_wrs = sc->rw_io.credits.max * wrs_per_credit; - max_send_wrs = smb_direct_send_credit_target + max_rw_wrs; + max_send_wrs = sp->send_credit_target + max_rw_wrs;if (max_send_wrs > device->attrs.max_cqe || max_send_wrs > device->attrs.max_qp_wr) {pr_err ("consider lowering send_credit_target = %d\n" , - smb_direct_send_credit_target); + sp->send_credit_target);pr_err ("Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n" , device->attrs.max_cqe, device->attrs.max_qp_wr);return -EINVAL ; } -if (smb_direct_receive_credit_max > device->attrs.max_cqe || - smb_direct_receive_credit_max > device->attrs.max_qp_wr) { +if (sp->recv_credit_max > device->attrs.max_cqe || + sp->recv_credit_max > device->attrs.max_qp_wr) {pr_err ("consider lowering receive_credit_max = %d\n" , - smb_direct_receive_credit_max); + sp->recv_credit_max);pr_err ("Possible CQE overrun, device reporting max_cpe %d max_qp_wr %d\n" , device->attrs.max_cqe, device->attrs.max_qp_wr);return -EINVAL ;
@@ -1748,16 +1755,10 @@ static int smb_direct_init_params(struct smb_direct_transport *t,return -EINVAL ; } - sp->recv_credit_max = smb_direct_receive_credit_max; sc->recv_io.credits.target =1 ; - sp->send_credit_target = smb_direct_send_credit_target;atomic_set (&sc->rw_io.credits.count, sc->rw_io.credits.max); - sp->max_send_size = smb_direct_max_send_size; - sp->max_recv_size = smb_direct_max_receive_size; - sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; - cap->max_send_wr = max_send_wrs; cap->max_recv_wr = sp->recv_credit_max; cap->max_send_sge = max_sge_per_wr;
@@ -1857,7 +1858,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, } sc->ib.send_cq =ib_alloc_cq (sc->ib.dev, t, - smb_direct_send_credit_target + cap->max_rdma_ctxs, + sp->send_credit_target + cap->max_rdma_ctxs,0 ,IB_POLL_WORKQUEUE );if (IS_ERR (sc->ib.send_cq)) {pr_err ("Can't create RDMA send CQ\n" );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 110/142 smb: server: make use of smbdirect_socket_parameters.negotiate_timeout_msec and change to 5s
In reply to Stefan MetzmacherThe server negotiations timer is just 5 seconds in Windows, so use the same. See [MS-SMBD] 3.1.7.2 Connection Arrival.
--- fs/smb/server/transport_rdma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +4 -3
@@ -33,8 +33,8 @@#define SMB_DIRECT_VERSION_LE cpu_to_le16(SMBDIRECT_V1) -/* SMB_DIRECT negotiation timeout in seconds */ -#define SMB_DIRECT_NEGOTIATE_TIMEOUT 120 +/* SMB_DIRECT negotiation timeout (for the server) in seconds */ +#define SMB_DIRECT_NEGOTIATE_TIMEOUT 5/* * Default maximum number of RDMA read/write outstanding on this connection
@@ -299,6 +299,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); + sp->negotiate_timeout_msec =SMB_DIRECT_NEGOTIATE_TIMEOUT *1000 ; sp->recv_credit_max = smb_direct_receive_credit_max; sp->send_credit_target = smb_direct_send_credit_target; sp->max_send_size = smb_direct_max_send_size;
@@ -1954,7 +1955,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED && sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING && sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED , - SMB_DIRECT_NEGOTIATE_TIMEOUT * HZ); + msecs_to_jiffies(sp->negotiate_timeout_msec));if (ret <=0 || sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING )return ret <0 ? ret : -ETIMEDOUT ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 111/142 smb: server: make use of smbdirect_socket_parameters.{initiator_depth,responder_resources}
In reply to Stefan MetzmacherThis will make it easier to specify these from the outside of the core code first and then negotiate the value with the peer.
--- fs/smb/server/transport_rdma.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
fs/smb/server/transport_rdma.c +14 -12
@@ -95,8 +95,6 @@ struct smb_direct_transport {struct work_struct send_immediate_work;bool legacy_iwarp; -u8 initiator_depth; -u8 responder_resources; };#define KSMBD_TRANS (t) (&(t)->transport)
@@ -300,6 +298,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); sp->negotiate_timeout_msec =SMB_DIRECT_NEGOTIATE_TIMEOUT *1000 ; + sp->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; + sp->responder_resources =1 ; sp->recv_credit_max = smb_direct_receive_credit_max; sp->send_credit_target = smb_direct_send_credit_target; sp->max_send_size = smb_direct_max_send_size;
@@ -310,9 +310,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->rdma.cm_id = cm_id; cm_id->context = t; - t->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; - t->responder_resources =1 ; - sc->ib.dev = sc->rdma.cm_id->device; INIT_WORK(&sc->recv_io.posted.refill_work,
@@ -1613,18 +1610,19 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,static int smb_direct_accept_client (struct smb_direct_transport *t) {struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters;struct rdma_conn_param conn_param;__be32 ird_ord_hdr[2 ];int ret;/* * smb_direct_handle_connect_request() -* already negotiated t->initiator_depth -* and t->responder_resources +* already negotiated sp->initiator_depth +* and sp->responder_resources */ memset (&conn_param,0 ,sizeof (conn_param)); - conn_param.initiator_depth = t->initiator_depth; - conn_param.responder_resources = t->responder_resources; + conn_param.initiator_depth = sp->initiator_depth; + conn_param.responder_resources = sp->responder_resources;if (t->legacy_iwarp) { ird_ord_hdr[0 ] =cpu_to_be32 (conn_param.responder_resources);
@@ -2035,6 +2033,8 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, struct rdma_cm_event *event) {struct smb_direct_transport *t; +struct smbdirect_socket *sc; +struct smbdirect_socket_parameters *sp;struct task_struct *handler;u8 peer_initiator_depth;u8 peer_responder_resources;
@@ -2050,6 +2050,8 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, t =alloc_transport (new_cm_id);if (!t)return -ENOMEM ; + sc = &t->socket; + sp = &sc->parameters; peer_initiator_depth = event->param.conn.initiator_depth; peer_responder_resources = event->param.conn.responder_resources;
@@ -2099,7 +2101,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id,/* * First set what the we as server are able to support */ - t->initiator_depth =min_t (u8, t->initiator_depth, + sp->initiator_depth =min_t (u8, sp->initiator_depth, new_cm_id->device->attrs.max_qp_rd_atom);/*
@@ -2108,10 +2110,10 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id,* non 0 values. */ if (peer_initiator_depth !=0 ) - t->initiator_depth =min_t (u8, t->initiator_depth, + sp->initiator_depth =min_t (u8, sp->initiator_depth, peer_initiator_depth);if (peer_responder_resources !=0 ) - t->responder_resources =min_t (u8, t->responder_resources, + sp->responder_resources =min_t (u8, sp->responder_resources, peer_responder_resources); ret =smb_direct_connect (t);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 112/142 smb: server: make use of smbdirect_socket.rdma.legacy_iwarp
In reply to Stefan Metzmacher--- fs/smb/server/transport_rdma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +2 -4
@@ -93,8 +93,6 @@ struct smb_direct_transport {struct smbdirect_socket socket;struct work_struct send_immediate_work; - -bool legacy_iwarp; };#define KSMBD_TRANS (t) (&(t)->transport)
@@ -1624,7 +1622,7 @@ static int smb_direct_accept_client(struct smb_direct_transport *t) conn_param.initiator_depth = sp->initiator_depth; conn_param.responder_resources = sp->responder_resources; -if (t->legacy_iwarp) { +if (sc->rdma.legacy_iwarp) { ird_ord_hdr[0 ] =cpu_to_be32 (conn_param.responder_resources); ird_ord_hdr[1 ] =cpu_to_be32 (conn_param.initiator_depth); conn_param.private_data = ird_ord_hdr;
@@ -2092,7 +2090,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, ird32 =min_t (u32, ird32,U8_MAX ); ord32 =min_t (u32, ord32,U8_MAX ); - t->legacy_iwarp = true; + sc->rdma.legacy_iwarp = true; peer_initiator_depth = (u8 )ird32; peer_responder_resources = (u8 )ord32; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 113/142 smb: server: make use of smbdirect_socket.idle.immediate_work
In reply to Stefan MetzmacherWith 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.
--- fs/smb/server/transport_rdma.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
fs/smb/server/transport_rdma.c +9 -12
@@ -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 :
@@ -269,9 +265,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 ;
@@ -312,7 +309,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)
@@ -347,7 +344,7 @@ static void free_transport(struct smb_direct_transport *t)wake_up_all (&sc->send_io.pending.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);
@@ -554,7 +551,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);
@@ -770,7 +767,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)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 114/142 smb: server: implement correct keepalive and timeout handling for smbdirect
In reply to Stefan MetzmacherNow client and server behave in the same way and we can start to share common functions.
--- fs/smb/server/transport_rdma.c | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)
fs/smb/server/transport_rdma.c +74 -0
@@ -36,6 +36,12 @@/* SMB_DIRECT negotiation timeout (for the server) in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 5 +/* The timeout to wait for a keepalive message from peer in seconds */ +#define SMB_DIRECT_KEEPALIVE_SEND_INTERVAL 120 + +/* The timeout to wait for a keepalive message from peer in seconds */ +#define SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT 5 +/* * Default maximum number of RDMA read/write outstanding on this connection * This value is possibly decreased during QP creation on hardware limit
@@ -220,6 +226,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_delayed_work (&sc->idle.timer_work);disable_work (&sc->idle.immediate_work);switch (sc->status) {
@@ -276,6 +283,32 @@ static void smb_direct_send_immediate_work(struct work_struct *work)smb_direct_post_send_data (t,NULL ,NULL ,0 ,0 ); } +static void smb_direct_idle_connection_timer (struct work_struct *work) +{ +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, idle.timer_work.work); +struct smbdirect_socket_parameters *sp = &sc->parameters; +struct smb_direct_transport *t = + container_of(sc, struct smb_direct_transport, socket); + +if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) { +smb_direct_disconnect_rdma_connection (t); +return ; + } + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) +return ; + +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec)); +queue_work (smb_direct_wq, &sc->idle.immediate_work); +} +static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) {struct smb_direct_transport *t;
@@ -301,6 +334,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; sp->max_recv_size = smb_direct_max_receive_size; sp->max_read_write_size = smb_direct_max_read_write_size; + sp->keepalive_interval_msec =SMB_DIRECT_KEEPALIVE_SEND_INTERVAL *1000 ; + sp->keepalive_timeout_msec =SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT *1000 ; sc->rdma.cm_id = cm_id; cm_id->context = t;
@@ -310,6 +345,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 (&sc->idle.immediate_work, smb_direct_send_immediate_work); +INIT_DELAYED_WORK (&sc->idle.timer_work, smb_direct_idle_connection_timer); conn =ksmbd_conn_alloc ();if (!conn)
@@ -344,6 +380,7 @@ static void free_transport(struct smb_direct_transport *t)wake_up_all (&sc->send_io.pending.wait_queue);disable_work_sync (&sc->recv_io.posted.refill_work); +disable_delayed_work_sync (&sc->idle.timer_work);disable_work_sync (&sc->idle.immediate_work);if (sc->ib.qp) {
@@ -492,6 +529,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)ib_dma_sync_single_for_cpu (wc->qp->device, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE ); +/* +* Reset timer to the keepalive interval in +* order to trigger our next keepalive message. +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_interval_msec)); +switch (sc->recv_io.expected) {case SMBDIRECT_EXPECT_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) {
@@ -828,6 +873,24 @@ static int manage_credits_prior_sending(struct smb_direct_transport *t)return new_credits; } +static int manage_keep_alive_before_sending (struct smb_direct_transport *t) +{ +struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters; + +if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) { + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_SENT ; +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec)); +return 1 ; + } +return 0 ; +} +static int smb_direct_post_send (struct smb_direct_transport *t,struct ib_send_wr *wr) {
@@ -976,6 +1039,9 @@ static int smb_direct_create_header(struct smb_direct_transport *t, packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); packet->flags =0 ; +if (manage_keep_alive_before_sending (t)) + packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); + packet->reserved =0 ;if (!size) packet->data_offset =0 ;
@@ -1632,6 +1698,14 @@ static int smb_direct_accept_client(struct smb_direct_transport *t) conn_param.rnr_retry_count =SMB_DIRECT_CM_RNR_RETRY ; conn_param.flow_control =0 ; +/* +* start with the negotiate timeout and SMBDIRECT_KEEPALIVE_PENDING +* so that the timer will cause a disconnect. +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->negotiate_timeout_msec)); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; ret =rdma_accept (sc->rdma.cm_id, &conn_param);
Signature · 1 line
2.43.0