diff mbox series

[v5,15/21] CIFS: SMBD: Upper layer sends data via RDMA send

Message ID	20171018230920.21042-16-longli@exchange.microsoft.com
State	New
Headers	show Return-Path: <linux-cifs-owner@vger.kernel.org> From: Long Li <longli@exchange.microsoft.com> To: Steve French <sfrench@samba.org>, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-rdma@vger.kernel.org, Tom Talpey <ttalpey@microsoft.com>, Matthew Wilcox <mawilcox@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com> Cc: Long Li <longli@microsoft.com> Subject: [Patch v5 15/21] CIFS: SMBD: Upper layer sends data via RDMA send Date: Wed, 18 Oct 2017 16:09:14 -0700 Message-Id: <20171018230920.21042-16-longli@exchange.microsoft.com> In-Reply-To: <20171018230920.21042-1-longli@exchange.microsoft.com> References: <20171018230920.21042-1-longli@exchange.microsoft.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk
Series	CIFS: Implement SMB Direct protocol \| expand [v5,00/21] CIFS: Implement SMB Direct protocol [v5,01/21] CIFS: SMBD: Add SMB Direct protocol initial values and constants [v5,02/21] CIFS: SMBD: Establish SMB Direct connection [v5,03/21] CIFS: SMBD: export protocol initial values [v5,04/21] CIFS: SMBD: Add rdma mount option [v5,05/21] CIFS: SMBD: Implement function to create a SMB Direct connection [v5,06/21] CIFS: SMBD: Upper layer connects to SMBDirect session [v5,07/21] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport [v5,08/21] CIFS: SMBD: Upper layer reconnects to SMB Direct session [v5,09/21] CIFS: SMBD: Implement function to destroy a SMB Direct connection [v5,10/21] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount [v5,11/21] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O [v5,12/21] CIFS: SMBD: Implement function to receive data via RDMA receive [v5,13/21] CIFS: SMBD: Upper layer receives data via RDMA receive [v5,14/21] CIFS: SMBD: Implement function to send data via RDMA send [v5,15/21] CIFS: SMBD: Upper layer sends data via RDMA send [v5,16/21] CIFS: SMBD: Implement RDMA memory registration [v5,17/21] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration [v5,18/21] CIFS: SMBD: Add parameter rdata to smb2_new_read_req [v5,19/21] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O [v5,20/21] CIFS: SMBD: Upper layer performs SMB read via RDMA write through memory registration [v5,21/21] CIFS: SMBD: Add SMB Direct debug counters

Commit Message

Long Li Oct. 18, 2017, 11:09 p.m. UTC

From: Long Li <longli@microsoft.com>

With SMB Direct connected, use it for sending data via RDMA send.

Signed-off-by: Long Li <longli@microsoft.com>
---
 fs/cifs/transport.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 7efbab0..1b51d08 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -37,6 +37,9 @@ 
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
+#ifdef CONFIG_CIFS_SMB_DIRECT
+#include "smbdirect.h"
+#endif
 
 void
 cifs_wake_up_task(struct mid_q_entry *mid)
@@ -229,7 +232,12 @@  __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst)
 	struct socket *ssocket = server->ssocket;
 	struct msghdr smb_msg;
 	int val = 1;
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+	if (server->smbd_conn) {
+		rc = smbd_send(server->smbd_conn, rqst);
+		goto smbd_done;
+	}
+#endif
 	if (ssocket == NULL)
 		return -ENOTSOCK;
 
@@ -298,7 +306,9 @@  __smb_send_rqst(struct TCP_Server_Info *server, struct smb_rqst *rqst)
 		 */
 		server->tcpStatus = CifsNeedReconnect;
 	}
-
+#ifdef CONFIG_CIFS_SMB_DIRECT
+smbd_done:
+#endif
 	if (rc < 0 && rc != -EINTR)
 		cifs_dbg(VFS, "Error %d sending data on socket to server\n",
 			 rc);