smb: smbdirect/client/server: moving to common functions and smbdirect.ko
Subsystems (3)
Stefan Metzmacher
reviewerPATCH v4 99/145 smb: server: make use of smbdirect_socket_wake_up_all()
In reply to Stefan MetzmacherThis is a superset of smb_direct_disconnect_wake_up_all() and calling wake_up_all(&sc->mr_io.ready.wait_queue); and wake_up_all(&sc->mr_io.cleanup.wait_queue); in addition should not matter as it's not used on the server anyway.
--- fs/smb/server/transport_rdma.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-)
fs/smb/server/transport_rdma.c +3 -17
@@ -285,20 +285,6 @@ static struct smbdirect_recv_io *get_first_reassembly(struct smbdirect_socket *sreturn NULL ; } -static void smb_direct_disconnect_wake_up_all (struct smbdirect_socket *sc) -{ -/* -* Wake up all waiters in all wait queues -* in order to notice the broken connection. -*/ -wake_up_all (&sc->status_wait); -wake_up_all (&sc->send_io.lcredits.wait_queue); -wake_up_all (&sc->send_io.credits.wait_queue); -wake_up_all (&sc->send_io.pending.zero_wait_queue); -wake_up_all (&sc->recv_io.reassembly.wait_queue); -wake_up_all (&sc->rw_io.credits.wait_queue); -} -static void smb_direct_disconnect_rdma_work (struct work_struct *work) { struct smbdirect_socket *sc =
@@ -354,7 +340,7 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)* Wake up all waiters in all wait queues * in order to notice the broken connection. */ -smb_direct_disconnect_wake_up_all (sc); +smbdirect_socket_wake_up_all (sc); } static void
@@ -419,7 +405,7 @@ smb_direct_disconnect_rdma_connection(struct smbdirect_socket *sc)* Wake up all waiters in all wait queues * in order to notice the broken connection. */ -smb_direct_disconnect_wake_up_all (sc); +smbdirect_socket_wake_up_all (sc);queue_work (sc->workqueue, &sc->disconnect_work); }
@@ -545,7 +531,7 @@ static void free_transport(struct smb_direct_transport *t)* Most likely this was already called via * smb_direct_disconnect_rdma_work(), but call it again... */ -smb_direct_disconnect_wake_up_all (sc); +smbdirect_socket_wake_up_all (sc);disable_work_sync (&sc->recv_io.posted.refill_work);disable_delayed_work_sync (&sc->idle.timer_work);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 100/145 smb: server: let smb_direct_create_pools() initialize complex_work as disabled
In reply to Stefan Metzmachersmbdirect_recv_io.complex_work won't be used in server until the end of the move to common functions, but common cleanup code will call disable_work[_sync]() before that, so we better initialize it now.
--- fs/smb/server/transport_rdma.c | 2 ++ 1 file changed, 2 insertions(+)
fs/smb/server/transport_rdma.c +2 -0
@@ -2107,6 +2107,8 @@ static int smb_direct_create_pools(struct smbdirect_socket *sc) goto err; recvmsg->socket = sc; recvmsg->sge.length =0 ; +INIT_WORK (&recvmsg->complex_work, __smbdirect_socket_disabled_work); +disable_work_sync (&recvmsg->complex_work);list_add (&recvmsg->list, &sc->recv_io.free.list); }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 101/145 smb: server: make use of smbdirect_socket_cleanup_work()
In reply to Stefan MetzmacherNote smbdirect_socket_prepare_create() already calls INIT_WORK() with smbdirect_socket_cleanup_work.
--- fs/smb/server/transport_rdma.c | 70 +++------------------------------- 1 file changed, 5 insertions(+), 65 deletions(-)
fs/smb/server/transport_rdma.c +5 -65
@@ -285,64 +285,6 @@ static struct smbdirect_recv_io *get_first_reassembly(struct smbdirect_socket *sreturn NULL ; } -static void smb_direct_disconnect_rdma_work (struct work_struct *work) -{ -struct smbdirect_socket *sc = - container_of(work, struct smbdirect_socket, disconnect_work); - -if (sc->first_error ==0 ) - sc->first_error = -ECONNABORTED ; - -/* -* make sure this and other work is not queued again -* but here we don't block and avoid -* disable[_delayed]_work_sync() -*/ -disable_work (&sc->disconnect_work); -disable_work (&sc->recv_io.posted.refill_work); -disable_delayed_work (&sc->idle.timer_work); -disable_work (&sc->idle.immediate_work); - -switch (sc->status) { -case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : -case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : -case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : -case SMBDIRECT_SOCKET_CONNECTED : -case SMBDIRECT_SOCKET_ERROR : - sc->status =SMBDIRECT_SOCKET_DISCONNECTING ; -rdma_disconnect (sc->rdma.cm_id); -break ; - -case SMBDIRECT_SOCKET_CREATED : -case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : -case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : -case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : -case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : -case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : -case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : -/* -* rdma_accept() never reached -* RDMA_CM_EVENT_ESTABLISHED -*/ - sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -break ; - -case SMBDIRECT_SOCKET_DISCONNECTING : -case SMBDIRECT_SOCKET_DISCONNECTED : -case SMBDIRECT_SOCKET_DESTROYED : -break ; - } - -/* -* Wake up all waiters in all wait queues -* in order to notice the broken connection. -*/ -smbdirect_socket_wake_up_all (sc); -} -static void smb_direct_disconnect_rdma_connection (struct smbdirect_socket *sc) {
@@ -482,8 +424,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)*/ sp = &sc->parameters; -INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); - sc->rdma.cm_id = cm_id; cm_id->context = sc;
@@ -520,7 +460,7 @@ static void free_transport(struct smb_direct_transport *t)disable_work_sync (&sc->disconnect_work);if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) -smb_direct_disconnect_rdma_work (&sc->disconnect_work); +smbdirect_socket_cleanup_work (&sc->disconnect_work);if (sc->status <SMBDIRECT_SOCKET_DISCONNECTED )wait_event (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED );
@@ -529,7 +469,7 @@ static void free_transport(struct smb_direct_transport *t)* in order to notice the broken connection. * * Most likely this was already called via -* smb_direct_disconnect_rdma_work(), but call it again... +* smbdirect_socket_cleanup_work(), but call it again... */ smbdirect_socket_wake_up_all (sc);
@@ -1791,7 +1731,7 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id); -smb_direct_disconnect_rdma_work (&sc->disconnect_work); +smbdirect_socket_cleanup_work (&sc->disconnect_work); } static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,
@@ -1823,14 +1763,14 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,case RDMA_CM_EVENT_DEVICE_REMOVAL :case RDMA_CM_EVENT_DISCONNECTED : { sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -smb_direct_disconnect_rdma_work (&sc->disconnect_work); +smbdirect_socket_cleanup_work (&sc->disconnect_work);if (sc->ib.qp)ib_drain_qp (sc->ib.qp);break ; }case RDMA_CM_EVENT_CONNECT_ERROR : { sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -smb_direct_disconnect_rdma_work (&sc->disconnect_work); +smbdirect_socket_cleanup_work (&sc->disconnect_work);break ; }default :
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 102/145 smb: server: make use of smbdirect_socket_schedule_cleanup()
In reply to Stefan MetzmacherThis removes smb_direct_disconnect_rdma_connection() which is basically the same as smbdirect_socket_schedule_cleanup().
And we pass more useful errors than -ECONNABORTED if we have them.
--- fs/smb/server/transport_rdma.c | 97 +++++----------------------------- 1 file changed, 13 insertions(+), 84 deletions(-)
fs/smb/server/transport_rdma.c +13 -84
@@ -21,8 +21,6 @@#include <rdma/rdma_cm.h> #include <rdma/rw.h> -#define __SMBDIRECT_SOCKET_DISCONNECT (__sc) smb_direct_disconnect_rdma_connection(__sc) -#include "glob.h" #include "connection.h" #include "smb_common.h"
@@ -32,8 +30,6 @@#include "../common/smbdirect/smbdirect_socket.h" #include "transport_rdma.h" -static void smb_direct_disconnect_rdma_connection (struct smbdirect_socket *sc); -/* * This is a temporary solution until all code * is moved to smbdirect_all_c_files.c and we
@@ -285,73 +281,6 @@ static struct smbdirect_recv_io *get_first_reassembly(struct smbdirect_socket *sreturn NULL ; } -static void -smb_direct_disconnect_rdma_connection (struct smbdirect_socket *sc) -{ -if (sc->first_error ==0 ) - sc->first_error = -ECONNABORTED ; - -/* -* make sure other work (than disconnect_work) is -* not queued again but here we don't block and avoid -* disable[_delayed]_work_sync() -*/ -disable_work (&sc->recv_io.posted.refill_work); -disable_work (&sc->idle.immediate_work); -disable_delayed_work (&sc->idle.timer_work); - -switch (sc->status) { -case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : -case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : -case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : -case SMBDIRECT_SOCKET_ERROR : -case SMBDIRECT_SOCKET_DISCONNECTING : -case SMBDIRECT_SOCKET_DISCONNECTED : -case SMBDIRECT_SOCKET_DESTROYED : -/* -* Keep the current error status -*/ -break ; - -case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : -case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : - sc->status =SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ; -break ; - -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : -case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : - sc->status =SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED ; -break ; - -case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : -case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : - sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED ; -break ; - -case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : -case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : - sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ; -break ; - -case SMBDIRECT_SOCKET_CREATED : - sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -break ; - -case SMBDIRECT_SOCKET_CONNECTED : - sc->status =SMBDIRECT_SOCKET_ERROR ; -break ; - } - -/* -* Wake up all waiters in all wait queues -* in order to notice the broken connection. -*/ -smbdirect_socket_wake_up_all (sc); - -queue_work (sc->workqueue, &sc->disconnect_work); -} -static void smb_direct_send_immediate_work (struct work_struct *work) { struct smbdirect_socket *sc =
@@ -370,7 +299,7 @@ static void smb_direct_idle_connection_timer(struct work_struct *work)struct smbdirect_socket_parameters *sp = &sc->parameters;if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) { -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ETIMEDOUT );return ; }
@@ -619,7 +548,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)pr_err ("Recv error. status='%s (%d)' opcode=%d\n" ,ib_wc_status_msg (wc->status), wc->status, wc->opcode); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); }return ; }
@@ -643,7 +572,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMBDIRECT_EXPECT_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; } sc->recv_io.reassembly.full_packet_received = true;
@@ -656,7 +585,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ;if (SMBDIRECT_CHECK_STATUS_WARN (sc,SMBDIRECT_SOCKET_NEGOTIATE_NEEDED )) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; } sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ;
@@ -672,7 +601,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len < offsetof(struct smbdirect_data_transfer , padding)) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -682,7 +611,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len < data_offset || wc->byte_len < (u64 )data_offset + data_length) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; } if (remaining_data_length > sp->max_fragmented_recv_size ||
@@ -690,7 +619,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) (u64)remaining_data_length + (u64)data_length > (u64)sp->max_fragmented_recv_size) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -745,7 +674,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)*/ WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER );put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); } static int smb_direct_post_recv(struct smbdirect_socket *sc,
@@ -778,7 +707,7 @@ static int smb_direct_post_recv(struct smbdirect_socket *sc, recvmsg->sge.addr, recvmsg->sge.length, DMA_FROM_DEVICE); recvmsg->sge.length =0 ; -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, ret);return ret; }return ret;
@@ -965,7 +894,7 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)pr_err ("Send error. status='%s (%d)', opcode=%d\n" ,ib_wc_status_msg (wc->status), wc->status, wc->opcode); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -1021,7 +950,7 @@ static int smb_direct_post_send(struct smbdirect_socket *sc, ret =ib_post_send (sc->ib.qp, wr,NULL );if (ret) {pr_err ("failed to post send: %d\n" , ret); -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, ret); }return ret; }
@@ -1548,7 +1477,7 @@ static void read_write_done(struct ib_cq *cq, struct ib_wc *wc,pr_err ("read/write error. opcode = %d, status = %s(%d)\n" , wc->opcode,ib_wc_status_msg (wc->status), wc->status);if (wc->status !=IB_WC_WR_FLUSH_ERR ) -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, msg->error); }complete (msg->completion);
@@ -1792,7 +1721,7 @@ static void smb_direct_qpair_handler(struct ib_event *event, void *context)switch (event->event) {case IB_EVENT_CQ_ERR :case IB_EVENT_QP_FATAL : -smb_direct_disconnect_rdma_connection (sc); +smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );break ;default :break ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 103/145 smb: server: make use of smbdirect_connection_{get,put}_recv_io()
In reply to Stefan MetzmacherThese are basically copies of {get,put}_receive_buffer() in the client. They are very similar to {get_free,put}_recvmsg() the only logical difference is the updating of the sc->statistics.*.
--- fs/smb/server/transport_rdma.c | 69 ++++++++-------------------------- 1 file changed, 16 insertions(+), 53 deletions(-)
fs/smb/server/transport_rdma.c +16 -53
@@ -215,43 +215,6 @@ static inline voidreturn (void *)recvmsg->packet; } -static struct -smbdirect_recv_io *get_free_recvmsg (struct smbdirect_socket *sc) -{ -struct smbdirect_recv_io *recvmsg =NULL ; -unsigned long flags; - -spin_lock_irqsave (&sc->recv_io.free.lock, flags); -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_irqrestore (&sc->recv_io.free.lock, flags); -return recvmsg; -} - -static void put_recvmsg (struct smbdirect_socket *sc, -struct smbdirect_recv_io *recvmsg) -{ -unsigned long flags; - -if (likely (recvmsg->sge.length !=0 )) { -ib_dma_unmap_single (sc->ib.dev, - recvmsg->sge.addr, - recvmsg->sge.length, -DMA_FROM_DEVICE ); - recvmsg->sge.length =0 ; - } - -spin_lock_irqsave (&sc->recv_io.free.lock, flags); -list_add (&recvmsg->list, &sc->recv_io.free.list); -spin_unlock_irqrestore (&sc->recv_io.free.lock, flags); - -queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); -} -static void enqueue_reassembly (struct smbdirect_socket *sc,struct smbdirect_recv_io *recvmsg,int data_length)
@@ -424,7 +387,7 @@ static void free_transport(struct smb_direct_transport *t)if (recvmsg) {list_del (&recvmsg->list);spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg); }else {spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); }
@@ -543,7 +506,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sp = &sc->parameters;if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);if (wc->status !=IB_WC_WR_FLUSH_ERR ) { pr_err("Recv error. status='%s (%d)' opcode=%d\n", ib_wc_status_msg(wc->status), wc->status,
@@ -571,7 +534,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)switch (sc->recv_io.expected) {case SMBDIRECT_EXPECT_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -584,7 +547,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (!sc->first_error && sc->status ==SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ) sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ;if (SMBDIRECT_CHECK_STATUS_WARN (sc,SMBDIRECT_SOCKET_NEGOTIATE_NEEDED )) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -600,7 +563,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len < offsetof(struct smbdirect_data_transfer , padding)) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -610,7 +573,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) data_offset =le32_to_cpu (data_transfer->data_offset);if (wc->byte_len < data_offset || wc->byte_len < (u64 )data_offset + data_length) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -618,7 +581,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) data_length > sp->max_fragmented_recv_size || (u64)remaining_data_length + (u64)data_length > (u64)sp->max_fragmented_recv_size) { -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED );return ; }
@@ -660,7 +623,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)enqueue_reassembly (sc, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);return ; }
@@ -673,7 +636,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* This is an internal error! */ WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER ); -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); }
@@ -799,7 +762,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); } queue_removed++; -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg); offset =0 ; }else { offset += to_copy;
@@ -843,7 +806,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work)if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target) {while (true) { - recvmsg =get_free_recvmsg (sc); + recvmsg =smbdirect_connection_get_recv_io (sc);if (!recvmsg)break ;
@@ -852,7 +815,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) ret =smb_direct_post_recv (sc, recvmsg);if (ret) {pr_err ("Can't post recv: %d\n" , ret); -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);break ; } credits++;
@@ -1853,7 +1816,7 @@ static int smb_direct_prepare_negotiation(struct smbdirect_socket *sc) sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ; - recvmsg =get_free_recvmsg (sc); + recvmsg =smbdirect_connection_get_recv_io (sc);if (!recvmsg)return -ENOMEM ;
@@ -1879,7 +1842,7 @@ static int smb_direct_prepare_negotiation(struct smbdirect_socket *sc)* will unmap it exactly once. */ if (!recv_posted) -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);return ret; }
@@ -1919,7 +1882,7 @@ static void smb_direct_destroy_pools(struct smbdirect_socket *sc) {struct smbdirect_recv_io *recvmsg; -while ((recvmsg =get_free_recvmsg (sc))) +while ((recvmsg =smbdirect_connection_get_recv_io (sc)))mempool_free (recvmsg, sc->recv_io.mem.pool);mempool_destroy (sc->recv_io.mem.pool);
@@ -2244,7 +2207,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) sc->recv_io.reassembly.queue_length--;list_del (&recvmsg->list);spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); -put_recvmsg (sc, recvmsg); +smbdirect_connection_put_recv_io (recvmsg);if (ret == -ECONNABORTED )return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 104/145 smb: server: make use of smbdirect_connection_reassembly_{append,first}_recv_io()
In reply to Stefan MetzmacherThese are basically copies of enqueue_reassembly() and get_first_reassembly(). The only difference is that sc->statistics.enqueue_reassembly_queue now updated.
--- fs/smb/server/transport_rdma.c | 41 +++++----------------------------- 1 file changed, 6 insertions(+), 35 deletions(-)
fs/smb/server/transport_rdma.c +6 -35
@@ -215,35 +215,6 @@ static inline voidreturn (void *)recvmsg->packet; } -static void enqueue_reassembly (struct smbdirect_socket *sc, -struct smbdirect_recv_io *recvmsg, -int data_length) -{ -unsigned long flags; - -spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); -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 -* reassembly_data_length is checked without a lock to determine -* if reassembly_queue_length and list is up to date -*/ -virt_wmb (); - sc->recv_io.reassembly.data_length += data_length; -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); -} - -static struct smbdirect_recv_io *get_first_reassembly (struct smbdirect_socket *sc) -{ -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 ; -} -static void smb_direct_send_immediate_work (struct work_struct *work) { struct smbdirect_socket *sc =
@@ -383,7 +354,7 @@ static void free_transport(struct smb_direct_transport *t)unsigned long flags;spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); - recvmsg =get_first_reassembly (sc); + recvmsg =smbdirect_connection_reassembly_first_recv_io (sc);if (recvmsg) {list_del (&recvmsg->list);spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags);
@@ -552,7 +523,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ; -enqueue_reassembly (sc, recvmsg,0 ); +smbdirect_connection_reassembly_append_recv_io (sc, recvmsg,0 );wake_up (&sc->status_wait);return ;case SMBDIRECT_EXPECT_DATA_TRANSFER : {
@@ -620,7 +591,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (sc->recv_io.credits.target > old_recv_credit_target)queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); -enqueue_reassembly (sc, recvmsg, (int )data_length); +smbdirect_connection_reassembly_append_recv_io (sc, recvmsg, data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else smbdirect_connection_put_recv_io (recvmsg);
@@ -706,7 +677,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,/* * Need to make sure reassembly_data_length is read before * reading reassembly_queue_length and calling -* get_first_reassembly. This call is lock free +* smbdirect_connection_reassembly_first_recv_io. This call is lock free * as we never read at the end of the queue which are being * updated in SOFTIRQ as more data is received */
@@ -716,7 +687,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, to_read = size; offset = sc->recv_io.reassembly.first_entry_offset;while (data_read < size) { - recvmsg =get_first_reassembly (sc); + recvmsg =smbdirect_connection_reassembly_first_recv_io (sc); data_transfer =smbdirect_recv_io_payload (recvmsg); data_length =le32_to_cpu (data_transfer->data_length); remaining_data_length =
@@ -2181,7 +2152,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)if (ret <=0 || sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING )return ret <0 ? ret : -ETIMEDOUT ; - recvmsg =get_first_reassembly (sc); + recvmsg =smbdirect_connection_reassembly_first_recv_io (sc);if (!recvmsg)return -ECONNABORTED ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 105/145 smb: server: make use of smbdirect_connection_idle_timer_work()
In reply to Stefan MetzmacherThis is basically a copy of smb_direct_idle_connection_timer(). The only difference is that we had no logging before.
Note smbdirect_socket_prepare_create() already calls INIT_DELAYED_WORK().
--- fs/smb/server/transport_rdma.c | 26 -------------------------- 1 file changed, 26 deletions(-)
fs/smb/server/transport_rdma.c +0 -26
@@ -226,30 +226,6 @@ static void smb_direct_send_immediate_work(struct work_struct *work)smb_direct_post_send_data (sc,NULL ,NULL ,0 ,0 ); } -static void smb_direct_idle_connection_timer (struct work_struct *work) -{ -struct smbdirect_socket *sc = - container_of(work, struct smbdirect_socket, idle.timer_work.work); -struct smbdirect_socket_parameters *sp = &sc->parameters; - -if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) { -smbdirect_socket_schedule_cleanup (sc, -ETIMEDOUT ); -return ; - } - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return ; - -/* -* Now use the keepalive timeout (instead of keepalive interval) -* in order to wait for a response -*/ - sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, -msecs_to_jiffies (sp->keepalive_timeout_msec)); -queue_work (sc->workqueue, &sc->idle.immediate_work); -} -static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) {struct smb_direct_transport *t;
@@ -292,8 +268,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.dev = sc->rdma.cm_id->device; -INIT_DELAYED_WORK (&sc->idle.timer_work, smb_direct_idle_connection_timer); - conn =ksmbd_conn_alloc ();if (!conn) goto err;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 106/145 smb: server: make use of smbdirect_frwr_is_supported()
In reply to Stefan MetzmacherThis is an exact copy of rdma_frwr_is_supported().
--- fs/smb/server/transport_rdma.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
fs/smb/server/transport_rdma.c +3 -12
@@ -2212,15 +2212,6 @@ static int smb_direct_connect(struct smbdirect_socket *sc)return 0 ; } -static bool rdma_frwr_is_supported (struct ib_device_attr *attrs) -{ -if (!(attrs->device_cap_flags &IB_DEVICE_MEM_MGT_EXTENSIONS )) -return false; -if (attrs->max_fast_reg_page_list_len ==0 ) -return false; -return true; -} -static int smb_direct_handle_connect_request (struct rdma_cm_id *new_cm_id,struct rdma_cm_event *event) {
@@ -2232,7 +2223,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id,u8 peer_responder_resources;int ret; -if (!rdma_frwr_is_supported (&new_cm_id->device->attrs)) { +if (!smbdirect_frwr_is_supported (&new_cm_id->device->attrs)) {ksmbd_debug (RDMA ,"Fast Registration Work Requests is not supported. device capabilities=%llx\n" , new_cm_id->device->attrs.device_cap_flags);
@@ -2394,7 +2385,7 @@ static int smb_direct_ib_client_add(struct ib_device *ib_dev)if (ib_dev->node_type !=RDMA_NODE_IB_CA ) smb_direct_port =SMB_DIRECT_PORT_IWARP ; -if (!rdma_frwr_is_supported (&ib_dev->attrs)) +if (!smbdirect_frwr_is_supported (&ib_dev->attrs))return 0 ; smb_dev =kzalloc (sizeof (*smb_dev),KSMBD_DEFAULT_GFP );
@@ -2518,7 +2509,7 @@ static bool ksmbd_find_rdma_capable_netdev(struct net_device *netdev) ibdev =ib_device_get_by_netdev (netdev,RDMA_DRIVER_UNKNOWN );if (ibdev) { - rdma_capable =rdma_frwr_is_supported (&ibdev->attrs); + rdma_capable =smbdirect_frwr_is_supported (&ibdev->attrs);ib_device_put (ibdev); } }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 107/145 smb: server: make use of smbdirect_connection_{alloc,free}_send_io()
In reply to Stefan MetzmacherThese are basically copies of smb_direct_{alloc,free}_sendmsg() just a bit simpler and with the gfp_mask mask abstracted.
For now we still use KSMBD_DEFAULT_GFP, which includes __GFP_RETRY_MAYFAIL.
The only difference is that we use ib_dma_unmap_page() for all sges, this simplifies the logic and doesn't matter as ib_dma_unmap_single() and ib_dma_unmap_page() both operate on dma_addr_t and dma_unmap_single_attrs() is just an alias for dma_unmap_page_attrs().
We already had such an inconsistency in the client
code where we use ib_dma_unmap_single(), while we mapped using ib_dma_map_page().
--- fs/smb/server/transport_rdma.c | 58 +++++++--------------------------- 1 file changed, 11 insertions(+), 47 deletions(-)
fs/smb/server/transport_rdma.c +11 -47
@@ -258,6 +258,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)smbdirect_socket_set_logging (sc,NULL , smb_direct_logging_needed, smb_direct_logging_vaprintf); + sc->send_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ;/* * from here we operate on the copy. */
@@ -354,43 +355,6 @@ static void free_transport(struct smb_direct_transport *t)ksmbd_conn_free (KSMBD_TRANS (t)->conn); } -static struct smbdirect_send_io -*smb_direct_alloc_sendmsg (struct smbdirect_socket *sc) -{ -struct smbdirect_send_io *msg; - - msg =mempool_alloc (sc->send_io.mem.pool,KSMBD_DEFAULT_GFP ); -if (!msg) -return ERR_PTR (-ENOMEM ); - msg->socket = sc; -INIT_LIST_HEAD (&msg->sibling_list); - msg->num_sge =0 ; -return msg; -} - -static void smb_direct_free_sendmsg (struct smbdirect_socket *sc, -struct smbdirect_send_io *msg) -{ -int i; - -/* -* The list needs to be empty! -* The caller should take care of it. -*/ -WARN_ON_ONCE (!list_empty (&msg->sibling_list)); - -if (msg->num_sge >0 ) { -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 (sc->ib.dev, - msg->sge[i].addr, msg->sge[i].length, -DMA_TO_DEVICE ); - } -mempool_free (msg, sc->send_io.mem.pool); -} -static int smb_direct_check_recvmsg (struct smbdirect_recv_io *recvmsg) {struct smbdirect_socket *sc = recvmsg->socket;
@@ -791,11 +755,11 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)*/ list_for_each_entry_safe (sibling, next, &sendmsg->sibling_list, sibling_list) {list_del_init (&sibling->sibling_list); -smb_direct_free_sendmsg (sc, sibling); +smbdirect_connection_free_send_io (sibling); lcredits +=1 ; }/* Note this frees wc->wr_cqe, but not wc */ -smb_direct_free_sendmsg (sc, sendmsg); +smbdirect_connection_free_send_io (sendmsg); lcredits +=1 ;if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_SEND ) {
@@ -918,9 +882,9 @@ static int smb_direct_flush_send_list(struct smbdirect_socket *sc,list_for_each_entry_safe (sibling, next, &last->sibling_list, sibling_list) {list_del_init (&sibling->sibling_list); -smb_direct_free_sendmsg (sc, sibling); +smbdirect_connection_free_send_io (sibling); } -smb_direct_free_sendmsg (sc, last); +smbdirect_connection_free_send_io (last); }return ret;
@@ -1005,7 +969,7 @@ static int smb_direct_create_header(struct smbdirect_socket *sc,int header_length;int ret; - sendmsg =smb_direct_alloc_sendmsg (sc); + sendmsg =smbdirect_connection_alloc_send_io (sc);if (IS_ERR (sendmsg))return PTR_ERR (sendmsg);
@@ -1048,7 +1012,7 @@ static int smb_direct_create_header(struct smbdirect_socket *sc, DMA_TO_DEVICE); ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) { -smb_direct_free_sendmsg (sc, sendmsg); +smbdirect_connection_free_send_io (sendmsg);return ret; }
@@ -1204,7 +1168,7 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, goto err;return 0 ; err: -smb_direct_free_sendmsg (sc, msg); +smbdirect_connection_free_send_io (msg); header_failed:atomic_inc (&sc->send_io.credits.count); credit_failed:
@@ -1644,7 +1608,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc,struct smbdirect_negotiate_resp *resp;int ret; - sendmsg =smb_direct_alloc_sendmsg (sc); + sendmsg =smbdirect_connection_alloc_send_io (sc);if (IS_ERR (sendmsg))return -ENOMEM ;
@@ -1680,7 +1644,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc, DMA_TO_DEVICE); ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) { -smb_direct_free_sendmsg (sc, sendmsg); +smbdirect_connection_free_send_io (sendmsg);return ret; }
@@ -1690,7 +1654,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc, ret =post_sendmsg (sc,NULL , sendmsg);if (ret) { -smb_direct_free_sendmsg (sc, sendmsg); +smbdirect_connection_free_send_io (sendmsg);return ret; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 108/145 smb: server: make use of smbdirect_connection_send_io_done()
In reply to Stefan MetzmacherThis also wakes up send_io.pending.dec_wait_queue, which
is currently always empty in the server, but that might change in future. And we also don't spam the logs on IB_WC_WR_FLUSH_ERR.
--- fs/smb/server/transport_rdma.c | 42 +--------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)
fs/smb/server/transport_rdma.c +1 -41
@@ -737,46 +737,6 @@ static void smb_direct_post_recv_credits(struct work_struct *work)queue_work (sc->workqueue, &sc->idle.immediate_work); } -static void send_done (struct ib_cq *cq,struct ib_wc *wc) -{ -struct smbdirect_send_io *sendmsg, *sibling, *next; -struct smbdirect_socket *sc; -int lcredits =0 ; - - sendmsg = container_of(wc->wr_cqe, struct smbdirect_send_io, cqe); - sc = sendmsg->socket; - -ksmbd_debug (RDMA ,"Send completed. status='%s (%d)', opcode=%d\n" , -ib_wc_status_msg (wc->status), wc->status, - wc->opcode); - -/* -* Free possible siblings and then the main send_io -*/ -list_for_each_entry_safe (sibling, next, &sendmsg->sibling_list, sibling_list) { -list_del_init (&sibling->sibling_list); -smbdirect_connection_free_send_io (sibling); - lcredits +=1 ; - } -/* Note this frees wc->wr_cqe, but not wc */ -smbdirect_connection_free_send_io (sendmsg); - lcredits +=1 ; - -if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_SEND ) { -pr_err ("Send error. status='%s (%d)', opcode=%d\n" , -ib_wc_status_msg (wc->status), wc->status, - wc->opcode); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } - -atomic_add (lcredits, &sc->send_io.lcredits.count); -wake_up (&sc->send_io.lcredits.wait_queue); - -if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.zero_wait_queue); -} -static int manage_credits_prior_sending (struct smbdirect_socket *sc) {int new_credits;
@@ -1079,7 +1039,7 @@ static int post_sendmsg(struct smbdirect_socket *sc, msg->sge[i].addr, msg->sge[i].length, DMA_TO_DEVICE); - msg->cqe.done = send_done; + msg->cqe.done = smbdirect_connection_send_io_done; msg->wr.opcode =IB_WR_SEND ; msg->wr.sg_list = &msg->sge[0 ]; msg->wr.num_sge = msg->num_sge;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 109/145 smb: server: make use of smbdirect_connection_{create,destroy}_mem_pools()
In reply to Stefan MetzmacherThis were based on smb_direct_{create,destroy}_pools() in the server.
The main logical differences are the following:
We now don't use smbdirect_connection_get_recv_io() on cleanup, instead it uses list_for_each_entry_safe()...
We don't generate warnings if smbdirect_recv_io payload is copied into userspace buffers. This doesn't happen in the server anyway.
And it uses list_add_tail() just to let me feel
better when looking at the code...
--- fs/smb/server/transport_rdma.c | 78 ++-------------------------------- 1 file changed, 3 insertions(+), 75 deletions(-)
fs/smb/server/transport_rdma.c +3 -75
@@ -202,7 +202,6 @@ static inline int get_buf_page_count(void *buf, int size) (uintptr_t )buf /PAGE_SIZE ; } -static void smb_direct_destroy_pools (struct smbdirect_socket *sc);static void smb_direct_post_recv_credits (struct work_struct *work); static int smb_direct_post_send_data(struct smbdirect_socket *sc, struct smbdirect_send_batch *send_ctx,
@@ -259,6 +258,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) smb_direct_logging_needed, smb_direct_logging_vaprintf); sc->send_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; + sc->recv_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ;/* * from here we operate on the copy. */
@@ -351,7 +351,7 @@ static void free_transport(struct smb_direct_transport *t)rdma_destroy_id (sc->rdma.cm_id); } -smb_direct_destroy_pools (sc); +smbdirect_connection_destroy_mem_pools (sc);ksmbd_conn_free (KSMBD_TRANS (t)->conn); }
@@ -1747,78 +1747,6 @@ static int smb_direct_init_params(struct smbdirect_socket *sc)return 0 ; } -static void smb_direct_destroy_pools (struct smbdirect_socket *sc) -{ -struct smbdirect_recv_io *recvmsg; - -while ((recvmsg =smbdirect_connection_get_recv_io (sc))) -mempool_free (recvmsg, sc->recv_io.mem.pool); - -mempool_destroy (sc->recv_io.mem.pool); - sc->recv_io.mem.pool =NULL ; - -kmem_cache_destroy (sc->recv_io.mem.cache); - sc->recv_io.mem.cache =NULL ; - -mempool_destroy (sc->send_io.mem.pool); - sc->send_io.mem.pool =NULL ; - -kmem_cache_destroy (sc->send_io.mem.cache); - sc->send_io.mem.cache =NULL ; -} - -static int smb_direct_create_pools (struct smbdirect_socket *sc) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -char name[80 ]; -int i; -struct smbdirect_recv_io *recvmsg; - -snprintf (name,sizeof (name),"smbdirect_send_io_pool_%p" , sc); - sc->send_io.mem.cache =kmem_cache_create (name, -sizeof (struct smbdirect_send_io ) + -sizeof (struct smbdirect_negotiate_resp ), -0 ,SLAB_HWCACHE_ALIGN ,NULL ); -if (!sc->send_io.mem.cache) -return -ENOMEM ; - - sc->send_io.mem.pool =mempool_create (sp->send_credit_target, - mempool_alloc_slab, mempool_free_slab, - sc->send_io.mem.cache); -if (!sc->send_io.mem.pool) - goto err; - -snprintf (name,sizeof (name),"smbdirect_recv_io_pool_%p" , sc); - sc->recv_io.mem.cache =kmem_cache_create (name, -sizeof (struct smbdirect_recv_io ) + - sp->max_recv_size, -0 ,SLAB_HWCACHE_ALIGN ,NULL ); -if (!sc->recv_io.mem.cache) - goto err; - - sc->recv_io.mem.pool = -mempool_create (sp->recv_credit_max, mempool_alloc_slab, - mempool_free_slab, sc->recv_io.mem.cache); -if (!sc->recv_io.mem.pool) - goto err; - -for (i =0 ; i < sp->recv_credit_max; i++) { - recvmsg =mempool_alloc (sc->recv_io.mem.pool,KSMBD_DEFAULT_GFP ); -if (!recvmsg) - goto err; - recvmsg->socket = sc; - recvmsg->sge.length =0 ; -INIT_WORK (&recvmsg->complex_work, __smbdirect_socket_disabled_work); -disable_work_sync (&recvmsg->complex_work); -list_add (&recvmsg->list, &sc->recv_io.free.list); - } - -return 0 ; -err: -smb_direct_destroy_pools (sc); -return -ENOMEM ; -} -static u32 smb_direct_rdma_rw_send_wrs (struct ib_device *dev,const struct ib_qp_init_attr *attr) {/*
@@ -2116,7 +2044,7 @@ static int smb_direct_connect(struct smbdirect_socket *sc)return ret; } - ret =smb_direct_create_pools (sc); + ret =smbdirect_connection_create_mem_pools (sc);if (ret) {pr_err ("Can't init RDMA pool: %d\n" , ret);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 110/145 smb: server: make use of smbdirect_map_sges_from_iter()
In reply to Stefan MetzmacherIt will make it easier to move stuff into common code when both client and server use smbdirect_map_sges_from_iter().
--- fs/smb/server/transport_rdma.c | 58 +++++++++++----------------------- 1 file changed, 19 insertions(+), 39 deletions(-)
fs/smb/server/transport_rdma.c +19 -39
@@ -1016,18 +1016,6 @@ static int get_sg_list(void *buf, int size, struct scatterlist *sg_list, int nenreturn i; } -static int get_mapped_sg_list (struct ib_device *device,void *buf,int size, -struct scatterlist *sg_list,int nentries, -enum dma_data_direction dir) -{ -int npages; - - npages =get_sg_list (buf, size, sg_list, nentries); -if (npages <0 ) -return -EINVAL ; -return ib_dma_map_sg (device, sg_list, npages, dir); -} -static int post_sendmsg (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct smbdirect_send_io *msg)
@@ -1071,10 +1059,9 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, struct kvec *iov, int niov, int remaining_data_length) { - int i, j, ret; + int i, ret;struct smbdirect_send_io *msg;int data_length; -struct scatterlist sg[SMBDIRECT_SEND_IO_MAX_SGE -1 ]; ret =wait_for_send_lcredit (sc, send_ctx);if (ret)
@@ -1093,34 +1080,27 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,if (ret) goto header_failed; -for (i =0 ; i < niov; i++) { -struct ib_sge *sge; -int sg_cnt; - -sg_init_table (sg,SMBDIRECT_SEND_IO_MAX_SGE -1 ); - sg_cnt =get_mapped_sg_list (sc->ib.dev, - iov[i].iov_base, iov[i].iov_len, - sg,SMBDIRECT_SEND_IO_MAX_SGE -1 , -DMA_TO_DEVICE ); -if (sg_cnt <=0 ) { -pr_err ("failed to map buffer\n" ); - ret = -ENOMEM ; +if (data_length) { +struct smbdirect_map_sges extract = { + .num_sge = msg->num_sge, + .max_sge =ARRAY_SIZE (msg->sge), + .sge = msg->sge, + .device = sc->ib.dev, + .local_dma_lkey = sc->ib.pd->local_dma_lkey, + .direction =DMA_TO_DEVICE , + }; +struct iov_iter iter; + +iov_iter_kvec (&iter,ITER_SOURCE , iov, niov, data_length); + + ret =smbdirect_map_sges_from_iter (&iter, data_length, &extract); +if (ret <0 ) goto err; - }else if (sg_cnt + msg->num_sge >SMBDIRECT_SEND_IO_MAX_SGE ) { -pr_err ("buffer not fitted into sges\n" ); - ret = -E2BIG ; -ib_dma_unmap_sg (sc->ib.dev, sg, sg_cnt, -DMA_TO_DEVICE ); +if (WARN_ON_ONCE (ret != data_length)) { + ret = -EIO ; goto err; } - -for (j =0 ; j < sg_cnt; j++) { - sge = &msg->sge[msg->num_sge]; - sge->addr =sg_dma_address (&sg[j]); - sge->length =sg_dma_len (&sg[j]); - sge->lkey = sc->ib.pd->local_dma_lkey; - msg->num_sge++; - } + msg->num_sge = extract.num_sge; } ret =post_sendmsg (sc, send_ctx, msg);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 111/145 smb: server: make use of smbdirect_connection_qp_event_handler()
In reply to Stefan MetzmacherThis is a copy of smb_direct_qpair_handler()...
It will allow more code to be moved to common functions soon.
--- fs/smb/server/transport_rdma.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
fs/smb/server/transport_rdma.c +1 -18
@@ -1523,23 +1523,6 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,return 0 ; } -static void smb_direct_qpair_handler (struct ib_event *event,void *context) -{ -struct smbdirect_socket *sc = context; - -ksmbd_debug (RDMA ,"Received QP event. cm_id=%p, event=%s (%d)\n" , - sc->rdma.cm_id,ib_event_msg (event->event), event->event); - -switch (event->event) { -case IB_EVENT_CQ_ERR : -case IB_EVENT_QP_FATAL : -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -break ; -default : -break ; - } -} -static int smb_direct_send_negotiate_response (struct smbdirect_socket *sc,int failed) {
@@ -1888,7 +1871,7 @@ static int smb_direct_create_qpair(struct smbdirect_socket *sc)* again if max_rdma_ctxs is not 0. */ memset (&qp_attr,0 ,sizeof (qp_attr)); - qp_attr.event_handler = smb_direct_qpair_handler; + qp_attr.event_handler = smbdirect_connection_qp_event_handler; qp_attr.qp_context = sc; qp_attr.cap = qp_cap; qp_attr.sq_sig_type =IB_SIGNAL_REQ_WR ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 112/145 smb: server: make use of smbdirect_connection_negotiate_rdma_resources()
In reply to Stefan MetzmacherIt's good to have this logic in a central place, it will allow us share more code soon.
--- fs/smb/server/transport_rdma.c | 62 ++++------------------------------ 1 file changed, 7 insertions(+), 55 deletions(-)
fs/smb/server/transport_rdma.c +7 -55
@@ -2051,66 +2051,18 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, sc = &t->socket; sp = &sc->parameters; - peer_initiator_depth = event->param.conn.initiator_depth; - peer_responder_resources = event->param.conn.responder_resources; -if (rdma_protocol_iwarp (new_cm_id->device, new_cm_id->port_num) && - event->param.conn.private_data_len ==8 ) { -/* -* Legacy clients with only iWarp MPA v1 support -* need a private blob in order to negotiate -* the IRD/ORD values. -*/ -const __be32 *ird_ord_hdr = event->param.conn.private_data; -u32 ird32 =be32_to_cpu (ird_ord_hdr[0 ]); -u32 ord32 =be32_to_cpu (ird_ord_hdr[1 ]); - -/* -* cifs.ko sends the legacy IRD/ORD negotiation -* event if iWarp MPA v2 was used. -* -* Here we check that the values match and only -* mark the client as legacy if they don't match. -*/ -if ((u32 )event->param.conn.initiator_depth != ird32 || - (u32 )event->param.conn.responder_resources != ord32) { -/* -* There are broken clients (old cifs.ko) -* using little endian and also -* struct rdma_conn_param only uses u8 -* for initiator_depth and responder_resources, -* so we truncate the value to U8_MAX. -* -* smb_direct_accept_client() will then -* do the real negotiation in order to -* select the minimum between client and -* server. -*/ - ird32 =min_t (u32, ird32,U8_MAX ); - ord32 =min_t (u32, ord32,U8_MAX ); - - sc->rdma.legacy_iwarp = true; - peer_initiator_depth = (u8 )ird32; - peer_responder_resources = (u8 )ord32; - } - } -/* * First set what the we as server are able to support */ sp->initiator_depth =min_t (u8, sp->initiator_depth, - new_cm_id->device->attrs.max_qp_rd_atom); + sc->ib.dev->attrs.max_qp_rd_atom); -/* -* negotiate the value by using the minimum -* between client and server if the client provided -* non 0 values. -*/ -if (peer_initiator_depth !=0 ) - sp->initiator_depth =min_t (u8, sp->initiator_depth, - peer_initiator_depth); -if (peer_responder_resources !=0 ) - sp->responder_resources =min_t (u8, sp->responder_resources, - peer_responder_resources); + peer_initiator_depth = event->param.conn.initiator_depth; + peer_responder_resources = event->param.conn.responder_resources; +smbdirect_connection_negotiate_rdma_resources (sc, + peer_initiator_depth, + peer_responder_resources, + &event->param.conn); ret =smb_direct_connect (sc);if (ret)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 113/145 smb: server: make use of smbdirect_connection_{create,destroy}_qp()
In reply to Stefan MetzmacherIt's good a use common code for this and it will allow us to share more code in the next steps.
Calling ib_drain_qp() twice is ok.
--- fs/smb/server/transport_rdma.c | 217 +-------------------------------- 1 file changed, 6 insertions(+), 211 deletions(-)
fs/smb/server/transport_rdma.c +6 -211
@@ -257,6 +257,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)smbdirect_socket_set_logging (sc,NULL , smb_direct_logging_needed, smb_direct_logging_vaprintf); + sc->ib.poll_ctx =IB_POLL_WORKQUEUE ; sc->send_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; sc->recv_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ;/*
@@ -318,11 +319,8 @@ static void free_transport(struct smb_direct_transport *t)if (sc->rdma.cm_id)rdma_lock_handler (sc->rdma.cm_id); -if (sc->ib.qp) { +if (sc->ib.qp)ib_drain_qp (sc->ib.qp); - sc->ib.qp =NULL ; -rdma_destroy_qp (sc->rdma.cm_id); - }ksmbd_debug (RDMA ,"drain the reassembly queue\n" ); do {
@@ -340,12 +338,7 @@ static void free_transport(struct smb_direct_transport *t) }while (recvmsg); sc->recv_io.reassembly.data_length =0 ; -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); +smbdirect_connection_destroy_qp (sc);if (sc->rdma.cm_id) {rdma_unlock_handler (sc->rdma.cm_id);rdma_destroy_id (sc->rdma.cm_id);
@@ -1710,206 +1703,6 @@ static int smb_direct_init_params(struct smbdirect_socket *sc)return 0 ; } -static u32 smb_direct_rdma_rw_send_wrs (struct ib_device *dev,const struct ib_qp_init_attr *attr) -{ -/* -* This could be split out of rdma_rw_init_qp() -* and be a helper function next to rdma_rw_mr_factor() -* -* We can't check unlikely(rdma_rw_force_mr) here, -* but that is most likely 0 anyway. -*/ -u32 factor; - -WARN_ON_ONCE (attr->port_num ==0 ); - -/* -* Each context needs at least one RDMA READ or WRITE WR. -* -* For some hardware we might need more, eventually we should ask the -* HCA driver for a multiplier here. -*/ - factor =1 ; - -/* -* If the device needs MRs to perform RDMA READ or WRITE operations, -* we'll need two additional MRs for the registrations and the -* invalidation. -*/ -if (rdma_protocol_iwarp (dev, attr->port_num) || dev->attrs.max_sgl_rd) - factor +=2 ;/* inv + reg */ - -return factor * attr->cap.max_rdma_ctxs; -} - -static int smb_direct_create_qpair (struct smbdirect_socket *sc) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -int ret; -struct ib_qp_cap qp_cap; -struct ib_qp_init_attr qp_attr; -u32 max_send_wr; -u32 rdma_send_wr; - -/* -* Note that {rdma,ib}_create_qp() will call -* rdma_rw_init_qp() if cap->max_rdma_ctxs is not 0. -* It will adjust cap->max_send_wr to the required -* number of additional WRs for the RDMA RW operations. -* It will cap cap->max_send_wr to the device limit. -* -* +1 for ib_drain_qp -*/ - qp_cap.max_send_wr = sp->send_credit_target +1 ; - qp_cap.max_recv_wr = sp->recv_credit_max +1 ; - qp_cap.max_send_sge =SMBDIRECT_SEND_IO_MAX_SGE ; - qp_cap.max_recv_sge =SMBDIRECT_RECV_IO_MAX_SGE ; - qp_cap.max_inline_data =0 ; - qp_cap.max_rdma_ctxs = sc->rw_io.credits.max; - -/* -* Find out the number of max_send_wr -* after rdma_rw_init_qp() adjusted it. -* -* We only do it on a temporary variable, -* as rdma_create_qp() will trigger -* rdma_rw_init_qp() again. -*/ -memset (&qp_attr,0 ,sizeof (qp_attr)); - qp_attr.cap = qp_cap; - qp_attr.port_num = sc->rdma.cm_id->port_num; - rdma_send_wr =smb_direct_rdma_rw_send_wrs (sc->ib.dev, &qp_attr); - max_send_wr = qp_cap.max_send_wr + rdma_send_wr; - -if (qp_cap.max_send_wr > sc->ib.dev->attrs.max_cqe || - qp_cap.max_send_wr > sc->ib.dev->attrs.max_qp_wr) { -pr_err ("Possible CQE overrun: max_send_wr %d\n" , - qp_cap.max_send_wr); -pr_err ("device %.*s reporting max_cqe %d max_qp_wr %d\n" , -IB_DEVICE_NAME_MAX , - sc->ib.dev->name, - sc->ib.dev->attrs.max_cqe, - sc->ib.dev->attrs.max_qp_wr); -pr_err ("consider lowering send_credit_target = %d\n" , - sp->send_credit_target); -return -EINVAL ; - } - -if (qp_cap.max_rdma_ctxs && - (max_send_wr >= sc->ib.dev->attrs.max_cqe || - max_send_wr >= sc->ib.dev->attrs.max_qp_wr)) { -pr_err ("Possible CQE overrun: rdma_send_wr %d + max_send_wr %d = %d\n" , - rdma_send_wr, qp_cap.max_send_wr, max_send_wr); -pr_err ("device %.*s reporting max_cqe %d max_qp_wr %d\n" , -IB_DEVICE_NAME_MAX , - sc->ib.dev->name, - sc->ib.dev->attrs.max_cqe, - sc->ib.dev->attrs.max_qp_wr); -pr_err ("consider lowering send_credit_target = %d, max_rdma_ctxs = %d\n" , - sp->send_credit_target, qp_cap.max_rdma_ctxs); -return -EINVAL ; - } - -if (qp_cap.max_recv_wr > sc->ib.dev->attrs.max_cqe || - qp_cap.max_recv_wr > sc->ib.dev->attrs.max_qp_wr) { -pr_err ("Possible CQE overrun: max_recv_wr %d\n" , - qp_cap.max_recv_wr); -pr_err ("device %.*s reporting max_cqe %d max_qp_wr %d\n" , -IB_DEVICE_NAME_MAX , - sc->ib.dev->name, - sc->ib.dev->attrs.max_cqe, - sc->ib.dev->attrs.max_qp_wr); -pr_err ("consider lowering receive_credit_max = %d\n" , - sp->recv_credit_max); -return -EINVAL ; - } - -if (qp_cap.max_send_sge > sc->ib.dev->attrs.max_send_sge || - qp_cap.max_recv_sge > sc->ib.dev->attrs.max_recv_sge) { -pr_err ("device %.*s max_send_sge/max_recv_sge = %d/%d too small\n" , -IB_DEVICE_NAME_MAX , - sc->ib.dev->name, - sc->ib.dev->attrs.max_send_sge, - sc->ib.dev->attrs.max_recv_sge); -return -EINVAL ; - } - - 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 (sc->ib.pd); - sc->ib.pd =NULL ; -return ret; - } - - sc->ib.send_cq =ib_alloc_cq_any (sc->ib.dev, sc, - max_send_wr, -IB_POLL_WORKQUEUE ); -if (IS_ERR (sc->ib.send_cq)) { -pr_err ("Can't create RDMA send CQ\n" ); - ret =PTR_ERR (sc->ib.send_cq); - sc->ib.send_cq =NULL ; - goto err; - } - - sc->ib.recv_cq =ib_alloc_cq_any (sc->ib.dev, sc, - qp_cap.max_recv_wr, -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); - sc->ib.recv_cq =NULL ; - goto err; - } - -/* -* We reset completely here! -* As the above use was just temporary -* to calc max_send_wr and rdma_send_wr. -* -* rdma_create_qp() will trigger rdma_rw_init_qp() -* again if max_rdma_ctxs is not 0. -*/ -memset (&qp_attr,0 ,sizeof (qp_attr)); - qp_attr.event_handler = smbdirect_connection_qp_event_handler; - qp_attr.qp_context = sc; - qp_attr.cap = qp_cap; - qp_attr.sq_sig_type =IB_SIGNAL_REQ_WR ; - qp_attr.qp_type =IB_QPT_RC ; - 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 (sc->rdma.cm_id, sc->ib.pd, &qp_attr); -if (ret) { -pr_err ("Can't create RDMA QP: %d\n" , ret); - goto err; - } - - sc->ib.qp = sc->rdma.cm_id->qp; - sc->rdma.cm_id->event_handler = smb_direct_cm_handler; - -return 0 ; -err: -if (sc->ib.qp) { - sc->ib.qp =NULL ; -rdma_destroy_qp (sc->rdma.cm_id); - } -if (sc->ib.recv_cq) { -ib_destroy_cq (sc->ib.recv_cq); - sc->ib.recv_cq =NULL ; - } -if (sc->ib.send_cq) { -ib_destroy_cq (sc->ib.send_cq); - sc->ib.send_cq =NULL ; - } -if (sc->ib.pd) { -ib_dealloc_pd (sc->ib.pd); - sc->ib.pd =NULL ; - } -return ret; -} -static int smb_direct_prepare (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t);
@@ -2001,6 +1794,8 @@ static int smb_direct_connect(struct smbdirect_socket *sc) {int ret; + sc->rdma.cm_id->event_handler = smb_direct_cm_handler; + ret =smb_direct_init_params (sc);if (ret) {pr_err ("Can't configure RDMA parameters\n" );
@@ -2013,7 +1808,7 @@ static int smb_direct_connect(struct smbdirect_socket *sc)return ret; } - ret =smb_direct_create_qpair (sc); + ret =smbdirect_connection_create_qp (sc);if (ret) {pr_err ("Can't accept RDMA client: %d\n" , ret);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 114/145 smb: server: initialize recv_io->cqe.done = recv_done just once
In reply to Stefan Metzmachersmbdirect_recv_io structures are pre-allocated so we can set the callback function just once.
This will make it easy to move smb_direct_post_recv to common code soon.
--- fs/smb/server/transport_rdma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/smb/server/transport_rdma.c +4 -1
@@ -558,7 +558,6 @@ static int smb_direct_post_recv(struct smbdirect_socket *sc,return ret; recvmsg->sge.length = sp->max_recv_size; recvmsg->sge.lkey = sc->ib.pd->local_dma_lkey; - recvmsg->cqe.done = recv_done; wr.wr_cqe = &recvmsg->cqe; wr.next =NULL ;
@@ -1792,6 +1791,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)static int smb_direct_connect (struct smbdirect_socket *sc) { +struct smbdirect_recv_io *recv_io;int ret; sc->rdma.cm_id->event_handler = smb_direct_cm_handler;
@@ -1808,6 +1808,9 @@ static int smb_direct_connect(struct smbdirect_socket *sc)return ret; } +list_for_each_entry (recv_io, &sc->recv_io.free.list, list) + recv_io->cqe.done = recv_done; + ret =smbdirect_connection_create_qp (sc);if (ret) {pr_err ("Can't accept RDMA client: %d\n" , ret);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 115/145 smb: server: make use of smbdirect_connection_post_recv_io()
In reply to Stefan MetzmacherThe only difference is that smbdirect_connection_post_recv_io() returns early if the connection is already broken.
--- fs/smb/server/transport_rdma.c | 39 ++-------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-)
fs/smb/server/transport_rdma.c +2 -37
@@ -542,41 +542,6 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); } -static int smb_direct_post_recv (struct smbdirect_socket *sc, -struct smbdirect_recv_io *recvmsg) -{ -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, - 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 = sp->max_recv_size; - recvmsg->sge.lkey = sc->ib.pd->local_dma_lkey; - - wr.wr_cqe = &recvmsg->cqe; - wr.next =NULL ; - wr.sg_list = &recvmsg->sge; - wr.num_sge =1 ; - - ret =ib_post_recv (sc->ib.qp, &wr,NULL ); -if (ret) { -pr_err ("Can't post recv: %d\n" , ret); -ib_dma_unmap_single (sc->ib.dev, - recvmsg->sge.addr, recvmsg->sge.length, -DMA_FROM_DEVICE ); - recvmsg->sge.length =0 ; -smbdirect_socket_schedule_cleanup (sc, ret); -return ret; - } -return ret; -} -static int smb_direct_read (struct ksmbd_transport *t,char *buf,unsigned int size,int unused) {
@@ -713,7 +678,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) recvmsg->first_segment = false; - ret =smb_direct_post_recv (sc, recvmsg); + ret =smbdirect_connection_post_recv_io (recvmsg);if (ret) {pr_err ("Can't post recv: %d\n" , ret);smbdirect_connection_put_recv_io (recvmsg);
@@ -1644,7 +1609,7 @@ static int smb_direct_prepare_negotiation(struct smbdirect_socket *sc)if (!recvmsg)return -ENOMEM ; - ret =smb_direct_post_recv (sc, recvmsg); + ret =smbdirect_connection_post_recv_io (recvmsg);if (ret) {pr_err ("Can't post recv: %d\n" , ret); goto out_err;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 116/145 smb: server: make use of smbdirect_connection_recv_io_refill[_work]()
In reply to Stefan MetzmacherThis is basically a copy of smb_direct_post_recv_credits(), but there are several improvements compared to the existing function:
1. We calculate the number of missing posted buffers by getting the difference between recv_io.credits.target and recv_io.posted.count.
Instead of the difference between recv_io.credits.target and recv_io.credits.count, because recv_io.credits.count is only updated once a message is send to the peer.
It was not really a problem before, because we have a fixed number smbdirect_recv_io buffers, so the loop terminated when smbdirect_connection_get_recv_io() returns NULL.
But using recv_io.posted.count makes it easier to understand.
2. In order to tell the peer about the newly posted buffer and grant the credits, we only trigger the send immediate when we're not granting only the last possible credit.
This is mostly a difference relative to the servers smb_direct_post_recv_credits() implementation, which should avoid useless ping pong messages.
--- fs/smb/server/transport_rdma.c | 53 +++++++--------------------------- 1 file changed, 10 insertions(+), 43 deletions(-)
fs/smb/server/transport_rdma.c +10 -43
@@ -202,7 +202,6 @@ static inline int get_buf_page_count(void *buf, int size) (uintptr_t )buf /PAGE_SIZE ; } -static void smb_direct_post_recv_credits (struct work_struct *work); static int smb_direct_post_send_data(struct smbdirect_socket *sc, struct smbdirect_send_batch *send_ctx, struct kvec *iov, int niov,
@@ -662,38 +661,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, goto again; } -static void smb_direct_post_recv_credits (struct work_struct *work) -{ -struct smbdirect_socket *sc = - container_of(work, struct smbdirect_socket, recv_io.posted.refill_work); -struct smbdirect_recv_io *recvmsg; -int credits =0 ; -int ret; - -if (atomic_read (&sc->recv_io.credits.count) < sc->recv_io.credits.target) { -while (true) { - recvmsg =smbdirect_connection_get_recv_io (sc); -if (!recvmsg) -break ; - - recvmsg->first_segment = false; - - ret =smbdirect_connection_post_recv_io (recvmsg); -if (ret) { -pr_err ("Can't post recv: %d\n" , ret); -smbdirect_connection_put_recv_io (recvmsg); -break ; - } - credits++; - -atomic_inc (&sc->recv_io.posted.count); - } - } - -if (credits) -queue_work (sc->workqueue, &sc->idle.immediate_work); -} -static int manage_credits_prior_sending (struct smbdirect_socket *sc) {int new_credits;
@@ -1734,24 +1701,24 @@ static int smb_direct_prepare(struct ksmbd_transport *t)/* * We negotiated with success, so we need to refill the recv queue. -* We do that with sc->idle.immediate_work still being disabled -* via smbdirect_socket_init(), so that queue_work(sc->workqueue, -* &sc->idle.immediate_work) in smb_direct_post_recv_credits() -* is a no-op. * * The message that grants the credits to the client is * the negotiate response. */ -INIT_WORK (&sc->recv_io.posted.refill_work, smb_direct_post_recv_credits); -smb_direct_post_recv_credits (&sc->recv_io.posted.refill_work); -if (unlikely (sc->first_error)) -return sc->first_error; -INIT_WORK (&sc->idle.immediate_work, smb_direct_send_immediate_work); + ret =smbdirect_connection_recv_io_refill (sc); +if (ret <0 ) +return ret; + ret =0 ; respond: ret =smb_direct_send_negotiate_response (sc, ret); +if (ret) +return ret; -return ret; +INIT_WORK (&sc->recv_io.posted.refill_work, smbdirect_connection_recv_io_refill_work); +INIT_WORK (&sc->idle.immediate_work, smb_direct_send_immediate_work); + +return 0 ; }static int smb_direct_connect (struct smbdirect_socket *sc)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 117/145 smb: server: make use of smbdirect_get_buf_page_count()
In reply to Stefan MetzmacherThis will allow us to move code into common code between client and server soon.
--- fs/smb/server/transport_rdma.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
fs/smb/server/transport_rdma.c +6 -12
@@ -196,12 +196,6 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)return sp->max_read_write_size; } -static inline int get_buf_page_count (void *buf,int size) -{ -return DIV_ROUND_UP ((uintptr_t )buf + size,PAGE_SIZE ) - - (uintptr_t )buf /PAGE_SIZE ; -} - static int smb_direct_post_send_data(struct smbdirect_socket *sc, struct smbdirect_send_batch *send_ctx, struct kvec *iov, int niov,
@@ -839,7 +833,7 @@ static int wait_for_rw_credits(struct smbdirect_socket *sc, int credits)static int calc_rw_credits (struct smbdirect_socket *sc,char *buf,unsigned int len) { -return DIV_ROUND_UP (get_buf_page_count (buf, len), +return DIV_ROUND_UP (smbdirect_get_buf_page_count (buf, len), sc->rw_io.credits.num_pages); }
@@ -915,7 +909,7 @@ static int get_sg_list(void *buf, int size, struct scatterlist *sg_list, int nenint offset, len;int i =0 ; -if (size <=0 || nentries <get_buf_page_count (buf, size)) +if (size <=0 || nentries <smbdirect_get_buf_page_count (buf, size))return -EINVAL ; offset =offset_in_page (buf);
@@ -1106,7 +1100,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, v->iov_len =min_t (size_t, iov[iov_idx].iov_len - iov_ofs, possible_bytes); - page_count =get_buf_page_count (v->iov_base, v->iov_len); + page_count =smbdirect_get_buf_page_count (v->iov_base, v->iov_len);if (page_count > possible_vecs) {/* * If the number of pages in the buffer
@@ -1135,7 +1129,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,size_t elen =min_t (size_t, v->iov_len - fplen, epages*PAGE_SIZE ); v->iov_len = fplen + elen; - page_count =get_buf_page_count (v->iov_base, v->iov_len); + page_count =smbdirect_get_buf_page_count (v->iov_base, v->iov_len);if (WARN_ON_ONCE (page_count > possible_vecs)) {/* * Something went wrong in the above
@@ -1300,7 +1294,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, msg->sgt.sgl = &msg->sg_list[0 ]; ret =sg_alloc_table_chained (&msg->sgt, -get_buf_page_count (desc_buf, desc_buf_len), +smbdirect_get_buf_page_count (desc_buf, desc_buf_len), msg->sg_list,SG_CHUNK_SIZE );if (ret) { ret = -ENOMEM ;
@@ -1314,7 +1308,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, ret = rdma_rw_ctx_init(&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, msg->sgt.sgl, - get_buf_page_count(desc_buf, desc_buf_len), + smbdirect_get_buf_page_count(desc_buf, desc_buf_len), 0, le64_to_cpu(desc[i].offset), le32_to_cpu(desc[i].token),
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 118/145 smb: server: make use of smbdirect_socket_wait_for_credits()
In reply to Stefan MetzmacherThis will allow us to share more common code between client and server soon.
--- fs/smb/server/transport_rdma.c | 48 +++++++++++++--------------------- 1 file changed, 18 insertions(+), 30 deletions(-)
fs/smb/server/transport_rdma.c +18 -30
@@ -768,27 +768,6 @@ static int smb_direct_flush_send_list(struct smbdirect_socket *sc,return ret; } -static int wait_for_credits (struct smbdirect_socket *sc, -wait_queue_head_t *waitq,atomic_t *total_credits, -int needed) -{ -int ret; - -do { -if (atomic_sub_return (needed, total_credits) >=0 ) -return 0 ; - -atomic_add (needed, total_credits); - ret =wait_event_interruptible (*waitq, -atomic_read (total_credits) >= needed || - sc->status !=SMBDIRECT_SOCKET_CONNECTED ); - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return -ENOTCONN ; -else if (ret <0 ) -return ret; - }while (true); -}static int wait_for_send_lcredit (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx)
@@ -801,10 +780,12 @@ static int wait_for_send_lcredit(struct smbdirect_socket *sc,return ret; } -return wait_for_credits (sc, - &sc->send_io.lcredits.wait_queue, - &sc->send_io.lcredits.count, -1 ); +return smbdirect_socket_wait_for_credits (sc, +SMBDIRECT_SOCKET_CONNECTED , + -ENOTCONN , + &sc->send_io.lcredits.wait_queue, + &sc->send_io.lcredits.count, +1 ); } static int wait_for_send_credits(struct smbdirect_socket *sc,
@@ -819,15 +800,22 @@ static int wait_for_send_credits(struct smbdirect_socket *sc,return ret; } -return wait_for_credits (sc, &sc->send_io.credits.wait_queue, &sc->send_io.credits.count,1 ); +return smbdirect_socket_wait_for_credits (sc, +SMBDIRECT_SOCKET_CONNECTED , + -ENOTCONN , + &sc->send_io.credits.wait_queue, + &sc->send_io.credits.count, +1 ); }static int wait_for_rw_credits (struct smbdirect_socket *sc,int credits) { -return wait_for_credits (sc, - &sc->rw_io.credits.wait_queue, - &sc->rw_io.credits.count, - credits); +return smbdirect_socket_wait_for_credits (sc, +SMBDIRECT_SOCKET_CONNECTED , + -ENOTCONN , + &sc->rw_io.credits.wait_queue, + &sc->rw_io.credits.count, + credits); } static int calc_rw_credits(struct smbdirect_socket *sc,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 119/145 smb: server: make use of functions from smbdirect_rw.c
In reply to Stefan MetzmacherThe copied code only got new names, some indentation/formatting changes, some variable names are changed too.
They also only use struct smbdirect_socket instead of struct smb_direct_transport.
But the logic is still the same.
--- fs/smb/server/transport_rdma.c | 236 ++------------------------------- 1 file changed, 11 insertions(+), 225 deletions(-)
fs/smb/server/transport_rdma.c +11 -225
@@ -253,6 +253,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sc->ib.poll_ctx =IB_POLL_WORKQUEUE ; sc->send_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; sc->recv_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; + sc->rw_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ;/* * from here we operate on the copy. */
@@ -808,23 +809,6 @@ static int wait_for_send_credits(struct smbdirect_socket *sc, 1); } -static int wait_for_rw_credits (struct smbdirect_socket *sc,int credits) -{ -return smbdirect_socket_wait_for_credits (sc, -SMBDIRECT_SOCKET_CONNECTED , - -ENOTCONN , - &sc->rw_io.credits.wait_queue, - &sc->rw_io.credits.count, - credits); -} - -static int calc_rw_credits (struct smbdirect_socket *sc, -char *buf,unsigned int len) -{ -return DIV_ROUND_UP (smbdirect_get_buf_page_count (buf, len), - sc->rw_io.credits.num_pages); -} -static int smb_direct_create_header (struct smbdirect_socket *sc,int size,int remaining_data_length,struct smbdirect_send_io **sendmsg_out)
@@ -890,38 +874,6 @@ static int smb_direct_create_header(struct smbdirect_socket *sc,return 0 ; } -static int get_sg_list (void *buf,int size,struct scatterlist *sg_list,int nentries) -{ -bool high =is_vmalloc_addr (buf); -struct page *page; -int offset, len; -int i =0 ; - -if (size <=0 || nentries <smbdirect_get_buf_page_count (buf, size)) -return -EINVAL ; - - offset =offset_in_page (buf); - buf -= offset; -while (size >0 ) { - len =min_t (int,PAGE_SIZE - offset, size); -if (high) - page =vmalloc_to_page (buf); -else - page =kmap_to_page (buf); - -if (!sg_list) -return -EINVAL ; -sg_set_page (sg_list, page, len, offset); - sg_list =sg_next (sg_list); - - buf +=PAGE_SIZE ; - size -= len; - offset =0 ; - i++; - } -return i; -} -static int post_sendmsg (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct smbdirect_send_io *msg)
@@ -1171,185 +1123,16 @@ static int smb_direct_writev(struct ksmbd_transport *t,return ret; } -static void smb_direct_free_rdma_rw_msg (struct smb_direct_transport *t, -struct smbdirect_rw_io *msg, -enum dma_data_direction dir) -{ -struct smbdirect_socket *sc = &t->socket; - -rdma_rw_ctx_destroy (&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, - msg->sgt.sgl, msg->sgt.nents, dir); -sg_free_table_chained (&msg->sgt,SG_CHUNK_SIZE ); -kfree (msg); -} - -static void read_write_done (struct ib_cq *cq,struct ib_wc *wc, -enum dma_data_direction dir) -{ -struct smbdirect_rw_io *msg = - container_of(wc->wr_cqe, struct smbdirect_rw_io, cqe); -struct smbdirect_socket *sc = msg->socket; - -if (wc->status !=IB_WC_SUCCESS ) { - msg->error = -EIO ; -pr_err ("read/write error. opcode = %d, status = %s(%d)\n" , - wc->opcode,ib_wc_status_msg (wc->status), wc->status); -if (wc->status !=IB_WC_WR_FLUSH_ERR ) -smbdirect_socket_schedule_cleanup (sc, msg->error); - } - -complete (msg->completion); -} - -static void read_done (struct ib_cq *cq,struct ib_wc *wc) -{ -read_write_done (cq, wc,DMA_FROM_DEVICE ); -} - -static void write_done (struct ib_cq *cq,struct ib_wc *wc) -{ -read_write_done (cq, wc,DMA_TO_DEVICE ); -} - -static int smb_direct_rdma_xmit (struct smb_direct_transport *t, -void *buf,int buf_len, -struct smbdirect_buffer_descriptor_v1 *desc, -unsigned int desc_len, -bool is_read) -{ -struct smbdirect_socket *sc = &t->socket; -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_rw_io *msg, *next_msg; -int i, ret; -DECLARE_COMPLETION_ONSTACK (completion); -struct ib_send_wr *first_wr; -LIST_HEAD (msg_list); -char *desc_buf; -int credits_needed; -unsigned int desc_buf_len, desc_num =0 ; - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return -ENOTCONN ; - -if (buf_len > sp->max_read_write_size) -return -EINVAL ; - -/* calculate needed credits */ - credits_needed =0 ; - desc_buf = buf; -for (i =0 ; i < desc_len /sizeof (*desc); i++) { -if (!buf_len) -break ; - - desc_buf_len =le32_to_cpu (desc[i].length); -if (!desc_buf_len) -return -EINVAL ; - -if (desc_buf_len > buf_len) { - desc_buf_len = buf_len; - desc[i].length =cpu_to_le32 (desc_buf_len); - buf_len =0 ; - } - - credits_needed +=calc_rw_credits (sc, desc_buf, desc_buf_len); - desc_buf += desc_buf_len; - buf_len -= desc_buf_len; - desc_num++; - } - -ksmbd_debug (RDMA ,"RDMA %s, len %#x, needed credits %#x\n" , -str_read_write (is_read), buf_len, credits_needed); - - ret =wait_for_rw_credits (sc, credits_needed); -if (ret <0 ) -return ret; - -/* build rdma_rw_ctx for each descriptor */ - desc_buf = buf; -for (i =0 ; i < desc_num; i++) { - msg =kzalloc (struct_size (msg, sg_list,SG_CHUNK_SIZE ), -KSMBD_DEFAULT_GFP ); -if (!msg) { - ret = -ENOMEM ; - goto out; - } - - desc_buf_len =le32_to_cpu (desc[i].length); - - msg->socket = sc; - msg->cqe.done = is_read ? read_done : write_done; - msg->completion = &completion; - - msg->sgt.sgl = &msg->sg_list[0 ]; - ret =sg_alloc_table_chained (&msg->sgt, -smbdirect_get_buf_page_count (desc_buf, desc_buf_len), - msg->sg_list,SG_CHUNK_SIZE ); -if (ret) { - ret = -ENOMEM ; - goto free_msg; - } - - ret =get_sg_list (desc_buf, desc_buf_len, - msg->sgt.sgl, msg->sgt.orig_nents); -if (ret <0 ) - goto free_table; - - ret =rdma_rw_ctx_init (&msg->rdma_ctx, sc->ib.qp, sc->ib.qp->port, - msg->sgt.sgl, -smbdirect_get_buf_page_count (desc_buf, desc_buf_len), -0 , -le64_to_cpu (desc[i].offset), -le32_to_cpu (desc[i].token), - is_read ?DMA_FROM_DEVICE :DMA_TO_DEVICE ); -if (ret <0 ) { -pr_err ("failed to init rdma_rw_ctx: %d\n" , ret); - goto free_table; - } - -list_add_tail (&msg->list, &msg_list); - desc_buf += desc_buf_len; - } - -/* 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->rdma_ctx, sc->ib.qp, sc->ib.qp->port, - &msg->cqe, first_wr); - } - - 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; - } - - msg = list_last_entry(&msg_list, struct smbdirect_rw_io, list); -wait_for_completion (&completion); - ret = msg->error; -out: -list_for_each_entry_safe (msg, next_msg, &msg_list, list) { -list_del (&msg->list); -smb_direct_free_rdma_rw_msg (t, msg, - is_read ?DMA_FROM_DEVICE :DMA_TO_DEVICE ); - } -atomic_add (credits_needed, &sc->rw_io.credits.count); -wake_up (&sc->rw_io.credits.wait_queue); -return ret; - -free_table: -sg_free_table_chained (&msg->sgt,SG_CHUNK_SIZE ); -free_msg: -kfree (msg); - goto out; -} -static int smb_direct_rdma_write (struct ksmbd_transport *t,void *buf,unsigned int buflen,struct smbdirect_buffer_descriptor_v1 *desc,unsigned int desc_len) { -return smb_direct_rdma_xmit (SMBD_TRANS (t), buf, buflen, - desc, desc_len, false); +struct smb_direct_transport *st =SMBD_TRANS (t); +struct smbdirect_socket *sc = &st->socket; + +return smbdirect_connection_rdma_xmit (sc, buf, buflen, + desc, desc_len, false); } static int smb_direct_rdma_read(struct ksmbd_transport *t,
@@ -1357,8 +1140,11 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t, struct smbdirect_buffer_descriptor_v1 *desc, unsigned int desc_len) { - return smb_direct_rdma_xmit(SMBD_TRANS(t), buf, buflen, -desc ,desc_len ,true ); +struct smb_direct_transport *st =SMBD_TRANS (t); +struct smbdirect_socket *sc = &st->socket; + +return smbdirect_connection_rdma_xmit (sc, buf, buflen, + desc, desc_len, true); }static void smb_direct_disconnect (struct ksmbd_transport *t)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 120/145 smb: server: make use of smbdirect_socket_destroy_sync()
In reply to Stefan MetzmacherThis is basically the same logic as before, but we now use common code, which will also be used by the server soon.
--- fs/smb/server/transport_rdma.c | 49 +--------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-)
fs/smb/server/transport_rdma.c +1 -48
@@ -289,56 +289,9 @@ 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 smbdirect_recv_io *recvmsg; - -disable_work_sync (&sc->disconnect_work); -if (sc->status <SMBDIRECT_SOCKET_DISCONNECTING ) -smbdirect_socket_cleanup_work (&sc->disconnect_work); -if (sc->status <SMBDIRECT_SOCKET_DISCONNECTED ) -wait_event (sc->status_wait, sc->status ==SMBDIRECT_SOCKET_DISCONNECTED ); - -/* -* Wake up all waiters in all wait queues -* in order to notice the broken connection. -* -* Most likely this was already called via -* smbdirect_socket_cleanup_work(), but call it again... -*/ -smbdirect_socket_wake_up_all (sc); - -disable_work_sync (&sc->recv_io.posted.refill_work); -disable_delayed_work_sync (&sc->idle.timer_work); -disable_work_sync (&sc->idle.immediate_work); - -if (sc->rdma.cm_id) -rdma_lock_handler (sc->rdma.cm_id); -if (sc->ib.qp) -ib_drain_qp (sc->ib.qp); - -ksmbd_debug (RDMA ,"drain the reassembly queue\n" ); -do { -unsigned long flags; - -spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); - recvmsg =smbdirect_connection_reassembly_first_recv_io (sc); -if (recvmsg) { -list_del (&recvmsg->list); -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); -smbdirect_connection_put_recv_io (recvmsg); - }else { -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); - } - }while (recvmsg); - sc->recv_io.reassembly.data_length =0 ; - -smbdirect_connection_destroy_qp (sc); -if (sc->rdma.cm_id) { -rdma_unlock_handler (sc->rdma.cm_id); -rdma_destroy_id (sc->rdma.cm_id); - } +smbdirect_socket_destroy_sync (sc); -smbdirect_connection_destroy_mem_pools (sc);ksmbd_conn_free (KSMBD_TRANS (t)->conn); }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 121/145 smb: server: make use of smbdirect_connection_recvmsg()
In reply to Stefan MetzmacherThis is basically the same logic, it just operates on iov_iter_kvec() instead of a raw buffer pointer. This allows us to use common code between client and server.
We keep returning -EINTR instead of -ERESTARTSYS if wait_event_interruptible() fails. I don't if this is required, but changing it is a task for another patch.
--- fs/smb/server/transport_rdma.c | 128 +++------------------------------ 1 file changed, 11 insertions(+), 117 deletions(-)
fs/smb/server/transport_rdma.c +11 -117
@@ -201,12 +201,6 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, struct kvec *iov, int niov, int remaining_data_length); -static inline void -*smbdirect_recv_io_payload (struct smbdirect_recv_io *recvmsg) -{ -return (void *)recvmsg->packet; -} -static void smb_direct_send_immediate_work (struct work_struct *work) { struct smbdirect_socket *sc =
@@ -492,121 +486,21 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)static int smb_direct_read (struct ksmbd_transport *t,char *buf,unsigned int size,int unused) { -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; -int rc;struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket; +struct msghdr msg = { .msg_flags =0 , }; +struct kvec iov = { + .iov_base = buf, + .iov_len = size, + }; +int ret; -again: -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { -pr_err ("disconnected\n" ); -return -ENOTCONN ; - } - -/* -* No need to hold the reassembly queue lock all the time as we are -* 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 (sc->recv_io.reassembly.data_length >= size) { -int queue_length; -int queue_removed =0 ; -unsigned long flags; - -/* -* Need to make sure reassembly_data_length is read before -* reading reassembly_queue_length and calling -* smbdirect_connection_reassembly_first_recv_io. This call is lock free -* as we never read at the end of the queue which are being -* updated in SOFTIRQ as more data is received -*/ -virt_rmb (); - queue_length = sc->recv_io.reassembly.queue_length; - data_read =0 ; - to_read = size; - offset = sc->recv_io.reassembly.first_entry_offset; -while (data_read < size) { - recvmsg =smbdirect_connection_reassembly_first_recv_io (sc); - 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); - data_offset =le32_to_cpu (data_transfer->data_offset); - -/* -* The upper layer expects RFC1002 length at the -* beginning of the payload. Return it to indicate -* the total length of the packet. This minimize the -* change to upper layer packet processing logic. This -* will be eventually remove when an intermediate -* transport layer is added -*/ -if (recvmsg->first_segment && size ==4 ) { -unsigned int rfc1002_len = - data_length + remaining_data_length; - *((__be32 *)buf) =cpu_to_be32 (rfc1002_len); - data_read =4 ; - recvmsg->first_segment = false; -ksmbd_debug (RDMA , -"returning rfc1002 length %d\n" , - rfc1002_len); - goto read_rfc1002_done; - } - - to_copy =min_t (int, data_length - offset, to_read); -memcpy (buf + data_read, (char *)data_transfer + data_offset + offset, - to_copy); - -/* move on to the next buffer? */ -if (to_copy == data_length - offset) { - queue_length--; -/* -* No need to lock if we are not at the -* end of the queue -*/ -if (queue_length) { -list_del (&recvmsg->list); - }else { -spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); -list_del (&recvmsg->list); -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); - } - queue_removed++; -smbdirect_connection_put_recv_io (recvmsg); - offset =0 ; - }else { - offset += to_copy; - } - - to_read -= to_copy; - data_read += to_copy; - } - -spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); - sc->recv_io.reassembly.data_length -= data_read; - sc->recv_io.reassembly.queue_length -= queue_removed; -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); - - 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, 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 (sc->recv_io.reassembly.wait_queue, - sc->recv_io.reassembly.data_length >= size || - sc->status !=SMBDIRECT_SOCKET_CONNECTED ); -if (rc) -return -EINTR ; +iov_iter_kvec (&msg.msg_iter,ITER_DEST , &iov,1 , size); - goto again; + ret =smbdirect_connection_recvmsg (sc, &msg,0 ); +if (ret == -ERESTARTSYS ) + ret = -EINTR ; +return ret; }static int manage_credits_prior_sending (struct smbdirect_socket *sc)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 122/145 smb: server: make use of smbdirect_connection_grant_recv_credits()
In reply to Stefan MetzmacherThis is already used by the client too and will help to share more common code.
--- fs/smb/server/transport_rdma.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-)
fs/smb/server/transport_rdma.c +4 -21
@@ -503,25 +503,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,return ret; } -static int manage_credits_prior_sending (struct smbdirect_socket *sc) -{ -int new_credits; - -if (atomic_read (&sc->recv_io.credits.count) >= sc->recv_io.credits.target) -return 0 ; - - new_credits =atomic_read (&sc->recv_io.posted.count); -if (new_credits ==0 ) -return 0 ; - - new_credits -=atomic_read (&sc->recv_io.credits.count); -if (new_credits <=0 ) -return 0 ; - -atomic_add (new_credits, &sc->recv_io.credits.count); -return new_credits; -} -static int manage_keep_alive_before_sending (struct smbdirect_socket *sc) {struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -663,6 +644,7 @@ static int smb_direct_create_header(struct smbdirect_socket *sc,struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_send_io *sendmsg;struct smbdirect_data_transfer *packet; +u16 new_credits =0 ;int header_length;int ret;
@@ -673,7 +655,8 @@ static int smb_direct_create_header(struct smbdirect_socket *sc,/* Fill in the packet header */ packet = (struct smbdirect_data_transfer *)sendmsg->packet; packet->credits_requested =cpu_to_le16 (sp->send_credit_target); - packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (sc)); + new_credits =smbdirect_connection_grant_recv_credits (sc); + packet->credits_granted =cpu_to_le16 (new_credits); packet->flags =0 ;if (manage_keep_alive_before_sending (sc))
@@ -1090,7 +1073,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc, resp->reserved =0 ; resp->credits_requested =cpu_to_le16 (sp->send_credit_target); - resp->credits_granted =cpu_to_le16 (manage_credits_prior_sending (sc)); + resp->credits_granted =cpu_to_le16 (smbdirect_connection_grant_recv_credits (sc)); 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);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 123/145 smb: server: make use of smbdirect_connection_request_keep_alive()
In reply to Stefan MetzmacherThis will help to share more common code soon.
--- fs/smb/server/transport_rdma.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-)
fs/smb/server/transport_rdma.c +1 -18
@@ -503,23 +503,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,return ret; } -static int manage_keep_alive_before_sending (struct smbdirect_socket *sc) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; - -if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) { - sc->idle.keepalive =SMBDIRECT_KEEPALIVE_SENT ; -/* -* Now use the keepalive timeout (instead of keepalive interval) -* in order to wait for a response -*/ -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, -msecs_to_jiffies (sp->keepalive_timeout_msec)); -return 1 ; - } -return 0 ; -} -static int smb_direct_post_send (struct smbdirect_socket *sc,struct ib_send_wr *wr) {
@@ -659,7 +642,7 @@ static int smb_direct_create_header(struct smbdirect_socket *sc, packet->credits_granted =cpu_to_le16 (new_credits); packet->flags =0 ; -if (manage_keep_alive_before_sending (sc)) +if (smbdirect_connection_request_keep_alive (sc)) packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); packet->reserved =0 ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 124/145 smb: server: move iov_iter_kvec() out of smb_direct_post_send_data()
In reply to Stefan MetzmacherThis will allow us to make the code more generic in order to move it to common with the client.
--- fs/smb/server/transport_rdma.c | 38 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-)
fs/smb/server/transport_rdma.c +20 -18
@@ -198,8 +198,8 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)static int smb_direct_post_send_data (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx, -struct kvec *iov,int niov, -int remaining_data_length); +struct iov_iter *iter, +size_t *remaining_data_length);static void smb_direct_send_immediate_work (struct work_struct *work) {
@@ -209,7 +209,7 @@ static void smb_direct_send_immediate_work(struct work_struct *work)if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ; -smb_direct_post_send_data (sc,NULL ,NULL ,0 ,0 ); +smb_direct_post_send_data (sc,NULL ,NULL ,NULL ); }static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id)
@@ -727,12 +727,13 @@ static int post_sendmsg(struct smbdirect_socket *sc,static int smb_direct_post_send_data (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx, -struct kvec *iov,int niov, -int remaining_data_length) +struct iov_iter *iter, +size_t *_remaining_data_length) { -int i, ret;struct smbdirect_send_io *msg; -int data_length; +u32 remaining_data_length =0 ; +u32 data_length =0 ; +int ret; ret =wait_for_send_lcredit (sc, send_ctx);if (ret)
@@ -742,16 +743,20 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,if (ret) goto credit_failed; - data_length =0 ; -for (i =0 ; i < niov; i++) - data_length += iov[i].iov_len; +if (iter) + data_length =iov_iter_count (iter); + +if (_remaining_data_length) { + *_remaining_data_length -= data_length; + remaining_data_length = *_remaining_data_length; + } ret =smb_direct_create_header (sc, data_length, remaining_data_length, &msg);if (ret) goto header_failed; -if (data_length) { +if (iter) {struct smbdirect_map_sges extract = { .num_sge = msg->num_sge, .max_sge =ARRAY_SIZE (msg->sge),
@@ -760,11 +765,8 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, .local_dma_lkey = sc->ib.pd->local_dma_lkey, .direction = DMA_TO_DEVICE, }; -struct iov_iter iter; - -iov_iter_kvec (&iter,ITER_SOURCE , iov, niov, data_length); - ret =smbdirect_map_sges_from_iter (&iter, data_length, &extract); + ret =smbdirect_map_sges_from_iter (iter, data_length, &extract);if (ret <0 ) goto err;if (WARN_ON_ONCE (ret != data_length)) {
@@ -824,6 +826,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,size_t possible_vecs;size_t bytes =0 ;size_t nvecs =0 ; +struct iov_iter iter;/* * For the last message remaining_data_length should be
@@ -904,11 +907,10 @@ static int smb_direct_writev(struct ksmbd_transport *t, } } - remaining_data_length -= bytes; +iov_iter_kvec (&iter,ITER_SOURCE , vecs, nvecs, bytes); ret =smb_direct_post_send_data (sc, &send_ctx, - vecs, nvecs, - remaining_data_length); + &iter, &remaining_data_length);if (unlikely (ret)) { error = ret; goto done;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 125/145 smb: server: inline smb_direct_create_header() into smb_direct_post_send_data()
In reply to Stefan MetzmacherThe point is that ib_dma_map_single() is done first, but the 'Fill in the packet header' will be done after smbdirect_map_sges_from_iter().
This will simplify further changes in order to share common code with the client.
--- fs/smb/server/transport_rdma.c | 128 +++++++++++++++------------------ 1 file changed, 57 insertions(+), 71 deletions(-)
fs/smb/server/transport_rdma.c +57 -71
@@ -620,73 +620,6 @@ static int wait_for_send_credits(struct smbdirect_socket *sc, 1); } -static int smb_direct_create_header (struct smbdirect_socket *sc, -int size,int remaining_data_length, -struct smbdirect_send_io **sendmsg_out) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_send_io *sendmsg; -struct smbdirect_data_transfer *packet; -u16 new_credits =0 ; -int header_length; -int ret; - - sendmsg =smbdirect_connection_alloc_send_io (sc); -if (IS_ERR (sendmsg)) -return PTR_ERR (sendmsg); - -/* Fill in the packet header */ - packet = (struct smbdirect_data_transfer *)sendmsg->packet; - packet->credits_requested =cpu_to_le16 (sp->send_credit_target); - new_credits =smbdirect_connection_grant_recv_credits (sc); - packet->credits_granted =cpu_to_le16 (new_credits); - - packet->flags =0 ; -if (smbdirect_connection_request_keep_alive (sc)) - packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); - - packet->reserved =0 ; -if (!size) - packet->data_offset =0 ; -else - packet->data_offset =cpu_to_le32 (24 ); - packet->data_length =cpu_to_le32 (size); - packet->remaining_data_length =cpu_to_le32 (remaining_data_length); - packet->padding =0 ; - -ksmbd_debug (RDMA , -"credits_requested=%d credits_granted=%d data_offset=%d data_length=%d remaining_data_length=%d\n" , -le16_to_cpu (packet->credits_requested), -le16_to_cpu (packet->credits_granted), -le32_to_cpu (packet->data_offset), -le32_to_cpu (packet->data_length), -le32_to_cpu (packet->remaining_data_length)); - -/* Map the packet to DMA */ - header_length =sizeof (struct smbdirect_data_transfer ); -/* If this is a packet without payload, don't send padding */ -if (!size) - header_length = - offsetof(struct smbdirect_data_transfer , padding); - - sendmsg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, - (void *)packet, - header_length, -DMA_TO_DEVICE ); - ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr); -if (ret) { -smbdirect_connection_free_send_io (sendmsg); -return ret; - } - - sendmsg->num_sge =1 ; - sendmsg->sge[0 ].length = header_length; - sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; - - *sendmsg_out = sendmsg; -return 0 ; -} -static int post_sendmsg (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct smbdirect_send_io *msg)
@@ -730,11 +663,22 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,struct iov_iter *iter, size_t *_remaining_data_length) { + const struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_send_io *msg; +struct smbdirect_data_transfer *packet; +size_t header_length; +u16 new_credits =0 ;u32 remaining_data_length =0 ;u32 data_length =0 ;int ret; +if (iter) { + header_length =sizeof (struct smbdirect_data_transfer ); + }else { +/* If this is a packet without payload, don't send padding */ + header_length = offsetof(struct smbdirect_data_transfer , padding); + } + ret =wait_for_send_lcredit (sc, send_ctx);if (ret) goto lcredit_failed;
@@ -751,10 +695,24 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, remaining_data_length = *_remaining_data_length; } - ret =smb_direct_create_header (sc, data_length, remaining_data_length, - &msg); + msg =smbdirect_connection_alloc_send_io (sc); +if (IS_ERR (msg)) { + ret =PTR_ERR (msg); + goto alloc_failed; + } + +/* Map the packet to DMA */ + msg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, + msg->packet, + header_length, +DMA_TO_DEVICE ); + ret =ib_dma_mapping_error (sc->ib.dev, msg->sge[0 ].addr);if (ret) - goto header_failed; + goto err; + + msg->sge[0 ].length = header_length; + msg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; + msg->num_sge =1 ;if (iter) {struct smbdirect_map_sges extract = {
@@ -776,13 +734,41 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, msg->num_sge = extract.num_sge; } +/* Fill in the packet header */ + packet = (struct smbdirect_data_transfer *)msg->packet; + packet->credits_requested =cpu_to_le16 (sp->send_credit_target); + new_credits =smbdirect_connection_grant_recv_credits (sc); + packet->credits_granted =cpu_to_le16 (new_credits); + + packet->flags =0 ; +if (smbdirect_connection_request_keep_alive (sc)) + packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); + + packet->reserved =0 ; +if (!data_length) + packet->data_offset =0 ; +else + packet->data_offset =cpu_to_le32 (24 ); + packet->data_length =cpu_to_le32 (data_length); + packet->remaining_data_length =cpu_to_le32 (remaining_data_length); + packet->padding =0 ; + +ksmbd_debug (RDMA , +"credits_req=%u credits_granted=%u flags=0x%x ofs=%u len=%u remaining=%u\n" , +le16_to_cpu (packet->credits_requested), +le16_to_cpu (packet->credits_granted), +le16_to_cpu (packet->flags), +le32_to_cpu (packet->data_offset), +le32_to_cpu (packet->data_length), +le32_to_cpu (packet->remaining_data_length)); + ret =post_sendmsg (sc, send_ctx, msg);if (ret) goto err;return 0 ; err:smbdirect_connection_free_send_io (msg); -header_failed: +alloc_failed:atomic_inc (&sc->send_io.credits.count); credit_failed:atomic_inc (&sc->send_io.lcredits.count);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 126/145 smb: server: let smbdirect_map_sges_from_iter() truncate the message boundary
In reply to Stefan Metzmachersmbdirect_map_sges_from_iter() already handles the case that only a limited number of sges are available. Its return value is data_length and the remaining bytes in the iter are remaining_data_length.
This is now much easier and will allow us to share more code with the client soon.
--- fs/smb/server/transport_rdma.c | 151 +++++++-------------------------- 1 file changed, 31 insertions(+), 120 deletions(-)
fs/smb/server/transport_rdma.c +31 -120
@@ -199,7 +199,7 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)static int smb_direct_post_send_data (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct iov_iter *iter, -size_t *remaining_data_length); +u32 remaining_data_length);static void smb_direct_send_immediate_work (struct work_struct *work) {
@@ -209,7 +209,7 @@ static void smb_direct_send_immediate_work(struct work_struct *work)if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ; -smb_direct_post_send_data (sc,NULL ,NULL ,NULL ); +smb_direct_post_send_data (sc,NULL ,NULL ,0 ); }static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id)
@@ -661,22 +661,26 @@ static int post_sendmsg(struct smbdirect_socket *sc,static int smb_direct_post_send_data (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct iov_iter *iter, -size_t *_remaining_data_length) +u32 remaining_data_length) {const struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_send_io *msg;struct smbdirect_data_transfer *packet;size_t header_length;u16 new_credits =0 ; -u32 remaining_data_length =0 ;u32 data_length =0 ;int ret;if (iter) { header_length =sizeof (struct smbdirect_data_transfer ); +if (WARN_ON_ONCE (remaining_data_length ==0 || +iov_iter_count (iter) > remaining_data_length)) +return -EINVAL ; }else {/* If this is a packet without payload, don't send padding */ header_length = offsetof(struct smbdirect_data_transfer , padding); +if (WARN_ON_ONCE (remaining_data_length)) +return -EINVAL ; } ret =wait_for_send_lcredit (sc, send_ctx);
@@ -687,14 +691,6 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,if (ret) goto credit_failed; -if (iter) - data_length =iov_iter_count (iter); - -if (_remaining_data_length) { - *_remaining_data_length -= data_length; - remaining_data_length = *_remaining_data_length; - } - msg =smbdirect_connection_alloc_send_io (sc);if (IS_ERR (msg)) { ret =PTR_ERR (msg);
@@ -723,14 +719,14 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, .local_dma_lkey = sc->ib.pd->local_dma_lkey, .direction = DMA_TO_DEVICE, }; +size_t payload_len =umin (iov_iter_count (iter), + sp->max_send_size -sizeof (*packet)); - ret =smbdirect_map_sges_from_iter (iter, data_length, &extract); + ret =smbdirect_map_sges_from_iter (iter, payload_len, &extract);if (ret <0 ) goto err; -if (WARN_ON_ONCE (ret != data_length)) { - ret = -EIO ; - goto err; - } + data_length = ret; + remaining_data_length -= data_length; msg->num_sge = extract.num_sge; }
@@ -783,13 +779,9 @@ static int smb_direct_writev(struct ksmbd_transport *t,struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket;struct smbdirect_socket_parameters *sp = &sc->parameters; -size_t remaining_data_length; -size_t iov_idx; -size_t iov_ofs; -size_t max_iov_size = sp->max_send_size - -sizeof (struct smbdirect_data_transfer );int ret;struct smbdirect_send_batch send_ctx; +struct iov_iter iter;int error =0 ;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )
@@ -798,112 +790,31 @@ static int smb_direct_writev(struct ksmbd_transport *t,//FIXME: skip RFC1002 header.. if (WARN_ON_ONCE (niovs <=1 || iov[0 ].iov_len !=4 ))return -EINVAL ; - buflen -=4 ; - iov_idx =1 ; - iov_ofs =0 ; - - remaining_data_length = buflen; -ksmbd_debug (RDMA ,"Sending smb (RDMA): smb_len=%u\n" , buflen); - -smb_direct_send_ctx_init (&send_ctx, need_invalidate, remote_key); -while (remaining_data_length) { -struct kvec vecs[SMBDIRECT_SEND_IO_MAX_SGE -1 ];/* minus smbdirect hdr */ -size_t possible_bytes = max_iov_size; -size_t possible_vecs; -size_t bytes =0 ; -size_t nvecs =0 ; -struct iov_iter iter; - -/* -* For the last message remaining_data_length should be -* have been 0 already! -*/ -if (WARN_ON_ONCE (iov_idx >= niovs)) { - error = -EINVAL ; - goto done; - } +iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen); +iov_iter_advance (&iter,4 ); -/* -* We have 2 factors which limit the arguments we pass -* to smb_direct_post_send_data(): -* -* 1. The number of supported sges for the send, -* while one is reserved for the smbdirect header. -* And we currently need one SGE per page. -* 2. The number of negotiated payload bytes per send. -*/ - possible_vecs =min_t (size_t,ARRAY_SIZE (vecs), niovs - iov_idx); - -while (iov_idx < niovs && possible_vecs && possible_bytes) { -struct kvec *v = &vecs[nvecs]; -int page_count; - - v->iov_base = ((u8 *)iov[iov_idx].iov_base) + iov_ofs; - v->iov_len =min_t (size_t, - iov[iov_idx].iov_len - iov_ofs, - possible_bytes); - page_count =smbdirect_get_buf_page_count (v->iov_base, v->iov_len); -if (page_count > possible_vecs) { -/* -* If the number of pages in the buffer -* is to much (because we currently require -* one SGE per page), we need to limit the -* length. -* -* We know possible_vecs is at least 1, -* so we always keep the first page. -* -* We need to calculate the number extra -* pages (epages) we can also keep. -* -* We calculate the number of bytes in the -* first page (fplen), this should never be -* larger than v->iov_len because page_count is -* at least 2, but adding a limitation feels -* better. -* -* Then we calculate the number of bytes (elen) -* we can keep for the extra pages. -*/ -size_t epages = possible_vecs -1 ; -size_t fpofs =offset_in_page (v->iov_base); -size_t fplen =min_t (size_t,PAGE_SIZE - fpofs, v->iov_len); -size_t elen =min_t (size_t, v->iov_len - fplen, epages*PAGE_SIZE ); - - v->iov_len = fplen + elen; - page_count =smbdirect_get_buf_page_count (v->iov_base, v->iov_len); -if (WARN_ON_ONCE (page_count > possible_vecs)) { -/* -* Something went wrong in the above -* logic... -*/ - error = -EINVAL ; - goto done; - } - } - possible_vecs -= page_count; - nvecs +=1 ; - possible_bytes -= v->iov_len; - bytes += v->iov_len; - - iov_ofs += v->iov_len; -if (iov_ofs >= iov[iov_idx].iov_len) { - iov_idx +=1 ; - iov_ofs =0 ; - } - } +/* +* The size must fit into the negotiated +* fragmented send size. +*/ +if (iov_iter_count (&iter) > sp->max_fragmented_send_size) +return -EMSGSIZE ; -iov_iter_kvec (&iter,ITER_SOURCE , vecs, nvecs, bytes); +ksmbd_debug (RDMA ,"Sending smb (RDMA): smb_len=%zu\n" , +iov_iter_count (&iter)); - ret =smb_direct_post_send_data (sc, &send_ctx, - &iter, &remaining_data_length); +smb_direct_send_ctx_init (&send_ctx, need_invalidate, remote_key); +while (iov_iter_count (&iter)) { + ret =smb_direct_post_send_data (sc, + &send_ctx, + &iter, +iov_iter_count (&iter));if (unlikely (ret)) { error = ret; - goto done; +break ; } } -done: ret =smb_direct_flush_send_list (sc, &send_ctx, true);if (unlikely (!ret && error)) ret = error;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 127/145 smb: server: split out smb_direct_send_iter() out of smb_direct_writev()
In reply to Stefan MetzmacherThis will help to move to common code in future.
--- fs/smb/server/transport_rdma.c | 47 +++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 15 deletions(-)
fs/smb/server/transport_rdma.c +32 -15
@@ -772,43 +772,47 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc,return ret; } -static int smb_direct_writev (struct ksmbd_transport *t, -struct kvec *iov,int niovs,int buflen, -bool need_invalidate,unsigned int remote_key) +static int smb_direct_send_iter (struct smbdirect_socket *sc, +struct iov_iter *iter, +bool need_invalidate, +unsigned int remote_key) { -struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int ret;struct smbdirect_send_batch send_ctx; -struct iov_iter iter;int error =0 ; +__be32 hdr;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ; -//FIXME: skip RFC1002 header.. -if (WARN_ON_ONCE (niovs <=1 || iov[0 ].iov_len !=4 )) +/* +* For now we expect the iter to have the full +* message, including a 4 byte length header. +*/ +if (iov_iter_count (iter) <=4 ) +return -EINVAL ; +if (!copy_from_iter_full (&hdr,sizeof (hdr), iter)) +return -EFAULT ; +if (iov_iter_count (iter) !=be32_to_cpu (hdr))return -EINVAL ; -iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen); -iov_iter_advance (&iter,4 );/* * The size must fit into the negotiated * fragmented send size. */ -if (iov_iter_count (&iter) > sp->max_fragmented_send_size) +if (iov_iter_count (iter) > sp->max_fragmented_send_size)return -EMSGSIZE ;ksmbd_debug (RDMA ,"Sending smb (RDMA): smb_len=%zu\n" , -iov_iter_count (&iter)); +iov_iter_count (iter));smb_direct_send_ctx_init (&send_ctx, need_invalidate, remote_key); -while (iov_iter_count (&iter)) { +while (iov_iter_count (iter)) { ret =smb_direct_post_send_data (sc, &send_ctx, - &iter, -iov_iter_count (&iter)); + iter, +iov_iter_count (iter));if (unlikely (ret)) { error = ret;break ;
@@ -835,6 +839,19 @@ static int smb_direct_writev(struct ksmbd_transport *t,return ret; } +static int smb_direct_writev (struct ksmbd_transport *t, +struct kvec *iov,int niovs,int buflen, +bool need_invalidate,unsigned int remote_key) +{ +struct smb_direct_transport *st =SMBD_TRANS (t); +struct smbdirect_socket *sc = &st->socket; +struct iov_iter iter; + +iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen); + +return smb_direct_send_iter (sc, &iter, need_invalidate, remote_key); +} + static int smb_direct_rdma_write(struct ksmbd_transport *t, void *buf, unsigned int buflen, struct smbdirect_buffer_descriptor_v1 *desc,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 128/145 smb: server: let smb_direct_post_send_data() return data_length
In reply to Stefan MetzmacherThis make it easier moving to common code shared with the client.
--- fs/smb/server/transport_rdma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/server/transport_rdma.c +2 -2
@@ -761,7 +761,7 @@ static int smb_direct_post_send_data(struct smbdirect_socket *sc, ret =post_sendmsg (sc, send_ctx, msg);if (ret) goto err; -return 0 ; +return data_length; err:smbdirect_connection_free_send_io (msg); alloc_failed:
@@ -813,7 +813,7 @@ static int smb_direct_send_iter(struct smbdirect_socket *sc, &send_ctx, iter, iov_iter_count(iter)); -if (unlikely (ret)) { +if (unlikely (ret <0 )) { error = ret;break ; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 129/145 smb: server: make use of smbdirect_connection_send_iter() and related functions
In reply to Stefan MetzmacherThis makes use of common code for sending messages, this will allow to make more use of common code in the next commits.
--- fs/smb/server/transport_rdma.c | 359 +-------------------------------- 1 file changed, 4 insertions(+), 355 deletions(-)
fs/smb/server/transport_rdma.c +4 -355
@@ -196,22 +196,6 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)return sp->max_read_write_size; } -static int smb_direct_post_send_data (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx, -struct iov_iter *iter, -u32 remaining_data_length); - -static void smb_direct_send_immediate_work (struct work_struct *work) -{ -struct smbdirect_socket *sc = - container_of(work, struct smbdirect_socket, idle.immediate_work); - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return ; - -smb_direct_post_send_data (sc,NULL ,NULL ,0 ); -} -static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) {struct smb_direct_transport *t;
@@ -503,342 +487,6 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,return ret; } -static int smb_direct_post_send (struct smbdirect_socket *sc, -struct ib_send_wr *wr) -{ -int ret; - -atomic_inc (&sc->send_io.pending.count); - ret =ib_post_send (sc->ib.qp, wr,NULL ); -if (ret) { -pr_err ("failed to post send: %d\n" , ret); -smbdirect_socket_schedule_cleanup (sc, ret); - } -return ret; -} - -static void smb_direct_send_ctx_init (struct smbdirect_send_batch *send_ctx, -bool need_invalidate_rkey, -unsigned int remote_key) -{ -INIT_LIST_HEAD (&send_ctx->msg_list); - send_ctx->wr_cnt =0 ; - send_ctx->need_invalidate_rkey = need_invalidate_rkey; - send_ctx->remote_key = remote_key; -} - -static int smb_direct_flush_send_list (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx, -bool is_last) -{ -struct smbdirect_send_io *first, *last; -int ret; - -if (list_empty (&send_ctx->msg_list)) -return 0 ; - - first =list_first_entry (&send_ctx->msg_list, - struct smbdirect_send_io, - sibling_list); - last =list_last_entry (&send_ctx->msg_list, - struct smbdirect_send_io, - sibling_list); - -if (send_ctx->need_invalidate_rkey) { - first->wr.opcode =IB_WR_SEND_WITH_INV ; - first->wr.ex.invalidate_rkey = send_ctx->remote_key; - send_ctx->need_invalidate_rkey = false; - send_ctx->remote_key =0 ; - } - - last->wr.send_flags =IB_SEND_SIGNALED ; - last->wr.wr_cqe = &last->cqe; - -/* -* Remove last from send_ctx->msg_list -* and splice the rest of send_ctx->msg_list -* to last->sibling_list. -* -* send_ctx->msg_list is a valid empty list -* at the end. -*/ -list_del_init (&last->sibling_list); -list_splice_tail_init (&send_ctx->msg_list, &last->sibling_list); - send_ctx->wr_cnt =0 ; - - ret =smb_direct_post_send (sc, &first->wr); -if (ret) { -struct smbdirect_send_io *sibling, *next; - -list_for_each_entry_safe (sibling, next, &last->sibling_list, sibling_list) { -list_del_init (&sibling->sibling_list); -smbdirect_connection_free_send_io (sibling); - } -smbdirect_connection_free_send_io (last); - } - -return ret; -} - - -static int wait_for_send_lcredit (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx) -{ -if (send_ctx && (atomic_read (&sc->send_io.lcredits.count) <=1 )) { -int ret; - - ret =smb_direct_flush_send_list (sc, send_ctx, false); -if (ret) -return ret; - } - -return smbdirect_socket_wait_for_credits (sc, -SMBDIRECT_SOCKET_CONNECTED , - -ENOTCONN , - &sc->send_io.lcredits.wait_queue, - &sc->send_io.lcredits.count, -1 ); -} - -static int wait_for_send_credits (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx) -{ -int ret; - -if (send_ctx && - (send_ctx->wr_cnt >=16 ||atomic_read (&sc->send_io.credits.count) <=1 )) { - ret =smb_direct_flush_send_list (sc, send_ctx, false); -if (ret) -return ret; - } - -return smbdirect_socket_wait_for_credits (sc, -SMBDIRECT_SOCKET_CONNECTED , - -ENOTCONN , - &sc->send_io.credits.wait_queue, - &sc->send_io.credits.count, -1 ); -} - -static int post_sendmsg (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx, -struct smbdirect_send_io *msg) -{ -int i; - -for (i =0 ; i < msg->num_sge; i++) -ib_dma_sync_single_for_device (sc->ib.dev, - msg->sge[i].addr, msg->sge[i].length, -DMA_TO_DEVICE ); - - msg->cqe.done = smbdirect_connection_send_io_done; - msg->wr.opcode =IB_WR_SEND ; - msg->wr.sg_list = &msg->sge[0 ]; - msg->wr.num_sge = msg->num_sge; - msg->wr.next =NULL ; - -if (send_ctx) { - msg->wr.wr_cqe =NULL ; - msg->wr.send_flags =0 ; -if (!list_empty (&send_ctx->msg_list)) { -struct smbdirect_send_io *last; - - last =list_last_entry (&send_ctx->msg_list, - struct smbdirect_send_io, - sibling_list); - last->wr.next = &msg->wr; - } -list_add_tail (&msg->sibling_list, &send_ctx->msg_list); - send_ctx->wr_cnt++; -return 0 ; - } - - msg->wr.wr_cqe = &msg->cqe; - msg->wr.send_flags =IB_SEND_SIGNALED ; -return smb_direct_post_send (sc, &msg->wr); -} - -static int smb_direct_post_send_data (struct smbdirect_socket *sc, -struct smbdirect_send_batch *send_ctx, -struct iov_iter *iter, -u32 remaining_data_length) -{ -const struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_send_io *msg; -struct smbdirect_data_transfer *packet; -size_t header_length; -u16 new_credits =0 ; -u32 data_length =0 ; -int ret; - -if (iter) { - header_length =sizeof (struct smbdirect_data_transfer ); -if (WARN_ON_ONCE (remaining_data_length ==0 || -iov_iter_count (iter) > remaining_data_length)) -return -EINVAL ; - }else { -/* If this is a packet without payload, don't send padding */ - header_length = offsetof(struct smbdirect_data_transfer , padding); -if (WARN_ON_ONCE (remaining_data_length)) -return -EINVAL ; - } - - ret =wait_for_send_lcredit (sc, send_ctx); -if (ret) - goto lcredit_failed; - - ret =wait_for_send_credits (sc, send_ctx); -if (ret) - goto credit_failed; - - msg =smbdirect_connection_alloc_send_io (sc); -if (IS_ERR (msg)) { - ret =PTR_ERR (msg); - goto alloc_failed; - } - -/* Map the packet to DMA */ - msg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, - msg->packet, - header_length, -DMA_TO_DEVICE ); - ret =ib_dma_mapping_error (sc->ib.dev, msg->sge[0 ].addr); -if (ret) - goto err; - - msg->sge[0 ].length = header_length; - msg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; - msg->num_sge =1 ; - -if (iter) { -struct smbdirect_map_sges extract = { - .num_sge = msg->num_sge, - .max_sge =ARRAY_SIZE (msg->sge), - .sge = msg->sge, - .device = sc->ib.dev, - .local_dma_lkey = sc->ib.pd->local_dma_lkey, - .direction =DMA_TO_DEVICE , - }; -size_t payload_len =umin (iov_iter_count (iter), - sp->max_send_size -sizeof (*packet)); - - ret =smbdirect_map_sges_from_iter (iter, payload_len, &extract); -if (ret <0 ) - goto err; - data_length = ret; - remaining_data_length -= data_length; - msg->num_sge = extract.num_sge; - } - -/* Fill in the packet header */ - packet = (struct smbdirect_data_transfer *)msg->packet; - packet->credits_requested =cpu_to_le16 (sp->send_credit_target); - new_credits =smbdirect_connection_grant_recv_credits (sc); - packet->credits_granted =cpu_to_le16 (new_credits); - - packet->flags =0 ; -if (smbdirect_connection_request_keep_alive (sc)) - packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); - - packet->reserved =0 ; -if (!data_length) - packet->data_offset =0 ; -else - packet->data_offset =cpu_to_le32 (24 ); - packet->data_length =cpu_to_le32 (data_length); - packet->remaining_data_length =cpu_to_le32 (remaining_data_length); - packet->padding =0 ; - -ksmbd_debug (RDMA , -"credits_req=%u credits_granted=%u flags=0x%x ofs=%u len=%u remaining=%u\n" , -le16_to_cpu (packet->credits_requested), -le16_to_cpu (packet->credits_granted), -le16_to_cpu (packet->flags), -le32_to_cpu (packet->data_offset), -le32_to_cpu (packet->data_length), -le32_to_cpu (packet->remaining_data_length)); - - ret =post_sendmsg (sc, send_ctx, msg); -if (ret) - goto err; -return data_length; -err: -smbdirect_connection_free_send_io (msg); -alloc_failed: -atomic_inc (&sc->send_io.credits.count); -credit_failed: -atomic_inc (&sc->send_io.lcredits.count); -lcredit_failed: -return ret; -} - -static int smb_direct_send_iter (struct smbdirect_socket *sc, -struct iov_iter *iter, -bool need_invalidate, -unsigned int remote_key) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -int ret; -struct smbdirect_send_batch send_ctx; -int error =0 ; -__be32 hdr; - -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return -ENOTCONN ; - -/* -* For now we expect the iter to have the full -* message, including a 4 byte length header. -*/ -if (iov_iter_count (iter) <=4 ) -return -EINVAL ; -if (!copy_from_iter_full (&hdr,sizeof (hdr), iter)) -return -EFAULT ; -if (iov_iter_count (iter) !=be32_to_cpu (hdr)) -return -EINVAL ; - -/* -* The size must fit into the negotiated -* fragmented send size. -*/ -if (iov_iter_count (iter) > sp->max_fragmented_send_size) -return -EMSGSIZE ; - -ksmbd_debug (RDMA ,"Sending smb (RDMA): smb_len=%zu\n" , -iov_iter_count (iter)); - -smb_direct_send_ctx_init (&send_ctx, need_invalidate, remote_key); -while (iov_iter_count (iter)) { - ret =smb_direct_post_send_data (sc, - &send_ctx, - iter, -iov_iter_count (iter)); -if (unlikely (ret <0 )) { - error = ret; -break ; - } - } - - ret =smb_direct_flush_send_list (sc, &send_ctx, true); -if (unlikely (!ret && error)) - ret = error; - -/* -* As an optimization, we don't wait for individual I/O to finish -* before sending the next one. -* Send them all and wait for pending send count to get to 0 -* that means all the I/Os have been out and we are good to return -*/ - -wait_event (sc->send_io.pending.zero_wait_queue, -atomic_read (&sc->send_io.pending.count) ==0 || - sc->status !=SMBDIRECT_SOCKET_CONNECTED ); -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED && ret ==0 ) - ret = -ENOTCONN ; - -return ret; -} -static int smb_direct_writev (struct ksmbd_transport *t,struct kvec *iov,int niovs,int buflen,bool need_invalidate,unsigned int remote_key)
@@ -849,7 +497,8 @@ static int smb_direct_writev(struct ksmbd_transport *t,iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen); -return smb_direct_send_iter (sc, &iter, need_invalidate, remote_key); +return smbdirect_connection_send_iter (sc, &iter,0 , + need_invalidate, remote_key); } static int smb_direct_rdma_write(struct ksmbd_transport *t,
@@ -996,7 +645,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc, sendmsg->sge[0 ].length =sizeof (*resp); sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; - ret =post_sendmsg (sc,NULL , sendmsg); + ret =smbdirect_connection_post_send_io (sc,NULL , sendmsg);if (ret) {smbdirect_connection_free_send_io (sendmsg);return ret;
@@ -1213,7 +862,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)return ret;INIT_WORK (&sc->recv_io.posted.refill_work, smbdirect_connection_recv_io_refill_work); -INIT_WORK (&sc->idle.immediate_work, smb_direct_send_immediate_work); +INIT_WORK (&sc->idle.immediate_work, smbdirect_connection_send_immediate_work);return 0 ; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 130/145 smb: server: make use of smbdirect_{socket_init_accepting,connection_wait_for_connected}()
In reply to Stefan MetzmacherThis means we finally only use common functions in the server.
We still use the embedded struct smbdirect_socket and are able to access internals, but the will be removed in the next commits as well.
--- fs/smb/server/transport_rdma.c | 606 ++------------------------------- 1 file changed, 30 insertions(+), 576 deletions(-)
fs/smb/server/transport_rdma.c +30 -576
@@ -17,6 +17,7 @@#include <linux/highmem.h> #include <linux/scatterlist.h> #include <linux/string_choices.h> +#include <linux/errname.h> #include <rdma/ib_verbs.h> #include <rdma/rdma_cm.h> #include <rdma/rw.h>
@@ -184,14 +185,14 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt) {struct smb_direct_transport *t;struct smbdirect_socket *sc; -struct smbdirect_socket_parameters *sp; +const struct smbdirect_socket_parameters *sp;if (kt->ops != &ksmbd_smb_direct_transport_ops)return 0 ; t =SMBD_TRANS (kt); sc = &t->socket; - sp = &sc->parameters; + sp =smbdirect_socket_get_current_parameters (sc);return sp->max_read_write_size; }
@@ -203,6 +204,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)struct smbdirect_socket_parameters init_params = {};struct smbdirect_socket_parameters *sp;struct ksmbd_conn *conn; +int ret;/* * Create the initial parameters
@@ -224,27 +226,25 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)if (!t)return NULL ; sc = &t->socket; -smbdirect_socket_prepare_create (sc, sp, smb_direct_wq); + ret =smbdirect_socket_init_accepting (cm_id, sc); +if (ret) + goto socket_init_failed;smbdirect_socket_set_logging (sc,NULL , smb_direct_logging_needed, smb_direct_logging_vaprintf); - sc->ib.poll_ctx =IB_POLL_WORKQUEUE ; - sc->send_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; - sc->recv_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; - sc->rw_io.mem.gfp_mask =KSMBD_DEFAULT_GFP ; -/* -* from here we operate on the copy. -*/ - sp = &sc->parameters; - - sc->rdma.cm_id = cm_id; - cm_id->context = sc; - - sc->ib.dev = sc->rdma.cm_id->device; + ret =smbdirect_socket_set_initial_parameters (sc, sp); +if (ret) + goto set_params_failed; + ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_WORKQUEUE ,KSMBD_DEFAULT_GFP ); +if (ret) + goto set_settings_failed; + ret =smbdirect_socket_set_custom_workqueue (sc, smb_direct_wq); +if (ret) + goto set_workqueue_failed; conn =ksmbd_conn_alloc ();if (!conn) - goto err; + goto conn_alloc_failed;down_write (&conn_list_lock);hash_add (conn_list, &conn->hlist,0 );
@@ -254,7 +254,12 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)KSMBD_TRANS (t)->conn = conn;KSMBD_TRANS (t)->ops = &ksmbd_smb_direct_transport_ops;return t; -err: + +conn_alloc_failed: +set_workqueue_failed: +set_settings_failed: +set_params_failed: +socket_init_failed:kfree (t);return NULL ; }
@@ -273,200 +278,6 @@ static void free_transport(struct smb_direct_transport *t)ksmbd_conn_free (KSMBD_TRANS (t)->conn); } -static int smb_direct_check_recvmsg (struct smbdirect_recv_io *recvmsg) -{ -struct smbdirect_socket *sc = recvmsg->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 - +le32_to_cpu (req->data_offset)); -ksmbd_debug (RDMA , -"CreditGranted: %u, CreditRequested: %u, DataLength: %u, RemainingDataLength: %u, SMB: %x, Command: %u\n" , -le16_to_cpu (req->credits_granted), -le16_to_cpu (req->credits_requested), - req->data_length, req->remaining_data_length, - hdr->ProtocolId, hdr->Command); -return 0 ; - } -case SMBDIRECT_EXPECT_NEGOTIATE_REQ : { -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), -le16_to_cpu (req->max_version), -le16_to_cpu (req->credits_requested), -le32_to_cpu (req->preferred_send_size), -le32_to_cpu (req->max_receive_size), -le32_to_cpu (req->max_fragmented_size)); -if (le16_to_cpu (req->min_version) >0x0100 || -le16_to_cpu (req->max_version) <0x0100 ) -return -EOPNOTSUPP ; -if (le16_to_cpu (req->credits_requested) <=0 || -le32_to_cpu (req->max_receive_size) <=128 || -le32_to_cpu (req->max_fragmented_size) <= -128 *1024 ) -return -ECONNABORTED ; - -return 0 ; - } -case SMBDIRECT_EXPECT_NEGOTIATE_REP : -/* client only */ -break ; - } - -/* This is an internal error */ -return -EINVAL ; -} - -static void recv_done (struct ib_cq *cq,struct ib_wc *wc) -{ -struct smbdirect_recv_io *recvmsg; -struct smbdirect_socket *sc; -struct smbdirect_socket_parameters *sp; - - recvmsg = container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe); - sc = recvmsg->socket; - sp = &sc->parameters; - -if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) { -smbdirect_connection_put_recv_io (recvmsg); -if (wc->status !=IB_WC_WR_FLUSH_ERR ) { -pr_err ("Recv error. status='%s (%d)' opcode=%d\n" , -ib_wc_status_msg (wc->status), wc->status, - wc->opcode); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); - } -return ; - } - -ksmbd_debug (RDMA ,"Recv completed. status='%s (%d)', opcode=%d\n" , -ib_wc_status_msg (wc->status), wc->status, - wc->opcode); - -ib_dma_sync_single_for_cpu (wc->qp->device, recvmsg->sge.addr, - recvmsg->sge.length,DMA_FROM_DEVICE ); - -/* -* Reset timer to the keepalive interval in -* order to trigger our next keepalive message. -*/ - sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, -msecs_to_jiffies (sp->keepalive_interval_msec)); - -switch (sc->recv_io.expected) { -case SMBDIRECT_EXPECT_NEGOTIATE_REQ : -if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) { -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } - sc->recv_io.reassembly.full_packet_received = true; -/* -* Some drivers (at least mlx5_ib) might post a -* recv completion before RDMA_CM_EVENT_ESTABLISHED, -* we need to adjust our expectation in that case. -*/ -if (!sc->first_error && sc->status ==SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ) - sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ; -if (SMBDIRECT_CHECK_STATUS_WARN (sc,SMBDIRECT_SOCKET_NEGOTIATE_NEEDED )) { -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } - sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ; -smbdirect_connection_reassembly_append_recv_io (sc, recvmsg,0 ); -wake_up (&sc->status_wait); -return ; -case SMBDIRECT_EXPECT_DATA_TRANSFER : { -struct smbdirect_data_transfer *data_transfer = - (struct smbdirect_data_transfer *)recvmsg->packet; -u32 remaining_data_length, data_offset, data_length; -u16 old_recv_credit_target; - -if (wc->byte_len < - offsetof(struct smbdirect_data_transfer , padding)) { -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } - - remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); - data_length =le32_to_cpu (data_transfer->data_length); - data_offset =le32_to_cpu (data_transfer->data_offset); -if (wc->byte_len < data_offset || - wc->byte_len < (u64 )data_offset + data_length) { -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } -if (remaining_data_length > sp->max_fragmented_recv_size || - data_length > sp->max_fragmented_recv_size || - (u64 )remaining_data_length + (u64 )data_length > - (u64 )sp->max_fragmented_recv_size) { -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -return ; - } - -if (data_length) { -if (sc->recv_io.reassembly.full_packet_received) - recvmsg->first_segment = true; - -if (le32_to_cpu (data_transfer->remaining_data_length)) - sc->recv_io.reassembly.full_packet_received = false; -else - sc->recv_io.reassembly.full_packet_received = true; - } - -atomic_dec (&sc->recv_io.posted.count); -atomic_dec (&sc->recv_io.credits.count); - - old_recv_credit_target = sc->recv_io.credits.target; - sc->recv_io.credits.target = -le16_to_cpu (data_transfer->credits_requested); - sc->recv_io.credits.target = -min_t (u16, sc->recv_io.credits.target, sp->recv_credit_max); - sc->recv_io.credits.target = -max_t (u16, sc->recv_io.credits.target,1 ); -atomic_add (le16_to_cpu (data_transfer->credits_granted), - &sc->send_io.credits.count); - -if (le16_to_cpu (data_transfer->flags) & -SMBDIRECT_FLAG_RESPONSE_REQUESTED ) -queue_work (sc->workqueue, &sc->idle.immediate_work); - -if (atomic_read (&sc->send_io.credits.count) >0 ) -wake_up (&sc->send_io.credits.wait_queue); - -if (data_length) { -if (sc->recv_io.credits.target > old_recv_credit_target) -queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); - -smbdirect_connection_reassembly_append_recv_io (sc, recvmsg, data_length); -wake_up (&sc->recv_io.reassembly.wait_queue); - }else -smbdirect_connection_put_recv_io (recvmsg); - -return ; - } -case SMBDIRECT_EXPECT_NEGOTIATE_REP : -/* client only */ -break ; - } - -/* -* This is an internal error! -*/ -WARN_ON_ONCE (sc->recv_io.expected !=SMBDIRECT_EXPECT_DATA_TRANSFER ); -smbdirect_connection_put_recv_io (recvmsg); -smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); -} -static int smb_direct_read (struct ksmbd_transport *t,char *buf,unsigned int size,int unused) {
@@ -542,364 +353,24 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id); -smbdirect_socket_cleanup_work (&sc->disconnect_work); -} - -static int smb_direct_cm_handler (struct rdma_cm_id *cm_id, -struct rdma_cm_event *event) -{ -struct smbdirect_socket *sc = cm_id->context; - -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 : { -/* -* Some drivers (at least mlx5_ib) might post a -* recv completion before RDMA_CM_EVENT_ESTABLISHED, -* we need to adjust our expectation in that case. -* -* As we already started the negotiation, we just -* ignore RDMA_CM_EVENT_ESTABLISHED here. -*/ -if (!sc->first_error && sc->status >SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ) -break ; -if (SMBDIRECT_CHECK_STATUS_DISCONNECT (sc,SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING )) -break ; - sc->status =SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ; -wake_up (&sc->status_wait); -break ; - } -case RDMA_CM_EVENT_DEVICE_REMOVAL : -case RDMA_CM_EVENT_DISCONNECTED : { - sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -smbdirect_socket_cleanup_work (&sc->disconnect_work); -if (sc->ib.qp) -ib_drain_qp (sc->ib.qp); -break ; - } -case RDMA_CM_EVENT_CONNECT_ERROR : { - sc->status =SMBDIRECT_SOCKET_DISCONNECTED ; -smbdirect_socket_cleanup_work (&sc->disconnect_work); -break ; - } -default : -pr_err ("Unexpected RDMA CM event. cm_id=%p, event=%s (%d)\n" , - cm_id,rdma_event_msg (event->event), - event->event); -break ; - } -return 0 ; -} - -static int smb_direct_send_negotiate_response (struct smbdirect_socket *sc, -int failed) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_send_io *sendmsg; -struct smbdirect_negotiate_resp *resp; -int ret; - - sendmsg =smbdirect_connection_alloc_send_io (sc); -if (IS_ERR (sendmsg)) -return -ENOMEM ; - - resp = (struct smbdirect_negotiate_resp *)sendmsg->packet; -if (failed) { -memset (resp,0 ,sizeof (*resp)); - resp->min_version =SMB_DIRECT_VERSION_LE ; - resp->max_version =SMB_DIRECT_VERSION_LE ; - resp->status =STATUS_NOT_SUPPORTED ; - - sc->status =SMBDIRECT_SOCKET_NEGOTIATE_FAILED ; - }else { - resp->status =STATUS_SUCCESS ; - resp->min_version =SMB_DIRECT_VERSION_LE ; - resp->max_version =SMB_DIRECT_VERSION_LE ; - resp->negotiated_version =SMB_DIRECT_VERSION_LE ; - resp->reserved =0 ; - resp->credits_requested = -cpu_to_le16 (sp->send_credit_target); - resp->credits_granted =cpu_to_le16 (smbdirect_connection_grant_recv_credits (sc)); - 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 (sp->max_fragmented_recv_size); - - sc->recv_io.expected =SMBDIRECT_EXPECT_DATA_TRANSFER ; - sc->status =SMBDIRECT_SOCKET_CONNECTED ; - } - - sendmsg->sge[0 ].addr =ib_dma_map_single (sc->ib.dev, - (void *)resp,sizeof (*resp), -DMA_TO_DEVICE ); - ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr); -if (ret) { -smbdirect_connection_free_send_io (sendmsg); -return ret; - } - - sendmsg->num_sge =1 ; - sendmsg->sge[0 ].length =sizeof (*resp); - sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; - - ret =smbdirect_connection_post_send_io (sc,NULL , sendmsg); -if (ret) { -smbdirect_connection_free_send_io (sendmsg); -return ret; - } - -wait_event (sc->send_io.pending.zero_wait_queue, -atomic_read (&sc->send_io.pending.count) ==0 || - sc->status !=SMBDIRECT_SOCKET_CONNECTED ); -if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) -return -ENOTCONN ; - -return 0 ; -} - -static int smb_direct_accept_client (struct smbdirect_socket *sc) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct rdma_conn_param conn_param; -__be32 ird_ord_hdr[2 ]; -int ret; - -/* -* smb_direct_handle_connect_request() -* already negotiated sp->initiator_depth -* and sp->responder_resources -*/ -memset (&conn_param,0 ,sizeof (conn_param)); - conn_param.initiator_depth = sp->initiator_depth; - conn_param.responder_resources = sp->responder_resources; - -if (sc->rdma.legacy_iwarp) { - ird_ord_hdr[0 ] =cpu_to_be32 (conn_param.responder_resources); - ird_ord_hdr[1 ] =cpu_to_be32 (conn_param.initiator_depth); - conn_param.private_data = ird_ord_hdr; - conn_param.private_data_len =sizeof (ird_ord_hdr); - }else { - conn_param.private_data =NULL ; - conn_param.private_data_len =0 ; - } - conn_param.retry_count =SMB_DIRECT_CM_RETRY ; - conn_param.rnr_retry_count =SMB_DIRECT_CM_RNR_RETRY ; - conn_param.flow_control =0 ; - -/* -* start with the negotiate timeout and SMBDIRECT_KEEPALIVE_PENDING -* so that the timer will cause a disconnect. -*/ - sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, -msecs_to_jiffies (sp->negotiate_timeout_msec)); - -WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); - sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; - ret =rdma_accept (sc->rdma.cm_id, &conn_param); -if (ret) { -pr_err ("error at rdma_accept: %d\n" , ret); -return ret; - } -return 0 ; -} - -static int smb_direct_prepare_negotiation (struct smbdirect_socket *sc) -{ -struct smbdirect_recv_io *recvmsg; -bool recv_posted = false; -int ret; - -WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED ); - sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ; - - sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ; - - recvmsg =smbdirect_connection_get_recv_io (sc); -if (!recvmsg) -return -ENOMEM ; - - ret =smbdirect_connection_post_recv_io (recvmsg); -if (ret) { -pr_err ("Can't post recv: %d\n" , ret); - goto out_err; - } - recv_posted = true; - - ret =smb_direct_accept_client (sc); -if (ret) { -pr_err ("Can't accept client\n" ); - goto out_err; - } - -return 0 ; -out_err: -/* -* If the recv was never posted, return it to the free list. -* If it was posted, leave it alone so disconnect teardown can -* drain the QP and complete it (flush) and the completion path -* will unmap it exactly once. -*/ -if (!recv_posted) -smbdirect_connection_put_recv_io (recvmsg); -return ret; -} - -static int smb_direct_init_params (struct smbdirect_socket *sc) -{ -struct smbdirect_socket_parameters *sp = &sc->parameters; -int max_send_sges; -unsigned int maxpages; - -/* need 3 more sge. because a SMB_DIRECT header, SMB2 header, -* SMB2 response could be mapped. -*/ - max_send_sges =DIV_ROUND_UP (sp->max_send_size,PAGE_SIZE ) +3 ; -if (max_send_sges >SMBDIRECT_SEND_IO_MAX_SGE ) { -pr_err ("max_send_size %d is too large\n" , sp->max_send_size); -return -EINVAL ; - } - -atomic_set (&sc->send_io.lcredits.count, sp->send_credit_target); - - maxpages =DIV_ROUND_UP (sp->max_read_write_size,PAGE_SIZE ); - sc->rw_io.credits.max =rdma_rw_mr_factor (sc->ib.dev, - sc->rdma.cm_id->port_num, - maxpages); - sc->rw_io.credits.num_pages =DIV_ROUND_UP (maxpages, sc->rw_io.credits.max); -/* add one extra in order to handle unaligned pages */ - sc->rw_io.credits.max +=1 ; - - sc->recv_io.credits.target =1 ; - -atomic_set (&sc->rw_io.credits.count, sc->rw_io.credits.max); - -return 0 ; +smbdirect_socket_shutdown (sc); }static int smb_direct_prepare (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t);struct smbdirect_socket *sc = &st->socket; -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_recv_io *recvmsg; -struct smbdirect_negotiate_req *req; -unsigned long flags; -int ret; - -/* -* We are waiting to pass the following states: -* -* SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED -* SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING -* SMBDIRECT_SOCKET_NEGOTIATE_NEEDED -* -* To finally get to SMBDIRECT_SOCKET_NEGOTIATE_RUNNING -* in order to continue below. -* -* Everything else is unexpected and an error. -*/ -ksmbd_debug (RDMA ,"Waiting for SMB_DIRECT negotiate request\n" ); - ret =wait_event_interruptible_timeout (sc->status_wait, - sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED && - sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING && - sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED , -msecs_to_jiffies (sp->negotiate_timeout_msec)); -if (ret <=0 || sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ) -return ret <0 ? ret : -ETIMEDOUT ; - - recvmsg =smbdirect_connection_reassembly_first_recv_io (sc); -if (!recvmsg) -return -ECONNABORTED ; - - ret =smb_direct_check_recvmsg (recvmsg); -if (ret) - goto put; - - req = (struct smbdirect_negotiate_req *)recvmsg->packet; - sp->max_recv_size =min_t (int, sp->max_recv_size, -le32_to_cpu (req->preferred_send_size)); - sp->max_send_size =min_t (int, sp->max_send_size, -le32_to_cpu (req->max_receive_size)); - sp->max_fragmented_send_size = -le32_to_cpu (req->max_fragmented_size); - sp->max_fragmented_recv_size = - (sp->recv_credit_max * sp->max_recv_size) /2 ; - sc->recv_io.credits.target =le16_to_cpu (req->credits_requested); - sc->recv_io.credits.target =min_t (u16, sc->recv_io.credits.target, sp->recv_credit_max); - sc->recv_io.credits.target =max_t (u16, sc->recv_io.credits.target,1 ); - -put: -spin_lock_irqsave (&sc->recv_io.reassembly.lock, flags); - sc->recv_io.reassembly.queue_length--; -list_del (&recvmsg->list); -spin_unlock_irqrestore (&sc->recv_io.reassembly.lock, flags); -smbdirect_connection_put_recv_io (recvmsg); - -if (ret == -ECONNABORTED ) -return ret; - -if (ret) - goto respond; - -/* -* We negotiated with success, so we need to refill the recv queue. -* -* The message that grants the credits to the client is -* the negotiate response. -*/ - ret =smbdirect_connection_recv_io_refill (sc); -if (ret <0 ) -return ret; - ret =0 ; - -respond: - ret =smb_direct_send_negotiate_response (sc, ret); -if (ret) -return ret; - -INIT_WORK (&sc->recv_io.posted.refill_work, smbdirect_connection_recv_io_refill_work); -INIT_WORK (&sc->idle.immediate_work, smbdirect_connection_send_immediate_work); - -return 0 ; -} - -static int smb_direct_connect (struct smbdirect_socket *sc) -{ -struct smbdirect_recv_io *recv_io;int ret; - sc->rdma.cm_id->event_handler = smb_direct_cm_handler; - - ret =smb_direct_init_params (sc); -if (ret) { -pr_err ("Can't configure RDMA parameters\n" ); -return ret; - } - - ret =smbdirect_connection_create_mem_pools (sc); -if (ret) { -pr_err ("Can't init RDMA pool: %d\n" , ret); -return ret; - } - -list_for_each_entry (recv_io, &sc->recv_io.free.list, list) - recv_io->cqe.done = recv_done; - - ret =smbdirect_connection_create_qp (sc); +ksmbd_debug (RDMA ,"SMB_DIRECT Waiting for connection\n" ); + ret =smbdirect_connection_wait_for_connected (sc);if (ret) { -pr_err ("Can't accept RDMA client: %d\n" , ret); +ksmbd_debug (RDMA ,"SMB_DIRECT connection failed %d => %s\n" , + ret,errname (ret));return ret; } - ret =smb_direct_prepare_negotiation (sc); -if (ret) { -pr_err ("Can't negotiate: %d\n" , ret); -return ret; - } +ksmbd_debug (RDMA ,"SMB_DIRECT connection ready\n" );return 0 ; }
@@ -908,10 +379,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, {struct smb_direct_transport *t;struct smbdirect_socket *sc; -struct smbdirect_socket_parameters *sp;struct task_struct *handler; -u8 peer_initiator_depth; -u8 peer_responder_resources;int ret;if (!smbdirect_frwr_is_supported (&new_cm_id->device->attrs)) {
@@ -925,22 +393,8 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id,if (!t)return -ENOMEM ; sc = &t->socket; - sp = &sc->parameters; - -/* -* First set what the we as server are able to support -*/ - sp->initiator_depth =min_t (u8, sp->initiator_depth, - sc->ib.dev->attrs.max_qp_rd_atom); - - peer_initiator_depth = event->param.conn.initiator_depth; - peer_responder_resources = event->param.conn.responder_resources; -smbdirect_connection_negotiate_rdma_resources (sc, - peer_initiator_depth, - peer_responder_resources, - &event->param.conn); - ret =smb_direct_connect (sc); + ret =smbdirect_accept_connect_request (sc, &event->param.conn);if (ret) goto out_err;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 131/145 smb: server: make use of smbdirect_socket_create_accepting()/smbdirect_socket_release()
In reply to Stefan MetzmacherWith this we no longer embed struct smbdirect_socket, which will allow us to make it private in the following commits.
--- fs/smb/server/transport_rdma.c | 53 +++++++++++++++------------------- 1 file changed, 23 insertions(+), 30 deletions(-)
fs/smb/server/transport_rdma.c +23 -30
@@ -42,8 +42,6 @@#define SMB_DIRECT_PORT_IWARP 5445#define SMB_DIRECT_PORT_INFINIBAND 445 -#define SMB_DIRECT_VERSION_LE cpu_to_le16(SMBDIRECT_V1) -/* SMB_DIRECT negotiation timeout (for the server) in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 5
@@ -59,11 +57,6 @@*/ #define SMB_DIRECT_CM_INITIATOR_DEPTH 8 -/* Maximum number of retries on data transfer operations */ -#define SMB_DIRECT_CM_RETRY 6 -/* No need to retry on Receiver Not Ready since SMB_DIRECT manages credits */ -#define SMB_DIRECT_CM_RNR_RETRY 0 -/* * User configurable initial values per SMB_DIRECT transport connection * as defined in [MS-SMBD] 3.1.1.1
@@ -107,7 +100,7 @@ static struct workqueue_struct *smb_direct_wq;struct smb_direct_transport {struct ksmbd_transport transport; -struct smbdirect_socket socket; +struct smbdirect_socket *socket; }; static bool smb_direct_logging_needed(struct smbdirect_socket *sc,
@@ -184,15 +177,13 @@ void init_smbd_max_io_size(unsigned int sz)unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {struct smb_direct_transport *t; -struct smbdirect_socket *sc;const struct smbdirect_socket_parameters *sp;if (kt->ops != &ksmbd_smb_direct_transport_ops)return 0 ; t =SMBD_TRANS (kt); - sc = &t->socket; - sp =smbdirect_socket_get_current_parameters (sc); + sp =smbdirect_socket_get_current_parameters (t->socket);return sp->max_read_write_size; }
@@ -225,10 +216,9 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );if (!t)return NULL ; - sc = &t->socket; - ret =smbdirect_socket_init_accepting (cm_id, sc); + ret =smbdirect_socket_create_accepting (cm_id, &sc);if (ret) - goto socket_init_failed; + goto socket_create_failed;smbdirect_socket_set_logging (sc,NULL , smb_direct_logging_needed, smb_direct_logging_vaprintf);
@@ -253,28 +243,31 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) conn->transport =KSMBD_TRANS (t);KSMBD_TRANS (t)->conn = conn;KSMBD_TRANS (t)->ops = &ksmbd_smb_direct_transport_ops; + + t->socket = sc;return t; conn_alloc_failed: set_workqueue_failed: set_settings_failed: set_params_failed: -socket_init_failed: +smbdirect_socket_release (sc); +socket_create_failed:kfree (t);return NULL ; }static void smb_direct_free_transport (struct ksmbd_transport *kt) { -kfree (SMBD_TRANS (kt)); +struct smb_direct_transport *t =SMBD_TRANS (kt); + +smbdirect_socket_release (t->socket); +kfree (t); }static void free_transport (struct smb_direct_transport *t) { -struct smbdirect_socket *sc = &t->socket; - -smbdirect_socket_destroy_sync (sc); - +smbdirect_socket_shutdown (t->socket);ksmbd_conn_free (KSMBD_TRANS (t)->conn); }
@@ -282,7 +275,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf, unsigned int size, int unused) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket;struct msghdr msg = { .msg_flags =0 , };struct kvec iov = { .iov_base = buf,
@@ -303,7 +296,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, bool need_invalidate, unsigned int remote_key) { struct smb_direct_transport *st = SMBD_TRANS(t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket;struct iov_iter iter;iov_iter_kvec (&iter,ITER_SOURCE , iov, niovs, buflen);
@@ -318,7 +311,7 @@ static int smb_direct_rdma_write(struct ksmbd_transport *t, unsigned int desc_len) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket;return smbdirect_connection_rdma_xmit (sc, buf, buflen, desc, desc_len, false);
@@ -330,7 +323,7 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t, unsigned int desc_len) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket;return smbdirect_connection_rdma_xmit (sc, buf, buflen, desc, desc_len, true);
@@ -339,9 +332,9 @@ static int smb_direct_rdma_read(struct ksmbd_transport *t,static void smb_direct_disconnect (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket; -ksmbd_debug (RDMA ,"Disconnecting cm_id=%p\n" , sc->rdma.cm_id); +ksmbd_debug (RDMA ,"Disconnecting sc=%p\n" , sc);free_transport (st); }
@@ -349,9 +342,9 @@ static void smb_direct_disconnect(struct ksmbd_transport *t)static void smb_direct_shutdown (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket; -ksmbd_debug (RDMA ,"smb-direct shutdown cm_id=%p\n" , sc->rdma.cm_id); +ksmbd_debug (RDMA ,"smb-direct shutdown sc=%p\n" , sc);smbdirect_socket_shutdown (sc); }
@@ -359,7 +352,7 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)static int smb_direct_prepare (struct ksmbd_transport *t) {struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = &st->socket; +struct smbdirect_socket *sc = st->socket;int ret;ksmbd_debug (RDMA ,"SMB_DIRECT Waiting for connection\n" );
@@ -392,7 +385,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, t =alloc_transport (new_cm_id);if (!t)return -ENOMEM ; - sc = &t->socket; + sc = t->socket; ret =smbdirect_accept_connect_request (sc, &event->param.conn);if (ret)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 132/145 smb: server: only use public smbdirect functions
In reply to Stefan MetzmacherAlso remove a lot of unused includes...
--- fs/smb/server/smb2pdu.c | 1 - fs/smb/server/transport_rdma.c | 25 +++++++++---------------- fs/smb/server/transport_rdma.h | 2 ++ 3 files changed, 11 insertions(+), 17 deletions(-)
fs/smb/server/smb2pdu.c +0 -1
@@ -23,7 +23,6 @@#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"
fs/smb/server/transport_rdma.c +9 -16
@@ -13,31 +13,16 @@#include <linux/kthread.h> #include <linux/list.h> -#include <linux/mempool.h> -#include <linux/highmem.h> -#include <linux/scatterlist.h> #include <linux/string_choices.h> #include <linux/errname.h> -#include <rdma/ib_verbs.h> -#include <rdma/rdma_cm.h> -#include <rdma/rw.h> #include "glob.h" #include "connection.h" #include "smb_common.h" #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" +#include "../common/smbdirect/smbdirect_public.h" -/* -* This is a temporary solution until all code -* is moved to smbdirect_all_c_files.c and we -* have an smbdirect.ko that exports the required -* functions. -*/ -#include "../common/smbdirect/smbdirect_all_c_files.c" #define SMB_DIRECT_PORT_IWARP 5445#define SMB_DIRECT_PORT_INFINIBAND 445
@@ -642,3 +627,11 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { .rdma_write = smb_direct_rdma_write, .free_transport = smb_direct_free_transport, }; + +/* +* This is a temporary solution until all code +* is moved to smbdirect_all_c_files.c and we +* have an smbdirect.ko that exports the required +* functions. +*/ +#include "../common/smbdirect/smbdirect_all_c_files.c"
fs/smb/server/transport_rdma.h +2 -0
@@ -27,4 +27,6 @@ static inline void init_smbd_max_io_size(unsigned int sz) { }static inline unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {return 0 ; }#endif +#include "../common/smbdirect/smbdirect.h" +#endif /* __KSMBD_TRANSPORT_RDMA_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 133/145 smb: server: make use of smbdirect.ko
In reply to Stefan MetzmacherThis means we no longer inline the common smbdirect .c files and use the exported functions from the module instead.
Note the connection specific logging is still redirect to ksmbd.ko functions via smbdirect_socket_set_logging().
We still don't use real socket layer,
but we're very close...
--- fs/smb/server/Kconfig | 4 ++-- fs/smb/server/transport_rdma.c | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-)
fs/smb/server/Kconfig +2 -2
@@ -47,8 +47,8 @@ if SMB_SERVER config SMB_SERVER_SMBDIRECT bool "Support for SMB Direct protocol" - depends on SMB_SERVER=m && INFINIBAND && INFINIBAND_ADDR_TRANS || SMB_SERVER=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y - select SG_POOL + depends on SMB_SERVER && INFINIBAND && INFINIBAND_ADDR_TRANS + select SMB_COMMON_SMBDIRECT default n help
fs/smb/server/transport_rdma.c +0 -10
@@ -9,8 +9,6 @@#define SUBMOD_NAME "smb_direct" -#define SMBDIRECT_USE_INLINE_C_FILES 1 -#include <linux/kthread.h> #include <linux/list.h> #include <linux/string_choices.h>
@@ -627,11 +625,3 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { .rdma_write = smb_direct_rdma_write, .free_transport = smb_direct_free_transport, }; - -/* -* This is a temporary solution until all code -* is moved to smbdirect_all_c_files.c and we -* have an smbdirect.ko that exports the required -* functions. -*/ -#include "../common/smbdirect/smbdirect_all_c_files.c"
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 134/145 smb: smbdirect: wrap rdma_disconnect() in rdma_[un]lock_handler()
In reply to Stefan MetzmacherThis might not be needed, but it controls the order of ib_drain_qp() and rdma_disconnect().
--- fs/smb/common/smbdirect/smbdirect_socket.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/smb/common/smbdirect/smbdirect_socket.c +13 -0
@@ -461,7 +461,20 @@ static void smbdirect_socket_cleanup_work(struct work_struct *work)case SMBDIRECT_SOCKET_CONNECTED :case SMBDIRECT_SOCKET_ERROR : sc->status =SMBDIRECT_SOCKET_DISCONNECTING ; +/* +* Make sure we hold the callback lock +* im order to coordinate with the +* rdma_event handlers, typically +* smbdirect_connection_rdma_event_handler(), +* and smbdirect_socket_destroy(). +* +* So that the order of ib_drain_qp() +* and rdma_disconnect() is controlled +* by the mutex. +*/ +rdma_lock_handler (sc->rdma.cm_id);rdma_disconnect (sc->rdma.cm_id); +rdma_unlock_handler (sc->rdma.cm_id);break ;case SMBDIRECT_SOCKET_CREATED :
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 135/145 smb: smbdirect: remove unused smbdirect_connection_mr_io_recovery_work()
In reply to Stefan MetzmacherThis would actually never be used as we only move to SMBDIRECT_MR_ERROR when we directly call smbdirect_socket_schedule_cleanup().
Doing an ib_dereg_mr/ib_alloc_mr dance on
working connection is not needed and
it's also pointless on a broken connection
as we don't reuse any ib_pd.
--- fs/smb/common/smbdirect/smbdirect_mr.c | 94 +++----------------------- 1 file changed, 10 insertions(+), 84 deletions(-)
fs/smb/common/smbdirect/smbdirect_mr.c +10 -84
@@ -6,8 +6,6 @@#include "smbdirect_internal.h" -static void smbdirect_connection_mr_io_recovery_work (struct work_struct *work); -/* * Allocate MRs used for RDMA read/write * The number of MRs will not exceed hardware capability in responder_resources
@@ -67,8 +65,6 @@ int smbdirect_connection_create_mr_list(struct smbdirect_socket *sc)atomic_inc (&sc->mr_io.ready.count); } -INIT_WORK (&sc->mr_io.recovery_work, smbdirect_connection_mr_io_recovery_work); -return 0 ; kcalloc_sgl_failed:
@@ -128,8 +124,6 @@ void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc)LIST_HEAD (all_list);unsigned long flags; -disable_work_sync (&sc->mr_io.recovery_work); -spin_lock_irqsave (&sc->mr_io.all.lock, flags);list_splice_tail_init (&sc->mr_io.all.list, &all_list);spin_unlock_irqrestore (&sc->mr_io.all.lock, flags);
@@ -165,11 +159,8 @@ void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc)/* * Get a MR from mr_list. This function waits until there is at least one MR -* available in the list. It may access the list while the -* smbdirect_connection_mr_io_recovery_work is recovering the MR list. This -* doesn't need a lock as they never modify the same places. However, there may -* be several CPUs issuing I/O trying to get MR at the same time, mr_list_lock -* is used to protect this situation. +* available in the list. There may be several CPUs issuing I/O trying to get MR +* at the same time, mr_list_lock is used to protect this situation. */ static struct smbdirect_mr_io *smbdirect_connection_get_mr_io (struct smbdirect_socket *sc)
@@ -247,64 +238,6 @@ static void smbdirect_connection_mr_io_local_inv_done(struct ib_cq *cq, struct icomplete (&mr->invalidate_done); } -/* -* The work queue function that recovers MRs -* We need to call ib_dereg_mr() and ib_alloc_mr() before this MR can be used -* again. Both calls are slow, so finish them in a workqueue. This will not -* block I/O path. -* There is one workqueue that recovers MRs, there is no need to lock as the -* I/O requests calling smbd_register_mr will never update the links in the -* mr_list. -*/ -static void smbdirect_connection_mr_io_recovery_work (struct work_struct *work) -{ -struct smbdirect_socket *sc = - container_of(work, struct smbdirect_socket, mr_io.recovery_work); -struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smbdirect_mr_io *mr; -int ret; - -list_for_each_entry (mr, &sc->mr_io.all.list, list) { -if (mr->state !=SMBDIRECT_MR_ERROR ) -/* This MR is being used, don't recover it */ -continue ; - -/* recover this MR entry */ - ret =ib_dereg_mr (mr->mr); -if (ret) { -smbdirect_log_rdma_mr (sc,SMBDIRECT_LOG_ERR , -"ib_dereg_mr failed ret=%u (%s)\n" , - ret,errname (ret)); -smbdirect_socket_schedule_cleanup (sc, ret); -continue ; - } - - mr->mr =ib_alloc_mr (sc->ib.pd, - sc->mr_io.type, - sp->max_frmr_depth); -if (IS_ERR (mr->mr)) { - ret =PTR_ERR (mr->mr); -smbdirect_log_rdma_mr (sc,SMBDIRECT_LOG_ERR , -"ib_alloc_mr failed ret=%d (%s) type=0x%x depth=%u\n" , - ret,errname (ret), sc->mr_io.type, sp->max_frmr_depth); -smbdirect_socket_schedule_cleanup (sc, ret); -continue ; - } - - mr->state =SMBDIRECT_MR_READY ; - -/* smbdirect_mr->state is updated by this function -* and is read and updated by I/O issuing CPUs trying -* to get a MR, the call to atomic_inc_return -* implicates a memory barrier and guarantees this -* value is updated before waking up any calls to -* get_mr() from the I/O issuing CPUs -*/ -if (atomic_inc_return (&sc->mr_io.ready.count) ==1 ) -wake_up (&sc->mr_io.ready.wait_queue); - } -} -/* * Transcribe the pages from an iterator into an MR scatterlist. */
@@ -421,15 +354,13 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,"ib_post_send failed ret=%d (%s) reg_wr->key=0x%x\n" , ret, errname(ret), reg_wr->key); -/* If all failed, attempt to recover this MR by setting it SMBDIRECT_MR_ERROR*/ map_mr_error:ib_dma_unmap_sg (sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir); dma_map_error: mr->sgt.nents =0 ; mr->state =SMBDIRECT_MR_ERROR ; -if (atomic_dec_and_test (&sc->mr_io.used.count)) -wake_up (&sc->mr_io.cleanup.wait_queue); +atomic_dec (&sc->mr_io.used.count);smbdirect_socket_schedule_cleanup (sc, ret);
@@ -529,20 +460,15 @@ void smbdirect_connection_deregister_mr_io(struct smbdirect_mr_io *mr) mr->sgt.nents =0 ; } -if (mr->state ==SMBDIRECT_MR_INVALIDATED ) { - mr->state =SMBDIRECT_MR_READY ; -if (atomic_inc_return (&sc->mr_io.ready.count) ==1 ) -wake_up (&sc->mr_io.ready.wait_queue); - }else -/* -* Schedule the work to do MR recovery for future I/Os MR -* recovery is slow and don't want it to block current I/O -*/ -queue_work (sc->workqueue, &sc->mr_io.recovery_work); +WARN_ONCE (mr->state !=SMBDIRECT_MR_INVALIDATED , +"mr->state[%u] != SMBDIRECT_MR_INVALIDATED[%u]\n" , + mr->state,SMBDIRECT_MR_INVALIDATED ); + mr->state =SMBDIRECT_MR_READY ; +if (atomic_inc_return (&sc->mr_io.ready.count) ==1 ) +wake_up (&sc->mr_io.ready.wait_queue); done: -if (atomic_dec_and_test (&sc->mr_io.used.count)) -wake_up (&sc->mr_io.cleanup.wait_queue); +atomic_dec (&sc->mr_io.used.count); put_kref:/*
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 136/145 smb: smbdirect: prepare use of dedicated workqueues for different steps
In reply to Stefan MetzmacherThis is a preparation in order to have global workqueues in the smbdirect module instead of having the caller to provide one.
--- fs/smb/common/smbdirect/smbdirect_accept.c | 6 +++--- fs/smb/common/smbdirect/smbdirect_connect.c | 8 ++++---- fs/smb/common/smbdirect/smbdirect_connection.c | 16 ++++++++-------- fs/smb/common/smbdirect/smbdirect_socket.c | 9 +++++++-- fs/smb/common/smbdirect/smbdirect_socket.h | 11 +++++++++-- 5 files changed, 31 insertions(+), 19 deletions(-)
fs/smb/common/smbdirect/smbdirect_accept.c +3 -3
@@ -137,7 +137,7 @@ int smbdirect_accept_connect_request(struct smbdirect_socket *sc,*/ INIT_DELAYED_WORK (&sc->idle.timer_work, smbdirect_connection_idle_timer_work); sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->negotiate_timeout_msec));return 0 ;
@@ -234,7 +234,7 @@ static void smbdirect_accept_negotiate_recv_done(struct ib_cq *cq, struct ib_wc* order to trigger our next keepalive message. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec)); ib_dma_sync_single_for_cpu(sc->ib.dev,
@@ -266,7 +266,7 @@ static void smbdirect_accept_negotiate_recv_done(struct ib_cq *cq, struct ib_wc*/ smbdirect_connection_put_recv_io (recv_io);INIT_WORK (&recv_io->complex_work, smbdirect_accept_negotiate_recv_work); -queue_work (sc->workqueue, &recv_io->complex_work); +queue_work (sc->workqueues.accept, &recv_io->complex_work);return ; error:
fs/smb/common/smbdirect/smbdirect_connect.c +4 -4
@@ -210,7 +210,7 @@ static int smbdirect_connect_rdma_connect(struct smbdirect_socket *sc)*/ INIT_DELAYED_WORK (&sc->idle.timer_work, smbdirect_connection_idle_timer_work); sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->rdma_connect_timeout_msec));return 0 ;
@@ -475,7 +475,7 @@ static int smbdirect_connect_negotiate_start(struct smbdirect_socket *sc)* so that the timer will cause a disconnect. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->negotiate_timeout_msec));return 0 ;
@@ -562,7 +562,7 @@ static void smbdirect_connect_negotiate_recv_done(struct ib_cq *cq, struct ib_wc* order to trigger our next keepalive message. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec)); ib_dma_sync_single_for_cpu(sc->ib.dev,
@@ -594,7 +594,7 @@ static void smbdirect_connect_negotiate_recv_done(struct ib_cq *cq, struct ib_wc*/ smbdirect_connection_put_recv_io (recv_io);INIT_WORK (&recv_io->complex_work, smbdirect_connect_negotiate_recv_work); -queue_work (sc->workqueue, &recv_io->complex_work); +queue_work (sc->workqueues.connect, &recv_io->complex_work);return ; error:
fs/smb/common/smbdirect/smbdirect_connection.c +8 -8
@@ -616,7 +616,7 @@ void smbdirect_connection_put_recv_io(struct smbdirect_recv_io *msg) sc->statistics.put_receive_buffer++;spin_unlock_irqrestore (&sc->recv_io.free.lock, flags); -queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueues.refill, &sc->recv_io.posted.refill_work); }__maybe_unused /* this is temporary while this file is included in others */
@@ -824,11 +824,11 @@ void smbdirect_connection_idle_timer_work(struct work_struct *work)* in order to wait for a response */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));smbdirect_log_keep_alive (sc,SMBDIRECT_LOG_INFO ,"schedule send of empty idle message\n" ); -queue_work (sc->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueues.immediate, &sc->idle.immediate_work); }__maybe_unused /* this is temporary while this file is included in others */
@@ -862,7 +862,7 @@ static bool smbdirect_connection_request_keep_alive(struct smbdirect_socket *sc)* Now use the keepalive timeout (instead of keepalive interval) * in order to wait for a response */ -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));return true; }
@@ -1423,7 +1423,7 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)* order to trigger our next keepalive message. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (sc->workqueue, &sc->idle.timer_work, +mod_delayed_work (sc->workqueues.idle, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec)); ib_dma_sync_single_for_cpu(sc->ib.dev,
@@ -1527,7 +1527,7 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)if (flags &SMBDIRECT_FLAG_RESPONSE_REQUESTED ) {smbdirect_log_keep_alive (sc,SMBDIRECT_LOG_INFO ,"schedule send of immediate response\n" ); -queue_work (sc->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueues.immediate, &sc->idle.immediate_work); }/*
@@ -1536,7 +1536,7 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)*/ if (data_length) {if (sc->recv_io.credits.target > old_recv_credit_target) -queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueues.refill, &sc->recv_io.posted.refill_work);smbdirect_connection_reassembly_append_recv_io (sc, recv_io, data_length);wake_up (&sc->recv_io.reassembly.wait_queue);
@@ -1657,7 +1657,7 @@ static void smbdirect_connection_recv_io_refill_work(struct work_struct *work)if (posted >0 ) {smbdirect_log_keep_alive (sc,SMBDIRECT_LOG_INFO ,"schedule send of an empty message\n" ); -queue_work (sc->workqueue, &sc->idle.immediate_work); +queue_work (sc->workqueues.immediate, &sc->idle.immediate_work); } }
fs/smb/common/smbdirect/smbdirect_socket.c +7 -2
@@ -230,7 +230,12 @@ int smbdirect_socket_set_custom_workqueue(struct smbdirect_socket *sc,/* * Remember the callers workqueue */ - sc->workqueue = workqueue; + sc->workqueues.accept = workqueue; + sc->workqueues.connect = workqueue; + sc->workqueues.idle = workqueue; + sc->workqueues.refill = workqueue; + sc->workqueues.immediate = workqueue; + sc->workqueues.cleanup = workqueue;return 0 ; }
@@ -405,7 +410,7 @@ void __smbdirect_socket_schedule_cleanup(struct smbdirect_socket *sc,*/ smbdirect_socket_wake_up_all (sc); -queue_work (sc->workqueue, &sc->disconnect_work); +queue_work (sc->workqueues.cleanup, &sc->disconnect_work); }static void smbdirect_socket_cleanup_work (struct work_struct *work)
fs/smb/common/smbdirect/smbdirect_socket.h +9 -2
@@ -106,12 +106,19 @@ struct smbdirect_socket {int first_error;/* -* This points to the workqueue to +* This points to the workqueues to * be used for this socket. * It can be per socket (on the client) * or point to a global workqueue (on the server) */ -struct workqueue_struct *workqueue; +struct { +struct workqueue_struct *accept; +struct workqueue_struct *connect; +struct workqueue_struct *idle; +struct workqueue_struct *refill; +struct workqueue_struct *immediate; +struct workqueue_struct *cleanup; + } workqueues;struct work_struct disconnect_work;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 137/145 smb: smbdirect: introduce global workqueues
In reply to Stefan MetzmacherThese will be used in future and callers should no longer use smbdirect_socket_set_custom_workqueue().
--- fs/smb/common/smbdirect/smbdirect_internal.h | 9 +++ fs/smb/common/smbdirect/smbdirect_main.c | 76 +++++++++++++++++++- fs/smb/common/smbdirect/smbdirect_socket.h | 9 ++- 3 files changed, 90 insertions(+), 4 deletions(-)
fs/smb/common/smbdirect/smbdirect_internal.h +9 -0
@@ -19,6 +19,15 @@struct smbdirect_module_state {struct mutex mutex; + +struct { +struct workqueue_struct *accept; +struct workqueue_struct *connect; +struct workqueue_struct *idle; +struct workqueue_struct *refill; +struct workqueue_struct *immediate; +struct workqueue_struct *cleanup; + } workqueues; };extern struct smbdirect_module_state smbdirect_globals;
fs/smb/common/smbdirect/smbdirect_main.c +74 -2
95 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_socket.h +7 -2
@@ -108,8 +108,6 @@ struct smbdirect_socket {/* * This points to the workqueues to * be used for this socket. -* It can be per socket (on the client) -* or point to a global workqueue (on the server) */ struct {struct workqueue_struct *accept;
@@ -520,6 +518,13 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)init_waitqueue_head (&sc->status_wait); + sc->workqueues.accept = smbdirect_globals.workqueues.accept; + sc->workqueues.connect = smbdirect_globals.workqueues.connect; + sc->workqueues.idle = smbdirect_globals.workqueues.idle; + sc->workqueues.refill = smbdirect_globals.workqueues.refill; + sc->workqueues.immediate = smbdirect_globals.workqueues.immediate; + sc->workqueues.cleanup = smbdirect_globals.workqueues.cleanup; +INIT_WORK (&sc->disconnect_work, __smbdirect_socket_disabled_work);disable_work_sync (&sc->disconnect_work);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 138/145 smb: client: no longer use smbdirect_socket_set_custom_workqueue()
In reply to Stefan Metzmachersmbdirect.ko has global workqueues now, so we should use these default once.
--- fs/smb/client/smbdirect.c | 12 ------------ fs/smb/client/smbdirect.h | 1 - 2 files changed, 13 deletions(-)
fs/smb/client/smbdirect.c +0 -12
@@ -196,7 +196,6 @@ void smbd_destroy(struct TCP_Server_Info *server)smbdirect_socket_release (info->socket); -destroy_workqueue (info->workqueue);kfree (info); server->smbd_conn =NULL ; }
@@ -245,7 +244,6 @@ static struct smbd_connection *_smbd_get_connection(struct smbdirect_socket_parameters init_params = {};struct smbdirect_socket_parameters *sp;__be16 *sport; -char wq_name[80 ];int ret;/*
@@ -270,10 +268,6 @@ static struct smbd_connection *_smbd_get_connection( info =kzalloc (sizeof (struct smbd_connection ),GFP_KERNEL );if (!info)return NULL ; -scnprintf (wq_name,ARRAY_SIZE (wq_name),"smbd_%p" , info); - info->workqueue =create_workqueue (wq_name); -if (!info->workqueue) - goto create_wq_failed; ret =smbdirect_socket_create_kern (net, &sc);if (ret) goto socket_init_failed;
@@ -284,9 +278,6 @@ static struct smbd_connection *_smbd_get_connection( ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_SOFTIRQ ,GFP_KERNEL );if (ret) goto set_settings_failed; - ret =smbdirect_socket_set_custom_workqueue (sc, info->workqueue); -if (ret) - goto set_workqueue_failed;if (dstaddr->sa_family ==AF_INET6 ) sport = &((struct sockaddr_in6 *)dstaddr)->sin6_port;
@@ -306,13 +297,10 @@ static struct smbd_connection *_smbd_get_connection(return info; connect_failed: -set_workqueue_failed: set_settings_failed: set_params_failed:smbdirect_socket_release (sc); socket_init_failed: -destroy_workqueue (info->workqueue); -create_wq_failed:kfree (info);return NULL ; }
fs/smb/client/smbdirect.h +0 -1
@@ -25,7 +25,6 @@ extern int smbd_receive_credit_max;struct smbd_connection {struct smbdirect_socket *socket; -struct workqueue_struct *workqueue; };/* Create a SMBDirect session */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 139/145 smb: server: no longer use smbdirect_socket_set_custom_workqueue()
In reply to Stefan Metzmachersmbdirect.ko has global workqueues now, so we should use these default once.
--- fs/smb/server/connection.c | 1 - fs/smb/server/transport_rdma.c | 27 --------------------------- fs/smb/server/transport_rdma.h | 2 -- 3 files changed, 30 deletions(-)
fs/smb/server/connection.c +0 -1
@@ -505,6 +505,5 @@ void ksmbd_conn_transport_destroy(void)ksmbd_tcp_destroy ();ksmbd_rdma_stop_listening ();stop_sessions (); -ksmbd_rdma_destroy ();mutex_unlock (&init_lock); }
fs/smb/server/transport_rdma.c +0 -27
@@ -78,8 +78,6 @@ static struct smb_direct_listener {struct rdma_cm_id *cm_id; } smb_direct_listener; -static struct workqueue_struct *smb_direct_wq; -struct smb_direct_transport {struct ksmbd_transport transport;
@@ -211,9 +209,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_WORKQUEUE ,KSMBD_DEFAULT_GFP );if (ret) goto set_settings_failed; - ret =smbdirect_socket_set_custom_workqueue (sc, smb_direct_wq); -if (ret) - goto set_workqueue_failed; conn =ksmbd_conn_alloc ();if (!conn)
@@ -231,7 +226,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)return t; conn_alloc_failed: -set_workqueue_failed: set_settings_failed: set_params_failed:smbdirect_socket_release (sc);
@@ -508,21 +502,8 @@ int ksmbd_rdma_init(void)return ret; } -/* When a client is running out of send credits, the credits are -* granted by the server's sending a packet using this queue. -* This avoids the situation that a clients cannot send packets -* for lack of credits -*/ - smb_direct_wq =alloc_workqueue ("ksmbd-smb_direct-wq" , -WQ_HIGHPRI |WQ_MEM_RECLAIM |WQ_PERCPU , -0 ); -if (!smb_direct_wq) -return -ENOMEM ; - ret =smb_direct_listen (smb_direct_port);if (ret) { -destroy_workqueue (smb_direct_wq); - smb_direct_wq =NULL ;pr_err ("Can't listen: %d\n" , ret);return ret; }
@@ -543,14 +524,6 @@ void ksmbd_rdma_stop_listening(void) smb_direct_listener.cm_id =NULL ; } -void ksmbd_rdma_destroy (void ) -{ -if (smb_direct_wq) { -destroy_workqueue (smb_direct_wq); - smb_direct_wq =NULL ; - } -} -static bool ksmbd_find_rdma_capable_netdev (struct net_device *netdev) {struct smb_direct_device *smb_dev;
fs/smb/server/transport_rdma.h +0 -2
@@ -14,14 +14,12 @@#ifdef CONFIG_SMB_SERVER_SMBDIRECT int ksmbd_rdma_init (void );void ksmbd_rdma_stop_listening (void ); -void ksmbd_rdma_destroy (void );bool ksmbd_rdma_capable_netdev (struct net_device *netdev);void init_smbd_max_io_size (unsigned int sz);unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt);#else static inline int ksmbd_rdma_init (void ) {return 0 ; }static inline void ksmbd_rdma_stop_listening (void ) { } -static inline void ksmbd_rdma_destroy (void ) { }static inline bool ksmbd_rdma_capable_netdev (struct net_device *netdev) {return false; }static inline void init_smbd_max_io_size (unsigned int sz) { }static inline unsigned int get_smbd_max_read_write_size (struct ksmbd_transport *kt) {return 0 ; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 140/145 smb: smbdirect: split out smbdirect_accept_negotiate_finish()
In reply to Stefan MetzmacherThis will make it easier to support the listen/accept socket interfaces in the next steps.
--- fs/smb/common/smbdirect/smbdirect_accept.c | 24 +++++++++++++++----- fs/smb/common/smbdirect/smbdirect_internal.h | 2 ++ 2 files changed, 20 insertions(+), 6 deletions(-)
fs/smb/common/smbdirect/smbdirect_accept.c +18 -6
@@ -292,11 +292,7 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work)u32 preferred_send_size;u32 max_receive_size;u32 max_fragmented_size; -struct smbdirect_send_io *send_io =NULL ; -struct smbdirect_negotiate_resp *nrep;u32 ntstatus; -int posted; -int ret;/* * make sure we won't start again...
@@ -397,6 +393,24 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work)*/ sp->max_fragmented_send_size = max_fragmented_size; + ntstatus =0 ;/* NT_STATUS_OK */ + +not_supported: +smbdirect_accept_negotiate_finish (sc, ntstatus); +} + +void smbdirect_accept_negotiate_finish (struct smbdirect_socket *sc,u32 ntstatus) +{ +const struct smbdirect_socket_parameters *sp = &sc->parameters; +struct smbdirect_recv_io *recv_io; +struct smbdirect_send_io *send_io; +struct smbdirect_negotiate_resp *nrep; +int posted; +int ret; + +if (ntstatus) + goto not_supported; +/* * Prepare for receiving data_transfer messages */
@@ -424,8 +438,6 @@ static void smbdirect_accept_negotiate_recv_work(struct work_struct *work)*/ atomic_set (&sc->recv_io.credits.count, posted); - ntstatus =0 ;/* NT_STATUS_OK */ - not_supported: send_io =smbdirect_connection_alloc_send_io (sc);if (IS_ERR (send_io)) {
fs/smb/common/smbdirect/smbdirect_internal.h +2 -0
@@ -139,4 +139,6 @@ int smbdirect_connection_create_mr_list(struct smbdirect_socket *sc);__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mr_list(struct smbdirect_socket *sc); +void smbdirect_accept_negotiate_finish (struct smbdirect_socket *sc,u32 ntstatus); +#endif /* __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ */
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 141/145 smb: smbdirect: introduce smbdirect_socket_bind()
In reply to Stefan MetzmacherThis will be used by the server in the next steps.
--- fs/smb/common/smbdirect/smbdirect_public.h | 3 +++ fs/smb/common/smbdirect/smbdirect_socket.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+)
fs/smb/common/smbdirect/smbdirect_public.h +3 -0
@@ -85,6 +85,9 @@ bool smbdirect_connection_is_connected(struct smbdirect_socket *sc);__SMBDIRECT_PUBLIC__ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc); +__SMBDIRECT_PUBLIC__ +int smbdirect_socket_bind(struct smbdirect_socket *sc, struct sockaddr *addr); +__SMBDIRECT_PUBLIC__ void smbdirect_socket_shutdown(struct smbdirect_socket *sc);
fs/smb/common/smbdirect/smbdirect_socket.c +16 -0
@@ -663,6 +663,22 @@ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc) SMBDIRECT_DEBUG_ERR_PTR(sc->first_error)); } +__SMBDIRECT_PUBLIC__ +int smbdirect_socket_bind(struct smbdirect_socket *sc, struct sockaddr *addr) +{ +int ret; + +if (sc->status !=SMBDIRECT_SOCKET_CREATED ) +return -EINVAL ; + + ret =rdma_bind_addr (sc->rdma.cm_id, addr); +if (ret) +return ret; + +return 0 ; +} +__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_socket_bind); +__SMBDIRECT_PUBLIC__ void smbdirect_socket_shutdown(struct smbdirect_socket *sc) {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 142/145 smb: smbdirect: introduce smbdirect_socket_{listen,accept}()
In reply to Stefan MetzmacherThese will be used by the server soon instead of using smbdirect_accept_connect_request() together with rdma_listen().
--- fs/smb/common/smbdirect/Makefile | 1 + fs/smb/common/smbdirect/smbdirect_accept.c | 110 +++++++ .../common/smbdirect/smbdirect_connection.c | 9 + fs/smb/common/smbdirect/smbdirect_listen.c | 285 ++++++++++++++++++ fs/smb/common/smbdirect/smbdirect_public.h | 8 + fs/smb/common/smbdirect/smbdirect_socket.c | 83 ++++- fs/smb/common/smbdirect/smbdirect_socket.h | 40 +++ 7 files changed, 528 insertions(+), 8 deletions(-) create mode 100644 fs/smb/common/smbdirect/smbdirect_listen.c
fs/smb/common/smbdirect/Makefile +1 -0
@@ -12,5 +12,6 @@ smbdirect-y := \ smbdirect_rw.o \ smbdirect_debug.o \ smbdirect_connect.o \ + smbdirect_listen.o \ smbdirect_accept.o \ smbdirect_main.o
fs/smb/common/smbdirect/smbdirect_accept.c +110 -0
125 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_connection.c +9 -0
@@ -163,6 +163,14 @@ void smbdirect_connection_negotiation_done(struct smbdirect_socket *sc)if (unlikely (sc->first_error))return ; +if (sc->status ==SMBDIRECT_SOCKET_CONNECTED ) +/* +* This is the accept case where +* smbdirect_socket_accept() already sets +* SMBDIRECT_SOCKET_CONNECTED +*/ + goto done; +if (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ) {/* * Something went wrong...
@@ -189,6 +197,7 @@ void smbdirect_connection_negotiation_done(struct smbdirect_socket *sc)* We need to setup the refill and send immediate work * in order to get a working connection. */ +done:INIT_WORK (&sc->recv_io.posted.refill_work, smbdirect_connection_recv_io_refill_work);INIT_WORK (&sc->idle.immediate_work, smbdirect_connection_send_immediate_work);
fs/smb/common/smbdirect/smbdirect_listen.c new file +285 -0
285 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_public.h +8 -0
@@ -124,10 +124,18 @@ __SMBDIRECT_PUBLIC__int smbdirect_connect_sync (struct smbdirect_socket *sc,const struct sockaddr *dst); +__SMBDIRECT_PUBLIC__ +int smbdirect_socket_listen(struct smbdirect_socket *sc, int backlog); +__SMBDIRECT_PUBLIC__ int smbdirect_accept_connect_request(struct smbdirect_socket *sc,const struct rdma_conn_param *param); +__SMBDIRECT_PUBLIC__ +struct smbdirect_socket *smbdirect_socket_accept(struct smbdirect_socket *lsc, +long timeo, +struct proto_accept_arg *arg); + __SMBDIRECT_PUBLIC__ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc, void *buf, size_t buf_len,
fs/smb/common/smbdirect/smbdirect_socket.c +75 -8
158 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_socket.h +40 -0
@@ -17,6 +17,7 @@enum smbdirect_socket_status {SMBDIRECT_SOCKET_CREATED , +SMBDIRECT_SOCKET_LISTENING ,SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED ,SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING ,SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED ,
@@ -42,6 +43,8 @@ const char *smbdirect_socket_status_string(enum smbdirect_socket_status status)switch (status) {case SMBDIRECT_SOCKET_CREATED :return "CREATED" ; +case SMBDIRECT_SOCKET_LISTENING : +return "LISTENING" ;case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED :return "RESOLVE_ADDR_NEEDED" ;case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING :
@@ -190,6 +193,35 @@ struct smbdirect_socket {struct delayed_work timer_work; } idle; +/* +* The state for listen sockets +*/ +struct { +spinlock_t lock; +struct list_head pending; +struct list_head ready; +wait_queue_head_t wait_queue; +/* +* This starts as -1 and a value != -1 +* means this socket was in LISTENING state +* before. Note the valid backlog can +* only be > 0. +*/ +int backlog; + } listen; + +/* +* The state for sockets waiting +* for accept, either still waiting +* for the negotiation to finish +* or already ready with a usable +* connection. +*/ +struct { +struct smbdirect_socket *listener; +struct list_head list; + } accept; +/* * The state for posted send buffers */
@@ -540,6 +572,14 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)INIT_DELAYED_WORK (&sc->idle.timer_work, __smbdirect_socket_disabled_work);disable_delayed_work_sync (&sc->idle.timer_work); +spin_lock_init (&sc->listen.lock); +INIT_LIST_HEAD (&sc->listen.pending); +INIT_LIST_HEAD (&sc->listen.ready); + sc->listen.backlog =-1 ;/* not a listener */ +init_waitqueue_head (&sc->listen.wait_queue); + +INIT_LIST_HEAD (&sc->accept.list); + sc->send_io.mem.gfp_mask =GFP_KERNEL ;atomic_set (&sc->send_io.lcredits.count,0 );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 143/145 smb: server: make use of smbdirect_socket_{listen,accept}()
In reply to Stefan MetzmacherWe no longer need the custom rdma listener.
The code logic is very similar to transport_tcp.c now using a kernel thread that loops over smbdirect_socket_accept().
This is the first step in the direction of using IPPROTO_SMBDIRECT sockets in future.
--- fs/smb/server/transport_rdma.c | 229 +++++++++++++++++---------------- 1 file changed, 116 insertions(+), 113 deletions(-)
fs/smb/server/transport_rdma.c +116 -113
@@ -75,7 +75,9 @@ struct smb_direct_device { };static struct smb_direct_listener { -struct rdma_cm_id *cm_id; +struct task_struct *thread; + +struct smbdirect_socket *socket; } smb_direct_listener;struct smb_direct_transport {
@@ -169,46 +171,15 @@ unsigned int get_smbd_max_read_write_size(struct ksmbd_transport *kt)return sp->max_read_write_size; } -static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) +static struct smb_direct_transport *alloc_transport (struct smbdirect_socket *sc) {struct smb_direct_transport *t; -struct smbdirect_socket *sc; -struct smbdirect_socket_parameters init_params = {}; -struct smbdirect_socket_parameters *sp;struct ksmbd_conn *conn; -int ret; - -/* -* Create the initial parameters -*/ - sp = &init_params; - sp->negotiate_timeout_msec =SMB_DIRECT_NEGOTIATE_TIMEOUT *1000 ; - sp->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; - sp->responder_resources =1 ; - sp->recv_credit_max = smb_direct_receive_credit_max; - sp->send_credit_target = smb_direct_send_credit_target; - sp->max_send_size = smb_direct_max_send_size; - sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; - sp->max_recv_size = smb_direct_max_receive_size; - sp->max_read_write_size = smb_direct_max_read_write_size; - sp->keepalive_interval_msec =SMB_DIRECT_KEEPALIVE_SEND_INTERVAL *1000 ; - sp->keepalive_timeout_msec =SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT *1000 ; t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );if (!t)return NULL ; - ret =smbdirect_socket_create_accepting (cm_id, &sc); -if (ret) - goto socket_create_failed; -smbdirect_socket_set_logging (sc,NULL , - smb_direct_logging_needed, - smb_direct_logging_vaprintf); - ret =smbdirect_socket_set_initial_parameters (sc, sp); -if (ret) - goto set_params_failed; - ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_WORKQUEUE ,KSMBD_DEFAULT_GFP ); -if (ret) - goto set_settings_failed; + t->socket = sc; conn =ksmbd_conn_alloc ();if (!conn)
@@ -222,14 +193,9 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)KSMBD_TRANS (t)->conn = conn;KSMBD_TRANS (t)->ops = &ksmbd_smb_direct_transport_ops; - t->socket = sc;return t; conn_alloc_failed: -set_settings_failed: -set_params_failed: -smbdirect_socket_release (sc); -socket_create_failed:kfree (t);return NULL ; }
@@ -326,47 +292,17 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)smbdirect_socket_shutdown (sc); } -static int smb_direct_prepare (struct ksmbd_transport *t) -{ -struct smb_direct_transport *st =SMBD_TRANS (t); -struct smbdirect_socket *sc = st->socket; -int ret; - -ksmbd_debug (RDMA ,"SMB_DIRECT Waiting for connection\n" ); - ret =smbdirect_connection_wait_for_connected (sc); -if (ret) { -ksmbd_debug (RDMA ,"SMB_DIRECT connection failed %d => %s\n" , - ret,errname (ret)); -return ret; - } - -ksmbd_debug (RDMA ,"SMB_DIRECT connection ready\n" ); -return 0 ; -} - -static int smb_direct_handle_connect_request (struct rdma_cm_id *new_cm_id, -struct rdma_cm_event *event) +static int smb_direct_new_connection (struct smbdirect_socket *client_sc) {struct smb_direct_transport *t; -struct smbdirect_socket *sc;struct task_struct *handler;int ret; -if (!smbdirect_frwr_is_supported (&new_cm_id->device->attrs)) { -ksmbd_debug (RDMA , -"Fast Registration Work Requests is not supported. device capabilities=%llx\n" , - new_cm_id->device->attrs.device_cap_flags); -return -EPROTONOSUPPORT ; - } - - t =alloc_transport (new_cm_id); -if (!t) + t =alloc_transport (client_sc); +if (!t) { +smbdirect_socket_release (client_sc);return -ENOMEM ; - sc = t->socket; - - ret =smbdirect_accept_connect_request (sc, &event->param.conn); -if (ret) - goto out_err; + } handler = kthread_run(ksmbd_conn_handler_loop, KSMBD_TRANS(t)->conn, "ksmbd:r%u",
@@ -383,64 +319,134 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id,return ret; } -static int smb_direct_listen_handler (struct rdma_cm_id *cm_id, -struct rdma_cm_event *event) +static int smb_direct_listener_kthread_fn (void *p) { -switch (event->event) { -case RDMA_CM_EVENT_CONNECT_REQUEST : { -int ret =smb_direct_handle_connect_request (cm_id, event); +struct smb_direct_listener *listener = (struct smb_direct_listener *)p; +struct smbdirect_socket *client_sc =NULL ; -if (ret) { -pr_err ("Can't create transport: %d\n" , ret); -return ret; - } +while (!kthread_should_stop ()) { +struct proto_accept_arg arg = { .err = -EINVAL , }; +long timeo =MAX_SCHEDULE_TIMEOUT ; -ksmbd_debug (RDMA ,"Received connection request. cm_id=%p\n" , - cm_id); -break ; - } -default : -pr_err ("Unexpected listen event. cm_id=%p, event=%s (%d)\n" , - cm_id,rdma_event_msg (event->event), event->event); -break ; +if (!listener->socket) +break ; + client_sc =smbdirect_socket_accept (listener->socket, timeo, &arg); +if (!client_sc && arg.err == -EINVAL ) +break ; +if (!client_sc) +continue ; + +ksmbd_debug (CONN ,"connect success: accepted new connection\n" ); +smb_direct_new_connection (client_sc); } + +ksmbd_debug (CONN ,"releasing socket\n" );return 0 ; } -static int smb_direct_listen (int port) +static void smb_direct_listener_destroy (struct smb_direct_listener *listener) {int ret; -struct rdma_cm_id *cm_id; + +if (listener->socket) +smbdirect_socket_shutdown (listener->socket); + +if (listener->thread) { + ret =kthread_stop (listener->thread); +if (ret) +pr_err ("failed to stop forker thread\n" ); + listener->thread =NULL ; + } + +if (listener->socket) { +smbdirect_socket_release (listener->socket); + listener->socket =NULL ; + } +} + +static int smb_direct_listen (int port) +{ +struct net *net = current->nsproxy->net_ns; +struct task_struct *kthread;struct sockaddr_in sin = { .sin_family =AF_INET , .sin_addr.s_addr =htonl (INADDR_ANY ), .sin_port =htons (port), }; +struct smbdirect_socket_parameters init_params = {}; +struct smbdirect_socket_parameters *sp; +struct smbdirect_socket *sc; +int ret; - cm_id =rdma_create_id (&init_net, smb_direct_listen_handler, - &smb_direct_listener,RDMA_PS_TCP ,IB_QPT_RC ); -if (IS_ERR (cm_id)) { -pr_err ("Can't create cm id: %ld\n" ,PTR_ERR (cm_id)); -return PTR_ERR (cm_id); + ret =smbdirect_socket_create_kern (net, &sc); +if (ret) { +pr_err ("smbdirect_socket_create_kern() failed: %d %s\n" , + ret,errname (ret)); +return ret; } - ret =rdma_bind_addr (cm_id, (struct sockaddr *)&sin); +/* +* Create the initial parameters +*/ + sp = &init_params; + sp->negotiate_timeout_msec =SMB_DIRECT_NEGOTIATE_TIMEOUT *1000 ; + sp->initiator_depth =SMB_DIRECT_CM_INITIATOR_DEPTH ; + sp->responder_resources =1 ; + sp->recv_credit_max = smb_direct_receive_credit_max; + sp->send_credit_target = smb_direct_send_credit_target; + sp->max_send_size = smb_direct_max_send_size; + sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; + sp->max_recv_size = smb_direct_max_receive_size; + sp->max_read_write_size = smb_direct_max_read_write_size; + sp->keepalive_interval_msec =SMB_DIRECT_KEEPALIVE_SEND_INTERVAL *1000 ; + sp->keepalive_timeout_msec =SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT *1000 ; + +smbdirect_socket_set_logging (sc,NULL , + smb_direct_logging_needed, + smb_direct_logging_vaprintf); + ret =smbdirect_socket_set_initial_parameters (sc, sp); +if (ret) { +pr_err ("Failed smbdirect_socket_set_initial_parameters(): %d %s\n" , + ret,errname (ret)); + goto err; + } + ret =smbdirect_socket_set_kernel_settings (sc,IB_POLL_WORKQUEUE ,KSMBD_DEFAULT_GFP );if (ret) { -pr_err ("Can't bind: %d\n" , ret); +pr_err ("Failed smbdirect_socket_set_kernel_settings(): %d %s\n" , + ret,errname (ret)); goto err; } - smb_direct_listener.cm_id = cm_id; + ret =smbdirect_socket_bind (sc, (struct sockaddr *)&sin); +if (ret) { +pr_err ("smbdirect_socket_bind() failed: %d %s\n" , + ret,errname (ret)); + goto err; + } - ret =rdma_listen (cm_id,10 ); + ret =smbdirect_socket_listen (sc,10 );if (ret) { -pr_err ("Can't listen: %d\n" , ret); +pr_err ("Port[%d] smbdirect_socket_listen() failed: %d %s\n" , + port, ret,errname (ret)); goto err; } + + smb_direct_listener.socket = sc; + + kthread =kthread_run (smb_direct_listener_kthread_fn, + &smb_direct_listener, +"ksmbd-smbdirect-listener" ); +if (IS_ERR (kthread)) { + ret =PTR_ERR (kthread); +pr_err ("Can't start ksmbd listen kthread: %d %s\n" , + ret,errname (ret)); + goto err; + } + + smb_direct_listener.thread = kthread;return 0 ; err: - smb_direct_listener.cm_id =NULL ; -rdma_destroy_id (cm_id); +smb_direct_listener_destroy (&smb_direct_listener);return ret; }
@@ -494,7 +500,8 @@ int ksmbd_rdma_init(void) {int ret; - smb_direct_listener.cm_id =NULL ; + smb_direct_listener.socket =NULL ; + smb_direct_listener.thread =NULL ; ret =ib_register_client (&smb_direct_ib_client);if (ret) {
@@ -508,20 +515,17 @@ int ksmbd_rdma_init(void)return ret; } -ksmbd_debug (RDMA ,"init RDMA listener. cm_id=%p\n" , - smb_direct_listener.cm_id); +ksmbd_debug (RDMA ,"init RDMA listener\n" );return 0 ; }void ksmbd_rdma_stop_listening (void ) { -if (!smb_direct_listener.cm_id) +if (!smb_direct_listener.socket)return ;ib_unregister_client (&smb_direct_ib_client); -rdma_destroy_id (smb_direct_listener.cm_id); - - smb_direct_listener.cm_id =NULL ; +smb_direct_listener_destroy (&smb_direct_listener); }static bool ksmbd_find_rdma_capable_netdev (struct net_device *netdev)
@@ -589,7 +593,6 @@ bool ksmbd_rdma_capable_netdev(struct net_device *netdev) }static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { - .prepare = smb_direct_prepare, .disconnect = smb_direct_disconnect, .shutdown = smb_direct_shutdown, .writev = smb_direct_writev,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 144/145 smb: server: remove unused ksmbd_transport_ops.prepare()
In reply to Stefan MetzmacherThis is no longer needed for smbdirect.
--- fs/smb/server/connection.c | 4 ---- fs/smb/server/connection.h | 1 - 2 files changed, 5 deletions(-)
fs/smb/server/connection.c +0 -4
@@ -317,9 +317,6 @@ int ksmbd_conn_handler_loop(void *p)mutex_init (&conn->srv_mutex);__module_get (THIS_MODULE ); -if (t->ops->prepare && t->ops->prepare (t)) - goto out; - max_req = server_conf.max_inflight_req; conn->last_active = jiffies;set_freezable ();
@@ -411,7 +408,6 @@ int ksmbd_conn_handler_loop(void *p) } } -out:ksmbd_conn_set_releasing (conn);/* Wait till all reference dropped to the Server object*/ ksmbd_debug (CONN ,"Wait for all pending requests(%d)\n" ,atomic_read (&conn->r_count));
fs/smb/server/connection.h +0 -1
@@ -126,7 +126,6 @@ struct ksmbd_conn_ops { };struct ksmbd_transport_ops { -int (*prepare)(struct ksmbd_transport *t);void (*disconnect)(struct ksmbd_transport *t);void (*shutdown)(struct ksmbd_transport *t); int (*read)(struct ksmbd_transport *t, char *buf,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 145/145 smb: smbdirect: remove unused SMBDIRECT_USE_INLINE_C_FILES logic
In reply to Stefan MetzmacherWe always build as standalone module (or as part of the core kernel).
This also removes unused elements from struct smbdirect_socket and unused exports.
--- fs/smb/common/smbdirect/smbdirect_accept.c | 3 - .../common/smbdirect/smbdirect_all_c_files.c | 24 ------- fs/smb/common/smbdirect/smbdirect_connect.c | 2 - .../common/smbdirect/smbdirect_connection.c | 29 -------- fs/smb/common/smbdirect/smbdirect_debug.c | 1 - fs/smb/common/smbdirect/smbdirect_internal.h | 35 +-------- fs/smb/common/smbdirect/smbdirect_listen.c | 1 - fs/smb/common/smbdirect/smbdirect_mr.c | 5 -- fs/smb/common/smbdirect/smbdirect_public.h | 40 ----------- fs/smb/common/smbdirect/smbdirect_rw.c | 1 - fs/smb/common/smbdirect/smbdirect_socket.c | 71 ------------------- fs/smb/common/smbdirect/smbdirect_socket.h | 15 ---- 12 files changed, 3 insertions(+), 224 deletions(-) delete mode 100644 fs/smb/common/smbdirect/smbdirect_all_c_files.c
fs/smb/common/smbdirect/smbdirect_accept.c +0 -3
@@ -14,7 +14,6 @@ static int smbdirect_accept_init_params(struct smbdirect_socket *sc);static void smbdirect_accept_negotiate_recv_done (struct ib_cq *cq,struct ib_wc *wc);static void smbdirect_accept_negotiate_send_done (struct ib_cq *cq,struct ib_wc *wc); -__SMBDIRECT_PUBLIC__ int smbdirect_accept_connect_request (struct smbdirect_socket *sc,const struct rdma_conn_param *param) {
@@ -160,7 +159,6 @@ int smbdirect_accept_connect_request(struct smbdirect_socket *sc, init_params_failed:return ret; } -__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_accept_connect_request);static int smbdirect_accept_init_params (struct smbdirect_socket *sc) {
@@ -722,7 +720,6 @@ static long smbdirect_socket_wait_for_accept(struct smbdirect_socket *lsc, longreturn 0 ; } -__SMBDIRECT_PUBLIC__ struct smbdirect_socket *smbdirect_socket_accept (struct smbdirect_socket *lsc,long timeo,struct proto_accept_arg *arg)
fs/smb/common/smbdirect/smbdirect_all_c_files.c deleted +0 -24
@@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright (c) 2025, Stefan Metzmacher -*/ - -/* -* This is a temporary solution in order -* to include the common smbdirect functions -* into .c files in order to make a transformation -* in tiny bisectable steps possible. -* -* It will be replaced by a smbdirect.ko with -* exported public functions at the end. -*/ -#ifndef SMBDIRECT_USE_INLINE_C_FILES -#error SMBDIRECT_USE_INLINE_C_FILES define needed -#endif -#include "smbdirect_socket.c" -#include "smbdirect_connection.c" -#include "smbdirect_mr.c" -#include "smbdirect_rw.c" -#include "smbdirect_debug.c" -#include "smbdirect_connect.c" -#include "smbdirect_accept.c"
fs/smb/common/smbdirect/smbdirect_connect.c +0 -2
@@ -15,7 +15,6 @@ static int smbdirect_connect_negotiate_start(struct smbdirect_socket *sc);static void smbdirect_connect_negotiate_send_done (struct ib_cq *cq,struct ib_wc *wc);static void smbdirect_connect_negotiate_recv_done (struct ib_cq *cq,struct ib_wc *wc); -__SMBDIRECT_PUBLIC__ int smbdirect_connect (struct smbdirect_socket *sc,const struct sockaddr *dst) {const struct sockaddr *src =NULL ;
@@ -817,7 +816,6 @@ static void smbdirect_connect_negotiate_recv_work(struct work_struct *work)smbdirect_connection_negotiation_done (sc); } -__SMBDIRECT_PUBLIC__ int smbdirect_connect_sync (struct smbdirect_socket *sc,const struct sockaddr *dst) {
fs/smb/common/smbdirect/smbdirect_connection.c +0 -29
@@ -22,7 +22,6 @@ static ssize_t smbdirect_map_sges_from_iter(struct iov_iter *iter, size_t len,static void smbdirect_connection_recv_io_refill_work (struct work_struct *work);static void smbdirect_connection_send_immediate_work (struct work_struct *work); -__maybe_unused /* this is temporary while this file is included in others */ static void smbdirect_connection_qp_event_handler (struct ib_event *event,void *context) {struct smbdirect_socket *sc = context;
@@ -143,7 +142,6 @@ static int smbdirect_connection_rdma_event_handler(struct rdma_cm_id *id,return 0 ; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_rdma_established (struct smbdirect_socket *sc) { smbdirect_log_rdma_event(sc, SMBDIRECT_LOG_INFO,
@@ -157,7 +155,6 @@ void smbdirect_connection_rdma_established(struct smbdirect_socket *sc) sc->rdma.expected_event =RDMA_CM_EVENT_DISCONNECTED ; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_negotiation_done (struct smbdirect_socket *sc) {if (unlikely (sc->first_error))
@@ -242,7 +239,6 @@ static u32 smbdirect_rdma_rw_send_wrs(struct ib_device *dev,return factor * attr->cap.max_rdma_ctxs; } -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_qp (struct smbdirect_socket *sc) {const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -400,7 +396,6 @@ int smbdirect_connection_create_qp(struct smbdirect_socket *sc)return ret; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_qp (struct smbdirect_socket *sc) {if (sc->ib.qp) {
@@ -422,7 +417,6 @@ void smbdirect_connection_destroy_qp(struct smbdirect_socket *sc) } } -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_mem_pools (struct smbdirect_socket *sc) {const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -502,7 +496,6 @@ int smbdirect_connection_create_mem_pools(struct smbdirect_socket *sc)return -ENOMEM ; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mem_pools (struct smbdirect_socket *sc) {struct smbdirect_recv_io *recv_io, *next_io;
@@ -534,7 +527,6 @@ void smbdirect_connection_destroy_mem_pools(struct smbdirect_socket *sc) sc->send_io.mem.cache =NULL ; } -__SMBDIRECT_PRIVATE__ struct smbdirect_send_io *smbdirect_connection_alloc_send_io (struct smbdirect_socket *sc) {struct smbdirect_send_io *msg;
@@ -549,7 +541,6 @@ struct smbdirect_send_io *smbdirect_connection_alloc_send_io(struct smbdirect_soreturn msg; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_free_send_io (struct smbdirect_send_io *msg) {struct smbdirect_socket *sc = msg->socket;
@@ -581,7 +572,6 @@ void smbdirect_connection_free_send_io(struct smbdirect_send_io *msg)mempool_free (msg, sc->send_io.mem.pool); } -__SMBDIRECT_PRIVATE__ struct smbdirect_recv_io *smbdirect_connection_get_recv_io (struct smbdirect_socket *sc) {struct smbdirect_recv_io *msg =NULL ;
@@ -601,7 +591,6 @@ struct smbdirect_recv_io *smbdirect_connection_get_recv_io(struct smbdirect_sockreturn msg; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_put_recv_io (struct smbdirect_recv_io *msg) {struct smbdirect_socket *sc = msg->socket;
@@ -628,7 +617,6 @@ void smbdirect_connection_put_recv_io(struct smbdirect_recv_io *msg)queue_work (sc->workqueues.refill, &sc->recv_io.posted.refill_work); } -__maybe_unused /* this is temporary while this file is included in others */ static void smbdirect_connection_reassembly_append_recv_io (struct smbdirect_socket *sc,struct smbdirect_recv_io *msg,u32 data_length)
@@ -655,7 +643,6 @@ static void smbdirect_connection_reassembly_append_recv_io(struct smbdirect_sock sc->statistics.enqueue_reassembly_queue++; } -__maybe_unused /* this is temporary while this file is included in others */ static struct smbdirect_recv_io *smbdirect_connection_reassembly_first_recv_io (struct smbdirect_socket *sc) {
@@ -668,7 +655,6 @@ smbdirect_connection_reassembly_first_recv_io(struct smbdirect_socket *sc)return msg; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_negotiate_rdma_resources(struct smbdirect_socket *sc, u8 peer_initiator_depth, u8 peer_responder_resources,
@@ -730,7 +716,6 @@ void smbdirect_connection_negotiate_rdma_resources(struct smbdirect_socket *sc, peer_responder_resources); } -__SMBDIRECT_PUBLIC__ bool smbdirect_connection_is_connected (struct smbdirect_socket *sc) {if (unlikely (!sc || sc->first_error || sc->status !=SMBDIRECT_SOCKET_CONNECTED ))
@@ -739,7 +724,6 @@ bool smbdirect_connection_is_connected(struct smbdirect_socket *sc) }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_is_connected); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_wait_for_connected (struct smbdirect_socket *sc) {const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -808,7 +792,6 @@ int smbdirect_connection_wait_for_connected(struct smbdirect_socket *sc) }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_wait_for_connected); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_idle_timer_work (struct work_struct *work) { struct smbdirect_socket *sc =
@@ -840,7 +823,6 @@ void smbdirect_connection_idle_timer_work(struct work_struct *work)queue_work (sc->workqueues.immediate, &sc->idle.immediate_work); } -__maybe_unused /* this is temporary while this file is included in others */ static u16 smbdirect_connection_grant_recv_credits (struct smbdirect_socket *sc) {u16 new_credits;
@@ -860,7 +842,6 @@ static u16 smbdirect_connection_grant_recv_credits(struct smbdirect_socket *sc)return new_credits; } -__maybe_unused /* this is temporary while this file is included in others */ static bool smbdirect_connection_request_keep_alive (struct smbdirect_socket *sc) {const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -879,7 +860,6 @@ static bool smbdirect_connection_request_keep_alive(struct smbdirect_socket *sc)return false; } -__SMBDIRECT_PRIVATE__ int smbdirect_connection_post_send_wr (struct smbdirect_socket *sc,struct ib_send_wr *wr) {
@@ -1042,7 +1022,6 @@ static int smbdirect_connection_post_send_io(struct smbdirect_socket *sc,return smbdirect_connection_post_send_wr (sc, &msg->wr); } -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc, struct smbdirect_send_batch *batch, struct iov_iter *iter,
@@ -1180,7 +1159,6 @@ int smbdirect_connection_send_single_iter(struct smbdirect_socket *sc, }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_single_iter); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_wait_zero_pending (struct smbdirect_socket *sc) {/*
@@ -1206,7 +1184,6 @@ int smbdirect_connection_send_wait_zero_pending(struct smbdirect_socket *sc) }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_send_wait_zero_pending); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_iter(struct smbdirect_socket *sc, struct iov_iter *iter, unsigned int flags,
@@ -1330,8 +1307,6 @@ static void smbdirect_connection_send_io_done(struct ib_cq *cq, struct ib_wc *wcif (atomic_dec_and_test (&sc->send_io.pending.count))wake_up (&sc->send_io.pending.zero_wait_queue); - -wake_up (&sc->send_io.pending.dec_wait_queue); }static void smbdirect_connection_send_immediate_work (struct work_struct *work)
@@ -1355,7 +1330,6 @@ static void smbdirect_connection_send_immediate_work(struct work_struct *work) } } -__SMBDIRECT_PRIVATE__ int smbdirect_connection_post_recv_io (struct smbdirect_recv_io *msg) {struct smbdirect_socket *sc = msg->socket;
@@ -1397,7 +1371,6 @@ int smbdirect_connection_post_recv_io(struct smbdirect_recv_io *msg)return ret; } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_recv_io_done (struct ib_cq *cq,struct ib_wc *wc) { struct smbdirect_recv_io *recv_io =
@@ -1564,7 +1537,6 @@ void smbdirect_connection_recv_io_done(struct ib_cq *cq, struct ib_wc *wc)smbdirect_socket_schedule_cleanup (sc, -ECONNABORTED ); } -__SMBDIRECT_PRIVATE__ int smbdirect_connection_recv_io_refill (struct smbdirect_socket *sc) {int missing;
@@ -1670,7 +1642,6 @@ static void smbdirect_connection_recv_io_refill_work(struct work_struct *work) } } -__SMBDIRECT_PUBLIC__ int smbdirect_connection_recvmsg (struct smbdirect_socket *sc,struct msghdr *msg,unsigned int flags)
fs/smb/common/smbdirect/smbdirect_debug.c +0 -1
@@ -7,7 +7,6 @@#include "smbdirect_internal.h" #include <linux/seq_file.h> -__SMBDIRECT_PUBLIC__ void smbdirect_connection_legacy_debug_proc_show (struct smbdirect_socket *sc,unsigned int rdma_readwrite_threshold,struct seq_file *m)
fs/smb/common/smbdirect/smbdirect_internal.h +3 -32
@@ -6,9 +6,7 @@#ifndef __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__#define __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ -#ifndef SMBDIRECT_USE_INLINE_C_FILES #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#endif /* ! SMBDIRECT_USE_INLINE_C_FILES */ #include <linux/errname.h> #include "smbdirect.h"
@@ -34,20 +32,10 @@ extern struct smbdirect_module_state smbdirect_globals;#include "smbdirect_socket.h" -#ifdef SMBDIRECT_USE_INLINE_C_FILES -/* this is temporary while this file is included in others */ -#define __SMBDIRECT_PRIVATE__ __maybe_unused static -#else -#define __SMBDIRECT_PRIVATE__ -#endif - -__SMBDIRECT_PRIVATE__ int smbdirect_socket_init_new (struct net *net,struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ int smbdirect_socket_init_accepting (struct rdma_cm_id *id,struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void __smbdirect_socket_schedule_cleanup(struct smbdirect_socket *sc, const char *macro_name, unsigned int lvl,
@@ -70,10 +58,8 @@ void __smbdirect_socket_schedule_cleanup(struct smbdirect_socket *sc, __func__, __LINE__, __error, &__force_status); \ }while (0 ) -__SMBDIRECT_PRIVATE__ void smbdirect_socket_destroy_sync(struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc, enum smbdirect_socket_status expected_status, int unexpected_errno,
@@ -81,64 +67,49 @@ int smbdirect_socket_wait_for_credits(struct smbdirect_socket *sc,atomic_t *total_credits, int needed); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_rdma_established (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_negotiation_done (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_qp (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_qp (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_mem_pools (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mem_pools (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ struct smbdirect_send_io *smbdirect_connection_alloc_send_io (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_free_send_io (struct smbdirect_send_io *msg); -__SMBDIRECT_PRIVATE__ struct smbdirect_recv_io *smbdirect_connection_get_recv_io (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_put_recv_io (struct smbdirect_recv_io *msg); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_negotiate_rdma_resources (struct smbdirect_socket *sc,u8 peer_initiator_depth,u8 peer_responder_resources,const struct rdma_conn_param *param); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_idle_timer_work (struct work_struct *work); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_post_send_wr (struct smbdirect_socket *sc,struct ib_send_wr *wr); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_post_recv_io (struct smbdirect_recv_io *msg); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_recv_io_done (struct ib_cq *cq,struct ib_wc *wc); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_recv_io_refill (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_mr_list (struct smbdirect_socket *sc); -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mr_list (struct smbdirect_socket *sc); +int smbdirect_accept_connect_request (struct smbdirect_socket *sc, +const struct rdma_conn_param *param); +void smbdirect_accept_negotiate_finish (struct smbdirect_socket *sc,u32 ntstatus);#endif /* __FS_SMB_COMMON_SMBDIRECT_INTERNAL_H__ */
fs/smb/common/smbdirect/smbdirect_listen.c +0 -1
@@ -10,7 +10,6 @@static int smbdirect_listen_rdma_event_handler (struct rdma_cm_id *id,struct rdma_cm_event *event); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_listen (struct smbdirect_socket *sc,int backlog) {int ret;
fs/smb/common/smbdirect/smbdirect_mr.c +0 -5
@@ -13,7 +13,6 @@* Recovery is done in smbd_mr_recovery_work. The content of list entry changes * as MRs are used and recovered for I/O, but the list links will not change */ -__SMBDIRECT_PRIVATE__ int smbdirect_connection_create_mr_list (struct smbdirect_socket *sc) {const struct smbdirect_socket_parameters *sp = &sc->parameters;
@@ -117,7 +116,6 @@ static void smbdirect_mr_io_free_locked(struct kref *kref)kfree (mr); } -__SMBDIRECT_PRIVATE__ void smbdirect_connection_destroy_mr_list (struct smbdirect_socket *sc) {struct smbdirect_mr_io *mr, *tmp;
@@ -264,7 +262,6 @@ static int smbdirect_iter_to_sgt(struct iov_iter *iter,* need_invalidate: true if this MR needs to be locally invalidated after I/O * return value: the MR registered, NULL if failed. */ -__SMBDIRECT_PUBLIC__ struct smbdirect_mr_io * smbdirect_connection_register_mr_io(struct smbdirect_socket *sc, struct iov_iter *iter,
@@ -386,7 +383,6 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc, }__SMBDIRECT_EXPORT_SYMBOL__ (smbdirect_connection_register_mr_io); -__SMBDIRECT_PUBLIC__ void smbdirect_mr_io_fill_buffer_descriptor (struct smbdirect_mr_io *mr,struct smbdirect_buffer_descriptor_v1 *v1) {
@@ -410,7 +406,6 @@ __SMBDIRECT_EXPORT_SYMBOL__(smbdirect_mr_io_fill_buffer_descriptor);* and we have to locally invalidate the buffer to prevent data is being * modified by remote peer after upper layer consumes it */ -__SMBDIRECT_PUBLIC__ void smbdirect_connection_deregister_mr_io (struct smbdirect_mr_io *mr) {struct smbdirect_socket *sc = mr->socket;
fs/smb/common/smbdirect/smbdirect_public.h +0 -40
@@ -13,43 +13,26 @@ struct smbdirect_socket;struct smbdirect_send_batch ;struct smbdirect_mr_io ; -#ifdef SMBDIRECT_USE_INLINE_C_FILES -/* this is temporary while this file is included in others */ -#define __SMBDIRECT_PUBLIC__ __maybe_unused static -#define __SMBDIRECT_EXPORT_SYMBOL__ (__sym) -#else -#define __SMBDIRECT_PUBLIC__#define __SMBDIRECT_EXPORT_SYMBOL__ (__sym) EXPORT_SYMBOL_FOR_MODULES(__sym, "cifs,ksmbd") -#endif #include <rdma/rw.h> -__SMBDIRECT_PUBLIC__ bool smbdirect_frwr_is_supported (const struct ib_device_attr *attrs); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_create_kern (struct net *net,struct smbdirect_socket **_sc); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_create_accepting (struct rdma_cm_id *id,struct smbdirect_socket **_sc); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_set_initial_parameters (struct smbdirect_socket *sc,const struct smbdirect_socket_parameters *sp); -__SMBDIRECT_PUBLIC__ const struct smbdirect_socket_parameters *smbdirect_socket_get_current_parameters (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_set_kernel_settings (struct smbdirect_socket *sc,enum ib_poll_context poll_ctx,gfp_t gfp_mask); -__SMBDIRECT_PUBLIC__ -int smbdirect_socket_set_custom_workqueue(struct smbdirect_socket *sc, -struct workqueue_struct *workqueue); -#define SMBDIRECT_LOG_ERR 0x0#define SMBDIRECT_LOG_INFO 0x1
@@ -64,7 +47,6 @@ int smbdirect_socket_set_custom_workqueue(struct smbdirect_socket *sc,#define SMBDIRECT_LOG_RDMA_MR 0x100#define SMBDIRECT_LOG_RDMA_RW 0x200#define SMBDIRECT_LOG_NEGOTIATE 0x400 -__SMBDIRECT_PUBLIC__ void smbdirect_socket_set_logging(struct smbdirect_socket *sc, void *private_ptr, bool (*needed)(struct smbdirect_socket *sc,
@@ -79,85 +61,63 @@ void smbdirect_socket_set_logging(struct smbdirect_socket *sc,unsigned int cls, struct va_format *vaf)); -__SMBDIRECT_PUBLIC__ bool smbdirect_connection_is_connected (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_wait_for_connected (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_bind (struct smbdirect_socket *sc,struct sockaddr *addr); -__SMBDIRECT_PUBLIC__ void smbdirect_socket_shutdown (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ void smbdirect_socket_release (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_single_iter (struct smbdirect_socket *sc,struct smbdirect_send_batch *batch,struct iov_iter *iter,unsigned int flags,u32 remaining_data_length); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_wait_zero_pending (struct smbdirect_socket *sc); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_send_iter (struct smbdirect_socket *sc,struct iov_iter *iter,unsigned int flags,bool need_invalidate,unsigned int remote_key); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_recvmsg (struct smbdirect_socket *sc,struct msghdr *msg,unsigned int flags); -__SMBDIRECT_PUBLIC__ int smbdirect_connect (struct smbdirect_socket *sc,const struct sockaddr *dst); -__SMBDIRECT_PUBLIC__ int smbdirect_connect_sync (struct smbdirect_socket *sc,const struct sockaddr *dst); -__SMBDIRECT_PUBLIC__ int smbdirect_socket_listen (struct smbdirect_socket *sc,int backlog); -__SMBDIRECT_PUBLIC__ -int smbdirect_accept_connect_request(struct smbdirect_socket *sc, -const struct rdma_conn_param *param); - -__SMBDIRECT_PUBLIC__ struct smbdirect_socket *smbdirect_socket_accept (struct smbdirect_socket *lsc,long timeo,struct proto_accept_arg *arg); -__SMBDIRECT_PUBLIC__ int smbdirect_connection_rdma_xmit (struct smbdirect_socket *sc,void *buf,size_t buf_len,struct smbdirect_buffer_descriptor_v1 *desc,size_t desc_len,bool is_read); -__SMBDIRECT_PUBLIC__ struct smbdirect_mr_io *smbdirect_connection_register_mr_io (struct smbdirect_socket *sc,struct iov_iter *iter,bool writing,bool need_invalidate); -__SMBDIRECT_PUBLIC__ void smbdirect_mr_io_fill_buffer_descriptor (struct smbdirect_mr_io *mr,struct smbdirect_buffer_descriptor_v1 *v1); -__SMBDIRECT_PUBLIC__ void smbdirect_connection_deregister_mr_io (struct smbdirect_mr_io *mr); -__SMBDIRECT_PUBLIC__ void smbdirect_connection_legacy_debug_proc_show (struct smbdirect_socket *sc,unsigned int rdma_readwrite_threshold,struct seq_file *m);
fs/smb/common/smbdirect/smbdirect_rw.c +0 -1
@@ -105,7 +105,6 @@ static void smbdirect_connection_rdma_write_done(struct ib_cq *cq, struct ib_wcsmbdirect_connection_rdma_rw_done (cq, wc,DMA_TO_DEVICE ); } -__SMBDIRECT_PUBLIC__ int smbdirect_connection_rdma_xmit(struct smbdirect_socket *sc, void *buf, size_t buf_len, struct smbdirect_buffer_descriptor_v1 *desc,
fs/smb/common/smbdirect/smbdirect_socket.c +0 -71
185 lines not on this page · raw message
fs/smb/common/smbdirect/smbdirect_socket.h +0 -15
@@ -257,10 +257,6 @@ struct smbdirect_socket {*/ struct {atomic_t count; -/* -* woken when count is decremented -*/ -wait_queue_head_t dec_wait_queue;/* * woken when count reached zero */
@@ -373,13 +369,6 @@ struct smbdirect_socket {struct {atomic_t count; } used; - -struct work_struct recovery_work; - -/* Used by transport to wait until all MRs are returned */ -struct { -wait_queue_head_t wait_queue; - } cleanup; } mr_io;/*
@@ -589,7 +578,6 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)init_waitqueue_head (&sc->send_io.credits.wait_queue);atomic_set (&sc->send_io.pending.count,0 ); -init_waitqueue_head (&sc->send_io.pending.dec_wait_queue);init_waitqueue_head (&sc->send_io.pending.zero_wait_queue); sc->recv_io.mem.gfp_mask =GFP_KERNEL ;
@@ -616,9 +604,6 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)atomic_set (&sc->mr_io.ready.count,0 );init_waitqueue_head (&sc->mr_io.ready.wait_queue);atomic_set (&sc->mr_io.used.count,0 ); -INIT_WORK (&sc->mr_io.recovery_work, __smbdirect_socket_disabled_work); -disable_work_sync (&sc->mr_io.recovery_work); -init_waitqueue_head (&sc->mr_io.cleanup.wait_queue); sc->logging.private_ptr =NULL ; sc->logging.needed = __smbdirect_log_needed;
Signature · 1 line
2.43.0
Quoted 2 lines · Stefan Metzmacher
It is based on dhowells-linux-fs/cifs-cleanup at commit
1bc2089694a33afb711779dfcb4bbbe10ccbe466,
Btw, I applied the acks I've got to my patches on that branch if you want to rebase on it; if not, I'm sure Steve will cope:-).
David
Namjae Jeon
maintainerThis patchset completely breaks ksmbd rdma. Even simple file copying on Windows clients and cifs.ko doesn't work with the following error messages.
with Windows client :
[ 307.323201] ksmbd: smb_direct: smbdirect_socket_schedule_cleanup(-ESHUTDOWN) called from smbdirect_socket_shutdown in line=683 status=LISTENING [ 307.572330] ksmbd: running [ 473.984576] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 473.984595] ksmbd: sock_read failed: -107 [ 473.984708] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 473.984726] ksmbd: sock_read failed: -107 [ 480.044722] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 480.044742] ksmbd: sock_read failed: -107 [ 480.045290] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 480.045307] ksmbd: sock_read failed: -107 [ 480.045650] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 480.045667] ksmbd: sock_read failed: -107 [ 485.115961] ksmbd: smb_direct: status=DISCONNECTED first_error=-ECONNRESET => -ENOTCONN [ 485.115980] ksmbd: sock_read failed: -107
with cifs.ko :
[ 191.319885] CIFS: Attempting to mount //192.168.0.200/homes2 [ 191.322664] CIFS: VFS: smbdirect_connect_rdma_event_handler:251 RDMA_CONNECT_RUNNING (first_error=0, expected=established) => event=rejected status=8 => ret=-ECONNREFUSED [ 191.322671] CIFS: VFS: smbdirect_connect_rdma_event_handler:260 smbdirect_socket_schedule_cleanup(-ECONNREFUSED) called from smbdirect_connect_rdma_event_handler in line=260 status=RDMA_CONNECT_RUNNING [ 191.322681] CIFS: VFS: smbdirect_connection_wait_for_connected:784 connection failed -ECONNREFUSED device: rocep1s0f0 local: 192.168.0.200:50941 remote: 192.168.0.200:5445 [ 191.322685] CIFS: VFS: smbdirect_connect_sync:834 wait for smbdirect_connect(192.168.0.200:5445) failed -ECONNREFUSED [ 191.322688] CIFS: VFS: _smbd_get_connection:291 smbdirect_connect_sync(192.168.0.200:5445) failed with -111 -ECONNREFUSED [ 191.339145] CIFS: VFS: RDMA transport established