Skip to content

Commit 14b6088

Browse files
metze-sambasmfrench
authored andcommitted
smb: client: fill smbdirect_socket_parameters at the beginning and use the values from there
This is what we should do and it also simplifies the following changes. Cc: Steve French <smfrench@gmail.com> Cc: Tom Talpey <tom@talpey.com> Cc: Long Li <longli@microsoft.com> Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org Acked-by: Namjae Jeon <linkinjeon@kernel.org> Signed-off-by: Stefan Metzmacher <metze@samba.org> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent d3e743b commit 14b6088

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

fs/smb/client/smbdirect.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,37 +1718,37 @@ static struct smbd_connection *_smbd_get_connection(
17181718

17191719
INIT_WORK(&sc->disconnect_work, smbd_disconnect_rdma_work);
17201720

1721+
sp->recv_credit_max = smbd_receive_credit_max;
1722+
sp->send_credit_target = smbd_send_credit_target;
1723+
sp->max_send_size = smbd_max_send_size;
1724+
sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size;
1725+
sp->max_recv_size = smbd_max_receive_size;
1726+
sp->keepalive_interval_msec = smbd_keep_alive_interval * 1000;
1727+
17211728
rc = smbd_ia_open(info, dstaddr, port);
17221729
if (rc) {
17231730
log_rdma_event(INFO, "smbd_ia_open rc=%d\n", rc);
17241731
goto create_id_failed;
17251732
}
17261733

1727-
if (smbd_send_credit_target > sc->ib.dev->attrs.max_cqe ||
1728-
smbd_send_credit_target > sc->ib.dev->attrs.max_qp_wr) {
1734+
if (sp->send_credit_target > sc->ib.dev->attrs.max_cqe ||
1735+
sp->send_credit_target > sc->ib.dev->attrs.max_qp_wr) {
17291736
log_rdma_event(ERR, "consider lowering send_credit_target = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n",
1730-
smbd_send_credit_target,
1737+
sp->send_credit_target,
17311738
sc->ib.dev->attrs.max_cqe,
17321739
sc->ib.dev->attrs.max_qp_wr);
17331740
goto config_failed;
17341741
}
17351742

1736-
if (smbd_receive_credit_max > sc->ib.dev->attrs.max_cqe ||
1737-
smbd_receive_credit_max > sc->ib.dev->attrs.max_qp_wr) {
1743+
if (sp->recv_credit_max > sc->ib.dev->attrs.max_cqe ||
1744+
sp->recv_credit_max > sc->ib.dev->attrs.max_qp_wr) {
17381745
log_rdma_event(ERR, "consider lowering receive_credit_max = %d. Possible CQE overrun, device reporting max_cqe %d max_qp_wr %d\n",
1739-
smbd_receive_credit_max,
1746+
sp->recv_credit_max,
17401747
sc->ib.dev->attrs.max_cqe,
17411748
sc->ib.dev->attrs.max_qp_wr);
17421749
goto config_failed;
17431750
}
17441751

1745-
sp->recv_credit_max = smbd_receive_credit_max;
1746-
sp->send_credit_target = smbd_send_credit_target;
1747-
sp->max_send_size = smbd_max_send_size;
1748-
sp->max_fragmented_recv_size = smbd_max_fragmented_recv_size;
1749-
sp->max_recv_size = smbd_max_receive_size;
1750-
sp->keepalive_interval_msec = smbd_keep_alive_interval * 1000;
1751-
17521752
if (sc->ib.dev->attrs.max_send_sge < SMBDIRECT_SEND_IO_MAX_SGE ||
17531753
sc->ib.dev->attrs.max_recv_sge < SMBDIRECT_RECV_IO_MAX_SGE) {
17541754
log_rdma_event(ERR,

0 commit comments

Comments
 (0)