diff mbox series

[v7,17/22] CIFS: SMBD: Upper layer sends data via RDMA send

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

Commit Message

Long Li Nov. 7, 2017, 8:55 a.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 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff mbox series

Patch

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