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>, Stephen Hemminger <sthemmin-0li6OtcxBFHby3iVrkZq2A@public.gmane.org> Cc: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org> Subject: [Patch v7 08/22] CIFS: SMBD: Upper layer connects to SMBDirect session Date: Tue, 7 Nov 2017 01:55:00 -0700 [thread overview] Message-ID: <20171107085514.12693-9-longli@exchange.microsoft.com> (raw) In-Reply-To: <20171107085514.12693-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> From: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org> When "rdma" is specified in the mount option, make CIFS connect to SMB Direct. Signed-off-by: Long Li <longli-0li6OtcxBFHby3iVrkZq2A@public.gmane.org> --- 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 b5a575f..75eb50b 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 @@ -2279,13 +2279,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 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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 08/22] CIFS: SMBD: Upper layer connects to SMBDirect session Date: Tue, 7 Nov 2017 01:55:00 -0700 [thread overview] Message-ID: <20171107085514.12693-9-longli@exchange.microsoft.com> (raw) In-Reply-To: <20171107085514.12693-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 b5a575f..75eb50b 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 @@ -2279,13 +2279,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
next prev parent reply other threads:[~2017-11-07 8:55 UTC|newest] Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-07 8:54 [Patch v7 00/22] CIFS: Implement SMB Direct protocol Long Li 2017-11-07 8:54 ` [Patch v7 01/22] CIFS: SMBD: Add parameter rdata to smb2_new_read_req Long Li [not found] ` <20171107085514.12693-2-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-16 23:06 ` Pavel Shilovskiy 2017-11-16 23:06 ` Pavel Shilovskiy 2017-11-16 23:06 ` Pavel Shilovskiy 2017-11-20 5:28 ` Leif Sahlberg 2017-11-20 5:28 ` Leif Sahlberg 2017-11-07 8:54 ` [Patch v7 04/22] CIFS: SMBD: Add SMB Direct protocol initial values and constants Long Li [not found] ` <20171107085514.12693-5-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-20 5:31 ` Leif Sahlberg 2017-11-20 5:31 ` Leif Sahlberg 2017-11-07 8:54 ` [Patch v7 05/22] CIFS: SMBD: Establish SMB Direct connection Long Li [not found] ` <20171107085514.12693-6-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-20 1:36 ` ronnie sahlberg 2017-11-20 1:36 ` ronnie sahlberg 2017-11-20 5:46 ` Leif Sahlberg 2017-11-20 5:46 ` Leif Sahlberg [not found] ` <817309867.28473523.1511156807466.JavaMail.zimbra-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> 2017-11-20 6:07 ` Long Li 2017-11-20 6:07 ` Long Li 2017-11-07 8:54 ` [Patch v7 07/22] CIFS: SMBD: Implement function to create a " Long Li [not found] ` <20171107085514.12693-1-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-07 8:54 ` [Patch v7 02/22] CIFS: SMBD: Introduce kernel config option CONFIG_CIFS_SMB_DIRECT Long Li 2017-11-07 8:54 ` Long Li [not found] ` <20171107085514.12693-3-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-16 23:08 ` Pavel Shilovskiy 2017-11-16 23:08 ` Pavel Shilovskiy 2017-11-16 23:08 ` Pavel Shilovskiy 2017-11-20 5:28 ` Leif Sahlberg 2017-11-20 5:28 ` Leif Sahlberg 2017-11-07 8:54 ` [Patch v7 03/22] CIFS: SMBD: Add rdma mount option Long Li 2017-11-07 8:54 ` Long Li [not found] ` <20171107085514.12693-4-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-16 23:18 ` Pavel Shilovskiy 2017-11-16 23:18 ` Pavel Shilovskiy 2017-11-16 23:18 ` Pavel Shilovskiy 2017-11-20 5:30 ` Leif Sahlberg 2017-11-20 5:30 ` Leif Sahlberg 2017-11-07 8:54 ` [Patch v7 06/22] CIFS: SMBD: export protocol initial values Long Li 2017-11-07 8:54 ` Long Li [not found] ` <20171107085514.12693-7-longli-Lp/cVzEoVyZiJJESP9tAQJZ3qXmFLfmx@public.gmane.org> 2017-11-20 7:37 ` Leif Sahlberg 2017-11-20 7:37 ` Leif Sahlberg 2017-11-20 16:55 ` Steve French 2017-11-07 8:55 ` Long Li [this message] 2017-11-07 8:55 ` [Patch v7 08/22] CIFS: SMBD: Upper layer connects to SMBDirect session Long Li 2017-11-07 8:55 ` [Patch v7 15/22] CIFS: SMBD: Upper layer receives data via RDMA receive Long Li 2017-11-07 8:55 ` Long Li 2017-11-21 5:16 ` [Patch v7 00/22] CIFS: Implement SMB Direct protocol Steve French 2017-11-21 5:16 ` Steve French 2017-11-07 8:55 ` [Patch v7 09/22] CIFS: SMBD: Implement function to reconnect to a SMB Direct transport Long Li 2017-11-07 8:55 ` [Patch v7 10/22] CIFS: SMBD: Upper layer reconnects to SMB Direct session Long Li 2017-11-07 8:55 ` [Patch v7 11/22] CIFS: SMBD: Implement function to destroy a SMB Direct connection Long Li 2017-11-07 8:55 ` [Patch v7 12/22] CIFS: SMBD: Upper layer destroys SMB Direct session on shutdown or umount Long Li 2017-11-07 8:55 ` [Patch v7 13/22] CIFS: SMBD: Set SMB Direct maximum read or write size for I/O Long Li 2017-11-07 8:55 ` [Patch v7 14/22] CIFS: SMBD: Implement function to receive data via RDMA receive Long Li 2017-11-07 8:55 ` [Patch v7 16/22] CIFS: SMBD: Implement function to send data via RDMA send Long Li 2017-11-07 8:55 ` [Patch v7 17/22] CIFS: SMBD: Upper layer sends " Long Li 2017-11-07 8:55 ` [Patch v7 18/22] CIFS: SMBD: Implement RDMA memory registration Long Li 2017-11-07 8:55 ` [Patch v7 19/22] CIFS: SMBD: Upper layer performs SMB write via RDMA read through " Long Li 2017-11-07 8:55 ` [Patch v7 20/22] CIFS: SMBD: Read correct returned data length for RDMA write (SMB read) I/O Long Li 2017-11-07 8:55 ` [Patch v7 21/22] CIFS: SMBD: Upper layer performs SMB read via RDMA write through memory registration Long Li 2018-09-19 5:59 ` Tom Talpey 2018-09-20 17:01 ` Long Li 2018-09-22 3:56 ` Stefan Metzmacher 2018-09-22 17:16 ` Tom Talpey 2018-09-23 21:24 ` Stefan Metzmacher 2018-09-24 4:00 ` Tom Talpey 2018-09-24 4:07 ` Stefan Metzmacher 2017-11-07 8:55 ` [Patch v7 22/22] CIFS: SMBD: Add SMB Direct 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=20171107085514.12693-9-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=sthemmin-0li6OtcxBFHby3iVrkZq2A@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: linkBe 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.