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 02/16] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport
Date: Wed, 22 Nov 2017 17:38:35 -0700 [thread overview]
Message-ID: <20171123003849.17093-3-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171123003849.17093-1-longli@exchange.microsoft.com>
From: Long Li <longli@microsoft.com>
Add function to implement a reconnect to SMB Direct. This involves tearing down
the current connection and establishing/negotiating a new connection.
Signed-off-by: Long Li <longli@microsoft.com>
---
fs/cifs/smbdirect.c | 36 ++++++++++++++++++++++++++++++++++++
fs/cifs/smbdirect.h | 4 ++++
2 files changed, 40 insertions(+)
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 862cdf9..a96058a 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -1387,6 +1387,42 @@ static void idle_connection_timer(struct work_struct *work)
info->keep_alive_interval*HZ);
}
+/*
+ * Reconnect this SMBD connection, called from upper layer
+ * return value: 0 on success, or actual error code
+ */
+int smbd_reconnect(struct TCP_Server_Info *server)
+{
+ log_rdma_event(INFO, "reconnecting rdma session\n");
+
+ if (!server->smbd_conn) {
+ log_rdma_event(ERR, "rdma session already destroyed\n");
+ return -EINVAL;
+ }
+
+ /*
+ * This is possible if transport is disconnected and we haven't received
+ * notification from RDMA, but upper layer has detected timeout
+ */
+ if (server->smbd_conn->transport_status == SMBD_CONNECTED) {
+ log_rdma_event(INFO, "disconnecting transport\n");
+ smbd_disconnect_rdma_connection(server->smbd_conn);
+ }
+
+ /* wait until the transport is destroyed */
+ wait_event(server->smbd_conn->wait_destroy,
+ server->smbd_conn->transport_status == SMBD_DESTROYED);
+
+ destroy_workqueue(server->smbd_conn->workqueue);
+ kfree(server->smbd_conn);
+
+ log_rdma_event(INFO, "creating rdma session\n");
+ server->smbd_conn = smbd_get_connection(
+ server, (struct sockaddr *) &server->dstaddr);
+
+ return server->smbd_conn ? 0 : -ENOENT;
+}
+
static void destroy_caches_and_workqueue(struct smbd_connection *info)
{
destroy_receive_buffers(info);
diff --git a/fs/cifs/smbdirect.h b/fs/cifs/smbdirect.h
index 25b3782..8948f06 100644
--- a/fs/cifs/smbdirect.h
+++ b/fs/cifs/smbdirect.h
@@ -247,11 +247,15 @@ struct smbd_response {
struct smbd_connection *smbd_get_connection(
struct TCP_Server_Info *server, struct sockaddr *dstaddr);
+/* Reconnect SMBDirect session */
+int smbd_reconnect(struct TCP_Server_Info *server);
+
#else
#define cifs_rdma_enabled(server) 0
struct smbd_connection {};
static inline void *smbd_get_connection(
struct TCP_Server_Info *server, struct sockaddr *dstaddr) {return NULL;}
+static inline int smbd_reconnect(struct TCP_Server_Info *server) {return -1;}
#endif
#endif
--
2.7.4
next prev parent reply other threads:[~2017-11-23 0:38 UTC|newest]
Thread overview: 22+ 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 ` [Patch v8 01/16] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li
2017-11-23 0:38 ` Long Li [this message]
[not found] ` <20171123003849.17093-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2018-01-03 17:51 ` [Patch v8 02/16] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport Steve French
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
[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 ` [Patch v8 05/16] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount 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 ` [Patch v8 12/16] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration 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 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
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-3-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox