From: Long Li <longli@linuxonhyperv.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
Cc: Long Li <longli@microsoft.com>
Subject: [RFC PATCH 09/09] Introduce cache=rdma moutning option
Date: Thu, 17 May 2018 17:22:14 -0700 [thread overview]
Message-ID: <20180518002214.5657-10-longli@linuxonhyperv.com> (raw)
In-Reply-To: <20180518002214.5657-1-longli@linuxonhyperv.com>
From: Long Li <longli@microsoft.com>
When cache=rdma is enabled on mount options, CIFS do not allocate internal data
buffer pages for I/O, data is read/writen directly to user memory via RDMA.
Signed-off-by: Long Li <longli@microsoft.com>
---
fs/cifs/cifs_fs_sb.h | 2 ++
fs/cifs/cifsglob.h | 1 +
fs/cifs/connect.c | 9 +++++++++
fs/cifs/dir.c | 5 +++++
fs/cifs/file.c | 4 ++++
fs/cifs/inode.c | 4 +++-
6 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/cifs_fs_sb.h b/fs/cifs/cifs_fs_sb.h
index 350fa55..7c28dc3 100644
--- a/fs/cifs/cifs_fs_sb.h
+++ b/fs/cifs/cifs_fs_sb.h
@@ -51,6 +51,8 @@
*/
#define CIFS_MOUNT_UID_FROM_ACL 0x2000000 /* try to get UID via special SID */
+#define CIFS_MOUNT_DIRECT_RDMA 0x4000000
+
struct cifs_sb_info {
struct rb_root tlink_tree;
spinlock_t tlink_tree_lock;
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index a51855c..3bec63f 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -518,6 +518,7 @@ struct smb_vol {
bool server_ino:1; /* use inode numbers from server ie UniqueId */
bool direct_io:1;
bool strict_io:1; /* strict cache behavior */
+ bool rdma_io:1;
bool remap:1; /* set to remap seven reserved chars in filenames */
bool sfu_remap:1; /* remap seven reserved chars ala SFU */
bool posix_paths:1; /* unset to not ask for posix pathnames. */
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 46d0cf4..c92b3d8 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -282,6 +282,7 @@ enum {
Opt_cache_loose,
Opt_cache_strict,
Opt_cache_none,
+ Opt_cache_rdma,
Opt_cache_err
};
@@ -289,6 +290,7 @@ static const match_table_t cifs_cacheflavor_tokens = {
{ Opt_cache_loose, "loose" },
{ Opt_cache_strict, "strict" },
{ Opt_cache_none, "none" },
+ { Opt_cache_rdma, "rdma" },
{ Opt_cache_err, NULL }
};
@@ -1128,6 +1130,9 @@ cifs_parse_cache_flavor(char *value, struct smb_vol *vol)
vol->direct_io = true;
vol->strict_io = false;
break;
+ case Opt_cache_rdma:
+ vol->rdma_io = true;
+ break;
default:
cifs_dbg(VFS, "bad cache= option: %s\n", value);
return 1;
@@ -3612,6 +3617,10 @@ int cifs_setup_cifs_sb(struct smb_vol *pvolume_info,
cifs_dbg(FYI, "mounting share using direct i/o\n");
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO;
}
+ if (pvolume_info->rdma_io) {
+ cifs_dbg(VFS, "mounting share using rdma i/o\n");
+ cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_RDMA;
+ }
if (pvolume_info->mfsymlinks) {
if (pvolume_info->sfu_emul) {
/*
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c
index 81ba6e0..ce69b1c 100644
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@ -557,6 +557,11 @@ cifs_atomic_open(struct inode *inode, struct dentry *direntry,
file->f_op = &cifs_file_direct_ops;
}
+ if (file->f_flags & O_DIRECT &&
+ CIFS_SB(inode->i_sb)->mnt_cifs_flags & CIFS_MOUNT_DIRECT_RDMA)
+ file->f_op = &cifs_file_direct_rdma_ops;
+
+
file_info = cifs_new_fileinfo(&fid, file, tlink, oplock);
if (file_info == NULL) {
if (server->ops->close)
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 0b394db..30ccf6a 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -492,6 +492,10 @@ int cifs_open(struct inode *inode, struct file *file)
file->f_op = &cifs_file_direct_ops;
}
+ if (file->f_flags & O_DIRECT &&
+ cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_RDMA)
+ file->f_op = &cifs_file_direct_rdma_ops;
+
if (server->oplocks)
oplock = REQ_OPLOCK;
else
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index 3c371f7..7991298 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -44,7 +44,9 @@ static void cifs_set_ops(struct inode *inode)
switch (inode->i_mode & S_IFMT) {
case S_IFREG:
inode->i_op = &cifs_file_inode_ops;
- if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) {
+ if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_RDMA)
+ inode->i_fop = &cifs_file_direct_rdma_ops;
+ else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) {
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
inode->i_fop = &cifs_file_direct_nobrl_ops;
else
--
2.7.4
next prev parent reply other threads:[~2018-05-18 0:22 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-18 0:22 [RFC PATCH 00/09] Implement direct user I/O interfaces for RDMA Long Li
2018-05-17 23:10 ` Tom Talpey
2018-05-18 6:03 ` Long Li
2018-05-18 6:44 ` Christoph Hellwig
2018-05-19 0:58 ` Tom Talpey
2018-05-18 6:42 ` Christoph Hellwig
2018-05-18 0:22 ` [RFC PATCH 01/09] Introduce offset for the 1st page in data transfer structures Long Li
2018-05-18 6:37 ` Steve French
2018-05-18 0:22 ` [RFC PATCH 02/09] Change wdata alloc to support direct pages Long Li
2018-05-19 1:05 ` Tom Talpey
2018-05-18 0:22 ` [RFC PATCH 03/09] Change rdata " Long Li
2018-05-18 0:22 ` [RFC PATCH 04/09] Change function to support offset when reading pages Long Li
2018-05-18 0:22 ` [RFC PATCH 05/09] Change RDMA send to regonize page offset in the 1st page Long Li
2018-05-19 1:09 ` Tom Talpey
2018-05-19 5:54 ` Long Li
2018-05-18 0:22 ` [RFC PATCH 06/09] Change RDMA recv to support " Long Li
2018-05-18 0:22 ` [RFC PATCH 07/09] Support page offset in memory regsitrations Long Li
2018-05-18 0:22 ` [RFC PATCH 08/09] Implement direct file I/O interfaces Long Li
2018-05-18 0:22 ` Long Li [this message]
2018-05-18 7:26 ` [RFC PATCH 09/09] Introduce cache=rdma moutning option Christoph Hellwig
2018-05-18 19:00 ` Long Li
2018-05-18 20:44 ` Steve French
2018-05-18 20:58 ` Long Li
2018-05-19 1:20 ` Tom Talpey
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=20180518002214.5657-10-longli@linuxonhyperv.com \
--to=longli@linuxonhyperv.com \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=longli@microsoft.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.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;
as well as URLs for NNTP newsgroup(s).