lkml.org 
[lkml]   [2017]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Patch v5 04/21] CIFS: SMBD: Add rdma mount option
    Date
    From: Long Li <longli@microsoft.com>

    Add "rdma" to CIFS mount options to connect to SMB Direct.
    Add checks to validate this is used on SMB 3.X dialects.

    To connect to SMBDirect, use "mount.cifs -o rdma,vers=3.x".
    At the time of this patch, 3.x can be 3.0, 3.02 or 3.1.1.

    Signed-off-by: Long Li <longli@microsoft.com>
    ---
    fs/cifs/cifs_debug.c | 2 ++
    fs/cifs/cifsfs.c | 2 ++
    fs/cifs/cifsglob.h | 7 +++++++
    fs/cifs/connect.c | 15 ++++++++++++++-
    4 files changed, 25 insertions(+), 1 deletion(-)

    diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
    index 26d0dff..7025d8d 100644
    --- a/fs/cifs/cifs_debug.c
    +++ b/fs/cifs/cifs_debug.c
    @@ -174,6 +174,8 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
    ses->ses_count, ses->serverOS, ses->serverNOS,
    ses->capabilities, ses->status);
    }
    + if (server->rdma)
    + seq_printf(m, "RDMA\n\t");
    seq_printf(m, "TCP status: %d\n\tLocal Users To "
    "Server: %d SecMode: 0x%x Req On Wire: %d",
    server->tcpStatus, server->srv_count,
    diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
    index 180b335..e15fbf1 100644
    --- a/fs/cifs/cifsfs.c
    +++ b/fs/cifs/cifsfs.c
    @@ -327,6 +327,8 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server)
    default:
    seq_puts(s, "(unknown)");
    }
    + if (server->rdma)
    + seq_puts(s, ",rdma");
    }

    static void
    diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
    index 808486c..09f9a71 100644
    --- a/fs/cifs/cifsglob.h
    +++ b/fs/cifs/cifsglob.h
    @@ -530,6 +530,7 @@ struct smb_vol {
    bool nopersistent:1;
    bool resilient:1; /* noresilient not required since not fored for CA */
    bool domainauto:1;
    + bool rdma:1;
    unsigned int rsize;
    unsigned int wsize;
    bool sockopt_tcp_nodelay:1;
    @@ -646,6 +647,12 @@ struct TCP_Server_Info {
    bool sec_kerberos; /* supports plain Kerberos */
    bool sec_mskerberos; /* supports legacy MS Kerberos */
    bool large_buf; /* is current buffer large? */
    + /* use SMBD connection instead of socket */
    + bool rdma;
    +#ifdef CONFIG_CIFS_SMB_DIRECT
    + /* point to the SMBD connection if RDMA is used instead of socket */
    + struct smbd_connection *smbd_conn;
    +#endif
    struct delayed_work echo; /* echo ping workqueue job */
    char *smallbuf; /* pointer to current "small" buffer */
    char *bigbuf; /* pointer to current "big" buffer */
    diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
    index 59647eb..b5a575f 100644
    --- a/fs/cifs/connect.c
    +++ b/fs/cifs/connect.c
    @@ -92,7 +92,7 @@ enum {
    Opt_multiuser, Opt_sloppy, Opt_nosharesock,
    Opt_persistent, Opt_nopersistent,
    Opt_resilient, Opt_noresilient,
    - Opt_domainauto,
    + Opt_domainauto, Opt_rdma,

    /* Mount options which take numeric value */
    Opt_backupuid, Opt_backupgid, Opt_uid,
    @@ -183,6 +183,7 @@ static const match_table_t cifs_mount_option_tokens = {
    { Opt_resilient, "resilienthandles"},
    { Opt_noresilient, "noresilienthandles"},
    { Opt_domainauto, "domainauto"},
    + { Opt_rdma, "rdma"},

    { Opt_backupuid, "backupuid=%s" },
    { Opt_backupgid, "backupgid=%s" },
    @@ -1538,6 +1539,9 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
    case Opt_domainauto:
    vol->domainauto = true;
    break;
    + case Opt_rdma:
    + vol->rdma = true;
    + break;

    /* Numeric Values */
    case Opt_backupuid:
    @@ -1928,6 +1932,11 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
    goto cifs_parse_mount_err;
    }

    + if (vol->rdma && vol->vals->protocol_id < SMB30_PROT_ID) {
    + cifs_dbg(VFS, "SMB Direct requires Version >=3.0\n");
    + goto cifs_parse_mount_err;
    + }
    +
    #ifndef CONFIG_KEYS
    /* Muliuser mounts require CONFIG_KEYS support */
    if (vol->multiuser) {
    @@ -2131,6 +2140,9 @@ static int match_server(struct TCP_Server_Info *server, struct smb_vol *vol)
    if (server->echo_interval != vol->echo_interval * HZ)
    return 0;

    + if (server->rdma != vol->rdma)
    + return 0;
    +
    return 1;
    }

    @@ -2229,6 +2241,7 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
    tcp_ses->noblocksnd = volume_info->noblocksnd;
    tcp_ses->noautotune = volume_info->noautotune;
    tcp_ses->tcp_nodelay = volume_info->sockopt_tcp_nodelay;
    + tcp_ses->rdma = volume_info->rdma;
    tcp_ses->in_flight = 0;
    tcp_ses->credits = 1;
    init_waitqueue_head(&tcp_ses->response_q);
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-10-22 17:19    [W:2.777 / U:0.296 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site