12 files changed, 530 insertions, 99 deletions

diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 3e812428ac8d..ba178b09de0b 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -145,6 +145,58 @@ cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)
                 seq_printf(m, "\t\tIPv6: %pI6\n", &ipv6->sin6_addr);
 }
 
+static int cifs_debug_files_proc_show(struct seq_file *m, void *v)
+{
+        struct list_head *stmp, *tmp, *tmp1, *tmp2;
+        struct TCP_Server_Info *server;
+        struct cifs_ses *ses;
+        struct cifs_tcon *tcon;
+        struct cifsFileInfo *cfile;
+
+        seq_puts(m, "# Version:1\n");
+        seq_puts(m, "# Format:\n");
+        seq_puts(m, "# <tree id> <persistent fid> <flags> <count> <pid> <uid>");
+#ifdef CONFIG_CIFS_DEBUG2
+        seq_printf(m, " <filename> <mid>\n");
+#else
+        seq_printf(m, " <filename>\n");
+#endif /* CIFS_DEBUG2 */
+        spin_lock(&cifs_tcp_ses_lock);
+        list_for_each(stmp, &cifs_tcp_ses_list) {
+                server = list_entry(stmp, struct TCP_Server_Info,
+                                    tcp_ses_list);
+                list_for_each(tmp, &server->smb_ses_list) {
+                        ses = list_entry(tmp, struct cifs_ses, smb_ses_list);
+                        list_for_each(tmp1, &ses->tcon_list) {
+                                tcon = list_entry(tmp1, struct cifs_tcon, tcon_list);
+                                spin_lock(&tcon->open_file_lock);
+                                list_for_each(tmp2, &tcon->openFileList) {
+                                        cfile = list_entry(tmp2, struct cifsFileInfo,
+                                                     tlist);
+                                        seq_printf(m,
+                                                "0x%x 0x%llx 0x%x %d %d %d %s",
+                                                tcon->tid,
+                                                cfile->fid.persistent_fid,
+                                                cfile->f_flags,
+                                                cfile->count,
+                                                cfile->pid,
+                                                from_kuid(&init_user_ns, cfile->uid),
+                                                cfile->dentry->d_name.name);
+#ifdef CONFIG_CIFS_DEBUG2
+                                        seq_printf(m, " 0x%llx\n", cfile->fid.mid);
+#else
+                                        seq_printf(m, "\n");
+#endif /* CIFS_DEBUG2 */
+                                }
+                                spin_unlock(&tcon->open_file_lock);
+                        }
+                }
+        }
+        spin_unlock(&cifs_tcp_ses_lock);
+        seq_putc(m, '\n');
+        return 0;
+}
+
 static int cifs_debug_data_proc_show(struct seq_file *m, void *v)
 {
         struct list_head *tmp1, *tmp2, *tmp3;
@@ -565,6 +617,9 @@ cifs_proc_init(void)
         proc_create_single("DebugData", 0, proc_fs_cifs,
                         cifs_debug_data_proc_show);
 
+        proc_create_single("open_files", 0400, proc_fs_cifs,
+                        cifs_debug_files_proc_show);
+
         proc_create("Stats", 0644, proc_fs_cifs, &cifs_stats_proc_fops);
         proc_create("cifsFYI", 0644, proc_fs_cifs, &cifsFYI_proc_fops);
         proc_create("traceSMB", 0644, proc_fs_cifs, &traceSMB_proc_fops);
@@ -601,6 +656,7 @@ cifs_proc_clean(void)
                 return;
 
         remove_proc_entry("DebugData", proc_fs_cifs);
+        remove_proc_entry("open_files", proc_fs_cifs);
         remove_proc_entry("cifsFYI", proc_fs_cifs);
         remove_proc_entry("traceSMB", proc_fs_cifs);
         remove_proc_entry("Stats", proc_fs_cifs);
diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index b611fc2e8984..7f01c6e60791 100644
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -147,8 +147,10 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo)
                 sprintf(dp, ";sec=krb5");
         else if (server->sec_mskerberos)
                 sprintf(dp, ";sec=mskrb5");
-        else
-                goto out;
+        else {
+                cifs_dbg(VFS, "unknown or missing server auth type, use krb5\n");
+                sprintf(dp, ";sec=krb5");
+        }
 
         dp = description + strlen(description);
         sprintf(dp, ";uid=0x%x",
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b7ac09e38159..865706edb307 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -999,8 +999,8 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
         struct inode *src_inode = file_inode(src_file);
         struct inode *target_inode = file_inode(dst_file);
         struct cifsFileInfo *smb_file_src = src_file->private_data;
-        struct cifsFileInfo *smb_file_target = dst_file->private_data;
-        struct cifs_tcon *target_tcon = tlink_tcon(smb_file_target->tlink);
+        struct cifsFileInfo *smb_file_target;
+        struct cifs_tcon *target_tcon;
         unsigned int xid;
         int rc;
 
@@ -1017,6 +1017,9 @@ static loff_t cifs_remap_file_range(struct file *src_file, loff_t off,
                 goto out;
         }
 
+        smb_file_target = dst_file->private_data;
+        target_tcon = tlink_tcon(smb_file_target->tlink);
+
         /*
          * Note: cifs case is easier than btrfs since server responsible for
          * checks for proper open modes and file type and if it wants
@@ -1180,9 +1183,8 @@ const struct file_operations cifs_file_strict_ops = {
 };
 
 const struct file_operations cifs_file_direct_ops = {
-        /* BB reevaluate whether they can be done with directio, no cache */
-        .read_iter = cifs_user_readv,
-        .write_iter = cifs_user_writev,
+        .read_iter = cifs_direct_readv,
+        .write_iter = cifs_direct_writev,
         .open = cifs_open,
         .release = cifs_close,
         .lock = cifs_lock,
@@ -1236,9 +1238,8 @@ const struct file_operations cifs_file_strict_nobrl_ops = {
 };
 
 const struct file_operations cifs_file_direct_nobrl_ops = {
-        /* BB reevaluate whether they can be done with directio, no cache */
-        .read_iter = cifs_user_readv,
-        .write_iter = cifs_user_writev,
+        .read_iter = cifs_direct_readv,
+        .write_iter = cifs_direct_writev,
         .open = cifs_open,
         .release = cifs_close,
         .fsync = cifs_fsync,
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index 24e265a51874..4c3b5cfccc49 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -101,8 +101,10 @@ extern int cifs_open(struct inode *inode, struct file *file);
 extern int cifs_close(struct inode *inode, struct file *file);
 extern int cifs_closedir(struct inode *inode, struct file *file);
 extern ssize_t cifs_user_readv(struct kiocb *iocb, struct iov_iter *to);
+extern ssize_t cifs_direct_readv(struct kiocb *iocb, struct iov_iter *to);
 extern ssize_t cifs_strict_readv(struct kiocb *iocb, struct iov_iter *to);
 extern ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from);
+extern ssize_t cifs_direct_writev(struct kiocb *iocb, struct iov_iter *from);
 extern ssize_t cifs_strict_writev(struct kiocb *iocb, struct iov_iter *from);
 extern int cifs_lock(struct file *, int, struct file_lock *);
 extern int cifs_fsync(struct file *, loff_t, loff_t, int);
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index ed1e0fcb69e3..38ab0fca49e1 100644
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1125,6 +1125,9 @@ struct cifs_fid {
         __u8 create_guid[16];
         struct cifs_pending_open *pending_open;
         unsigned int epoch;
+#ifdef CONFIG_CIFS_DEBUG2
+        __u64 mid;
+#endif /* CIFS_DEBUG2 */
         bool purge_cache;
 };
 
@@ -1183,6 +1186,11 @@ struct cifs_aio_ctx {
         unsigned int            len;
         unsigned int            total_len;
         bool                    should_dirty;
+        /*
+         * Indicates if this aio_ctx is for direct_io,