smb: smbdirect: more use of common structures
Subsystems (3)
Stefan Metzmacher
reviewercover smb: smbdirect: more use of common structures
Hi,
this is the next step towards a commin 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.
This patchset focuses on the usage of a common smbdirect_recv_io and related structures in smbdirect_socket.recv_io.
Note only patches 01-09 are intended to be merged soon, while the ksmbd patches 10-17 are only posted for completeness (as discussed with Namjae) to get early feedback.
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 in all combinations with and without the patchset on each side.
Stefan Metzmacher (17):
smb: client: remove unused
smbd_connection->fragment_reassembly_remaining
smb: smbdirect: introduce smbdirect_socket.recv_io.expected
smb: client: make use of smbdirect_socket->recv_io.expected
smb: smbdirect: introduce struct smbdirect_recv_io
smb: client: make use of struct smbdirect_recv_io
smb: smbdirect: introduce smbdirect_socket.recv_io.free.{list,lock}
smb: client: make use of smb:
smbdirect_socket.recv_io.free.{list,lock} smb: smbdirect: introduce smbdirect_socket.recv_io.reassembly.*
smb: client: make use of smbdirect_socket.recv_io.reassembly.*
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.*
fs/smb/client/cifs_debug.c | 10 +- fs/smb/client/smbdirect.c | 203 +++---- fs/smb/client/smbdirect.h | 47 -- fs/smb/common/smbdirect/smbdirect_socket.h | 64 +++ 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 | 608 +++++++++++---------- fs/smb/server/transport_rdma.h | 41 -- 10 files changed, 505 insertions(+), 499 deletions(-)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 1/17 smb: client: remove unused smbd_connection->fragment_reassembly_remaining
--- fs/smb/client/cifs_debug.c | 2 -- fs/smb/client/smbdirect.h | 1 - 2 files changed, 3 deletions(-)
fs/smb/client/cifs_debug.c +0 -2
@@ -467,13 +467,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nRead Queue count_reassembly_queue: %x " "count_enqueue_reassembly_queue: %x " "count_dequeue_reassembly_queue: %x " -"fragment_reassembly_remaining: %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, - server->smbd_conn->fragment_reassembly_remaining, server->smbd_conn->reassembly_data_length, server->smbd_conn->reassembly_queue_length); seq_printf(m, "\nCurrent Credits send_credits: %x "
fs/smb/client/smbdirect.h +0 -1
@@ -75,7 +75,6 @@ struct smbd_connection {atomic_t send_credits;atomic_t receive_credits;int receive_credit_target; -int fragment_reassembly_remaining;/* Memory registrations */ /* Maximum number of RDMA read/write outstanding on this connection */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 2/17 smb: smbdirect: introduce smbdirect_socket.recv_io.expected
In reply to Stefan MetzmacherThe expected message type can be global as they never change during the after negotiation process.
This will replace smbd_response->type and smb_direct_recvmsg->type in future.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +14 -0
@@ -38,6 +38,20 @@ struct smbdirect_socket { } ib;struct smbdirect_socket_parameters parameters; + +/* +* The state for posted receive buffers +*/ +struct { +/* +* The type of PDU we are expecting +*/ +enum { +SMBDIRECT_EXPECT_NEGOTIATE_REQ =1 , +SMBDIRECT_EXPECT_NEGOTIATE_REP =2 , +SMBDIRECT_EXPECT_DATA_TRANSFER =3 , + } expected; + } recv_io; };#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_SOCKET_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 3/17 smb: client: make use of smbdirect_socket->recv_io.expected
In reply to Stefan MetzmacherThe expected incoming message type can be per connection.
--- fs/smb/client/smbdirect.c | 22 ++++++++++++++-------- fs/smb/client/smbdirect.h | 7 ------- 2 files changed, 14 insertions(+), 15 deletions(-)
fs/smb/client/smbdirect.c +14 -8
@@ -383,6 +383,7 @@ static bool process_negotiation_response( info->max_frmr_depth * PAGE_SIZE); info->max_frmr_depth = sp->max_read_write_size /PAGE_SIZE ; + sc->recv_io.expected =SMBDIRECT_EXPECT_DATA_TRANSFER ;return true; }
@@ -408,7 +409,6 @@ static void smbd_post_send_credits(struct work_struct *work)if (!response)break ; - response->type =SMBD_TRANSFER_DATA ; response->first_segment = false; rc =smbd_post_recv (info, response);if (rc) {
@@ -445,10 +445,11 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbd_response *response = container_of(wc->wr_cqe, struct smbd_response, cqe);struct smbd_connection *info = response->info; +struct smbdirect_socket *sc = &info->socket;int data_length =0 ;log_rdma_recv (INFO ,"response=0x%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%u\n" , - response, response->type, wc->status, wc->opcode, + response, sc->recv_io.expected, wc->status, wc->opcode, wc->byte_len, wc->pkey_index);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) {
@@ -463,9 +464,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) response->sge.length, DMA_FROM_DEVICE); -switch (response->type) { +switch (sc->recv_io.expected) {/* SMBD negotiation response */ -case SMBD_NEGOTIATE_RESP : +case SMBDIRECT_EXPECT_NEGOTIATE_REP :dump_smbdirect_negotiate_resp (smbd_response_payload (response)); info->full_packet_received = true; info->negotiate_done =
@@ -475,7 +476,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ;/* SMBD data transfer packet */ -case SMBD_TRANSFER_DATA : +case SMBDIRECT_EXPECT_DATA_TRANSFER : data_transfer =smbd_response_payload (response); data_length =le32_to_cpu (data_transfer->data_length);
@@ -526,13 +527,17 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)put_receive_buffer (info, response);return ; + +case SMBDIRECT_EXPECT_NEGOTIATE_REQ : +/* Only server... */ +break ; }/* * This is an internal error! */ -log_rdma_recv (ERR ,"unexpected response type=%d\n" , response->type); -WARN_ON_ONCE (response->type !=SMBD_TRANSFER_DATA ); +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);smbd_disconnect_rdma_connection (info);
@@ -1067,10 +1072,11 @@ static int smbd_post_recv(/* Perform SMBD negotiate according to [MS-SMBD] 3.1.5.2 */ static int smbd_negotiate (struct smbd_connection *info) { +struct smbdirect_socket *sc = &info->socket;int rc;struct smbd_response *response =get_receive_buffer (info); - response->type =SMBD_NEGOTIATE_RESP ; + 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", rc, response->sge.addr,
fs/smb/client/smbdirect.h +0 -7
@@ -156,11 +156,6 @@ struct smbd_connection {unsigned int count_send_empty; }; -enum smbd_message_type { -SMBD_NEGOTIATE_RESP , -SMBD_TRANSFER_DATA , -}; -/* Maximum number of SGEs used by smbdirect.c in any send work request */ #define SMBDIRECT_MAX_SEND_SGE 6
@@ -186,8 +181,6 @@ struct smbd_response {struct ib_cqe cqe;struct ib_sge sge; -enum smbd_message_type type; -/* Link to receive queue or reassembly queue */ struct list_head list;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 4/17 smb: smbdirect: introduce struct smbdirect_recv_io
In reply to Stefan MetzmacherThis will be used in client and server soon in order to replace smbd_response/smb_direct_recvmsg.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +15 -0
@@ -54,4 +54,19 @@ struct smbdirect_socket { } recv_io; }; +struct smbdirect_recv_io { +struct smbdirect_socket *socket; +struct ib_cqe cqe; +struct ib_sge sge; + +/* Link to free or reassembly list */ +struct list_head list; + +/* Indicate if this is the 1st packet of a payload */ +bool first_segment; + +/* SMBD packet header and payload follows this structure */ +u8 packet[]; +}; +#endif /* __FS_SMB_COMMON_SMBDIRECT_SMBDIRECT_SOCKET_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 5/17 smb: client: make use of struct smbdirect_recv_io
In reply to Stefan MetzmacherThis is the shared structure that will be used in the server too and will allow us to move helper functions into common code soon.
--- fs/smb/client/smbdirect.c | 79 ++++++++++++++++++++------------------- fs/smb/client/smbdirect.h | 16 -------- 2 files changed, 41 insertions(+), 54 deletions(-)
fs/smb/client/smbdirect.c +41 -38
@@ -13,23 +13,23 @@#include "cifsproto.h" #include "smb2proto.h" -static struct smbd_response *get_receive_buffer ( +static struct smbdirect_recv_io *get_receive_buffer (struct smbd_connection *info);static void put_receive_buffer (struct smbd_connection *info, -struct smbd_response *response); +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 void enqueue_reassembly (struct smbd_connection *info, -struct smbd_response *response,int data_length); -static struct smbd_response *_get_first_reassembly ( +struct smbdirect_recv_io *response,int data_length); +static struct smbdirect_recv_io *_get_first_reassembly (struct smbd_connection *info);static int smbd_post_recv (struct smbd_connection *info, -struct smbd_response *response); +struct smbdirect_recv_io *response);static int smbd_post_send_empty (struct smbd_connection *info);
@@ -260,7 +260,7 @@ static inline void *smbd_request_payload(struct smbd_request *request)return (void *)request->packet; } -static inline void *smbd_response_payload (struct smbd_response *response) +static inline void *smbdirect_recv_io_payload (struct smbdirect_recv_io *response) {return (void *)response->packet; }
@@ -315,12 +315,13 @@ static void dump_smbdirect_negotiate_resp(struct smbdirect_negotiate_resp *resp)* return value: true if negotiation is a success, false if failed */ static bool process_negotiation_response ( -struct smbd_response *response,int packet_length) +struct smbdirect_recv_io *response,int packet_length) { -struct smbd_connection *info = response->info; -struct smbdirect_socket *sc = &info->socket; +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 =smbd_response_payload (response); +struct smbdirect_negotiate_resp *packet =smbdirect_recv_io_payload (response);if (packet_length <sizeof (struct smbdirect_negotiate_resp )) { log_rdma_event(ERR,
@@ -391,7 +392,7 @@ static void smbd_post_send_credits(struct work_struct *work) {int ret =0 ;int rc; -struct smbd_response *response; +struct smbdirect_recv_io *response;struct smbd_connection *info = container_of(work, struct smbd_connection, post_send_credits_work);
@@ -442,10 +443,11 @@ static void smbd_post_send_credits(struct work_struct *work)static void recv_done (struct ib_cq *cq,struct ib_wc *wc) {struct smbdirect_data_transfer *data_transfer; -struct smbd_response *response = - container_of(wc->wr_cqe, struct smbd_response, cqe); -struct smbd_connection *info = response->info; -struct smbdirect_socket *sc = &info->socket; +struct smbdirect_recv_io *response = + container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe); +struct smbdirect_socket *sc = response->socket; +struct smbd_connection *info = + container_of(sc, struct smbd_connection, socket);int data_length =0 ; log_rdma_recv(INFO, "response=0x%p type=%d wc status=%d wc opcode %d byte_len=%d pkey_index=%u\n",
@@ -467,7 +469,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)switch (sc->recv_io.expected) {/* SMBD negotiation response */ case SMBDIRECT_EXPECT_NEGOTIATE_REP : -dump_smbdirect_negotiate_resp (smbd_response_payload (response)); +dump_smbdirect_negotiate_resp (smbdirect_recv_io_payload (response)); info->full_packet_received = true; info->negotiate_done =process_negotiation_response (response, wc->byte_len);
@@ -477,7 +479,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)/* SMBD data transfer packet */ case SMBDIRECT_EXPECT_DATA_TRANSFER : - data_transfer =smbd_response_payload (response); + data_transfer =smbdirect_recv_io_payload (response); data_length =le32_to_cpu (data_transfer->data_length);if (data_length) {
@@ -1034,7 +1036,7 @@ 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 smbd_response *response) +struct smbd_connection *info,struct smbdirect_recv_io *response) {struct smbdirect_socket *sc = &info->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -1074,7 +1076,7 @@ static int smbd_negotiate(struct smbd_connection *info) {struct smbdirect_socket *sc = &info->socket;int rc; -struct smbd_response *response =get_receive_buffer (info); +struct smbdirect_recv_io *response =get_receive_buffer (info); sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REP ; rc =smbd_post_recv (info, response);
@@ -1119,7 +1121,7 @@ static int smbd_negotiate(struct smbd_connection *info)*/ static void enqueue_reassembly (struct smbd_connection *info, -struct smbd_response *response, +struct smbdirect_recv_io *response,int data_length) {spin_lock (&info->reassembly_queue_lock);
@@ -1143,14 +1145,14 @@ static void enqueue_reassembly(* Caller is responsible for locking * return value: the first entry if any, NULL if queue is empty */ -static struct smbd_response *_get_first_reassembly (struct smbd_connection *info) +static struct smbdirect_recv_io *_get_first_reassembly (struct smbd_connection *info) { -struct smbd_response *ret =NULL ; +struct smbdirect_recv_io *ret =NULL ;if (!list_empty (&info->reassembly_queue)) { ret =list_first_entry ( &info->reassembly_queue, - struct smbd_response, list); + struct smbdirect_recv_io, list); }return ret; }
@@ -1161,16 +1163,16 @@ static struct smbd_response *_get_first_reassembly(struct smbd_connection *info)* pre-allocated in advance. * return value: the receive buffer, NULL if none is available */ -static struct smbd_response *get_receive_buffer (struct smbd_connection *info) +static struct smbdirect_recv_io *get_receive_buffer (struct smbd_connection *info) { -struct smbd_response *ret =NULL ; +struct smbdirect_recv_io *ret =NULL ;unsigned long flags;spin_lock_irqsave (&info->receive_queue_lock, flags);if (!list_empty (&info->receive_queue)) { ret =list_first_entry ( &info->receive_queue, - struct smbd_response, list); + struct smbdirect_recv_io, list);list_del (&ret->list); info->count_receive_queue--; info->count_get_receive_buffer++;
@@ -1187,7 +1189,7 @@ static struct smbd_response *get_receive_buffer(struct smbd_connection *info)* receive buffer is returned. */ static void put_receive_buffer ( -struct smbd_connection *info,struct smbd_response *response) +struct smbd_connection *info,struct smbdirect_recv_io *response) {struct smbdirect_socket *sc = &info->socket;unsigned long flags;
@@ -1212,8 +1214,9 @@ static void put_receive_buffer(/* Preallocate all receive buffer on transport establishment */ static int allocate_receive_buffers (struct smbd_connection *info,int num_buf) { +struct smbdirect_socket *sc = &info->socket; +struct smbdirect_recv_io *response;int i; -struct smbd_response *response;INIT_LIST_HEAD (&info->reassembly_queue);spin_lock_init (&info->reassembly_queue_lock);
@@ -1231,7 +1234,7 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)if (!response) goto allocate_failed; - response->info = info; + response->socket = sc; response->sge.length =0 ;list_add_tail (&response->list, &info->receive_queue); info->count_receive_queue++;
@@ -1243,7 +1246,7 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)while (!list_empty (&info->receive_queue)) { response =list_first_entry ( &info->receive_queue, - struct smbd_response, list); + struct smbdirect_recv_io, list);list_del (&response->list); info->count_receive_queue--;
@@ -1254,7 +1257,7 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf)static void destroy_receive_buffers (struct smbd_connection *info) { -struct smbd_response *response; +struct smbdirect_recv_io *response;while ((response =get_receive_buffer (info)))mempool_free (response, info->response_mempool);
@@ -1295,7 +1298,7 @@ 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 smbd_response *response; +struct smbdirect_recv_io *response;unsigned long flags;if (!info) {
@@ -1456,17 +1459,17 @@ static int allocate_caches_and_workqueue(struct smbd_connection *info)if (!info->request_mempool) goto out1; -scnprintf (name,MAX_NAME_LEN ,"smbd_response_%p" , info); +scnprintf (name,MAX_NAME_LEN ,"smbdirect_recv_io_%p" , info);struct kmem_cache_args response_args = { - .align = __alignof__(struct smbd_response ), - .useroffset = (offsetof(struct smbd_response , packet) + + .align = __alignof__(struct smbdirect_recv_io ), + .useroffset = (offsetof(struct smbdirect_recv_io , packet) +sizeof (struct smbdirect_data_transfer )), .usersize = sp->max_recv_size -sizeof (struct smbdirect_data_transfer ), }; info->response_cache =kmem_cache_create (name, -sizeof (struct smbd_response ) + sp->max_recv_size, +sizeof (struct smbdirect_recv_io ) + sp->max_recv_size, &response_args,SLAB_HWCACHE_ALIGN );if (!info->response_cache) goto out2;
@@ -1756,7 +1759,7 @@ struct smbd_connection *smbd_get_connection(int smbd_recv (struct smbd_connection *info,struct msghdr *msg) {struct smbdirect_socket *sc = &info->socket; -struct smbd_response *response; +struct smbdirect_recv_io *response;struct smbdirect_data_transfer *data_transfer;size_t size =iov_iter_count (&msg->msg_iter);int to_copy, to_read, data_read, offset;
@@ -1792,7 +1795,7 @@ int smbd_recv(struct smbd_connection *info, struct msghdr *msg) offset = info->first_entry_offset;while (data_read < size) { response =_get_first_reassembly (info); - data_transfer =smbd_response_payload (response); + data_transfer =smbdirect_recv_io_payload (response); data_length =le32_to_cpu (data_transfer->data_length); remaining_data_length = le32_to_cpu(
fs/smb/client/smbdirect.h +0 -16
@@ -175,22 +175,6 @@ struct smbd_request {/* Maximum number of SGEs used by smbdirect.c in any receive work request */ #define SMBDIRECT_MAX_RECV_SGE 1 -/* The context for a SMBD response */ -struct smbd_response { -struct smbd_connection *info; -struct ib_cqe cqe; -struct ib_sge sge; - -/* Link to receive queue or reassembly queue */ -struct list_head list; - -/* Indicate if this is the 1st packet of a payload */ -bool first_segment; - -/* SMBD packet header and payload follows this structure */ -u8 packet[]; -}; -/* Create a SMBDirect session */ struct smbd_connection *smbd_get_connection (struct TCP_Server_Info *server,struct sockaddr *dstaddr);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 6/17 smb: smbdirect: introduce smbdirect_socket.recv_io.free.{list,lock}
In reply to Stefan MetzmacherThis will allow the list of free smbdirect_recv_io messages including the spinlock to be in common between client and server in order to split out common helper functions in future.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +9 -0
@@ -51,6 +51,15 @@ struct smbdirect_socket {SMBDIRECT_EXPECT_NEGOTIATE_REP =2 ,SMBDIRECT_EXPECT_DATA_TRANSFER =3 , } expected; + +/* +* The list of free smbdirect_recv_io +* structures +*/ +struct { +struct list_head list; +spinlock_t lock; + } free; } recv_io; };
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 7/17 smb: client: make use of smb: smbdirect_socket.recv_io.free.{list,lock}
In reply to Stefan MetzmacherThis will be used by the server too in order to have common helper functions in future.
--- fs/smb/client/smbdirect.c | 25 +++++++++++++------------ fs/smb/client/smbdirect.h | 3 --- 2 files changed, 13 insertions(+), 15 deletions(-)
fs/smb/client/smbdirect.c +13 -12
@@ -1165,19 +1165,20 @@ static struct smbdirect_recv_io *_get_first_reassembly(struct smbd_connection *i*/ static struct smbdirect_recv_io *get_receive_buffer (struct smbd_connection *info) { +struct smbdirect_socket *sc = &info->socket;struct smbdirect_recv_io *ret =NULL ;unsigned long flags; -spin_lock_irqsave (&info->receive_queue_lock, flags); -if (!list_empty (&info->receive_queue)) { +spin_lock_irqsave (&sc->recv_io.free.lock, flags); +if (!list_empty (&sc->recv_io.free.list)) { ret =list_first_entry ( - &info->receive_queue, + &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 (&info->receive_queue_lock, flags); +spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);return ret; }
@@ -1202,11 +1203,11 @@ static void put_receive_buffer( response->sge.length =0 ; } -spin_lock_irqsave (&info->receive_queue_lock, flags); -list_add_tail (&response->list, &info->receive_queue); +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 (&info->receive_queue_lock, flags); +spin_unlock_irqrestore (&sc->recv_io.free.lock, flags);queue_work (info->workqueue, &info->post_send_credits_work); }
@@ -1223,8 +1224,8 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf) info->reassembly_data_length =0 ; info->reassembly_queue_length =0 ; -INIT_LIST_HEAD (&info->receive_queue); -spin_lock_init (&info->receive_queue_lock); +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);
@@ -1236,16 +1237,16 @@ static int allocate_receive_buffers(struct smbd_connection *info, int num_buf) response->socket = sc; response->sge.length =0 ; -list_add_tail (&response->list, &info->receive_queue); +list_add_tail (&response->list, &sc->recv_io.free.list); info->count_receive_queue++; }return 0 ; allocate_failed: -while (!list_empty (&info->receive_queue)) { +while (!list_empty (&sc->recv_io.free.list)) { response =list_first_entry ( - &info->receive_queue, + &sc->recv_io.free.list, struct smbdirect_recv_io, list);list_del (&response->list); info->count_receive_queue--;
fs/smb/client/smbdirect.h +0 -3
@@ -105,10 +105,7 @@ struct smbd_connection {wait_queue_head_t wait_post_send;/* Receive queue */ -struct list_head receive_queue;int count_receive_queue; -spinlock_t receive_queue_lock; -wait_queue_head_t wait_receive_queues;/* Reassembly queue */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 8/17 smb: smbdirect: introduce smbdirect_socket.recv_io.reassembly.*
In reply to Stefan MetzmacherThis will be used in common between client and server soon.
--- fs/smb/common/smbdirect/smbdirect_socket.h | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.h +26 -0
@@ -60,6 +60,32 @@ struct smbdirect_socket {struct list_head list;spinlock_t lock; } free; + +/* +* The list of arrived non-empty smbdirect_recv_io +* structures +* +* This represents the reassembly queue. +*/ +struct { +struct list_head list; +spinlock_t lock; +wait_queue_head_t wait_queue; +/* total data length of reassembly queue */ +int data_length; +int queue_length; +/* the offset to first buffer in reassembly queue */ +int first_entry_offset; +/* +* Indicate if we have received a full packet on the +* connection This is used to identify the first SMBD +* packet of a assembled payload (SMB packet) in +* reassembly queue so we can return a RFC1002 length to +* upper layer to indicate the length of the SMB packet +* received +*/ +bool full_packet_received; + } reassembly; } recv_io; };
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 9/17 smb: client: make use of smbdirect_socket.recv_io.reassembly.*
In reply to Stefan MetzmacherThis will be used by the server too and will allow us to create common helper functions.
--- fs/smb/client/cifs_debug.c | 8 ++-- fs/smb/client/smbdirect.c | 79 ++++++++++++++++++++------------------ fs/smb/client/smbdirect.h | 20 ---------- 3 files changed, 46 insertions(+), 61 deletions(-)
fs/smb/client/cifs_debug.c +5 -3
@@ -414,6 +414,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)spin_lock (&cifs_tcp_ses_lock);list_for_each_entry (server, &cifs_tcp_ses_list, tcp_ses_list) {#ifdef CONFIG_CIFS_SMB_DIRECT +struct smbdirect_socket *sc;struct smbdirect_socket_parameters *sp;#endif
@@ -438,7 +439,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)seq_printf (m,"\nSMBDirect transport not available" ); goto skip_rdma; } - sp = &server->smbd_conn->socket.parameters; + sc = &server->smbd_conn->socket; + sp = &sc->parameters; seq_printf(m, "\nSMBDirect (in hex) protocol version: %x " "transport status: %x",
@@ -472,8 +474,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) server->smbd_conn->count_reassembly_queue, server->smbd_conn->count_enqueue_reassembly_queue, server->smbd_conn->count_dequeue_reassembly_queue, - server->smbd_conn->reassembly_data_length, - server->smbd_conn->reassembly_queue_length); + sc->recv_io.reassembly.data_length, + 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),
fs/smb/client/smbdirect.c +41 -38
190 lines not on this page · raw message
fs/smb/client/smbdirect.h +0 -20
@@ -108,30 +108,10 @@ struct smbd_connection {int count_receive_queue;wait_queue_head_t wait_receive_queues; -/* Reassembly queue */ -struct list_head reassembly_queue; -spinlock_t reassembly_queue_lock; -wait_queue_head_t wait_reassembly_queue; - -/* total data length of reassembly queue */ -int reassembly_data_length; -int reassembly_queue_length; -/* the offset to first buffer in reassembly queue */ -int first_entry_offset; -bool send_immediate;wait_queue_head_t wait_send_queue; -/* -* Indicate if we have received a full packet on the connection -* This is used to identify the first SMBD packet of a assembled -* payload (SMB packet) in reassembly queue so we can return a -* RFC1002 length to upper layer to indicate the length of the SMB -* packet received -*/ -bool full_packet_received; -struct workqueue_struct *workqueue;struct delayed_work idle_timer_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 10/17 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
@@ -472,8 +473,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,
@@ -485,8 +486,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),
@@ -540,7 +541,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 ;
@@ -552,13 +553,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 ;
@@ -566,7 +567,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);
@@ -598,7 +599,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 )
@@ -664,7 +665,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;
@@ -1001,7 +1002,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;
@@ -1010,7 +1011,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));
@@ -1033,11 +1034,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,
@@ -1212,7 +1213,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;
@@ -1560,18 +1561,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 ;
@@ -1803,7 +1804,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 ;
@@ -1936,7 +1937,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" );
@@ -1955,7 +1956,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 11/17 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 {
@@ -127,11 +129,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); };
@@ -157,11 +159,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"
@@ -1335,7 +1336,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) {
@@ -1465,7 +1466,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,
@@ -1474,7 +1475,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 12/17 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 | 249 ++++++++++++++++++--------------- 1 file changed, 137 insertions(+), 112 deletions(-)
fs/smb/server/transport_rdma.c +137 -112
@@ -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;
@@ -267,8 +256,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 );
@@ -312,17 +303,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); }
@@ -330,8 +324,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 );
@@ -340,16 +335,20 @@ 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->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);
@@ -393,6 +392,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);
@@ -405,11 +405,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" );
@@ -426,14 +426,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);
@@ -456,14 +456,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 ); }
@@ -518,9 +519,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);
@@ -549,7 +552,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 ;
@@ -631,17 +634,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;
@@ -649,10 +653,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 ;
@@ -671,9 +675,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 ; }
@@ -783,7 +788,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 ;
@@ -885,10 +890,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))
@@ -953,6 +959,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 {
@@ -962,9 +969,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;
@@ -1002,6 +1009,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;
@@ -1041,11 +1049,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;
@@ -1053,7 +1061,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 ;
@@ -1107,10 +1115,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 );
@@ -1146,6 +1155,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;
@@ -1171,7 +1181,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 );
@@ -1182,7 +1192,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; }
@@ -1191,7 +1201,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++; } }
@@ -1211,6 +1221,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 -
@@ -1219,7 +1230,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..
@@ -1300,7 +1311,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);
@@ -1340,6 +1353,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);
@@ -1349,7 +1363,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)
@@ -1419,7 +1433,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,
@@ -1440,11 +1454,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;
@@ -1485,20 +1499,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); }
@@ -1507,28 +1523,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 ; }
@@ -1544,9 +1561,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 :
@@ -1561,6 +1579,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;
@@ -1591,10 +1610,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;
@@ -1602,7 +1621,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) {
@@ -1617,19 +1636,20 @@ 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;struct ib_port_immutable port_immutable;u32 ird_ord_hdr[2 ];int ret;memset (&conn_param,0 ,sizeof (conn_param)); - conn_param.initiator_depth =min_t (u8, t->cm_id->device->attrs.max_qp_rd_atom, + conn_param.initiator_depth =min_t (u8, sc->ib.dev->attrs.max_qp_rd_atom,SMB_DIRECT_CM_INITIATOR_DEPTH ); conn_param.responder_resources =0 ; - t->cm_id->device->ops.get_port_immutable (t->cm_id->device, - t->cm_id->port_num, - &port_immutable); + sc->ib.dev->ops.get_port_immutable (sc->ib.dev, + sc->rdma.cm_id->port_num, + &port_immutable);if (port_immutable.core_cap_flags &RDMA_CORE_PORT_IWARP ) { ird_ord_hdr[0 ] = conn_param.responder_resources; ird_ord_hdr[1 ] =1 ;
@@ -1643,7 +1663,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;
@@ -1683,15 +1703,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;
@@ -1851,34 +1874,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; }
@@ -1888,22 +1912,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) {
@@ -1915,21 +1939,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; }
@@ -1937,6 +1961,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;
@@ -1944,9 +1969,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 13/17 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;
@@ -635,16 +627,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;
@@ -1010,6 +1004,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;
@@ -1021,7 +1016,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 ;
@@ -1222,9 +1217,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;
@@ -1354,6 +1350,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);
@@ -1366,7 +1363,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 */
@@ -1580,6 +1577,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;
@@ -1601,13 +1599,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,
@@ -1714,6 +1712,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;
@@ -1721,10 +1720,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 ; }
@@ -1735,9 +1734,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 );
@@ -1778,20 +1777,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 ;
@@ -1821,6 +1820,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;
@@ -1833,7 +1834,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)
@@ -1842,20 +1843,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;
@@ -1863,7 +1864,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:
@@ -1875,6 +1876,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;
@@ -1898,7 +1900,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);
@@ -1925,7 +1927,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,
@@ -1962,6 +1964,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;
@@ -1983,14 +1986,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 14/17 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
@@ -141,10 +141,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;
@@ -168,7 +164,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;
@@ -465,8 +460,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
@@ -477,9 +474,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,
@@ -499,12 +496,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)
@@ -535,8 +535,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);
@@ -548,7 +548,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;
@@ -613,12 +613,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); }
@@ -807,7 +810,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);
@@ -1606,6 +1608,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,
@@ -1671,13 +1675,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 15/17 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
@@ -161,15 +161,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;
@@ -212,7 +203,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; }
@@ -225,14 +216,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); }
@@ -241,7 +232,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;
@@ -259,7 +250,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);
@@ -276,11 +267,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 ; }
@@ -380,7 +371,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);
@@ -458,9 +449,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 : {
@@ -509,13 +500,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);
@@ -627,7 +618,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;
@@ -666,7 +657,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;
@@ -703,7 +694,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);
@@ -796,7 +787,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;
@@ -1677,7 +1668,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 ;
@@ -1806,7 +1797,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);
@@ -1830,7 +1821,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,
@@ -1846,9 +1837,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)
@@ -1866,7 +1857,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); }
@@ -1971,7 +1962,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 16/17 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;
@@ -218,16 +215,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; }
@@ -244,9 +242,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,
@@ -326,6 +324,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);
@@ -338,8 +339,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 );
@@ -1851,15 +1850,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 17/17 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;
@@ -251,9 +243,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
@@ -261,14 +255,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 ;
@@ -330,11 +326,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);
@@ -391,17 +387,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);
@@ -533,7 +529,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);
@@ -560,13 +556,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);
@@ -597,7 +593,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);
@@ -675,7 +671,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 ;
@@ -687,10 +683,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);
@@ -733,9 +729,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);
@@ -748,10 +744,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;
@@ -763,18 +759,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 ;
@@ -1529,7 +1525,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 ; }
@@ -1991,10 +1987,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