All of lore.kernel.org
 help / color / mirror / Atom feed
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 v8 01/16] CIFS: SMBD: Upper layer connects to SMBDirect session
Date: Wed, 22 Nov 2017 17:38:34 -0700	[thread overview]
Message-ID: <20171123003849.17093-2-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171123003849.17093-1-longli@exchange.microsoft.com>

From: Long Li <longli@microsoft.com>

When "rdma" is specified in the mount option, make CIFS connect to
SMB Direct.

Signed-off-by: Long Li <longli@microsoft.com>
---
 fs/cifs/connect.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 64be6f9..fafaecb 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -44,7 +44,6 @@
 #include <net/ipv6.h>
 #include <linux/parser.h>
 #include <linux/bvec.h>
-
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifsproto.h"
@@ -56,6 +55,7 @@
 #include "rfc1002pdu.h"
 #include "fscache.h"
 #include "smb2proto.h"
+#include "smbdirect.h"
 
 #define CIFS_PORT 445
 #define RFC1001_PORT 139
@@ -2310,13 +2310,29 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
 		tcp_ses->echo_interval = volume_info->echo_interval * HZ;
 	else
 		tcp_ses->echo_interval = SMB_ECHO_INTERVAL_DEFAULT * HZ;
-
+	if (tcp_ses->rdma) {
+#ifndef CONFIG_CIFS_SMB_DIRECT
+		cifs_dbg(VFS, "CONFIG_CIFS_SMB_DIRECT is not enabled\n");
+		rc = -ENOENT;
+		goto out_err_crypto_release;
+#endif
+		tcp_ses->smbd_conn = smbd_get_connection(
+			tcp_ses, (struct sockaddr *)&volume_info->dstaddr);
+		if (tcp_ses->smbd_conn) {
+			cifs_dbg(VFS, "RDMA transport established\n");
+			rc = 0;
+			goto smbd_connected;
+		} else {
+			rc = -ENOENT;
+			goto out_err_crypto_release;
+		}
+	}
 	rc = ip_connect(tcp_ses);
 	if (rc < 0) {
 		cifs_dbg(VFS, "Error connecting to socket. Aborting operation.\n");
 		goto out_err_crypto_release;
 	}
-
+smbd_connected:
 	/*
 	 * since we're in a cifs function already, we know that
 	 * this will succeed. No need for try_module_get().
-- 
2.7.4

  reply	other threads:[~2017-11-23  0:38 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-23  0:38 [Patch v8 00/16] CIFS: Implement SMB Direct protocol Long Li
2017-11-23  0:38 ` Long Li [this message]
2017-11-23  0:38 ` [Patch v8 02/16] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport Long Li
     [not found]   ` <20171123003849.17093-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2018-01-03 17:51     ` Steve French
2018-01-03 17:51       ` Steve French
     [not found] ` <20171123003849.17093-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-11-23  0:38   ` [Patch v8 03/16] CIFS: SMBD: Upper layer reconnects to SMB Direct session Long Li
2017-11-23  0:38     ` Long Li
2017-11-23  0:38   ` [Patch v8 05/16] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount Long Li
2017-11-23  0:38     ` Long Li
2017-11-23  0:38   ` [Patch v8 09/16] CIFS: SMBD: Implement function to send data via RDMA send Long Li
2017-11-23  0:38     ` Long Li
2017-11-23  0:38   ` [Patch v8 12/16] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration Long Li
2017-11-23  0:38     ` Long Li
2018-01-01 23:28   ` [Patch v8 00/16] CIFS: Implement SMB Direct protocol Ronnie Sahlberg
2017-11-23  0:38 ` [Patch v8 04/16] CIFS: SMBD: Implement function to destroy a SMB Direct connection Long Li
2017-11-23  0:38 ` [Patch v8 06/16] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O Long Li
2017-11-23  0:38 ` [Patch v8 07/16] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li
2017-11-23  0:38 ` [Patch v8 08/16] CIFS: SMBD: Upper layer receives " Long Li
2017-11-23  0:38 ` [Patch v8 10/16] CIFS: SMBD: Upper layer sends data via RDMA send Long Li
2017-11-23  0:38 ` [Patch v8 11/16] CIFS: SMBD: Implement RDMA memory registration Long Li
2017-11-23  0:38 ` [Patch v8 13/16] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-11-23  0:38 ` [Patch v8 14/16] CIFS: SMBD: Upper layer performs SMB read via RDMA write through memory registration Long Li
     [not found]   ` <20171123003849.17093-15-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2018-01-03 21:31     ` Steve French
2017-11-23  0:38 ` [Patch v8 15/16] CIFS: SMBD: Add SMB Direct debug counters Long Li
2017-11-23  0:38 ` [Patch v8 16/16] CIFS: SMBD: Disable signing on SMB direct transport Long Li
2017-12-28 21:57 ` [Patch v8 00/16] CIFS: Implement SMB Direct protocol Pavel Shilovskiy
2017-12-28 21:57   ` Pavel Shilovskiy
2018-01-03 21:39 ` Steve French

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171123003849.17093-2-longli@exchange.microsoft.com \
    --to=longli@exchange.microsoft.com \
    --cc=hch@infradead.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rdma@vger.kernel.org \
    --cc=longli@microsoft.com \
    --cc=mawilcox@microsoft.com \
    --cc=samba-technical@lists.samba.org \
    --cc=sfrench@samba.org \
    --cc=sthemmin@microsoft.com \
    --cc=ttalpey@microsoft.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.