2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* fs/cifs/file.c
|
|
|
|
*
|
|
|
|
* vfs operations that deal with files
|
2007-07-10 08:16:18 +07:00
|
|
|
*
|
2010-04-21 11:12:10 +07:00
|
|
|
* Copyright (C) International Business Machines Corp., 2002,2010
|
2005-04-17 05:20:36 +07:00
|
|
|
* Author(s): Steve French (sfrench@us.ibm.com)
|
2006-08-03 04:56:33 +07:00
|
|
|
* Jeremy Allison (jra@samba.org)
|
2005-04-17 05:20:36 +07:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
|
|
* by the Free Software Foundation; either version 2.1 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
|
|
* the GNU Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
|
|
* along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
#include <linux/fs.h>
|
2005-10-06 04:50:29 +07:00
|
|
|
#include <linux/backing-dev.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/stat.h>
|
|
|
|
#include <linux/fcntl.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/pagevec.h>
|
2005-10-06 04:50:29 +07:00
|
|
|
#include <linux/writeback.h>
|
2006-12-10 17:19:44 +07:00
|
|
|
#include <linux/task_io_accounting_ops.h>
|
2005-10-21 03:44:56 +07:00
|
|
|
#include <linux/delay.h>
|
2009-09-21 17:47:50 +07:00
|
|
|
#include <linux/mount.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2011-10-20 02:30:16 +07:00
|
|
|
#include <linux/swap.h>
|
2019-01-04 06:29:02 +07:00
|
|
|
#include <linux/mm.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <asm/div64.h>
|
|
|
|
#include "cifsfs.h"
|
|
|
|
#include "cifspdu.h"
|
|
|
|
#include "cifsglob.h"
|
|
|
|
#include "cifsproto.h"
|
|
|
|
#include "cifs_unicode.h"
|
|
|
|
#include "cifs_debug.h"
|
|
|
|
#include "cifs_fs_sb.h"
|
2010-07-05 19:42:45 +07:00
|
|
|
#include "fscache.h"
|
2017-11-23 07:38:47 +07:00
|
|
|
#include "smbdirect.h"
|
2013-02-18 23:34:26 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static inline int cifs_convert_flags(unsigned int flags)
|
|
|
|
{
|
|
|
|
if ((flags & O_ACCMODE) == O_RDONLY)
|
|
|
|
return GENERIC_READ;
|
|
|
|
else if ((flags & O_ACCMODE) == O_WRONLY)
|
|
|
|
return GENERIC_WRITE;
|
|
|
|
else if ((flags & O_ACCMODE) == O_RDWR) {
|
|
|
|
/* GENERIC_ALL is too much permission to request
|
|
|
|
can cause unnecessary access denied on create */
|
|
|
|
/* return GENERIC_ALL; */
|
|
|
|
return (GENERIC_READ | GENERIC_WRITE);
|
|
|
|
}
|
|
|
|
|
2008-05-15 00:21:33 +07:00
|
|
|
return (READ_CONTROL | FILE_WRITE_ATTRIBUTES | FILE_READ_ATTRIBUTES |
|
|
|
|
FILE_WRITE_EA | FILE_APPEND_DATA | FILE_WRITE_DATA |
|
|
|
|
FILE_READ_DATA);
|
2009-02-24 03:43:11 +07:00
|
|
|
}
|
2008-05-15 00:21:33 +07:00
|
|
|
|
2010-10-16 02:33:56 +07:00
|
|
|
static u32 cifs_posix_convert_flags(unsigned int flags)
|
2009-02-24 03:43:11 +07:00
|
|
|
{
|
2010-10-16 02:33:56 +07:00
|
|
|
u32 posix_flags = 0;
|
2008-05-15 00:21:33 +07:00
|
|
|
|
2009-02-24 03:43:11 +07:00
|
|
|
if ((flags & O_ACCMODE) == O_RDONLY)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags = SMB_O_RDONLY;
|
2009-02-24 03:43:11 +07:00
|
|
|
else if ((flags & O_ACCMODE) == O_WRONLY)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags = SMB_O_WRONLY;
|
|
|
|
else if ((flags & O_ACCMODE) == O_RDWR)
|
|
|
|
posix_flags = SMB_O_RDWR;
|
|
|
|
|
2013-02-18 23:34:26 +07:00
|
|
|
if (flags & O_CREAT) {
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags |= SMB_O_CREAT;
|
2013-02-18 23:34:26 +07:00
|
|
|
if (flags & O_EXCL)
|
|
|
|
posix_flags |= SMB_O_EXCL;
|
|
|
|
} else if (flags & O_EXCL)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Application %s pid %d has incorrectly set O_EXCL flag but not O_CREAT on file open. Ignoring O_EXCL\n",
|
|
|
|
current->comm, current->tgid);
|
2013-02-18 23:34:26 +07:00
|
|
|
|
2010-10-16 02:33:56 +07:00
|
|
|
if (flags & O_TRUNC)
|
|
|
|
posix_flags |= SMB_O_TRUNC;
|
|
|
|
/* be safe and imply O_SYNC for O_DSYNC */
|
2009-10-27 17:05:28 +07:00
|
|
|
if (flags & O_DSYNC)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags |= SMB_O_SYNC;
|
2009-02-24 03:43:11 +07:00
|
|
|
if (flags & O_DIRECTORY)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags |= SMB_O_DIRECTORY;
|
2009-02-24 03:43:11 +07:00
|
|
|
if (flags & O_NOFOLLOW)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags |= SMB_O_NOFOLLOW;
|
2009-02-24 03:43:11 +07:00
|
|
|
if (flags & O_DIRECT)
|
2010-10-16 02:33:56 +07:00
|
|
|
posix_flags |= SMB_O_DIRECT;
|
2009-02-24 03:43:11 +07:00
|
|
|
|
|
|
|
return posix_flags;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int cifs_get_disposition(unsigned int flags)
|
|
|
|
{
|
|
|
|
if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
|
|
|
|
return FILE_CREATE;
|
|
|
|
else if ((flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC))
|
|
|
|
return FILE_OVERWRITE_IF;
|
|
|
|
else if ((flags & O_CREAT) == O_CREAT)
|
|
|
|
return FILE_OPEN_IF;
|
2006-05-31 01:09:31 +07:00
|
|
|
else if ((flags & O_TRUNC) == O_TRUNC)
|
|
|
|
return FILE_OVERWRITE;
|
2005-04-17 05:20:36 +07:00
|
|
|
else
|
|
|
|
return FILE_OPEN;
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:33:56 +07:00
|
|
|
int cifs_posix_open(char *full_path, struct inode **pinode,
|
|
|
|
struct super_block *sb, int mode, unsigned int f_flags,
|
2012-06-20 14:21:16 +07:00
|
|
|
__u32 *poplock, __u16 *pnetfid, unsigned int xid)
|
2010-10-16 02:33:56 +07:00
|
|
|
{
|
|
|
|
int rc;
|
|
|
|
FILE_UNIX_BASIC_INFO *presp_data;
|
|
|
|
__u32 posix_flags = 0;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
|
|
|
struct cifs_fattr fattr;
|
|
|
|
struct tcon_link *tlink;
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2010-10-16 02:33:56 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "posix open %s\n", full_path);
|
2010-10-16 02:33:56 +07:00
|
|
|
|
|
|
|
presp_data = kzalloc(sizeof(FILE_UNIX_BASIC_INFO), GFP_KERNEL);
|
|
|
|
if (presp_data == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink)) {
|
|
|
|
rc = PTR_ERR(tlink);
|
|
|
|
goto posix_open_ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
tcon = tlink_tcon(tlink);
|
|
|
|
mode &= ~current_umask();
|
|
|
|
|
|
|
|
posix_flags = cifs_posix_convert_flags(f_flags);
|
|
|
|
rc = CIFSPOSIXCreate(xid, tcon, posix_flags, mode, pnetfid, presp_data,
|
|
|
|
poplock, full_path, cifs_sb->local_nls,
|
2015-02-13 13:35:58 +07:00
|
|
|
cifs_remap(cifs_sb));
|
2010-10-16 02:33:56 +07:00
|
|
|
cifs_put_tlink(tlink);
|
|
|
|
|
|
|
|
if (rc)
|
|
|
|
goto posix_open_ret;
|
|
|
|
|
|
|
|
if (presp_data->Type == cpu_to_le32(-1))
|
|
|
|
goto posix_open_ret; /* open ok, caller does qpathinfo */
|
|
|
|
|
|
|
|
if (!pinode)
|
|
|
|
goto posix_open_ret; /* caller does not need info */
|
|
|
|
|
|
|
|
cifs_unix_basic_to_fattr(&fattr, presp_data, cifs_sb);
|
|
|
|
|
|
|
|
/* get new inode and set it up */
|
|
|
|
if (*pinode == NULL) {
|
|
|
|
cifs_fill_uniqueid(sb, &fattr);
|
|
|
|
*pinode = cifs_iget(sb, &fattr);
|
|
|
|
if (!*pinode) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto posix_open_ret;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
cifs_fattr_to_inode(*pinode, &fattr);
|
|
|
|
}
|
|
|
|
|
|
|
|
posix_open_ret:
|
|
|
|
kfree(presp_data);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-11-25 19:12:39 +07:00
|
|
|
static int
|
|
|
|
cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb,
|
2012-09-19 06:20:26 +07:00
|
|
|
struct cifs_tcon *tcon, unsigned int f_flags, __u32 *oplock,
|
|
|
|
struct cifs_fid *fid, unsigned int xid)
|
2010-11-25 19:12:39 +07:00
|
|
|
{
|
|
|
|
int rc;
|
2012-09-19 06:20:26 +07:00
|
|
|
int desired_access;
|
2010-11-25 19:12:39 +07:00
|
|
|
int disposition;
|
2011-09-26 21:56:44 +07:00
|
|
|
int create_options = CREATE_NOT_DIR;
|
2010-11-25 19:12:39 +07:00
|
|
|
FILE_ALL_INFO *buf;
|
2012-09-19 20:22:44 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2013-07-05 15:00:30 +07:00
|
|
|
struct cifs_open_parms oparms;
|
2010-11-25 19:12:39 +07:00
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
if (!server->ops->open)
|
2012-09-19 06:20:26 +07:00
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
desired_access = cifs_convert_flags(f_flags);
|
2010-11-25 19:12:39 +07:00
|
|
|
|
|
|
|
/*********************************************************************
|
|
|
|
* open flag mapping table:
|
|
|
|
*
|
|
|
|
* POSIX Flag CIFS Disposition
|
|
|
|
* ---------- ----------------
|
|
|
|
* O_CREAT FILE_OPEN_IF
|
|
|
|
* O_CREAT | O_EXCL FILE_CREATE
|
|
|
|
* O_CREAT | O_TRUNC FILE_OVERWRITE_IF
|
|
|
|
* O_TRUNC FILE_OVERWRITE
|
|
|
|
* none of the above FILE_OPEN
|
|
|
|
*
|
|
|
|
* Note that there is not a direct match between disposition
|
|
|
|
* FILE_SUPERSEDE (ie create whether or not file exists although
|
|
|
|
* O_CREAT | O_TRUNC is similar but truncates the existing
|
|
|
|
* file rather than creating a new file as FILE_SUPERSEDE does
|
|
|
|
* (which uses the attributes / metadata passed in on open call)
|
|
|
|
*?
|
|
|
|
*? O_SYNC is a reasonable match to CIFS writethrough flag
|
|
|
|
*? and the read write flags match reasonably. O_LARGEFILE
|
|
|
|
*? is irrelevant because largefile support is always used
|
|
|
|
*? by this client. Flags O_APPEND, O_DIRECT, O_DIRECTORY,
|
|
|
|
* O_FASYNC, O_NOFOLLOW, O_NONBLOCK need further investigation
|
|
|
|
*********************************************************************/
|
|
|
|
|
|
|
|
disposition = cifs_get_disposition(f_flags);
|
|
|
|
|
|
|
|
/* BB pass O_SYNC flag through on file attributes .. BB */
|
|
|
|
|
|
|
|
buf = kmalloc(sizeof(FILE_ALL_INFO), GFP_KERNEL);
|
|
|
|
if (!buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2017-09-22 13:40:27 +07:00
|
|
|
/* O_SYNC also has bit for O_DSYNC so following check picks up either */
|
|
|
|
if (f_flags & O_SYNC)
|
|
|
|
create_options |= CREATE_WRITE_THROUGH;
|
|
|
|
|
|
|
|
if (f_flags & O_DIRECT)
|
|
|
|
create_options |= CREATE_NO_BUFFER;
|
|
|
|
|
2013-07-05 15:00:30 +07:00
|
|
|
oparms.tcon = tcon;
|
|
|
|
oparms.cifs_sb = cifs_sb;
|
|
|
|
oparms.desired_access = desired_access;
|
2020-02-04 02:46:43 +07:00
|
|
|
oparms.create_options = cifs_create_options(cifs_sb, create_options);
|
2013-07-05 15:00:30 +07:00
|
|
|
oparms.disposition = disposition;
|
|
|
|
oparms.path = full_path;
|
|
|
|
oparms.fid = fid;
|
2013-07-09 21:40:58 +07:00
|
|
|
oparms.reconnect = false;
|
2013-07-05 15:00:30 +07:00
|
|
|
|
|
|
|
rc = server->ops->open(xid, &oparms, oplock, buf);
|
2010-11-25 19:12:39 +07:00
|
|
|
|
|
|
|
if (rc)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (tcon->unix_ext)
|
|
|
|
rc = cifs_get_inode_info_unix(&inode, full_path, inode->i_sb,
|
|
|
|
xid);
|
|
|
|
else
|
|
|
|
rc = cifs_get_inode_info(&inode, full_path, buf, inode->i_sb,
|
2014-02-11 03:08:16 +07:00
|
|
|
xid, fid);
|
2010-11-25 19:12:39 +07:00
|
|
|
|
2019-10-01 00:06:18 +07:00
|
|
|
if (rc) {
|
|
|
|
server->ops->close(xid, tcon, fid);
|
|
|
|
if (rc == -ESTALE)
|
|
|
|
rc = -EOPENSTALE;
|
|
|
|
}
|
|
|
|
|
2010-11-25 19:12:39 +07:00
|
|
|
out:
|
|
|
|
kfree(buf);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-12-24 17:41:19 +07:00
|
|
|
static bool
|
|
|
|
cifs_has_mand_locks(struct cifsInodeInfo *cinode)
|
|
|
|
{
|
|
|
|
struct cifs_fid_locks *cur;
|
|
|
|
bool has_locks = false;
|
|
|
|
|
|
|
|
down_read(&cinode->lock_sem);
|
|
|
|
list_for_each_entry(cur, &cinode->llist, llist) {
|
|
|
|
if (!list_empty(&cur->locks)) {
|
|
|
|
has_locks = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
up_read(&cinode->lock_sem);
|
|
|
|
return has_locks;
|
|
|
|
}
|
|
|
|
|
2019-10-23 16:02:33 +07:00
|
|
|
void
|
|
|
|
cifs_down_write(struct rw_semaphore *sem)
|
|
|
|
{
|
|
|
|
while (!down_write_trylock(sem))
|
|
|
|
msleep(10);
|
|
|
|
}
|
|
|
|
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
static void cifsFileInfo_put_work(struct work_struct *work);
|
|
|
|
|
2010-10-16 02:34:02 +07:00
|
|
|
struct cifsFileInfo *
|
2012-09-19 06:20:26 +07:00
|
|
|
cifs_new_fileinfo(struct cifs_fid *fid, struct file *file,
|
2010-10-16 02:34:02 +07:00
|
|
|
struct tcon_link *tlink, __u32 oplock)
|
|
|
|
{
|
2016-04-18 18:41:52 +07:00
|
|
|
struct dentry *dentry = file_dentry(file);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(dentry);
|
2012-09-19 06:20:26 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(inode);
|
|
|
|
struct cifsFileInfo *cfile;
|
2012-09-19 20:22:43 +07:00
|
|
|
struct cifs_fid_locks *fdlocks;
|
2012-09-19 20:22:45 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(tlink);
|
2012-12-24 17:41:19 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2012-09-19 06:20:26 +07:00
|
|
|
|
|
|
|
cfile = kzalloc(sizeof(struct cifsFileInfo), GFP_KERNEL);
|
|
|
|
if (cfile == NULL)
|
|
|
|
return cfile;
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
fdlocks = kzalloc(sizeof(struct cifs_fid_locks), GFP_KERNEL);
|
|
|
|
if (!fdlocks) {
|
|
|
|
kfree(cfile);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&fdlocks->locks);
|
|
|
|
fdlocks->cfile = cfile;
|
|
|
|
cfile->llist = fdlocks;
|
|
|
|
|
2012-09-19 06:20:26 +07:00
|
|
|
cfile->count = 1;
|
|
|
|
cfile->pid = current->tgid;
|
|
|
|
cfile->uid = current_fsuid();
|
|
|
|
cfile->dentry = dget(dentry);
|
|
|
|
cfile->f_flags = file->f_flags;
|
|
|
|
cfile->invalidHandle = false;
|
|
|
|
cfile->tlink = cifs_get_tlink(tlink);
|
|
|
|
INIT_WORK(&cfile->oplock_break, cifs_oplock_break);
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
INIT_WORK(&cfile->put, cifsFileInfo_put_work);
|
2012-09-19 20:22:43 +07:00
|
|
|
mutex_init(&cfile->fh_mutex);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock_init(&cfile->file_info_lock);
|
2010-10-16 02:34:02 +07:00
|
|
|
|
2013-03-08 22:30:03 +07:00
|
|
|
cifs_sb_active(inode->i_sb);
|
|
|
|
|
2012-12-24 17:41:19 +07:00
|
|
|
/*
|
|
|
|
* If the server returned a read oplock and we have mandatory brlocks,
|
|
|
|
* set oplock level to None.
|
|
|
|
*/
|
2013-09-05 19:11:28 +07:00
|
|
|
if (server->ops->is_read_op(oplock) && cifs_has_mand_locks(cinode)) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Reset oplock val from read to None due to mand locks\n");
|
2012-12-24 17:41:19 +07:00
|
|
|
oplock = 0;
|
|
|
|
}
|
|
|
|
|
2019-11-28 07:18:39 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
|
|
|
list_add(&fdlocks->llist, &cinode->llist);
|
|
|
|
up_write(&cinode->lock_sem);
|
|
|
|
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock(&tcon->open_file_lock);
|
2012-12-24 17:41:19 +07:00
|
|
|
if (fid->pending_open->oplock != CIFS_OPLOCK_NO_CHANGE && oplock)
|
2012-09-19 20:22:45 +07:00
|
|
|
oplock = fid->pending_open->oplock;
|
|
|
|
list_del(&fid->pending_open->olist);
|
|
|
|
|
2013-09-06 00:30:16 +07:00
|
|
|
fid->purge_cache = false;
|
2012-12-24 17:41:19 +07:00
|
|
|
server->ops->set_fid(cfile, fid, oplock);
|
2012-09-19 20:22:45 +07:00
|
|
|
|
|
|
|
list_add(&cfile->tlist, &tcon->openFileList);
|
2018-10-20 05:14:32 +07:00
|
|
|
atomic_inc(&tcon->num_local_opens);
|
2016-09-23 06:58:16 +07:00
|
|
|
|
2010-10-16 02:34:02 +07:00
|
|
|
/* if readable file instance put first in list*/
|
2019-06-05 07:38:38 +07:00
|
|
|
spin_lock(&cinode->open_file_lock);
|
2010-10-16 02:34:02 +07:00
|
|
|
if (file->f_mode & FMODE_READ)
|
2012-09-19 06:20:26 +07:00
|
|
|
list_add(&cfile->flist, &cinode->openFileList);
|
2010-10-16 02:34:02 +07:00
|
|
|
else
|
2012-09-19 06:20:26 +07:00
|
|
|
list_add_tail(&cfile->flist, &cinode->openFileList);
|
2019-06-05 07:38:38 +07:00
|
|
|
spin_unlock(&cinode->open_file_lock);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&tcon->open_file_lock);
|
2010-10-16 02:34:02 +07:00
|
|
|
|
2013-09-06 00:30:16 +07:00
|
|
|
if (fid->purge_cache)
|
2014-04-30 20:31:47 +07:00
|
|
|
cifs_zap_mapping(inode);
|
2013-09-06 00:30:16 +07:00
|
|
|
|
2012-09-19 06:20:26 +07:00
|
|
|
file->private_data = cfile;
|
|
|
|
return cfile;
|
2010-10-16 02:34:02 +07:00
|
|
|
}
|
|
|
|
|
2012-07-26 01:59:54 +07:00
|
|
|
struct cifsFileInfo *
|
|
|
|
cifsFileInfo_get(struct cifsFileInfo *cifs_file)
|
|
|
|
{
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock(&cifs_file->file_info_lock);
|
2012-07-26 01:59:54 +07:00
|
|
|
cifsFileInfo_get_locked(cifs_file);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&cifs_file->file_info_lock);
|
2012-07-26 01:59:54 +07:00
|
|
|
return cifs_file;
|
|
|
|
}
|
|
|
|
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
static void cifsFileInfo_put_final(struct cifsFileInfo *cifs_file)
|
|
|
|
{
|
|
|
|
struct inode *inode = d_inode(cifs_file->dentry);
|
|
|
|
struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
|
|
|
struct cifsLockInfo *li, *tmp;
|
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Delete any outstanding lock records. We'll lose them when the file
|
|
|
|
* is closed anyway.
|
|
|
|
*/
|
|
|
|
cifs_down_write(&cifsi->lock_sem);
|
|
|
|
list_for_each_entry_safe(li, tmp, &cifs_file->llist->locks, llist) {
|
|
|
|
list_del(&li->llist);
|
|
|
|
cifs_del_lock_waiters(li);
|
|
|
|
kfree(li);
|
|
|
|
}
|
|
|
|
list_del(&cifs_file->llist->llist);
|
|
|
|
kfree(cifs_file->llist);
|
|
|
|
up_write(&cifsi->lock_sem);
|
|
|
|
|
|
|
|
cifs_put_tlink(cifs_file->tlink);
|
|
|
|
dput(cifs_file->dentry);
|
|
|
|
cifs_sb_deactive(sb);
|
|
|
|
kfree(cifs_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void cifsFileInfo_put_work(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct cifsFileInfo *cifs_file = container_of(work,
|
|
|
|
struct cifsFileInfo, put);
|
|
|
|
|
|
|
|
cifsFileInfo_put_final(cifs_file);
|
|
|
|
}
|
|
|
|
|
2019-03-29 16:49:12 +07:00
|
|
|
/**
|
|
|
|
* cifsFileInfo_put - release a reference of file priv data
|
|
|
|
*
|
|
|
|
* Always potentially wait for oplock handler. See _cifsFileInfo_put().
|
2010-10-22 05:46:14 +07:00
|
|
|
*/
|
2010-10-16 02:34:04 +07:00
|
|
|
void cifsFileInfo_put(struct cifsFileInfo *cifs_file)
|
2019-03-29 16:49:12 +07:00
|
|
|
{
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
_cifsFileInfo_put(cifs_file, true, true);
|
2019-03-29 16:49:12 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* _cifsFileInfo_put - release a reference of file priv data
|
|
|
|
*
|
|
|
|
* This may involve closing the filehandle @cifs_file out on the
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
* server. Must be called without holding tcon->open_file_lock,
|
|
|
|
* cinode->open_file_lock and cifs_file->file_info_lock.
|
2019-03-29 16:49:12 +07:00
|
|
|
*
|
|
|
|
* If @wait_for_oplock_handler is true and we are releasing the last
|
|
|
|
* reference, wait for any running oplock break handler of the file
|
|
|
|
* and cancel any pending one. If calling this function from the
|
|
|
|
* oplock break handler, you need to pass false.
|
|
|
|
*
|
|
|
|
*/
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
void _cifsFileInfo_put(struct cifsFileInfo *cifs_file,
|
|
|
|
bool wait_oplock_handler, bool offload)
|
2010-10-16 02:34:04 +07:00
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(cifs_file->dentry);
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cifs_file->tlink);
|
2012-09-19 20:22:45 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2010-11-02 16:00:42 +07:00
|
|
|
struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
2013-03-08 22:30:03 +07:00
|
|
|
struct super_block *sb = inode->i_sb;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
|
2012-09-19 20:22:45 +07:00
|
|
|
struct cifs_fid fid;
|
|
|
|
struct cifs_pending_open open;
|
2015-01-15 19:22:04 +07:00
|
|
|
bool oplock_break_cancelled;
|
2010-10-22 05:46:14 +07:00
|
|
|
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock(&tcon->open_file_lock);
|
2019-10-24 05:37:19 +07:00
|
|
|
spin_lock(&cifsi->open_file_lock);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock(&cifs_file->file_info_lock);
|
2010-10-16 02:34:06 +07:00
|
|
|
if (--cifs_file->count > 0) {
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&cifs_file->file_info_lock);
|
2019-10-24 05:37:19 +07:00
|
|
|
spin_unlock(&cifsi->open_file_lock);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&tcon->open_file_lock);
|
2010-10-22 05:46:14 +07:00
|
|
|
return;
|
|
|
|
}
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&cifs_file->file_info_lock);
|
2010-10-22 05:46:14 +07:00
|
|
|
|
2012-09-19 20:22:45 +07:00
|
|
|
if (server->ops->get_lease_key)
|
|
|
|
server->ops->get_lease_key(inode, &fid);
|
|
|
|
|
|
|
|
/* store open in pending opens to make sure we don't miss lease break */
|
|
|
|
cifs_add_pending_open_locked(&fid, cifs_file->tlink, &open);
|
|
|
|
|
2010-10-22 05:46:14 +07:00
|
|
|
/* remove it from the lists */
|
|
|
|
list_del(&cifs_file->flist);
|
|
|
|
list_del(&cifs_file->tlist);
|
2018-10-20 05:14:32 +07:00
|
|
|
atomic_dec(&tcon->num_local_opens);
|
2010-10-22 05:46:14 +07:00
|
|
|
|
|
|
|
if (list_empty(&cifsi->openFileList)) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "closing last open instance for inode %p\n",
|
2015-03-18 05:25:59 +07:00
|
|
|
d_inode(cifs_file->dentry));
|
2012-09-19 06:20:27 +07:00
|
|
|
/*
|
|
|
|
* In strict cache mode we need invalidate mapping on the last
|
|
|
|
* close because it may cause a error when we open this file
|
|
|
|
* again and get at least level II oplock.
|
|
|
|
*/
|
2010-11-22 02:36:12 +07:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO)
|
2014-04-30 20:31:45 +07:00
|
|
|
set_bit(CIFS_INO_INVALID_MAPPING, &cifsi->flags);
|
2010-11-03 14:58:57 +07:00
|
|
|
cifs_set_oplock_level(cifsi, 0);
|
2010-10-22 05:46:14 +07:00
|
|
|
}
|
2016-09-23 06:58:16 +07:00
|
|
|
|
2019-10-24 05:37:19 +07:00
|
|
|
spin_unlock(&cifsi->open_file_lock);
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&tcon->open_file_lock);
|
2010-10-22 05:46:14 +07:00
|
|
|
|
2019-03-29 16:49:12 +07:00
|
|
|
oplock_break_cancelled = wait_oplock_handler ?
|
|
|
|
cancel_work_sync(&cifs_file->oplock_break) : false;
|
2011-07-26 23:20:17 +07:00
|
|
|
|
2010-10-22 05:46:14 +07:00
|
|
|
if (!tcon->need_reconnect && !cifs_file->invalidHandle) {
|
2012-09-19 06:20:26 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2012-09-19 06:20:26 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2019-12-03 10:46:54 +07:00
|
|
|
if (server->ops->close_getattr)
|
|
|
|
server->ops->close_getattr(xid, tcon, cifs_file);
|
|
|
|
else if (server->ops->close)
|
2012-09-25 14:00:07 +07:00
|
|
|
server->ops->close(xid, tcon, &cifs_file->fid);
|
|
|
|
_free_xid(xid);
|
2010-10-22 05:46:14 +07:00
|
|
|
}
|
|
|
|
|
2015-01-15 19:22:04 +07:00
|
|
|
if (oplock_break_cancelled)
|
|
|
|
cifs_done_oplock_break(cifsi);
|
|
|
|
|
2012-09-19 20:22:45 +07:00
|
|
|
cifs_del_pending_open(&open);
|
|
|
|
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
if (offload)
|
|
|
|
queue_work(fileinfo_put_wq, &cifs_file->put);
|
|
|
|
else
|
|
|
|
cifsFileInfo_put_final(cifs_file);
|
2010-10-16 02:34:04 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
int cifs_open(struct inode *inode, struct file *file)
|
2012-09-19 20:22:45 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int rc = -EACCES;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2009-09-12 22:54:28 +07:00
|
|
|
__u32 oplock;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2012-09-19 20:22:44 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2010-09-30 06:51:11 +07:00
|
|
|
struct tcon_link *tlink;
|
2012-09-19 06:20:26 +07:00
|
|
|
struct cifsFileInfo *cfile = NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
char *full_path = NULL;
|
2010-11-25 21:20:20 +07:00
|
|
|
bool posix_open_ok = false;
|
2012-09-19 06:20:26 +07:00
|
|
|
struct cifs_fid fid;
|
2012-09-19 20:22:45 +07:00
|
|
|
struct cifs_pending_open open;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
cifs_sb = CIFS_SB(inode->i_sb);
|
2010-09-30 06:51:11 +07:00
|
|
|
tlink = cifs_sb_tlink(cifs_sb);
|
|
|
|
if (IS_ERR(tlink)) {
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-09-30 06:51:11 +07:00
|
|
|
return PTR_ERR(tlink);
|
|
|
|
}
|
|
|
|
tcon = tlink_tcon(tlink);
|
2012-09-19 20:22:44 +07:00
|
|
|
server = tcon->ses->server;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2016-04-18 18:41:52 +07:00
|
|
|
full_path = build_path_from_dentry(file_dentry(file));
|
2005-04-17 05:20:36 +07:00
|
|
|
if (full_path == NULL) {
|
2009-06-25 19:42:34 +07:00
|
|
|
rc = -ENOMEM;
|
2010-08-06 00:58:38 +07:00
|
|
|
goto out;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "inode = 0x%p file flags are 0x%x for %s\n",
|
2010-04-21 10:50:45 +07:00
|
|
|
inode, file->f_flags, full_path);
|
2009-03-04 01:00:34 +07:00
|
|
|
|
2014-08-22 12:22:51 +07:00
|
|
|
if (file->f_flags & O_DIRECT &&
|
|
|
|
cifs_sb->mnt_cifs_flags & CIFS_MOUNT_STRICT_IO) {
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)
|
|
|
|
file->f_op = &cifs_file_direct_nobrl_ops;
|
|
|
|
else
|
|
|
|
file->f_op = &cifs_file_direct_ops;
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:45 +07:00
|
|
|
if (server->oplocks)
|
2009-03-04 01:00:34 +07:00
|
|
|
oplock = REQ_OPLOCK;
|
|
|
|
else
|
|
|
|
oplock = 0;
|
|
|
|
|
2009-03-05 02:54:08 +07:00
|
|
|
if (!tcon->broken_posix_open && tcon->unix_ext &&
|
2012-07-13 16:58:14 +07:00
|
|
|
cap_unix(tcon->ses) && (CIFS_UNIX_POSIX_PATH_OPS_CAP &
|
|
|
|
le64_to_cpu(tcon->fsUnixInfo.Capability))) {
|
2009-03-04 01:00:34 +07:00
|
|
|
/* can not refresh inode info since size could be stale */
|
2010-06-17 00:40:16 +07:00
|
|
|
rc = cifs_posix_open(full_path, &inode, inode->i_sb,
|
2010-04-23 02:21:55 +07:00
|
|
|
cifs_sb->mnt_file_mode /* ignored */,
|
2012-09-19 06:20:26 +07:00
|
|
|
file->f_flags, &oplock, &fid.netfid, xid);
|
2009-03-04 01:00:34 +07:00
|
|
|
if (rc == 0) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "posix open succeeded\n");
|
2010-11-25 21:20:20 +07:00
|
|
|
posix_open_ok = true;
|
2009-03-05 02:54:08 +07:00
|
|
|
} else if ((rc == -EINVAL) || (rc == -EOPNOTSUPP)) {
|
|
|
|
if (tcon->ses->serverNOS)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "server %s of type %s returned unexpected error on SMB posix open, disabling posix open support. Check if server update available.\n",
|
|
|
|
tcon->ses->serverName,
|
|
|
|
tcon->ses->serverNOS);
|
2009-03-05 02:54:08 +07:00
|
|
|
tcon->broken_posix_open = true;
|
2009-03-04 01:00:34 +07:00
|
|
|
} else if ((rc != -EIO) && (rc != -EREMOTE) &&
|
|
|
|
(rc != -EOPNOTSUPP)) /* path not found or net err */
|
|
|
|
goto out;
|
2012-09-19 06:20:26 +07:00
|
|
|
/*
|
|
|
|
* Else fallthrough to retry open the old way on network i/o
|
|
|
|
* or DFS errors.
|
|
|
|
*/
|
2009-03-04 01:00:34 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:45 +07:00
|
|
|
if (server->ops->get_lease_key)
|
|
|
|
server->ops->get_lease_key(inode, &fid);
|
|
|
|
|
|
|
|
cifs_add_pending_open(&fid, tlink, &open);
|
|
|
|
|
2010-11-25 21:20:20 +07:00
|
|
|
if (!posix_open_ok) {
|
2012-09-19 20:22:44 +07:00
|
|
|
if (server->ops->get_lease_key)
|
|
|
|
server->ops->get_lease_key(inode, &fid);
|
|
|
|
|
2010-11-25 21:20:20 +07:00
|
|
|
rc = cifs_nt_open(full_path, inode, cifs_sb, tcon,
|
2012-09-19 06:20:26 +07:00
|
|
|
file->f_flags, &oplock, &fid, xid);
|
2012-09-19 20:22:45 +07:00
|
|
|
if (rc) {
|
|
|
|
cifs_del_pending_open(&open);
|
2010-11-25 21:20:20 +07:00
|
|
|
goto out;
|
2012-09-19 20:22:45 +07:00
|
|
|
}
|
2010-11-25 21:20:20 +07:00
|
|
|
}
|
2010-06-17 00:40:17 +07:00
|
|
|
|
2012-09-19 06:20:26 +07:00
|
|
|
cfile = cifs_new_fileinfo(&fid, file, tlink, oplock);
|
|
|
|
if (cfile == NULL) {
|
2012-09-19 20:22:44 +07:00
|
|
|
if (server->ops->close)
|
|
|
|
server->ops->close(xid, tcon, &fid);
|
2012-09-19 20:22:45 +07:00
|
|
|
cifs_del_pending_open(&open);
|
2005-04-17 05:20:36 +07:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-07-05 19:42:45 +07:00
|
|
|
cifs_fscache_set_inode_cookie(inode, file);
|
|
|
|
|
2010-11-25 21:20:20 +07:00
|
|
|
if ((oplock & CIFS_CREATE_ACTION) && !posix_open_ok && tcon->unix_ext) {
|
2012-09-19 06:20:26 +07:00
|
|
|
/*
|
|
|
|
* Time to set mode which we can not set earlier due to
|
|
|
|
* problems creating new read-only files.
|
|
|
|
*/
|
2010-11-25 21:20:20 +07:00
|
|
|
struct cifs_unix_set_info_args args = {
|
|
|
|
.mode = inode->i_mode,
|
2013-02-06 15:57:56 +07:00
|
|
|
.uid = INVALID_UID, /* no change */
|
|
|
|
.gid = INVALID_GID, /* no change */
|
2010-11-25 21:20:20 +07:00
|
|
|
.ctime = NO_CHANGE_64,
|
|
|
|
.atime = NO_CHANGE_64,
|
|
|
|
.mtime = NO_CHANGE_64,
|
|
|
|
.device = 0,
|
|
|
|
};
|
2012-09-19 06:20:26 +07:00
|
|
|
CIFSSMBUnixSetFileInfo(xid, tcon, &args, fid.netfid,
|
|
|
|
cfile->pid);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
kfree(full_path);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-09-30 06:51:11 +07:00
|
|
|
cifs_put_tlink(tlink);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-11-22 20:10:57 +07:00
|
|
|
static int cifs_push_posix_locks(struct cifsFileInfo *cfile);
|
|
|
|
|
2012-09-19 06:20:27 +07:00
|
|
|
/*
|
|
|
|
* Try to reacquire byte range locks that were released when session
|
2012-11-22 20:10:57 +07:00
|
|
|
* to server was lost.
|
2012-09-19 06:20:27 +07:00
|
|
|
*/
|
2012-11-22 20:10:57 +07:00
|
|
|
static int
|
|
|
|
cifs_relock_file(struct cifsFileInfo *cfile)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-11-22 20:10:57 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(cfile->dentry->d_sb);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2012-11-22 20:10:57 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2005-04-17 05:20:36 +07:00
|
|
|
int rc = 0;
|
|
|
|
|
2017-05-03 22:17:21 +07:00
|
|
|
down_read_nested(&cinode->lock_sem, SINGLE_DEPTH_NESTING);
|
2012-11-22 20:10:57 +07:00
|
|
|
if (cinode->can_cache_brlcks) {
|
2013-07-11 14:17:45 +07:00
|
|
|
/* can cache locks - no need to relock */
|
|
|
|
up_read(&cinode->lock_sem);
|
2012-11-22 20:10:57 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (cap_unix(tcon->ses) &&
|
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
|
|
|
|
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
|
|
|
|
rc = cifs_push_posix_locks(cfile);
|
|
|
|
else
|
|
|
|
rc = tcon->ses->server->ops->push_mand_locks(cfile);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-07-11 14:17:45 +07:00
|
|
|
up_read(&cinode->lock_sem);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-09-19 06:20:27 +07:00
|
|
|
static int
|
|
|
|
cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int rc = -EACCES;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2009-09-12 22:54:28 +07:00
|
|
|
__u32 oplock;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2012-09-19 06:20:27 +07:00
|
|
|
struct TCP_Server_Info *server;
|
|
|
|
struct cifsInodeInfo *cinode;
|
2007-07-10 08:16:18 +07:00
|
|
|
struct inode *inode;
|
2005-04-17 05:20:36 +07:00
|
|
|
char *full_path = NULL;
|
2012-09-19 06:20:27 +07:00
|
|
|
int desired_access;
|
2005-04-17 05:20:36 +07:00
|
|
|
int disposition = FILE_OPEN;
|
2011-09-26 21:56:44 +07:00
|
|
|
int create_options = CREATE_NOT_DIR;
|
2013-07-05 15:00:30 +07:00
|
|
|
struct cifs_open_parms oparms;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2012-09-19 06:20:27 +07:00
|
|
|
mutex_lock(&cfile->fh_mutex);
|
|
|
|
if (!cfile->invalidHandle) {
|
|
|
|
mutex_unlock(&cfile->fh_mutex);
|
2009-06-25 19:42:34 +07:00
|
|
|
rc = 0;
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2009-06-25 19:42:34 +07:00
|
|
|
return rc;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2015-03-18 05:25:59 +07:00
|
|
|
inode = d_inode(cfile->dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
cifs_sb = CIFS_SB(inode->i_sb);
|
2012-09-19 06:20:27 +07:00
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Can not grab rename sem here because various ops, including those
|
|
|
|
* that already have the rename sem can end up causing writepage to get
|
|
|
|
* called and if the server was down that means we end up here, and we
|
|
|
|
* can never tell if the caller already has the rename_sem.
|
|
|
|
*/
|
|
|
|
full_path = build_path_from_dentry(cfile->dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (full_path == NULL) {
|
2007-04-05 00:10:24 +07:00
|
|
|
rc = -ENOMEM;
|
2012-09-19 06:20:27 +07:00
|
|
|
mutex_unlock(&cfile->fh_mutex);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2007-04-05 00:10:24 +07:00
|
|
|
return rc;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "inode = 0x%p file flags 0x%x for %s\n",
|
|
|
|
inode, cfile->f_flags, full_path);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-03-20 16:55:09 +07:00
|
|
|
if (tcon->ses->server->oplocks)
|
2005-04-17 05:20:36 +07:00
|
|
|
oplock = REQ_OPLOCK;
|
|
|
|
else
|
2008-04-29 07:06:05 +07:00
|
|
|
oplock = 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-07-13 16:58:14 +07:00
|
|
|
if (tcon->unix_ext && cap_unix(tcon->ses) &&
|
2009-02-24 03:43:11 +07:00
|
|
|
(CIFS_UNIX_POSIX_PATH_OPS_CAP &
|
2012-07-13 16:58:14 +07:00
|
|
|
le64_to_cpu(tcon->fsUnixInfo.Capability))) {
|
2010-10-16 02:33:56 +07:00
|
|
|
/*
|
|
|
|
* O_CREAT, O_EXCL and O_TRUNC already had their effect on the
|
|
|
|
* original open. Must mask them off for a reopen.
|
|
|
|
*/
|
2012-09-19 06:20:27 +07:00
|
|
|
unsigned int oflags = cfile->f_flags &
|
2010-10-16 02:33:59 +07:00
|
|
|
~(O_CREAT | O_EXCL | O_TRUNC);
|
2010-10-16 02:33:56 +07:00
|
|
|
|
2010-06-17 00:40:16 +07:00
|
|
|
rc = cifs_posix_open(full_path, NULL, inode->i_sb,
|
2012-09-19 06:20:27 +07:00
|
|
|
cifs_sb->mnt_file_mode /* ignored */,
|
2013-07-09 21:40:58 +07:00
|
|
|
oflags, &oplock, &cfile->fid.netfid, xid);
|
2009-02-24 03:43:11 +07:00
|
|
|
if (rc == 0) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "posix reopen succeeded\n");
|
2013-07-30 01:04:35 +07:00
|
|
|
oparms.reconnect = true;
|
2009-02-24 03:43:11 +07:00
|
|
|
goto reopen_success;
|
|
|
|
}
|
2012-09-19 06:20:27 +07:00
|
|
|
/*
|
|
|
|
* fallthrough to retry open the old way on errors, especially
|
|
|
|
* in the reconnect path it is important to retry hard
|
|
|
|
*/
|
2009-02-24 03:43:11 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 06:20:27 +07:00
|
|
|
desired_access = cifs_convert_flags(cfile->f_flags);
|
2009-02-24 03:43:11 +07:00
|
|
|
|
2019-11-13 08:16:35 +07:00
|
|
|
/* O_SYNC also has bit for O_DSYNC so following check picks up either */
|
|
|
|
if (cfile->f_flags & O_SYNC)
|
|
|
|
create_options |= CREATE_WRITE_THROUGH;
|
|
|
|
|
|
|
|
if (cfile->f_flags & O_DIRECT)
|
|
|
|
create_options |= CREATE_NO_BUFFER;
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
if (server->ops->get_lease_key)
|
2013-07-09 21:40:58 +07:00
|
|
|
server->ops->get_lease_key(inode, &cfile->fid);
|
2012-09-19 20:22:44 +07:00
|
|
|
|
2013-07-05 15:00:30 +07:00
|
|
|
oparms.tcon = tcon;
|
|
|
|
oparms.cifs_sb = cifs_sb;
|
|
|
|
oparms.desired_access = desired_access;
|
2020-02-04 02:46:43 +07:00
|
|
|
oparms.create_options = cifs_create_options(cifs_sb, create_options);
|
2013-07-05 15:00:30 +07:00
|
|
|
oparms.disposition = disposition;
|
|
|
|
oparms.path = full_path;
|
2013-07-09 21:40:58 +07:00
|
|
|
oparms.fid = &cfile->fid;
|
|
|
|
oparms.reconnect = true;
|
2013-07-05 15:00:30 +07:00
|
|
|
|
2012-09-19 06:20:27 +07:00
|
|
|
/*
|
|
|
|
* Can not refresh inode by passing in file_info buf to be returned by
|
2014-01-16 18:53:36 +07:00
|
|
|
* ops->open and then calling get_inode_info with returned buf since
|
2012-09-19 06:20:27 +07:00
|
|
|
* file might have write behind data that needs to be flushed and server
|
|
|
|
* version of file size can be stale. If we knew for sure that inode was
|
|
|
|
* not dirty locally we could do this.
|
|
|
|
*/
|
2013-07-05 15:00:30 +07:00
|
|
|
rc = server->ops->open(xid, &oparms, &oplock, NULL);
|
2013-07-11 13:58:30 +07:00
|
|
|
if (rc == -ENOENT && oparms.reconnect == false) {
|
|
|
|
/* durable handle timeout is expired - open the file again */
|
|
|
|
rc = server->ops->open(xid, &oparms, &oplock, NULL);
|
|
|
|
/* indicate that we need to relock the file */
|
|
|
|
oparms.reconnect = true;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (rc) {
|
2012-09-19 06:20:27 +07:00
|
|
|
mutex_unlock(&cfile->fh_mutex);
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "cifs_reopen returned 0x%x\n", rc);
|
|
|
|
cifs_dbg(FYI, "oplock: %d\n", oplock);
|
2010-10-16 02:33:59 +07:00
|
|
|
goto reopen_error_exit;
|
|
|
|
}
|
|
|
|
|
2009-02-24 03:43:11 +07:00
|
|
|
reopen_success:
|
2012-09-19 06:20:27 +07:00
|
|
|
cfile->invalidHandle = false;
|
|
|
|
mutex_unlock(&cfile->fh_mutex);
|
|
|
|
cinode = CIFS_I(inode);
|
2010-10-16 02:33:59 +07:00
|
|
|
|
|
|
|
if (can_flush) {
|
|
|
|
rc = filemap_write_and_wait(inode->i_mapping);
|
2019-01-09 02:15:28 +07:00
|
|
|
if (!is_interrupt_error(rc))
|
|
|
|
mapping_set_error(inode->i_mapping, rc);
|
2010-10-16 02:33:59 +07:00
|
|
|
|
|
|
|
if (tcon->unix_ext)
|
2012-09-19 06:20:27 +07:00
|
|
|
rc = cifs_get_inode_info_unix(&inode, full_path,
|
|
|
|
inode->i_sb, xid);
|
2010-10-16 02:33:59 +07:00
|
|
|
else
|
2012-09-19 06:20:27 +07:00
|
|
|
rc = cifs_get_inode_info(&inode, full_path, NULL,
|
|
|
|
inode->i_sb, xid, NULL);
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* Else we are writing out data to server already and could deadlock if
|
|
|
|
* we tried to flush data, and since we do not know if we have data that
|
|
|
|
* would invalidate the current end of file on the server we can not go
|
|
|
|
* to the server to get the new inode info.
|
|
|
|
*/
|
|
|
|
|
2016-10-12 05:34:07 +07:00
|
|
|
/*
|
|
|
|
* If the server returned a read oplock and we have mandatory brlocks,
|
|
|
|
* set oplock level to None.
|
|
|
|
*/
|
|
|
|
if (server->ops->is_read_op(oplock) && cifs_has_mand_locks(cinode)) {
|
|
|
|
cifs_dbg(FYI, "Reset oplock val from read to None due to mand locks\n");
|
|
|
|
oplock = 0;
|
|
|
|
}
|
|
|
|
|
2013-07-09 21:40:58 +07:00
|
|
|
server->ops->set_fid(cfile, &cfile->fid, oplock);
|
|
|
|
if (oparms.reconnect)
|
|
|
|
cifs_relock_file(cfile);
|
2010-10-16 02:33:59 +07:00
|
|
|
|
|
|
|
reopen_error_exit:
|
2005-04-17 05:20:36 +07:00
|
|
|
kfree(full_path);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
int cifs_close(struct inode *inode, struct file *file)
|
|
|
|
{
|
2011-04-06 06:23:47 +07:00
|
|
|
if (file->private_data != NULL) {
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
_cifsFileInfo_put(file->private_data, true, false);
|
2011-04-06 06:23:47 +07:00
|
|
|
file->private_data = NULL;
|
|
|
|
}
|
2006-08-03 04:56:33 +07:00
|
|
|
|
2010-10-22 05:46:14 +07:00
|
|
|
/* return code from the ->release op is always ignored */
|
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2016-09-23 07:23:56 +07:00
|
|
|
void
|
|
|
|
cifs_reopen_persistent_handles(struct cifs_tcon *tcon)
|
|
|
|
{
|
2016-10-08 07:26:36 +07:00
|
|
|
struct cifsFileInfo *open_file;
|
2016-09-23 07:23:56 +07:00
|
|
|
struct list_head *tmp;
|
|
|
|
struct list_head *tmp1;
|
2016-10-08 07:26:36 +07:00
|
|
|
struct list_head tmp_list;
|
|
|
|
|
2016-11-30 02:31:23 +07:00
|
|
|
if (!tcon->use_persistent || !tcon->need_reopen_files)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tcon->need_reopen_files = false;
|
|
|
|
|
2016-10-08 07:26:36 +07:00
|
|
|
cifs_dbg(FYI, "Reopen persistent handles");
|
|
|
|
INIT_LIST_HEAD(&tmp_list);
|
2016-09-23 07:23:56 +07:00
|
|
|
|
|
|
|
/* list all files open on tree connection, reopen resilient handles */
|
|
|
|
spin_lock(&tcon->open_file_lock);
|
2016-10-08 07:26:36 +07:00
|
|
|
list_for_each(tmp, &tcon->openFileList) {
|
2016-09-23 07:23:56 +07:00
|
|
|
open_file = list_entry(tmp, struct cifsFileInfo, tlist);
|
2016-10-08 07:26:36 +07:00
|
|
|
if (!open_file->invalidHandle)
|
|
|
|
continue;
|
|
|
|
cifsFileInfo_get(open_file);
|
|
|
|
list_add_tail(&open_file->rlist, &tmp_list);
|
2016-09-23 07:23:56 +07:00
|
|
|
}
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
2016-10-08 07:26:36 +07:00
|
|
|
|
|
|
|
list_for_each_safe(tmp, tmp1, &tmp_list) {
|
|
|
|
open_file = list_entry(tmp, struct cifsFileInfo, rlist);
|
2016-11-30 02:31:23 +07:00
|
|
|
if (cifs_reopen_file(open_file, false /* do not flush */))
|
|
|
|
tcon->need_reopen_files = true;
|
2016-10-08 07:26:36 +07:00
|
|
|
list_del_init(&open_file->rlist);
|
|
|
|
cifsFileInfo_put(open_file);
|
|
|
|
}
|
2016-09-23 07:23:56 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
int cifs_closedir(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2012-09-19 06:20:26 +07:00
|
|
|
struct cifsFileInfo *cfile = file->private_data;
|
2012-09-19 06:20:32 +07:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct TCP_Server_Info *server;
|
|
|
|
char *buf;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Closedir inode = 0x%p\n", inode);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-09-19 06:20:32 +07:00
|
|
|
if (cfile == NULL)
|
|
|
|
return rc;
|
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2012-09-19 06:20:32 +07:00
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
server = tcon->ses->server;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Freeing private data in close dir\n");
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_lock(&cfile->file_info_lock);
|
2014-08-18 23:49:57 +07:00
|
|
|
if (server->ops->dir_needs_close(cfile)) {
|
2012-09-19 06:20:32 +07:00
|
|
|
cfile->invalidHandle = true;
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&cfile->file_info_lock);
|
2012-09-19 06:20:32 +07:00
|
|
|
if (server->ops->close_dir)
|
|
|
|
rc = server->ops->close_dir(xid, tcon, &cfile->fid);
|
|
|
|
else
|
|
|
|
rc = -ENOSYS;
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Closing uncompleted readdir with rc %d\n", rc);
|
2012-09-19 06:20:32 +07:00
|
|
|
/* not much we can do if it fails anyway, ignore rc */
|
|
|
|
rc = 0;
|
|
|
|
} else
|
2016-09-23 06:58:16 +07:00
|
|
|
spin_unlock(&cfile->file_info_lock);
|
2012-09-19 06:20:32 +07:00
|
|
|
|
|
|
|
buf = cfile->srch_inf.ntwrk_buf_start;
|
|
|
|
if (buf) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "closedir free smb buf in srch struct\n");
|
2012-09-19 06:20:32 +07:00
|
|
|
cfile->srch_inf.ntwrk_buf_start = NULL;
|
|
|
|
if (cfile->srch_inf.smallBuf)
|
|
|
|
cifs_small_buf_release(buf);
|
|
|
|
else
|
|
|
|
cifs_buf_release(buf);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2012-09-19 06:20:32 +07:00
|
|
|
|
|
|
|
cifs_put_tlink(cfile->tlink);
|
|
|
|
kfree(file->private_data);
|
|
|
|
file->private_data = NULL;
|
2005-04-17 05:20:36 +07:00
|
|
|
/* BB can we lock the filestruct while this is going on? */
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-10-22 18:33:29 +07:00
|
|
|
static struct cifsLockInfo *
|
2018-10-04 06:24:38 +07:00
|
|
|
cifs_lock_init(__u64 offset, __u64 length, __u8 type, __u16 flags)
|
2006-08-03 04:56:33 +07:00
|
|
|
{
|
2011-10-29 20:17:59 +07:00
|
|
|
struct cifsLockInfo *lock =
|
2007-07-10 08:16:18 +07:00
|
|
|
kmalloc(sizeof(struct cifsLockInfo), GFP_KERNEL);
|
2011-10-29 20:17:59 +07:00
|
|
|
if (!lock)
|
|
|
|
return lock;
|
|
|
|
lock->offset = offset;
|
|
|
|
lock->length = length;
|
|
|
|
lock->type = type;
|
|
|
|
lock->pid = current->tgid;
|
2018-10-04 06:24:38 +07:00
|
|
|
lock->flags = flags;
|
2011-10-29 20:17:59 +07:00
|
|
|
INIT_LIST_HEAD(&lock->blist);
|
|
|
|
init_waitqueue_head(&lock->block_q);
|
|
|
|
return lock;
|
2011-10-22 18:33:29 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
void
|
2011-10-22 18:33:29 +07:00
|
|
|
cifs_del_lock_waiters(struct cifsLockInfo *lock)
|
|
|
|
{
|
|
|
|
struct cifsLockInfo *li, *tmp;
|
|
|
|
list_for_each_entry_safe(li, tmp, &lock->blist, blist) {
|
|
|
|
list_del_init(&li->blist);
|
|
|
|
wake_up(&li->block_q);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-27 21:38:53 +07:00
|
|
|
#define CIFS_LOCK_OP 0
|
|
|
|
#define CIFS_READ_OP 1
|
|
|
|
#define CIFS_WRITE_OP 2
|
|
|
|
|
|
|
|
/* @rw_check : 0 - no op, 1 - read, 2 - write */
|
2011-10-22 18:33:29 +07:00
|
|
|
static bool
|
2012-09-19 20:22:43 +07:00
|
|
|
cifs_find_fid_lock_conflict(struct cifs_fid_locks *fdlocks, __u64 offset,
|
2018-10-04 06:24:38 +07:00
|
|
|
__u64 length, __u8 type, __u16 flags,
|
|
|
|
struct cifsFileInfo *cfile,
|
2012-11-27 21:38:53 +07:00
|
|
|
struct cifsLockInfo **conf_lock, int rw_check)
|
2011-10-22 18:33:29 +07:00
|
|
|
{
|
2012-02-24 19:41:06 +07:00
|
|
|
struct cifsLockInfo *li;
|
2012-09-19 20:22:43 +07:00
|
|
|
struct cifsFileInfo *cur_cfile = fdlocks->cfile;
|
2012-02-28 18:23:34 +07:00
|
|
|
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
|
2011-10-22 18:33:29 +07:00
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
list_for_each_entry(li, &fdlocks->locks, llist) {
|
2011-10-22 18:33:29 +07:00
|
|
|
if (offset + length <= li->offset ||
|
|
|
|
offset >= li->offset + li->length)
|
|
|
|
continue;
|
2012-11-27 21:38:53 +07:00
|
|
|
if (rw_check != CIFS_LOCK_OP && current->tgid == li->pid &&
|
|
|
|
server->ops->compare_fids(cfile, cur_cfile)) {
|
|
|
|
/* shared lock prevents write op through the same fid */
|
|
|
|
if (!(li->type & server->vals->shared_lock_type) ||
|
|
|
|
rw_check != CIFS_WRITE_OP)
|
|
|
|
continue;
|
|
|
|
}
|
2012-09-19 20:22:43 +07:00
|
|
|
if ((type & server->vals->shared_lock_type) &&
|
|
|
|
((server->ops->compare_fids(cfile, cur_cfile) &&
|
|
|
|
current->tgid == li->pid) || type == li->type))
|
2011-10-22 18:33:29 +07:00
|
|
|
continue;
|
2018-10-04 06:24:38 +07:00
|
|
|
if (rw_check == CIFS_LOCK_OP &&
|
|
|
|
(flags & FL_OFDLCK) && (li->flags & FL_OFDLCK) &&
|
|
|
|
server->ops->compare_fids(cfile, cur_cfile))
|
|
|
|
continue;
|
2012-09-19 20:22:44 +07:00
|
|
|
if (conf_lock)
|
|
|
|
*conf_lock = li;
|
2012-09-19 20:22:43 +07:00
|
|
|
return true;
|
2011-10-22 18:33:29 +07:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
bool
|
2012-02-28 18:04:17 +07:00
|
|
|
cifs_find_lock_conflict(struct cifsFileInfo *cfile, __u64 offset, __u64 length,
|
2018-10-04 06:24:38 +07:00
|
|
|
__u8 type, __u16 flags,
|
|
|
|
struct cifsLockInfo **conf_lock, int rw_check)
|
2011-10-29 20:17:58 +07:00
|
|
|
{
|
2012-02-24 19:41:06 +07:00
|
|
|
bool rc = false;
|
2012-09-19 20:22:43 +07:00
|
|
|
struct cifs_fid_locks *cur;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2012-02-24 19:41:06 +07:00
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
list_for_each_entry(cur, &cinode->llist, llist) {
|
|
|
|
rc = cifs_find_fid_lock_conflict(cur, offset, length, type,
|
2018-10-04 06:24:38 +07:00
|
|
|
flags, cfile, conf_lock,
|
|
|
|
rw_check);
|
2012-02-24 19:41:06 +07:00
|
|
|
if (rc)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rc;
|
2011-10-29 20:17:58 +07:00
|
|
|
}
|
|
|
|
|
2011-11-07 20:11:24 +07:00
|
|
|
/*
|
|
|
|
* Check if there is another lock that prevents us to set the lock (mandatory
|
|
|
|
* style). If such a lock exists, update the flock structure with its
|
|
|
|
* properties. Otherwise, set the flock type to F_UNLCK if we can cache brlocks
|
|
|
|
* or leave it the same if we can't. Returns 0 if we don't need to request to
|
|
|
|
* the server or 1 otherwise.
|
|
|
|
*/
|
2011-10-22 18:33:29 +07:00
|
|
|
static int
|
2012-02-24 19:41:06 +07:00
|
|
|
cifs_lock_test(struct cifsFileInfo *cfile, __u64 offset, __u64 length,
|
|
|
|
__u8 type, struct file_lock *flock)
|
2011-10-22 18:33:29 +07:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
struct cifsLockInfo *conf_lock;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2012-02-28 18:23:34 +07:00
|
|
|
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
|
2011-10-22 18:33:29 +07:00
|
|
|
bool exist;
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
down_read(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
|
2012-02-28 18:04:17 +07:00
|
|
|
exist = cifs_find_lock_conflict(cfile, offset, length, type,
|
2018-10-04 06:24:38 +07:00
|
|
|
flock->fl_flags, &conf_lock,
|
|
|
|
CIFS_LOCK_OP);
|
2011-10-22 18:33:29 +07:00
|
|
|
if (exist) {
|
|
|
|
flock->fl_start = conf_lock->offset;
|
|
|
|
flock->fl_end = conf_lock->offset + conf_lock->length - 1;
|
|
|
|
flock->fl_pid = conf_lock->pid;
|
2012-02-28 18:23:34 +07:00
|
|
|
if (conf_lock->type & server->vals->shared_lock_type)
|
2011-10-22 18:33:29 +07:00
|
|
|
flock->fl_type = F_RDLCK;
|
|
|
|
else
|
|
|
|
flock->fl_type = F_WRLCK;
|
|
|
|
} else if (!cinode->can_cache_brlcks)
|
|
|
|
rc = 1;
|
|
|
|
else
|
|
|
|
flock->fl_type = F_UNLCK;
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
up_read(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-10-29 20:17:58 +07:00
|
|
|
static void
|
2012-02-24 19:41:06 +07:00
|
|
|
cifs_lock_add(struct cifsFileInfo *cfile, struct cifsLockInfo *lock)
|
2011-10-22 18:33:29 +07:00
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2012-09-19 20:22:43 +07:00
|
|
|
list_add_tail(&lock->llist, &cfile->llist->locks);
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2006-08-03 04:56:33 +07:00
|
|
|
}
|
|
|
|
|
2011-11-07 20:11:24 +07:00
|
|
|
/*
|
|
|
|
* Set the byte-range lock (mandatory style). Returns:
|
|
|
|
* 1) 0, if we set the lock and don't need to request to the server;
|
|
|
|
* 2) 1, if no locks prevent us but we need to request to the server;
|
2018-10-27 01:07:21 +07:00
|
|
|
* 3) -EACCES, if there is a lock that prevents us and wait is false.
|
2011-11-07 20:11:24 +07:00
|
|
|
*/
|
2011-10-22 18:33:29 +07:00
|
|
|
static int
|
2012-02-24 19:41:06 +07:00
|
|
|
cifs_lock_add_if(struct cifsFileInfo *cfile, struct cifsLockInfo *lock,
|
2011-10-29 20:17:58 +07:00
|
|
|
bool wait)
|
2011-10-22 18:33:29 +07:00
|
|
|
{
|
2011-10-29 20:17:58 +07:00
|
|
|
struct cifsLockInfo *conf_lock;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2011-10-22 18:33:29 +07:00
|
|
|
bool exist;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
try_again:
|
|
|
|
exist = false;
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
|
2012-02-28 18:04:17 +07:00
|
|
|
exist = cifs_find_lock_conflict(cfile, lock->offset, lock->length,
|
2018-10-04 06:24:38 +07:00
|
|
|
lock->type, lock->flags, &conf_lock,
|
|
|
|
CIFS_LOCK_OP);
|
2011-10-22 18:33:29 +07:00
|
|
|
if (!exist && cinode->can_cache_brlcks) {
|
2012-09-19 20:22:43 +07:00
|
|
|
list_add_tail(&lock->llist, &cfile->llist->locks);
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!exist)
|
|
|
|
rc = 1;
|
|
|
|
else if (!wait)
|
|
|
|
rc = -EACCES;
|
|
|
|
else {
|
|
|
|
list_add_tail(&lock->blist, &conf_lock->blist);
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
rc = wait_event_interruptible(lock->block_q,
|
|
|
|
(lock->blist.prev == &lock->blist) &&
|
|
|
|
(lock->blist.next == &lock->blist));
|
|
|
|
if (!rc)
|
|
|
|
goto try_again;
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2011-10-29 20:17:59 +07:00
|
|
|
list_del_init(&lock->blist);
|
2011-10-22 18:33:29 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2011-10-22 18:33:29 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-11-07 20:11:24 +07:00
|
|
|
/*
|
|
|
|
* Check if there is another lock that prevents us to set the lock (posix
|
|
|
|
* style). If such a lock exists, update the flock structure with its
|
|
|
|
* properties. Otherwise, set the flock type to F_UNLCK if we can cache brlocks
|
|
|
|
* or leave it the same if we can't. Returns 0 if we don't need to request to
|
|
|
|
* the server or 1 otherwise.
|
|
|
|
*/
|
2011-10-22 18:33:29 +07:00
|
|
|
static int
|
2011-10-22 18:33:30 +07:00
|
|
|
cifs_posix_lock_test(struct file *file, struct file_lock *flock)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
2013-01-24 05:07:38 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(file_inode(file));
|
2011-10-22 18:33:30 +07:00
|
|
|
unsigned char saved_type = flock->fl_type;
|
|
|
|
|
2011-10-29 20:17:57 +07:00
|
|
|
if ((flock->fl_flags & FL_POSIX) == 0)
|
|
|
|
return 1;
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
down_read(&cinode->lock_sem);
|
2011-10-22 18:33:30 +07:00
|
|
|
posix_test_lock(file, flock);
|
|
|
|
|
|
|
|
if (flock->fl_type == F_UNLCK && !cinode->can_cache_brlcks) {
|
|
|
|
flock->fl_type = saved_type;
|
|
|
|
rc = 1;
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
up_read(&cinode->lock_sem);
|
2011-10-22 18:33:30 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-11-07 20:11:24 +07:00
|
|
|
/*
|
|
|
|
* Set the byte-range lock (posix style). Returns:
|
|
|
|
* 1) 0, if we set the lock and don't need to request to the server;
|
|
|
|
* 2) 1, if we need to request to the server;
|
|
|
|
* 3) <0, if the error occurs while setting the lock.
|
|
|
|
*/
|
2011-10-22 18:33:30 +07:00
|
|
|
static int
|
|
|
|
cifs_posix_lock_set(struct file *file, struct file_lock *flock)
|
|
|
|
{
|
2013-01-24 05:07:38 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(file_inode(file));
|
2011-10-29 20:17:57 +07:00
|
|
|
int rc = 1;
|
|
|
|
|
|
|
|
if ((flock->fl_flags & FL_POSIX) == 0)
|
|
|
|
return rc;
|
2011-10-22 18:33:30 +07:00
|
|
|
|
2012-03-29 00:56:19 +07:00
|
|
|
try_again:
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2011-10-22 18:33:30 +07:00
|
|
|
if (!cinode->can_cache_brlcks) {
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2011-10-29 20:17:57 +07:00
|
|
|
return rc;
|
2011-10-22 18:33:30 +07:00
|
|
|
}
|
2012-03-29 00:56:19 +07:00
|
|
|
|
|
|
|
rc = posix_lock_file(file, flock, NULL);
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2012-03-29 00:56:19 +07:00
|
|
|
if (rc == FILE_LOCK_DEFERRED) {
|
2020-03-18 18:52:21 +07:00
|
|
|
rc = wait_event_interruptible(flock->fl_wait,
|
|
|
|
list_empty(&flock->fl_blocked_member));
|
2012-03-29 00:56:19 +07:00
|
|
|
if (!rc)
|
|
|
|
goto try_again;
|
2018-11-30 06:04:08 +07:00
|
|
|
locks_delete_block(flock);
|
2012-03-29 00:56:19 +07:00
|
|
|
}
|
2012-04-02 01:52:54 +07:00
|
|
|
return rc;
|
2011-10-22 18:33:30 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
int
|
2011-10-22 18:33:30 +07:00
|
|
|
cifs_push_mandatory_locks(struct cifsFileInfo *cfile)
|
2011-10-22 18:33:29 +07:00
|
|
|
{
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
|
|
|
int rc = 0, stored_rc;
|
2011-10-22 18:33:29 +07:00
|
|
|
struct cifsLockInfo *li, *tmp;
|
|
|
|
struct cifs_tcon *tcon;
|
2012-05-31 16:03:26 +07:00
|
|
|
unsigned int num, max_num, max_buf;
|
2011-10-22 18:33:32 +07:00
|
|
|
LOCKING_ANDX_RANGE *buf, *cur;
|
2017-09-19 22:27:39 +07:00
|
|
|
static const int types[] = {
|
|
|
|
LOCKING_ANDX_LARGE_FILES,
|
|
|
|
LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES
|
|
|
|
};
|
2011-10-22 18:33:32 +07:00
|
|
|
int i;
|
2011-10-22 18:33:29 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2011-10-22 18:33:29 +07:00
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
|
2012-05-31 16:03:26 +07:00
|
|
|
/*
|
|
|
|
* Accessing maxBuf is racy with cifs_reconnect - need to store value
|
2019-01-09 01:30:57 +07:00
|
|
|
* and check it before using.
|
2012-05-31 16:03:26 +07:00
|
|
|
*/
|
|
|
|
max_buf = tcon->ses->server->maxBuf;
|
2019-01-09 01:30:57 +07:00
|
|
|
if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE))) {
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2012-05-31 16:03:26 +07:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2019-01-09 01:30:56 +07:00
|
|
|
BUILD_BUG_ON(sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE) >
|
|
|
|
PAGE_SIZE);
|
|
|
|
max_buf = min_t(unsigned int, max_buf - sizeof(struct smb_hdr),
|
|
|
|
PAGE_SIZE);
|
2012-05-31 16:03:26 +07:00
|
|
|
max_num = (max_buf - sizeof(struct smb_hdr)) /
|
|
|
|
sizeof(LOCKING_ANDX_RANGE);
|
2014-12-11 06:41:17 +07:00
|
|
|
buf = kcalloc(max_num, sizeof(LOCKING_ANDX_RANGE), GFP_KERNEL);
|
2011-10-22 18:33:32 +07:00
|
|
|
if (!buf) {
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2012-08-30 00:13:38 +07:00
|
|
|
return -ENOMEM;
|
2011-10-22 18:33:32 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
cur = buf;
|
|
|
|
num = 0;
|
2012-09-19 20:22:43 +07:00
|
|
|
list_for_each_entry_safe(li, tmp, &cfile->llist->locks, llist) {
|
2011-10-22 18:33:32 +07:00
|
|
|
if (li->type != types[i])
|
|
|
|
continue;
|
|
|
|
cur->Pid = cpu_to_le16(li->pid);
|
|
|
|
cur->LengthLow = cpu_to_le32((u32)li->length);
|
|
|
|
cur->LengthHigh = cpu_to_le32((u32)(li->length>>32));
|
|
|
|
cur->OffsetLow = cpu_to_le32((u32)li->offset);
|
|
|
|
cur->OffsetHigh = cpu_to_le32((u32)(li->offset>>32));
|
|
|
|
if (++num == max_num) {
|
2012-09-19 06:20:26 +07:00
|
|
|
stored_rc = cifs_lockv(xid, tcon,
|
|
|
|
cfile->fid.netfid,
|
2012-02-28 18:16:55 +07:00
|
|
|
(__u8)li->type, 0, num,
|
|
|
|
buf);
|
2011-10-22 18:33:32 +07:00
|
|
|
if (stored_rc)
|
|
|
|
rc = stored_rc;
|
|
|
|
cur = buf;
|
|
|
|
num = 0;
|
|
|
|
} else
|
|
|
|
cur++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num) {
|
2012-09-19 06:20:26 +07:00
|
|
|
stored_rc = cifs_lockv(xid, tcon, cfile->fid.netfid,
|
2012-02-28 18:16:55 +07:00
|
|
|
(__u8)types[i], 0, num, buf);
|
2011-10-22 18:33:32 +07:00
|
|
|
if (stored_rc)
|
|
|
|
rc = stored_rc;
|
|
|
|
}
|
2011-10-22 18:33:29 +07:00
|
|
|
}
|
|
|
|
|
2011-10-22 18:33:32 +07:00
|
|
|
kfree(buf);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2011-10-22 18:33:29 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2016-05-24 17:27:44 +07:00
|
|
|
static __u32
|
|
|
|
hash_lockowner(fl_owner_t owner)
|
|
|
|
{
|
|
|
|
return cifs_lock_secret ^ hash32_ptr((const void *)owner);
|
|
|
|
}
|
|
|
|
|
2012-03-05 13:39:20 +07:00
|
|
|
struct lock_to_push {
|
|
|
|
struct list_head llist;
|
|
|
|
__u64 offset;
|
|
|
|
__u64 length;
|
|
|
|
__u32 pid;
|
|
|
|
__u16 netfid;
|
|
|
|
__u8 type;
|
|
|
|
};
|
|
|
|
|
2011-10-22 18:33:30 +07:00
|
|
|
static int
|
2012-11-22 20:07:16 +07:00
|
|
|
cifs_push_posix_locks(struct cifsFileInfo *cfile)
|
2011-10-22 18:33:30 +07:00
|
|
|
{
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(cfile->dentry);
|
2011-10-22 18:33:30 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2015-01-17 03:05:55 +07:00
|
|
|
struct file_lock *flock;
|
|
|
|
struct file_lock_context *flctx = inode->i_flctx;
|
2015-02-17 02:32:03 +07:00
|
|
|
unsigned int count = 0, i;
|
2011-10-22 18:33:30 +07:00
|
|
|
int rc = 0, xid, type;
|
2012-03-05 13:39:20 +07:00
|
|
|
struct list_head locks_to_send, *el;
|
|
|
|
struct lock_to_push *lck, *tmp;
|
2011-10-22 18:33:30 +07:00
|
|
|
__u64 length;
|
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2011-10-22 18:33:30 +07:00
|
|
|
|
2015-01-17 03:05:55 +07:00
|
|
|
if (!flctx)
|
|
|
|
goto out;
|
2012-03-05 13:39:20 +07:00
|
|
|
|
2015-02-17 02:32:03 +07:00
|
|
|
spin_lock(&flctx->flc_lock);
|
|
|
|
list_for_each(el, &flctx->flc_posix) {
|
|
|
|
count++;
|
|
|
|
}
|
|
|
|
spin_unlock(&flctx->flc_lock);
|
|
|
|
|
2011-10-22 18:33:30 +07:00
|
|
|
INIT_LIST_HEAD(&locks_to_send);
|
|
|
|
|
2012-03-05 13:39:20 +07:00
|
|
|
/*
|
2015-02-17 02:32:03 +07:00
|
|
|
* Allocating count locks is enough because no FL_POSIX locks can be
|
|
|
|
* added to the list while we are holding cinode->lock_sem that
|
2012-03-17 13:46:55 +07:00
|
|
|
* protects locking operations of this inode.
|
2012-03-05 13:39:20 +07:00
|
|
|
*/
|
2015-02-17 02:32:03 +07:00
|
|
|
for (i = 0; i < count; i++) {
|
2012-03-05 13:39:20 +07:00
|
|
|
lck = kmalloc(sizeof(struct lock_to_push), GFP_KERNEL);
|
|
|
|
if (!lck) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
list_add_tail(&lck->llist, &locks_to_send);
|
|
|
|
}
|
|
|
|
|
|
|
|
el = locks_to_send.next;
|
2015-01-17 03:05:57 +07:00
|
|
|
spin_lock(&flctx->flc_lock);
|
2015-01-17 03:05:55 +07:00
|
|
|
list_for_each_entry(flock, &flctx->flc_posix, fl_list) {
|
2012-03-05 13:39:20 +07:00
|
|
|
if (el == &locks_to_send) {
|
2012-03-17 13:46:55 +07:00
|
|
|
/*
|
|
|
|
* The list ended. We don't have enough allocated
|
|
|
|
* structures - something is really wrong.
|
|
|
|
*/
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "Can't push all brlocks!\n");
|
2012-03-05 13:39:20 +07:00
|
|
|
break;
|
|
|
|
}
|
2011-10-22 18:33:30 +07:00
|
|
|
length = 1 + flock->fl_end - flock->fl_start;
|
|
|
|
if (flock->fl_type == F_RDLCK || flock->fl_type == F_SHLCK)
|
|
|
|
type = CIFS_RDLCK;
|
|
|
|
else
|
|
|
|
type = CIFS_WRLCK;
|
2012-03-05 13:39:20 +07:00
|
|
|
lck = list_entry(el, struct lock_to_push, llist);
|
2016-05-24 17:27:44 +07:00
|
|
|
lck->pid = hash_lockowner(flock->fl_owner);
|
2012-09-19 06:20:26 +07:00
|
|
|
lck->netfid = cfile->fid.netfid;
|
2012-03-05 13:39:20 +07:00
|
|
|
lck->length = length;
|
|
|
|
lck->type = type;
|
|
|
|
lck->offset = flock->fl_start;
|
2011-10-22 18:33:30 +07:00
|
|
|
}
|
2015-01-17 03:05:57 +07:00
|
|
|
spin_unlock(&flctx->flc_lock);
|
2011-10-22 18:33:30 +07:00
|
|
|
|
|
|
|
list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {
|
|
|
|
int stored_rc;
|
|
|
|
|
|
|
|
stored_rc = CIFSSMBPosixLock(xid, tcon, lck->netfid, lck->pid,
|
2012-07-24 00:28:37 +07:00
|
|
|
lck->offset, lck->length, NULL,
|
2011-10-22 18:33:30 +07:00
|
|
|
lck->type, 0);
|
|
|
|
if (stored_rc)
|
|
|
|
rc = stored_rc;
|
|
|
|
list_del(&lck->llist);
|
|
|
|
kfree(lck);
|
|
|
|
}
|
|
|
|
|
2012-03-05 13:39:20 +07:00
|
|
|
out:
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2011-10-22 18:33:30 +07:00
|
|
|
return rc;
|
2012-03-05 13:39:20 +07:00
|
|
|
err_out:
|
|
|
|
list_for_each_entry_safe(lck, tmp, &locks_to_send, llist) {
|
|
|
|
list_del(&lck->llist);
|
|
|
|
kfree(lck);
|
|
|
|
}
|
|
|
|
goto out;
|
2011-10-22 18:33:30 +07:00
|
|
|
}
|
|
|
|
|
2012-11-22 20:00:10 +07:00
|
|
|
static int
|
2012-11-22 20:07:16 +07:00
|
|
|
cifs_push_locks(struct cifsFileInfo *cfile)
|
2012-11-22 20:00:10 +07:00
|
|
|
{
|
2012-11-22 20:07:16 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(cfile->dentry->d_sb);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2012-11-22 20:07:16 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2012-11-22 20:00:10 +07:00
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
/* we are going to update can_cache_brlcks here - need a write access */
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2012-11-22 20:00:10 +07:00
|
|
|
if (!cinode->can_cache_brlcks) {
|
|
|
|
up_write(&cinode->lock_sem);
|
|
|
|
return rc;
|
|
|
|
}
|
2011-10-22 18:33:30 +07:00
|
|
|
|
2012-07-13 16:58:14 +07:00
|
|
|
if (cap_unix(tcon->ses) &&
|
2011-10-22 18:33:30 +07:00
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
|
|
|
|
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
|
2012-11-22 20:07:16 +07:00
|
|
|
rc = cifs_push_posix_locks(cfile);
|
|
|
|
else
|
|
|
|
rc = tcon->ses->server->ops->push_mand_locks(cfile);
|
2011-10-22 18:33:30 +07:00
|
|
|
|
2012-11-22 20:07:16 +07:00
|
|
|
cinode->can_cache_brlcks = false;
|
|
|
|
up_write(&cinode->lock_sem);
|
|
|
|
return rc;
|
2011-10-22 18:33:30 +07:00
|
|
|
}
|
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
static void
|
2012-02-28 18:16:55 +07:00
|
|
|
cifs_read_flock(struct file_lock *flock, __u32 *type, int *lock, int *unlock,
|
2012-02-28 18:23:34 +07:00
|
|
|
bool *wait_flag, struct TCP_Server_Info *server)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags & FL_POSIX)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Posix\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags & FL_FLOCK)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Flock\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags & FL_SLEEP) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Blocking lock\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
*wait_flag = true;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags & FL_ACCESS)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Process suspended by mandatory locking - not implemented yet\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags & FL_LEASE)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Lease on file - not implemented yet\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_flags &
|
2012-09-19 20:22:46 +07:00
|
|
|
(~(FL_POSIX | FL_FLOCK | FL_SLEEP |
|
2018-10-04 06:24:38 +07:00
|
|
|
FL_ACCESS | FL_LEASE | FL_CLOSE | FL_OFDLCK)))
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Unknown lock flags 0x%x\n", flock->fl_flags);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-02-28 18:23:34 +07:00
|
|
|
*type = server->vals->large_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
if (flock->fl_type == F_WRLCK) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "F_WRLCK\n");
|
2012-02-28 18:23:34 +07:00
|
|
|
*type |= server->vals->exclusive_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
*lock = 1;
|
|
|
|
} else if (flock->fl_type == F_UNLCK) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "F_UNLCK\n");
|
2012-02-28 18:23:34 +07:00
|
|
|
*type |= server->vals->unlock_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
*unlock = 1;
|
|
|
|
/* Check if unlock includes more than one lock range */
|
|
|
|
} else if (flock->fl_type == F_RDLCK) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "F_RDLCK\n");
|
2012-02-28 18:23:34 +07:00
|
|
|
*type |= server->vals->shared_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
*lock = 1;
|
|
|
|
} else if (flock->fl_type == F_EXLCK) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "F_EXLCK\n");
|
2012-02-28 18:23:34 +07:00
|
|
|
*type |= server->vals->exclusive_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
*lock = 1;
|
|
|
|
} else if (flock->fl_type == F_SHLCK) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "F_SHLCK\n");
|
2012-02-28 18:23:34 +07:00
|
|
|
*type |= server->vals->shared_lock_type;
|
2010-08-17 14:26:00 +07:00
|
|
|
*lock = 1;
|
2005-04-17 05:20:36 +07:00
|
|
|
} else
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Unknown type of lock\n");
|
2010-08-17 14:26:00 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
static int
|
2012-02-28 18:16:55 +07:00
|
|
|
cifs_getlk(struct file *file, struct file_lock *flock, __u32 type,
|
2012-06-20 14:21:16 +07:00
|
|
|
bool wait_flag, bool posix_lck, unsigned int xid)
|
2010-08-17 14:26:00 +07:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
__u64 length = 1 + flock->fl_end - flock->fl_start;
|
2011-10-22 18:33:30 +07:00
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *)file->private_data;
|
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2012-02-28 18:23:34 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2012-09-19 06:20:26 +07:00
|
|
|
__u16 netfid = cfile->fid.netfid;
|
2010-04-05 12:59:14 +07:00
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
if (posix_lck) {
|
|
|
|
int posix_lock_type;
|
2011-10-22 18:33:30 +07:00
|
|
|
|
|
|
|
rc = cifs_posix_lock_test(file, flock);
|
|
|
|
if (!rc)
|
|
|
|
return rc;
|
|
|
|
|
2012-02-28 18:23:34 +07:00
|
|
|
if (type & server->vals->shared_lock_type)
|
2010-08-17 14:26:00 +07:00
|
|
|
posix_lock_type = CIFS_RDLCK;
|
|
|
|
else
|
|
|
|
posix_lock_type = CIFS_WRLCK;
|
2016-05-24 17:27:44 +07:00
|
|
|
rc = CIFSSMBPosixLock(xid, tcon, netfid,
|
|
|
|
hash_lockowner(flock->fl_owner),
|
2012-07-24 00:28:37 +07:00
|
|
|
flock->fl_start, length, flock,
|
2011-10-22 18:33:30 +07:00
|
|
|
posix_lock_type, wait_flag);
|
2010-08-17 14:26:00 +07:00
|
|
|
return rc;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-02-24 19:41:06 +07:00
|
|
|
rc = cifs_lock_test(cfile, flock->fl_start, length, type, flock);
|
2011-10-22 18:33:29 +07:00
|
|
|
if (!rc)
|
|
|
|
return rc;
|
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
/* BB we could chain these into one lock request BB */
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length, type,
|
|
|
|
1, 0, false);
|
2010-08-17 14:26:00 +07:00
|
|
|
if (rc == 0) {
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
|
|
|
|
type, 0, 1, false);
|
2010-08-17 14:26:00 +07:00
|
|
|
flock->fl_type = F_UNLCK;
|
|
|
|
if (rc != 0)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "Error unlocking previously locked range %d during test of lock\n",
|
|
|
|
rc);
|
2011-10-29 20:17:59 +07:00
|
|
|
return 0;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2006-08-03 04:56:33 +07:00
|
|
|
|
2012-02-28 18:23:34 +07:00
|
|
|
if (type & server->vals->shared_lock_type) {
|
2010-08-17 14:26:00 +07:00
|
|
|
flock->fl_type = F_WRLCK;
|
2011-10-29 20:17:59 +07:00
|
|
|
return 0;
|
2006-08-03 04:56:33 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
type &= ~server->vals->exclusive_lock_type;
|
|
|
|
|
|
|
|
rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
|
|
|
|
type | server->vals->shared_lock_type,
|
|
|
|
1, 0, false);
|
2010-08-17 14:26:00 +07:00
|
|
|
if (rc == 0) {
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
|
|
|
|
type | server->vals->shared_lock_type, 0, 1, false);
|
2010-08-17 14:26:00 +07:00
|
|
|
flock->fl_type = F_RDLCK;
|
|
|
|
if (rc != 0)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "Error unlocking previously locked range %d during test of lock\n",
|
|
|
|
rc);
|
2010-08-17 14:26:00 +07:00
|
|
|
} else
|
|
|
|
flock->fl_type = F_WRLCK;
|
|
|
|
|
2011-10-29 20:17:59 +07:00
|
|
|
return 0;
|
2010-08-17 14:26:00 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
void
|
2011-10-22 18:33:31 +07:00
|
|
|
cifs_move_llist(struct list_head *source, struct list_head *dest)
|
|
|
|
{
|
|
|
|
struct list_head *li, *tmp;
|
|
|
|
list_for_each_safe(li, tmp, source)
|
|
|
|
list_move(li, dest);
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
void
|
2011-10-22 18:33:31 +07:00
|
|
|
cifs_free_llist(struct list_head *llist)
|
|
|
|
{
|
|
|
|
struct cifsLockInfo *li, *tmp;
|
|
|
|
list_for_each_entry_safe(li, tmp, llist, llist) {
|
|
|
|
cifs_del_lock_waiters(li);
|
|
|
|
list_del(&li->llist);
|
|
|
|
kfree(li);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
int
|
2012-06-20 14:21:16 +07:00
|
|
|
cifs_unlock_range(struct cifsFileInfo *cfile, struct file_lock *flock,
|
|
|
|
unsigned int xid)
|
2011-10-22 18:33:31 +07:00
|
|
|
{
|
|
|
|
int rc = 0, stored_rc;
|
2017-09-19 22:27:39 +07:00
|
|
|
static const int types[] = {
|
|
|
|
LOCKING_ANDX_LARGE_FILES,
|
|
|
|
LOCKING_ANDX_SHARED_LOCK | LOCKING_ANDX_LARGE_FILES
|
|
|
|
};
|
2011-10-22 18:33:31 +07:00
|
|
|
unsigned int i;
|
2012-05-31 16:03:26 +07:00
|
|
|
unsigned int max_num, num, max_buf;
|
2011-10-22 18:33:31 +07:00
|
|
|
LOCKING_ANDX_RANGE *buf, *cur;
|
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(d_inode(cfile->dentry));
|
2011-10-22 18:33:31 +07:00
|
|
|
struct cifsLockInfo *li, *tmp;
|
|
|
|
__u64 length = 1 + flock->fl_end - flock->fl_start;
|
|
|
|
struct list_head tmp_llist;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&tmp_llist);
|
|
|
|
|
2012-05-31 16:03:26 +07:00
|
|
|
/*
|
|
|
|
* Accessing maxBuf is racy with cifs_reconnect - need to store value
|
2019-01-09 01:30:57 +07:00
|
|
|
* and check it before using.
|
2012-05-31 16:03:26 +07:00
|
|
|
*/
|
|
|
|
max_buf = tcon->ses->server->maxBuf;
|
2019-01-09 01:30:57 +07:00
|
|
|
if (max_buf < (sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE)))
|
2012-05-31 16:03:26 +07:00
|
|
|
return -EINVAL;
|
|
|
|
|
2019-01-09 01:30:56 +07:00
|
|
|
BUILD_BUG_ON(sizeof(struct smb_hdr) + sizeof(LOCKING_ANDX_RANGE) >
|
|
|
|
PAGE_SIZE);
|
|
|
|
max_buf = min_t(unsigned int, max_buf - sizeof(struct smb_hdr),
|
|
|
|
PAGE_SIZE);
|
2012-05-31 16:03:26 +07:00
|
|
|
max_num = (max_buf - sizeof(struct smb_hdr)) /
|
|
|
|
sizeof(LOCKING_ANDX_RANGE);
|
2014-12-11 06:41:17 +07:00
|
|
|
buf = kcalloc(max_num, sizeof(LOCKING_ANDX_RANGE), GFP_KERNEL);
|
2011-10-22 18:33:31 +07:00
|
|
|
if (!buf)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2019-10-23 16:02:33 +07:00
|
|
|
cifs_down_write(&cinode->lock_sem);
|
2011-10-22 18:33:31 +07:00
|
|
|
for (i = 0; i < 2; i++) {
|
|
|
|
cur = buf;
|
|
|
|
num = 0;
|
2012-09-19 20:22:43 +07:00
|
|
|
list_for_each_entry_safe(li, tmp, &cfile->llist->locks, llist) {
|
2011-10-22 18:33:31 +07:00
|
|
|
if (flock->fl_start > li->offset ||
|
|
|
|
(flock->fl_start + length) <
|
|
|
|
(li->offset + li->length))
|
|
|
|
continue;
|
|
|
|
if (current->tgid != li->pid)
|
|
|
|
continue;
|
|
|
|
if (types[i] != li->type)
|
|
|
|
continue;
|
2012-05-31 16:59:36 +07:00
|
|
|
if (cinode->can_cache_brlcks) {
|
2011-10-22 18:33:31 +07:00
|
|
|
/*
|
|
|
|
* We can cache brlock requests - simply remove
|
2012-02-24 19:41:06 +07:00
|
|
|
* a lock from the file's list.
|
2011-10-22 18:33:31 +07:00
|
|
|
*/
|
|
|
|
list_del(&li->llist);
|
|
|
|
cifs_del_lock_waiters(li);
|
|
|
|
kfree(li);
|
2012-05-31 16:59:36 +07:00
|
|
|
continue;
|
2011-10-22 18:33:31 +07:00
|
|
|
}
|
2012-05-31 16:59:36 +07:00
|
|
|
cur->Pid = cpu_to_le16(li->pid);
|
|
|
|
cur->LengthLow = cpu_to_le32((u32)li->length);
|
|
|
|
cur->LengthHigh = cpu_to_le32((u32)(li->length>>32));
|
|
|
|
cur->OffsetLow = cpu_to_le32((u32)li->offset);
|
|
|
|
cur->OffsetHigh = cpu_to_le32((u32)(li->offset>>32));
|
|
|
|
/*
|
|
|
|
* We need to save a lock here to let us add it again to
|
|
|
|
* the file's list if the unlock range request fails on
|
|
|
|
* the server.
|
|
|
|
*/
|
|
|
|
list_move(&li->llist, &tmp_llist);
|
|
|
|
if (++num == max_num) {
|
2012-09-19 06:20:26 +07:00
|
|
|
stored_rc = cifs_lockv(xid, tcon,
|
|
|
|
cfile->fid.netfid,
|
2012-05-31 16:59:36 +07:00
|
|
|
li->type, num, 0, buf);
|
|
|
|
if (stored_rc) {
|
|
|
|
/*
|
|
|
|
* We failed on the unlock range
|
|
|
|
* request - add all locks from the tmp
|
|
|
|
* list to the head of the file's list.
|
|
|
|
*/
|
|
|
|
cifs_move_llist(&tmp_llist,
|
2012-09-19 20:22:43 +07:00
|
|
|
&cfile->llist->locks);
|
2012-05-31 16:59:36 +07:00
|
|
|
rc = stored_rc;
|
|
|
|
} else
|
|
|
|
/*
|
|
|
|
* The unlock range request succeed -
|
|
|
|
* free the tmp list.
|
|
|
|
*/
|
|
|
|
cifs_free_llist(&tmp_llist);
|
|
|
|
cur = buf;
|
|
|
|
num = 0;
|
|
|
|
} else
|
|
|
|
cur++;
|
2011-10-22 18:33:31 +07:00
|
|
|
}
|
|
|
|
if (num) {
|
2012-09-19 06:20:26 +07:00
|
|
|
stored_rc = cifs_lockv(xid, tcon, cfile->fid.netfid,
|
2011-10-22 18:33:31 +07:00
|
|
|
types[i], num, 0, buf);
|
|
|
|
if (stored_rc) {
|
2012-09-19 20:22:43 +07:00
|
|
|
cifs_move_llist(&tmp_llist,
|
|
|
|
&cfile->llist->locks);
|
2011-10-22 18:33:31 +07:00
|
|
|
rc = stored_rc;
|
|
|
|
} else
|
|
|
|
cifs_free_llist(&tmp_llist);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
up_write(&cinode->lock_sem);
|
2011-10-22 18:33:31 +07:00
|
|
|
kfree(buf);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
static int
|
2012-09-19 20:22:43 +07:00
|
|
|
cifs_setlk(struct file *file, struct file_lock *flock, __u32 type,
|
2012-06-20 14:21:16 +07:00
|
|
|
bool wait_flag, bool posix_lck, int lock, int unlock,
|
|
|
|
unsigned int xid)
|
2010-08-17 14:26:00 +07:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
__u64 length = 1 + flock->fl_end - flock->fl_start;
|
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *)file->private_data;
|
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2012-02-28 18:23:34 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(cfile->dentry);
|
2010-08-17 14:26:00 +07:00
|
|
|
|
|
|
|
if (posix_lck) {
|
2006-03-01 05:39:25 +07:00
|
|
|
int posix_lock_type;
|
2011-10-22 18:33:30 +07:00
|
|
|
|
|
|
|
rc = cifs_posix_lock_set(file, flock);
|
|
|
|
if (!rc || rc < 0)
|
|
|
|
return rc;
|
|
|
|
|
2012-02-28 18:23:34 +07:00
|
|
|
if (type & server->vals->shared_lock_type)
|
2006-03-01 05:39:25 +07:00
|
|
|
posix_lock_type = CIFS_RDLCK;
|
|
|
|
else
|
|
|
|
posix_lock_type = CIFS_WRLCK;
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
if (unlock == 1)
|
2006-03-04 06:36:34 +07:00
|
|
|
posix_lock_type = CIFS_UNLCK;
|
2006-08-03 04:56:33 +07:00
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = CIFSSMBPosixLock(xid, tcon, cfile->fid.netfid,
|
2016-05-24 17:27:44 +07:00
|
|
|
hash_lockowner(flock->fl_owner),
|
|
|
|
flock->fl_start, length,
|
2012-09-19 20:22:43 +07:00
|
|
|
NULL, posix_lock_type, wait_flag);
|
2010-08-17 14:26:00 +07:00
|
|
|
goto out;
|
|
|
|
}
|
2006-08-03 04:56:33 +07:00
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
if (lock) {
|
2011-10-29 20:17:58 +07:00
|
|
|
struct cifsLockInfo *lock;
|
|
|
|
|
2018-10-04 06:24:38 +07:00
|
|
|
lock = cifs_lock_init(flock->fl_start, length, type,
|
|
|
|
flock->fl_flags);
|
2011-10-29 20:17:58 +07:00
|
|
|
if (!lock)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2012-02-24 19:41:06 +07:00
|
|
|
rc = cifs_lock_add_if(cfile, lock, wait_flag);
|
2012-11-22 21:56:39 +07:00
|
|
|
if (rc < 0) {
|
2011-10-29 20:17:58 +07:00
|
|
|
kfree(lock);
|
2012-11-22 21:56:39 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
if (!rc)
|
2011-10-22 18:33:29 +07:00
|
|
|
goto out;
|
|
|
|
|
2012-12-24 17:41:19 +07:00
|
|
|
/*
|
|
|
|
* Windows 7 server can delay breaking lease from read to None
|
|
|
|
* if we set a byte-range lock on a file - break it explicitly
|
|
|
|
* before sending the lock to the server to be sure the next
|
|
|
|
* read won't conflict with non-overlapted locks due to
|
|
|
|
* pagereading.
|
|
|
|
*/
|
2013-09-05 16:01:06 +07:00
|
|
|
if (!CIFS_CACHE_WRITE(CIFS_I(inode)) &&
|
|
|
|
CIFS_CACHE_READ(CIFS_I(inode))) {
|
2014-04-30 20:31:47 +07:00
|
|
|
cifs_zap_mapping(inode);
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Set no oplock for inode=%p due to mand locks\n",
|
|
|
|
inode);
|
2013-09-05 16:01:06 +07:00
|
|
|
CIFS_I(inode)->oplock = 0;
|
2012-12-24 17:41:19 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = server->ops->mand_lock(xid, cfile, flock->fl_start, length,
|
|
|
|
type, 1, 0, wait_flag);
|
2011-10-29 20:17:58 +07:00
|
|
|
if (rc) {
|
|
|
|
kfree(lock);
|
2012-11-22 21:56:39 +07:00
|
|
|
return rc;
|
2010-08-17 14:26:00 +07:00
|
|
|
}
|
2011-10-29 20:17:58 +07:00
|
|
|
|
2012-02-24 19:41:06 +07:00
|
|
|
cifs_lock_add(cfile, lock);
|
2011-10-22 18:33:31 +07:00
|
|
|
} else if (unlock)
|
2012-09-19 20:22:43 +07:00
|
|
|
rc = server->ops->mand_unlock_range(cfile, flock, xid);
|
2010-08-17 14:26:00 +07:00
|
|
|
|
|
|
|
out:
|
2019-07-17 06:55:38 +07:00
|
|
|
if ((flock->fl_flags & FL_POSIX) || (flock->fl_flags & FL_FLOCK)) {
|
CIFS: fix POSIX lock leak and invalid ptr deref
We have a customer reporting crashes in lock_get_status() with many
"Leaked POSIX lock" messages preceeding the crash.
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
POSIX: fl_owner=ffff8900e7b79380 fl_flags=0x1 fl_type=0x1 fl_pid=20709
Leaked POSIX lock on dev=0x0:0x4b ino...
Leaked locks on dev=0x0:0x4b ino=0xf911400000029:
POSIX: fl_owner=ffff89f41c870e00 fl_flags=0x1 fl_type=0x1 fl_pid=19592
stack segment: 0000 [#1] SMP
Modules linked in: binfmt_misc msr tcp_diag udp_diag inet_diag unix_diag af_packet_diag netlink_diag rpcsec_gss_krb5 arc4 ecb auth_rpcgss nfsv4 md4 nfs nls_utf8 lockd grace cifs sunrpc ccm dns_resolver fscache af_packet iscsi_ibft iscsi_boot_sysfs vmw_vsock_vmci_transport vsock xfs libcrc32c sb_edac edac_core crct10dif_pclmul crc32_pclmul ghash_clmulni_intel drbg ansi_cprng vmw_balloon aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd joydev pcspkr vmxnet3 i2c_piix4 vmw_vmci shpchp fjes processor button ac btrfs xor raid6_pq sr_mod cdrom ata_generic sd_mod ata_piix vmwgfx crc32c_intel drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm serio_raw ahci libahci drm libata vmw_pvscsi sg dm_multipath dm_mod scsi_dh_rdac scsi_dh_emc scsi_dh_alua scsi_mod autofs4
Supported: Yes
CPU: 6 PID: 28250 Comm: lsof Not tainted 4.4.156-94.64-default #1
Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/05/2016
task: ffff88a345f28740 ti: ffff88c74005c000 task.ti: ffff88c74005c000
RIP: 0010:[<ffffffff8125dcab>] [<ffffffff8125dcab>] lock_get_status+0x9b/0x3b0
RSP: 0018:ffff88c74005fd90 EFLAGS: 00010202
RAX: ffff89bde83e20ae RBX: ffff89e870003d18 RCX: 0000000049534f50
RDX: ffffffff81a3541f RSI: ffffffff81a3544e RDI: ffff89bde83e20ae
RBP: 0026252423222120 R08: 0000000020584953 R09: 000000000000ffff
R10: 0000000000000000 R11: ffff88c74005fc70 R12: ffff89e5ca7b1340
R13: 00000000000050e5 R14: ffff89e870003d30 R15: ffff89e5ca7b1340
FS: 00007fafd64be800(0000) GS:ffff89f41fd00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000001c80018 CR3: 000000a522048000 CR4: 0000000000360670
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
0000000000000208 ffffffff81a3d6b6 ffff89e870003d30 ffff89e870003d18
ffff89e5ca7b1340 ffff89f41738d7c0 ffff89e870003d30 ffff89e5ca7b1340
ffffffff8125e08f 0000000000000000 ffff89bc22b67d00 ffff88c74005ff28
Call Trace:
[<ffffffff8125e08f>] locks_show+0x2f/0x70
[<ffffffff81230ad1>] seq_read+0x251/0x3a0
[<ffffffff81275bbc>] proc_reg_read+0x3c/0x70
[<ffffffff8120e456>] __vfs_read+0x26/0x140
[<ffffffff8120e9da>] vfs_read+0x7a/0x120
[<ffffffff8120faf2>] SyS_read+0x42/0xa0
[<ffffffff8161cbc3>] entry_SYSCALL_64_fastpath+0x1e/0xb7
When Linux closes a FD (close(), close-on-exec, dup2(), ...) it calls
filp_close() which also removes all posix locks.
The lock struct is initialized like so in filp_close() and passed
down to cifs
...
lock.fl_type = F_UNLCK;
lock.fl_flags = FL_POSIX | FL_CLOSE;
lock.fl_start = 0;
lock.fl_end = OFFSET_MAX;
...
Note the FL_CLOSE flag, which hints the VFS code that this unlocking
is done for closing the fd.
filp_close()
locks_remove_posix(filp, id);
vfs_lock_file(filp, F_SETLK, &lock, NULL);
return filp->f_op->lock(filp, cmd, fl) => cifs_lock()
rc = cifs_setlk(file, flock, type, wait_flag, posix_lck, lock, unlock, xid);
rc = server->ops->mand_unlock_range(cfile, flock, xid);
if (flock->fl_flags & FL_POSIX && !rc)
rc = locks_lock_file_wait(file, flock)
Notice how we don't call locks_lock_file_wait() which does the
generic VFS lock/unlock/wait work on the inode if rc != 0.
If we are closing the handle, the SMB server is supposed to remove any
locks associated with it. Similarly, cifs.ko frees and wakes up any
lock and lock waiter when closing the file:
cifs_close()
cifsFileInfo_put(file->private_data)
/*
* Delete any outstanding lock records. We'll lose them when the file
* is closed anyway.
*/
down_write(&cifsi->lock_sem);
list_for_each_entry_safe(li, tmp, &cifs_file->llist->locks, llist) {
list_del(&li->llist);
cifs_del_lock_waiters(li);
kfree(li);
}
list_del(&cifs_file->llist->llist);
kfree(cifs_file->llist);
up_write(&cifsi->lock_sem);
So we can safely ignore unlocking failures in cifs_lock() if they
happen with the FL_CLOSE flag hint set as both the server and the
client take care of it during the actual closing.
This is not a proper fix for the unlocking failure but it's safe and
it seems to prevent the lock leakages and crashes the customer
experiences.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: NeilBrown <neil@brown.name>
Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
2019-03-15 00:44:16 +07:00
|
|
|
/*
|
|
|
|
* If this is a request to remove all locks because we
|
|
|
|
* are closing the file, it doesn't matter if the
|
|
|
|
* unlocking failed as both cifs.ko and the SMB server
|
|
|
|
* remove the lock on file close
|
|
|
|
*/
|
|
|
|
if (rc) {
|
|
|
|
cifs_dbg(VFS, "%s failed rc=%d\n", __func__, rc);
|
|
|
|
if (!(flock->fl_flags & FL_CLOSE))
|
|
|
|
return rc;
|
|
|
|
}
|
2015-10-23 00:38:14 +07:00
|
|
|
rc = locks_lock_file_wait(file, flock);
|
CIFS: fix POSIX lock leak and invalid ptr deref
We have a customer reporting crashes in lock_get_status() with many
"Leaked POSIX lock" messages preceeding the crash.
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x56 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
Leaked POSIX lock on dev=0x0:0x53 ...
POSIX: fl_owner=ffff8900e7b79380 fl_flags=0x1 fl_type=0x1 fl_pid=20709
Leaked POSIX lock on dev=0x0:0x4b ino...
Leaked locks on dev=0x0:0x4b ino=0xf911400000029:
POSIX: fl_owner=ffff89f41c870e00 fl_flags=0x1 fl_type=0x1 fl_pid=19592
stack segment: 0000 [#1] SMP
Modules linked in: binfmt_misc msr tcp_diag udp_diag inet_diag unix_diag af_packet_diag netlink_diag rpcsec_gss_krb5 arc4 ecb auth_rpcgss nfsv4 md4 nfs nls_utf8 lockd grace cifs sunrpc ccm dns_resolver fscache af_packet iscsi_ibft iscsi_boot_sysfs vmw_vsock_vmci_transport vsock xfs libcrc32c sb_edac edac_core crct10dif_pclmul crc32_pclmul ghash_clmulni_intel drbg ansi_cprng vmw_balloon aesni_intel aes_x86_64 lrw gf128mul glue_helper ablk_helper cryptd joydev pcspkr vmxnet3 i2c_piix4 vmw_vmci shpchp fjes processor button ac btrfs xor raid6_pq sr_mod cdrom ata_generic sd_mod ata_piix vmwgfx crc32c_intel drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops ttm serio_raw ahci libahci drm libata vmw_pvscsi sg dm_multipath dm_mod scsi_dh_rdac scsi_dh_emc scsi_dh_alua scsi_mod autofs4
Supported: Yes
CPU: 6 PID: 28250 Comm: lsof Not tainted 4.4.156-94.64-default #1
Hardware name: VMware, Inc. VMware Virtual Platform/440BX Desktop Reference Platform, BIOS 6.00 04/05/2016
task: ffff88a345f28740 ti: ffff88c74005c000 task.ti: ffff88c74005c000
RIP: 0010:[<ffffffff8125dcab>] [<ffffffff8125dcab>] lock_get_status+0x9b/0x3b0
RSP: 0018:ffff88c74005fd90 EFLAGS: 00010202
RAX: ffff89bde83e20ae RBX: ffff89e870003d18 RCX: 0000000049534f50
RDX: ffffffff81a3541f RSI: ffffffff81a3544e RDI: ffff89bde83e20ae
RBP: 0026252423222120 R08: 0000000020584953 R09: 000000000000ffff
R10: 0000000000000000 R11: ffff88c74005fc70 R12: ffff89e5ca7b1340
R13: 00000000000050e5 R14: ffff89e870003d30 R15: ffff89e5ca7b1340
FS: 00007fafd64be800(0000) GS:ffff89f41fd00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000001c80018 CR3: 000000a522048000 CR4: 0000000000360670
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
0000000000000208 ffffffff81a3d6b6 ffff89e870003d30 ffff89e870003d18
ffff89e5ca7b1340 ffff89f41738d7c0 ffff89e870003d30 ffff89e5ca7b1340
ffffffff8125e08f 0000000000000000 ffff89bc22b67d00 ffff88c74005ff28
Call Trace:
[<ffffffff8125e08f>] locks_show+0x2f/0x70
[<ffffffff81230ad1>] seq_read+0x251/0x3a0
[<ffffffff81275bbc>] proc_reg_read+0x3c/0x70
[<ffffffff8120e456>] __vfs_read+0x26/0x140
[<ffffffff8120e9da>] vfs_read+0x7a/0x120
[<ffffffff8120faf2>] SyS_read+0x42/0xa0
[<ffffffff8161cbc3>] entry_SYSCALL_64_fastpath+0x1e/0xb7
When Linux closes a FD (close(), close-on-exec, dup2(), ...) it calls
filp_close() which also removes all posix locks.
The lock struct is initialized like so in filp_close() and passed
down to cifs
...
lock.fl_type = F_UNLCK;
lock.fl_flags = FL_POSIX | FL_CLOSE;
lock.fl_start = 0;
lock.fl_end = OFFSET_MAX;
...
Note the FL_CLOSE flag, which hints the VFS code that this unlocking
is done for closing the fd.
filp_close()
locks_remove_posix(filp, id);
vfs_lock_file(filp, F_SETLK, &lock, NULL);
return filp->f_op->lock(filp, cmd, fl) => cifs_lock()
rc = cifs_setlk(file, flock, type, wait_flag, posix_lck, lock, unlock, xid);
rc = server->ops->mand_unlock_range(cfile, flock, xid);
if (flock->fl_flags & FL_POSIX && !rc)
rc = locks_lock_file_wait(file, flock)
Notice how we don't call locks_lock_file_wait() which does the
generic VFS lock/unlock/wait work on the inode if rc != 0.
If we are closing the handle, the SMB server is supposed to remove any
locks associated with it. Similarly, cifs.ko frees and wakes up any
lock and lock waiter when closing the file:
cifs_close()
cifsFileInfo_put(file->private_data)
/*
* Delete any outstanding lock records. We'll lose them when the file
* is closed anyway.
*/
down_write(&cifsi->lock_sem);
list_for_each_entry_safe(li, tmp, &cifs_file->llist->locks, llist) {
list_del(&li->llist);
cifs_del_lock_waiters(li);
kfree(li);
}
list_del(&cifs_file->llist->llist);
kfree(cifs_file->llist);
up_write(&cifsi->lock_sem);
So we can safely ignore unlocking failures in cifs_lock() if they
happen with the FL_CLOSE flag hint set as both the server and the
client take care of it during the actual closing.
This is not a proper fix for the unlocking failure but it's safe and
it seems to prevent the lock leakages and crashes the customer
experiences.
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: NeilBrown <neil@brown.name>
Signed-off-by: Steve French <stfrench@microsoft.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
2019-03-15 00:44:16 +07:00
|
|
|
}
|
2010-08-17 14:26:00 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2019-07-17 06:55:38 +07:00
|
|
|
int cifs_flock(struct file *file, int cmd, struct file_lock *fl)
|
|
|
|
{
|
|
|
|
int rc, xid;
|
|
|
|
int lock = 0, unlock = 0;
|
|
|
|
bool wait_flag = false;
|
|
|
|
bool posix_lck = false;
|
|
|
|
struct cifs_sb_info *cifs_sb;
|
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct cifsFileInfo *cfile;
|
|
|
|
__u32 type;
|
|
|
|
|
|
|
|
rc = -EACCES;
|
|
|
|
xid = get_xid();
|
|
|
|
|
|
|
|
if (!(fl->fl_flags & FL_FLOCK))
|
|
|
|
return -ENOLCK;
|
|
|
|
|
|
|
|
cfile = (struct cifsFileInfo *)file->private_data;
|
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
|
|
|
|
cifs_read_flock(fl, &type, &lock, &unlock, &wait_flag,
|
|
|
|
tcon->ses->server);
|
|
|
|
cifs_sb = CIFS_FILE_SB(file);
|
|
|
|
|
|
|
|
if (cap_unix(tcon->ses) &&
|
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
|
|
|
|
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
|
|
|
|
posix_lck = true;
|
|
|
|
|
|
|
|
if (!lock && !unlock) {
|
|
|
|
/*
|
|
|
|
* if no lock or unlock then nothing to do since we do not
|
|
|
|
* know what it is
|
|
|
|
*/
|
|
|
|
free_xid(xid);
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = cifs_setlk(file, fl, type, wait_flag, posix_lck, lock, unlock,
|
|
|
|
xid);
|
|
|
|
free_xid(xid);
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
int cifs_lock(struct file *file, int cmd, struct file_lock *flock)
|
|
|
|
{
|
|
|
|
int rc, xid;
|
|
|
|
int lock = 0, unlock = 0;
|
|
|
|
bool wait_flag = false;
|
|
|
|
bool posix_lck = false;
|
|
|
|
struct cifs_sb_info *cifs_sb;
|
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct cifsFileInfo *cfile;
|
2012-02-28 18:16:55 +07:00
|
|
|
__u32 type;
|
2010-08-17 14:26:00 +07:00
|
|
|
|
|
|
|
rc = -EACCES;
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2010-08-17 14:26:00 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Lock parm: 0x%x flockflags: 0x%x flocktype: 0x%x start: %lld end: %lld\n",
|
|
|
|
cmd, flock->fl_flags, flock->fl_type,
|
|
|
|
flock->fl_start, flock->fl_end);
|
2010-08-17 14:26:00 +07:00
|
|
|
|
|
|
|
cfile = (struct cifsFileInfo *)file->private_data;
|
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
2012-02-28 18:23:34 +07:00
|
|
|
|
|
|
|
cifs_read_flock(flock, &type, &lock, &unlock, &wait_flag,
|
|
|
|
tcon->ses->server);
|
2014-10-22 11:25:12 +07:00
|
|
|
cifs_sb = CIFS_FILE_SB(file);
|
2010-08-17 14:26:00 +07:00
|
|
|
|
2012-07-13 16:58:14 +07:00
|
|
|
if (cap_unix(tcon->ses) &&
|
2010-08-17 14:26:00 +07:00
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
|
|
|
|
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
|
|
|
|
posix_lck = true;
|
|
|
|
/*
|
|
|
|
* BB add code here to normalize offset and length to account for
|
|
|
|
* negative length which we can not accept over the wire.
|
|
|
|
*/
|
|
|
|
if (IS_GETLK(cmd)) {
|
2011-10-22 18:33:30 +07:00
|
|
|
rc = cifs_getlk(file, flock, type, wait_flag, posix_lck, xid);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-08-17 14:26:00 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!lock && !unlock) {
|
|
|
|
/*
|
|
|
|
* if no lock or unlock then nothing to do since we do not
|
|
|
|
* know what it is
|
|
|
|
*/
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-08-17 14:26:00 +07:00
|
|
|
return -EOPNOTSUPP;
|
2006-08-03 04:56:33 +07:00
|
|
|
}
|
|
|
|
|
2010-08-17 14:26:00 +07:00
|
|
|
rc = cifs_setlk(file, flock, type, wait_flag, posix_lck, lock, unlock,
|
|
|
|
xid);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-03-24 01:40:56 +07:00
|
|
|
/*
|
|
|
|
* update the file size (if needed) after a write. Should be called with
|
|
|
|
* the inode->i_lock held
|
|
|
|
*/
|
2011-01-25 02:16:35 +07:00
|
|
|
void
|
2009-04-04 00:44:00 +07:00
|
|
|
cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset,
|
|
|
|
unsigned int bytes_written)
|
|
|
|
{
|
|
|
|
loff_t end_of_write = offset + bytes_written;
|
|
|
|
|
|
|
|
if (end_of_write > cifsi->server_eof)
|
|
|
|
cifsi->server_eof = end_of_write;
|
|
|
|
}
|
|
|
|
|
2012-09-19 06:20:30 +07:00
|
|
|
static ssize_t
|
|
|
|
cifs_write(struct cifsFileInfo *open_file, __u32 pid, const char *write_data,
|
|
|
|
size_t write_size, loff_t *offset)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
unsigned int bytes_written = 0;
|
|
|
|
unsigned int total_written;
|
2012-09-19 06:20:30 +07:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct TCP_Server_Info *server;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2010-10-16 02:34:00 +07:00
|
|
|
struct dentry *dentry = open_file->dentry;
|
2015-03-18 05:25:59 +07:00
|
|
|
struct cifsInodeInfo *cifsi = CIFS_I(d_inode(dentry));
|
2011-05-26 13:01:59 +07:00
|
|
|
struct cifs_io_parms io_parms;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-08-20 07:25:34 +07:00
|
|
|
cifs_dbg(FYI, "write %zd bytes to offset %lld of %pd\n",
|
|
|
|
write_size, *offset, dentry);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-09-19 06:20:30 +07:00
|
|
|
tcon = tlink_tcon(open_file->tlink);
|
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
if (!server->ops->sync_write)
|
|
|
|
return -ENOSYS;
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
for (total_written = 0; write_size > total_written;
|
|
|
|
total_written += bytes_written) {
|
|
|
|
rc = -EAGAIN;
|
|
|
|
while (rc == -EAGAIN) {
|
2011-04-12 20:13:44 +07:00
|
|
|
struct kvec iov[2];
|
|
|
|
unsigned int len;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (open_file->invalidHandle) {
|
|
|
|
/* we could deadlock if we called
|
|
|
|
filemap_fdatawait from here so tell
|
2007-07-10 08:16:18 +07:00
|
|
|
reopen_file not to flush data to
|
2005-04-17 05:20:36 +07:00
|
|
|
server now */
|
2010-10-16 02:33:59 +07:00
|
|
|
rc = cifs_reopen_file(open_file, false);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (rc != 0)
|
|
|
|
break;
|
|
|
|
}
|
2011-04-12 20:13:44 +07:00
|
|
|
|
2015-03-18 05:25:59 +07:00
|
|
|
len = min(server->ops->wp_retry_size(d_inode(dentry)),
|
2014-06-05 22:03:27 +07:00
|
|
|
(unsigned int)write_size - total_written);
|
2011-04-12 20:13:44 +07:00
|
|
|
/* iov[0] is reserved for smb header */
|
|
|
|
iov[1].iov_base = (char *)write_data + total_written;
|
|
|
|
iov[1].iov_len = len;
|
2011-05-26 13:01:59 +07:00
|
|
|
io_parms.pid = pid;
|
2012-09-19 06:20:30 +07:00
|
|
|
io_parms.tcon = tcon;
|
|
|
|
io_parms.offset = *offset;
|
2011-05-26 13:01:59 +07:00
|
|
|
io_parms.length = len;
|
2014-09-22 17:13:55 +07:00
|
|
|
rc = server->ops->sync_write(xid, &open_file->fid,
|
|
|
|
&io_parms, &bytes_written, iov, 1);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
if (rc || (bytes_written == 0)) {
|
|
|
|
if (total_written)
|
|
|
|
break;
|
|
|
|
else {
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
2009-04-04 00:44:00 +07:00
|
|
|
} else {
|
2015-03-18 05:25:59 +07:00
|
|
|
spin_lock(&d_inode(dentry)->i_lock);
|
2012-09-19 06:20:30 +07:00
|
|
|
cifs_update_eof(cifsi, *offset, bytes_written);
|
2015-03-18 05:25:59 +07:00
|
|
|
spin_unlock(&d_inode(dentry)->i_lock);
|
2012-09-19 06:20:30 +07:00
|
|
|
*offset += bytes_written;
|
2009-04-04 00:44:00 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2012-09-19 06:20:30 +07:00
|
|
|
cifs_stats_bytes_written(tcon, total_written);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2010-10-16 02:34:00 +07:00
|
|
|
if (total_written > 0) {
|
2015-03-18 05:25:59 +07:00
|
|
|
spin_lock(&d_inode(dentry)->i_lock);
|
|
|
|
if (*offset > d_inode(dentry)->i_size)
|
|
|
|
i_size_write(d_inode(dentry), *offset);
|
|
|
|
spin_unlock(&d_inode(dentry)->i_lock);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2015-03-18 05:25:59 +07:00
|
|
|
mark_inode_dirty_sync(d_inode(dentry));
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return total_written;
|
|
|
|
}
|
|
|
|
|
2010-09-30 06:51:11 +07:00
|
|
|
struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *cifs_inode,
|
|
|
|
bool fsuid_only)
|
2007-10-26 04:17:17 +07:00
|
|
|
{
|
|
|
|
struct cifsFileInfo *open_file = NULL;
|
2010-09-30 06:51:11 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(cifs_inode->vfs_inode.i_sb);
|
|
|
|
|
|
|
|
/* only filter by fsuid on multiuser mounts */
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))
|
|
|
|
fsuid_only = false;
|
2007-10-26 04:17:17 +07:00
|
|
|
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_lock(&cifs_inode->open_file_lock);
|
2007-10-26 04:17:17 +07:00
|
|
|
/* we could simply get the first_list_entry since write-only entries
|
|
|
|
are always at the end of the list but since the first entry might
|
|
|
|
have a close pending, we go through the whole list */
|
|
|
|
list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
|
2013-02-06 17:23:02 +07:00
|
|
|
if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
|
2010-09-30 06:51:11 +07:00
|
|
|
continue;
|
2010-10-16 02:34:01 +07:00
|
|
|
if (OPEN_FMODE(open_file->f_flags) & FMODE_READ) {
|
2007-10-26 04:17:17 +07:00
|
|
|
if (!open_file->invalidHandle) {
|
|
|
|
/* found a good file */
|
|
|
|
/* lock it so it will not be closed on us */
|
2016-09-23 06:58:16 +07:00
|
|
|
cifsFileInfo_get(open_file);
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2007-10-26 04:17:17 +07:00
|
|
|
return open_file;
|
|
|
|
} /* else might as well continue, and look for
|
|
|
|
another, or simply have the caller reopen it
|
|
|
|
again rather than trying to fix this handle */
|
|
|
|
} else /* write only file */
|
|
|
|
break; /* write only files are last so must be done */
|
|
|
|
}
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2007-10-26 04:17:17 +07:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2019-01-30 03:15:11 +07:00
|
|
|
/* Return -EBADF if no handle is found and general rc otherwise */
|
|
|
|
int
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
cifs_get_writable_file(struct cifsInodeInfo *cifs_inode, int flags,
|
2019-01-30 03:15:11 +07:00
|
|
|
struct cifsFileInfo **ret_file)
|
2005-10-06 02:23:19 +07:00
|
|
|
{
|
2012-05-21 21:20:12 +07:00
|
|
|
struct cifsFileInfo *open_file, *inv_file = NULL;
|
2010-11-03 03:22:50 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2008-09-23 08:33:33 +07:00
|
|
|
bool any_available = false;
|
2019-01-30 03:15:11 +07:00
|
|
|
int rc = -EBADF;
|
2012-05-21 21:20:12 +07:00
|
|
|
unsigned int refind = 0;
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
bool fsuid_only = flags & FIND_WR_FSUID_ONLY;
|
|
|
|
bool with_delete = flags & FIND_WR_WITH_DELETE;
|
2019-01-30 03:15:11 +07:00
|
|
|
*ret_file = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Having a null inode here (because mapping->host was set to zero by
|
|
|
|
* the VFS or MM) should not happen but we had reports of on oops (due
|
|
|
|
* to it being zero) during stress testcases so we need to check for it
|
|
|
|
*/
|
2006-04-22 22:53:05 +07:00
|
|
|
|
2007-07-10 08:16:18 +07:00
|
|
|
if (cifs_inode == NULL) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "Null inode passed to cifs_writeable_file\n");
|
2006-04-22 22:53:05 +07:00
|
|
|
dump_stack();
|
2019-01-30 03:15:11 +07:00
|
|
|
return rc;
|
2006-04-22 22:53:05 +07:00
|
|
|
}
|
|
|
|
|
2010-11-03 03:22:50 +07:00
|
|
|
cifs_sb = CIFS_SB(cifs_inode->vfs_inode.i_sb);
|
|
|
|
|
2010-09-30 06:51:11 +07:00
|
|
|
/* only filter by fsuid on multiuser mounts */
|
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))
|
|
|
|
fsuid_only = false;
|
|
|
|
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_lock(&cifs_inode->open_file_lock);
|
2007-10-02 08:11:08 +07:00
|
|
|
refind_writable:
|
2012-05-21 21:20:12 +07:00
|
|
|
if (refind > MAX_REOPEN_ATT) {
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2019-01-30 03:15:11 +07:00
|
|
|
return rc;
|
2012-05-21 21:20:12 +07:00
|
|
|
}
|
2005-10-06 02:23:19 +07:00
|
|
|
list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
|
2010-09-30 06:51:11 +07:00
|
|
|
if (!any_available && open_file->pid != current->tgid)
|
|
|
|
continue;
|
2013-02-06 17:23:02 +07:00
|
|
|
if (fsuid_only && !uid_eq(open_file->uid, current_fsuid()))
|
2005-10-06 02:23:19 +07:00
|
|
|
continue;
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
if (with_delete && !(open_file->fid.access & DELETE))
|
|
|
|
continue;
|
2010-10-16 02:34:01 +07:00
|
|
|
if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
|
2007-10-02 08:11:08 +07:00
|
|
|
if (!open_file->invalidHandle) {
|
|
|
|
/* found a good writable file */
|
2016-09-23 06:58:16 +07:00
|
|
|
cifsFileInfo_get(open_file);
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2019-01-30 03:15:11 +07:00
|
|
|
*ret_file = open_file;
|
|
|
|
return 0;
|
2012-05-21 21:20:12 +07:00
|
|
|
} else {
|
|
|
|
if (!inv_file)
|
|
|
|
inv_file = open_file;
|
2007-10-02 08:11:08 +07:00
|
|
|
}
|
2005-10-06 02:23:19 +07:00
|
|
|
}
|
|
|
|
}
|
2008-09-23 08:33:33 +07:00
|
|
|
/* couldn't find useable FH with same pid, try any available */
|
|
|
|
if (!any_available) {
|
|
|
|
any_available = true;
|
|
|
|
goto refind_writable;
|
|
|
|
}
|
2012-05-21 21:20:12 +07:00
|
|
|
|
|
|
|
if (inv_file) {
|
|
|
|
any_available = false;
|
2016-09-23 06:58:16 +07:00
|
|
|
cifsFileInfo_get(inv_file);
|
2012-05-21 21:20:12 +07:00
|
|
|
}
|
|
|
|
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2012-05-21 21:20:12 +07:00
|
|
|
|
|
|
|
if (inv_file) {
|
|
|
|
rc = cifs_reopen_file(inv_file, false);
|
2019-01-30 03:15:11 +07:00
|
|
|
if (!rc) {
|
|
|
|
*ret_file = inv_file;
|
|
|
|
return 0;
|
2012-05-21 21:20:12 +07:00
|
|
|
}
|
2019-01-30 03:15:11 +07:00
|
|
|
|
2019-06-05 07:38:38 +07:00
|
|
|
spin_lock(&cifs_inode->open_file_lock);
|
2019-01-30 03:15:11 +07:00
|
|
|
list_move_tail(&inv_file->flist, &cifs_inode->openFileList);
|
2019-06-05 07:38:38 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2019-01-30 03:15:11 +07:00
|
|
|
cifsFileInfo_put(inv_file);
|
|
|
|
++refind;
|
|
|
|
inv_file = NULL;
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_lock(&cifs_inode->open_file_lock);
|
2019-01-30 03:15:11 +07:00
|
|
|
goto refind_writable;
|
2012-05-21 21:20:12 +07:00
|
|
|
}
|
|
|
|
|
2019-01-30 03:15:11 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cifsFileInfo *
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
find_writable_file(struct cifsInodeInfo *cifs_inode, int flags)
|
2019-01-30 03:15:11 +07:00
|
|
|
{
|
|
|
|
struct cifsFileInfo *cfile;
|
|
|
|
int rc;
|
|
|
|
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
rc = cifs_get_writable_file(cifs_inode, flags, &cfile);
|
2019-01-30 03:15:11 +07:00
|
|
|
if (rc)
|
|
|
|
cifs_dbg(FYI, "couldn't find writable handle rc=%d", rc);
|
|
|
|
|
|
|
|
return cfile;
|
2005-10-06 02:23:19 +07:00
|
|
|
}
|
|
|
|
|
2019-08-30 05:25:46 +07:00
|
|
|
int
|
|
|
|
cifs_get_writable_path(struct cifs_tcon *tcon, const char *name,
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
int flags,
|
2019-08-30 05:25:46 +07:00
|
|
|
struct cifsFileInfo **ret_file)
|
|
|
|
{
|
|
|
|
struct list_head *tmp;
|
|
|
|
struct cifsFileInfo *cfile;
|
|
|
|
struct cifsInodeInfo *cinode;
|
|
|
|
char *full_path;
|
|
|
|
|
|
|
|
*ret_file = NULL;
|
|
|
|
|
|
|
|
spin_lock(&tcon->open_file_lock);
|
|
|
|
list_for_each(tmp, &tcon->openFileList) {
|
|
|
|
cfile = list_entry(tmp, struct cifsFileInfo,
|
|
|
|
tlist);
|
|
|
|
full_path = build_path_from_dentry(cfile->dentry);
|
|
|
|
if (full_path == NULL) {
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
if (strcmp(full_path, name)) {
|
|
|
|
kfree(full_path);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(full_path);
|
|
|
|
cinode = CIFS_I(d_inode(cfile->dentry));
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
return cifs_get_writable_file(cinode, flags, ret_file);
|
2019-08-30 05:25:46 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
2019-09-09 12:30:00 +07:00
|
|
|
int
|
|
|
|
cifs_get_readable_path(struct cifs_tcon *tcon, const char *name,
|
|
|
|
struct cifsFileInfo **ret_file)
|
|
|
|
{
|
|
|
|
struct list_head *tmp;
|
|
|
|
struct cifsFileInfo *cfile;
|
|
|
|
struct cifsInodeInfo *cinode;
|
|
|
|
char *full_path;
|
|
|
|
|
|
|
|
*ret_file = NULL;
|
|
|
|
|
|
|
|
spin_lock(&tcon->open_file_lock);
|
|
|
|
list_for_each(tmp, &tcon->openFileList) {
|
|
|
|
cfile = list_entry(tmp, struct cifsFileInfo,
|
|
|
|
tlist);
|
|
|
|
full_path = build_path_from_dentry(cfile->dentry);
|
|
|
|
if (full_path == NULL) {
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
if (strcmp(full_path, name)) {
|
|
|
|
kfree(full_path);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(full_path);
|
|
|
|
cinode = CIFS_I(d_inode(cfile->dentry));
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
|
|
|
*ret_file = find_readable_file(cinode, 0);
|
|
|
|
return *ret_file ? 0 : -ENOENT;
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_unlock(&tcon->open_file_lock);
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int cifs_partialpagewrite(struct page *page, unsigned from, unsigned to)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = page->mapping;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
loff_t offset = (loff_t)page->index << PAGE_SHIFT;
|
2005-04-17 05:20:36 +07:00
|
|
|
char *write_data;
|
|
|
|
int rc = -EFAULT;
|
|
|
|
int bytes_written = 0;
|
|
|
|
struct inode *inode;
|
2005-10-06 02:23:19 +07:00
|
|
|
struct cifsFileInfo *open_file;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (!mapping || !mapping->host)
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
inode = page->mapping->host;
|
|
|
|
|
|
|
|
offset += (loff_t)from;
|
|
|
|
write_data = kmap(page);
|
|
|
|
write_data += from;
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if ((to > PAGE_SIZE) || (from > to)) {
|
2005-04-17 05:20:36 +07:00
|
|
|
kunmap(page);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* racing with truncate? */
|
|
|
|
if (offset > mapping->host->i_size) {
|
|
|
|
kunmap(page);
|
|
|
|
return 0; /* don't care */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* check to make sure that we are not extending the file */
|
|
|
|
if (mapping->host->i_size - offset < (loff_t)to)
|
2007-07-10 08:16:18 +07:00
|
|
|
to = (unsigned)(mapping->host->i_size - offset);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
rc = cifs_get_writable_file(CIFS_I(mapping->host), FIND_WR_ANY,
|
|
|
|
&open_file);
|
2019-01-30 03:15:11 +07:00
|
|
|
if (!rc) {
|
2011-05-26 13:01:59 +07:00
|
|
|
bytes_written = cifs_write(open_file, open_file->pid,
|
|
|
|
write_data, to - from, &offset);
|
2009-08-31 22:07:12 +07:00
|
|
|
cifsFileInfo_put(open_file);
|
2005-04-17 05:20:36 +07:00
|
|
|
/* Does mm or vfs already set times? */
|
2016-09-14 21:48:06 +07:00
|
|
|
inode->i_atime = inode->i_mtime = current_time(inode);
|
2007-12-31 11:21:29 +07:00
|
|
|
if ((bytes_written > 0) && (offset))
|
2005-10-06 02:23:19 +07:00
|
|
|
rc = 0;
|
2007-12-31 11:21:29 +07:00
|
|
|
else if (bytes_written < 0)
|
|
|
|
rc = bytes_written;
|
2019-01-30 03:15:11 +07:00
|
|
|
else
|
|
|
|
rc = -EFAULT;
|
2005-10-06 02:23:19 +07:00
|
|
|
} else {
|
2019-01-30 03:15:11 +07:00
|
|
|
cifs_dbg(FYI, "No writable handle for write page rc=%d\n", rc);
|
|
|
|
if (!is_retryable_error(rc))
|
|
|
|
rc = -EIO;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
kunmap(page);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2014-06-19 19:11:00 +07:00
|
|
|
static struct cifs_writedata *
|
|
|
|
wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping,
|
|
|
|
pgoff_t end, pgoff_t *index,
|
|
|
|
unsigned int *found_pages)
|
|
|
|
{
|
|
|
|
struct cifs_writedata *wdata;
|
|
|
|
|
|
|
|
wdata = cifs_writedata_alloc((unsigned int)tofind,
|
|
|
|
cifs_writev_complete);
|
|
|
|
if (!wdata)
|
|
|
|
return NULL;
|
|
|
|
|
2017-11-16 08:35:26 +07:00
|
|
|
*found_pages = find_get_pages_range_tag(mapping, index, end,
|
|
|
|
PAGECACHE_TAG_DIRTY, tofind, wdata->pages);
|
2014-06-19 19:11:00 +07:00
|
|
|
return wdata;
|
|
|
|
}
|
|
|
|
|
2014-06-19 18:01:03 +07:00
|
|
|
static unsigned int
|
|
|
|
wdata_prepare_pages(struct cifs_writedata *wdata, unsigned int found_pages,
|
|
|
|
struct address_space *mapping,
|
|
|
|
struct writeback_control *wbc,
|
|
|
|
pgoff_t end, pgoff_t *index, pgoff_t *next, bool *done)
|
|
|
|
{
|
|
|
|
unsigned int nr_pages = 0, i;
|
|
|
|
struct page *page;
|
|
|
|
|
|
|
|
for (i = 0; i < found_pages; i++) {
|
|
|
|
page = wdata->pages[i];
|
|
|
|
/*
|
2018-04-11 06:36:56 +07:00
|
|
|
* At this point we hold neither the i_pages lock nor the
|
|
|
|
* page lock: the page may be truncated or invalidated
|
|
|
|
* (changing page->mapping to NULL), or even swizzled
|
|
|
|
* back from swapper_space to tmpfs file mapping
|
2014-06-19 18:01:03 +07:00
|
|
|
*/
|
|
|
|
|
|
|
|
if (nr_pages == 0)
|
|
|
|
lock_page(page);
|
|
|
|
else if (!trylock_page(page))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (unlikely(page->mapping != mapping)) {
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wbc->range_cyclic && page->index > end) {
|
|
|
|
*done = true;
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (*next && (page->index != *next)) {
|
|
|
|
/* Not next consecutive page */
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wbc->sync_mode != WB_SYNC_NONE)
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
|
|
|
|
if (PageWriteback(page) ||
|
|
|
|
!clear_page_dirty_for_io(page)) {
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This actually clears the dirty bit in the radix tree.
|
|
|
|
* See cifs_writepage() for more commentary.
|
|
|
|
*/
|
|
|
|
set_page_writeback(page);
|
|
|
|
if (page_offset(page) >= i_size_read(mapping->host)) {
|
|
|
|
*done = true;
|
|
|
|
unlock_page(page);
|
|
|
|
end_page_writeback(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
wdata->pages[i] = page;
|
|
|
|
*next = page->index + 1;
|
|
|
|
++nr_pages;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* reset index to refind any pages skipped */
|
|
|
|
if (nr_pages == 0)
|
|
|
|
*index = wdata->pages[0]->index + 1;
|
|
|
|
|
|
|
|
/* put any pages we aren't going to use */
|
|
|
|
for (i = nr_pages; i < found_pages; i++) {
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(wdata->pages[i]);
|
2014-06-19 18:01:03 +07:00
|
|
|
wdata->pages[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return nr_pages;
|
|
|
|
}
|
|
|
|
|
2014-06-19 18:28:37 +07:00
|
|
|
static int
|
2019-01-29 03:09:02 +07:00
|
|
|
wdata_send_pages(struct cifs_writedata *wdata, unsigned int nr_pages,
|
|
|
|
struct address_space *mapping, struct writeback_control *wbc)
|
2014-06-19 18:28:37 +07:00
|
|
|
{
|
2019-01-29 02:57:00 +07:00
|
|
|
int rc;
|
2019-01-29 03:09:02 +07:00
|
|
|
struct TCP_Server_Info *server =
|
|
|
|
tlink_tcon(wdata->cfile->tlink)->ses->server;
|
2014-06-19 18:28:37 +07:00
|
|
|
|
|
|
|
wdata->sync_mode = wbc->sync_mode;
|
|
|
|
wdata->nr_pages = nr_pages;
|
|
|
|
wdata->offset = page_offset(wdata->pages[0]);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
wdata->pagesz = PAGE_SIZE;
|
2014-06-19 18:28:37 +07:00
|
|
|
wdata->tailsz = min(i_size_read(mapping->host) -
|
|
|
|
page_offset(wdata->pages[nr_pages - 1]),
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
(loff_t)PAGE_SIZE);
|
|
|
|
wdata->bytes = ((nr_pages - 1) * PAGE_SIZE) + wdata->tailsz;
|
2019-01-29 03:09:02 +07:00
|
|
|
wdata->pid = wdata->cfile->pid;
|
2014-06-19 18:28:37 +07:00
|
|
|
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = adjust_credits(server, &wdata->credits, wdata->bytes);
|
|
|
|
if (rc)
|
2019-01-29 02:57:00 +07:00
|
|
|
return rc;
|
2019-01-24 09:15:52 +07:00
|
|
|
|
2019-01-29 03:09:02 +07:00
|
|
|
if (wdata->cfile->invalidHandle)
|
|
|
|
rc = -EAGAIN;
|
|
|
|
else
|
|
|
|
rc = server->ops->async_writev(wdata, cifs_writedata_release);
|
2014-06-19 18:28:37 +07:00
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int cifs_writepages(struct address_space *mapping,
|
2005-10-06 04:50:29 +07:00
|
|
|
struct writeback_control *wbc)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2019-01-26 06:23:36 +07:00
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2014-06-05 22:03:27 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2011-05-20 03:22:57 +07:00
|
|
|
bool done = false, scanned = false, range_whole = false;
|
|
|
|
pgoff_t end, index;
|
|
|
|
struct cifs_writedata *wdata;
|
2019-01-26 06:23:36 +07:00
|
|
|
struct cifsFileInfo *cfile = NULL;
|
2005-10-06 04:50:29 +07:00
|
|
|
int rc = 0;
|
2019-01-09 02:15:28 +07:00
|
|
|
int saved_rc = 0;
|
2018-10-11 13:01:02 +07:00
|
|
|
unsigned int xid;
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2005-10-06 04:50:29 +07:00
|
|
|
/*
|
2011-05-20 03:22:57 +07:00
|
|
|
* If wsize is smaller than the page cache size, default to writing
|
2005-10-06 04:50:29 +07:00
|
|
|
* one page at a time via cifs_writepage
|
|
|
|
*/
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (cifs_sb->wsize < PAGE_SIZE)
|
2005-10-06 04:50:29 +07:00
|
|
|
return generic_writepages(mapping, wbc);
|
|
|
|
|
2018-10-11 13:01:02 +07:00
|
|
|
xid = get_xid();
|
[PATCH] writeback: fix range handling
When a writeback_control's `start' and `end' fields are used to
indicate a one-byte-range starting at file offset zero, the required
values of .start=0,.end=0 mean that the ->writepages() implementation
has no way of telling that it is being asked to perform a range
request. Because we're currently overloading (start == 0 && end == 0)
to mean "this is not a write-a-range request".
To make all this sane, the patch changes range of writeback_control.
So caller does: If it is calling ->writepages() to write pages, it
sets range (range_start/end or range_cyclic) always.
And if range_cyclic is true, ->writepages() thinks the range is
cyclic, otherwise it just uses range_start and range_end.
This patch does,
- Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h
-1 is usually ok for range_end (type is long long). But, if someone did,
range_end += val; range_end is "val - 1"
u64val = range_end >> bits; u64val is "~(0ULL)"
or something, they are wrong. So, this adds LLONG_MAX to avoid nasty
things, and uses LLONG_MAX for range_end.
- All callers of ->writepages() sets range_start/end or range_cyclic.
- Fix updates of ->writeback_index. It seems already bit strange.
If it starts at 0 and ended by check of nr_to_write, this last
index may reduce chance to scan end of file. So, this updates
->writeback_index only if range_cyclic is true or whole-file is
scanned.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 16:03:26 +07:00
|
|
|
if (wbc->range_cyclic) {
|
2005-10-06 04:50:29 +07:00
|
|
|
index = mapping->writeback_index; /* Start from prev offset */
|
[PATCH] writeback: fix range handling
When a writeback_control's `start' and `end' fields are used to
indicate a one-byte-range starting at file offset zero, the required
values of .start=0,.end=0 mean that the ->writepages() implementation
has no way of telling that it is being asked to perform a range
request. Because we're currently overloading (start == 0 && end == 0)
to mean "this is not a write-a-range request".
To make all this sane, the patch changes range of writeback_control.
So caller does: If it is calling ->writepages() to write pages, it
sets range (range_start/end or range_cyclic) always.
And if range_cyclic is true, ->writepages() thinks the range is
cyclic, otherwise it just uses range_start and range_end.
This patch does,
- Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h
-1 is usually ok for range_end (type is long long). But, if someone did,
range_end += val; range_end is "val - 1"
u64val = range_end >> bits; u64val is "~(0ULL)"
or something, they are wrong. So, this adds LLONG_MAX to avoid nasty
things, and uses LLONG_MAX for range_end.
- All callers of ->writepages() sets range_start/end or range_cyclic.
- Fix updates of ->writeback_index. It seems already bit strange.
If it starts at 0 and ended by check of nr_to_write, this last
index may reduce chance to scan end of file. So, this updates
->writeback_index only if range_cyclic is true or whole-file is
scanned.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 16:03:26 +07:00
|
|
|
end = -1;
|
|
|
|
} else {
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
index = wbc->range_start >> PAGE_SHIFT;
|
|
|
|
end = wbc->range_end >> PAGE_SHIFT;
|
[PATCH] writeback: fix range handling
When a writeback_control's `start' and `end' fields are used to
indicate a one-byte-range starting at file offset zero, the required
values of .start=0,.end=0 mean that the ->writepages() implementation
has no way of telling that it is being asked to perform a range
request. Because we're currently overloading (start == 0 && end == 0)
to mean "this is not a write-a-range request".
To make all this sane, the patch changes range of writeback_control.
So caller does: If it is calling ->writepages() to write pages, it
sets range (range_start/end or range_cyclic) always.
And if range_cyclic is true, ->writepages() thinks the range is
cyclic, otherwise it just uses range_start and range_end.
This patch does,
- Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h
-1 is usually ok for range_end (type is long long). But, if someone did,
range_end += val; range_end is "val - 1"
u64val = range_end >> bits; u64val is "~(0ULL)"
or something, they are wrong. So, this adds LLONG_MAX to avoid nasty
things, and uses LLONG_MAX for range_end.
- All callers of ->writepages() sets range_start/end or range_cyclic.
- Fix updates of ->writeback_index. It seems already bit strange.
If it starts at 0 and ended by check of nr_to_write, this last
index may reduce chance to scan end of file. So, this updates
->writeback_index only if range_cyclic is true or whole-file is
scanned.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 16:03:26 +07:00
|
|
|
if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
|
2011-05-20 03:22:57 +07:00
|
|
|
range_whole = true;
|
|
|
|
scanned = true;
|
2005-10-06 04:50:29 +07:00
|
|
|
}
|
2014-06-05 22:03:27 +07:00
|
|
|
server = cifs_sb_master_tcon(cifs_sb)->ses->server;
|
2005-10-06 04:50:29 +07:00
|
|
|
retry:
|
2011-05-20 03:22:57 +07:00
|
|
|
while (!done && index <= end) {
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int i, nr_pages, found_pages, wsize;
|
2014-06-19 19:15:16 +07:00
|
|
|
pgoff_t next = 0, tofind, saved_index = index;
|
2019-01-17 02:12:41 +07:00
|
|
|
struct cifs_credits credits_on_stack;
|
|
|
|
struct cifs_credits *credits = &credits_on_stack;
|
2019-01-30 03:15:11 +07:00
|
|
|
int get_file_rc = 0;
|
2011-05-20 03:22:57 +07:00
|
|
|
|
2019-01-26 06:23:36 +07:00
|
|
|
if (cfile)
|
|
|
|
cifsFileInfo_put(cfile);
|
|
|
|
|
cifs: fix rename() by ensuring source handle opened with DELETE bit
To rename a file in SMB2 we open it with the DELETE access and do a
special SetInfo on it. If the handle is missing the DELETE bit the
server will fail the SetInfo with STATUS_ACCESS_DENIED.
We currently try to reuse any existing opened handle we have with
cifs_get_writable_path(). That function looks for handles with WRITE
access but doesn't check for DELETE, making rename() fail if it finds
a handle to reuse. Simple reproducer below.
To select handles with the DELETE bit, this patch adds a flag argument
to cifs_get_writable_path() and find_writable_file() and the existing
'bool fsuid_only' argument is converted to a flag.
The cifsFileInfo struct only stores the UNIX open mode but not the
original SMB access flags. Since the DELETE bit is not mapped in that
mode, this patch stores the access mask in cifs_fid on file open,
which is accessible from cifsFileInfo.
Simple reproducer:
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#define E(s) perror(s), exit(1)
int main(int argc, char *argv[])
{
int fd, ret;
if (argc != 3) {
fprintf(stderr, "Usage: %s A B\n"
"create&open A in write mode, "
"rename A to B, close A\n", argv[0]);
return 0;
}
fd = openat(AT_FDCWD, argv[1], O_WRONLY|O_CREAT|O_SYNC, 0666);
if (fd == -1) E("openat()");
ret = rename(argv[1], argv[2]);
if (ret) E("rename()");
ret = close(fd);
if (ret) E("close()");
return ret;
}
$ gcc -o bugrename bugrename.c
$ ./bugrename /mnt/a /mnt/b
rename(): Permission denied
Fixes: 8de9e86c67ba ("cifs: create a helper to find a writeable handle by path name")
CC: Stable <stable@vger.kernel.org>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
2020-02-21 17:19:06 +07:00
|
|
|
rc = cifs_get_writable_file(CIFS_I(inode), FIND_WR_ANY, &cfile);
|
2019-01-30 03:15:11 +07:00
|
|
|
|
|
|
|
/* in case of an error store it to return later */
|
|
|
|
if (rc)
|
|
|
|
get_file_rc = rc;
|
2019-01-26 06:23:36 +07:00
|
|
|
|
2014-06-05 22:03:27 +07:00
|
|
|
rc = server->ops->wait_mtu_credits(server, cifs_sb->wsize,
|
2019-01-17 02:12:41 +07:00
|
|
|
&wsize, credits);
|
2019-01-09 02:15:28 +07:00
|
|
|
if (rc != 0) {
|
|
|
|
done = true;
|
2014-06-05 22:03:27 +07:00
|
|
|
break;
|
2019-01-09 02:15:28 +07:00
|
|
|
}
|
2011-05-20 03:22:57 +07:00
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
tofind = min((wsize / PAGE_SIZE) - 1, end - index) + 1;
|
2011-05-20 03:22:57 +07:00
|
|
|
|
2014-06-19 19:11:00 +07:00
|
|
|
wdata = wdata_alloc_and_fillpages(tofind, mapping, end, &index,
|
|
|
|
&found_pages);
|
2011-05-20 03:22:57 +07:00
|
|
|
if (!wdata) {
|
|
|
|
rc = -ENOMEM;
|
2019-01-09 02:15:28 +07:00
|
|
|
done = true;
|
2014-06-05 22:03:27 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2011-05-20 03:22:57 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (found_pages == 0) {
|
|
|
|
kref_put(&wdata->refcount, cifs_writedata_release);
|
2014-06-05 22:03:27 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2011-05-20 03:22:57 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-19 18:01:03 +07:00
|
|
|
nr_pages = wdata_prepare_pages(wdata, found_pages, mapping, wbc,
|
|
|
|
end, &index, &next, &done);
|
2005-10-06 04:50:29 +07:00
|
|
|
|
2011-05-20 03:22:57 +07:00
|
|
|
/* nothing to write? */
|
|
|
|
if (nr_pages == 0) {
|
|
|
|
kref_put(&wdata->refcount, cifs_writedata_release);
|
2014-06-05 22:03:27 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2011-05-20 03:22:57 +07:00
|
|
|
continue;
|
2005-10-06 04:50:29 +07:00
|
|
|
}
|
2009-04-04 00:44:00 +07:00
|
|
|
|
2019-01-17 02:12:41 +07:00
|
|
|
wdata->credits = credits_on_stack;
|
2019-01-26 06:23:36 +07:00
|
|
|
wdata->cfile = cfile;
|
|
|
|
cfile = NULL;
|
2011-01-11 19:24:01 +07:00
|
|
|
|
2019-01-29 03:09:02 +07:00
|
|
|
if (!wdata->cfile) {
|
2019-01-30 03:15:11 +07:00
|
|
|
cifs_dbg(VFS, "No writable handle in writepages rc=%d\n",
|
|
|
|
get_file_rc);
|
|
|
|
if (is_retryable_error(get_file_rc))
|
|
|
|
rc = get_file_rc;
|
|
|
|
else
|
|
|
|
rc = -EBADF;
|
2019-01-29 03:09:02 +07:00
|
|
|
} else
|
|
|
|
rc = wdata_send_pages(wdata, nr_pages, mapping, wbc);
|
2010-09-23 06:17:40 +07:00
|
|
|
|
2019-01-29 02:57:00 +07:00
|
|
|
for (i = 0; i < nr_pages; ++i)
|
|
|
|
unlock_page(wdata->pages[i]);
|
|
|
|
|
2011-05-20 03:22:57 +07:00
|
|
|
/* send failure -- clean up the mess */
|
|
|
|
if (rc != 0) {
|
2019-01-17 02:12:41 +07:00
|
|
|
add_credits_and_wake_if(server, &wdata->credits, 0);
|
2011-05-20 03:22:57 +07:00
|
|
|
for (i = 0; i < nr_pages; ++i) {
|
2019-01-09 02:15:28 +07:00
|
|
|
if (is_retryable_error(rc))
|
2011-05-20 03:22:57 +07:00
|
|
|
redirty_page_for_writepage(wbc,
|
|
|
|
wdata->pages[i]);
|
|
|
|
else
|
|
|
|
SetPageError(wdata->pages[i]);
|
|
|
|
end_page_writeback(wdata->pages[i]);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(wdata->pages[i]);
|
2005-10-06 04:50:29 +07:00
|
|
|
}
|
2019-01-09 02:15:28 +07:00
|
|
|
if (!is_retryable_error(rc))
|
2011-01-11 19:24:01 +07:00
|
|
|
mapping_set_error(mapping, rc);
|
2011-05-20 03:22:57 +07:00
|
|
|
}
|
|
|
|
kref_put(&wdata->refcount, cifs_writedata_release);
|
2011-01-11 19:24:01 +07:00
|
|
|
|
2014-06-19 19:15:16 +07:00
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN) {
|
|
|
|
index = saved_index;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2019-01-09 02:15:28 +07:00
|
|
|
/* Return immediately if we received a signal during writing */
|
|
|
|
if (is_interrupt_error(rc)) {
|
|
|
|
done = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rc != 0 && saved_rc == 0)
|
|
|
|
saved_rc = rc;
|
|
|
|
|
2011-05-20 03:22:57 +07:00
|
|
|
wbc->nr_to_write -= nr_pages;
|
|
|
|
if (wbc->nr_to_write <= 0)
|
|
|
|
done = true;
|
2008-11-18 10:49:05 +07:00
|
|
|
|
2011-05-20 03:22:57 +07:00
|
|
|
index = next;
|
2005-10-06 04:50:29 +07:00
|
|
|
}
|
2011-05-20 03:22:57 +07:00
|
|
|
|
2005-10-06 04:50:29 +07:00
|
|
|
if (!scanned && !done) {
|
|
|
|
/*
|
|
|
|
* We hit the last page and there is more work to be done: wrap
|
|
|
|
* back to the start of the file
|
|
|
|
*/
|
2011-05-20 03:22:57 +07:00
|
|
|
scanned = true;
|
2005-10-06 04:50:29 +07:00
|
|
|
index = 0;
|
|
|
|
goto retry;
|
|
|
|
}
|
2011-05-20 03:22:57 +07:00
|
|
|
|
2019-01-09 02:15:28 +07:00
|
|
|
if (saved_rc != 0)
|
|
|
|
rc = saved_rc;
|
|
|
|
|
[PATCH] writeback: fix range handling
When a writeback_control's `start' and `end' fields are used to
indicate a one-byte-range starting at file offset zero, the required
values of .start=0,.end=0 mean that the ->writepages() implementation
has no way of telling that it is being asked to perform a range
request. Because we're currently overloading (start == 0 && end == 0)
to mean "this is not a write-a-range request".
To make all this sane, the patch changes range of writeback_control.
So caller does: If it is calling ->writepages() to write pages, it
sets range (range_start/end or range_cyclic) always.
And if range_cyclic is true, ->writepages() thinks the range is
cyclic, otherwise it just uses range_start and range_end.
This patch does,
- Add LLONG_MAX, LLONG_MIN, ULLONG_MAX to include/linux/kernel.h
-1 is usually ok for range_end (type is long long). But, if someone did,
range_end += val; range_end is "val - 1"
u64val = range_end >> bits; u64val is "~(0ULL)"
or something, they are wrong. So, this adds LLONG_MAX to avoid nasty
things, and uses LLONG_MAX for range_end.
- All callers of ->writepages() sets range_start/end or range_cyclic.
- Fix updates of ->writeback_index. It seems already bit strange.
If it starts at 0 and ended by check of nr_to_write, this last
index may reduce chance to scan end of file. So, this updates
->writeback_index only if range_cyclic is true or whole-file is
scanned.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Cc: Nathan Scott <nathans@sgi.com>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Steven French <sfrench@us.ibm.com>
Cc: "Vladimir V. Saveliev" <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-06-23 16:03:26 +07:00
|
|
|
if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
|
2005-10-06 04:50:29 +07:00
|
|
|
mapping->writeback_index = index;
|
|
|
|
|
2019-01-26 06:23:36 +07:00
|
|
|
if (cfile)
|
|
|
|
cifsFileInfo_put(cfile);
|
2018-10-11 13:01:02 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-04-08 08:29:10 +07:00
|
|
|
static int
|
|
|
|
cifs_writepage_locked(struct page *page, struct writeback_control *wbc)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2011-04-08 08:29:10 +07:00
|
|
|
int rc;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
/* BB add check for wbc flags */
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
get_page(page);
|
2008-02-08 06:25:02 +07:00
|
|
|
if (!PageUptodate(page))
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "ppw - page not up to date\n");
|
2006-12-24 07:19:07 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the "writeback" flag, and clear "dirty" in the radix tree.
|
|
|
|
*
|
|
|
|
* A writepage() implementation always needs to do either this,
|
|
|
|
* or re-dirty the page with "redirty_page_for_writepage()" in
|
|
|
|
* the case of a failure.
|
|
|
|
*
|
|
|
|
* Just unlocking the page will cause the radix tree tag-bits
|
|
|
|
* to fail to update with the state of the page correctly.
|
|
|
|
*/
|
2007-07-10 08:16:18 +07:00
|
|
|
set_page_writeback(page);
|
2011-04-08 08:29:10 +07:00
|
|
|
retry_write:
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
rc = cifs_partialpagewrite(page, 0, PAGE_SIZE);
|
2019-01-09 02:15:28 +07:00
|
|
|
if (is_retryable_error(rc)) {
|
|
|
|
if (wbc->sync_mode == WB_SYNC_ALL && rc == -EAGAIN)
|
2017-05-25 17:59:52 +07:00
|
|
|
goto retry_write;
|
2011-04-08 08:29:10 +07:00
|
|
|
redirty_page_for_writepage(wbc, page);
|
2017-05-25 17:59:52 +07:00
|
|
|
} else if (rc != 0) {
|
2011-04-08 08:29:10 +07:00
|
|
|
SetPageError(page);
|
2017-05-25 17:59:52 +07:00
|
|
|
mapping_set_error(page->mapping, rc);
|
|
|
|
} else {
|
2011-04-08 08:29:10 +07:00
|
|
|
SetPageUptodate(page);
|
2017-05-25 17:59:52 +07:00
|
|
|
}
|
2006-12-24 07:19:07 +07:00
|
|
|
end_page_writeback(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-04-08 08:29:10 +07:00
|
|
|
static int cifs_writepage(struct page *page, struct writeback_control *wbc)
|
|
|
|
{
|
|
|
|
int rc = cifs_writepage_locked(page, wbc);
|
|
|
|
unlock_page(page);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2008-09-24 22:32:59 +07:00
|
|
|
static int cifs_write_end(struct file *file, struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2008-09-24 22:32:59 +07:00
|
|
|
int rc;
|
|
|
|
struct inode *inode = mapping->host;
|
2011-05-26 13:02:00 +07:00
|
|
|
struct cifsFileInfo *cfile = file->private_data;
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(cfile->dentry->d_sb);
|
|
|
|
__u32 pid;
|
|
|
|
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
|
|
|
|
pid = cfile->pid;
|
|
|
|
else
|
|
|
|
pid = current->tgid;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "write_end for page %p from pos %lld with %d bytes\n",
|
2010-04-21 10:50:45 +07:00
|
|
|
page, pos, copied);
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2008-11-27 02:32:33 +07:00
|
|
|
if (PageChecked(page)) {
|
|
|
|
if (copied == len)
|
|
|
|
SetPageUptodate(page);
|
|
|
|
ClearPageChecked(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
} else if (!PageUptodate(page) && copied == PAGE_SIZE)
|
2008-09-24 22:32:59 +07:00
|
|
|
SetPageUptodate(page);
|
2008-02-08 06:25:02 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (!PageUptodate(page)) {
|
2008-09-24 22:32:59 +07:00
|
|
|
char *page_data;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
unsigned offset = pos & (PAGE_SIZE - 1);
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
/* this is probably better than directly calling
|
|
|
|
partialpage_write since in this function the file handle is
|
|
|
|
known which we might as well leverage */
|
|
|
|
/* BB check if anything else missing out of ppw
|
|
|
|
such as updating last write time */
|
|
|
|
page_data = kmap(page);
|
2011-05-26 13:02:00 +07:00
|
|
|
rc = cifs_write(cfile, pid, page_data + offset, copied, &pos);
|
2008-09-24 22:32:59 +07:00
|
|
|
/* if (rc < 0) should we set writebehind rc? */
|
2005-04-17 05:20:36 +07:00
|
|
|
kunmap(page);
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2007-07-10 08:16:18 +07:00
|
|
|
} else {
|
2008-09-24 22:32:59 +07:00
|
|
|
rc = copied;
|
|
|
|
pos += copied;
|
2012-12-21 18:05:47 +07:00
|
|
|
set_page_dirty(page);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-09-24 22:32:59 +07:00
|
|
|
if (rc > 0) {
|
|
|
|
spin_lock(&inode->i_lock);
|
|
|
|
if (pos > inode->i_size)
|
|
|
|
i_size_write(inode, pos);
|
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-07-17 07:44:56 +07:00
|
|
|
int cifs_strict_fsync(struct file *file, loff_t start, loff_t end,
|
|
|
|
int datasync)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2005-04-17 05:20:36 +07:00
|
|
|
int rc = 0;
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2012-09-19 06:20:27 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2010-07-13 03:50:14 +07:00
|
|
|
struct cifsFileInfo *smbfile = file->private_data;
|
2013-01-24 05:07:38 +07:00
|
|
|
struct inode *inode = file_inode(file);
|
2010-12-12 17:11:13 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2017-07-08 02:20:52 +07:00
|
|
|
rc = file_write_and_wait_range(file, start, end);
|
2020-02-07 05:04:59 +07:00
|
|
|
if (rc) {
|
|
|
|
trace_cifs_fsync_err(inode->i_ino, rc);
|
2011-07-17 07:44:56 +07:00
|
|
|
return rc;
|
2020-02-07 05:04:59 +07:00
|
|
|
}
|
2011-07-17 07:44:56 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2014-08-20 07:25:34 +07:00
|
|
|
cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
|
|
|
|
file, datasync);
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2013-09-05 16:01:06 +07:00
|
|
|
if (!CIFS_CACHE_READ(CIFS_I(inode))) {
|
2014-04-30 20:31:47 +07:00
|
|
|
rc = cifs_zap_mapping(inode);
|
2011-04-07 21:18:11 +07:00
|
|
|
if (rc) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "rc: %d during invalidate phase\n", rc);
|
2011-04-07 21:18:11 +07:00
|
|
|
rc = 0; /* don't care about it in fsync */
|
|
|
|
}
|
|
|
|
}
|
2010-10-23 01:52:29 +07:00
|
|
|
|
2010-12-12 17:11:13 +07:00
|
|
|
tcon = tlink_tcon(smbfile->tlink);
|
2012-09-19 06:20:27 +07:00
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {
|
|
|
|
server = tcon->ses->server;
|
|
|
|
if (server->ops->flush)
|
|
|
|
rc = server->ops->flush(xid, tcon, &smbfile->fid);
|
|
|
|
else
|
|
|
|
rc = -ENOSYS;
|
|
|
|
}
|
2010-12-12 17:11:13 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-12-12 17:11:13 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-07-17 07:44:56 +07:00
|
|
|
int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
|
2010-12-12 17:11:13 +07:00
|
|
|
{
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2010-12-12 17:11:13 +07:00
|
|
|
int rc = 0;
|
2011-05-27 11:34:02 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2012-09-19 06:20:27 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2010-12-12 17:11:13 +07:00
|
|
|
struct cifsFileInfo *smbfile = file->private_data;
|
2014-10-22 11:25:12 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
|
2011-07-17 07:44:56 +07:00
|
|
|
|
2017-07-08 02:20:52 +07:00
|
|
|
rc = file_write_and_wait_range(file, start, end);
|
2020-02-06 07:22:37 +07:00
|
|
|
if (rc) {
|
|
|
|
trace_cifs_fsync_err(file_inode(file)->i_ino, rc);
|
2011-07-17 07:44:56 +07:00
|
|
|
return rc;
|
2020-02-06 07:22:37 +07:00
|
|
|
}
|
2010-12-12 17:11:13 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2010-12-12 17:11:13 +07:00
|
|
|
|
2014-08-20 07:25:34 +07:00
|
|
|
cifs_dbg(FYI, "Sync file - name: %pD datasync: 0x%x\n",
|
|
|
|
file, datasync);
|
2010-12-12 17:11:13 +07:00
|
|
|
|
|
|
|
tcon = tlink_tcon(smbfile->tlink);
|
2012-09-19 06:20:27 +07:00
|
|
|
if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOSSYNC)) {
|
|
|
|
server = tcon->ses->server;
|
|
|
|
if (server->ops->flush)
|
|
|
|
rc = server->ops->flush(xid, tcon, &smbfile->fid);
|
|
|
|
else
|
|
|
|
rc = -ENOSYS;
|
|
|
|
}
|
2009-02-22 04:17:43 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* As file closes, flush all cached write data for this inode checking
|
|
|
|
* for write behind errors.
|
|
|
|
*/
|
2006-06-23 16:05:12 +07:00
|
|
|
int cifs_flush(struct file *file, fl_owner_t id)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2013-01-24 05:07:38 +07:00
|
|
|
struct inode *inode = file_inode(file);
|
2005-04-17 05:20:36 +07:00
|
|
|
int rc = 0;
|
|
|
|
|
2010-10-23 01:52:29 +07:00
|
|
|
if (file->f_mode & FMODE_WRITE)
|
2010-10-16 02:34:07 +07:00
|
|
|
rc = filemap_write_and_wait(inode->i_mapping);
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Flush inode %p file %p rc %d\n", inode, file, rc);
|
2020-02-06 07:22:37 +07:00
|
|
|
if (rc)
|
|
|
|
trace_cifs_flush_err(inode->i_ino, rc);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2011-01-25 02:16:35 +07:00
|
|
|
static int
|
|
|
|
cifs_write_allocate_pages(struct page **pages, unsigned long num_pages)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
unsigned long i;
|
|
|
|
|
|
|
|
for (i = 0; i < num_pages; i++) {
|
2012-03-24 01:40:56 +07:00
|
|
|
pages[i] = alloc_page(GFP_KERNEL|__GFP_HIGHMEM);
|
2011-01-25 02:16:35 +07:00
|
|
|
if (!pages[i]) {
|
|
|
|
/*
|
|
|
|
* save number of pages we have already allocated and
|
|
|
|
* return with ENOMEM error
|
|
|
|
*/
|
|
|
|
num_pages = i;
|
|
|
|
rc = -ENOMEM;
|
2012-03-24 01:40:56 +07:00
|
|
|
break;
|
2011-01-25 02:16:35 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-24 01:40:56 +07:00
|
|
|
if (rc) {
|
|
|
|
for (i = 0; i < num_pages; i++)
|
|
|
|
put_page(pages[i]);
|
|
|
|
}
|
2011-01-25 02:16:35 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
size_t get_numpages(const size_t wsize, const size_t len, size_t *cur_len)
|
|
|
|
{
|
|
|
|
size_t num_pages;
|
|
|
|
size_t clen;
|
|
|
|
|
|
|
|
clen = min_t(const size_t, len, wsize);
|
2012-03-24 01:40:56 +07:00
|
|
|
num_pages = DIV_ROUND_UP(clen, PAGE_SIZE);
|
2011-01-25 02:16:35 +07:00
|
|
|
|
|
|
|
if (cur_len)
|
|
|
|
*cur_len = clen;
|
|
|
|
|
|
|
|
return num_pages;
|
|
|
|
}
|
|
|
|
|
2012-03-24 01:40:56 +07:00
|
|
|
static void
|
2014-02-08 09:45:12 +07:00
|
|
|
cifs_uncached_writedata_release(struct kref *refcount)
|
2012-03-24 01:40:56 +07:00
|
|
|
{
|
|
|
|
int i;
|
2014-02-08 09:45:12 +07:00
|
|
|
struct cifs_writedata *wdata = container_of(refcount,
|
|
|
|
struct cifs_writedata, refcount);
|
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
kref_put(&wdata->ctx->refcount, cifs_aio_ctx_release);
|
2014-02-08 09:45:12 +07:00
|
|
|
for (i = 0; i < wdata->nr_pages; i++)
|
|
|
|
put_page(wdata->pages[i]);
|
|
|
|
cifs_writedata_release(refcount);
|
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
static void collect_uncached_write_data(struct cifs_aio_ctx *ctx);
|
|
|
|
|
2014-02-08 09:45:12 +07:00
|
|
|
static void
|
|
|
|
cifs_uncached_writev_complete(struct work_struct *work)
|
|
|
|
{
|
2012-03-24 01:40:56 +07:00
|
|
|
struct cifs_writedata *wdata = container_of(work,
|
|
|
|
struct cifs_writedata, work);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(wdata->cfile->dentry);
|
2012-03-24 01:40:56 +07:00
|
|
|
struct cifsInodeInfo *cifsi = CIFS_I(inode);
|
|
|
|
|
|
|
|
spin_lock(&inode->i_lock);
|
|
|
|
cifs_update_eof(cifsi, wdata->offset, wdata->bytes);
|
|
|
|
if (cifsi->server_eof > inode->i_size)
|
|
|
|
i_size_write(inode, cifsi->server_eof);
|
|
|
|
spin_unlock(&inode->i_lock);
|
|
|
|
|
|
|
|
complete(&wdata->done);
|
2017-04-26 01:52:31 +07:00
|
|
|
collect_uncached_write_data(wdata->ctx);
|
|
|
|
/* the below call can possibly free the last ref to aio ctx */
|
2014-02-08 09:45:12 +07:00
|
|
|
kref_put(&wdata->refcount, cifs_uncached_writedata_release);
|
2012-03-24 01:40:56 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2014-06-20 18:48:40 +07:00
|
|
|
wdata_fill_from_iovec(struct cifs_writedata *wdata, struct iov_iter *from,
|
|
|
|
size_t *len, unsigned long *num_pages)
|
2012-03-24 01:40:56 +07:00
|
|
|
{
|
2014-06-20 18:48:40 +07:00
|
|
|
size_t save_len, copied, bytes, cur_len = *len;
|
|
|
|
unsigned long i, nr_pages = *num_pages;
|
2012-09-19 06:20:29 +07:00
|
|
|
|
2014-06-20 18:48:40 +07:00
|
|
|
save_len = cur_len;
|
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
bytes = min_t(const size_t, cur_len, PAGE_SIZE);
|
|
|
|
copied = copy_page_from_iter(wdata->pages[i], 0, bytes, from);
|
|
|
|
cur_len -= copied;
|
|
|
|
/*
|
|
|
|
* If we didn't copy as much as we expected, then that
|
|
|
|
* may mean we trod into an unmapped area. Stop copying
|
|
|
|
* at that point. On the next pass through the big
|
|
|
|
* loop, we'll likely end up getting a zero-length
|
|
|
|
* write and bailing out of it.
|
|
|
|
*/
|
|
|
|
if (copied < bytes)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
cur_len = save_len - cur_len;
|
|
|
|
*len = cur_len;
|
2012-03-24 01:40:56 +07:00
|
|
|
|
2014-06-20 18:48:40 +07:00
|
|
|
/*
|
|
|
|
* If we have no data to send, then that probably means that
|
|
|
|
* the copy above failed altogether. That's most likely because
|
|
|
|
* the address in the iovec was bogus. Return -EFAULT and let
|
|
|
|
* the caller free anything we allocated and bail out.
|
|
|
|
*/
|
|
|
|
if (!cur_len)
|
|
|
|
return -EFAULT;
|
2012-03-24 01:40:56 +07:00
|
|
|
|
2014-06-20 18:48:40 +07:00
|
|
|
/*
|
|
|
|
* i + 1 now represents the number of pages we actually used in
|
|
|
|
* the copy phase above.
|
|
|
|
*/
|
|
|
|
*num_pages = i + 1;
|
|
|
|
return 0;
|
2012-03-24 01:40:56 +07:00
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
static int
|
|
|
|
cifs_resend_wdata(struct cifs_writedata *wdata, struct list_head *wdata_list,
|
|
|
|
struct cifs_aio_ctx *ctx)
|
|
|
|
{
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int wsize;
|
|
|
|
struct cifs_credits credits;
|
2018-11-01 05:13:10 +07:00
|
|
|
int rc;
|
|
|
|
struct TCP_Server_Info *server =
|
|
|
|
tlink_tcon(wdata->cfile->tlink)->ses->server;
|
|
|
|
|
|
|
|
do {
|
2019-03-15 14:54:59 +07:00
|
|
|
if (wdata->cfile->invalidHandle) {
|
|
|
|
rc = cifs_reopen_file(wdata->cfile, false);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
continue;
|
|
|
|
else if (rc)
|
|
|
|
break;
|
|
|
|
}
|
2018-11-01 05:13:10 +07:00
|
|
|
|
|
|
|
|
2019-03-15 14:54:59 +07:00
|
|
|
/*
|
|
|
|
* Wait for credits to resend this wdata.
|
|
|
|
* Note: we are attempting to resend the whole wdata not in
|
|
|
|
* segments
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
rc = server->ops->wait_mtu_credits(server, wdata->bytes,
|
|
|
|
&wsize, &credits);
|
|
|
|
if (rc)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (wsize < wdata->bytes) {
|
|
|
|
add_credits_and_wake_if(server, &credits, 0);
|
|
|
|
msleep(1000);
|
|
|
|
}
|
|
|
|
} while (wsize < wdata->bytes);
|
|
|
|
wdata->credits = credits;
|
2018-11-01 05:13:10 +07:00
|
|
|
|
2019-03-15 14:54:59 +07:00
|
|
|
rc = adjust_credits(server, &wdata->credits, wdata->bytes);
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
if (wdata->cfile->invalidHandle)
|
|
|
|
rc = -EAGAIN;
|
2019-10-16 05:54:50 +07:00
|
|
|
else {
|
|
|
|
#ifdef CONFIG_CIFS_SMB_DIRECT
|
|
|
|
if (wdata->mr) {
|
|
|
|
wdata->mr->need_invalidate = true;
|
|
|
|
smbd_deregister_mr(wdata->mr);
|
|
|
|
wdata->mr = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2019-03-15 14:54:59 +07:00
|
|
|
rc = server->ops->async_writev(wdata,
|
2018-11-01 05:13:10 +07:00
|
|
|
cifs_uncached_writedata_release);
|
2019-10-16 05:54:50 +07:00
|
|
|
}
|
2019-03-15 14:54:59 +07:00
|
|
|
}
|
2018-11-01 05:13:10 +07:00
|
|
|
|
2019-03-15 14:54:59 +07:00
|
|
|
/* If the write was successfully sent, we are done */
|
|
|
|
if (!rc) {
|
|
|
|
list_add_tail(&wdata->list, wdata_list);
|
|
|
|
return 0;
|
|
|
|
}
|
2018-11-01 05:13:10 +07:00
|
|
|
|
2019-03-15 14:54:59 +07:00
|
|
|
/* Roll back credits and retry if needed */
|
|
|
|
add_credits_and_wake_if(server, &wdata->credits, 0);
|
|
|
|
} while (rc == -EAGAIN);
|
2018-11-01 05:13:10 +07:00
|
|
|
|
2019-03-15 14:54:59 +07:00
|
|
|
fail:
|
|
|
|
kref_put(&wdata->refcount, cifs_uncached_writedata_release);
|
2018-11-01 05:13:10 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2014-06-20 19:10:52 +07:00
|
|
|
static int
|
|
|
|
cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from,
|
|
|
|
struct cifsFileInfo *open_file,
|
2017-04-26 01:52:31 +07:00
|
|
|
struct cifs_sb_info *cifs_sb, struct list_head *wdata_list,
|
|
|
|
struct cifs_aio_ctx *ctx)
|
2011-01-25 02:16:35 +07:00
|
|
|
{
|
2014-06-20 19:10:52 +07:00
|
|
|
int rc = 0;
|
|
|
|
size_t cur_len;
|
2014-06-20 18:48:40 +07:00
|
|
|
unsigned long nr_pages, num_pages, i;
|
2014-06-20 19:10:52 +07:00
|
|
|
struct cifs_writedata *wdata;
|
2016-09-22 05:18:23 +07:00
|
|
|
struct iov_iter saved_from = *from;
|
2014-06-20 19:30:46 +07:00
|
|
|
loff_t saved_offset = offset;
|
2012-03-24 01:40:56 +07:00
|
|
|
pid_t pid;
|
2014-06-20 19:30:46 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2018-11-01 05:13:10 +07:00
|
|
|
struct page **pagevec;
|
|
|
|
size_t start;
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int xid;
|
2011-05-26 13:02:00 +07:00
|
|
|
|
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
|
|
|
|
pid = open_file->pid;
|
|
|
|
else
|
|
|
|
pid = current->tgid;
|
|
|
|
|
2014-06-20 19:30:46 +07:00
|
|
|
server = tlink_tcon(open_file->tlink)->ses->server;
|
2019-01-17 02:12:41 +07:00
|
|
|
xid = get_xid();
|
2014-06-20 19:30:46 +07:00
|
|
|
|
2011-01-25 02:16:35 +07:00
|
|
|
do {
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int wsize;
|
|
|
|
struct cifs_credits credits_on_stack;
|
|
|
|
struct cifs_credits *credits = &credits_on_stack;
|
2014-06-05 22:03:27 +07:00
|
|
|
|
2019-01-26 02:59:01 +07:00
|
|
|
if (open_file->invalidHandle) {
|
|
|
|
rc = cifs_reopen_file(open_file, false);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
continue;
|
|
|
|
else if (rc)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-05 22:03:27 +07:00
|
|
|
rc = server->ops->wait_mtu_credits(server, cifs_sb->wsize,
|
2019-01-17 02:12:41 +07:00
|
|
|
&wsize, credits);
|
2014-06-05 22:03:27 +07:00
|
|
|
if (rc)
|
|
|
|
break;
|
2012-03-24 01:40:56 +07:00
|
|
|
|
2018-12-17 06:17:04 +07:00
|
|
|
cur_len = min_t(const size_t, len, wsize);
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
if (ctx->direct_io) {
|
2018-11-01 22:54:32 +07:00
|
|
|
ssize_t result;
|
|
|
|
|
|
|
|
result = iov_iter_get_pages_alloc(
|
2018-12-17 06:17:04 +07:00
|
|
|
from, &pagevec, cur_len, &start);
|
2018-11-01 22:54:32 +07:00
|
|
|
if (result < 0) {
|
2018-11-01 05:13:10 +07:00
|
|
|
cifs_dbg(VFS,
|
|
|
|
"direct_writev couldn't get user pages "
|
|
|
|
"(rc=%zd) iter type %d iov_offset %zd "
|
|
|
|
"count %zd\n",
|
2019-11-21 15:13:58 +07:00
|
|
|
result, iov_iter_type(from),
|
2018-11-01 05:13:10 +07:00
|
|
|
from->iov_offset, from->count);
|
|
|
|
dump_stack();
|
2018-12-17 05:41:07 +07:00
|
|
|
|
|
|
|
rc = result;
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2018-11-01 05:13:10 +07:00
|
|
|
break;
|
|
|
|
}
|
2018-11-01 22:54:32 +07:00
|
|
|
cur_len = (size_t)result;
|
2018-11-01 05:13:10 +07:00
|
|
|
iov_iter_advance(from, cur_len);
|
|
|
|
|
|
|
|
nr_pages =
|
|
|
|
(cur_len + start + PAGE_SIZE - 1) / PAGE_SIZE;
|
|
|
|
|
|
|
|
wdata = cifs_writedata_direct_alloc(pagevec,
|
2012-03-24 01:40:56 +07:00
|
|
|
cifs_uncached_writev_complete);
|
2018-11-01 05:13:10 +07:00
|
|
|
if (!wdata) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
break;
|
|
|
|
}
|
2012-03-24 01:40:56 +07:00
|
|
|
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
wdata->page_offset = start;
|
|
|
|
wdata->tailsz =
|
|
|
|
nr_pages > 1 ?
|
|
|
|
cur_len - (PAGE_SIZE - start) -
|
|
|
|
(nr_pages - 2) * PAGE_SIZE :
|
|
|
|
cur_len;
|
|
|
|
} else {
|
|
|
|
nr_pages = get_numpages(wsize, len, &cur_len);
|
|
|
|
wdata = cifs_writedata_alloc(nr_pages,
|
|
|
|
cifs_uncached_writev_complete);
|
|
|
|
if (!wdata) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
break;
|
|
|
|
}
|
2014-02-14 19:20:35 +07:00
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
rc = cifs_write_allocate_pages(wdata->pages, nr_pages);
|
|
|
|
if (rc) {
|
2019-01-24 08:12:09 +07:00
|
|
|
kvfree(wdata->pages);
|
2018-11-01 05:13:10 +07:00
|
|
|
kfree(wdata);
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
num_pages = nr_pages;
|
|
|
|
rc = wdata_fill_from_iovec(
|
|
|
|
wdata, from, &cur_len, &num_pages);
|
|
|
|
if (rc) {
|
|
|
|
for (i = 0; i < nr_pages; i++)
|
|
|
|
put_page(wdata->pages[i]);
|
2019-01-24 08:12:09 +07:00
|
|
|
kvfree(wdata->pages);
|
2018-11-01 05:13:10 +07:00
|
|
|
kfree(wdata);
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Bring nr_pages down to the number of pages we
|
|
|
|
* actually used, and free any pages that we didn't use.
|
|
|
|
*/
|
|
|
|
for ( ; nr_pages > num_pages; nr_pages--)
|
|
|
|
put_page(wdata->pages[nr_pages - 1]);
|
|
|
|
|
|
|
|
wdata->tailsz = cur_len - ((nr_pages - 1) * PAGE_SIZE);
|
|
|
|
}
|
2014-02-14 19:20:35 +07:00
|
|
|
|
2012-03-24 01:40:56 +07:00
|
|
|
wdata->sync_mode = WB_SYNC_ALL;
|
|
|
|
wdata->nr_pages = nr_pages;
|
|
|
|
wdata->offset = (__u64)offset;
|
|
|
|
wdata->cfile = cifsFileInfo_get(open_file);
|
|
|
|
wdata->pid = pid;
|
|
|
|
wdata->bytes = cur_len;
|
2012-09-19 06:20:35 +07:00
|
|
|
wdata->pagesz = PAGE_SIZE;
|
2019-01-17 02:12:41 +07:00
|
|
|
wdata->credits = credits_on_stack;
|
2017-04-26 01:52:31 +07:00
|
|
|
wdata->ctx = ctx;
|
|
|
|
kref_get(&ctx->refcount);
|
2014-06-20 19:30:46 +07:00
|
|
|
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = adjust_credits(server, &wdata->credits, wdata->bytes);
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
if (wdata->cfile->invalidHandle)
|
2019-01-26 02:59:01 +07:00
|
|
|
rc = -EAGAIN;
|
|
|
|
else
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = server->ops->async_writev(wdata,
|
2014-06-20 19:30:46 +07:00
|
|
|
cifs_uncached_writedata_release);
|
2019-01-24 09:15:52 +07:00
|
|
|
}
|
|
|
|
|
2012-03-24 01:40:56 +07:00
|
|
|
if (rc) {
|
2019-01-17 02:12:41 +07:00
|
|
|
add_credits_and_wake_if(server, &wdata->credits, 0);
|
2014-02-08 09:45:12 +07:00
|
|
|
kref_put(&wdata->refcount,
|
|
|
|
cifs_uncached_writedata_release);
|
2014-06-20 19:30:46 +07:00
|
|
|
if (rc == -EAGAIN) {
|
2016-09-22 05:18:23 +07:00
|
|
|
*from = saved_from;
|
2014-06-20 19:30:46 +07:00
|
|
|
iov_iter_advance(from, offset - saved_offset);
|
|
|
|
continue;
|
|
|
|
}
|
2011-01-25 02:16:35 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-20 19:10:52 +07:00
|
|
|
list_add_tail(&wdata->list, wdata_list);
|
2012-03-24 01:40:56 +07:00
|
|
|
offset += cur_len;
|
|
|
|
len -= cur_len;
|
2011-01-25 02:16:35 +07:00
|
|
|
} while (len > 0);
|
|
|
|
|
2019-01-17 02:12:41 +07:00
|
|
|
free_xid(xid);
|
2014-06-20 19:10:52 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
static void collect_uncached_write_data(struct cifs_aio_ctx *ctx)
|
2014-06-20 19:10:52 +07:00
|
|
|
{
|
2017-04-26 01:52:31 +07:00
|
|
|
struct cifs_writedata *wdata, *tmp;
|
2014-06-20 19:10:52 +07:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct cifs_sb_info *cifs_sb;
|
2017-04-26 01:52:31 +07:00
|
|
|
struct dentry *dentry = ctx->cfile->dentry;
|
2014-06-20 19:10:52 +07:00
|
|
|
int rc;
|
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
tcon = tlink_tcon(ctx->cfile->tlink);
|
|
|
|
cifs_sb = CIFS_SB(dentry->d_sb);
|
2014-06-20 19:10:52 +07:00
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
mutex_lock(&ctx->aio_mutex);
|
2014-06-20 19:10:52 +07:00
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
if (list_empty(&ctx->list)) {
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
return;
|
|
|
|
}
|
2012-03-24 01:40:56 +07:00
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
rc = ctx->rc;
|
2012-03-24 01:40:56 +07:00
|
|
|
/*
|
|
|
|
* Wait for and collect replies for any successful sends in order of
|
2017-04-26 01:52:31 +07:00
|
|
|
* increasing offset. Once an error is hit, then return without waiting
|
|
|
|
* for any more replies.
|
2012-03-24 01:40:56 +07:00
|
|
|
*/
|
|
|
|
restart_loop:
|
2017-04-26 01:52:31 +07:00
|
|
|
list_for_each_entry_safe(wdata, tmp, &ctx->list, list) {
|
2012-03-24 01:40:56 +07:00
|
|
|
if (!rc) {
|
2017-04-26 01:52:31 +07:00
|
|
|
if (!try_wait_for_completion(&wdata->done)) {
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wdata->result)
|
2012-03-24 01:40:56 +07:00
|
|
|
rc = wdata->result;
|
|
|
|
else
|
2017-04-26 01:52:31 +07:00
|
|
|
ctx->total_len += wdata->bytes;
|
2012-03-24 01:40:56 +07:00
|
|
|
|
|
|
|
/* resend call if it's a retryable error */
|
|
|
|
if (rc == -EAGAIN) {
|
2014-06-20 19:30:46 +07:00
|
|
|
struct list_head tmp_list;
|
2017-04-26 01:52:31 +07:00
|
|
|
struct iov_iter tmp_from = ctx->iter;
|
2014-06-20 19:30:46 +07:00
|
|
|
|
|
|
|
INIT_LIST_HEAD(&tmp_list);
|
|
|
|
list_del_init(&wdata->list);
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
if (ctx->direct_io)
|
|
|
|
rc = cifs_resend_wdata(
|
|
|
|
wdata, &tmp_list, ctx);
|
|
|
|
else {
|
|
|
|
iov_iter_advance(&tmp_from,
|
2017-04-26 01:52:31 +07:00
|
|
|
wdata->offset - ctx->pos);
|
2014-06-20 19:30:46 +07:00
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
rc = cifs_write_from_iter(wdata->offset,
|
2014-06-20 19:30:46 +07:00
|
|
|
wdata->bytes, &tmp_from,
|
2017-04-26 01:52:31 +07:00
|
|
|
ctx->cfile, cifs_sb, &tmp_list,
|
|
|
|
ctx);
|
2019-03-15 14:54:59 +07:00
|
|
|
|
|
|
|
kref_put(&wdata->refcount,
|
|
|
|
cifs_uncached_writedata_release);
|
2018-11-01 05:13:10 +07:00
|
|
|
}
|
2014-06-20 19:30:46 +07:00
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
list_splice(&tmp_list, &ctx->list);
|
2012-03-24 01:40:56 +07:00
|
|
|
goto restart_loop;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
list_del_init(&wdata->list);
|
2014-02-08 09:45:12 +07:00
|
|
|
kref_put(&wdata->refcount, cifs_uncached_writedata_release);
|
2011-01-25 02:16:35 +07:00
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:31 +07:00
|
|
|
cifs_stats_bytes_written(tcon, ctx->total_len);
|
|
|
|
set_bit(CIFS_INO_INVALID_MAPPING, &CIFS_I(dentry->d_inode)->flags);
|
|
|
|
|
|
|
|
ctx->rc = (rc == 0) ? ctx->total_len : rc;
|
|
|
|
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
if (ctx->iocb && ctx->iocb->ki_complete)
|
|
|
|
ctx->iocb->ki_complete(ctx->iocb, ctx->rc, 0);
|
|
|
|
else
|
|
|
|
complete(&ctx->done);
|
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
static ssize_t __cifs_writev(
|
|
|
|
struct kiocb *iocb, struct iov_iter *from, bool direct)
|
2017-04-26 01:52:31 +07:00
|
|
|
{
|
|
|
|
struct file *file = iocb->ki_filp;
|
|
|
|
ssize_t total_written = 0;
|
|
|
|
struct cifsFileInfo *cfile;
|
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
struct cifs_sb_info *cifs_sb;
|
|
|
|
struct cifs_aio_ctx *ctx;
|
|
|
|
struct iov_iter saved_from = *from;
|
2018-11-01 05:13:10 +07:00
|
|
|
size_t len = iov_iter_count(from);
|
2017-04-26 01:52:31 +07:00
|
|
|
int rc;
|
|
|
|
|
|
|
|
/*
|
2018-11-01 05:13:10 +07:00
|
|
|
* iov_iter_get_pages_alloc doesn't work with ITER_KVEC.
|
|
|
|
* In this case, fall back to non-direct write function.
|
|
|
|
* this could be improved by getting pages directly in ITER_KVEC
|
2017-04-26 01:52:31 +07:00
|
|
|
*/
|
2019-11-21 15:13:58 +07:00
|
|
|
if (direct && iov_iter_is_kvec(from)) {
|
2018-11-01 05:13:10 +07:00
|
|
|
cifs_dbg(FYI, "use non-direct cifs_writev for kvec I/O\n");
|
|
|
|
direct = false;
|
|
|
|
}
|
2017-04-26 01:52:31 +07:00
|
|
|
|
|
|
|
rc = generic_write_checks(iocb, from);
|
|
|
|
if (rc <= 0)
|
|
|
|
return rc;
|
|
|
|
|
|
|
|
cifs_sb = CIFS_FILE_SB(file);
|
|
|
|
cfile = file->private_data;
|
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
|
|
|
|
if (!tcon->ses->server->ops->async_writev)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
ctx = cifs_aio_ctx_alloc();
|
|
|
|
if (!ctx)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ctx->cfile = cifsFileInfo_get(cfile);
|
|
|
|
|
|
|
|
if (!is_sync_kiocb(iocb))
|
|
|
|
ctx->iocb = iocb;
|
|
|
|
|
|
|
|
ctx->pos = iocb->ki_pos;
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
if (direct) {
|
|
|
|
ctx->direct_io = true;
|
|
|
|
ctx->iter = *from;
|
|
|
|
ctx->len = len;
|
|
|
|
} else {
|
|
|
|
rc = setup_aio_ctx_iter(ctx, from, WRITE);
|
|
|
|
if (rc) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return rc;
|
|
|
|
}
|
2017-04-26 01:52:31 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* grab a lock here due to read response handlers can access ctx */
|
|
|
|
mutex_lock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
rc = cifs_write_from_iter(iocb->ki_pos, ctx->len, &saved_from,
|
|
|
|
cfile, cifs_sb, &ctx->list, ctx);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If at least one write was successfully sent, then discard any rc
|
|
|
|
* value from the later writes. If the other write succeeds, then
|
|
|
|
* we'll end up returning whatever was written. If it fails, then
|
|
|
|
* we'll get a new rc value from that.
|
|
|
|
*/
|
|
|
|
if (!list_empty(&ctx->list))
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
if (rc) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_sync_kiocb(iocb)) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return -EIOCBQUEUED;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = wait_for_completion_killable(&ctx->done);
|
|
|
|
if (rc) {
|
|
|
|
mutex_lock(&ctx->aio_mutex);
|
|
|
|
ctx->rc = rc = -EINTR;
|
|
|
|
total_written = ctx->total_len;
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
} else {
|
|
|
|
rc = ctx->rc;
|
|
|
|
total_written = ctx->total_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
|
2015-04-07 09:44:11 +07:00
|
|
|
if (unlikely(!total_written))
|
|
|
|
return rc;
|
2011-01-25 02:16:35 +07:00
|
|
|
|
2015-04-07 09:44:11 +07:00
|
|
|
iocb->ki_pos += total_written;
|
|
|
|
return total_written;
|
2011-01-25 02:16:35 +07:00
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:10 +07:00
|
|
|
ssize_t cifs_direct_writev(struct kiocb *iocb, struct iov_iter *from)
|
|
|
|
{
|
|
|
|
return __cifs_writev(iocb, from, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from)
|
|
|
|
{
|
|
|
|
return __cifs_writev(iocb, from, false);
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
static ssize_t
|
2014-04-03 23:05:17 +07:00
|
|
|
cifs_writev(struct kiocb *iocb, struct iov_iter *from)
|
2011-01-25 02:16:35 +07:00
|
|
|
{
|
2012-09-19 20:22:44 +07:00
|
|
|
struct file *file = iocb->ki_filp;
|
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *)file->private_data;
|
|
|
|
struct inode *inode = file->f_mapping->host;
|
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(inode);
|
|
|
|
struct TCP_Server_Info *server = tlink_tcon(cfile->tlink)->ses->server;
|
2015-04-07 22:28:12 +07:00
|
|
|
ssize_t rc;
|
2011-01-25 02:16:35 +07:00
|
|
|
|
CIFS: fix circular locking dependency
When a CIFS filesystem is mounted with the forcemand option and the
following command is run on it, lockdep warns about a circular locking
dependency between CifsInodeInfo::lock_sem and the inode lock.
while echo foo > hello; do :; done & while touch -c hello; do :; done
cifs_writev() takes the locks in the wrong order, but note that we can't
only flip the order around because it releases the inode lock before the
call to generic_write_sync() while it holds the lock_sem across that
call.
But, AFAICS, there is no need to hold the CifsInodeInfo::lock_sem across
the generic_write_sync() call either, so we can release both the locks
before generic_write_sync(), and change the order.
======================================================
WARNING: possible circular locking dependency detected
4.12.0-rc7+ #9 Not tainted
------------------------------------------------------
touch/487 is trying to acquire lock:
(&cifsi->lock_sem){++++..}, at: cifsFileInfo_put+0x88f/0x16a0
but task is already holding lock:
(&sb->s_type->i_mutex_key#11){+.+.+.}, at: utimes_common+0x3ad/0x870
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#11){+.+.+.}:
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifs_strict_writev+0x3cb/0x8c0
__vfs_write+0x4c1/0x930
vfs_write+0x14c/0x2d0
SyS_write+0xf7/0x240
entry_SYSCALL_64_fastpath+0x1f/0xbe
-> #0 (&cifsi->lock_sem){++++..}:
check_prevs_add+0xfa0/0x1d10
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifsFileInfo_put+0x88f/0x16a0
cifs_setattr+0x992/0x1680
notify_change+0x61a/0xa80
utimes_common+0x3d4/0x870
do_utimes+0x1c1/0x220
SyS_utimensat+0x84/0x1a0
entry_SYSCALL_64_fastpath+0x1f/0xbe
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&sb->s_type->i_mutex_key#11);
lock(&cifsi->lock_sem);
lock(&sb->s_type->i_mutex_key#11);
lock(&cifsi->lock_sem);
*** DEADLOCK ***
2 locks held by touch/487:
#0: (sb_writers#10){.+.+.+}, at: mnt_want_write+0x41/0xb0
#1: (&sb->s_type->i_mutex_key#11){+.+.+.}, at: utimes_common+0x3ad/0x870
stack backtrace:
CPU: 0 PID: 487 Comm: touch Not tainted 4.12.0-rc7+ #9
Call Trace:
dump_stack+0xdb/0x185
print_circular_bug+0x45b/0x790
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifsFileInfo_put+0x88f/0x16a0
cifs_setattr+0x992/0x1680
notify_change+0x61a/0xa80
utimes_common+0x3d4/0x870
do_utimes+0x1c1/0x220
SyS_utimensat+0x84/0x1a0
entry_SYSCALL_64_fastpath+0x1f/0xbe
Fixes: 19dfc1f5f2ef03a52 ("cifs: fix the race in cifs_writev()")
Signed-off-by: Rabin Vincent <rabinv@axis.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
2017-06-29 21:01:42 +07:00
|
|
|
inode_lock(inode);
|
2012-09-19 20:22:44 +07:00
|
|
|
/*
|
|
|
|
* We need to hold the sem to be sure nobody modifies lock list
|
|
|
|
* with a brlock that prevents writing.
|
|
|
|
*/
|
|
|
|
down_read(&cinode->lock_sem);
|
2015-04-07 22:28:12 +07:00
|
|
|
|
2015-04-09 23:55:47 +07:00
|
|
|
rc = generic_write_checks(iocb, from);
|
|
|
|
if (rc <= 0)
|
2015-04-07 22:28:12 +07:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(from),
|
2018-10-04 06:24:38 +07:00
|
|
|
server->vals->exclusive_lock_type, 0,
|
|
|
|
NULL, CIFS_WRITE_OP))
|
2014-04-03 23:05:17 +07:00
|
|
|
rc = __generic_file_write_iter(iocb, from);
|
2015-04-07 22:28:12 +07:00
|
|
|
else
|
|
|
|
rc = -EACCES;
|
|
|
|
out:
|
CIFS: fix circular locking dependency
When a CIFS filesystem is mounted with the forcemand option and the
following command is run on it, lockdep warns about a circular locking
dependency between CifsInodeInfo::lock_sem and the inode lock.
while echo foo > hello; do :; done & while touch -c hello; do :; done
cifs_writev() takes the locks in the wrong order, but note that we can't
only flip the order around because it releases the inode lock before the
call to generic_write_sync() while it holds the lock_sem across that
call.
But, AFAICS, there is no need to hold the CifsInodeInfo::lock_sem across
the generic_write_sync() call either, so we can release both the locks
before generic_write_sync(), and change the order.
======================================================
WARNING: possible circular locking dependency detected
4.12.0-rc7+ #9 Not tainted
------------------------------------------------------
touch/487 is trying to acquire lock:
(&cifsi->lock_sem){++++..}, at: cifsFileInfo_put+0x88f/0x16a0
but task is already holding lock:
(&sb->s_type->i_mutex_key#11){+.+.+.}, at: utimes_common+0x3ad/0x870
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&sb->s_type->i_mutex_key#11){+.+.+.}:
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifs_strict_writev+0x3cb/0x8c0
__vfs_write+0x4c1/0x930
vfs_write+0x14c/0x2d0
SyS_write+0xf7/0x240
entry_SYSCALL_64_fastpath+0x1f/0xbe
-> #0 (&cifsi->lock_sem){++++..}:
check_prevs_add+0xfa0/0x1d10
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifsFileInfo_put+0x88f/0x16a0
cifs_setattr+0x992/0x1680
notify_change+0x61a/0xa80
utimes_common+0x3d4/0x870
do_utimes+0x1c1/0x220
SyS_utimensat+0x84/0x1a0
entry_SYSCALL_64_fastpath+0x1f/0xbe
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&sb->s_type->i_mutex_key#11);
lock(&cifsi->lock_sem);
lock(&sb->s_type->i_mutex_key#11);
lock(&cifsi->lock_sem);
*** DEADLOCK ***
2 locks held by touch/487:
#0: (sb_writers#10){.+.+.+}, at: mnt_want_write+0x41/0xb0
#1: (&sb->s_type->i_mutex_key#11){+.+.+.}, at: utimes_common+0x3ad/0x870
stack backtrace:
CPU: 0 PID: 487 Comm: touch Not tainted 4.12.0-rc7+ #9
Call Trace:
dump_stack+0xdb/0x185
print_circular_bug+0x45b/0x790
__lock_acquire+0x1f74/0x38f0
lock_acquire+0x1cc/0x600
down_write+0x74/0x110
cifsFileInfo_put+0x88f/0x16a0
cifs_setattr+0x992/0x1680
notify_change+0x61a/0xa80
utimes_common+0x3d4/0x870
do_utimes+0x1c1/0x220
SyS_utimensat+0x84/0x1a0
entry_SYSCALL_64_fastpath+0x1f/0xbe
Fixes: 19dfc1f5f2ef03a52 ("cifs: fix the race in cifs_writev()")
Signed-off-by: Rabin Vincent <rabinv@axis.com>
Signed-off-by: Steve French <smfrench@gmail.com>
Acked-by: Pavel Shilovsky <pshilov@microsoft.com>
2017-06-29 21:01:42 +07:00
|
|
|
up_read(&cinode->lock_sem);
|
2016-01-23 03:40:57 +07:00
|
|
|
inode_unlock(inode);
|
2014-04-03 21:27:17 +07:00
|
|
|
|
2016-04-07 22:52:01 +07:00
|
|
|
if (rc > 0)
|
|
|
|
rc = generic_write_sync(iocb, rc);
|
2012-09-19 20:22:44 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t
|
2014-04-03 23:05:17 +07:00
|
|
|
cifs_strict_writev(struct kiocb *iocb, struct iov_iter *from)
|
2012-09-19 20:22:44 +07:00
|
|
|
{
|
2013-01-24 05:07:38 +07:00
|
|
|
struct inode *inode = file_inode(iocb->ki_filp);
|
2012-09-19 20:22:44 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(inode);
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *)
|
|
|
|
iocb->ki_filp->private_data;
|
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2012-12-21 18:07:52 +07:00
|
|
|
ssize_t written;
|
2012-12-21 18:05:47 +07:00
|
|
|
|
2014-03-11 23:11:47 +07:00
|
|
|
written = cifs_get_writer(cinode);
|
|
|
|
if (written)
|
|
|
|
return written;
|
|
|
|
|
2013-09-05 16:01:06 +07:00
|
|
|
if (CIFS_CACHE_WRITE(cinode)) {
|
2012-12-21 18:07:52 +07:00
|
|
|
if (cap_unix(tcon->ses) &&
|
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability))
|
2014-03-11 23:11:47 +07:00
|
|
|
&& ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0)) {
|
2014-04-03 23:05:17 +07:00
|
|
|
written = generic_file_write_iter(iocb, from);
|
2014-03-11 23:11:47 +07:00
|
|
|
goto out;
|
|
|
|
}
|
2014-04-03 23:05:17 +07:00
|
|
|
written = cifs_writev(iocb, from);
|
2014-03-11 23:11:47 +07:00
|
|
|
goto out;
|
2012-09-19 20:22:45 +07:00
|
|
|
}
|
|
|
|
/*
|
2012-12-21 18:05:47 +07:00
|
|
|
* For non-oplocked files in strict cache mode we need to write the data
|
|
|
|
* to the server exactly from the pos to pos+len-1 rather than flush all
|
|
|
|
* affected pages because it may cause a error with mandatory locks on
|
|
|
|
* these pages but not on the region from pos to ppos+len-1.
|
2011-01-25 02:16:35 +07:00
|
|
|
*/
|
2014-04-03 23:05:17 +07:00
|
|
|
written = cifs_user_writev(iocb, from);
|
2019-03-05 08:48:01 +07:00
|
|
|
if (CIFS_CACHE_READ(cinode)) {
|
2012-12-21 18:07:52 +07:00
|
|
|
/*
|
2019-03-05 08:48:01 +07:00
|
|
|
* We have read level caching and we have just sent a write
|
|
|
|
* request to the server thus making data in the cache stale.
|
|
|
|
* Zap the cache and set oplock/lease level to NONE to avoid
|
|
|
|
* reading stale data from the cache. All subsequent read
|
|
|
|
* operations will read new data from the server.
|
2012-12-21 18:07:52 +07:00
|
|
|
*/
|
2014-04-30 20:31:47 +07:00
|
|
|
cifs_zap_mapping(inode);
|
2019-03-05 08:48:01 +07:00
|
|
|
cifs_dbg(FYI, "Set Oplock/Lease to NONE for inode=%p after write\n",
|
2013-05-05 10:12:25 +07:00
|
|
|
inode);
|
2013-09-05 16:01:06 +07:00
|
|
|
cinode->oplock = 0;
|
2012-12-21 18:07:52 +07:00
|
|
|
}
|
2014-03-11 23:11:47 +07:00
|
|
|
out:
|
|
|
|
cifs_put_writer(cinode);
|
2012-12-21 18:07:52 +07:00
|
|
|
return written;
|
2011-01-25 02:16:35 +07:00
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
static struct cifs_readdata *
|
2018-05-31 02:47:54 +07:00
|
|
|
cifs_readdata_direct_alloc(struct page **pages, work_func_t complete)
|
2012-05-16 18:13:16 +07:00
|
|
|
{
|
|
|
|
struct cifs_readdata *rdata;
|
2012-09-19 06:20:36 +07:00
|
|
|
|
2018-05-31 02:47:54 +07:00
|
|
|
rdata = kzalloc(sizeof(*rdata), GFP_KERNEL);
|
2012-05-16 18:13:16 +07:00
|
|
|
if (rdata != NULL) {
|
2018-05-31 02:47:54 +07:00
|
|
|
rdata->pages = pages;
|
2012-05-16 18:13:17 +07:00
|
|
|
kref_init(&rdata->refcount);
|
2012-05-16 18:13:17 +07:00
|
|
|
INIT_LIST_HEAD(&rdata->list);
|
|
|
|
init_completion(&rdata->done);
|
2012-05-16 18:13:16 +07:00
|
|
|
INIT_WORK(&rdata->work, complete);
|
|
|
|
}
|
2012-09-19 06:20:36 +07:00
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
return rdata;
|
|
|
|
}
|
|
|
|
|
2018-05-31 02:47:54 +07:00
|
|
|
static struct cifs_readdata *
|
|
|
|
cifs_readdata_alloc(unsigned int nr_pages, work_func_t complete)
|
|
|
|
{
|
|
|
|
struct page **pages =
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:03:40 +07:00
|
|
|
kcalloc(nr_pages, sizeof(struct page *), GFP_KERNEL);
|
2018-05-31 02:47:54 +07:00
|
|
|
struct cifs_readdata *ret = NULL;
|
|
|
|
|
|
|
|
if (pages) {
|
|
|
|
ret = cifs_readdata_direct_alloc(pages, complete);
|
|
|
|
if (!ret)
|
|
|
|
kfree(pages);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
void
|
|
|
|
cifs_readdata_release(struct kref *refcount)
|
2012-05-16 18:13:16 +07:00
|
|
|
{
|
2012-05-16 18:13:17 +07:00
|
|
|
struct cifs_readdata *rdata = container_of(refcount,
|
|
|
|
struct cifs_readdata, refcount);
|
2017-11-23 07:38:47 +07:00
|
|
|
#ifdef CONFIG_CIFS_SMB_DIRECT
|
|
|
|
if (rdata->mr) {
|
|
|
|
smbd_deregister_mr(rdata->mr);
|
|
|
|
rdata->mr = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2012-05-16 18:13:17 +07:00
|
|
|
if (rdata->cfile)
|
|
|
|
cifsFileInfo_put(rdata->cfile);
|
|
|
|
|
2018-05-31 02:47:54 +07:00
|
|
|
kvfree(rdata->pages);
|
2012-05-16 18:13:16 +07:00
|
|
|
kfree(rdata);
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
static int
|
2012-09-19 20:22:30 +07:00
|
|
|
cifs_read_allocate_pages(struct cifs_readdata *rdata, unsigned int nr_pages)
|
2012-05-16 18:13:17 +07:00
|
|
|
{
|
|
|
|
int rc = 0;
|
2012-09-19 20:22:30 +07:00
|
|
|
struct page *page;
|
2012-05-16 18:13:17 +07:00
|
|
|
unsigned int i;
|
|
|
|
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < nr_pages; i++) {
|
2012-05-16 18:13:17 +07:00
|
|
|
page = alloc_page(GFP_KERNEL|__GFP_HIGHMEM);
|
|
|
|
if (!page) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->pages[i] = page;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (rc) {
|
2019-05-28 14:38:14 +07:00
|
|
|
unsigned int nr_page_failed = i;
|
|
|
|
|
|
|
|
for (i = 0; i < nr_page_failed; i++) {
|
2012-09-19 20:22:30 +07:00
|
|
|
put_page(rdata->pages[i]);
|
|
|
|
rdata->pages[i] = NULL;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
cifs_uncached_readdata_release(struct kref *refcount)
|
|
|
|
{
|
|
|
|
struct cifs_readdata *rdata = container_of(refcount,
|
|
|
|
struct cifs_readdata, refcount);
|
2012-09-19 20:22:30 +07:00
|
|
|
unsigned int i;
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
kref_put(&rdata->ctx->refcount, cifs_aio_ctx_release);
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < rdata->nr_pages; i++) {
|
|
|
|
put_page(rdata->pages[i]);
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
cifs_readdata_release(refcount);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* cifs_readdata_to_iov - copy data from pages in response to an iovec
|
|
|
|
* @rdata: the readdata response with list of pages holding data
|
2014-02-05 02:07:43 +07:00
|
|
|
* @iter: destination for our data
|
2012-05-16 18:13:17 +07:00
|
|
|
*
|
|
|
|
* This function copies data from a list of pages in a readdata response into
|
|
|
|
* an array of iovecs. It will first calculate where the data should go
|
|
|
|
* based on the info in the readdata and then copy the data into that spot.
|
|
|
|
*/
|
2014-02-05 02:07:43 +07:00
|
|
|
static int
|
|
|
|
cifs_readdata_to_iov(struct cifs_readdata *rdata, struct iov_iter *iter)
|
2012-05-16 18:13:17 +07:00
|
|
|
{
|
2014-07-10 13:03:29 +07:00
|
|
|
size_t remaining = rdata->got_bytes;
|
2012-09-19 20:22:30 +07:00
|
|
|
unsigned int i;
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < rdata->nr_pages; i++) {
|
|
|
|
struct page *page = rdata->pages[i];
|
2014-04-14 01:46:21 +07:00
|
|
|
size_t copy = min_t(size_t, remaining, PAGE_SIZE);
|
2017-01-20 04:53:15 +07:00
|
|
|
size_t written;
|
|
|
|
|
2018-10-22 19:07:28 +07:00
|
|
|
if (unlikely(iov_iter_is_pipe(iter))) {
|
2017-01-20 04:53:15 +07:00
|
|
|
void *addr = kmap_atomic(page);
|
|
|
|
|
|
|
|
written = copy_to_iter(addr, copy, iter);
|
|
|
|
kunmap_atomic(addr);
|
|
|
|
} else
|
|
|
|
written = copy_page_to_iter(page, 0, copy, iter);
|
2014-02-05 02:07:43 +07:00
|
|
|
remaining -= written;
|
|
|
|
if (written < copy && iov_iter_count(iter) > 0)
|
|
|
|
break;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
2014-02-05 02:07:43 +07:00
|
|
|
return remaining ? -EFAULT : 0;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
static void collect_uncached_read_data(struct cifs_aio_ctx *ctx);
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
static void
|
|
|
|
cifs_uncached_readv_complete(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct cifs_readdata *rdata = container_of(work,
|
|
|
|
struct cifs_readdata, work);
|
|
|
|
|
|
|
|
complete(&rdata->done);
|
2017-04-26 01:52:30 +07:00
|
|
|
collect_uncached_read_data(rdata->ctx);
|
|
|
|
/* the below call can possibly free the last ref to aio ctx */
|
2012-05-16 18:13:17 +07:00
|
|
|
kref_put(&rdata->refcount, cifs_uncached_readdata_release);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2016-11-18 07:20:18 +07:00
|
|
|
uncached_fill_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata, struct iov_iter *iter,
|
|
|
|
unsigned int len)
|
2012-05-16 18:13:17 +07:00
|
|
|
{
|
2014-07-10 13:16:25 +07:00
|
|
|
int result = 0;
|
2012-09-19 20:22:30 +07:00
|
|
|
unsigned int i;
|
|
|
|
unsigned int nr_pages = rdata->nr_pages;
|
2018-05-31 02:47:55 +07:00
|
|
|
unsigned int page_offset = rdata->page_offset;
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
rdata->got_bytes = 0;
|
2012-09-19 20:22:32 +07:00
|
|
|
rdata->tailsz = PAGE_SIZE;
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = rdata->pages[i];
|
2016-01-10 07:54:50 +07:00
|
|
|
size_t n;
|
2018-05-31 02:47:55 +07:00
|
|
|
unsigned int segment_size = rdata->pagesz;
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
segment_size -= page_offset;
|
|
|
|
else
|
|
|
|
page_offset = 0;
|
|
|
|
|
2012-09-19 20:22:30 +07:00
|
|
|
|
2016-01-10 07:54:50 +07:00
|
|
|
if (len <= 0) {
|
2012-05-16 18:13:17 +07:00
|
|
|
/* no need to hold page hostage */
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->pages[i] = NULL;
|
|
|
|
rdata->nr_pages--;
|
2012-05-16 18:13:17 +07:00
|
|
|
put_page(page);
|
2012-09-19 20:22:32 +07:00
|
|
|
continue;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
2018-05-31 02:47:55 +07:00
|
|
|
|
2016-01-10 07:54:50 +07:00
|
|
|
n = len;
|
2018-05-31 02:47:55 +07:00
|
|
|
if (len >= segment_size)
|
2016-01-10 07:54:50 +07:00
|
|
|
/* enough data to fill the page */
|
2018-05-31 02:47:55 +07:00
|
|
|
n = segment_size;
|
|
|
|
else
|
2016-01-10 07:54:50 +07:00
|
|
|
rdata->tailsz = len;
|
2018-05-31 02:47:55 +07:00
|
|
|
len -= n;
|
|
|
|
|
2016-11-18 07:20:18 +07:00
|
|
|
if (iter)
|
2018-05-31 02:47:55 +07:00
|
|
|
result = copy_page_from_iter(
|
|
|
|
page, page_offset, n, iter);
|
2017-11-23 07:38:47 +07:00
|
|
|
#ifdef CONFIG_CIFS_SMB_DIRECT
|
|
|
|
else if (rdata->mr)
|
|
|
|
result = n;
|
|
|
|
#endif
|
2016-11-18 07:20:18 +07:00
|
|
|
else
|
2018-05-31 02:47:55 +07:00
|
|
|
result = cifs_read_page_from_socket(
|
|
|
|
server, page, page_offset, n);
|
2012-09-19 20:22:32 +07:00
|
|
|
if (result < 0)
|
|
|
|
break;
|
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
rdata->got_bytes += result;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
return rdata->got_bytes > 0 && result != -ECONNABORTED ?
|
|
|
|
rdata->got_bytes : result;
|
2012-05-16 18:13:17 +07:00
|
|
|
}
|
|
|
|
|
2016-11-18 07:20:18 +07:00
|
|
|
static int
|
|
|
|
cifs_uncached_read_into_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata, unsigned int len)
|
|
|
|
{
|
|
|
|
return uncached_fill_pages(server, rdata, NULL, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
cifs_uncached_copy_into_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata,
|
|
|
|
struct iov_iter *iter)
|
|
|
|
{
|
|
|
|
return uncached_fill_pages(server, rdata, iter, iter->count);
|
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
static int cifs_resend_rdata(struct cifs_readdata *rdata,
|
|
|
|
struct list_head *rdata_list,
|
|
|
|
struct cifs_aio_ctx *ctx)
|
|
|
|
{
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int rsize;
|
|
|
|
struct cifs_credits credits;
|
2018-11-01 05:13:09 +07:00
|
|
|
int rc;
|
|
|
|
struct TCP_Server_Info *server =
|
|
|
|
tlink_tcon(rdata->cfile->tlink)->ses->server;
|
|
|
|
|
|
|
|
do {
|
2019-03-15 14:55:00 +07:00
|
|
|
if (rdata->cfile->invalidHandle) {
|
|
|
|
rc = cifs_reopen_file(rdata->cfile, true);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
continue;
|
|
|
|
else if (rc)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Wait for credits to resend this rdata.
|
|
|
|
* Note: we are attempting to resend the whole rdata not in
|
|
|
|
* segments
|
|
|
|
*/
|
|
|
|
do {
|
|
|
|
rc = server->ops->wait_mtu_credits(server, rdata->bytes,
|
2018-11-01 05:13:09 +07:00
|
|
|
&rsize, &credits);
|
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
if (rc)
|
|
|
|
goto fail;
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
if (rsize < rdata->bytes) {
|
|
|
|
add_credits_and_wake_if(server, &credits, 0);
|
|
|
|
msleep(1000);
|
|
|
|
}
|
|
|
|
} while (rsize < rdata->bytes);
|
|
|
|
rdata->credits = credits;
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
rc = adjust_credits(server, &rdata->credits, rdata->bytes);
|
|
|
|
if (!rc) {
|
|
|
|
if (rdata->cfile->invalidHandle)
|
|
|
|
rc = -EAGAIN;
|
2019-10-16 05:54:50 +07:00
|
|
|
else {
|
|
|
|
#ifdef CONFIG_CIFS_SMB_DIRECT
|
|
|
|
if (rdata->mr) {
|
|
|
|
rdata->mr->need_invalidate = true;
|
|
|
|
smbd_deregister_mr(rdata->mr);
|
|
|
|
rdata->mr = NULL;
|
|
|
|
}
|
|
|
|
#endif
|
2019-03-15 14:55:00 +07:00
|
|
|
rc = server->ops->async_readv(rdata);
|
2019-10-16 05:54:50 +07:00
|
|
|
}
|
2019-03-15 14:55:00 +07:00
|
|
|
}
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
/* If the read was successfully sent, we are done */
|
|
|
|
if (!rc) {
|
|
|
|
/* Add to aio pending list */
|
|
|
|
list_add_tail(&rdata->list, rdata_list);
|
|
|
|
return 0;
|
|
|
|
}
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
/* Roll back credits and retry if needed */
|
|
|
|
add_credits_and_wake_if(server, &rdata->credits, 0);
|
|
|
|
} while (rc == -EAGAIN);
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2019-03-15 14:55:00 +07:00
|
|
|
fail:
|
|
|
|
kref_put(&rdata->refcount, cifs_uncached_readdata_release);
|
2018-11-01 05:13:09 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2014-06-25 13:42:28 +07:00
|
|
|
static int
|
|
|
|
cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file,
|
2017-04-26 01:52:30 +07:00
|
|
|
struct cifs_sb_info *cifs_sb, struct list_head *rdata_list,
|
|
|
|
struct cifs_aio_ctx *ctx)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2014-06-25 13:42:28 +07:00
|
|
|
struct cifs_readdata *rdata;
|
2019-01-17 02:12:41 +07:00
|
|
|
unsigned int npages, rsize;
|
|
|
|
struct cifs_credits credits_on_stack;
|
|
|
|
struct cifs_credits *credits = &credits_on_stack;
|
2014-06-25 13:42:28 +07:00
|
|
|
size_t cur_len;
|
|
|
|
int rc;
|
2012-05-16 18:13:17 +07:00
|
|
|
pid_t pid;
|
2014-06-25 13:45:07 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2018-11-01 05:13:09 +07:00
|
|
|
struct page **pagevec;
|
|
|
|
size_t start;
|
|
|
|
struct iov_iter direct_iov = ctx->iter;
|
2010-12-14 15:50:41 +07:00
|
|
|
|
2014-06-25 13:45:07 +07:00
|
|
|
server = tlink_tcon(open_file->tlink)->ses->server;
|
2012-09-19 06:20:28 +07:00
|
|
|
|
2011-05-26 13:02:00 +07:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
|
|
|
|
pid = open_file->pid;
|
|
|
|
else
|
|
|
|
pid = current->tgid;
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
if (ctx->direct_io)
|
|
|
|
iov_iter_advance(&direct_iov, offset - ctx->pos);
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
do {
|
2019-01-26 02:59:01 +07:00
|
|
|
if (open_file->invalidHandle) {
|
|
|
|
rc = cifs_reopen_file(open_file, true);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
continue;
|
|
|
|
else if (rc)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-25 14:28:57 +07:00
|
|
|
rc = server->ops->wait_mtu_credits(server, cifs_sb->rsize,
|
2019-01-17 02:12:41 +07:00
|
|
|
&rsize, credits);
|
2014-06-25 14:28:57 +07:00
|
|
|
if (rc)
|
|
|
|
break;
|
|
|
|
|
|
|
|
cur_len = min_t(const size_t, len, rsize);
|
2010-12-14 15:50:41 +07:00
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
if (ctx->direct_io) {
|
2018-11-01 22:54:32 +07:00
|
|
|
ssize_t result;
|
2018-11-01 05:13:09 +07:00
|
|
|
|
2018-11-01 22:54:32 +07:00
|
|
|
result = iov_iter_get_pages_alloc(
|
2018-11-01 05:13:09 +07:00
|
|
|
&direct_iov, &pagevec,
|
|
|
|
cur_len, &start);
|
2018-11-01 22:54:32 +07:00
|
|
|
if (result < 0) {
|
2018-11-01 05:13:09 +07:00
|
|
|
cifs_dbg(VFS,
|
2018-12-17 05:41:07 +07:00
|
|
|
"couldn't get user pages (rc=%zd)"
|
2018-11-01 05:13:09 +07:00
|
|
|
" iter type %d"
|
|
|
|
" iov_offset %zd count %zd\n",
|
2019-11-21 15:13:58 +07:00
|
|
|
result, iov_iter_type(&direct_iov),
|
2018-11-01 05:13:09 +07:00
|
|
|
direct_iov.iov_offset,
|
|
|
|
direct_iov.count);
|
|
|
|
dump_stack();
|
2018-12-17 05:41:07 +07:00
|
|
|
|
|
|
|
rc = result;
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2018-11-01 05:13:09 +07:00
|
|
|
break;
|
|
|
|
}
|
2018-11-01 22:54:32 +07:00
|
|
|
cur_len = (size_t)result;
|
2018-11-01 05:13:09 +07:00
|
|
|
iov_iter_advance(&direct_iov, cur_len);
|
|
|
|
|
|
|
|
rdata = cifs_readdata_direct_alloc(
|
|
|
|
pagevec, cifs_uncached_readv_complete);
|
|
|
|
if (!rdata) {
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
rc = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
npages = (cur_len + start + PAGE_SIZE-1) / PAGE_SIZE;
|
|
|
|
rdata->page_offset = start;
|
|
|
|
rdata->tailsz = npages > 1 ?
|
|
|
|
cur_len-(PAGE_SIZE-start)-(npages-2)*PAGE_SIZE :
|
|
|
|
cur_len;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
npages = DIV_ROUND_UP(cur_len, PAGE_SIZE);
|
|
|
|
/* allocate a readdata struct */
|
|
|
|
rdata = cifs_readdata_alloc(npages,
|
2012-05-16 18:13:17 +07:00
|
|
|
cifs_uncached_readv_complete);
|
2018-11-01 05:13:09 +07:00
|
|
|
if (!rdata) {
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
rc = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
2010-12-14 15:50:41 +07:00
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
rc = cifs_read_allocate_pages(rdata, npages);
|
2019-01-24 08:12:09 +07:00
|
|
|
if (rc) {
|
|
|
|
kvfree(rdata->pages);
|
|
|
|
kfree(rdata);
|
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
|
|
|
break;
|
|
|
|
}
|
2018-11-01 05:13:09 +07:00
|
|
|
|
|
|
|
rdata->tailsz = PAGE_SIZE;
|
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
|
|
|
|
rdata->cfile = cifsFileInfo_get(open_file);
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->nr_pages = npages;
|
2012-05-16 18:13:17 +07:00
|
|
|
rdata->offset = offset;
|
|
|
|
rdata->bytes = cur_len;
|
|
|
|
rdata->pid = pid;
|
2012-09-19 20:22:32 +07:00
|
|
|
rdata->pagesz = PAGE_SIZE;
|
|
|
|
rdata->read_into_pages = cifs_uncached_read_into_pages;
|
2016-11-18 07:20:18 +07:00
|
|
|
rdata->copy_into_pages = cifs_uncached_copy_into_pages;
|
2019-01-17 02:12:41 +07:00
|
|
|
rdata->credits = credits_on_stack;
|
2017-04-26 01:52:30 +07:00
|
|
|
rdata->ctx = ctx;
|
|
|
|
kref_get(&ctx->refcount);
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = adjust_credits(server, &rdata->credits, rdata->bytes);
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
if (rdata->cfile->invalidHandle)
|
2019-01-26 02:59:01 +07:00
|
|
|
rc = -EAGAIN;
|
|
|
|
else
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = server->ops->async_readv(rdata);
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
if (rc) {
|
2019-01-17 02:12:41 +07:00
|
|
|
add_credits_and_wake_if(server, &rdata->credits, 0);
|
2012-05-16 18:13:17 +07:00
|
|
|
kref_put(&rdata->refcount,
|
2018-11-01 05:13:09 +07:00
|
|
|
cifs_uncached_readdata_release);
|
|
|
|
if (rc == -EAGAIN) {
|
|
|
|
iov_iter_revert(&direct_iov, cur_len);
|
2014-06-25 13:45:07 +07:00
|
|
|
continue;
|
2018-11-01 05:13:09 +07:00
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-25 13:42:28 +07:00
|
|
|
list_add_tail(&rdata->list, rdata_list);
|
2012-05-16 18:13:17 +07:00
|
|
|
offset += cur_len;
|
|
|
|
len -= cur_len;
|
|
|
|
} while (len > 0);
|
|
|
|
|
2014-06-25 13:42:28 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
static void
|
|
|
|
collect_uncached_read_data(struct cifs_aio_ctx *ctx)
|
2014-06-25 13:42:28 +07:00
|
|
|
{
|
2017-04-26 01:52:30 +07:00
|
|
|
struct cifs_readdata *rdata, *tmp;
|
|
|
|
struct iov_iter *to = &ctx->iter;
|
2014-06-25 13:42:28 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2017-04-26 01:52:30 +07:00
|
|
|
int rc;
|
2014-06-25 13:42:28 +07:00
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
cifs_sb = CIFS_SB(ctx->cfile->dentry->d_sb);
|
2014-06-25 13:42:28 +07:00
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
mutex_lock(&ctx->aio_mutex);
|
2014-06-25 13:42:28 +07:00
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
if (list_empty(&ctx->list)) {
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
return;
|
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
rc = ctx->rc;
|
2012-05-16 18:13:17 +07:00
|
|
|
/* the loop below should proceed in the order of increasing offsets */
|
2014-06-25 13:45:07 +07:00
|
|
|
again:
|
2017-04-26 01:52:30 +07:00
|
|
|
list_for_each_entry_safe(rdata, tmp, &ctx->list, list) {
|
2012-05-16 18:13:17 +07:00
|
|
|
if (!rc) {
|
2017-04-26 01:52:30 +07:00
|
|
|
if (!try_wait_for_completion(&rdata->done)) {
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rdata->result == -EAGAIN) {
|
2014-02-05 01:47:26 +07:00
|
|
|
/* resend call if it's a retryable error */
|
2014-07-10 14:50:39 +07:00
|
|
|
struct list_head tmp_list;
|
2014-07-10 14:31:48 +07:00
|
|
|
unsigned int got_bytes = rdata->got_bytes;
|
2014-06-25 13:45:07 +07:00
|
|
|
|
2014-07-10 14:50:39 +07:00
|
|
|
list_del_init(&rdata->list);
|
|
|
|
INIT_LIST_HEAD(&tmp_list);
|
2014-06-25 13:45:07 +07:00
|
|
|
|
2014-07-10 14:31:48 +07:00
|
|
|
/*
|
|
|
|
* Got a part of data and then reconnect has
|
|
|
|
* happened -- fill the buffer and continue
|
|
|
|
* reading.
|
|
|
|
*/
|
|
|
|
if (got_bytes && got_bytes < rdata->bytes) {
|
2018-11-01 05:13:09 +07:00
|
|
|
rc = 0;
|
|
|
|
if (!ctx->direct_io)
|
|
|
|
rc = cifs_readdata_to_iov(rdata, to);
|
2014-07-10 14:31:48 +07:00
|
|
|
if (rc) {
|
|
|
|
kref_put(&rdata->refcount,
|
2018-11-01 05:13:09 +07:00
|
|
|
cifs_uncached_readdata_release);
|
2014-07-10 14:31:48 +07:00
|
|
|
continue;
|
|
|
|
}
|
2014-02-05 01:47:26 +07:00
|
|
|
}
|
2014-07-10 14:31:48 +07:00
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
if (ctx->direct_io) {
|
|
|
|
/*
|
|
|
|
* Re-use rdata as this is a
|
|
|
|
* direct I/O
|
|
|
|
*/
|
|
|
|
rc = cifs_resend_rdata(
|
|
|
|
rdata,
|
|
|
|
&tmp_list, ctx);
|
|
|
|
} else {
|
|
|
|
rc = cifs_send_async_read(
|
2014-07-10 14:31:48 +07:00
|
|
|
rdata->offset + got_bytes,
|
|
|
|
rdata->bytes - got_bytes,
|
|
|
|
rdata->cfile, cifs_sb,
|
2017-04-26 01:52:30 +07:00
|
|
|
&tmp_list, ctx);
|
2014-06-25 13:45:07 +07:00
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
kref_put(&rdata->refcount,
|
|
|
|
cifs_uncached_readdata_release);
|
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
list_splice(&tmp_list, &ctx->list);
|
2014-06-25 13:45:07 +07:00
|
|
|
|
2014-07-10 14:50:39 +07:00
|
|
|
goto again;
|
|
|
|
} else if (rdata->result)
|
|
|
|
rc = rdata->result;
|
2018-11-01 05:13:09 +07:00
|
|
|
else if (!ctx->direct_io)
|
2014-04-03 06:53:36 +07:00
|
|
|
rc = cifs_readdata_to_iov(rdata, to);
|
2012-05-16 18:13:17 +07:00
|
|
|
|
2014-07-10 13:21:15 +07:00
|
|
|
/* if there was a short read -- discard anything left */
|
|
|
|
if (rdata->got_bytes && rdata->got_bytes < rdata->bytes)
|
|
|
|
rc = -ENODATA;
|
2018-11-01 05:13:09 +07:00
|
|
|
|
|
|
|
ctx->total_len += rdata->got_bytes;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
list_del_init(&rdata->list);
|
|
|
|
kref_put(&rdata->refcount, cifs_uncached_readdata_release);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-12-14 15:50:41 +07:00
|
|
|
|
2019-04-11 02:37:47 +07:00
|
|
|
if (!ctx->direct_io)
|
2018-11-01 05:13:09 +07:00
|
|
|
ctx->total_len = ctx->len - iov_iter_count(to);
|
2017-04-26 01:52:30 +07:00
|
|
|
|
2012-09-19 06:20:29 +07:00
|
|
|
/* mask nodata case */
|
|
|
|
if (rc == -ENODATA)
|
|
|
|
rc = 0;
|
|
|
|
|
CIFS: Fix bug which the return value by asynchronous read is error
This patch is used to fix the bug in collect_uncached_read_data()
that rc is automatically converted from a signed number to an
unsigned number when the CIFS asynchronous read fails.
It will cause ctx->rc is error.
Example:
Share a directory and create a file on the Windows OS.
Mount the directory to the Linux OS using CIFS.
On the CIFS client of the Linux OS, invoke the pread interface to
deliver the read request.
The size of the read length plus offset of the read request is greater
than the maximum file size.
In this case, the CIFS server on the Windows OS returns a failure
message (for example, the return value of
smb2.nt_status is STATUS_INVALID_PARAMETER).
After receiving the response message, the CIFS client parses
smb2.nt_status to STATUS_INVALID_PARAMETER
and converts it to the Linux error code (rdata->result=-22).
Then the CIFS client invokes the collect_uncached_read_data function to
assign the value of rdata->result to rc, that is, rc=rdata->result=-22.
The type of the ctx->total_len variable is unsigned integer,
the type of the rc variable is integer, and the type of
the ctx->rc variable is ssize_t.
Therefore, during the ternary operation, the value of rc is
automatically converted to an unsigned number. The final result is
ctx->rc=4294967274. However, the expected result is ctx->rc=-22.
Signed-off-by: Yilu Lin <linyilu@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
CC: Stable <stable@vger.kernel.org>
Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
2020-03-18 10:59:19 +07:00
|
|
|
ctx->rc = (rc == 0) ? (ssize_t)ctx->total_len : rc;
|
2017-04-26 01:52:30 +07:00
|
|
|
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
if (ctx->iocb && ctx->iocb->ki_complete)
|
|
|
|
ctx->iocb->ki_complete(ctx->iocb, ctx->rc, 0);
|
|
|
|
else
|
|
|
|
complete(&ctx->done);
|
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
static ssize_t __cifs_readv(
|
|
|
|
struct kiocb *iocb, struct iov_iter *to, bool direct)
|
2017-04-26 01:52:30 +07:00
|
|
|
{
|
|
|
|
size_t len;
|
2018-11-01 05:13:09 +07:00
|
|
|
struct file *file = iocb->ki_filp;
|
2017-04-26 01:52:30 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
|
|
|
struct cifsFileInfo *cfile;
|
2018-11-01 05:13:09 +07:00
|
|
|
struct cifs_tcon *tcon;
|
|
|
|
ssize_t rc, total_read = 0;
|
|
|
|
loff_t offset = iocb->ki_pos;
|
2017-04-26 01:52:30 +07:00
|
|
|
struct cifs_aio_ctx *ctx;
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
/*
|
|
|
|
* iov_iter_get_pages_alloc() doesn't work with ITER_KVEC,
|
|
|
|
* fall back to data copy read path
|
|
|
|
* this could be improved by getting pages directly in ITER_KVEC
|
|
|
|
*/
|
2019-11-21 15:13:58 +07:00
|
|
|
if (direct && iov_iter_is_kvec(to)) {
|
2018-11-01 05:13:09 +07:00
|
|
|
cifs_dbg(FYI, "use non-direct cifs_user_readv for kvec I/O\n");
|
|
|
|
direct = false;
|
|
|
|
}
|
|
|
|
|
2017-04-26 01:52:30 +07:00
|
|
|
len = iov_iter_count(to);
|
|
|
|
if (!len)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cifs_sb = CIFS_FILE_SB(file);
|
|
|
|
cfile = file->private_data;
|
|
|
|
tcon = tlink_tcon(cfile->tlink);
|
|
|
|
|
|
|
|
if (!tcon->ses->server->ops->async_readv)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
|
|
|
cifs_dbg(FYI, "attempting read on write only file instance\n");
|
|
|
|
|
|
|
|
ctx = cifs_aio_ctx_alloc();
|
|
|
|
if (!ctx)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ctx->cfile = cifsFileInfo_get(cfile);
|
|
|
|
|
|
|
|
if (!is_sync_kiocb(iocb))
|
|
|
|
ctx->iocb = iocb;
|
|
|
|
|
2018-10-22 19:07:28 +07:00
|
|
|
if (iter_is_iovec(to))
|
2017-04-26 01:52:30 +07:00
|
|
|
ctx->should_dirty = true;
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
if (direct) {
|
|
|
|
ctx->pos = offset;
|
|
|
|
ctx->direct_io = true;
|
|
|
|
ctx->iter = *to;
|
|
|
|
ctx->len = len;
|
|
|
|
} else {
|
|
|
|
rc = setup_aio_ctx_iter(ctx, to, READ);
|
|
|
|
if (rc) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
len = ctx->len;
|
2017-04-26 01:52:30 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* grab a lock here due to read response handlers can access ctx */
|
|
|
|
mutex_lock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
rc = cifs_send_async_read(offset, len, cfile, cifs_sb, &ctx->list, ctx);
|
|
|
|
|
|
|
|
/* if at least one read request send succeeded, then reset rc */
|
|
|
|
if (!list_empty(&ctx->list))
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
|
|
|
|
if (rc) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!is_sync_kiocb(iocb)) {
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
return -EIOCBQUEUED;
|
|
|
|
}
|
|
|
|
|
|
|
|
rc = wait_for_completion_killable(&ctx->done);
|
|
|
|
if (rc) {
|
|
|
|
mutex_lock(&ctx->aio_mutex);
|
|
|
|
ctx->rc = rc = -EINTR;
|
|
|
|
total_read = ctx->total_len;
|
|
|
|
mutex_unlock(&ctx->aio_mutex);
|
|
|
|
} else {
|
|
|
|
rc = ctx->rc;
|
|
|
|
total_read = ctx->total_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
kref_put(&ctx->refcount, cifs_aio_ctx_release);
|
|
|
|
|
2014-02-05 02:19:48 +07:00
|
|
|
if (total_read) {
|
2014-04-03 06:53:36 +07:00
|
|
|
iocb->ki_pos += total_read;
|
2014-02-05 02:19:48 +07:00
|
|
|
return total_read;
|
|
|
|
}
|
|
|
|
return rc;
|
2010-12-14 15:50:41 +07:00
|
|
|
}
|
|
|
|
|
2018-11-01 05:13:09 +07:00
|
|
|
ssize_t cifs_direct_readv(struct kiocb *iocb, struct iov_iter *to)
|
|
|
|
{
|
|
|
|
return __cifs_readv(iocb, to, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
ssize_t cifs_user_readv(struct kiocb *iocb, struct iov_iter *to)
|
|
|
|
{
|
|
|
|
return __cifs_readv(iocb, to, false);
|
|
|
|
}
|
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
ssize_t
|
2014-04-03 06:53:36 +07:00
|
|
|
cifs_strict_readv(struct kiocb *iocb, struct iov_iter *to)
|
2010-12-14 15:50:41 +07:00
|
|
|
{
|
2013-01-24 05:07:38 +07:00
|
|
|
struct inode *inode = file_inode(iocb->ki_filp);
|
2012-09-19 20:22:44 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(inode);
|
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
|
|
|
|
struct cifsFileInfo *cfile = (struct cifsFileInfo *)
|
|
|
|
iocb->ki_filp->private_data;
|
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
|
|
|
int rc = -EACCES;
|
2010-12-14 15:50:41 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* In strict cache mode we need to read from the server all the time
|
|
|
|
* if we don't have level II oplock because the server can delay mtime
|
|
|
|
* change - so we can't make a decision about inode invalidating.
|
|
|
|
* And we can also fail with pagereading if there are mandatory locks
|
|
|
|
* on pages affected by this read but not on the region from pos to
|
|
|
|
* pos+len-1.
|
|
|
|
*/
|
2013-09-05 16:01:06 +07:00
|
|
|
if (!CIFS_CACHE_READ(cinode))
|
2014-04-03 06:53:36 +07:00
|
|
|
return cifs_user_readv(iocb, to);
|
2010-12-14 15:50:41 +07:00
|
|
|
|
2012-09-19 20:22:44 +07:00
|
|
|
if (cap_unix(tcon->ses) &&
|
|
|
|
(CIFS_UNIX_FCNTL_CAP & le64_to_cpu(tcon->fsUnixInfo.Capability)) &&
|
|
|
|
((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NOPOSIXBRL) == 0))
|
2014-04-03 06:53:36 +07:00
|
|
|
return generic_file_read_iter(iocb, to);
|
2012-09-19 20:22:44 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We need to hold the sem to be sure nobody modifies lock list
|
|
|
|
* with a brlock that prevents reading.
|
|
|
|
*/
|
|
|
|
down_read(&cinode->lock_sem);
|
2014-04-03 06:53:36 +07:00
|
|
|
if (!cifs_find_lock_conflict(cfile, iocb->ki_pos, iov_iter_count(to),
|
2012-09-19 20:22:44 +07:00
|
|
|
tcon->ses->server->vals->shared_lock_type,
|
2018-10-04 06:24:38 +07:00
|
|
|
0, NULL, CIFS_READ_OP))
|
2014-04-03 06:53:36 +07:00
|
|
|
rc = generic_file_read_iter(iocb, to);
|
2012-09-19 20:22:44 +07:00
|
|
|
up_read(&cinode->lock_sem);
|
|
|
|
return rc;
|
2010-12-14 15:50:41 +07:00
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-09-19 06:20:29 +07:00
|
|
|
static ssize_t
|
|
|
|
cifs_read(struct file *file, char *read_data, size_t read_size, loff_t *offset)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
int rc = -EACCES;
|
|
|
|
unsigned int bytes_read = 0;
|
|
|
|
unsigned int total_read;
|
|
|
|
unsigned int current_read_size;
|
2011-10-20 02:30:26 +07:00
|
|
|
unsigned int rsize;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
2012-07-13 16:58:14 +07:00
|
|
|
struct cifs_tcon *tcon;
|
2012-09-19 06:20:29 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2012-09-19 06:20:29 +07:00
|
|
|
char *cur_offset;
|
2005-04-17 05:20:36 +07:00
|
|
|
struct cifsFileInfo *open_file;
|
2011-05-26 13:02:00 +07:00
|
|
|
struct cifs_io_parms io_parms;
|
2005-12-13 11:53:18 +07:00
|
|
|
int buf_type = CIFS_NO_BUFFER;
|
2011-05-26 13:02:00 +07:00
|
|
|
__u32 pid;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2014-10-22 11:25:12 +07:00
|
|
|
cifs_sb = CIFS_FILE_SB(file);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-10-20 02:30:26 +07:00
|
|
|
/* FIXME: set up handlers for larger reads and/or convert to async */
|
|
|
|
rsize = min_t(unsigned int, cifs_sb->rsize, CIFSMaxBufSize);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (file->private_data == NULL) {
|
2009-06-25 19:42:34 +07:00
|
|
|
rc = -EBADF;
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2009-06-25 19:42:34 +07:00
|
|
|
return rc;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2010-07-13 03:50:14 +07:00
|
|
|
open_file = file->private_data;
|
2012-07-13 16:58:14 +07:00
|
|
|
tcon = tlink_tcon(open_file->tlink);
|
2012-09-19 06:20:29 +07:00
|
|
|
server = tcon->ses->server;
|
|
|
|
|
|
|
|
if (!server->ops->sync_read) {
|
|
|
|
free_xid(xid);
|
|
|
|
return -ENOSYS;
|
|
|
|
}
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2011-05-26 13:02:00 +07:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
|
|
|
|
pid = open_file->pid;
|
|
|
|
else
|
|
|
|
pid = current->tgid;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if ((file->f_flags & O_ACCMODE) == O_WRONLY)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "attempting read on write only file instance\n");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-09-19 06:20:29 +07:00
|
|
|
for (total_read = 0, cur_offset = read_data; read_size > total_read;
|
|
|
|
total_read += bytes_read, cur_offset += bytes_read) {
|
2014-06-25 19:19:02 +07:00
|
|
|
do {
|
|
|
|
current_read_size = min_t(uint, read_size - total_read,
|
|
|
|
rsize);
|
|
|
|
/*
|
|
|
|
* For windows me and 9x we do not want to request more
|
|
|
|
* than it negotiated since it will refuse the read
|
|
|
|
* then.
|
|
|
|
*/
|
|
|
|
if ((tcon->ses) && !(tcon->ses->capabilities &
|
2012-07-13 16:58:14 +07:00
|
|
|
tcon->ses->server->vals->cap_large_files)) {
|
2014-06-25 19:19:02 +07:00
|
|
|
current_read_size = min_t(uint,
|
|
|
|
current_read_size, CIFSMaxBufSize);
|
|
|
|
}
|
2010-10-22 05:46:14 +07:00
|
|
|
if (open_file->invalidHandle) {
|
2010-10-16 02:33:59 +07:00
|
|
|
rc = cifs_reopen_file(open_file, true);
|
2005-04-17 05:20:36 +07:00
|
|
|
if (rc != 0)
|
|
|
|
break;
|
|
|
|
}
|
2011-05-26 13:02:00 +07:00
|
|
|
io_parms.pid = pid;
|
2012-07-13 16:58:14 +07:00
|
|
|
io_parms.tcon = tcon;
|
2012-09-19 06:20:29 +07:00
|
|
|
io_parms.offset = *offset;
|
2011-05-26 13:02:00 +07:00
|
|
|
io_parms.length = current_read_size;
|
2014-09-22 17:13:55 +07:00
|
|
|
rc = server->ops->sync_read(xid, &open_file->fid, &io_parms,
|
2012-09-19 06:20:29 +07:00
|
|
|
&bytes_read, &cur_offset,
|
|
|
|
&buf_type);
|
2014-06-25 19:19:02 +07:00
|
|
|
} while (rc == -EAGAIN);
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (rc || (bytes_read == 0)) {
|
|
|
|
if (total_read) {
|
|
|
|
break;
|
|
|
|
} else {
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
} else {
|
2012-07-13 16:58:14 +07:00
|
|
|
cifs_stats_bytes_read(tcon, total_read);
|
2012-09-19 06:20:29 +07:00
|
|
|
*offset += bytes_read;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
}
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return total_read;
|
|
|
|
}
|
|
|
|
|
2011-04-12 20:13:44 +07:00
|
|
|
/*
|
|
|
|
* If the page is mmap'ed into a process' page tables, then we need to make
|
|
|
|
* sure that it doesn't change while being written back.
|
|
|
|
*/
|
2018-04-15 02:28:25 +07:00
|
|
|
static vm_fault_t
|
2017-02-25 05:56:41 +07:00
|
|
|
cifs_page_mkwrite(struct vm_fault *vmf)
|
2011-04-12 20:13:44 +07:00
|
|
|
{
|
|
|
|
struct page *page = vmf->page;
|
|
|
|
|
|
|
|
lock_page(page);
|
|
|
|
return VM_FAULT_LOCKED;
|
|
|
|
}
|
|
|
|
|
2015-09-10 05:39:26 +07:00
|
|
|
static const struct vm_operations_struct cifs_file_vm_ops = {
|
2011-04-12 20:13:44 +07:00
|
|
|
.fault = filemap_fault,
|
2014-04-08 05:37:19 +07:00
|
|
|
.map_pages = filemap_map_pages,
|
2011-04-12 20:13:44 +07:00
|
|
|
.page_mkwrite = cifs_page_mkwrite,
|
|
|
|
};
|
|
|
|
|
2010-12-14 15:29:51 +07:00
|
|
|
int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
{
|
2017-12-16 03:48:32 +07:00
|
|
|
int xid, rc = 0;
|
2013-01-24 05:07:38 +07:00
|
|
|
struct inode *inode = file_inode(file);
|
2010-12-14 15:29:51 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2010-12-14 15:29:51 +07:00
|
|
|
|
2017-12-16 03:48:32 +07:00
|
|
|
if (!CIFS_CACHE_READ(CIFS_I(inode)))
|
2014-04-30 20:31:47 +07:00
|
|
|
rc = cifs_zap_mapping(inode);
|
2017-12-16 03:48:32 +07:00
|
|
|
if (!rc)
|
|
|
|
rc = generic_file_mmap(file, vma);
|
|
|
|
if (!rc)
|
2011-04-12 20:13:44 +07:00
|
|
|
vma->vm_ops = &cifs_file_vm_ops;
|
2017-12-16 03:48:32 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2010-12-14 15:29:51 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
int cifs_file_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
{
|
|
|
|
int rc, xid;
|
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2017-12-16 03:48:32 +07:00
|
|
|
|
2010-02-12 19:44:18 +07:00
|
|
|
rc = cifs_revalidate_file(file);
|
2017-12-16 03:48:32 +07:00
|
|
|
if (rc)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Validation prior to mmap failed, error=%d\n",
|
|
|
|
rc);
|
2017-12-16 03:48:32 +07:00
|
|
|
if (!rc)
|
|
|
|
rc = generic_file_mmap(file, vma);
|
|
|
|
if (!rc)
|
2011-04-12 20:13:44 +07:00
|
|
|
vma->vm_ops = &cifs_file_vm_ops;
|
2017-12-16 03:48:32 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
static void
|
|
|
|
cifs_readv_complete(struct work_struct *work)
|
|
|
|
{
|
2014-07-10 14:31:53 +07:00
|
|
|
unsigned int i, got_bytes;
|
2012-05-16 18:13:16 +07:00
|
|
|
struct cifs_readdata *rdata = container_of(work,
|
|
|
|
struct cifs_readdata, work);
|
|
|
|
|
2014-07-10 14:31:53 +07:00
|
|
|
got_bytes = rdata->got_bytes;
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < rdata->nr_pages; i++) {
|
|
|
|
struct page *page = rdata->pages[i];
|
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
lru_cache_add_file(page);
|
|
|
|
|
2014-07-10 14:31:53 +07:00
|
|
|
if (rdata->result == 0 ||
|
|
|
|
(rdata->result == -EAGAIN && got_bytes)) {
|
2012-05-16 18:13:16 +07:00
|
|
|
flush_dcache_page(page);
|
|
|
|
SetPageUptodate(page);
|
|
|
|
}
|
|
|
|
|
|
|
|
unlock_page(page);
|
|
|
|
|
2014-07-10 14:31:53 +07:00
|
|
|
if (rdata->result == 0 ||
|
|
|
|
(rdata->result == -EAGAIN && got_bytes))
|
2012-05-16 18:13:16 +07:00
|
|
|
cifs_readpage_to_fscache(rdata->mapping->host, page);
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
got_bytes -= min_t(unsigned int, PAGE_SIZE, got_bytes);
|
2014-07-10 14:31:53 +07:00
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->pages[i] = NULL;
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
kref_put(&rdata->refcount, cifs_readdata_release);
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
static int
|
2016-11-18 07:20:18 +07:00
|
|
|
readpages_fill_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata, struct iov_iter *iter,
|
|
|
|
unsigned int len)
|
2012-05-16 18:13:16 +07:00
|
|
|
{
|
2014-07-10 13:16:25 +07:00
|
|
|
int result = 0;
|
2012-09-19 20:22:30 +07:00
|
|
|
unsigned int i;
|
2012-05-16 18:13:16 +07:00
|
|
|
u64 eof;
|
|
|
|
pgoff_t eof_index;
|
2012-09-19 20:22:30 +07:00
|
|
|
unsigned int nr_pages = rdata->nr_pages;
|
2018-05-31 02:47:55 +07:00
|
|
|
unsigned int page_offset = rdata->page_offset;
|
2012-05-16 18:13:16 +07:00
|
|
|
|
|
|
|
/* determine the eof that the server (probably) has */
|
|
|
|
eof = CIFS_I(rdata->mapping->host)->server_eof;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
eof_index = eof ? (eof - 1) >> PAGE_SHIFT : 0;
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "eof=%llu eof_index=%lu\n", eof, eof_index);
|
2012-05-16 18:13:16 +07:00
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
rdata->got_bytes = 0;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
rdata->tailsz = PAGE_SIZE;
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < nr_pages; i++) {
|
|
|
|
struct page *page = rdata->pages[i];
|
2018-05-31 02:47:55 +07:00
|
|
|
unsigned int to_read = rdata->pagesz;
|
|
|
|
size_t n;
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
to_read -= page_offset;
|
|
|
|
else
|
|
|
|
page_offset = 0;
|
|
|
|
|
|
|
|
n = to_read;
|
2012-09-19 20:22:30 +07:00
|
|
|
|
2018-05-31 02:47:55 +07:00
|
|
|
if (len >= to_read) {
|
|
|
|
len -= to_read;
|
2012-09-19 20:22:32 +07:00
|
|
|
} else if (len > 0) {
|
2012-05-16 18:13:16 +07:00
|
|
|
/* enough for partial page, fill and zero the rest */
|
2018-05-31 02:47:55 +07:00
|
|
|
zero_user(page, len + page_offset, to_read - len);
|
2016-01-10 07:54:50 +07:00
|
|
|
n = rdata->tailsz = len;
|
2012-09-19 20:22:32 +07:00
|
|
|
len = 0;
|
2012-05-16 18:13:16 +07:00
|
|
|
} else if (page->index > eof_index) {
|
|
|
|
/*
|
|
|
|
* The VFS will not try to do readahead past the
|
|
|
|
* i_size, but it's possible that we have outstanding
|
|
|
|
* writes with gaps in the middle and the i_size hasn't
|
|
|
|
* caught up yet. Populate those with zeroed out pages
|
|
|
|
* to prevent the VFS from repeatedly attempting to
|
|
|
|
* fill them until the writes are flushed.
|
|
|
|
*/
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
zero_user(page, 0, PAGE_SIZE);
|
2012-05-16 18:13:16 +07:00
|
|
|
lru_cache_add_file(page);
|
|
|
|
flush_dcache_page(page);
|
|
|
|
SetPageUptodate(page);
|
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->pages[i] = NULL;
|
|
|
|
rdata->nr_pages--;
|
2012-09-19 20:22:32 +07:00
|
|
|
continue;
|
2012-05-16 18:13:16 +07:00
|
|
|
} else {
|
|
|
|
/* no need to hold page hostage */
|
|
|
|
lru_cache_add_file(page);
|
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2012-09-19 20:22:30 +07:00
|
|
|
rdata->pages[i] = NULL;
|
|
|
|
rdata->nr_pages--;
|
2012-09-19 20:22:32 +07:00
|
|
|
continue;
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
2012-09-19 20:22:32 +07:00
|
|
|
|
2016-11-18 07:20:18 +07:00
|
|
|
if (iter)
|
2018-05-31 02:47:55 +07:00
|
|
|
result = copy_page_from_iter(
|
|
|
|
page, page_offset, n, iter);
|
2017-11-23 07:38:47 +07:00
|
|
|
#ifdef CONFIG_CIFS_SMB_DIRECT
|
|
|
|
else if (rdata->mr)
|
|
|
|
result = n;
|
|
|
|
#endif
|
2016-11-18 07:20:18 +07:00
|
|
|
else
|
2018-05-31 02:47:55 +07:00
|
|
|
result = cifs_read_page_from_socket(
|
|
|
|
server, page, page_offset, n);
|
2012-09-19 20:22:32 +07:00
|
|
|
if (result < 0)
|
|
|
|
break;
|
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
rdata->got_bytes += result;
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
|
|
|
|
2014-07-10 13:16:25 +07:00
|
|
|
return rdata->got_bytes > 0 && result != -ECONNABORTED ?
|
|
|
|
rdata->got_bytes : result;
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
|
|
|
|
2016-11-18 07:20:18 +07:00
|
|
|
static int
|
|
|
|
cifs_readpages_read_into_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata, unsigned int len)
|
|
|
|
{
|
|
|
|
return readpages_fill_pages(server, rdata, NULL, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
cifs_readpages_copy_into_pages(struct TCP_Server_Info *server,
|
|
|
|
struct cifs_readdata *rdata,
|
|
|
|
struct iov_iter *iter)
|
|
|
|
{
|
|
|
|
return readpages_fill_pages(server, rdata, iter, iter->count);
|
|
|
|
}
|
|
|
|
|
2014-06-24 16:08:54 +07:00
|
|
|
static int
|
|
|
|
readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
|
|
|
|
unsigned int rsize, struct list_head *tmplist,
|
|
|
|
unsigned int *nr_pages, loff_t *offset, unsigned int *bytes)
|
|
|
|
{
|
|
|
|
struct page *page, *tpage;
|
|
|
|
unsigned int expected_index;
|
|
|
|
int rc;
|
2016-07-27 05:24:53 +07:00
|
|
|
gfp_t gfp = readahead_gfp_mask(mapping);
|
2014-06-24 16:08:54 +07:00
|
|
|
|
2014-06-24 16:42:03 +07:00
|
|
|
INIT_LIST_HEAD(tmplist);
|
|
|
|
|
2019-01-04 06:29:02 +07:00
|
|
|
page = lru_to_page(page_list);
|
2014-06-24 16:08:54 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Lock the page and put it in the cache. Since no one else
|
|
|
|
* should have access to this page, we're safe to simply set
|
|
|
|
* PG_locked without checking it first.
|
|
|
|
*/
|
2016-01-16 07:51:24 +07:00
|
|
|
__SetPageLocked(page);
|
2014-06-24 16:08:54 +07:00
|
|
|
rc = add_to_page_cache_locked(page, mapping,
|
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 05:28:24 +07:00
|
|
|
page->index, gfp);
|
2014-06-24 16:08:54 +07:00
|
|
|
|
|
|
|
/* give up if we can't stick it in the cache */
|
|
|
|
if (rc) {
|
2016-01-16 07:51:24 +07:00
|
|
|
__ClearPageLocked(page);
|
2014-06-24 16:08:54 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* move first page to the tmplist */
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
*offset = (loff_t)page->index << PAGE_SHIFT;
|
|
|
|
*bytes = PAGE_SIZE;
|
2014-06-24 16:08:54 +07:00
|
|
|
*nr_pages = 1;
|
|
|
|
list_move_tail(&page->lru, tmplist);
|
|
|
|
|
|
|
|
/* now try and add more pages onto the request */
|
|
|
|
expected_index = page->index + 1;
|
|
|
|
list_for_each_entry_safe_reverse(page, tpage, page_list, lru) {
|
|
|
|
/* discontinuity ? */
|
|
|
|
if (page->index != expected_index)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* would this page push the read over the rsize? */
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (*bytes + PAGE_SIZE > rsize)
|
2014-06-24 16:08:54 +07:00
|
|
|
break;
|
|
|
|
|
2016-01-16 07:51:24 +07:00
|
|
|
__SetPageLocked(page);
|
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 05:28:24 +07:00
|
|
|
if (add_to_page_cache_locked(page, mapping, page->index, gfp)) {
|
2016-01-16 07:51:24 +07:00
|
|
|
__ClearPageLocked(page);
|
2014-06-24 16:08:54 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
list_move_tail(&page->lru, tmplist);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
(*bytes) += PAGE_SIZE;
|
2014-06-24 16:08:54 +07:00
|
|
|
expected_index++;
|
|
|
|
(*nr_pages)++;
|
|
|
|
}
|
|
|
|
return rc;
|
2012-05-16 18:13:16 +07:00
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
static int cifs_readpages(struct file *file, struct address_space *mapping,
|
|
|
|
struct list_head *page_list, unsigned num_pages)
|
|
|
|
{
|
2011-10-20 02:30:16 +07:00
|
|
|
int rc;
|
|
|
|
struct list_head tmplist;
|
|
|
|
struct cifsFileInfo *open_file = file->private_data;
|
2014-10-22 11:25:12 +07:00
|
|
|
struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
|
2014-06-24 16:42:03 +07:00
|
|
|
struct TCP_Server_Info *server;
|
2011-10-20 02:30:16 +07:00
|
|
|
pid_t pid;
|
2018-10-11 13:01:02 +07:00
|
|
|
unsigned int xid;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2018-10-11 13:01:02 +07:00
|
|
|
xid = get_xid();
|
2010-07-05 19:43:25 +07:00
|
|
|
/*
|
|
|
|
* Reads as many pages as possible from fscache. Returns -ENOBUFS
|
|
|
|
* immediately if the cookie is negative
|
2013-09-05 00:10:39 +07:00
|
|
|
*
|
|
|
|
* After this point, every page in the list might have PG_fscache set,
|
|
|
|
* so we will need to clean that up off of every page we don't use.
|
2010-07-05 19:43:25 +07:00
|
|
|
*/
|
|
|
|
rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list,
|
|
|
|
&num_pages);
|
2018-10-11 13:01:02 +07:00
|
|
|
if (rc == 0) {
|
|
|
|
free_xid(xid);
|
2011-10-20 02:30:16 +07:00
|
|
|
return rc;
|
2018-10-11 13:01:02 +07:00
|
|
|
}
|
2010-07-05 19:43:25 +07:00
|
|
|
|
2011-05-26 13:02:00 +07:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
|
|
|
|
pid = open_file->pid;
|
|
|
|
else
|
|
|
|
pid = current->tgid;
|
|
|
|
|
2011-10-20 02:30:16 +07:00
|
|
|
rc = 0;
|
2014-06-24 16:42:03 +07:00
|
|
|
server = tlink_tcon(open_file->tlink)->ses->server;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "%s: file=%p mapping=%p num_pages=%u\n",
|
|
|
|
__func__, file, mapping, num_pages);
|
2011-10-20 02:30:16 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Start with the page at end of list and move it to private
|
|
|
|
* list. Do the same with any following pages until we hit
|
|
|
|
* the rsize limit, hit an index discontinuity, or run out of
|
|
|
|
* pages. Issue the async read and then start the loop again
|
|
|
|
* until the list is empty.
|
|
|
|
*
|
|
|
|
* Note that list order is important. The page_list is in
|
|
|
|
* the order of declining indexes. When we put the pages in
|
|
|
|
* the rdata->pages, then we want them in increasing order.
|
|
|
|
*/
|
|
|
|
while (!list_empty(page_list)) {
|
2014-06-25 14:28:57 +07:00
|
|
|
unsigned int i, nr_pages, bytes, rsize;
|
2011-10-20 02:30:16 +07:00
|
|
|
loff_t offset;
|
|
|
|
struct page *page, *tpage;
|
|
|
|
struct cifs_readdata *rdata;
|
2019-01-17 02:12:41 +07:00
|
|
|
struct cifs_credits credits_on_stack;
|
|
|
|
struct cifs_credits *credits = &credits_on_stack;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2019-01-26 02:59:01 +07:00
|
|
|
if (open_file->invalidHandle) {
|
|
|
|
rc = cifs_reopen_file(open_file, true);
|
|
|
|
if (rc == -EAGAIN)
|
|
|
|
continue;
|
|
|
|
else if (rc)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2014-06-25 14:28:57 +07:00
|
|
|
rc = server->ops->wait_mtu_credits(server, cifs_sb->rsize,
|
2019-01-17 02:12:41 +07:00
|
|
|
&rsize, credits);
|
2014-06-25 14:28:57 +07:00
|
|
|
if (rc)
|
|
|
|
break;
|
2011-10-20 02:30:16 +07:00
|
|
|
|
|
|
|
/*
|
2014-06-24 16:42:03 +07:00
|
|
|
* Give up immediately if rsize is too small to read an entire
|
|
|
|
* page. The VFS will fall back to readpage. We should never
|
|
|
|
* reach this point however since we set ra_pages to 0 when the
|
|
|
|
* rsize is smaller than a cache page.
|
2011-10-20 02:30:16 +07:00
|
|
|
*/
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (unlikely(rsize < PAGE_SIZE)) {
|
2014-06-25 14:28:57 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2018-10-11 13:01:02 +07:00
|
|
|
free_xid(xid);
|
2014-06-24 16:42:03 +07:00
|
|
|
return 0;
|
2014-06-25 14:28:57 +07:00
|
|
|
}
|
2011-10-20 02:30:16 +07:00
|
|
|
|
2014-06-25 14:28:57 +07:00
|
|
|
rc = readpages_get_pages(mapping, page_list, rsize, &tmplist,
|
|
|
|
&nr_pages, &offset, &bytes);
|
2011-10-20 02:30:16 +07:00
|
|
|
if (rc) {
|
2014-06-25 14:28:57 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2011-10-20 02:30:16 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:16 +07:00
|
|
|
rdata = cifs_readdata_alloc(nr_pages, cifs_readv_complete);
|
2011-10-20 02:30:16 +07:00
|
|
|
if (!rdata) {
|
|
|
|
/* best to give up if we're out of mem */
|
|
|
|
list_for_each_entry_safe(page, tpage, &tmplist, lru) {
|
|
|
|
list_del(&page->lru);
|
|
|
|
lru_cache_add_file(page);
|
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2011-10-20 02:30:16 +07:00
|
|
|
}
|
|
|
|
rc = -ENOMEM;
|
2014-06-25 14:28:57 +07:00
|
|
|
add_credits_and_wake_if(server, credits, 0);
|
2011-10-20 02:30:16 +07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-05-16 18:13:17 +07:00
|
|
|
rdata->cfile = cifsFileInfo_get(open_file);
|
2011-10-20 02:30:16 +07:00
|
|
|
rdata->mapping = mapping;
|
|
|
|
rdata->offset = offset;
|
|
|
|
rdata->bytes = bytes;
|
|
|
|
rdata->pid = pid;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
rdata->pagesz = PAGE_SIZE;
|
2018-05-31 02:47:55 +07:00
|
|
|
rdata->tailsz = PAGE_SIZE;
|
2012-09-19 20:22:32 +07:00
|
|
|
rdata->read_into_pages = cifs_readpages_read_into_pages;
|
2016-11-18 07:20:18 +07:00
|
|
|
rdata->copy_into_pages = cifs_readpages_copy_into_pages;
|
2019-01-17 02:12:41 +07:00
|
|
|
rdata->credits = credits_on_stack;
|
2012-09-19 20:22:30 +07:00
|
|
|
|
|
|
|
list_for_each_entry_safe(page, tpage, &tmplist, lru) {
|
|
|
|
list_del(&page->lru);
|
|
|
|
rdata->pages[rdata->nr_pages++] = page;
|
|
|
|
}
|
2011-10-20 02:30:16 +07:00
|
|
|
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = adjust_credits(server, &rdata->credits, rdata->bytes);
|
|
|
|
|
|
|
|
if (!rc) {
|
|
|
|
if (rdata->cfile->invalidHandle)
|
2019-01-26 02:59:01 +07:00
|
|
|
rc = -EAGAIN;
|
|
|
|
else
|
2019-01-24 09:15:52 +07:00
|
|
|
rc = server->ops->async_readv(rdata);
|
|
|
|
}
|
|
|
|
|
2014-06-24 16:42:03 +07:00
|
|
|
if (rc) {
|
2019-01-17 02:12:41 +07:00
|
|
|
add_credits_and_wake_if(server, &rdata->credits, 0);
|
2012-09-19 20:22:30 +07:00
|
|
|
for (i = 0; i < rdata->nr_pages; i++) {
|
|
|
|
page = rdata->pages[i];
|
2011-10-20 02:30:16 +07:00
|
|
|
lru_cache_add_file(page);
|
|
|
|
unlock_page(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2014-10-02 23:13:35 +07:00
|
|
|
/* Fallback to the readpage in error/reconnect cases */
|
2012-05-16 18:13:17 +07:00
|
|
|
kref_put(&rdata->refcount, cifs_readdata_release);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
2012-05-16 18:13:17 +07:00
|
|
|
|
|
|
|
kref_put(&rdata->refcount, cifs_readdata_release);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-09-05 00:10:39 +07:00
|
|
|
/* Any pages that have been shown to fscache but didn't get added to
|
|
|
|
* the pagecache must be uncached before they get returned to the
|
|
|
|
* allocator.
|
|
|
|
*/
|
|
|
|
cifs_fscache_readpages_cancel(mapping->host, page_list);
|
2018-10-11 13:01:02 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2013-09-13 20:11:56 +07:00
|
|
|
/*
|
|
|
|
* cifs_readpage_worker must be called with the page pinned
|
|
|
|
*/
|
2005-04-17 05:20:36 +07:00
|
|
|
static int cifs_readpage_worker(struct file *file, struct page *page,
|
|
|
|
loff_t *poffset)
|
|
|
|
{
|
|
|
|
char *read_data;
|
|
|
|
int rc;
|
|
|
|
|
2010-07-05 19:43:25 +07:00
|
|
|
/* Is the page cached? */
|
2013-01-24 05:07:38 +07:00
|
|
|
rc = cifs_readpage_from_fscache(file_inode(file), page);
|
2010-07-05 19:43:25 +07:00
|
|
|
if (rc == 0)
|
|
|
|
goto read_complete;
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
read_data = kmap(page);
|
|
|
|
/* for reads over a certain size could initiate async read ahead */
|
2007-07-10 08:16:18 +07:00
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
rc = cifs_read(file, read_data, PAGE_SIZE, poffset);
|
2007-07-10 08:16:18 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
if (rc < 0)
|
|
|
|
goto io_error;
|
|
|
|
else
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Bytes read %d\n", rc);
|
2007-07-10 08:16:18 +07:00
|
|
|
|
2018-09-23 00:07:06 +07:00
|
|
|
/* we do not want atime to be less than mtime, it broke some apps */
|
|
|
|
file_inode(file)->i_atime = current_time(file_inode(file));
|
|
|
|
if (timespec64_compare(&(file_inode(file)->i_atime), &(file_inode(file)->i_mtime)))
|
|
|
|
file_inode(file)->i_atime = file_inode(file)->i_mtime;
|
|
|
|
else
|
|
|
|
file_inode(file)->i_atime = current_time(file_inode(file));
|
2007-07-10 08:16:18 +07:00
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (PAGE_SIZE > rc)
|
|
|
|
memset(read_data + rc, 0, PAGE_SIZE - rc);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
flush_dcache_page(page);
|
|
|
|
SetPageUptodate(page);
|
2010-07-05 19:43:11 +07:00
|
|
|
|
|
|
|
/* send this page to the cache */
|
2013-01-24 05:07:38 +07:00
|
|
|
cifs_readpage_to_fscache(file_inode(file), page);
|
2010-07-05 19:43:11 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
rc = 0;
|
2007-07-10 08:16:18 +07:00
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
io_error:
|
2007-07-10 08:16:18 +07:00
|
|
|
kunmap(page);
|
2013-09-13 20:11:57 +07:00
|
|
|
unlock_page(page);
|
2010-07-05 19:43:25 +07:00
|
|
|
|
|
|
|
read_complete:
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cifs_readpage(struct file *file, struct page *page)
|
|
|
|
{
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
loff_t offset = (loff_t)page->index << PAGE_SHIFT;
|
2005-04-17 05:20:36 +07:00
|
|
|
int rc = -EACCES;
|
2012-06-20 14:21:16 +07:00
|
|
|
unsigned int xid;
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
xid = get_xid();
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
if (file->private_data == NULL) {
|
2009-06-25 19:42:34 +07:00
|
|
|
rc = -EBADF;
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2009-06-25 19:42:34 +07:00
|
|
|
return rc;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "readpage %p at offset %d 0x%x\n",
|
2010-04-21 10:50:45 +07:00
|
|
|
page, (int)offset, (int)offset);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
|
|
|
rc = cifs_readpage_worker(file, page, &offset);
|
|
|
|
|
2012-06-20 14:21:16 +07:00
|
|
|
free_xid(xid);
|
2005-04-17 05:20:36 +07:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2007-07-26 22:54:16 +07:00
|
|
|
static int is_inode_writable(struct cifsInodeInfo *cifs_inode)
|
|
|
|
{
|
|
|
|
struct cifsFileInfo *open_file;
|
|
|
|
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_lock(&cifs_inode->open_file_lock);
|
2007-07-26 22:54:16 +07:00
|
|
|
list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
|
2010-10-16 02:34:01 +07:00
|
|
|
if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2007-07-26 22:54:16 +07:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
2019-10-03 12:16:27 +07:00
|
|
|
spin_unlock(&cifs_inode->open_file_lock);
|
2007-07-26 22:54:16 +07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
/* We do not want to update the file size from server for inodes
|
|
|
|
open for write - to avoid races with writepage extending
|
|
|
|
the file - in the future we could consider allowing
|
2007-07-10 08:16:18 +07:00
|
|
|
refreshing the inode only on increases in the file size
|
2005-04-17 05:20:36 +07:00
|
|
|
but this is tricky to do without racing with writebehind
|
|
|
|
page caching in the current Linux kernel design */
|
2008-04-29 07:06:05 +07:00
|
|
|
bool is_size_safe_to_change(struct cifsInodeInfo *cifsInode, __u64 end_of_file)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2007-07-26 22:54:16 +07:00
|
|
|
if (!cifsInode)
|
2008-04-29 07:06:05 +07:00
|
|
|
return true;
|
2007-07-13 07:33:32 +07:00
|
|
|
|
2007-07-26 22:54:16 +07:00
|
|
|
if (is_inode_writable(cifsInode)) {
|
|
|
|
/* This inode is open for write at least once */
|
2006-01-13 05:41:28 +07:00
|
|
|
struct cifs_sb_info *cifs_sb;
|
|
|
|
|
|
|
|
cifs_sb = CIFS_SB(cifsInode->vfs_inode.i_sb);
|
2008-02-08 06:25:02 +07:00
|
|
|
if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO) {
|
2007-07-10 08:16:18 +07:00
|
|
|
/* since no page cache to corrupt on directio
|
2006-01-13 05:41:28 +07:00
|
|
|
we can change size safely */
|
2008-04-29 07:06:05 +07:00
|
|
|
return true;
|
2006-01-13 05:41:28 +07:00
|
|
|
}
|
|
|
|
|
2007-07-10 08:16:18 +07:00
|
|
|
if (i_size_read(&cifsInode->vfs_inode) < end_of_file)
|
2008-04-29 07:06:05 +07:00
|
|
|
return true;
|
2007-02-09 01:14:13 +07:00
|
|
|
|
2008-04-29 07:06:05 +07:00
|
|
|
return false;
|
2005-10-21 03:44:56 +07:00
|
|
|
} else
|
2008-04-29 07:06:05 +07:00
|
|
|
return true;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-09-24 22:32:59 +07:00
|
|
|
static int cifs_write_begin(struct file *file, struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
|
struct page **pagep, void **fsdata)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
2013-09-13 20:11:57 +07:00
|
|
|
int oncethru = 0;
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
pgoff_t index = pos >> PAGE_SHIFT;
|
|
|
|
loff_t offset = pos & (PAGE_SIZE - 1);
|
2008-11-27 02:32:33 +07:00
|
|
|
loff_t page_start = pos & PAGE_MASK;
|
|
|
|
loff_t i_size;
|
|
|
|
struct page *page;
|
|
|
|
int rc = 0;
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "write_begin from %lld len %d\n", (long long)pos, len);
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2013-09-13 20:11:57 +07:00
|
|
|
start:
|
fs: symlink write_begin allocation context fix
With the write_begin/write_end aops, page_symlink was broken because it
could no longer pass a GFP_NOFS type mask into the point where the
allocations happened. They are done in write_begin, which would always
assume that the filesystem can be entered from reclaim. This bug could
cause filesystem deadlocks.
The funny thing with having a gfp_t mask there is that it doesn't really
allow the caller to arbitrarily tinker with the context in which it can be
called. It couldn't ever be GFP_ATOMIC, for example, because it needs to
take the page lock. The only thing any callers care about is __GFP_FS
anyway, so turn that into a single flag.
Add a new flag for write_begin, AOP_FLAG_NOFS. Filesystems can now act on
this flag in their write_begin function. Change __grab_cache_page to
accept a nofs argument as well, to honour that flag (while we're there,
change the name to grab_cache_page_write_begin which is more instructive
and does away with random leading underscores).
This is really a more flexible way to go in the end anyway -- if a
filesystem happens to want any extra allocations aside from the pagecache
ones in ints write_begin function, it may now use GFP_KERNEL (rather than
GFP_NOFS) for common case allocations (eg. ocfs2_alloc_write_ctxt, for a
random example).
[kosaki.motohiro@jp.fujitsu.com: fix ubifs]
[kosaki.motohiro@jp.fujitsu.com: fix fuse]
Signed-off-by: Nick Piggin <npiggin@suse.de>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: <stable@kernel.org> [2.6.28.x]
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
[ Cleaned up the calling convention: just pass in the AOP flags
untouched to the grab_cache_page_write_begin() function. That
just simplifies everybody, and may even allow future expansion of the
logic. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-01-05 03:00:53 +07:00
|
|
|
page = grab_cache_page_write_begin(mapping, index, flags);
|
2008-11-27 02:32:33 +07:00
|
|
|
if (!page) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
2007-03-06 07:31:00 +07:00
|
|
|
|
2008-11-27 02:32:33 +07:00
|
|
|
if (PageUptodate(page))
|
|
|
|
goto out;
|
2007-03-06 07:31:00 +07:00
|
|
|
|
2008-11-27 02:32:33 +07:00
|
|
|
/*
|
|
|
|
* If we write a full page it will be up to date, no need to read from
|
|
|
|
* the server. If the write is short, we'll end up doing a sync write
|
|
|
|
* instead.
|
|
|
|
*/
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (len == PAGE_SIZE)
|
2008-11-27 02:32:33 +07:00
|
|
|
goto out;
|
2007-03-06 07:31:00 +07:00
|
|
|
|
2008-11-27 02:32:33 +07:00
|
|
|
/*
|
|
|
|
* optimize away the read when we have an oplock, and we're not
|
|
|
|
* expecting to use any of the data we'd be reading in. That
|
|
|
|
* is, when the page lies beyond the EOF, or straddles the EOF
|
|
|
|
* and the write will cover all of the existing data.
|
|
|
|
*/
|
2013-09-05 16:01:06 +07:00
|
|
|
if (CIFS_CACHE_READ(CIFS_I(mapping->host))) {
|
2008-11-27 02:32:33 +07:00
|
|
|
i_size = i_size_read(mapping->host);
|
|
|
|
if (page_start >= i_size ||
|
|
|
|
(offset == 0 && (pos + len) >= i_size)) {
|
|
|
|
zero_user_segments(page, 0, offset,
|
|
|
|
offset + len,
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
PAGE_SIZE);
|
2008-11-27 02:32:33 +07:00
|
|
|
/*
|
|
|
|
* PageChecked means that the parts of the page
|
|
|
|
* to which we're not writing are considered up
|
|
|
|
* to date. Once the data is copied to the
|
|
|
|
* page, it can be set uptodate.
|
|
|
|
*/
|
|
|
|
SetPageChecked(page);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
2008-09-24 22:32:59 +07:00
|
|
|
|
2013-09-13 20:11:57 +07:00
|
|
|
if ((file->f_flags & O_ACCMODE) != O_WRONLY && !oncethru) {
|
2008-11-27 02:32:33 +07:00
|
|
|
/*
|
|
|
|
* might as well read a page, it is fast enough. If we get
|
|
|
|
* an error, we don't need to return it. cifs_write_end will
|
|
|
|
* do a sync write instead since PG_uptodate isn't set.
|
|
|
|
*/
|
|
|
|
cifs_readpage_worker(file, page, &page_start);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2013-09-13 20:11:57 +07:00
|
|
|
oncethru = 1;
|
|
|
|
goto start;
|
2007-03-06 07:31:00 +07:00
|
|
|
} else {
|
|
|
|
/* we could try using another file handle if there is one -
|
|
|
|
but how would we lock it to prevent close of that handle
|
|
|
|
racing with this read? In any case
|
2008-09-24 22:32:59 +07:00
|
|
|
this will be written out by write_end so is fine */
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
2008-11-27 02:32:33 +07:00
|
|
|
out:
|
|
|
|
*pagep = page;
|
|
|
|
return rc;
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2010-07-05 19:43:00 +07:00
|
|
|
static int cifs_release_page(struct page *page, gfp_t gfp)
|
|
|
|
{
|
|
|
|
if (PagePrivate(page))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return cifs_fscache_release_page(page, gfp);
|
|
|
|
}
|
|
|
|
|
2013-05-22 10:17:23 +07:00
|
|
|
static void cifs_invalidate_page(struct page *page, unsigned int offset,
|
|
|
|
unsigned int length)
|
2010-07-05 19:43:00 +07:00
|
|
|
{
|
|
|
|
struct cifsInodeInfo *cifsi = CIFS_I(page->mapping->host);
|
|
|
|
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (offset == 0 && length == PAGE_SIZE)
|
2010-07-05 19:43:00 +07:00
|
|
|
cifs_fscache_invalidate_page(page, &cifsi->vfs_inode);
|
|
|
|
}
|
|
|
|
|
2011-04-08 08:29:10 +07:00
|
|
|
static int cifs_launder_page(struct page *page)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
loff_t range_start = page_offset(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
loff_t range_end = range_start + (loff_t)(PAGE_SIZE - 1);
|
2011-04-08 08:29:10 +07:00
|
|
|
struct writeback_control wbc = {
|
|
|
|
.sync_mode = WB_SYNC_ALL,
|
|
|
|
.nr_to_write = 0,
|
|
|
|
.range_start = range_start,
|
|
|
|
.range_end = range_end,
|
|
|
|
};
|
|
|
|
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Launder page: %p\n", page);
|
2011-04-08 08:29:10 +07:00
|
|
|
|
|
|
|
if (clear_page_dirty_for_io(page))
|
|
|
|
rc = cifs_writepage_locked(page, &wbc);
|
|
|
|
|
|
|
|
cifs_fscache_invalidate_page(page, page->mapping->host);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2010-07-21 03:09:02 +07:00
|
|
|
void cifs_oplock_break(struct work_struct *work)
|
2009-09-21 17:47:50 +07:00
|
|
|
{
|
|
|
|
struct cifsFileInfo *cfile = container_of(work, struct cifsFileInfo,
|
|
|
|
oplock_break);
|
2015-03-18 05:25:59 +07:00
|
|
|
struct inode *inode = d_inode(cfile->dentry);
|
2009-09-21 17:47:50 +07:00
|
|
|
struct cifsInodeInfo *cinode = CIFS_I(inode);
|
2012-09-19 06:20:33 +07:00
|
|
|
struct cifs_tcon *tcon = tlink_tcon(cfile->tlink);
|
2014-03-11 23:11:47 +07:00
|
|
|
struct TCP_Server_Info *server = tcon->ses->server;
|
2010-10-23 01:52:29 +07:00
|
|
|
int rc = 0;
|
2019-10-30 06:51:19 +07:00
|
|
|
bool purge_cache = false;
|
2009-09-21 17:47:50 +07:00
|
|
|
|
2014-03-11 23:11:47 +07:00
|
|
|
wait_on_bit(&cinode->flags, CIFS_INODE_PENDING_WRITERS,
|
sched: Remove proliferation of wait_on_bit() action functions
The current "wait_on_bit" interface requires an 'action'
function to be provided which does the actual waiting.
There are over 20 such functions, many of them identical.
Most cases can be satisfied by one of just two functions, one
which uses io_schedule() and one which just uses schedule().
So:
Rename wait_on_bit and wait_on_bit_lock to
wait_on_bit_action and wait_on_bit_lock_action
to make it explicit that they need an action function.
Introduce new wait_on_bit{,_lock} and wait_on_bit{,_lock}_io
which are *not* given an action function but implicitly use
a standard one.
The decision to error-out if a signal is pending is now made
based on the 'mode' argument rather than being encoded in the action
function.
All instances of the old wait_on_bit and wait_on_bit_lock which
can use the new version have been changed accordingly and their
action functions have been discarded.
wait_on_bit{_lock} does not return any specific error code in the
event of a signal so the caller must check for non-zero and
interpolate their own error code as appropriate.
The wait_on_bit() call in __fscache_wait_on_invalidate() was
ambiguous as it specified TASK_UNINTERRUPTIBLE but used
fscache_wait_bit_interruptible as an action function.
David Howells confirms this should be uniformly
"uninterruptible"
The main remaining user of wait_on_bit{,_lock}_action is NFS
which needs to use a freezer-aware schedule() call.
A comment in fs/gfs2/glock.c notes that having multiple 'action'
functions is useful as they display differently in the 'wchan'
field of 'ps'. (and /proc/$PID/wchan).
As the new bit_wait{,_io} functions are tagged "__sched", they
will not show up at all, but something higher in the stack. So
the distinction will still be visible, only with different
function names (gds2_glock_wait versus gfs2_glock_dq_wait in the
gfs2/glock.c case).
Since first version of this patch (against 3.15) two new action
functions appeared, on in NFS and one in CIFS. CIFS also now
uses an action function that makes the same freezer aware
schedule call as NFS.
Signed-off-by: NeilBrown <neilb@suse.de>
Acked-by: David Howells <dhowells@redhat.com> (fscache, keys)
Acked-by: Steven Whitehouse <swhiteho@redhat.com> (gfs2)
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steve French <sfrench@samba.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20140707051603.28027.72349.stgit@notabene.brown
Signed-off-by: Ingo Molnar <mingo@kernel.org>
2014-07-07 12:16:04 +07:00
|
|
|
TASK_UNINTERRUPTIBLE);
|
2014-03-11 23:11:47 +07:00
|
|
|
|
2019-10-30 06:51:19 +07:00
|
|
|
server->ops->downgrade_oplock(server, cinode, cfile->oplock_level,
|
|
|
|
cfile->oplock_epoch, &purge_cache);
|
2014-03-11 23:11:47 +07:00
|
|
|
|
2013-09-05 16:01:06 +07:00
|
|
|
if (!CIFS_CACHE_WRITE(cinode) && CIFS_CACHE_READ(cinode) &&
|
2012-12-24 17:41:19 +07:00
|
|
|
cifs_has_mand_locks(cinode)) {
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Reset oplock to None for inode=%p due to mand locks\n",
|
|
|
|
inode);
|
2013-09-05 16:01:06 +07:00
|
|
|
cinode->oplock = 0;
|
2012-12-24 17:41:19 +07:00
|
|
|
}
|
|
|
|
|
2009-09-21 17:47:50 +07:00
|
|
|
if (inode && S_ISREG(inode->i_mode)) {
|
2013-09-05 16:01:06 +07:00
|
|
|
if (CIFS_CACHE_READ(cinode))
|
2009-12-24 18:47:55 +07:00
|
|
|
break_lease(inode, O_RDONLY);
|
2010-04-27 11:38:15 +07:00
|
|
|
else
|
2009-12-24 18:47:55 +07:00
|
|
|
break_lease(inode, O_WRONLY);
|
2009-09-21 17:47:50 +07:00
|
|
|
rc = filemap_fdatawrite(inode->i_mapping);
|
2019-10-30 06:51:19 +07:00
|
|
|
if (!CIFS_CACHE_READ(cinode) || purge_cache) {
|
2010-10-23 01:52:29 +07:00
|
|
|
rc = filemap_fdatawait(inode->i_mapping);
|
|
|
|
mapping_set_error(inode->i_mapping, rc);
|
2014-04-30 20:31:47 +07:00
|
|
|
cifs_zap_mapping(inode);
|
2009-09-21 17:47:50 +07:00
|
|
|
}
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Oplock flush inode %p rc %d\n", inode, rc);
|
2019-10-30 06:51:19 +07:00
|
|
|
if (CIFS_CACHE_WRITE(cinode))
|
|
|
|
goto oplock_break_ack;
|
2009-09-21 17:47:50 +07:00
|
|
|
}
|
|
|
|
|
2011-10-22 18:33:29 +07:00
|
|
|
rc = cifs_push_locks(cfile);
|
|
|
|
if (rc)
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(VFS, "Push locks rc = %d\n", rc);
|
2011-10-22 18:33:29 +07:00
|
|
|
|
2019-10-30 06:51:19 +07:00
|
|
|
oplock_break_ack:
|
2009-09-21 17:47:50 +07:00
|
|
|
/*
|
|
|
|
* releasing stale oplock after recent reconnect of smb session using
|
|
|
|
* a now incorrect file handle is not a data integrity issue but do
|
|
|
|
* not bother sending an oplock release if session to server still is
|
|
|
|
* disconnected since oplock already released by the server
|
|
|
|
*/
|
2010-10-22 05:46:14 +07:00
|
|
|
if (!cfile->oplock_break_cancelled) {
|
2012-09-19 06:20:33 +07:00
|
|
|
rc = tcon->ses->server->ops->oplock_response(tcon, &cfile->fid,
|
|
|
|
cinode);
|
2013-05-05 10:12:25 +07:00
|
|
|
cifs_dbg(FYI, "Oplock release rc = %d\n", rc);
|
2009-09-21 17:47:50 +07:00
|
|
|
}
|
cifs: move cifsFileInfo_put logic into a work-queue
This patch moves the final part of the cifsFileInfo_put() logic where we
need a write lock on lock_sem to be processed in a separate thread that
holds no other locks.
This is to prevent deadlocks like the one below:
> there are 6 processes looping to while trying to down_write
> cinode->lock_sem, 5 of them from _cifsFileInfo_put, and one from
> cifs_new_fileinfo
>
> and there are 5 other processes which are blocked, several of them
> waiting on either PG_writeback or PG_locked (which are both set), all
> for the same page of the file
>
> 2 inode_lock() (inode->i_rwsem) for the file
> 1 wait_on_page_writeback() for the page
> 1 down_read(inode->i_rwsem) for the inode of the directory
> 1 inode_lock()(inode->i_rwsem) for the inode of the directory
> 1 __lock_page
>
>
> so processes are blocked waiting on:
> page flags PG_locked and PG_writeback for one specific page
> inode->i_rwsem for the directory
> inode->i_rwsem for the file
> cifsInodeInflock_sem
>
>
>
> here are the more gory details (let me know if I need to provide
> anything more/better):
>
> [0 00:48:22.765] [UN] PID: 8863 TASK: ffff8c691547c5c0 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff9965007e3ba8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007e3c38] schedule at ffffffff9b6e64df
> #2 [ffff9965007e3c48] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965007e3cb8] legitimize_path at ffffffff9b0f975d
> #4 [ffff9965007e3d08] path_openat at ffffffff9b0fe55d
> #5 [ffff9965007e3dd8] do_filp_open at ffffffff9b100a33
> #6 [ffff9965007e3ee0] do_sys_open at ffffffff9b0eb2d6
> #7 [ffff9965007e3f38] do_syscall_64 at ffffffff9ae04315
> * (I think legitimize_path is bogus)
>
> in path_openat
> } else {
> const char *s = path_init(nd, flags);
> while (!(error = link_path_walk(s, nd)) &&
> (error = do_last(nd, file, op)) > 0) { <<<<
>
> do_last:
> if (open_flag & O_CREAT)
> inode_lock(dir->d_inode); <<<<
> else
> so it's trying to take inode->i_rwsem for the directory
>
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68bb8e79c0 ffff8c691158ef20 ffff8c6915bf9000 DIR /mnt/vm1_smb/
> inode.i_rwsem is ffff8c691158efc0
>
> <struct rw_semaphore 0xffff8c691158efc0>:
> owner: <struct task_struct 0xffff8c6914275d00> (UN - 8856 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 2
> 0xffff9965007e3c90 8863 reopen_file UN 0 1:29:22.926
> RWSEM_WAITING_FOR_WRITE
> 0xffff996500393e00 9802 ls UN 0 1:17:26.700
> RWSEM_WAITING_FOR_READ
>
>
> the owner of the inode.i_rwsem of the directory is:
>
> [0 00:00:00.109] [UN] PID: 8856 TASK: ffff8c6914275d00 CPU: 3
> COMMAND: "reopen_file"
> #0 [ffff99650065b828] __schedule at ffffffff9b6e6095
> #1 [ffff99650065b8b8] schedule at ffffffff9b6e64df
> #2 [ffff99650065b8c8] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff99650065b940] msleep at ffffffff9af573a9
> #4 [ffff99650065b948] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff99650065ba38] cifs_writepage_locked at ffffffffc0a0b8f3 [cifs]
> #6 [ffff99650065bab0] cifs_launder_page at ffffffffc0a0bb72 [cifs]
> #7 [ffff99650065bb30] invalidate_inode_pages2_range at ffffffff9b04d4bd
> #8 [ffff99650065bcb8] cifs_invalidate_mapping at ffffffffc0a11339 [cifs]
> #9 [ffff99650065bcd0] cifs_revalidate_mapping at ffffffffc0a1139a [cifs]
> #10 [ffff99650065bcf0] cifs_d_revalidate at ffffffffc0a014f6 [cifs]
> #11 [ffff99650065bd08] path_openat at ffffffff9b0fe7f7
> #12 [ffff99650065bdd8] do_filp_open at ffffffff9b100a33
> #13 [ffff99650065bee0] do_sys_open at ffffffff9b0eb2d6
> #14 [ffff99650065bf38] do_syscall_64 at ffffffff9ae04315
>
> cifs_launder_page is for page 0xffffd1e2c07d2480
>
> crash> page.index,mapping,flags 0xffffd1e2c07d2480
> index = 0x8
> mapping = 0xffff8c68f3cd0db0
> flags = 0xfffffc0008095
>
> PAGE-FLAG BIT VALUE
> PG_locked 0 0000001
> PG_uptodate 2 0000004
> PG_lru 4 0000010
> PG_waiters 7 0000080
> PG_writeback 15 0008000
>
>
> inode is ffff8c68f3cd0c40
> inode.i_rwsem is ffff8c68f3cd0ce0
> DENTRY INODE SUPERBLK TYPE PATH
> ffff8c68a1f1b480 ffff8c68f3cd0c40 ffff8c6915bf9000 REG
> /mnt/vm1_smb/testfile.8853
>
>
> this process holds the inode->i_rwsem for the parent directory, is
> laundering a page attached to the inode of the file it's opening, and in
> _cifsFileInfo_put is trying to down_write the cifsInodeInflock_sem
> for the file itself.
>
>
> <struct rw_semaphore 0xffff8c68f3cd0ce0>:
> owner: <struct task_struct 0xffff8c6914272e80> (UN - 8854 -
> reopen_file), counter: 0x0000000000000003
> waitlist: 1
> 0xffff9965005dfd80 8855 reopen_file UN 0 1:29:22.912
> RWSEM_WAITING_FOR_WRITE
>
> this is the inode.i_rwsem for the file
>
> the owner:
>
> [0 00:48:22.739] [UN] PID: 8854 TASK: ffff8c6914272e80 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff99650054fb38] __schedule at ffffffff9b6e6095
> #1 [ffff99650054fbc8] schedule at ffffffff9b6e64df
> #2 [ffff99650054fbd8] io_schedule at ffffffff9b6e68e2
> #3 [ffff99650054fbe8] __lock_page at ffffffff9b03c56f
> #4 [ffff99650054fc80] pagecache_get_page at ffffffff9b03dcdf
> #5 [ffff99650054fcc0] grab_cache_page_write_begin at ffffffff9b03ef4c
> #6 [ffff99650054fcd0] cifs_write_begin at ffffffffc0a064ec [cifs]
> #7 [ffff99650054fd30] generic_perform_write at ffffffff9b03bba4
> #8 [ffff99650054fda8] __generic_file_write_iter at ffffffff9b04060a
> #9 [ffff99650054fdf0] cifs_strict_writev.cold.70 at ffffffffc0a4469b [cifs]
> #10 [ffff99650054fe48] new_sync_write at ffffffff9b0ec1dd
> #11 [ffff99650054fed0] vfs_write at ffffffff9b0eed35
> #12 [ffff99650054ff00] ksys_write at ffffffff9b0eefd9
> #13 [ffff99650054ff38] do_syscall_64 at ffffffff9ae04315
>
> the process holds the inode->i_rwsem for the file to which it's writing,
> and is trying to __lock_page for the same page as in the other processes
>
>
> the other tasks:
> [0 00:00:00.028] [UN] PID: 8859 TASK: ffff8c6915479740 CPU: 2
> COMMAND: "reopen_file"
> #0 [ffff9965007b39d8] __schedule at ffffffff9b6e6095
> #1 [ffff9965007b3a68] schedule at ffffffff9b6e64df
> #2 [ffff9965007b3a78] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007b3af0] msleep at ffffffff9af573a9
> #4 [ffff9965007b3af8] cifs_new_fileinfo.cold.61 at ffffffffc0a42a07 [cifs]
> #5 [ffff9965007b3b78] cifs_open at ffffffffc0a0709d [cifs]
> #6 [ffff9965007b3cd8] do_dentry_open at ffffffff9b0e9b7a
> #7 [ffff9965007b3d08] path_openat at ffffffff9b0fe34f
> #8 [ffff9965007b3dd8] do_filp_open at ffffffff9b100a33
> #9 [ffff9965007b3ee0] do_sys_open at ffffffff9b0eb2d6
> #10 [ffff9965007b3f38] do_syscall_64 at ffffffff9ae04315
>
> this is opening the file, and is trying to down_write cinode->lock_sem
>
>
> [0 00:00:00.041] [UN] PID: 8860 TASK: ffff8c691547ae80 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.057] [UN] PID: 8861 TASK: ffff8c6915478000 CPU: 3
> COMMAND: "reopen_file"
> [0 00:00:00.059] [UN] PID: 8858 TASK: ffff8c6914271740 CPU: 2
> COMMAND: "reopen_file"
> [0 00:00:00.109] [UN] PID: 8862 TASK: ffff8c691547dd00 CPU: 6
> COMMAND: "reopen_file"
> #0 [ffff9965007c3c78] __schedule at ffffffff9b6e6095
> #1 [ffff9965007c3d08] schedule at ffffffff9b6e64df
> #2 [ffff9965007c3d18] schedule_timeout at ffffffff9b6e9f89
> #3 [ffff9965007c3d90] msleep at ffffffff9af573a9
> #4 [ffff9965007c3d98] _cifsFileInfo_put.cold.63 at ffffffffc0a42dd6 [cifs]
> #5 [ffff9965007c3e88] cifs_close at ffffffffc0a07aaf [cifs]
> #6 [ffff9965007c3ea0] __fput at ffffffff9b0efa6e
> #7 [ffff9965007c3ee8] task_work_run at ffffffff9aef1614
> #8 [ffff9965007c3f20] exit_to_usermode_loop at ffffffff9ae03d6f
> #9 [ffff9965007c3f38] do_syscall_64 at ffffffff9ae0444c
>
> closing the file, and trying to down_write cifsi->lock_sem
>
>
> [0 00:48:22.839] [UN] PID: 8857 TASK: ffff8c6914270000 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965006a7cc8] __schedule at ffffffff9b6e6095
> #1 [ffff9965006a7d58] schedule at ffffffff9b6e64df
> #2 [ffff9965006a7d68] io_schedule at ffffffff9b6e68e2
> #3 [ffff9965006a7d78] wait_on_page_bit at ffffffff9b03cac6
> #4 [ffff9965006a7e10] __filemap_fdatawait_range at ffffffff9b03b028
> #5 [ffff9965006a7ed8] filemap_write_and_wait at ffffffff9b040165
> #6 [ffff9965006a7ef0] cifs_flush at ffffffffc0a0c2fa [cifs]
> #7 [ffff9965006a7f10] filp_close at ffffffff9b0e93f1
> #8 [ffff9965006a7f30] __x64_sys_close at ffffffff9b0e9a0e
> #9 [ffff9965006a7f38] do_syscall_64 at ffffffff9ae04315
>
> in __filemap_fdatawait_range
> wait_on_page_writeback(page);
> for the same page of the file
>
>
>
> [0 00:48:22.718] [UN] PID: 8855 TASK: ffff8c69142745c0 CPU: 7
> COMMAND: "reopen_file"
> #0 [ffff9965005dfc98] __schedule at ffffffff9b6e6095
> #1 [ffff9965005dfd28] schedule at ffffffff9b6e64df
> #2 [ffff9965005dfd38] rwsem_down_write_slowpath at ffffffff9af283d7
> #3 [ffff9965005dfdf0] cifs_strict_writev at ffffffffc0a0c40a [cifs]
> #4 [ffff9965005dfe48] new_sync_write at ffffffff9b0ec1dd
> #5 [ffff9965005dfed0] vfs_write at ffffffff9b0eed35
> #6 [ffff9965005dff00] ksys_write at ffffffff9b0eefd9
> #7 [ffff9965005dff38] do_syscall_64 at ffffffff9ae04315
>
> inode_lock(inode);
>
>
> and one 'ls' later on, to see whether the rest of the mount is available
> (the test file is in the root, so we get blocked up on the directory
> ->i_rwsem), so the entire mount is unavailable
>
> [0 00:36:26.473] [UN] PID: 9802 TASK: ffff8c691436ae80 CPU: 4
> COMMAND: "ls"
> #0 [ffff996500393d28] __schedule at ffffffff9b6e6095
> #1 [ffff996500393db8] schedule at ffffffff9b6e64df
> #2 [ffff996500393dc8] rwsem_down_read_slowpath at ffffffff9b6e9421
> #3 [ffff996500393e78] down_read_killable at ffffffff9b6e95e2
> #4 [ffff996500393e88] iterate_dir at ffffffff9b103c56
> #5 [ffff996500393ec8] ksys_getdents64 at ffffffff9b104b0c
> #6 [ffff996500393f30] __x64_sys_getdents64 at ffffffff9b104bb6
> #7 [ffff996500393f38] do_syscall_64 at ffffffff9ae04315
>
> in iterate_dir:
> if (shared)
> res = down_read_killable(&inode->i_rwsem); <<<<
> else
> res = down_write_killable(&inode->i_rwsem);
>
Reported-by: Frank Sorenson <sorenson@redhat.com>
Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
2019-11-03 10:06:37 +07:00
|
|
|
_cifsFileInfo_put(cfile, false /* do not wait for ourself */, false);
|
2014-03-11 23:11:47 +07:00
|
|
|
cifs_done_oplock_break(cinode);
|
2009-09-21 17:47:50 +07:00
|
|
|
}
|
|
|
|
|
2013-11-12 05:42:37 +07:00
|
|
|
/*
|
|
|
|
* The presence of cifs_direct_io() in the address space ops vector
|
|
|
|
* allowes open() O_DIRECT flags which would have failed otherwise.
|
|
|
|
*
|
|
|
|
* In the non-cached mode (mount with cache=none), we shunt off direct read and write requests
|
|
|
|
* so this method should never be called.
|
|
|
|
*
|
|
|
|
* Direct IO is not yet supported in the cached mode.
|
|
|
|
*/
|
|
|
|
static ssize_t
|
2016-04-07 22:51:58 +07:00
|
|
|
cifs_direct_io(struct kiocb *iocb, struct iov_iter *iter)
|
2013-11-12 05:42:37 +07:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* FIXME
|
|
|
|
* Eventually need to support direct IO for non forcedirectio mounts
|
|
|
|
*/
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-06-28 18:26:44 +07:00
|
|
|
const struct address_space_operations cifs_addr_ops = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.readpage = cifs_readpage,
|
|
|
|
.readpages = cifs_readpages,
|
|
|
|
.writepage = cifs_writepage,
|
2005-10-06 04:50:29 +07:00
|
|
|
.writepages = cifs_writepages,
|
2008-09-24 22:32:59 +07:00
|
|
|
.write_begin = cifs_write_begin,
|
|
|
|
.write_end = cifs_write_end,
|
2005-04-17 05:20:36 +07:00
|
|
|
.set_page_dirty = __set_page_dirty_nobuffers,
|
2010-07-05 19:43:00 +07:00
|
|
|
.releasepage = cifs_release_page,
|
2013-11-12 05:42:37 +07:00
|
|
|
.direct_IO = cifs_direct_io,
|
2010-07-05 19:43:00 +07:00
|
|
|
.invalidatepage = cifs_invalidate_page,
|
2011-04-08 08:29:10 +07:00
|
|
|
.launder_page = cifs_launder_page,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
2006-06-02 02:41:23 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* cifs_readpages requires the server to support a buffer large enough to
|
|
|
|
* contain the header plus one complete page of data. Otherwise, we need
|
|
|
|
* to leave cifs_readpages out of the address space operations.
|
|
|
|
*/
|
2006-06-28 18:26:44 +07:00
|
|
|
const struct address_space_operations cifs_addr_ops_smallbuf = {
|
2006-06-02 02:41:23 +07:00
|
|
|
.readpage = cifs_readpage,
|
|
|
|
.writepage = cifs_writepage,
|
|
|
|
.writepages = cifs_writepages,
|
2008-09-24 22:32:59 +07:00
|
|
|
.write_begin = cifs_write_begin,
|
|
|
|
.write_end = cifs_write_end,
|
2006-06-02 02:41:23 +07:00
|
|
|
.set_page_dirty = __set_page_dirty_nobuffers,
|
2010-07-05 19:43:00 +07:00
|
|
|
.releasepage = cifs_release_page,
|
|
|
|
.invalidatepage = cifs_invalidate_page,
|
2011-04-08 08:29:10 +07:00
|
|
|
.launder_page = cifs_launder_page,
|
2006-06-02 02:41:23 +07:00
|
|
|
};
|