Linux CIFS filesystem development
 help / color / mirror / Atom feed
From: Long Li <longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
To: Steve French <sfrench-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org>,
	linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Christoph Hellwig <hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>,
	Tom Talpey <ttalpey-0li6OtcxBFHby3iVrkZq2A@public.gmane.org>,
	Matthew Wilcox <mawilcox-0li6OtcxBFHby3iVrkZq2A@public.gmane.org>
Cc: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org>
Subject: [Patch v4 07/22] CIFS: SMBD: Implement function to reconnect to a SMBDirect transport
Date: Sun,  1 Oct 2017 19:30:15 -0700	[thread overview]
Message-ID: <20171002023030.3582-8-longli@exchange.microsoft.com> (raw)
In-Reply-To: <20171002023030.3582-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>

From: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org>

Add function to implement a reconnect to SMBDirect. This involves tearing down
the current connection and establishing/negotiating a new connection.

Signed-off-by: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org>
---
 fs/cifs/smbdirect.c | 36 ++++++++++++++++++++++++++++++++++++
 fs/cifs/smbdirect.h |  3 +++
 2 files changed, 39 insertions(+)

diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c
index 34f73e2..1f0f33c 100644
--- a/fs/cifs/smbdirect.c
+++ b/fs/cifs/smbdirect.c
@@ -1416,6 +1416,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 42a9338..9818852 100644
--- a/fs/cifs/smbdirect.h
+++ b/fs/cifs/smbdirect.h
@@ -249,6 +249,9 @@ 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);
+
 void profiling_display_histogram(
 	struct seq_file *m, unsigned long long array[]);
 #endif
-- 
2.7.4

  parent reply	other threads:[~2017-10-02  2:30 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-02  2:30 [Patch v4 00/22] CIFS: Implement SMBDirect Long Li
2017-10-02  2:30 ` [Patch v4 01/22] CIFS: SMBD: Add SMBDirect protocol initial values and constants Long Li
2017-10-02  2:30 ` [Patch v4 02/22] CIFS: SMBD: Establish SMBDirect connection Long Li
     [not found]   ` <20171002023030.3582-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04 11:01     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 03/22] CIFS: SMBD: export protocol initial values Long Li
2017-10-02  2:30 ` [Patch v4 04/22] CIFS: SMBD: Add rdma mount option Long Li
2017-10-02  2:30 ` [Patch v4 08/22] CIFS: SMBD: Upper layer reconnects to SMBDirect session Long Li
2017-10-02  2:30 ` [Patch v4 09/22] CIFS: SMBD: Implement function to destroy a SMBDirect connection Long Li
     [not found] ` <20171002023030.3582-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-02  2:30   ` [Patch v4 05/22] CIFS: SMBD: Implement function to create " Long Li
2017-10-02  2:30   ` [Patch v4 06/22] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li
2017-10-02  2:30   ` Long Li [this message]
2017-10-02  2:30   ` [Patch v4 10/22] CIFS: SMBD: Upper layer destroys SMBDirect session on shutdown or umount Long Li
2017-10-02  2:30   ` [Patch v4 13/22] CIFS: SMBD: Upper layer receives data via RDMA receive Long Li
2017-10-02  2:30   ` [Patch v4 18/22] CIFS: SMBD: Upper layer performs SMB write via RDMA read through memory registration Long Li
2017-10-02  2:30   ` [Patch v4 21/22] CIFS: SMBD: Upper layer performs SMB read via RDMA write " Long Li
2017-10-02  2:30 ` [Patch v4 11/22] CIFS: SMBD: Set SMBDirect maximum read or write size for I/O Long Li
2017-10-02  2:30 ` [Patch v4 12/22] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li
     [not found]   ` <20171002023030.3582-13-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04  9:43     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 14/22] CIFS: SMBD: Implement function to send data via RDMA send Long Li
     [not found]   ` <20171002023030.3582-15-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04  9:43     ` kbuild test robot
2017-10-04 10:05     ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 15/22] CIFS: SMBD: Upper layer sends " Long Li
2017-10-02  2:30 ` [Patch v4 16/22] CIFS: SMBD: Fix the definition for SMB2_CHANNEL_RDMA_V1_INVALIDATE Long Li
     [not found]   ` <20171002023030.3582-17-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org>
2017-10-04 22:07     ` Steve French
2017-10-02  2:30 ` [Patch v4 17/22] CIFS: SMBD: Implement RDMA memory registration Long Li
2017-10-04 14:08   ` kbuild test robot
2017-10-02  2:30 ` [Patch v4 19/22] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li
2017-10-02  2:30 ` [Patch v4 20/22] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li
2017-10-02  2:30 ` [Patch v4 22/22] CIFS: SMBD: Add SMBDirect debug counters Long Li

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=20171002023030.3582-8-longli@exchange.microsoft.com \
    --to=longli-lp/cvzeovyzijjesp9taqjz3qxmflfmx@public.gmane.org \
    --cc=hch-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org \
    --cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org \
    --cc=mawilcox-0li6OtcxBFHby3iVrkZq2A@public.gmane.org \
    --cc=samba-technical-w/Ol4Ecudpl8XjKLYN78aQ@public.gmane.org \
    --cc=sfrench-eUNUBHrolfbYtjvyW6yDsg@public.gmane.org \
    --cc=ttalpey-0li6OtcxBFHby3iVrkZq2A@public.gmane.org \
    /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