smb: smbdirect/client/server: make use of common structures
Subsystems (3)
Stefan Metzmacher
reviewerPATCH v4 114/142 smb: server: implement correct keepalive and timeout handling for smbdirect
In reply to Stefan MetzmacherNow client and server behave in the same way and we can start to share common functions.
--- fs/smb/server/transport_rdma.c | 74 ++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+)
fs/smb/server/transport_rdma.c +74 -0
@@ -36,6 +36,12 @@/* SMB_DIRECT negotiation timeout (for the server) in seconds */ #define SMB_DIRECT_NEGOTIATE_TIMEOUT 5 +/* The timeout to wait for a keepalive message from peer in seconds */ +#define SMB_DIRECT_KEEPALIVE_SEND_INTERVAL 120 + +/* The timeout to wait for a keepalive message from peer in seconds */ +#define SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT 5 +/* * Default maximum number of RDMA read/write outstanding on this connection * This value is possibly decreased during QP creation on hardware limit
@@ -220,6 +226,7 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work)*/ disable_work (&sc->disconnect_work);disable_work (&sc->recv_io.posted.refill_work); +disable_delayed_work (&sc->idle.timer_work);disable_work (&sc->idle.immediate_work);switch (sc->status) {
@@ -276,6 +283,32 @@ static void smb_direct_send_immediate_work(struct work_struct *work)smb_direct_post_send_data (t,NULL ,NULL ,0 ,0 ); } +static void smb_direct_idle_connection_timer (struct work_struct *work) +{ +struct smbdirect_socket *sc = + container_of(work, struct smbdirect_socket, idle.timer_work.work); +struct smbdirect_socket_parameters *sp = &sc->parameters; +struct smb_direct_transport *t = + container_of(sc, struct smb_direct_transport, socket); + +if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) { +smb_direct_disconnect_rdma_connection (t); +return ; + } + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) +return ; + +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec)); +queue_work (smb_direct_wq, &sc->idle.immediate_work); +} +static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id) {struct smb_direct_transport *t;
@@ -301,6 +334,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sp->max_fragmented_recv_size = smb_direct_max_fragmented_recv_size; sp->max_recv_size = smb_direct_max_receive_size; sp->max_read_write_size = smb_direct_max_read_write_size; + sp->keepalive_interval_msec =SMB_DIRECT_KEEPALIVE_SEND_INTERVAL *1000 ; + sp->keepalive_timeout_msec =SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT *1000 ; sc->rdma.cm_id = cm_id; cm_id->context = t;
@@ -310,6 +345,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)INIT_WORK (&sc->recv_io.posted.refill_work, smb_direct_post_recv_credits);INIT_WORK (&sc->idle.immediate_work, smb_direct_send_immediate_work); +INIT_DELAYED_WORK (&sc->idle.timer_work, smb_direct_idle_connection_timer); conn =ksmbd_conn_alloc ();if (!conn)
@@ -344,6 +380,7 @@ static void free_transport(struct smb_direct_transport *t)wake_up_all (&sc->send_io.pending.wait_queue);disable_work_sync (&sc->recv_io.posted.refill_work); +disable_delayed_work_sync (&sc->idle.timer_work);disable_work_sync (&sc->idle.immediate_work);if (sc->ib.qp) {
@@ -492,6 +529,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)ib_dma_sync_single_for_cpu (wc->qp->device, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE ); +/* +* Reset timer to the keepalive interval in +* order to trigger our next keepalive message. +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_interval_msec)); +switch (sc->recv_io.expected) {case SMBDIRECT_EXPECT_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smbdirect_negotiate_req )) {
@@ -828,6 +873,24 @@ static int manage_credits_prior_sending(struct smb_direct_transport *t)return new_credits; } +static int manage_keep_alive_before_sending (struct smb_direct_transport *t) +{ +struct smbdirect_socket *sc = &t->socket; +struct smbdirect_socket_parameters *sp = &sc->parameters; + +if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) { + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_SENT ; +/* +* Now use the keepalive timeout (instead of keepalive interval) +* in order to wait for a response +*/ +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->keepalive_timeout_msec)); +return 1 ; + } +return 0 ; +} +static int smb_direct_post_send (struct smb_direct_transport *t,struct ib_send_wr *wr) {
@@ -976,6 +1039,9 @@ static int smb_direct_create_header(struct smb_direct_transport *t, packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); packet->flags =0 ; +if (manage_keep_alive_before_sending (t)) + packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); + packet->reserved =0 ;if (!size) packet->data_offset =0 ;
@@ -1632,6 +1698,14 @@ static int smb_direct_accept_client(struct smb_direct_transport *t) conn_param.rnr_retry_count =SMB_DIRECT_CM_RNR_RETRY ; conn_param.flow_control =0 ; +/* +* start with the negotiate timeout and SMBDIRECT_KEEPALIVE_PENDING +* so that the timer will cause a disconnect. +*/ + sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; +mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +msecs_to_jiffies (sp->negotiate_timeout_msec)); +WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING ; ret =rdma_accept (sc->rdma.cm_id, &conn_param);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 115/142 smb: server: make use of smbdirect_socket.workqueue
In reply to Stefan MetzmacherWe still use the single global workqueue, but this will allow us to share common code soon.
--- fs/smb/server/transport_rdma.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
fs/smb/server/transport_rdma.c +12 -10
@@ -180,7 +180,7 @@ static void put_recvmsg(struct smb_direct_transport *t,list_add (&recvmsg->list, &sc->recv_io.free.list);spin_unlock (&sc->recv_io.free.lock); -queue_work (smb_direct_wq, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); } static void enqueue_reassembly(struct smb_direct_transport *t,
@@ -267,7 +267,7 @@ smb_direct_disconnect_rdma_connection(struct smb_direct_transport *t) {struct smbdirect_socket *sc = &t->socket; -queue_work (smb_direct_wq, &sc->disconnect_work); +queue_work (sc->workqueue, &sc->disconnect_work); }static void smb_direct_send_immediate_work (struct work_struct *work)
@@ -304,9 +304,9 @@ static void smb_direct_idle_connection_timer(struct work_struct *work)* in order to wait for a response */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec)); -queue_work (smb_direct_wq, &sc->idle.immediate_work); +queue_work (sc->workqueue, &sc->idle.immediate_work); }static struct smb_direct_transport *alloc_transport (struct rdma_cm_id *cm_id)
@@ -323,6 +323,8 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)smbdirect_socket_init (sc); sp = &sc->parameters; + sc->workqueue = smb_direct_wq; +INIT_WORK (&sc->disconnect_work, smb_direct_disconnect_rdma_work); sp->negotiate_timeout_msec =SMB_DIRECT_NEGOTIATE_TIMEOUT *1000 ;
@@ -534,7 +536,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)* order to trigger our next keepalive message. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_NONE ; -mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_interval_msec));switch (sc->recv_io.expected) {
@@ -596,14 +598,14 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (le16_to_cpu (data_transfer->flags) &SMBDIRECT_FLAG_RESPONSE_REQUESTED ) -queue_work (smb_direct_wq, &sc->idle.immediate_work); +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 (smb_direct_wq, &sc->recv_io.posted.refill_work); +queue_work (sc->workqueue, &sc->recv_io.posted.refill_work);enqueue_reassembly (t, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue);
@@ -812,7 +814,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) }if (credits) -queue_work (smb_direct_wq, &sc->idle.immediate_work); +queue_work (sc->workqueue, &sc->idle.immediate_work); }static void send_done (struct ib_cq *cq,struct ib_wc *wc)
@@ -884,7 +886,7 @@ static int manage_keep_alive_before_sending(struct smb_direct_transport *t)* Now use the keepalive timeout (instead of keepalive interval) * in order to wait for a response */ -mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +mod_delayed_work (sc->workqueue, &sc->idle.timer_work,msecs_to_jiffies (sp->keepalive_timeout_msec));return 1 ; }
@@ -1703,7 +1705,7 @@ static int smb_direct_accept_client(struct smb_direct_transport *t)* so that the timer will cause a disconnect. */ sc->idle.keepalive =SMBDIRECT_KEEPALIVE_PENDING ; -mod_delayed_work (smb_direct_wq, &sc->idle.timer_work, +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 );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 116/142 smb: server: pass struct smbdirect_socket to {get_free,put}_recvmsg()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 35 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 19 deletions(-)
fs/smb/server/transport_rdma.c +16 -19
@@ -147,9 +147,8 @@ static inline void }static struct -smbdirect_recv_io *get_free_recvmsg (struct smb_direct_transport *t) +smbdirect_recv_io *get_free_recvmsg (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg =NULL ;spin_lock (&sc->recv_io.free.lock);
@@ -163,11 +162,9 @@ smbdirect_recv_io *get_free_recvmsg(struct smb_direct_transport *t)return recvmsg; } -static void put_recvmsg (struct smb_direct_transport *t, +static void put_recvmsg (struct smbdirect_socket *sc,struct smbdirect_recv_io *recvmsg) { -struct smbdirect_socket *sc = &t->socket; -if (likely (recvmsg->sge.length !=0 )) { ib_dma_unmap_single(sc->ib.dev, recvmsg->sge.addr,
@@ -399,7 +396,7 @@ static void free_transport(struct smb_direct_transport *t)if (recvmsg) {list_del (&recvmsg->list);spin_unlock (&sc->recv_io.reassembly.lock); -put_recvmsg (t, recvmsg); +put_recvmsg (sc, recvmsg); }else {spin_unlock (&sc->recv_io.reassembly.lock); }
@@ -514,7 +511,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) t = container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) { -put_recvmsg (t, recvmsg); +put_recvmsg (sc, 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,
@@ -542,7 +539,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 (t, recvmsg); +put_recvmsg (sc, recvmsg);smb_direct_disconnect_rdma_connection (t);return ; }
@@ -560,7 +557,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 (t, recvmsg); +put_recvmsg (sc, recvmsg);smb_direct_disconnect_rdma_connection (t);return ; }
@@ -569,7 +566,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (data_length) {if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + (u64 )data_length) { -put_recvmsg (t, recvmsg); +put_recvmsg (sc, recvmsg);smb_direct_disconnect_rdma_connection (t);return ; }
@@ -610,7 +607,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)enqueue_reassembly (t, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else -put_recvmsg (t, recvmsg); +put_recvmsg (sc, recvmsg);return ; }
@@ -623,7 +620,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 (t, recvmsg); +put_recvmsg (sc, recvmsg);smb_direct_disconnect_rdma_connection (t); }
@@ -749,7 +746,7 @@ static int smb_direct_read(struct ksmbd_transport *t, char *buf,spin_unlock_irq (&sc->recv_io.reassembly.lock); } queue_removed++; -put_recvmsg (st, recvmsg); +put_recvmsg (sc, recvmsg); offset =0 ; }else { offset += to_copy;
@@ -795,7 +792,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 (t); + recvmsg =get_free_recvmsg (sc);if (!recvmsg)break ;
@@ -804,7 +801,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) ret =smb_direct_post_recv (t, recvmsg);if (ret) {pr_err ("Can't post recv: %d\n" , ret); -put_recvmsg (t, recvmsg); +put_recvmsg (sc, recvmsg);break ; } credits++;
@@ -1729,7 +1726,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) sc->recv_io.expected =SMBDIRECT_EXPECT_NEGOTIATE_REQ ; - recvmsg =get_free_recvmsg (t); + recvmsg =get_free_recvmsg (sc);if (!recvmsg)return -ENOMEM ;
@@ -1748,7 +1745,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t)smb_direct_post_recv_credits (&sc->recv_io.posted.refill_work);return 0 ; out_err: -put_recvmsg (t, recvmsg); +put_recvmsg (sc, recvmsg);return ret; }
@@ -1843,7 +1840,7 @@ static void smb_direct_destroy_pools(struct smb_direct_transport *t)struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg; -while ((recvmsg =get_free_recvmsg (t))) +while ((recvmsg =get_free_recvmsg (sc)))mempool_free (recvmsg, sc->recv_io.mem.pool);mempool_destroy (sc->recv_io.mem.pool);
@@ -2055,7 +2052,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) sc->recv_io.reassembly.queue_length--;list_del (&recvmsg->list);spin_unlock_irq (&sc->recv_io.reassembly.lock); -put_recvmsg (st, recvmsg); +put_recvmsg (sc, recvmsg);return ret; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 117/142 smb: server: pass struct smbdirect_socket to smb_direct_{create,destroy}_pools()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
fs/smb/server/transport_rdma.c +9 -10
@@ -133,7 +133,7 @@ static inline int get_buf_page_count(void *buf, int size) (uintptr_t )buf /PAGE_SIZE ; } -static void smb_direct_destroy_pools (struct smb_direct_transport *transport); +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 smb_direct_transport *t, struct smbdirect_send_batch *send_ctx,
@@ -412,7 +412,7 @@ static void free_transport(struct smb_direct_transport *t)if (sc->rdma.cm_id)rdma_destroy_id (sc->rdma.cm_id); -smb_direct_destroy_pools (t); +smb_direct_destroy_pools (sc);ksmbd_conn_free (KSMBD_TRANS (t)->conn); }
@@ -1835,9 +1835,8 @@ static int smb_direct_init_params(struct smb_direct_transport *t,return 0 ; } -static void smb_direct_destroy_pools (struct smb_direct_transport *t) +static void smb_direct_destroy_pools (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_recv_io *recvmsg;while ((recvmsg =get_free_recvmsg (sc)))
@@ -1856,15 +1855,14 @@ static void smb_direct_destroy_pools(struct smb_direct_transport *t) sc->send_io.mem.cache =NULL ; } -static int smb_direct_create_pools (struct smb_direct_transport *t) +static int smb_direct_create_pools (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;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" , t); +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),
@@ -1878,7 +1876,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)if (!sc->send_io.mem.pool) goto err; -snprintf (name,sizeof (name),"smbdirect_recv_io_pool_%p" , t); +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,
@@ -1903,7 +1901,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)return 0 ; err: -smb_direct_destroy_pools (t); +smb_direct_destroy_pools (sc);return -ENOMEM ; }
@@ -2059,6 +2057,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t)static int smb_direct_connect (struct smb_direct_transport *st) { +struct smbdirect_socket *sc = &st->socket;int ret;struct ib_qp_cap qp_cap;
@@ -2068,7 +2067,7 @@ static int smb_direct_connect(struct smb_direct_transport *st)return ret; } - ret =smb_direct_create_pools (st); + ret =smb_direct_create_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 118/142 smb: server: pass struct smbdirect_socket to smb_direct_get_max_fr_pages()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +2 -4
@@ -1749,10 +1749,8 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t)return ret; } -static unsigned int smb_direct_get_max_fr_pages (struct smb_direct_transport *t) +static unsigned int smb_direct_get_max_fr_pages (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket; - return min_t(unsigned int, sc->ib.dev->attrs.max_fast_reg_page_list_len,256 );
@@ -1783,7 +1781,7 @@ static int smb_direct_init_params(struct smb_direct_transport *t,* are needed for MR registration, RDMA R/W, local & remote * MR invalidation. */ - sc->rw_io.credits.num_pages =smb_direct_get_max_fr_pages (t); + sc->rw_io.credits.num_pages =smb_direct_get_max_fr_pages (sc); sc->rw_io.credits.max =DIV_ROUND_UP (sp->max_read_write_size, (sc->rw_io.credits.num_pages -1 ) *PAGE_SIZE );
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 119/142 smb: server: pass struct smbdirect_socket to smb_direct_init_params()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -1756,10 +1756,9 @@ static unsigned int smb_direct_get_max_fr_pages(struct smbdirect_socket *sc) 256); } -static int smb_direct_init_params (struct smb_direct_transport *t, +static int smb_direct_init_params (struct smbdirect_socket *sc,struct ib_qp_cap *cap) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_device *device = sc->ib.dev;int max_send_sges, max_rw_wrs, max_send_wrs;
@@ -2059,7 +2058,7 @@ static int smb_direct_connect(struct smb_direct_transport *st)int ret;struct ib_qp_cap qp_cap; - ret =smb_direct_init_params (st, &qp_cap); + ret =smb_direct_init_params (sc, &qp_cap);if (ret) {pr_err ("Can't configure RDMA parameters\n" );return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 120/142 smb: server: pass struct smbdirect_socket to smb_direct_disconnect_rdma_connection()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
fs/smb/server/transport_rdma.c +12 -18
@@ -260,10 +260,8 @@ static void smb_direct_disconnect_rdma_work(struct work_struct *work) }static void -smb_direct_disconnect_rdma_connection (struct smb_direct_transport *t) +smb_direct_disconnect_rdma_connection (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket; -queue_work (sc->workqueue, &sc->disconnect_work); }
@@ -285,11 +283,9 @@ static void smb_direct_idle_connection_timer(struct work_struct *work)struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, idle.timer_work.work);struct smbdirect_socket_parameters *sp = &sc->parameters; -struct smb_direct_transport *t = - container_of(sc, struct smb_direct_transport, socket);if (sc->idle.keepalive !=SMBDIRECT_KEEPALIVE_NONE ) { -smb_direct_disconnect_rdma_connection (t); +smb_direct_disconnect_rdma_connection (sc);return ; }
@@ -516,7 +512,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 (t); +smb_direct_disconnect_rdma_connection (sc); }return ; }
@@ -540,7 +536,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 (t); +smb_direct_disconnect_rdma_connection (sc);return ; } sc->recv_io.reassembly.full_packet_received = true;
@@ -558,7 +554,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 (t); +smb_direct_disconnect_rdma_connection (sc);return ; }
@@ -567,7 +563,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + (u64 )data_length) {put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (t); +smb_direct_disconnect_rdma_connection (sc);return ; }
@@ -621,7 +617,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 (t); +smb_direct_disconnect_rdma_connection (sc); } static int smb_direct_post_recv(struct smb_direct_transport *t,
@@ -655,7 +651,7 @@ static int smb_direct_post_recv(struct smb_direct_transport *t, recvmsg->sge.addr, recvmsg->sge.length, DMA_FROM_DEVICE); recvmsg->sge.length =0 ; -smb_direct_disconnect_rdma_connection (t); +smb_direct_disconnect_rdma_connection (sc);return ret; }return ret;
@@ -833,7 +829,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 (t); +smb_direct_disconnect_rdma_connection (sc); }if (atomic_dec_and_test (&sc->send_io.pending.count))
@@ -902,7 +898,7 @@ static int smb_direct_post_send(struct smb_direct_transport *t,pr_err ("failed to post send: %d\n" , ret);if (atomic_dec_and_test (&sc->send_io.pending.count))wake_up (&sc->send_io.pending.wait_queue); -smb_direct_disconnect_rdma_connection (t); +smb_direct_disconnect_rdma_connection (sc); }return ret; }
@@ -1346,15 +1342,13 @@ static void read_write_done(struct ib_cq *cq, struct ib_wc *wc,struct smbdirect_rw_io *msg = container_of(wc->wr_cqe, struct smbdirect_rw_io, cqe);struct smbdirect_socket *sc = msg->socket; -struct smb_direct_transport *t = - container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS ) { msg->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 ) -smb_direct_disconnect_rdma_connection (t); +smb_direct_disconnect_rdma_connection (sc); }complete (msg->completion);
@@ -1592,7 +1586,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 (t); +smb_direct_disconnect_rdma_connection (sc);break ;default :break ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 121/142 smb: server: pass struct smbdirect_socket to smb_direct_cm_handler()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -333,7 +333,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id) sp->keepalive_timeout_msec =SMB_DIRECT_KEEPALIVE_RECV_TIMEOUT *1000 ; sc->rdma.cm_id = cm_id; - cm_id->context = t; + cm_id->context = sc; sc->ib.dev = sc->rdma.cm_id->device;
@@ -1537,8 +1537,7 @@ static void smb_direct_shutdown(struct ksmbd_transport *t)static int smb_direct_cm_handler (struct rdma_cm_id *cm_id,struct rdma_cm_event *event) { -struct smb_direct_transport *t = cm_id->context; -struct smbdirect_socket *sc = &t->socket; +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);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 122/142 smb: server: pass struct smbdirect_socket to smb_direct_qpair_handler()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/smb/server/transport_rdma.c +4 -5
@@ -1576,8 +1576,7 @@ static int smb_direct_cm_handler(struct rdma_cm_id *cm_id,static void smb_direct_qpair_handler (struct ib_event *event,void *context) { -struct smb_direct_transport *t = context; -struct smbdirect_socket *sc = &t->socket; +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);
@@ -1912,7 +1911,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t,return ret; } - sc->ib.send_cq =ib_alloc_cq (sc->ib.dev, t, + sc->ib.send_cq =ib_alloc_cq (sc->ib.dev, sc, sp->send_credit_target + cap->max_rdma_ctxs,0 ,IB_POLL_WORKQUEUE );if (IS_ERR (sc->ib.send_cq)) {
@@ -1922,7 +1921,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t, goto err; } - sc->ib.recv_cq =ib_alloc_cq (sc->ib.dev, t, + sc->ib.recv_cq =ib_alloc_cq (sc->ib.dev, sc, sp->recv_credit_max,0 ,IB_POLL_WORKQUEUE );if (IS_ERR (sc->ib.recv_cq)) {pr_err ("Can't create RDMA recv CQ\n" );
@@ -1933,7 +1932,7 @@ static int smb_direct_create_qpair(struct smb_direct_transport *t,memset (&qp_attr,0 ,sizeof (qp_attr)); qp_attr.event_handler = smb_direct_qpair_handler; - qp_attr.qp_context = t; + qp_attr.qp_context = sc; qp_attr.cap = *cap; qp_attr.sq_sig_type =IB_SIGNAL_REQ_WR ; qp_attr.qp_type =IB_QPT_RC ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 123/142 smb: server: pass struct smbdirect_socket to smb_direct_create_qpair()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -1894,10 +1894,9 @@ static int smb_direct_create_pools(struct smbdirect_socket *sc)return -ENOMEM ; } -static int smb_direct_create_qpair (struct smb_direct_transport *t, +static int smb_direct_create_qpair (struct smbdirect_socket *sc,struct ib_qp_cap *cap) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;int ret;struct ib_qp_init_attr qp_attr;
@@ -2062,7 +2061,7 @@ static int smb_direct_connect(struct smb_direct_transport *st)return ret; } - ret =smb_direct_create_qpair (st, &qp_cap); + ret =smb_direct_create_qpair (sc, &qp_cap);if (ret) {pr_err ("Can't accept RDMA client: %d\n" , ret);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 124/142 smb: server: pass struct smbdirect_socket to smb_direct_post_recv()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
fs/smb/server/transport_rdma.c +3 -6
@@ -620,10 +620,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)smb_direct_disconnect_rdma_connection (sc); } -static int smb_direct_post_recv (struct smb_direct_transport *t, +static int smb_direct_post_recv (struct smbdirect_socket *sc,struct smbdirect_recv_io *recvmsg) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct ib_recv_wr wr;int ret;
@@ -780,8 +779,6 @@ 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 smb_direct_transport *t = - container_of(sc, struct smb_direct_transport, socket);struct smbdirect_recv_io *recvmsg;int credits =0 ;int ret;
@@ -794,7 +791,7 @@ static void smb_direct_post_recv_credits(struct work_struct *work) recvmsg->first_segment = false; - ret =smb_direct_post_recv (t, recvmsg); + ret =smb_direct_post_recv (sc, recvmsg);if (ret) {pr_err ("Can't post recv: %d\n" , ret);put_recvmsg (sc, recvmsg);
@@ -1722,7 +1719,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t)if (!recvmsg)return -ENOMEM ; - ret =smb_direct_post_recv (t, recvmsg); + ret =smb_direct_post_recv (sc, 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 125/142 smb: server: pass struct smbdirect_socket to smb_direct_accept_client()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -1656,9 +1656,8 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,return 0 ; } -static int smb_direct_accept_client (struct smb_direct_transport *t) +static int smb_direct_accept_client (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct rdma_conn_param conn_param;__be32 ird_ord_hdr[2 ];
@@ -1725,7 +1724,7 @@ static int smb_direct_prepare_negotiation(struct smb_direct_transport *t) goto out_err; } - ret =smb_direct_accept_client (t); + ret =smb_direct_accept_client (sc);if (ret) {pr_err ("Can't accept client\n" ); goto out_err;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 126/142 smb: server: pass struct smbdirect_socket to smb_direct_prepare_negotiation()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -1703,11 +1703,10 @@ static int smb_direct_accept_client(struct smbdirect_socket *sc)return 0 ; } -static int smb_direct_prepare_negotiation (struct smb_direct_transport *t) +static int smb_direct_prepare_negotiation (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket; -int ret;struct smbdirect_recv_io *recvmsg; +int ret;WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_CREATED ); sc->status =SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED ;
@@ -2063,7 +2062,7 @@ static int smb_direct_connect(struct smb_direct_transport *st)return ret; } - ret =smb_direct_prepare_negotiation (st); + ret =smb_direct_prepare_negotiation (sc);if (ret) {pr_err ("Can't negotiate: %d\n" , ret);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 127/142 smb: server: pass struct smbdirect_socket to smb_direct_connect()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -2038,11 +2038,10 @@ static int smb_direct_prepare(struct ksmbd_transport *t)return ret; } -static int smb_direct_connect (struct smb_direct_transport *st) +static int smb_direct_connect (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &st->socket; -int ret;struct ib_qp_cap qp_cap; +int ret; ret =smb_direct_init_params (sc, &qp_cap);if (ret) {
@@ -2166,7 +2165,7 @@ static int smb_direct_handle_connect_request(struct rdma_cm_id *new_cm_id, sp->responder_resources =min_t (u8, sp->responder_resources, peer_responder_resources); - ret =smb_direct_connect (t); + ret =smb_direct_connect (sc);if (ret) goto out_err;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 128/142 smb: server: pass struct smbdirect_socket to smb_direct_{alloc,free}_sendmsg()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
fs/smb/server/transport_rdma.c +11 -15
@@ -413,9 +413,8 @@ static void free_transport(struct smb_direct_transport *t) }static struct smbdirect_send_io -*smb_direct_alloc_sendmsg (struct smb_direct_transport *t) +*smb_direct_alloc_sendmsg (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_send_io *msg; msg =mempool_alloc (sc->send_io.mem.pool,KSMBD_DEFAULT_GFP );
@@ -427,10 +426,9 @@ static struct smbdirect_send_ioreturn msg; } -static void smb_direct_free_sendmsg (struct smb_direct_transport *t, +static void smb_direct_free_sendmsg (struct smbdirect_socket *sc,struct smbdirect_send_io *msg) { -struct smbdirect_socket *sc = &t->socket;int i;if (msg->num_sge >0 ) {
@@ -810,13 +808,11 @@ static void smb_direct_post_recv_credits(struct work_struct *work)static void send_done (struct ib_cq *cq,struct ib_wc *wc) {struct smbdirect_send_io *sendmsg, *sibling; -struct smb_direct_transport *t;struct smbdirect_socket *sc;struct list_head *pos, *prev, *end; sendmsg = container_of(wc->wr_cqe, struct smbdirect_send_io, cqe); sc = sendmsg->socket; - t = container_of(sc, struct smb_direct_transport, socket); ksmbd_debug(RDMA, "Send completed. status='%s (%d)', opcode=%d\n", ib_wc_status_msg(wc->status), wc->status,
@@ -838,11 +834,11 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)for (pos = &sendmsg->sibling_list, prev = pos->prev, end = sendmsg->sibling_list.next; prev != end; pos = prev, prev = prev->prev) { sibling = container_of(pos, struct smbdirect_send_io, sibling_list); -smb_direct_free_sendmsg (t, sibling); +smb_direct_free_sendmsg (sc, sibling); } sibling = container_of(pos, struct smbdirect_send_io, sibling_list); -smb_direct_free_sendmsg (t, sibling); +smb_direct_free_sendmsg (sc, sibling); }static int manage_credits_prior_sending (struct smb_direct_transport *t)
@@ -946,7 +942,7 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t,wake_up (&sc->send_io.credits.wait_queue);list_for_each_entry_safe (first, last, &send_ctx->msg_list, sibling_list) { -smb_direct_free_sendmsg (t, first); +smb_direct_free_sendmsg (sc, first); } }return ret;
@@ -1021,7 +1017,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t,int header_length;int ret; - sendmsg =smb_direct_alloc_sendmsg (t); + sendmsg =smb_direct_alloc_sendmsg (sc);if (IS_ERR (sendmsg))return PTR_ERR (sendmsg);
@@ -1064,7 +1060,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, DMA_TO_DEVICE); ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) { -smb_direct_free_sendmsg (t, sendmsg); +smb_direct_free_sendmsg (sc, sendmsg);return ret; }
@@ -1220,7 +1216,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, goto err;return 0 ; err: -smb_direct_free_sendmsg (t, msg); +smb_direct_free_sendmsg (sc, msg);atomic_inc (&sc->send_io.credits.count);return ret; }
@@ -1597,7 +1593,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t,struct smbdirect_negotiate_resp *resp;int ret; - sendmsg =smb_direct_alloc_sendmsg (t); + sendmsg =smb_direct_alloc_sendmsg (sc);if (IS_ERR (sendmsg))return -ENOMEM ;
@@ -1633,7 +1629,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, DMA_TO_DEVICE); ret =ib_dma_mapping_error (sc->ib.dev, sendmsg->sge[0 ].addr);if (ret) { -smb_direct_free_sendmsg (t, sendmsg); +smb_direct_free_sendmsg (sc, sendmsg);return ret; }
@@ -1643,7 +1639,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, ret =post_sendmsg (t,NULL , sendmsg);if (ret) { -smb_direct_free_sendmsg (t, sendmsg); +smb_direct_free_sendmsg (sc, sendmsg);return ret; }
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 129/142 smb: server: remove unused struct struct smb_direct_transport argument from smb_direct_send_ctx_init()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -896,8 +896,7 @@ static int smb_direct_post_send(struct smb_direct_transport *t,return ret; } -static void smb_direct_send_ctx_init (struct smb_direct_transport *t, -struct smbdirect_send_batch *send_ctx, +static void smb_direct_send_ctx_init (struct smbdirect_send_batch *send_ctx,bool need_invalidate_rkey,unsigned int remote_key) {
@@ -934,7 +933,7 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t, ret =smb_direct_post_send (t, &first->wr);if (!ret) { -smb_direct_send_ctx_init (t, send_ctx, +smb_direct_send_ctx_init (send_ctx, send_ctx->need_invalidate_rkey, send_ctx->remote_key); }else {
@@ -1245,7 +1244,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, remaining_data_length = buflen;ksmbd_debug (RDMA ,"Sending smb (RDMA): smb_len=%u\n" , buflen); -smb_direct_send_ctx_init (st, &send_ctx, need_invalidate, remote_key); +smb_direct_send_ctx_init (&send_ctx, need_invalidate, remote_key); start = i =1 ; buflen =0 ;while (true) {
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 130/142 smb: server: pass struct smbdirect_socket to smb_direct_post_send()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -879,10 +879,9 @@ static int manage_keep_alive_before_sending(struct smb_direct_transport *t)return 0 ; } -static int smb_direct_post_send (struct smb_direct_transport *t, +static int smb_direct_post_send (struct smbdirect_socket *sc,struct ib_send_wr *wr) { -struct smbdirect_socket *sc = &t->socket;int ret;atomic_inc (&sc->send_io.pending.count);
@@ -931,7 +930,7 @@ static int smb_direct_flush_send_list(struct smb_direct_transport *t, last->wr.ex.invalidate_rkey = send_ctx->remote_key; } - ret =smb_direct_post_send (t, &first->wr); + ret =smb_direct_post_send (sc, &first->wr);if (!ret) { smb_direct_send_ctx_init(send_ctx, send_ctx->need_invalidate_rkey,
@@ -1151,7 +1150,7 @@ static int post_sendmsg(struct smb_direct_transport *t, msg->wr.wr_cqe = &msg->cqe; msg->wr.send_flags =IB_SEND_SIGNALED ; -return smb_direct_post_send (t, &msg->wr); +return smb_direct_post_send (sc, &msg->wr); } static int smb_direct_post_send_data(struct smb_direct_transport *t,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 131/142 smb: server: pass struct smbdirect_socket to smb_direct_flush_send_list()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -905,11 +905,10 @@ static void smb_direct_send_ctx_init(struct smbdirect_send_batch *send_ctx, send_ctx->remote_key = remote_key; } -static int smb_direct_flush_send_list (struct smb_direct_transport *t, +static int smb_direct_flush_send_list (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,bool is_last) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_send_io *first, *last;int ret;
@@ -977,7 +976,7 @@ static int wait_for_send_credits(struct smb_direct_transport *t,if (send_ctx && (send_ctx->wr_cnt >=16 ||atomic_read (&sc->send_io.credits.count) <=1 )) { - ret =smb_direct_flush_send_list (t, send_ctx, false); + ret =smb_direct_flush_send_list (sc, send_ctx, false);if (ret)return ret; }
@@ -1297,7 +1296,7 @@ static int smb_direct_writev(struct ksmbd_transport *t, } done: - ret =smb_direct_flush_send_list (st, &send_ctx, true); + ret =smb_direct_flush_send_list (sc, &send_ctx, true);/* * As an optimization, we don't wait for individual I/O to finish
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 132/142 smb: server: pass struct smbdirect_socket to wait_for_credits()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -945,11 +945,10 @@ static int smb_direct_flush_send_list(struct smbdirect_socket *sc,return ret; } -static int wait_for_credits (struct smb_direct_transport *t, +static int wait_for_credits (struct smbdirect_socket *sc,wait_queue_head_t *waitq,atomic_t *total_credits,int needed) { -struct smbdirect_socket *sc = &t->socket;int ret; do {
@@ -981,14 +980,14 @@ static int wait_for_send_credits(struct smb_direct_transport *t,return ret; } -return wait_for_credits (t, &sc->send_io.credits.wait_queue, &sc->send_io.credits.count,1 ); +return wait_for_credits (sc, &sc->send_io.credits.wait_queue, &sc->send_io.credits.count,1 ); }static int wait_for_rw_credits (struct smb_direct_transport *t,int credits) {struct smbdirect_socket *sc = &t->socket; -return wait_for_credits (t, +return wait_for_credits (sc, &sc->rw_io.credits.wait_queue, &sc->rw_io.credits.count, credits);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 133/142 smb: server: pass struct smbdirect_socket to wait_for_send_credits()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -967,10 +967,9 @@ static int wait_for_credits(struct smbdirect_socket *sc, }while (true); } -static int wait_for_send_credits (struct smb_direct_transport *t, +static int wait_for_send_credits (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx) { -struct smbdirect_socket *sc = &t->socket;int ret; if (send_ctx &&
@@ -1162,7 +1161,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t,int data_length;struct scatterlist sg[SMBDIRECT_SEND_IO_MAX_SGE -1 ]; - ret =wait_for_send_credits (t, send_ctx); + ret =wait_for_send_credits (sc, send_ctx);if (ret)return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 134/142 smb: server: pass struct smbdirect_socket to wait_for_rw_credits()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +2 -4
@@ -982,10 +982,8 @@ static int wait_for_send_credits(struct smbdirect_socket *sc,return wait_for_credits (sc, &sc->send_io.credits.wait_queue, &sc->send_io.credits.count,1 ); } -static int wait_for_rw_credits (struct smb_direct_transport *t,int credits) +static int wait_for_rw_credits (struct smbdirect_socket *sc,int credits) { -struct smbdirect_socket *sc = &t->socket; - return wait_for_credits(sc, &sc->rw_io.credits.wait_queue, &sc->rw_io.credits.count,
@@ -1401,7 +1399,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t,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 (t, credits_needed); + ret =wait_for_rw_credits (sc, credits_needed);if (ret <0 )return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 135/142 smb: server: pass struct smbdirect_socket to calc_rw_credits()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +2 -4
@@ -990,11 +990,9 @@ static int wait_for_rw_credits(struct smbdirect_socket *sc, int credits) credits); } -static int calc_rw_credits (struct smb_direct_transport *t, +static int calc_rw_credits (struct smbdirect_socket *sc,char *buf,unsigned int len) { -struct smbdirect_socket *sc = &t->socket; -return DIV_ROUND_UP (get_buf_page_count (buf, len), sc->rw_io.credits.num_pages); }
@@ -1390,7 +1388,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, buf_len =0 ; } - credits_needed +=calc_rw_credits (t, desc_buf, desc_buf_len); + credits_needed +=calc_rw_credits (sc, desc_buf, desc_buf_len); desc_buf += desc_buf_len; buf_len -= desc_buf_len; desc_num++;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 136/142 smb: server: pass struct smbdirect_socket to manage_credits_prior_sending()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -841,9 +841,8 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc)smb_direct_free_sendmsg (sc, sibling); } -static int manage_credits_prior_sending (struct smb_direct_transport *t) +static int manage_credits_prior_sending (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;int new_credits;if (atomic_read (&sc->recv_io.credits.count) >= sc->recv_io.credits.target)
@@ -1015,7 +1014,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t,/* Fill in the packet header */ packet = (struct smbdirect_data_transfer *)sendmsg->packet; packet->credits_requested =cpu_to_le16 (sp->send_credit_target); - packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); + packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (sc)); packet->flags =0 ;if (manage_keep_alive_before_sending (t))
@@ -1604,7 +1603,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, resp->reserved =0 ; resp->credits_requested =cpu_to_le16 (sp->send_credit_target); - resp->credits_granted =cpu_to_le16 (manage_credits_prior_sending (t)); + resp->credits_granted =cpu_to_le16 (manage_credits_prior_sending (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 137/142 smb: server: pass struct smbdirect_socket to manage_keep_alive_before_sending()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -860,9 +860,8 @@ static int manage_credits_prior_sending(struct smbdirect_socket *sc)return new_credits; } -static int manage_keep_alive_before_sending (struct smb_direct_transport *t) +static int manage_keep_alive_before_sending (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;if (sc->idle.keepalive ==SMBDIRECT_KEEPALIVE_PENDING ) {
@@ -1017,7 +1016,7 @@ static int smb_direct_create_header(struct smb_direct_transport *t, packet->credits_granted =cpu_to_le16 (manage_credits_prior_sending (sc)); packet->flags =0 ; -if (manage_keep_alive_before_sending (t)) +if (manage_keep_alive_before_sending (sc)) packet->flags |=cpu_to_le16 (SMBDIRECT_FLAG_RESPONSE_REQUESTED ); packet->reserved =0 ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 138/142 smb: server: pass struct smbdirect_socket to smb_direct_create_header()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -995,11 +995,10 @@ static int calc_rw_credits(struct smbdirect_socket *sc, sc->rw_io.credits.num_pages); } -static int smb_direct_create_header (struct smb_direct_transport *t, +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 *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_send_io *sendmsg;struct smbdirect_data_transfer *packet;
@@ -1163,7 +1162,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t,for (i =0 ; i < niov; i++) data_length += iov[i].iov_len; - ret =smb_direct_create_header (t, data_length, remaining_data_length, + ret =smb_direct_create_header (sc, data_length, remaining_data_length, &msg);if (ret) {atomic_inc (&sc->send_io.credits.count);
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 139/142 smb: server: pass struct smbdirect_socket to post_sendmsg()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
fs/smb/server/transport_rdma.c +3 -4
@@ -1104,11 +1104,10 @@ static int get_mapped_sg_list(struct ib_device *device, void *buf, int size,return ib_dma_map_sg (device, sg_list, npages, dir); } -static int post_sendmsg (struct smb_direct_transport *t, +static int post_sendmsg (struct smbdirect_socket *sc,struct smbdirect_send_batch *send_ctx,struct smbdirect_send_io *msg) { -struct smbdirect_socket *sc = &t->socket;int i;for (i =0 ; i < msg->num_sge; i++)
@@ -1199,7 +1198,7 @@ static int smb_direct_post_send_data(struct smb_direct_transport *t, } } - ret =post_sendmsg (t, send_ctx, msg); + ret =post_sendmsg (sc, send_ctx, msg);if (ret) goto err;return 0 ;
@@ -1625,7 +1624,7 @@ static int smb_direct_send_negotiate_response(struct smb_direct_transport *t, sendmsg->sge[0 ].length =sizeof (*resp); sendmsg->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; - ret =post_sendmsg (t,NULL , sendmsg); + ret =post_sendmsg (sc,NULL , sendmsg);if (ret) {smb_direct_free_sendmsg (sc, sendmsg);return ret;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 140/142 smb: server: pass struct smbdirect_socket to smb_direct_post_send_data()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
fs/smb/server/transport_rdma.c +6 -9
@@ -135,7 +135,7 @@ static inline int get_buf_page_count(void *buf, int 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 smb_direct_transport *t, +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);
@@ -269,13 +269,11 @@ static void smb_direct_send_immediate_work(struct work_struct *work) {struct smbdirect_socket *sc = container_of(work, struct smbdirect_socket, idle.immediate_work); -struct smb_direct_transport *t = - container_of(sc, struct smb_direct_transport, socket);if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return ; -smb_direct_post_send_data (t,NULL ,NULL ,0 ,0 ); +smb_direct_post_send_data (sc,NULL ,NULL ,0 ,0 ); }static void smb_direct_idle_connection_timer (struct work_struct *work)
@@ -1142,12 +1140,11 @@ static int post_sendmsg(struct smbdirect_socket *sc,return smb_direct_post_send (sc, &msg->wr); } -static int smb_direct_post_send_data (struct smb_direct_transport *t, +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 smbdirect_socket *sc = &t->socket;int i, j, ret;struct smbdirect_send_io *msg;int data_length;
@@ -1241,7 +1238,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,if (i > start) { remaining_data_length -= (buflen - iov[i].iov_len); - ret =smb_direct_post_send_data (st, &send_ctx, + ret =smb_direct_post_send_data (sc, &send_ctx, &iov[start], i - start, remaining_data_length);if (ret)
@@ -1259,7 +1256,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,min_t (int, max_iov_size, buflen - max_iov_size * j); remaining_data_length -= vec.iov_len; - ret =smb_direct_post_send_data (st, &send_ctx, &vec,1 , + ret =smb_direct_post_send_data (sc, &send_ctx, &vec,1 , remaining_data_length);if (ret) goto done;
@@ -1275,7 +1272,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,if (i == niovs) {/* send out all remaining vecs */ remaining_data_length -= buflen; - ret =smb_direct_post_send_data (st, &send_ctx, + ret =smb_direct_post_send_data (sc, &send_ctx, &iov[start], i - start, remaining_data_length);if (ret)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 141/142 smb: server: pass struct smbdirect_socket to {enqueue,get_first}_reassembly()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
fs/smb/server/transport_rdma.c +7 -13
@@ -180,12 +180,10 @@ static void put_recvmsg(struct smbdirect_socket *sc,queue_work (sc->workqueue, &sc->recv_io.posted.refill_work); } -static void enqueue_reassembly (struct smb_direct_transport *t, +static void enqueue_reassembly (struct smbdirect_socket *sc,struct smbdirect_recv_io *recvmsg,int data_length) { -struct smbdirect_socket *sc = &t->socket; -spin_lock (&sc->recv_io.reassembly.lock);list_add_tail (&recvmsg->list, &sc->recv_io.reassembly.list); sc->recv_io.reassembly.queue_length++;
@@ -200,10 +198,8 @@ static void enqueue_reassembly(struct smb_direct_transport *t,spin_unlock (&sc->recv_io.reassembly.lock); } -static struct smbdirect_recv_io *get_first_reassembly (struct smb_direct_transport *t) +static struct smbdirect_recv_io *get_first_reassembly (struct smbdirect_socket *sc) { -struct smbdirect_socket *sc = &t->socket; -if (!list_empty (&sc->recv_io.reassembly.list))return list_first_entry (&sc->recv_io.reassembly.list, struct smbdirect_recv_io, list);
@@ -386,7 +382,7 @@ static void free_transport(struct smb_direct_transport *t)ksmbd_debug (RDMA ,"drain the reassembly queue\n" ); do { spin_lock(&sc->recv_io.reassembly.lock); - recvmsg = get_first_reassembly(t); + recvmsg = get_first_reassembly(sc); if (recvmsg) { list_del(&recvmsg->list); spin_unlock(&sc->recv_io.reassembly.lock);
@@ -493,14 +489,12 @@ static int smb_direct_check_recvmsg(struct smbdirect_recv_io *recvmsg)static void recv_done (struct ib_cq *cq,struct ib_wc *wc) {struct smbdirect_recv_io *recvmsg; -struct smb_direct_transport *t;struct smbdirect_socket *sc;struct smbdirect_socket_parameters *sp; recvmsg = container_of(wc->wr_cqe, struct smbdirect_recv_io, cqe); sc = recvmsg->socket; sp = &sc->parameters; - t = container_of(sc, struct smb_direct_transport, socket);if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) {put_recvmsg (sc, recvmsg);
@@ -538,7 +532,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) sc->recv_io.reassembly.full_packet_received = true;WARN_ON_ONCE (sc->status !=SMBDIRECT_SOCKET_NEGOTIATE_NEEDED ); sc->status =SMBDIRECT_SOCKET_NEGOTIATE_RUNNING ; -enqueue_reassembly (t, recvmsg,0 ); +enqueue_reassembly (sc, recvmsg,0 );wake_up (&sc->status_wait);return ;case SMBDIRECT_EXPECT_DATA_TRANSFER : {
@@ -596,7 +590,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 (t, recvmsg, (int )data_length); +enqueue_reassembly (sc, recvmsg, (int )data_length);wake_up (&sc->recv_io.reassembly.wait_queue); }else put_recvmsg (sc, recvmsg);
@@ -691,7 +685,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 (st); + recvmsg =get_first_reassembly (sc); data_transfer =smbdirect_recv_io_payload (recvmsg); data_length =le32_to_cpu (data_transfer->data_length); remaining_data_length =
@@ -1986,7 +1980,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 (st); + recvmsg =get_first_reassembly (sc);if (!recvmsg)return -ECONNABORTED ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH v4 142/142 smb: server: pass struct smbdirect_socket to smb_direct_send_negotiate_response()
In reply to Stefan MetzmacherThis will make it easier to move function to the common code in future.
--- fs/smb/server/transport_rdma.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/smb/server/transport_rdma.c +2 -3
@@ -1562,10 +1562,9 @@ static void smb_direct_qpair_handler(struct ib_event *event, void *context) } } -static int smb_direct_send_negotiate_response (struct smb_direct_transport *t, +static int smb_direct_send_negotiate_response (struct smbdirect_socket *sc,int failed) { -struct smbdirect_socket *sc = &t->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;struct smbdirect_send_io *sendmsg;struct smbdirect_negotiate_resp *resp;
@@ -2001,7 +2000,7 @@ static int smb_direct_prepare(struct ksmbd_transport *t) sc->recv_io.credits.target =min_t (u16, sc->recv_io.credits.target, sp->recv_credit_max); sc->recv_io.credits.target =max_t (u16, sc->recv_io.credits.target,1 ); - ret =smb_direct_send_negotiate_response (st, ret); + ret =smb_direct_send_negotiate_response (sc, ret); out:spin_lock_irq (&sc->recv_io.reassembly.lock); sc->recv_io.reassembly.queue_length--;
Signature · 1 line
2.43.0
Quoted 89 lines · Stefan Metzmacher
Hi,
this is the next step towards a common smbdirect layer between cifs.ko and ksmbd.ko, with the aim to provide a socket layer for userspace usage at the end of the road.
Note the patchset is based on v6.17-rc3 plus the following
patches from sfrench-cifs-2.6/for-next:21d14611210d0bdf6b0c6db45c2361e96e6673d4
smb3 client: fix return code mapping ofremap_file_rangea21e20edf966db8d3e0e0748a9201fbd62fd961a
smb: client: Fix mount deadlock by avoiding super block iteration in DFS reconnect plus the client and server fixes for the IRD/ORD negotiation:
https://lore.kernel.org/linux-cifs/[email protected]/
https://lore.kernel.org/linux-cifs/[email protected]/
But only the IRD/ORD patches are really required in order to
apply the patchset. It can also be found as branch for-6.18/fs-smb-20250825-v4 in https://git.samba.org/metze/linux/wip.git, see
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250825-v4This patchset introduces more common structures and elements to struct smbdirect_socket[_parameters]. (Patches 001-018)
The client side is modified in tiny steps in order to use the new common structures. At the end struct
smbd_connectionis only a simple container arround structsmbdirect_socket. For now I left
it that way in order to avoid changing the smb layer to use structsmbdirect_socket. In the end I'd like to expose only an anonymous structure to the smb layer and structsmbdirect_socketwill become a private structure. (Patches 019-075). In between there are some fixes for the keepalive and timeout handling.Note that 047 smb: client: make use of smbdirect_socket.statistics generates the following warnings from
scripts/checkpatch.pl--quiet
WARNING: quoted string split across lines
#40: FILE:fs/smb/client/cifs_debug.c:464:
+ seq_printf(m, "\nDebugcount_get_receive_buffer: %llx "
+ "count_put_receive_buffer: %llxcount_send_empty: %llx",WARNING: quoted string split across lines
#47: FILE:fs/smb/client/cifs_debug.c:469:
seq_printf(m, "\nRead Queue "
+ "count_enqueue_reassembly_queue: %llx "WARNING: quoted string split across lines
#48: FILE:fs/smb/client/cifs_debug.c:470:
+ "count_enqueue_reassembly_queue: %llx "
+ "count_dequeue_reassembly_queue: %llx "total: 0 errors, 3 warnings, 83 lines checked
scripts/checkpatch.pl: FAILEDBut I left them in in order to keep the strange style like the other code before and after...
The server is also changed in tiny steps in order to make use of the common structures only. Patches 076-142. We only have this left at the end of the patchset:
struct smb_direct_transport { struct ksmbd_transport transport;struct smbdirect_socket socket;};
The server also got patches to implement keepalive and timeout handling in order to match the client code.
The client patches and server patches are independent from each other, but both need their own IRD/ORD negotiation fix plus the common smbdirect patches.
From here I'll start to split out common functions. In the first step as static
__maybe_unusedfunctions in a commonsmbdirect_connection.cfile that will be included inclient/smbdirect.candserver/transport_rdma.c. This is strange, but it will allow me to continue in tiny steps until only common code it used.
If it's too strange I can use asmbdirect_connection.hand rename it later from .h to .cAt that point I'll introduce an smbdirect.ko and export some public functions which will replace the include of the .c. Then I can finally start to add the struct socket/sock glue in order to provide smbdirect support to userspace.
Quoted 8 lines
I used the following xfstests as regression tests:
cifs/001 generic/001 generic/002 generic/005 generic/006 generic/007 generic/010 generic/011Between cifs.ko against ksmbd.ko via siw.ko and also the client via siw.ko against Windows 2025 using a Chelsio T520-BT card. I tested the modules once before and after the applied patches and also the combination.
Thanks!
Quoted 243 lines
V4:
rebased on v6.17-rc3 and current sfrench-cifs-2.6/for-next A lot of additional patches are added in order to use structsmbdirect_socketalmost everywhere.V3:
smbd_disconnect_rdma_work()needed to handle more thanSMBDIRECT_SOCKET_CONNECTEDin order to callrdma_disconnect.V2:
init_waitqueue_head(&info->status_wait); was moved to the beginning so that it is correctly initialized insmbd_create_id().Stefan Metzmacher (142):
smb: smbdirect: introduce smbdirect_socket.status_wait
smb: smbdirect: introducesmbdirect_socket_init()
smb: smbdirect: introduce smbdirect_socket.disconnect_work
smb: smbdirect: introducesmbdirect_socket.send_io.pending.{count,wait_queue} smb: smbdirect: introduce smbdirect_socket.send_io.credits.{count,wait_queue} smb: smbdirect: introduce struct smbdirect_send_batch smb: smbdirect: introduce smbdirect_socket.rw_io.credits smb: smbdirect: introduce struct smbdirect_rw_io smb: smbdirect: introduce smbdirect_socket.recv_io.{posted,credits} smb: smbdirect: introduce smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec smb: smbdirect: introduce smbdirect_socket_parameters.{initiator_depth,responder_resources} smb: smbdirect: introduce smbdirect_socket.rdma.legacy_iwarp smb: smbdirect: introduce smbdirect_socket.idle.{keepalive,immediate_work,timer_work} smb: smbdirect: introduce smbdirect_socket.statistics smb: smbdirect: introduce smbdirect_socket.workqueue smb: smbdirect: introduce struct smbdirect_mr_io smb: smbdirect: introduce smbdirect_socket_parameters.max_frmr_depth smb: smbdirect: introduce smbdirect_socket.mr_io.* smb: client/smbdirect: replace SMBDIRECT_SOCKET_CONNECTING with more detailed states smb: client: use status_wait and SMBDIRECT_SOCKET_NEGOTIATE_RUNNING for completion smb: client: use status_wait and SMBDIRECT_SOCKET_RESOLVE_{ADDR,ROUTE}_RUNNING for completion smb: client: make use of smbdirect_socket.status_wait smb: client: make only use of wake_up[_all]() in smbdirect.c smb: client: make use of smbdirect_socket_init() smb: client: make use of smbdirect_socket.disconnect_work smb: client: make use of smbdirect_socket.send_io.pending.{count,wait_queue} smb: client: make use of smbdirect_socket.send_io.credits.{count,wait_queue} smb: client: make sure smbd_disconnect_rdma_work() doesn't run after smbd_destroy() took over smb: client: use disable[_delayed]_work_sync in smbdirect.c smb: client: let smbd_destroy() call disable_work_sync(&info->post_send_credits_work) smb: client: queue post_recv_credits_work also if the peer raises the credit target smb: client: make use of ib_wc_status_msg() and skip IB_WC_WR_FLUSH_ERR logging smb: client: remove info->wait_receive_queues handling in smbd_destroy() smb: client: limit the range of info->receive_credit_target smb: client: count the number of posted recv_io messages in order to calculated credits smb: client: make use of smbdirect_socket.recv_io.{posted,credits} smb: client: remove useless smbd_connection.send_immediate smb: client: fill smbdirect_socket_parameters at the beginning and use the values from there smb: client: make use of smbdirect_socket_parameters.{resolve_{addr,route},rdma_connect,negotiate}_timeout_msec smb: client: make use of smbdirect_socket_parameters.{initiator_depth,responder_resources} smb: client: make use of smbdirect_socket.rdma.legacy_iwarp smb: client: send empty packets via send_immediate_work smb: client: fix smbdirect keep alive handling to match the documentation smb: client: make use of smbdirect_socket.idle.{keepalive,immediate_work,timer_work} smb: client: remove unused smbd_connection->protocol smb: client: remove unused smbd_connection.count_reassembly_queue smb: client: make use of smbdirect_socket.statistics smb: client: don't check sc->send_io.pending.count is below sp->send_credit_target smb: client: move rdma_readwrite_threshold from smbd_connection to TCP_Server_Info smb: client: make use of smbdirect_socket.workqueue smb: client: add and use smbd_get_parameters() smb: client: make use of struct smbdirect_mr_io smb: client: make use of smbdirect_socket_parameters.max_frmr_depth smb: client: make use of smbdirect_socket.mr_io smb: client: pass struct smbdirect_socket to {get,put}_receive_buffer() smb: client: pass struct smbdirect_socket to {allocate,destroy}_receive_buffers() smb: client: pass struct smbdirect_socket to {allocate,destroy}_caches_and_workqueue() smb: client: pass struct smbdirect_socket to {enqueue,_get_first}_reassembly() smb: client: pass struct smbdirect_socket to {allocate,destroy}_mr_list() smb: client: pass struct smbdirect_socket to smbd_disconnect_rdma_connection() smb: client: pass struct smbdirect_socket to smbd_post_recv() smb: client: pass struct smbdirect_socket to manage_credits_prior_sending() smb: client: pass struct smbdirect_socket to smbd_post_send() smb: client: pass struct smbdirect_socket to manage_keep_alive_before_sending() smb: client: pass struct smbdirect_socket to smbd_post_send_iter() smb: client: pass struct smbdirect_socket to smbd_post_send_empty() smb: client: pass struct smbdirect_socket to smbd_post_send_full_iter() smb: client: pass struct smbdirect_socket to smbd_conn_upcall() smb: client: pass struct smbdirect_socket to smbd_qp_async_error_upcall() smb: client: pass struct smbdirect_socket to smbd_create_id() smb: client: pass struct smbdirect_socket to smbd_ia_open() smb: client: pass struct smbdirect_socket to smbd_post_send_negotiate_req() smb: client: pass struct smbdirect_socket to smbd_negotiate() smb: client: pass struct smbdirect_socket to get_mr() smb: client: remove unused struct smbdirect_socket argument of smbd_iter_to_mr() smb: server: make use of common smbdirect_pdu.h smb: server: make use of common smbdirect.h smb: server: make use of common smbdirect_socket smb: server: make use of common smbdirect_socket_parameters smb: server: make use of smbdirect_socket->recv_io.expected smb: server: make use of struct smbdirect_recv_io smb: server: make use of smbdirect_socket.recv_io.free.{list,lock} smb: server: make use of smbdirect_socket.recv_io.reassembly.* smb: server: make use of SMBDIRECT_RECV_IO_MAX_SGE smb: server: make use of struct smbdirect_send_io smb: server: make use of smbdirect_socket.{send,recv}_io.mem.{cache,pool} smb: server: make only use of wake_up[_all]() in transport_rdma.c smb: server: add a pr_info() when the server starts running smb: server: don't use delayed_work for post_recv_credits_work smb: server: queue post_recv_credits_work in put_recvmsg() and avoid count_avail_recvmsg smb: server: make use of smbdirect_socket.status_wait smb: server: only turn into SMBDIRECT_SOCKET_CONNECTED when negotiation is done smb: server: use disable_work_sync in transport_rdma.c smb: server: move smb_direct_disconnect_rdma_work() into free_transport() smb: server: don't wait for info->send_pending == 0 on error smb: server: make use of smbdirect_socket_init() smb: server: make use of smbdirect_socket.disconnect_work smb: server: make use of smbdirect_socket.send_io.pending.{count,wait_queue} smb: server: make use of smbdirect_socket.send_io.credits.{count,wait_queue} smb: server: make use of struct smbdirect_send_batch smb: server: make use smbdirect_socket.rw_io.credits smb: server: make use of struct smbdirect_rw_io smb: server: take the recv_credit_target from the negotiate req and always limit the range smb: server: manage recv credits by counting posted recv_io and granted credits smb: server: make use of smbdirect_socket.recv_io.{posted,credits} smb: server: replace smb_trans_direct_transfort() with SMBD_TRANS() smb: server: remove useless casts from KSMBD_TRANS/SMBD_TRANS smb: server: pass ksmbd_transport to get_smbd_max_read_write_size() smb: server: fill smbdirect_socket_parameters at the beginning and use the values from there smb: server: make use of smbdirect_socket_parameters.negotiate_timeout_msec and change to 5s smb: server: make use of smbdirect_socket_parameters.{initiator_depth,responder_resources}smb: server: make use of smbdirect_socket.rdma.legacy_iwarp
smb: server: make use of smbdirect_socket.idle.immediate_work
smb: server: implement correct keepalive and timeout handling for
smbdirect
smb: server: make use of smbdirect_socket.workqueue
smb: server: pass structsmbdirect_socketto {get_free,put}_recvmsg()
smb: server: pass structsmbdirect_socketto
smb_direct_{create,destroy}_pools()
smb: server: pass structsmbdirect_socketto
smb_direct_get_max_fr_pages()
smb: server: pass structsmbdirect_sockettosmb_direct_init_params()
smb: server: pass structsmbdirect_socketto
smb_direct_disconnect_rdma_connection()
smb: server: pass structsmbdirect_sockettosmb_direct_cm_handler()
smb: server: pass structsmbdirect_socketto
smb_direct_qpair_handler()
smb: server: pass structsmbdirect_sockettosmb_direct_create_qpair()
smb: server: pass structsmbdirect_sockettosmb_direct_post_recv()
smb: server: pass structsmbdirect_socketto
smb_direct_accept_client()
smb: server: pass structsmbdirect_socketto
smb_direct_prepare_negotiation()
smb: server: pass structsmbdirect_sockettosmb_direct_connect()
smb: server: pass structsmbdirect_socketto
smb_direct_{alloc,free}_sendmsg()
smb: server: remove unused struct structsmb_direct_transportargument
fromsmb_direct_send_ctx_init()
smb: server: pass structsmbdirect_sockettosmb_direct_post_send()
smb: server: pass structsmbdirect_socketto
smb_direct_flush_send_list()
smb: server: pass structsmbdirect_sockettowait_for_credits()
smb: server: pass structsmbdirect_sockettowait_for_send_credits()
smb: server: pass structsmbdirect_sockettowait_for_rw_credits()
smb: server: pass structsmbdirect_sockettocalc_rw_credits()
smb: server: pass structsmbdirect_socketto
manage_credits_prior_sending()
smb: server: pass structsmbdirect_socketto
manage_keep_alive_before_sending()
smb: server: pass structsmbdirect_socketto
smb_direct_create_header()
smb: server: pass structsmbdirect_sockettopost_sendmsg()
smb: server: pass structsmbdirect_socketto
smb_direct_post_send_data()
smb: server: pass structsmbdirect_socketto
{enqueue,get_first}_reassembly()
smb: server: pass structsmbdirect_socketto
smb_direct_send_negotiate_response()fs/smb/client/cifs_debug.c | 48 +- fs/smb/client/cifsglob.h | 9 +- fs/smb/client/file.c | 16 +- fs/smb/client/smb2ops.c | 8 +- fs/smb/client/smb2pdu.c | 2 +- fs/smb/client/smbdirect.c | 943 +++++++------ fs/smb/client/smbdirect.h | 104 +- fs/smb/common/smbdirect/smbdirect.h | 7 + fs/smb/common/smbdirect/smbdirect_socket.h | 242 +++- fs/smb/server/connection.c | 4 +- fs/smb/server/connection.h | 10 +- fs/smb/server/server.c | 1 + fs/smb/server/smb2pdu.c | 23 +- fs/smb/server/smb2pdu.h | 6 - fs/smb/server/transport_rdma.c | 1434 ++++++++++---------- fs/smb/server/transport_rdma.h | 45 +- 16 files changed, 1565 insertions(+), 1337 deletions(-)--
2.43.0
Stefan Metzmacher
reviewerreplace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
In reply to Stefan MetzmacherHi Steve,
here's the branch that could replace your for-next-next (6eede6a6805fb50e3131b4b8182e10a17c9005b1)
git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250908-v5 (d762704985c3bd93e2d2e9ab224f5795baea63e1)
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250908-v5
The first 3 patches are the main reason why the rebase is needed. 7a9cd9e986c1f6ce3a64f4329b2e795bf24752ae smb: server: let smb_direct_writev() respect SMB_DIRECT_MAX_SEND_SGES 329efe5eb73f7b7604dab6b08f16bb6c3e500690 smb: smbdirect: introduce smbdirect_socket_status_string() ab7a3a9ece72bce4f601d6224aa9243b7e090ca9 smb: client: adjust smbdirect related output of cifs_debug_data_proc_show()
In addition send_io.pending.wait_queue is changed to send_io.pending.zero_wait_queue to indicate it's woken when count gets zero.
send_io.pending.dec_wait_queue is introduced to replace info->wait_post_send instead of dropping the logic around it, that gets woken on every decrement.
The diff between the branches below:
Please replace your for-next-next if you're happy.
Thanks!
metze
fs/smb/client/cifs_debug.c | 41 +++---- fs/smb/client/smbdirect.c | 30 ++++-- fs/smb/common/smbdirect/smbdirect_socket.h | 55 +++++++++- fs/smb/server/transport_rdma.c | 167 +++++++++++++++++++---------- 4 files changed, 210 insertions(+), 83 deletions(-)
fs/smb/client/cifs_debug.c +21 -20
@@ -457,52 +457,53 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) sc = &server->smbd_conn->socket; sp = &sc->parameters; -seq_printf (m,"\nSMBDirect (in hex) protocol version: %x " -"transport status: %x" , +seq_printf (m,"\nSMBDirect protocol version: 0x%x " +"transport status: %s (%u)" ,SMBDIRECT_V1 , +smbdirect_socket_status_string (sc->status), sc->status); -seq_printf (m,"\nConn receive_credit_max: %x " -"send_credit_target: %x max_send_size: %x" , +seq_printf (m,"\nConn receive_credit_max: %u " +"send_credit_target: %u max_send_size: %u" , sp->recv_credit_max, sp->send_credit_target, sp->max_send_size); -seq_printf (m,"\nConn max_fragmented_recv_size: %x " -"max_fragmented_send_size: %x max_receive_size:%x" , +seq_printf (m,"\nConn max_fragmented_recv_size: %u " +"max_fragmented_send_size: %u max_receive_size:%u" , sp->max_fragmented_recv_size, sp->max_fragmented_send_size, sp->max_recv_size); -seq_printf (m,"\nConn keep_alive_interval: %x " -"max_readwrite_size: %x rdma_readwrite_threshold: %x" , +seq_printf (m,"\nConn keep_alive_interval: %u " +"max_readwrite_size: %u rdma_readwrite_threshold: %u" , sp->keepalive_interval_msec *1000 , sp->max_read_write_size, server->rdma_readwrite_threshold); -seq_printf (m,"\nDebug count_get_receive_buffer: %llx " -"count_put_receive_buffer: %llx count_send_empty: %llx" , +seq_printf (m,"\nDebug count_get_receive_buffer: %llu " +"count_put_receive_buffer: %llu count_send_empty: %llu" , sc->statistics.get_receive_buffer, sc->statistics.put_receive_buffer, sc->statistics.send_empty);seq_printf (m,"\nRead Queue " -"count_enqueue_reassembly_queue: %llx " -"count_dequeue_reassembly_queue: %llx " -"reassembly_data_length: %x " -"reassembly_queue_length: %x" , +"count_enqueue_reassembly_queue: %llu " +"count_dequeue_reassembly_queue: %llu " +"reassembly_data_length: %u " +"reassembly_queue_length: %u" , sc->statistics.enqueue_reassembly_queue, sc->statistics.dequeue_reassembly_queue, sc->recv_io.reassembly.data_length, sc->recv_io.reassembly.queue_length); -seq_printf (m,"\nCurrent Credits send_credits: %x " -"receive_credits: %x receive_credit_target: %x" , +seq_printf (m,"\nCurrent Credits send_credits: %u " +"receive_credits: %u receive_credit_target: %u" ,atomic_read (&sc->send_io.credits.count),atomic_read (&sc->recv_io.credits.count), sc->recv_io.credits.target); -seq_printf (m,"\nPending send_pending: %x " , +seq_printf (m,"\nPending send_pending: %u " ,atomic_read (&sc->send_io.pending.count)); -seq_printf (m,"\nMR responder_resources: %x " -"max_frmr_depth: %x mr_type: %x" , +seq_printf (m,"\nMR responder_resources: %u " +"max_frmr_depth: %u mr_type: 0x%x" , sp->responder_resources, sp->max_frmr_depth, sc->mr_io.type); -seq_printf (m,"\nMR mr_ready_count: %x mr_used_count: %x" , +seq_printf (m,"\nMR mr_ready_count: %u mr_used_count: %u" ,atomic_read (&sc->mr_io.ready.count),atomic_read (&sc->mr_io.used.count)); skip_rdma:
fs/smb/client/smbdirect.c +24 -6
@@ -412,7 +412,9 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) }if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue); + +wake_up (&sc->send_io.pending.dec_wait_queue);mempool_free (request, sc->send_io.mem.pool); }
@@ -1017,6 +1019,23 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, goto wait_credit; } +wait_send_queue: +wait_event (sc->send_io.pending.dec_wait_queue, +atomic_read (&sc->send_io.pending.count) < sp->send_credit_target || + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { +log_outgoing (ERR ,"disconnected not sending on wait_send_queue\n" ); + rc = -EAGAIN ; + goto err_wait_send_queue; + } + +if (unlikely (atomic_inc_return (&sc->send_io.pending.count) > + sp->send_credit_target)) { +atomic_dec (&sc->send_io.pending.count); + goto wait_send_queue; + } + request =mempool_alloc (sc->send_io.mem.pool,GFP_KERNEL );if (!request) { rc = -ENOMEM ;
@@ -1098,14 +1117,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, request->sge[0 ].length = header_length; request->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; -atomic_inc (&sc->send_io.pending.count); rc =smbd_post_send (sc, request);if (!rc)return 0 ; -if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); - err_dma:for (i =0 ; i < request->num_sge; i++)if (request->sge[i].addr)
@@ -1119,7 +1134,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc,atomic_sub (new_credits, &sc->recv_io.credits.count); err_alloc: +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.zero_wait_queue); +err_wait_send_queue:/* roll back send credits and pending */ atomic_inc (&sc->send_io.credits.count);
@@ -2118,7 +2136,7 @@ int smbd_send(struct TCP_Server_Info *server,* that means all the I/Os have been out and we are good to return */ -wait_event (sc->send_io.pending.wait_queue, +wait_event (sc->send_io.pending.zero_wait_queue,atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );
fs/smb/common/smbdirect/smbdirect_socket.h +53 -2
73 lines not on this page · raw message
fs/smb/server/transport_rdma.c +112 -55
238 lines not on this page · raw message
Namjae Jeon
maintainerRe: replace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
Quoted 10 lines · Stefan Metzmacher
Hi Steve,
here's the branch that could replace your for-next-next (
6eede6a6805fb50e3131b4b8182e10a17c9005b1)git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250908-v5 (
d762704985c3bd93e2d2e9ab224f5795baea63e1)https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250908-v5
Very nice. It will make it easier to review your patches also. And please Cc me on your smb client patches too. Thanks.
Quoted 509 lines
The first 3 patches are the main reason why the rebase is needed.
7a9cd9e986c1f6ce3a64f4329b2e795bf24752aesmb: server: letsmb_direct_writev()respectSMB_DIRECT_MAX_SEND_SGES329efe5eb73f7b7604dab6b08f16bb6c3e500690smb: smbdirect: introducesmbdirect_socket_status_string()ab7a3a9ece72bce4f601d6224aa9243b7e090ca9smb: client: adjust smbdirect related output ofcifs_debug_data_proc_show()In addition send_io.pending.wait_queue is changed to send_io.pending.zero_wait_queue to indicate it's woken when count gets zero.
send_io.pending.dec_wait_queue is introduced to replace
info->wait_post_sendinstead of dropping the logic around it, that gets woken on every decrement.The diff between the branches below:
Please replace your for-next-next if you're happy.
Thanks!
metzefs/smb/client/cifs_debug.c | 41 +++---- fs/smb/client/smbdirect.c | 30 ++++-- fs/smb/common/smbdirect/smbdirect_socket.h | 55 +++++++++- fs/smb/server/transport_rdma.c | 167 +++++++++++++++++++---------- 4 files changed, 210 insertions(+), 83 deletions(-)fs/smb/client/cifs_debug.c +21
-20@@ -457,52 +457,53 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) sc = &server->smbd_conn->socket; sp = &sc->parameters; -seq_printf (m,"\nSMBDirect (in hex) protocol version: %x " -"transport status: %x" , +seq_printf (m,"\nSMBDirect protocol version: 0x%x " +"transport status: %s (%u)" ,SMBDIRECT_V1 , +smbdirect_socket_status_string (sc->status), sc->status); -seq_printf (m,"\nConn receive_credit_max: %x " -"send_credit_target: %x max_send_size: %x" , +seq_printf (m,"\nConn receive_credit_max: %u " +"send_credit_target: %u max_send_size: %u" , sp->recv_credit_max, sp->send_credit_target, sp->max_send_size); -seq_printf (m,"\nConn max_fragmented_recv_size: %x " -"max_fragmented_send_size: %x max_receive_size:%x" , +seq_printf (m,"\nConn max_fragmented_recv_size: %u " +"max_fragmented_send_size: %u max_receive_size:%u" , sp->max_fragmented_recv_size, sp->max_fragmented_send_size, sp->max_recv_size); -seq_printf (m,"\nConn keep_alive_interval: %x " -"max_readwrite_size: %x rdma_readwrite_threshold: %x" , +seq_printf (m,"\nConn keep_alive_interval: %u " +"max_readwrite_size: %u rdma_readwrite_threshold: %u" , sp->keepalive_interval_msec *1000 , sp->max_read_write_size, server->rdma_readwrite_threshold); -seq_printf (m,"\nDebug count_get_receive_buffer: %llx " -"count_put_receive_buffer: %llx count_send_empty: %llx" , +seq_printf (m,"\nDebug count_get_receive_buffer: %llu " +"count_put_receive_buffer: %llu count_send_empty: %llu" , sc->statistics.get_receive_buffer, sc->statistics.put_receive_buffer, sc->statistics.send_empty);seq_printf (m,"\nRead Queue " -"count_enqueue_reassembly_queue: %llx " -"count_dequeue_reassembly_queue: %llx " -"reassembly_data_length: %x " -"reassembly_queue_length: %x" , +"count_enqueue_reassembly_queue: %llu " +"count_dequeue_reassembly_queue: %llu " +"reassembly_data_length: %u " +"reassembly_queue_length: %u" , sc->statistics.enqueue_reassembly_queue, sc->statistics.dequeue_reassembly_queue, sc->recv_io.reassembly.data_length, sc->recv_io.reassembly.queue_length); -seq_printf (m,"\nCurrent Credits send_credits: %x " -"receive_credits: %x receive_credit_target: %x" , +seq_printf (m,"\nCurrent Credits send_credits: %u " +"receive_credits: %u receive_credit_target: %u" ,atomic_read (&sc->send_io.credits.count),atomic_read (&sc->recv_io.credits.count), sc->recv_io.credits.target); -seq_printf (m,"\nPending send_pending: %x " , +seq_printf (m,"\nPending send_pending: %u " ,atomic_read (&sc->send_io.pending.count)); -seq_printf (m,"\nMR responder_resources: %x " -"max_frmr_depth: %x mr_type: %x" , +seq_printf (m,"\nMR responder_resources: %u " +"max_frmr_depth: %u mr_type: 0x%x" , sp->responder_resources, sp->max_frmr_depth, sc->mr_io.type); -seq_printf (m,"\nMR mr_ready_count: %x mr_used_count: %x" , +seq_printf (m,"\nMR mr_ready_count: %u mr_used_count: %u" ,atomic_read (&sc->mr_io.ready.count),atomic_read (&sc->mr_io.used.count)); skip_rdma:fs/smb/client/smbdirect.c +24
-6@@ -412,7 +412,9 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) }if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue); + +wake_up (&sc->send_io.pending.dec_wait_queue);mempool_free (request, sc->send_io.mem.pool); }@@ -1017,6 +1019,23 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, goto wait_credit; } +wait_send_queue: +wait_event (sc->send_io.pending.dec_wait_queue, +atomic_read (&sc->send_io.pending.count) < sp->send_credit_target || + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { +log_outgoing (ERR ,"disconnected not sending on wait_send_queue\n" ); + rc = -EAGAIN ; + goto err_wait_send_queue; + } + +if (unlikely (atomic_inc_return (&sc->send_io.pending.count) > + sp->send_credit_target)) { +atomic_dec (&sc->send_io.pending.count); + goto wait_send_queue; + } + request =mempool_alloc (sc->send_io.mem.pool,GFP_KERNEL );if (!request) { rc = -ENOMEM ;@@ -1098,14 +1117,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, request->sge[0 ].length = header_length; request->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; -atomic_inc (&sc->send_io.pending.count); rc =smbd_post_send (sc, request);if (!rc)return 0 ; -if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); - err_dma:for (i =0 ; i < request->num_sge; i++)if (request->sge[i].addr)@@ -1119,7 +1134,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc,atomic_sub (new_credits, &sc->recv_io.credits.count); err_alloc: +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.zero_wait_queue); +err_wait_send_queue:/* roll back send credits and pending */ atomic_inc (&sc->send_io.credits.count);@@ -2118,7 +2136,7 @@ int smbd_send(struct TCP_Server_Info *server,* that means all the I/Os have been out and we are good to return */ -wait_event (sc->send_io.pending.wait_queue, +wait_event (sc->send_io.pending.zero_wait_queue,atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );fs/smb/common/smbdirect/smbdirect_socket.h +53
-2@@ -28,6 +28,49 @@ enum smbdirect_socket_status {SMBDIRECT_SOCKET_DESTROYED }; +static __always_inline +const char *smbdirect_socket_status_string(enum smbdirect_socket_status status) +{ +switch (status) { +case SMBDIRECT_SOCKET_CREATED : +return "CREATED" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : +return "RESOLVE_ADDR_NEEDED" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : +return "RESOLVE_ADDR_RUNNING" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : +return "RESOLVE_ADDR_FAILED" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : +return "RESOLVE_ROUTE_NEEDED" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : +return "RESOLVE_ROUTE_RUNNING" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : +return "RESOLVE_ROUTE_FAILED" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : +return "RDMA_CONNECT_NEEDED" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : +return "RDMA_CONNECT_RUNNING" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : +return "RDMA_CONNECT_FAILED" ; +case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : +return "NEGOTIATE_NEEDED" ; +case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : +return "NEGOTIATE_RUNNING" ; +case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : +return "NEGOTIATE_FAILED" ; +case SMBDIRECT_SOCKET_CONNECTED : +return "CONNECTED" ; +case SMBDIRECT_SOCKET_DISCONNECTING : +return "DISCONNECTING" ; +case SMBDIRECT_SOCKET_DISCONNECTED : +return "DISCONNECTED," ; +case SMBDIRECT_SOCKET_DESTROYED : +return "DESTROYED" ; + } + +return "<unknown>" ; +} +enum smbdirect_keepalive_status {SMBDIRECT_KEEPALIVE_NONE ,SMBDIRECT_KEEPALIVE_PENDING ,@@ -107,7 +150,14 @@ struct smbdirect_socket {*/ struct {atomic_t count; -wait_queue_head_t wait_queue; +/* +* woken when count is decremented +*/ +wait_queue_head_t dec_wait_queue; +/* +* woken when count reached zero +*/ +wait_queue_head_t zero_wait_queue; } pending; } send_io;@@ -271,7 +321,8 @@ 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.wait_queue); +init_waitqueue_head (&sc->send_io.pending.dec_wait_queue); +init_waitqueue_head (&sc->send_io.pending.zero_wait_queue);INIT_LIST_HEAD (&sc->recv_io.free.list);spin_lock_init (&sc->recv_io.free.lock);fs/smb/server/transport_rdma.c +112
-55@@ -366,7 +366,7 @@ static void free_transport(struct smb_direct_transport *t) }wake_up_all (&sc->send_io.credits.wait_queue); -wake_up_all (&sc->send_io.pending.wait_queue); +wake_up_all (&sc->send_io.pending.zero_wait_queue);disable_work_sync (&sc->recv_io.posted.refill_work);disable_delayed_work_sync (&sc->idle.timer_work);@@ -818,7 +818,7 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) }if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue);/* iterate and free the list of messages in reverse. the list's head * is invalid. @@ -879,7 +879,7 @@ static int smb_direct_post_send(struct smbdirect_socket *sc,if (ret) {pr_err ("failed to post send: %d\n" , ret);if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue);smb_direct_disconnect_rdma_connection (sc); }return ret;@@ -1206,78 +1206,130 @@ 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; -int remaining_data_length; -int start, i, j; -int max_iov_size = sp->max_send_size - +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 kvec vec;struct smbdirect_send_batch send_ctx; +int error =0 ;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;//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); - start = i =1 ; - buflen =0 ; -while (true) { - buflen += iov[i].iov_len; -if (buflen > max_iov_size) { -if (i > start) { - remaining_data_length -= - (buflen - iov[i].iov_len); - ret =smb_direct_post_send_data (sc, &send_ctx, - &iov[start], i - start, - remaining_data_length); -if (ret) +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 ; + +/* +* For the last message remaining_data_length should be +* have been 0 already! +*/ +if (WARN_ON_ONCE (iov_idx >= niovs)) { + error = -EINVAL ; + goto done; + } + +/* +* 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 =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 =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; - }else { -/* iov[start] is too big, break it */ -int nvec = (buflen + max_iov_size -1 ) / - max_iov_size; - -for (j =0 ; j < nvec; j++) { - vec.iov_base = - (char *)iov[start].iov_base + - j * max_iov_size; - vec.iov_len = -min_t (int, max_iov_size, - buflen - max_iov_size * j); - remaining_data_length -= vec.iov_len; - ret =smb_direct_post_send_data (sc, &send_ctx, &vec,1 , - remaining_data_length); -if (ret) - goto done; } - i++; -if (i == niovs) -break ; } - start = i; - buflen =0 ; - }else { - i++; -if (i == niovs) { -/* send out all remaining vecs */ - remaining_data_length -= buflen; - ret =smb_direct_post_send_data (sc, &send_ctx, - &iov[start], i - start, - remaining_data_length); -if (ret) - goto done; -break ; + 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 ; } } + + remaining_data_length -= bytes; + + ret =smb_direct_post_send_data (sc, &send_ctx, + vecs, nvecs, + remaining_data_length); +if (unlikely (ret)) { + error = ret; + goto done; + } } done: 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 @@ -1286,7 +1338,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,* that means all the I/Os have been out and we are good to return */ -wait_event (sc->send_io.pending.wait_queue, +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 )@@ -1620,7 +1672,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc,return ret; } -wait_event (sc->send_io.pending.wait_queue, +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 )@@ -1773,6 +1825,11 @@ static int smb_direct_init_params(struct smbdirect_socket *sc,return -EINVAL ; } +if (device->attrs.max_send_sge <SMBDIRECT_SEND_IO_MAX_SGE ) { +pr_err ("warning: device max_send_sge = %d too small\n" , + device->attrs.max_send_sge); +return -EINVAL ; + }if (device->attrs.max_recv_sge <SMBDIRECT_RECV_IO_MAX_SGE ) {pr_err ("warning: device max_recv_sge = %d too small\n" , device->attrs.max_recv_sge);@@ -1785,7 +1842,7 @@ static int smb_direct_init_params(struct smbdirect_socket *sc, cap->max_send_wr = max_send_wrs; cap->max_recv_wr = sp->recv_credit_max; - cap->max_send_sge = max_sge_per_wr; + cap->max_send_sge =SMBDIRECT_SEND_IO_MAX_SGE ; cap->max_recv_sge =SMBDIRECT_RECV_IO_MAX_SGE ; cap->max_inline_data =0 ; cap->max_rdma_ctxs = sc->rw_io.credits.max;
Re: replace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
In reply to Stefan Metzmacherupdated for-next-next
Let me know if any problems, or if note any client patches to send for rc6
Quoted 519 lines · Stefan Metzmacher
Hi Steve,
here's the branch that could replace your for-next-next (
6eede6a6805fb50e3131b4b8182e10a17c9005b1)git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250908-v5 (
d762704985c3bd93e2d2e9ab224f5795baea63e1)https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250908-v5
The first 3 patches are the main reason why the rebase is needed.
7a9cd9e986c1f6ce3a64f4329b2e795bf24752aesmb: server: letsmb_direct_writev()respectSMB_DIRECT_MAX_SEND_SGES329efe5eb73f7b7604dab6b08f16bb6c3e500690smb: smbdirect: introducesmbdirect_socket_status_string()ab7a3a9ece72bce4f601d6224aa9243b7e090ca9smb: client: adjust smbdirect related output ofcifs_debug_data_proc_show()In addition send_io.pending.wait_queue is changed to send_io.pending.zero_wait_queue to indicate it's woken when count gets zero.
send_io.pending.dec_wait_queue is introduced to replace
info->wait_post_sendinstead of dropping the logic around it, that gets woken on every decrement.The diff between the branches below:
Please replace your for-next-next if you're happy.
Thanks!
metzefs/smb/client/cifs_debug.c | 41 +++---- fs/smb/client/smbdirect.c | 30 ++++-- fs/smb/common/smbdirect/smbdirect_socket.h | 55 +++++++++- fs/smb/server/transport_rdma.c | 167 +++++++++++++++++++---------- 4 files changed, 210 insertions(+), 83 deletions(-)fs/smb/client/cifs_debug.c +21
-20@@ -457,52 +457,53 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) sc = &server->smbd_conn->socket; sp = &sc->parameters; -seq_printf (m,"\nSMBDirect (in hex) protocol version: %x " -"transport status: %x" , +seq_printf (m,"\nSMBDirect protocol version: 0x%x " +"transport status: %s (%u)" ,SMBDIRECT_V1 , +smbdirect_socket_status_string (sc->status), sc->status); -seq_printf (m,"\nConn receive_credit_max: %x " -"send_credit_target: %x max_send_size: %x" , +seq_printf (m,"\nConn receive_credit_max: %u " +"send_credit_target: %u max_send_size: %u" , sp->recv_credit_max, sp->send_credit_target, sp->max_send_size); -seq_printf (m,"\nConn max_fragmented_recv_size: %x " -"max_fragmented_send_size: %x max_receive_size:%x" , +seq_printf (m,"\nConn max_fragmented_recv_size: %u " +"max_fragmented_send_size: %u max_receive_size:%u" , sp->max_fragmented_recv_size, sp->max_fragmented_send_size, sp->max_recv_size); -seq_printf (m,"\nConn keep_alive_interval: %x " -"max_readwrite_size: %x rdma_readwrite_threshold: %x" , +seq_printf (m,"\nConn keep_alive_interval: %u " +"max_readwrite_size: %u rdma_readwrite_threshold: %u" , sp->keepalive_interval_msec *1000 , sp->max_read_write_size, server->rdma_readwrite_threshold); -seq_printf (m,"\nDebug count_get_receive_buffer: %llx " -"count_put_receive_buffer: %llx count_send_empty: %llx" , +seq_printf (m,"\nDebug count_get_receive_buffer: %llu " +"count_put_receive_buffer: %llu count_send_empty: %llu" , sc->statistics.get_receive_buffer, sc->statistics.put_receive_buffer, sc->statistics.send_empty);seq_printf (m,"\nRead Queue " -"count_enqueue_reassembly_queue: %llx " -"count_dequeue_reassembly_queue: %llx " -"reassembly_data_length: %x " -"reassembly_queue_length: %x" , +"count_enqueue_reassembly_queue: %llu " +"count_dequeue_reassembly_queue: %llu " +"reassembly_data_length: %u " +"reassembly_queue_length: %u" , sc->statistics.enqueue_reassembly_queue, sc->statistics.dequeue_reassembly_queue, sc->recv_io.reassembly.data_length, sc->recv_io.reassembly.queue_length); -seq_printf (m,"\nCurrent Credits send_credits: %x " -"receive_credits: %x receive_credit_target: %x" , +seq_printf (m,"\nCurrent Credits send_credits: %u " +"receive_credits: %u receive_credit_target: %u" ,atomic_read (&sc->send_io.credits.count),atomic_read (&sc->recv_io.credits.count), sc->recv_io.credits.target); -seq_printf (m,"\nPending send_pending: %x " , +seq_printf (m,"\nPending send_pending: %u " ,atomic_read (&sc->send_io.pending.count)); -seq_printf (m,"\nMR responder_resources: %x " -"max_frmr_depth: %x mr_type: %x" , +seq_printf (m,"\nMR responder_resources: %u " +"max_frmr_depth: %u mr_type: 0x%x" , sp->responder_resources, sp->max_frmr_depth, sc->mr_io.type); -seq_printf (m,"\nMR mr_ready_count: %x mr_used_count: %x" , +seq_printf (m,"\nMR mr_ready_count: %u mr_used_count: %u" ,atomic_read (&sc->mr_io.ready.count),atomic_read (&sc->mr_io.used.count)); skip_rdma:fs/smb/client/smbdirect.c +24
-6@@ -412,7 +412,9 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) }if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue); + +wake_up (&sc->send_io.pending.dec_wait_queue);mempool_free (request, sc->send_io.mem.pool); }@@ -1017,6 +1019,23 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, goto wait_credit; } +wait_send_queue: +wait_event (sc->send_io.pending.dec_wait_queue, +atomic_read (&sc->send_io.pending.count) < sp->send_credit_target || + sc->status !=SMBDIRECT_SOCKET_CONNECTED ); + +if (sc->status !=SMBDIRECT_SOCKET_CONNECTED ) { +log_outgoing (ERR ,"disconnected not sending on wait_send_queue\n" ); + rc = -EAGAIN ; + goto err_wait_send_queue; + } + +if (unlikely (atomic_inc_return (&sc->send_io.pending.count) > + sp->send_credit_target)) { +atomic_dec (&sc->send_io.pending.count); + goto wait_send_queue; + } + request =mempool_alloc (sc->send_io.mem.pool,GFP_KERNEL );if (!request) { rc = -ENOMEM ;@@ -1098,14 +1117,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc, request->sge[0 ].length = header_length; request->sge[0 ].lkey = sc->ib.pd->local_dma_lkey; -atomic_inc (&sc->send_io.pending.count); rc =smbd_post_send (sc, request);if (!rc)return 0 ; -if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); - err_dma:for (i =0 ; i < request->num_sge; i++)if (request->sge[i].addr)@@ -1119,7 +1134,10 @@ static int smbd_post_send_iter(struct smbdirect_socket *sc,atomic_sub (new_credits, &sc->recv_io.credits.count); err_alloc: +if (atomic_dec_and_test (&sc->send_io.pending.count)) +wake_up (&sc->send_io.pending.zero_wait_queue); +err_wait_send_queue:/* roll back send credits and pending */ atomic_inc (&sc->send_io.credits.count);@@ -2118,7 +2136,7 @@ int smbd_send(struct TCP_Server_Info *server,* that means all the I/Os have been out and we are good to return */ -wait_event (sc->send_io.pending.wait_queue, +wait_event (sc->send_io.pending.zero_wait_queue,atomic_read (&sc->send_io.pending.count) ==0 || sc->status !=SMBDIRECT_SOCKET_CONNECTED );fs/smb/common/smbdirect/smbdirect_socket.h +53
-2@@ -28,6 +28,49 @@ enum smbdirect_socket_status {SMBDIRECT_SOCKET_DESTROYED }; +static __always_inline +const char *smbdirect_socket_status_string(enum smbdirect_socket_status status) +{ +switch (status) { +case SMBDIRECT_SOCKET_CREATED : +return "CREATED" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_NEEDED : +return "RESOLVE_ADDR_NEEDED" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_RUNNING : +return "RESOLVE_ADDR_RUNNING" ; +case SMBDIRECT_SOCKET_RESOLVE_ADDR_FAILED : +return "RESOLVE_ADDR_FAILED" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_NEEDED : +return "RESOLVE_ROUTE_NEEDED" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_RUNNING : +return "RESOLVE_ROUTE_RUNNING" ; +case SMBDIRECT_SOCKET_RESOLVE_ROUTE_FAILED : +return "RESOLVE_ROUTE_FAILED" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_NEEDED : +return "RDMA_CONNECT_NEEDED" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_RUNNING : +return "RDMA_CONNECT_RUNNING" ; +case SMBDIRECT_SOCKET_RDMA_CONNECT_FAILED : +return "RDMA_CONNECT_FAILED" ; +case SMBDIRECT_SOCKET_NEGOTIATE_NEEDED : +return "NEGOTIATE_NEEDED" ; +case SMBDIRECT_SOCKET_NEGOTIATE_RUNNING : +return "NEGOTIATE_RUNNING" ; +case SMBDIRECT_SOCKET_NEGOTIATE_FAILED : +return "NEGOTIATE_FAILED" ; +case SMBDIRECT_SOCKET_CONNECTED : +return "CONNECTED" ; +case SMBDIRECT_SOCKET_DISCONNECTING : +return "DISCONNECTING" ; +case SMBDIRECT_SOCKET_DISCONNECTED : +return "DISCONNECTED," ; +case SMBDIRECT_SOCKET_DESTROYED : +return "DESTROYED" ; + } + +return "<unknown>" ; +} +enum smbdirect_keepalive_status {SMBDIRECT_KEEPALIVE_NONE ,SMBDIRECT_KEEPALIVE_PENDING ,@@ -107,7 +150,14 @@ struct smbdirect_socket {*/ struct {atomic_t count; -wait_queue_head_t wait_queue; +/* +* woken when count is decremented +*/ +wait_queue_head_t dec_wait_queue; +/* +* woken when count reached zero +*/ +wait_queue_head_t zero_wait_queue; } pending; } send_io;@@ -271,7 +321,8 @@ 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.wait_queue); +init_waitqueue_head (&sc->send_io.pending.dec_wait_queue); +init_waitqueue_head (&sc->send_io.pending.zero_wait_queue);INIT_LIST_HEAD (&sc->recv_io.free.list);spin_lock_init (&sc->recv_io.free.lock);fs/smb/server/transport_rdma.c +112
-55@@ -366,7 +366,7 @@ static void free_transport(struct smb_direct_transport *t) }wake_up_all (&sc->send_io.credits.wait_queue); -wake_up_all (&sc->send_io.pending.wait_queue); +wake_up_all (&sc->send_io.pending.zero_wait_queue);disable_work_sync (&sc->recv_io.posted.refill_work);disable_delayed_work_sync (&sc->idle.timer_work);@@ -818,7 +818,7 @@ static void send_done(struct ib_cq *cq, struct ib_wc *wc) }if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue);/* iterate and free the list of messages in reverse. the list's head * is invalid. @@ -879,7 +879,7 @@ static int smb_direct_post_send(struct smbdirect_socket *sc,if (ret) {pr_err ("failed to post send: %d\n" , ret);if (atomic_dec_and_test (&sc->send_io.pending.count)) -wake_up (&sc->send_io.pending.wait_queue); +wake_up (&sc->send_io.pending.zero_wait_queue);smb_direct_disconnect_rdma_connection (sc); }return ret;@@ -1206,78 +1206,130 @@ 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; -int remaining_data_length; -int start, i, j; -int max_iov_size = sp->max_send_size - +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 kvec vec;struct smbdirect_send_batch send_ctx; +int error =0 ;if (sc->status !=SMBDIRECT_SOCKET_CONNECTED )return -ENOTCONN ;//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); - start = i =1 ; - buflen =0 ; -while (true) { - buflen += iov[i].iov_len; -if (buflen > max_iov_size) { -if (i > start) { - remaining_data_length -= - (buflen - iov[i].iov_len); - ret =smb_direct_post_send_data (sc, &send_ctx, - &iov[start], i - start, - remaining_data_length); -if (ret) +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 ; + +/* +* For the last message remaining_data_length should be +* have been 0 already! +*/ +if (WARN_ON_ONCE (iov_idx >= niovs)) { + error = -EINVAL ; + goto done; + } + +/* +* 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 =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 =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; - }else { -/* iov[start] is too big, break it */ -int nvec = (buflen + max_iov_size -1 ) / - max_iov_size; - -for (j =0 ; j < nvec; j++) { - vec.iov_base = - (char *)iov[start].iov_base + - j * max_iov_size; - vec.iov_len = -min_t (int, max_iov_size, - buflen - max_iov_size * j); - remaining_data_length -= vec.iov_len; - ret =smb_direct_post_send_data (sc, &send_ctx, &vec,1 , - remaining_data_length); -if (ret) - goto done; } - i++; -if (i == niovs) -break ; } - start = i; - buflen =0 ; - }else { - i++; -if (i == niovs) { -/* send out all remaining vecs */ - remaining_data_length -= buflen; - ret =smb_direct_post_send_data (sc, &send_ctx, - &iov[start], i - start, - remaining_data_length); -if (ret) - goto done; -break ; + 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 ; } } + + remaining_data_length -= bytes; + + ret =smb_direct_post_send_data (sc, &send_ctx, + vecs, nvecs, + remaining_data_length); +if (unlikely (ret)) { + error = ret; + goto done; + } } done: 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 @@ -1286,7 +1338,7 @@ static int smb_direct_writev(struct ksmbd_transport *t,* that means all the I/Os have been out and we are good to return */ -wait_event (sc->send_io.pending.wait_queue, +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 )@@ -1620,7 +1672,7 @@ static int smb_direct_send_negotiate_response(struct smbdirect_socket *sc,return ret; } -wait_event (sc->send_io.pending.wait_queue, +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 )@@ -1773,6 +1825,11 @@ static int smb_direct_init_params(struct smbdirect_socket *sc,return -EINVAL ; } +if (device->attrs.max_send_sge <SMBDIRECT_SEND_IO_MAX_SGE ) { +pr_err ("warning: device max_send_sge = %d too small\n" , + device->attrs.max_send_sge); +return -EINVAL ; + }if (device->attrs.max_recv_sge <SMBDIRECT_RECV_IO_MAX_SGE ) {pr_err ("warning: device max_recv_sge = %d too small\n" , device->attrs.max_recv_sge);@@ -1785,7 +1842,7 @@ static int smb_direct_init_params(struct smbdirect_socket *sc, cap->max_send_wr = max_send_wrs; cap->max_recv_wr = sp->recv_credit_max; - cap->max_send_sge = max_sge_per_wr; + cap->max_send_sge =SMBDIRECT_SEND_IO_MAX_SGE ; cap->max_recv_sge =SMBDIRECT_RECV_IO_MAX_SGE ; cap->max_inline_data =0 ; cap->max_rdma_ctxs = sc->rw_io.credits.max;
Signature · 3 lines
Thanks, Steve
Stefan Metzmacher
reviewerRe: replace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
Hi Steve, hi Namjae,
I found "ksmbd: smbdirect: validate data_offset and data_length field of smb_direct_data_transfer"
https://git.samba.org/?p=ksmbd.git;a=commitdiff;h=927f8fe05e334d016c598d2cc965161c2808d9ba
in ksmbd-for-next-next.
I added a Fixes and Reviewed-by tag
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=fa36db4e8d62aa9c3ba1200323d8e01e4eb88b19
and two additional patches:
ksmbd: smbdirect: verify remaining_data_length respects max_fragmented_recv_size
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=9e881174900e53dd2b17c0c0933cc4395ceb47a6
smb: client: let recv_done verify data_offset, data_length and remaining_data_length
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=174faeea9ee496b724206d405b74db8b05729f11
I think these should go into 6.17.
As there as conflicts with for-next-next I rebased it again and made sure each commit compiles and the result still passes the tests I made last time.
The result can be found under
git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250910-v6
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250910-v6
Please have a look and replace for-next-next again...
The diff against the current for-next-next (e2e99af785ee91ce20c6d583e396660494db77a2) and for-6.18/fs-smb-20250910-v6 (1fb2a52741e836f54a4691cbd74d9d70d736e506) follows below.
Thanks!
metze
fs/smb/client/smbdirect.c | 19 ++++++++++++++++++- fs/smb/common/smbdirect/smbdirect_socket.h | 2 +- fs/smb/server/transport_rdma.c | 25 +++++++++++++++++-------- 3 files changed, 36 insertions(+), 10 deletions(-)
fs/smb/client/smbdirect.c +18 -1
@@ -548,7 +548,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_socket *sc = response->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;u16 old_recv_credit_target; -int data_length =0 ; +u32 data_offset =0 ; +u32 data_length =0 ; +u32 remaining_data_length =0 ;bool negotiate_done = false; log_rdma_recv(INFO,
@@ -600,7 +602,22 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)/* SMBD data transfer packet */ case SMBDIRECT_EXPECT_DATA_TRANSFER : data_transfer =smbdirect_recv_io_payload (response); + +if (wc->byte_len < + offsetof(struct smbdirect_data_transfer , padding)) + goto error; + + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); + data_offset =le32_to_cpu (data_transfer->data_offset); data_length =le32_to_cpu (data_transfer->data_length); +if (wc->byte_len < data_offset || + wc->byte_len < (u64 )data_offset + data_length) + goto error; + +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) + goto error;if (data_length) {if (sc->recv_io.reassembly.full_packet_received)
fs/smb/common/smbdirect/smbdirect_socket.h +1 -1
@@ -63,7 +63,7 @@ const char *smbdirect_socket_status_string(enum smbdirect_socket_status status)case SMBDIRECT_SOCKET_DISCONNECTING :return "DISCONNECTING" ;case SMBDIRECT_SOCKET_DISCONNECTED : -return "DISCONNECTED," ; +return "DISCONNECTED" ;case SMBDIRECT_SOCKET_DESTROYED :return "DESTROYED" ; }
fs/smb/server/transport_rdma.c +17 -8
@@ -538,7 +538,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMBDIRECT_EXPECT_DATA_TRANSFER : {struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet; -unsigned int data_length; +u32 remaining_data_length, data_offset, data_length;u16 old_recv_credit_target; if (wc->byte_len <
@@ -548,15 +548,24 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); data_length =le32_to_cpu (data_transfer->data_length); -if (data_length) { -if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + - (u64 )data_length) { -put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); -return ; - } + 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); +smb_direct_disconnect_rdma_connection (sc); +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) { +put_recvmsg (sc, recvmsg); +smb_direct_disconnect_rdma_connection (sc); +return ; + } +if (data_length) {if (sc->recv_io.reassembly.full_packet_received) recvmsg->first_segment = true;
Namjae Jeon
maintainerRe: replace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
Quoted 2 lines · Stefan Metzmacher
Hi Steve, hi Namjae,
Hi Metze,
Quoted 8 lines
I found "ksmbd: smbdirect: validate
data_offsetanddata_lengthfield ofsmb_direct_data_transfer"
https://git.samba.org/?p=ksmbd.git;a=commitdiff;h=927f8fe05e334d016c598d2cc965161c2808d9ba
in ksmbd-for-next-next.I added a Fixes and Reviewed-by tag
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=fa36db4e8d62aa9c3ba1200323d8e01e4eb88b19
and two additional patches:
I will update it with your tags.
Quoted 2 lines
ksmbd: smbdirect: verify
remaining_data_lengthrespectsmax_fragmented_recv_size
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=9e881174900e53dd2b17c0c0933cc4395ceb47a6
Looks good to me. I will apply it to #ksmbd-for-next-next.
Quoted 2 lines
smb: client: let
recv_doneverifydata_offset,data_lengthandremaining_data_length
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=174faeea9ee496b724206d405b74db8b05729f11
Looks good to me. Reviewed-by: Namjae Jeon <[email protected]> for this client patch.
Thanks!
Quoted 122 lines
I think these should go into 6.17.
As there as conflicts with for-next-next I rebased it again and made sure each commit compiles and the result still passes the tests I made last time.
The result can be found under
git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250910-v6
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250910-v6Please have a look and replace for-next-next again...
The diff against the current for-next-next (e2e99af785ee91ce20c6d583e396660494db77a2) and for-6.18/fs-smb-20250910-v6 (1fb2a52741e836f54a4691cbd74d9d70d736e506) follows below.Thanks!
metzefs/smb/client/smbdirect.c | 19 ++++++++++++++++++- fs/smb/common/smbdirect/smbdirect_socket.h | 2 +- fs/smb/server/transport_rdma.c | 25 +++++++++++++++++-------- 3 files changed, 36 insertions(+), 10 deletions(-)fs/smb/client/smbdirect.c +18
-1@@ -548,7 +548,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_socket *sc = response->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;u16 old_recv_credit_target; -int data_length =0 ; +u32 data_offset =0 ; +u32 data_length =0 ; +u32 remaining_data_length =0 ;bool negotiate_done = false; log_rdma_recv(INFO,@@ -600,7 +602,22 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)/* SMBD data transfer packet */ case SMBDIRECT_EXPECT_DATA_TRANSFER : data_transfer =smbdirect_recv_io_payload (response); + +if (wc->byte_len < + offsetof(struct smbdirect_data_transfer , padding)) + goto error; + + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); + data_offset =le32_to_cpu (data_transfer->data_offset); data_length =le32_to_cpu (data_transfer->data_length); +if (wc->byte_len < data_offset || + wc->byte_len < (u64 )data_offset + data_length) + goto error; + +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) + goto error;if (data_length) {if (sc->recv_io.reassembly.full_packet_received)fs/smb/common/smbdirect/smbdirect_socket.h +1
-1@@ -63,7 +63,7 @@ const char *smbdirect_socket_status_string(enum smbdirect_socket_status status)case SMBDIRECT_SOCKET_DISCONNECTING :return "DISCONNECTING" ;case SMBDIRECT_SOCKET_DISCONNECTED : -return "DISCONNECTED," ; +return "DISCONNECTED" ;case SMBDIRECT_SOCKET_DESTROYED :return "DESTROYED" ; }fs/smb/server/transport_rdma.c +17
-8@@ -538,7 +538,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMBDIRECT_EXPECT_DATA_TRANSFER : {struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet; -unsigned int data_length; +u32 remaining_data_length, data_offset, data_length;u16 old_recv_credit_target; if (wc->byte_len <@@ -548,15 +548,24 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); data_length =le32_to_cpu (data_transfer->data_length); -if (data_length) { -if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + - (u64 )data_length) { -put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); -return ; - } + 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); +smb_direct_disconnect_rdma_connection (sc); +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) { +put_recvmsg (sc, recvmsg); +smb_direct_disconnect_rdma_connection (sc); +return ; + } +if (data_length) {if (sc->recv_io.reassembly.full_packet_received) recvmsg->first_segment = true;
Re: replace for-next-next... Re: [PATCH v4 000/142] smb: smbdirect/client/server: make use of common structures
updated cifs-2.6.git for-next with the client patch
Quoted 146 lines · Namjae Jeon
Quoted 2 lines · Stefan Metzmacher
Hi Steve, hi Namjae,
Hi Metze,
Quoted 8 lines
I found "ksmbd: smbdirect: validate
data_offsetanddata_lengthfield ofsmb_direct_data_transfer"
https://git.samba.org/?p=ksmbd.git;a=commitdiff;h=927f8fe05e334d016c598d2cc965161c2808d9ba
in ksmbd-for-next-next.I added a Fixes and Reviewed-by tag
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=fa36db4e8d62aa9c3ba1200323d8e01e4eb88b19
and two additional patches:I will update it with your tags.
Quoted 2 lines
ksmbd: smbdirect: verify
remaining_data_lengthrespectsmax_fragmented_recv_size
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=9e881174900e53dd2b17c0c0933cc4395ceb47a6Looks good to me. I will apply it to #ksmbd-for-next-next.
Quoted 2 lines
smb: client: let
recv_doneverifydata_offset,data_lengthandremaining_data_length
https://git.samba.org/?p=metze/linux/wip.git;a=commitdiff;h=174faeea9ee496b724206d405b74db8b05729f11Looks good to me. Reviewed-by: Namjae Jeon <[email protected]> for this client patch.
Thanks!
Quoted 122 lines
I think these should go into 6.17.
As there as conflicts with for-next-next I rebased it again and made sure each commit compiles and the result still passes the tests I made last time.
The result can be found under
git fetch https://git.samba.org/metze/linux/wip.git for-6.18/fs-smb-20250910-v6
https://git.samba.org/?p=metze/linux/wip.git;a=shortlog;h=refs/heads/for-6.18/fs-smb-20250910-v6Please have a look and replace for-next-next again...
The diff against the current for-next-next (e2e99af785ee91ce20c6d583e396660494db77a2) and for-6.18/fs-smb-20250910-v6 (1fb2a52741e836f54a4691cbd74d9d70d736e506) follows below.Thanks!
metzefs/smb/client/smbdirect.c | 19 ++++++++++++++++++- fs/smb/common/smbdirect/smbdirect_socket.h | 2 +- fs/smb/server/transport_rdma.c | 25 +++++++++++++++++-------- 3 files changed, 36 insertions(+), 10 deletions(-)fs/smb/client/smbdirect.c +18
-1@@ -548,7 +548,9 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)struct smbdirect_socket *sc = response->socket;struct smbdirect_socket_parameters *sp = &sc->parameters;u16 old_recv_credit_target; -int data_length =0 ; +u32 data_offset =0 ; +u32 data_length =0 ; +u32 remaining_data_length =0 ;bool negotiate_done = false; log_rdma_recv(INFO,@@ -600,7 +602,22 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)/* SMBD data transfer packet */ case SMBDIRECT_EXPECT_DATA_TRANSFER : data_transfer =smbdirect_recv_io_payload (response); + +if (wc->byte_len < + offsetof(struct smbdirect_data_transfer , padding)) + goto error; + + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); + data_offset =le32_to_cpu (data_transfer->data_offset); data_length =le32_to_cpu (data_transfer->data_length); +if (wc->byte_len < data_offset || + wc->byte_len < (u64 )data_offset + data_length) + goto error; + +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) + goto error;if (data_length) {if (sc->recv_io.reassembly.full_packet_received)fs/smb/common/smbdirect/smbdirect_socket.h +1
-1@@ -63,7 +63,7 @@ const char *smbdirect_socket_status_string(enum smbdirect_socket_status status)case SMBDIRECT_SOCKET_DISCONNECTING :return "DISCONNECTING" ;case SMBDIRECT_SOCKET_DISCONNECTED : -return "DISCONNECTED," ; +return "DISCONNECTED" ;case SMBDIRECT_SOCKET_DESTROYED :return "DESTROYED" ; }fs/smb/server/transport_rdma.c +17
-8@@ -538,7 +538,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMBDIRECT_EXPECT_DATA_TRANSFER : {struct smbdirect_data_transfer *data_transfer = (struct smbdirect_data_transfer *)recvmsg->packet; -unsigned int data_length; +u32 remaining_data_length, data_offset, data_length;u16 old_recv_credit_target; if (wc->byte_len <@@ -548,15 +548,24 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)return ; } + remaining_data_length =le32_to_cpu (data_transfer->remaining_data_length); data_length =le32_to_cpu (data_transfer->data_length); -if (data_length) { -if (wc->byte_len <sizeof (struct smbdirect_data_transfer ) + - (u64 )data_length) { -put_recvmsg (sc, recvmsg); -smb_direct_disconnect_rdma_connection (sc); -return ; - } + 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); +smb_direct_disconnect_rdma_connection (sc); +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) { +put_recvmsg (sc, recvmsg); +smb_direct_disconnect_rdma_connection (sc); +return ; + } +if (data_length) {if (sc->recv_io.reassembly.full_packet_received) recvmsg->first_segment = true;
Signature · 3 lines
Thanks, Steve