License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2010-04-07 06:14:15 +08:00
|
|
|
#include <linux/ceph/ceph_debug.h>
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
#include <linux/backing-dev.h>
|
|
|
|
#include <linux/fs.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/writeback.h> /* generic_writepages */
|
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 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2009-10-07 02:31:09 +08:00
|
|
|
#include <linux/pagevec.h>
|
|
|
|
#include <linux/task_io_accounting_ops.h>
|
2017-02-04 06:47:37 +08:00
|
|
|
#include <linux/signal.h>
|
2019-06-06 20:57:27 +08:00
|
|
|
#include <linux/iversion.h>
|
2020-03-20 11:45:01 +08:00
|
|
|
#include <linux/ktime.h>
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
#include "super.h"
|
2010-04-07 06:14:15 +08:00
|
|
|
#include "mds_client.h"
|
2013-08-22 05:29:54 +08:00
|
|
|
#include "cache.h"
|
2020-03-20 11:45:01 +08:00
|
|
|
#include "metric.h"
|
2010-04-07 06:14:15 +08:00
|
|
|
#include <linux/ceph/osd_client.h>
|
2018-02-17 17:41:20 +08:00
|
|
|
#include <linux/ceph/striper.h>
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Ceph address space ops.
|
|
|
|
*
|
|
|
|
* There are a few funny things going on here.
|
|
|
|
*
|
|
|
|
* The page->private field is used to reference a struct
|
|
|
|
* ceph_snap_context for _every_ dirty page. This indicates which
|
|
|
|
* snapshot the page was logically dirtied in, and thus which snap
|
|
|
|
* context needs to be associated with the osd write during writeback.
|
|
|
|
*
|
|
|
|
* Similarly, struct ceph_inode_info maintains a set of counters to
|
2011-03-31 09:57:33 +08:00
|
|
|
* count dirty pages on the inode. In the absence of snapshots,
|
2009-10-07 02:31:09 +08:00
|
|
|
* i_wrbuffer_ref == i_wrbuffer_ref_head == the dirty page count.
|
|
|
|
*
|
|
|
|
* When a snapshot is taken (that is, when the client receives
|
|
|
|
* notification that a snapshot was taken), each inode with caps and
|
|
|
|
* with dirty pages (dirty pages implies there is a cap) gets a new
|
|
|
|
* ceph_cap_snap in the i_cap_snaps list (which is sorted in ascending
|
|
|
|
* order, new snaps go to the tail). The i_wrbuffer_ref_head count is
|
|
|
|
* moved to capsnap->dirty. (Unless a sync write is currently in
|
|
|
|
* progress. In that case, the capsnap is said to be "pending", new
|
|
|
|
* writes cannot start, and the capsnap isn't "finalized" until the
|
|
|
|
* write completes (or fails) and a final size/mtime for the inode for
|
|
|
|
* that snap can be settled upon.) i_wrbuffer_ref_head is reset to 0.
|
|
|
|
*
|
|
|
|
* On writeback, we must submit writes to the osd IN SNAP ORDER. So,
|
|
|
|
* we look for the first capsnap in i_cap_snaps and write out pages in
|
|
|
|
* that snap context _only_. Then we move on to the next capsnap,
|
|
|
|
* eventually reaching the "live" or "head" context (i.e., pages that
|
|
|
|
* are not yet snapped) and are writing the most recently dirtied
|
|
|
|
* pages.
|
|
|
|
*
|
|
|
|
* Invalidate and so forth must take care to ensure the dirty page
|
|
|
|
* accounting is preserved.
|
|
|
|
*/
|
|
|
|
|
2009-12-19 05:51:57 +08:00
|
|
|
#define CONGESTION_ON_THRESH(congestion_kb) (congestion_kb >> (PAGE_SHIFT-10))
|
|
|
|
#define CONGESTION_OFF_THRESH(congestion_kb) \
|
|
|
|
(CONGESTION_ON_THRESH(congestion_kb) - \
|
|
|
|
(CONGESTION_ON_THRESH(congestion_kb) >> 2))
|
|
|
|
|
2012-05-28 14:44:30 +08:00
|
|
|
static inline struct ceph_snap_context *page_snap_context(struct page *page)
|
|
|
|
{
|
|
|
|
if (PagePrivate(page))
|
|
|
|
return (void *)page->private;
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Dirty a page. Optimistically adjust accounting, on the assumption
|
|
|
|
* that we won't race with invalidate. If we do, readjust.
|
|
|
|
*/
|
|
|
|
static int ceph_set_page_dirty(struct page *page)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = page->mapping;
|
|
|
|
struct inode *inode;
|
|
|
|
struct ceph_inode_info *ci;
|
|
|
|
struct ceph_snap_context *snapc;
|
2013-08-21 16:27:34 +08:00
|
|
|
int ret;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
if (unlikely(!mapping))
|
|
|
|
return !TestSetPageDirty(page);
|
|
|
|
|
2013-08-21 16:27:34 +08:00
|
|
|
if (PageDirty(page)) {
|
2009-10-07 02:31:09 +08:00
|
|
|
dout("%p set_page_dirty %p idx %lu -- already dirty\n",
|
|
|
|
mapping->host, page, page->index);
|
2013-08-21 16:27:34 +08:00
|
|
|
BUG_ON(!PagePrivate(page));
|
2009-10-07 02:31:09 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
inode = mapping->host;
|
|
|
|
ci = ceph_inode(inode);
|
|
|
|
|
|
|
|
/* dirty the head */
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2015-04-30 14:40:54 +08:00
|
|
|
BUG_ON(ci->i_wr_ref == 0); // caller should hold Fw reference
|
|
|
|
if (__ceph_have_pending_cap_snap(ci)) {
|
|
|
|
struct ceph_cap_snap *capsnap =
|
|
|
|
list_last_entry(&ci->i_cap_snaps,
|
|
|
|
struct ceph_cap_snap,
|
|
|
|
ci_item);
|
|
|
|
snapc = ceph_get_snap_context(capsnap->context);
|
|
|
|
capsnap->dirty_pages++;
|
|
|
|
} else {
|
|
|
|
BUG_ON(!ci->i_head_snapc);
|
|
|
|
snapc = ceph_get_snap_context(ci->i_head_snapc);
|
|
|
|
++ci->i_wrbuffer_ref_head;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
if (ci->i_wrbuffer_ref == 0)
|
2011-03-29 15:08:50 +08:00
|
|
|
ihold(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
++ci->i_wrbuffer_ref;
|
|
|
|
dout("%p set_page_dirty %p idx %lu head %d/%d -> %d/%d "
|
|
|
|
"snapc %p seq %lld (%d snaps)\n",
|
|
|
|
mapping->host, page, page->index,
|
|
|
|
ci->i_wrbuffer_ref-1, ci->i_wrbuffer_ref_head-1,
|
|
|
|
ci->i_wrbuffer_ref, ci->i_wrbuffer_ref_head,
|
|
|
|
snapc, snapc->seq, snapc->num_snaps);
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2013-08-21 16:27:34 +08:00
|
|
|
/*
|
|
|
|
* Reference snap context in page->private. Also set
|
|
|
|
* PagePrivate so that we get invalidatepage callback.
|
|
|
|
*/
|
|
|
|
BUG_ON(PagePrivate(page));
|
|
|
|
page->private = (unsigned long)snapc;
|
|
|
|
SetPagePrivate(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2013-08-21 16:27:34 +08:00
|
|
|
ret = __set_page_dirty_nobuffers(page);
|
|
|
|
WARN_ON(!PageLocked(page));
|
|
|
|
WARN_ON(!page->mapping);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2013-08-21 16:27:34 +08:00
|
|
|
return ret;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we are truncating the full page (i.e. offset == 0), adjust the
|
|
|
|
* dirty page counters appropriately. Only called if there is private
|
|
|
|
* data on the page.
|
|
|
|
*/
|
2013-05-22 11:17:23 +08:00
|
|
|
static void ceph_invalidatepage(struct page *page, unsigned int offset,
|
|
|
|
unsigned int length)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2010-02-22 22:17:44 +08:00
|
|
|
struct inode *inode;
|
2009-10-07 02:31:09 +08:00
|
|
|
struct ceph_inode_info *ci;
|
2012-05-28 14:44:30 +08:00
|
|
|
struct ceph_snap_context *snapc = page_snap_context(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2010-02-22 22:17:44 +08:00
|
|
|
inode = page->mapping->host;
|
2013-08-10 00:59:55 +08:00
|
|
|
ci = ceph_inode(inode);
|
|
|
|
|
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 20:29:47 +08:00
|
|
|
if (offset != 0 || length != PAGE_SIZE) {
|
2013-08-10 00:59:55 +08:00
|
|
|
dout("%p invalidatepage %p idx %lu partial dirty page %u~%u\n",
|
|
|
|
inode, page, page->index, offset, length);
|
|
|
|
return;
|
|
|
|
}
|
2010-02-22 22:17:44 +08:00
|
|
|
|
2013-08-22 05:29:54 +08:00
|
|
|
ceph_invalidate_fscache_page(inode, page);
|
|
|
|
|
2017-08-30 11:27:29 +08:00
|
|
|
WARN_ON(!PageLocked(page));
|
2013-08-22 05:29:54 +08:00
|
|
|
if (!PagePrivate(page))
|
|
|
|
return;
|
|
|
|
|
2013-08-10 00:59:55 +08:00
|
|
|
dout("%p invalidatepage %p idx %lu full dirty page\n",
|
|
|
|
inode, page, page->index);
|
|
|
|
|
|
|
|
ceph_put_wrbuffer_cap_refs(ci, 1, snapc);
|
|
|
|
ceph_put_snap_context(snapc);
|
|
|
|
page->private = 0;
|
|
|
|
ClearPagePrivate(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int ceph_releasepage(struct page *page, gfp_t g)
|
|
|
|
{
|
2016-08-31 10:59:29 +08:00
|
|
|
dout("%p releasepage %p idx %lu (%sdirty)\n", page->mapping->host,
|
|
|
|
page, page->index, PageDirty(page) ? "" : "not ");
|
2013-08-22 05:29:54 +08:00
|
|
|
|
|
|
|
/* Can we release the page from the cache? */
|
|
|
|
if (!ceph_release_fscache_page(page, g))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return !PagePrivate(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
2020-01-29 16:27:07 +08:00
|
|
|
/*
|
|
|
|
* Read some contiguous pages. If we cross a stripe boundary, shorten
|
|
|
|
* *plen. Return number of bytes read, or error.
|
|
|
|
*/
|
|
|
|
static int ceph_sync_readpages(struct ceph_fs_client *fsc,
|
|
|
|
struct ceph_vino vino,
|
|
|
|
struct ceph_file_layout *layout,
|
|
|
|
u64 off, u64 *plen,
|
|
|
|
u32 truncate_seq, u64 truncate_size,
|
|
|
|
struct page **pages, int num_pages,
|
|
|
|
int page_align)
|
|
|
|
{
|
|
|
|
struct ceph_osd_client *osdc = &fsc->client->osdc;
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
dout("readpages on ino %llx.%llx on %llu~%llu\n", vino.ino,
|
|
|
|
vino.snap, off, *plen);
|
|
|
|
req = ceph_osdc_new_request(osdc, layout, vino, off, plen, 0, 1,
|
|
|
|
CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,
|
|
|
|
NULL, truncate_seq, truncate_size,
|
|
|
|
false);
|
|
|
|
if (IS_ERR(req))
|
|
|
|
return PTR_ERR(req);
|
|
|
|
|
|
|
|
/* it may be a short read due to an object boundary */
|
|
|
|
osd_req_op_extent_osd_data_pages(req, 0,
|
|
|
|
pages, *plen, page_align, false, false);
|
|
|
|
|
|
|
|
dout("readpages final extent is %llu~%llu (%llu bytes align %d)\n",
|
|
|
|
off, *plen, *plen, page_align);
|
|
|
|
|
|
|
|
rc = ceph_osdc_start_request(osdc, req, false);
|
|
|
|
if (!rc)
|
|
|
|
rc = ceph_osdc_wait_request(osdc, req);
|
|
|
|
|
2020-03-20 11:45:01 +08:00
|
|
|
ceph_update_read_latency(&fsc->mdsc->metric, req->r_start_latency,
|
|
|
|
req->r_end_latency, rc);
|
|
|
|
|
2020-01-29 16:27:07 +08:00
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
dout("readpages result %d\n", rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* read a single page, without unlocking it.
|
|
|
|
*/
|
2017-08-04 11:22:31 +08:00
|
|
|
static int ceph_do_readpage(struct file *filp, struct page *page)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(filp);
|
2009-10-07 02:31:09 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2019-07-25 20:16:47 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
int err = 0;
|
2014-11-14 22:36:18 +08:00
|
|
|
u64 off = 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 20:29:47 +08:00
|
|
|
u64 len = PAGE_SIZE;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
if (off >= i_size_read(inode)) {
|
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 20:29:47 +08:00
|
|
|
zero_user_segment(page, 0, PAGE_SIZE);
|
2014-11-14 22:36:18 +08:00
|
|
|
SetPageUptodate(page);
|
|
|
|
return 0;
|
|
|
|
}
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2015-01-10 11:43:12 +08:00
|
|
|
if (ci->i_inline_version != CEPH_INLINE_NONE) {
|
|
|
|
/*
|
|
|
|
* Uptodate inline data should have been added
|
|
|
|
* into page cache while getting Fcr caps.
|
|
|
|
*/
|
|
|
|
if (off == 0)
|
|
|
|
return -EINVAL;
|
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 20:29:47 +08:00
|
|
|
zero_user_segment(page, 0, PAGE_SIZE);
|
2015-01-10 11:43:12 +08:00
|
|
|
SetPageUptodate(page);
|
|
|
|
return 0;
|
|
|
|
}
|
2014-11-14 22:36:18 +08:00
|
|
|
|
|
|
|
err = ceph_readpage_from_fscache(inode, page);
|
2013-08-22 05:29:54 +08:00
|
|
|
if (err == 0)
|
2017-08-04 11:22:31 +08:00
|
|
|
return -EINPROGRESS;
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
dout("readpage inode %p file %p page %p index %lu\n",
|
|
|
|
inode, filp, page, page->index);
|
2020-01-29 16:27:07 +08:00
|
|
|
err = ceph_sync_readpages(fsc, ceph_vino(inode),
|
2019-07-25 20:16:47 +08:00
|
|
|
&ci->i_layout, off, &len,
|
2009-10-07 02:31:09 +08:00
|
|
|
ci->i_truncate_seq, ci->i_truncate_size,
|
2010-11-10 04:43:12 +08:00
|
|
|
&page, 1, 0);
|
2009-10-07 02:31:09 +08:00
|
|
|
if (err == -ENOENT)
|
|
|
|
err = 0;
|
|
|
|
if (err < 0) {
|
|
|
|
SetPageError(page);
|
2013-12-19 22:03:49 +08:00
|
|
|
ceph_fscache_readpage_cancel(inode, page);
|
2019-07-25 20:16:47 +08:00
|
|
|
if (err == -EBLACKLISTED)
|
|
|
|
fsc->blacklisted = true;
|
2009-10-07 02:31:09 +08:00
|
|
|
goto out;
|
|
|
|
}
|
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 20:29:47 +08:00
|
|
|
if (err < PAGE_SIZE)
|
2014-05-28 15:09:55 +08:00
|
|
|
/* zero fill remainder of 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 20:29:47 +08:00
|
|
|
zero_user_segment(page, err, PAGE_SIZE);
|
2014-05-28 15:09:55 +08:00
|
|
|
else
|
|
|
|
flush_dcache_page(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2014-05-28 15:09:55 +08:00
|
|
|
SetPageUptodate(page);
|
|
|
|
ceph_readpage_to_fscache(inode, page);
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
out:
|
|
|
|
return err < 0 ? err : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ceph_readpage(struct file *filp, struct page *page)
|
|
|
|
{
|
2017-08-04 11:22:31 +08:00
|
|
|
int r = ceph_do_readpage(filp, page);
|
|
|
|
if (r != -EINPROGRESS)
|
|
|
|
unlock_page(page);
|
|
|
|
else
|
|
|
|
r = 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2011-08-04 00:58:09 +08:00
|
|
|
* Finish an async read(ahead) op.
|
2009-10-07 02:31:09 +08:00
|
|
|
*/
|
2016-04-28 22:07:24 +08:00
|
|
|
static void finish_read(struct ceph_osd_request *req)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2011-08-04 00:58:09 +08:00
|
|
|
struct inode *inode = req->r_inode;
|
2020-03-20 11:45:01 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2013-04-03 14:28:58 +08:00
|
|
|
struct ceph_osd_data *osd_data;
|
2016-04-28 22:07:24 +08:00
|
|
|
int rc = req->r_result <= 0 ? req->r_result : 0;
|
|
|
|
int bytes = req->r_result >= 0 ? req->r_result : 0;
|
2013-03-08 05:38:25 +08:00
|
|
|
int num_pages;
|
2011-08-04 00:58:09 +08:00
|
|
|
int i;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("finish_read %p req %p rc %d bytes %d\n", inode, req, rc, bytes);
|
2019-07-25 20:16:47 +08:00
|
|
|
if (rc == -EBLACKLISTED)
|
|
|
|
ceph_inode_to_client(inode)->blacklisted = true;
|
2011-08-04 00:58:09 +08:00
|
|
|
|
|
|
|
/* unlock all pages, zeroing any data we didn't read */
|
2013-04-16 03:50:36 +08:00
|
|
|
osd_data = osd_req_op_extent_osd_data(req, 0);
|
2013-04-03 14:28:58 +08:00
|
|
|
BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES);
|
|
|
|
num_pages = calc_pages_for((u64)osd_data->alignment,
|
|
|
|
(u64)osd_data->length);
|
2013-03-08 05:38:25 +08:00
|
|
|
for (i = 0; i < num_pages; i++) {
|
2013-04-03 14:28:58 +08:00
|
|
|
struct page *page = osd_data->pages[i];
|
2011-08-04 00:58:09 +08:00
|
|
|
|
2016-05-17 11:58:02 +08:00
|
|
|
if (rc < 0 && rc != -ENOENT) {
|
|
|
|
ceph_fscache_readpage_cancel(inode, page);
|
2013-11-27 22:28:13 +08:00
|
|
|
goto unlock;
|
2016-05-17 11:58:02 +08: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 20:29:47 +08:00
|
|
|
if (bytes < (int)PAGE_SIZE) {
|
2011-08-04 00:58:09 +08:00
|
|
|
/* zero (remainder of) page */
|
|
|
|
int s = bytes < 0 ? 0 : bytes;
|
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 20:29:47 +08:00
|
|
|
zero_user_segment(page, s, PAGE_SIZE);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("finish_read %p uptodate %p idx %lu\n", inode, page,
|
|
|
|
page->index);
|
|
|
|
flush_dcache_page(page);
|
|
|
|
SetPageUptodate(page);
|
2013-08-22 05:29:54 +08:00
|
|
|
ceph_readpage_to_fscache(inode, page);
|
2013-11-27 22:28:13 +08:00
|
|
|
unlock:
|
2011-08-04 00:58:09 +08:00
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
|
|
|
bytes -= PAGE_SIZE;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2020-03-20 11:45:01 +08:00
|
|
|
|
|
|
|
ceph_update_read_latency(&fsc->mdsc->metric, req->r_start_latency,
|
|
|
|
req->r_end_latency, rc);
|
|
|
|
|
2013-04-03 14:28:58 +08:00
|
|
|
kfree(osd_data->pages);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2011-08-04 00:58:09 +08:00
|
|
|
* start an async read(ahead) operation. return nr_pages we submitted
|
|
|
|
* a read for on success, or negative error code.
|
2009-10-07 02:31:09 +08:00
|
|
|
*/
|
2017-12-15 11:15:36 +08:00
|
|
|
static int start_read(struct inode *inode, struct ceph_rw_context *rw_ctx,
|
|
|
|
struct list_head *page_list, int max)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_osd_client *osdc =
|
|
|
|
&ceph_inode_to_client(inode)->client->osdc;
|
2011-08-04 00:58:09 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2019-01-04 07:29:02 +08:00
|
|
|
struct page *page = lru_to_page(page_list);
|
2013-03-15 03:09:05 +08:00
|
|
|
struct ceph_vino vino;
|
2011-08-04 00:58:09 +08:00
|
|
|
struct ceph_osd_request *req;
|
|
|
|
u64 off;
|
2009-10-07 02:31:09 +08:00
|
|
|
u64 len;
|
2011-08-04 00:58:09 +08:00
|
|
|
int i;
|
|
|
|
struct page **pages;
|
|
|
|
pgoff_t next_index;
|
|
|
|
int nr_pages = 0;
|
2016-10-25 10:51:55 +08:00
|
|
|
int got = 0;
|
|
|
|
int ret = 0;
|
|
|
|
|
2017-12-15 11:15:36 +08:00
|
|
|
if (!rw_ctx) {
|
2016-10-25 10:51:55 +08:00
|
|
|
/* caller of readpages does not hold buffer and read caps
|
|
|
|
* (fadvise, madvise and readahead cases) */
|
|
|
|
int want = CEPH_CAP_FILE_CACHE;
|
2019-07-25 20:16:43 +08:00
|
|
|
ret = ceph_try_get_caps(inode, CEPH_CAP_FILE_RD, want,
|
|
|
|
true, &got);
|
2016-10-25 10:51:55 +08:00
|
|
|
if (ret < 0) {
|
|
|
|
dout("start_read %p, error getting cap\n", inode);
|
|
|
|
} else if (!(got & want)) {
|
|
|
|
dout("start_read %p, no cache cap\n", inode);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
if (ret <= 0) {
|
|
|
|
if (got)
|
|
|
|
ceph_put_cap_refs(ci, got);
|
|
|
|
while (!list_empty(page_list)) {
|
2019-01-04 07:29:02 +08:00
|
|
|
page = lru_to_page(page_list);
|
2016-10-25 10:51:55 +08:00
|
|
|
list_del(&page->lru);
|
|
|
|
put_page(page);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2012-10-02 23:25:51 +08:00
|
|
|
off = (u64) page_offset(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
/* count pages */
|
|
|
|
next_index = page->index;
|
|
|
|
list_for_each_entry_reverse(page, page_list, lru) {
|
|
|
|
if (page->index != next_index)
|
|
|
|
break;
|
|
|
|
nr_pages++;
|
|
|
|
next_index++;
|
2011-08-04 23:21:30 +08:00
|
|
|
if (max && nr_pages == max)
|
|
|
|
break;
|
2011-08-04 00:58:09 +08: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 20:29:47 +08:00
|
|
|
len = nr_pages << PAGE_SHIFT;
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("start_read %p nr_pages %d is %lld~%lld\n", inode, nr_pages,
|
|
|
|
off, len);
|
2013-03-15 03:09:05 +08:00
|
|
|
vino = ceph_vino(inode);
|
|
|
|
req = ceph_osdc_new_request(osdc, &ci->i_layout, vino, off, &len,
|
2014-11-13 14:40:37 +08:00
|
|
|
0, 1, CEPH_OSD_OP_READ,
|
2013-03-15 03:09:05 +08:00
|
|
|
CEPH_OSD_FLAG_READ, NULL,
|
2011-08-04 00:58:09 +08:00
|
|
|
ci->i_truncate_seq, ci->i_truncate_size,
|
2013-03-15 03:09:05 +08:00
|
|
|
false);
|
2016-10-25 10:51:55 +08:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
ret = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
/* build page vector */
|
2013-03-02 08:00:15 +08:00
|
|
|
nr_pages = calc_pages_for(0, len);
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(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 tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- 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;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- 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;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
pages = kmalloc_array(nr_pages, sizeof(*pages), GFP_KERNEL);
|
2016-10-25 10:51:55 +08:00
|
|
|
if (!pages) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_put;
|
|
|
|
}
|
2011-08-04 00:58:09 +08:00
|
|
|
for (i = 0; i < nr_pages; ++i) {
|
|
|
|
page = list_entry(page_list->prev, struct page, lru);
|
|
|
|
BUG_ON(PageLocked(page));
|
2009-10-07 02:31:09 +08:00
|
|
|
list_del(&page->lru);
|
2013-08-22 05:29:54 +08:00
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("start_read %p adding %p idx %lu\n", inode, page,
|
|
|
|
page->index);
|
|
|
|
if (add_to_page_cache_lru(page, &inode->i_data, page->index,
|
2015-06-13 17:27:05 +08:00
|
|
|
GFP_KERNEL)) {
|
2013-09-04 07:11:17 +08:00
|
|
|
ceph_fscache_uncache_page(inode, 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 20:29:47 +08:00
|
|
|
put_page(page);
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("start_read %p add_to_page_cache failed %p\n",
|
2009-10-07 02:31:09 +08:00
|
|
|
inode, page);
|
2011-08-04 00:58:09 +08:00
|
|
|
nr_pages = i;
|
2016-08-24 11:33:46 +08:00
|
|
|
if (nr_pages > 0) {
|
|
|
|
len = nr_pages << PAGE_SHIFT;
|
2017-01-19 11:21:29 +08:00
|
|
|
osd_req_op_extent_update(req, 0, len);
|
2016-08-24 11:33:46 +08:00
|
|
|
break;
|
|
|
|
}
|
2011-08-04 00:58:09 +08:00
|
|
|
goto out_pages;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2011-08-04 00:58:09 +08:00
|
|
|
pages[i] = page;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2013-04-16 03:50:36 +08:00
|
|
|
osd_req_op_extent_osd_data_pages(req, 0, pages, len, 0, false, false);
|
2011-08-04 00:58:09 +08:00
|
|
|
req->r_callback = finish_read;
|
|
|
|
req->r_inode = inode;
|
|
|
|
|
|
|
|
dout("start_read %p starting %p %lld~%lld\n", inode, req, off, len);
|
|
|
|
ret = ceph_osdc_start_request(osdc, req, false);
|
|
|
|
if (ret < 0)
|
|
|
|
goto out_pages;
|
|
|
|
ceph_osdc_put_request(req);
|
2016-10-25 10:51:55 +08:00
|
|
|
|
|
|
|
/* After adding locked pages to page cache, the inode holds cache cap.
|
|
|
|
* So we can drop our cap refs. */
|
|
|
|
if (got)
|
|
|
|
ceph_put_cap_refs(ci, got);
|
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
return nr_pages;
|
|
|
|
|
|
|
|
out_pages:
|
2016-08-24 11:33:46 +08:00
|
|
|
for (i = 0; i < nr_pages; ++i) {
|
|
|
|
ceph_fscache_readpage_cancel(inode, pages[i]);
|
|
|
|
unlock_page(pages[i]);
|
|
|
|
}
|
|
|
|
ceph_put_page_vector(pages, nr_pages, false);
|
2016-10-25 10:51:55 +08:00
|
|
|
out_put:
|
2011-08-04 00:58:09 +08:00
|
|
|
ceph_osdc_put_request(req);
|
2016-10-25 10:51:55 +08:00
|
|
|
out:
|
|
|
|
if (got)
|
|
|
|
ceph_put_cap_refs(ci, got);
|
2011-08-04 00:58:09 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read multiple pages. Leave pages we don't read + unlock in page_list;
|
|
|
|
* the caller (VM) cleans them up.
|
|
|
|
*/
|
|
|
|
static int ceph_readpages(struct file *file, struct address_space *mapping,
|
|
|
|
struct list_head *page_list, unsigned nr_pages)
|
|
|
|
{
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2011-08-04 23:21:30 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2018-02-28 19:43:47 +08:00
|
|
|
struct ceph_file_info *fi = file->private_data;
|
2017-12-15 11:15:36 +08:00
|
|
|
struct ceph_rw_context *rw_ctx;
|
2011-08-04 00:58:09 +08:00
|
|
|
int rc = 0;
|
2011-08-04 23:21:30 +08:00
|
|
|
int max = 0;
|
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
if (ceph_inode(inode)->i_inline_version != CEPH_INLINE_NONE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-08-22 05:29:54 +08:00
|
|
|
rc = ceph_readpages_from_fscache(mapping->host, mapping, page_list,
|
|
|
|
&nr_pages);
|
|
|
|
|
|
|
|
if (rc == 0)
|
|
|
|
goto out;
|
|
|
|
|
2018-02-28 19:43:47 +08:00
|
|
|
rw_ctx = ceph_find_rw_context(fi);
|
2017-07-11 15:56:09 +08:00
|
|
|
max = fsc->mount_options->rsize >> PAGE_SHIFT;
|
2017-12-15 11:15:36 +08:00
|
|
|
dout("readpages %p file %p ctx %p nr_pages %d max %d\n",
|
|
|
|
inode, file, rw_ctx, nr_pages, max);
|
2011-08-04 00:58:09 +08:00
|
|
|
while (!list_empty(page_list)) {
|
2017-12-15 11:15:36 +08:00
|
|
|
rc = start_read(inode, rw_ctx, page_list, max);
|
2011-08-04 00:58:09 +08:00
|
|
|
if (rc < 0)
|
|
|
|
goto out;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
out:
|
2013-08-22 05:30:27 +08:00
|
|
|
ceph_fscache_readpages_cancel(inode, page_list);
|
|
|
|
|
2011-08-04 00:58:09 +08:00
|
|
|
dout("readpages %p file %p ret %d\n", inode, file, rc);
|
2009-10-07 02:31:09 +08:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2017-08-30 11:36:06 +08:00
|
|
|
struct ceph_writeback_ctl
|
|
|
|
{
|
|
|
|
loff_t i_size;
|
|
|
|
u64 truncate_size;
|
|
|
|
u32 truncate_seq;
|
|
|
|
bool size_stable;
|
2017-09-01 16:53:58 +08:00
|
|
|
bool head_snapc;
|
2017-08-30 11:36:06 +08:00
|
|
|
};
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* Get ref for the oldest snapc for an inode with dirty data... that is, the
|
|
|
|
* only snap context we are allowed to write back.
|
|
|
|
*/
|
2017-08-30 11:36:06 +08:00
|
|
|
static struct ceph_snap_context *
|
2017-09-02 10:50:48 +08:00
|
|
|
get_oldest_context(struct inode *inode, struct ceph_writeback_ctl *ctl,
|
|
|
|
struct ceph_snap_context *page_snapc)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_snap_context *snapc = NULL;
|
|
|
|
struct ceph_cap_snap *capsnap = NULL;
|
|
|
|
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2009-10-07 02:31:09 +08:00
|
|
|
list_for_each_entry(capsnap, &ci->i_cap_snaps, ci_item) {
|
|
|
|
dout(" cap_snap %p snapc %p has %d dirty pages\n", capsnap,
|
|
|
|
capsnap->context, capsnap->dirty_pages);
|
2017-09-02 10:50:48 +08:00
|
|
|
if (!capsnap->dirty_pages)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* get i_size, truncate_{seq,size} for page_snapc? */
|
|
|
|
if (snapc && capsnap->context != page_snapc)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (ctl) {
|
|
|
|
if (capsnap->writing) {
|
|
|
|
ctl->i_size = i_size_read(inode);
|
|
|
|
ctl->size_stable = false;
|
|
|
|
} else {
|
|
|
|
ctl->i_size = capsnap->size;
|
|
|
|
ctl->size_stable = true;
|
2017-08-30 11:36:06 +08:00
|
|
|
}
|
2017-09-02 10:50:48 +08:00
|
|
|
ctl->truncate_size = capsnap->truncate_size;
|
|
|
|
ctl->truncate_seq = capsnap->truncate_seq;
|
2017-09-01 16:53:58 +08:00
|
|
|
ctl->head_snapc = false;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2017-09-02 10:50:48 +08:00
|
|
|
|
|
|
|
if (snapc)
|
|
|
|
break;
|
|
|
|
|
|
|
|
snapc = ceph_get_snap_context(capsnap->context);
|
|
|
|
if (!page_snapc ||
|
|
|
|
page_snapc == snapc ||
|
|
|
|
page_snapc->seq > snapc->seq)
|
|
|
|
break;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2010-08-24 23:44:16 +08:00
|
|
|
if (!snapc && ci->i_wrbuffer_ref_head) {
|
2010-04-01 12:52:10 +08:00
|
|
|
snapc = ceph_get_snap_context(ci->i_head_snapc);
|
2009-10-07 02:31:09 +08:00
|
|
|
dout(" head snapc %p has %d dirty pages\n",
|
|
|
|
snapc, ci->i_wrbuffer_ref_head);
|
2017-08-30 11:36:06 +08:00
|
|
|
if (ctl) {
|
|
|
|
ctl->i_size = i_size_read(inode);
|
|
|
|
ctl->truncate_size = ci->i_truncate_size;
|
|
|
|
ctl->truncate_seq = ci->i_truncate_seq;
|
|
|
|
ctl->size_stable = false;
|
2017-09-01 16:53:58 +08:00
|
|
|
ctl->head_snapc = true;
|
2017-08-30 11:36:06 +08:00
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2011-12-01 01:47:09 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
2009-10-07 02:31:09 +08:00
|
|
|
return snapc;
|
|
|
|
}
|
|
|
|
|
2017-08-30 11:36:06 +08:00
|
|
|
static u64 get_writepages_data_length(struct inode *inode,
|
|
|
|
struct page *page, u64 start)
|
|
|
|
{
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_snap_context *snapc = page_snap_context(page);
|
|
|
|
struct ceph_cap_snap *capsnap = NULL;
|
|
|
|
u64 end = i_size_read(inode);
|
|
|
|
|
|
|
|
if (snapc != ci->i_head_snapc) {
|
|
|
|
bool found = false;
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
list_for_each_entry(capsnap, &ci->i_cap_snaps, ci_item) {
|
|
|
|
if (capsnap->context == snapc) {
|
|
|
|
if (!capsnap->writing)
|
|
|
|
end = capsnap->size;
|
|
|
|
found = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
WARN_ON(!found);
|
|
|
|
}
|
|
|
|
if (end > page_offset(page) + PAGE_SIZE)
|
|
|
|
end = page_offset(page) + PAGE_SIZE;
|
|
|
|
return end > start ? end - start : 0;
|
|
|
|
}
|
|
|
|
|
2020-01-29 16:27:07 +08:00
|
|
|
/*
|
|
|
|
* do a synchronous write on N pages
|
|
|
|
*/
|
|
|
|
static int ceph_sync_writepages(struct ceph_fs_client *fsc,
|
|
|
|
struct ceph_vino vino,
|
|
|
|
struct ceph_file_layout *layout,
|
|
|
|
struct ceph_snap_context *snapc,
|
|
|
|
u64 off, u64 len,
|
|
|
|
u32 truncate_seq, u64 truncate_size,
|
|
|
|
struct timespec64 *mtime,
|
|
|
|
struct page **pages, int num_pages)
|
|
|
|
{
|
|
|
|
struct ceph_osd_client *osdc = &fsc->client->osdc;
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
int rc = 0;
|
|
|
|
int page_align = off & ~PAGE_MASK;
|
|
|
|
|
|
|
|
req = ceph_osdc_new_request(osdc, layout, vino, off, &len, 0, 1,
|
|
|
|
CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,
|
|
|
|
snapc, truncate_seq, truncate_size,
|
|
|
|
true);
|
|
|
|
if (IS_ERR(req))
|
|
|
|
return PTR_ERR(req);
|
|
|
|
|
|
|
|
/* it may be a short write due to an object boundary */
|
|
|
|
osd_req_op_extent_osd_data_pages(req, 0, pages, len, page_align,
|
|
|
|
false, false);
|
|
|
|
dout("writepages %llu~%llu (%llu bytes)\n", off, len, len);
|
|
|
|
|
|
|
|
req->r_mtime = *mtime;
|
|
|
|
rc = ceph_osdc_start_request(osdc, req, true);
|
|
|
|
if (!rc)
|
|
|
|
rc = ceph_osdc_wait_request(osdc, req);
|
|
|
|
|
2020-03-20 11:45:01 +08:00
|
|
|
ceph_update_write_latency(&fsc->mdsc->metric, req->r_start_latency,
|
|
|
|
req->r_end_latency, rc);
|
|
|
|
|
2020-01-29 16:27:07 +08:00
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
if (rc == 0)
|
|
|
|
rc = len;
|
|
|
|
dout("writepages result %d\n", rc);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* Write a single page, but leave the page locked.
|
|
|
|
*
|
2019-07-03 00:35:52 +08:00
|
|
|
* If we get a write error, mark the mapping for error, but still adjust the
|
2009-10-07 02:31:09 +08:00
|
|
|
* dirty page accounting (i.e., page is no longer dirty).
|
|
|
|
*/
|
|
|
|
static int writepage_nounlock(struct page *page, struct writeback_control *wbc)
|
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
struct ceph_inode_info *ci;
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc;
|
2010-04-01 13:01:38 +08:00
|
|
|
struct ceph_snap_context *snapc, *oldest;
|
2013-05-31 16:48:29 +08:00
|
|
|
loff_t page_off = page_offset(page);
|
2017-05-23 17:48:28 +08:00
|
|
|
int err, len = PAGE_SIZE;
|
2017-08-30 11:36:06 +08:00
|
|
|
struct ceph_writeback_ctl ceph_wbc;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
dout("writepage %p idx %lu\n", page, page->index);
|
|
|
|
|
|
|
|
inode = page->mapping->host;
|
|
|
|
ci = ceph_inode(inode);
|
2010-04-07 06:14:15 +08:00
|
|
|
fsc = ceph_inode_to_client(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/* verify this is a writeable snap context */
|
2012-05-28 14:44:30 +08:00
|
|
|
snapc = page_snap_context(page);
|
2017-08-21 02:22:02 +08:00
|
|
|
if (!snapc) {
|
2009-10-07 02:31:09 +08:00
|
|
|
dout("writepage %p page %p not dirty?\n", inode, page);
|
2017-05-23 17:48:28 +08:00
|
|
|
return 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2017-09-02 10:50:48 +08:00
|
|
|
oldest = get_oldest_context(inode, &ceph_wbc, snapc);
|
2010-04-01 13:01:38 +08:00
|
|
|
if (snapc->seq > oldest->seq) {
|
2009-10-07 02:31:09 +08:00
|
|
|
dout("writepage %p page %p snapc %p not writeable - noop\n",
|
2012-05-28 14:44:30 +08:00
|
|
|
inode, page, snapc);
|
2009-10-07 02:31:09 +08:00
|
|
|
/* we should only noop if called by kswapd */
|
2017-05-23 17:18:53 +08:00
|
|
|
WARN_ON(!(current->flags & PF_MEMALLOC));
|
2010-04-01 13:01:38 +08:00
|
|
|
ceph_put_snap_context(oldest);
|
2017-05-23 17:18:53 +08:00
|
|
|
redirty_page_for_writepage(wbc, page);
|
2017-05-23 17:48:28 +08:00
|
|
|
return 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2010-04-01 13:01:38 +08:00
|
|
|
ceph_put_snap_context(oldest);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/* is this a partial page at end of file? */
|
2017-08-30 11:36:06 +08:00
|
|
|
if (page_off >= ceph_wbc.i_size) {
|
|
|
|
dout("%p page eof %llu\n", page, ceph_wbc.i_size);
|
2017-09-02 10:50:48 +08:00
|
|
|
page->mapping->a_ops->invalidatepage(page, 0, PAGE_SIZE);
|
2017-05-23 17:48:28 +08:00
|
|
|
return 0;
|
2013-05-31 16:48:29 +08:00
|
|
|
}
|
2017-05-23 17:48:28 +08:00
|
|
|
|
2017-08-30 11:36:06 +08:00
|
|
|
if (ceph_wbc.i_size < page_off + len)
|
|
|
|
len = ceph_wbc.i_size - page_off;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-08-16 17:24:58 +08:00
|
|
|
dout("writepage %p page %p index %lu on %llu~%u snapc %p seq %lld\n",
|
|
|
|
inode, page, page->index, page_off, len, snapc, snapc->seq);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-12-15 16:57:40 +08:00
|
|
|
if (atomic_long_inc_return(&fsc->writeback_count) >
|
2010-04-07 06:14:15 +08:00
|
|
|
CONGESTION_ON_THRESH(fsc->mount_options->congestion_kb))
|
2017-04-12 18:24:33 +08:00
|
|
|
set_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC);
|
2009-12-19 05:51:57 +08:00
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
set_page_writeback(page);
|
2020-01-29 16:27:07 +08:00
|
|
|
err = ceph_sync_writepages(fsc, ceph_vino(inode),
|
2017-08-30 11:36:06 +08:00
|
|
|
&ci->i_layout, snapc, page_off, len,
|
|
|
|
ceph_wbc.truncate_seq,
|
|
|
|
ceph_wbc.truncate_size,
|
2018-07-14 04:18:37 +08:00
|
|
|
&inode->i_mtime, &page, 1);
|
2009-10-07 02:31:09 +08:00
|
|
|
if (err < 0) {
|
2016-05-13 17:29:51 +08:00
|
|
|
struct writeback_control tmp_wbc;
|
|
|
|
if (!wbc)
|
|
|
|
wbc = &tmp_wbc;
|
|
|
|
if (err == -ERESTARTSYS) {
|
|
|
|
/* killed by SIGKILL */
|
|
|
|
dout("writepage interrupted page %p\n", page);
|
|
|
|
redirty_page_for_writepage(wbc, page);
|
|
|
|
end_page_writeback(page);
|
2017-05-23 17:48:28 +08:00
|
|
|
return err;
|
2016-05-13 17:29:51 +08:00
|
|
|
}
|
2019-07-25 20:16:47 +08:00
|
|
|
if (err == -EBLACKLISTED)
|
|
|
|
fsc->blacklisted = true;
|
2016-05-13 17:29:51 +08:00
|
|
|
dout("writepage setting page/mapping error %d %p\n",
|
|
|
|
err, page);
|
2009-10-07 02:31:09 +08:00
|
|
|
mapping_set_error(&inode->i_data, err);
|
2016-05-13 17:29:51 +08:00
|
|
|
wbc->pages_skipped++;
|
2009-10-07 02:31:09 +08:00
|
|
|
} else {
|
|
|
|
dout("writepage cleaned page %p\n", page);
|
|
|
|
err = 0; /* vfs expects us to return 0 */
|
|
|
|
}
|
|
|
|
page->private = 0;
|
|
|
|
ClearPagePrivate(page);
|
|
|
|
end_page_writeback(page);
|
|
|
|
ceph_put_wrbuffer_cap_refs(ci, 1, snapc);
|
2010-04-01 13:01:38 +08:00
|
|
|
ceph_put_snap_context(snapc); /* page's reference */
|
2017-12-15 16:57:40 +08:00
|
|
|
|
|
|
|
if (atomic_long_dec_return(&fsc->writeback_count) <
|
|
|
|
CONGESTION_OFF_THRESH(fsc->mount_options->congestion_kb))
|
|
|
|
clear_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC);
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int ceph_writepage(struct page *page, struct writeback_control *wbc)
|
|
|
|
{
|
2009-12-17 06:51:06 +08:00
|
|
|
int err;
|
|
|
|
struct inode *inode = page->mapping->host;
|
|
|
|
BUG_ON(!inode);
|
2011-05-28 00:24:26 +08:00
|
|
|
ihold(inode);
|
2009-12-17 06:51:06 +08:00
|
|
|
err = writepage_nounlock(page, wbc);
|
2016-05-13 17:29:51 +08:00
|
|
|
if (err == -ERESTARTSYS) {
|
|
|
|
/* direct memory reclaimer was killed by SIGKILL. return 0
|
|
|
|
* to prevent caller from setting mapping/page error */
|
|
|
|
err = 0;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
unlock_page(page);
|
2009-12-17 06:51:06 +08:00
|
|
|
iput(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* async writeback completion handler.
|
|
|
|
*
|
|
|
|
* If we get an error, set the mapping error bit, but not the individual
|
|
|
|
* page error bits.
|
|
|
|
*/
|
2016-04-28 22:07:24 +08:00
|
|
|
static void writepages_finish(struct ceph_osd_request *req)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
|
|
|
struct inode *inode = req->r_inode;
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2013-04-03 14:28:58 +08:00
|
|
|
struct ceph_osd_data *osd_data;
|
2009-10-07 02:31:09 +08:00
|
|
|
struct page *page;
|
2016-01-07 16:00:17 +08:00
|
|
|
int num_pages, total_pages = 0;
|
|
|
|
int i, j;
|
|
|
|
int rc = req->r_result;
|
2009-10-07 02:31:09 +08:00
|
|
|
struct ceph_snap_context *snapc = req->r_snapc;
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
2010-04-07 06:14:15 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2016-01-07 16:00:17 +08:00
|
|
|
bool remove_page;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
dout("writepages_finish %p rc %d\n", inode, rc);
|
2017-04-04 20:39:46 +08:00
|
|
|
if (rc < 0) {
|
2009-10-07 02:31:09 +08:00
|
|
|
mapping_set_error(mapping, rc);
|
2017-04-04 20:39:46 +08:00
|
|
|
ceph_set_error_write(ci);
|
2019-07-25 20:16:47 +08:00
|
|
|
if (rc == -EBLACKLISTED)
|
|
|
|
fsc->blacklisted = true;
|
2017-04-04 20:39:46 +08:00
|
|
|
} else {
|
|
|
|
ceph_clear_error_write(ci);
|
|
|
|
}
|
2016-01-07 16:00:17 +08:00
|
|
|
|
2020-03-20 11:45:01 +08:00
|
|
|
ceph_update_write_latency(&fsc->mdsc->metric, req->r_start_latency,
|
|
|
|
req->r_end_latency, rc);
|
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
/*
|
|
|
|
* We lost the cache cap, need to truncate the page before
|
|
|
|
* it is unlocked, otherwise we'd truncate it later in the
|
|
|
|
* page truncation thread, possibly losing some data that
|
|
|
|
* raced its way in
|
|
|
|
*/
|
|
|
|
remove_page = !(ceph_caps_issued(ci) &
|
|
|
|
(CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO));
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/* clean all pages */
|
2016-01-07 16:00:17 +08:00
|
|
|
for (i = 0; i < req->r_num_ops; i++) {
|
|
|
|
if (req->r_ops[i].op != CEPH_OSD_OP_WRITE)
|
|
|
|
break;
|
2010-02-19 08:07:01 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
osd_data = osd_req_op_extent_osd_data(req, i);
|
|
|
|
BUG_ON(osd_data->type != CEPH_OSD_DATA_TYPE_PAGES);
|
|
|
|
num_pages = calc_pages_for((u64)osd_data->alignment,
|
|
|
|
(u64)osd_data->length);
|
|
|
|
total_pages += num_pages;
|
|
|
|
for (j = 0; j < num_pages; j++) {
|
|
|
|
page = osd_data->pages[j];
|
|
|
|
BUG_ON(!page);
|
|
|
|
WARN_ON(!PageUptodate(page));
|
|
|
|
|
|
|
|
if (atomic_long_dec_return(&fsc->writeback_count) <
|
|
|
|
CONGESTION_OFF_THRESH(
|
|
|
|
fsc->mount_options->congestion_kb))
|
2017-04-12 18:24:33 +08:00
|
|
|
clear_bdi_congested(inode_to_bdi(inode),
|
2016-01-07 16:00:17 +08:00
|
|
|
BLK_RW_ASYNC);
|
|
|
|
|
|
|
|
ceph_put_snap_context(page_snap_context(page));
|
|
|
|
page->private = 0;
|
|
|
|
ClearPagePrivate(page);
|
|
|
|
dout("unlocking %p\n", page);
|
|
|
|
end_page_writeback(page);
|
|
|
|
|
|
|
|
if (remove_page)
|
|
|
|
generic_error_remove_page(inode->i_mapping,
|
|
|
|
page);
|
|
|
|
|
|
|
|
unlock_page(page);
|
|
|
|
}
|
|
|
|
dout("writepages_finish %p wrote %llu bytes cleaned %d pages\n",
|
|
|
|
inode, osd_data->length, rc >= 0 ? num_pages : 0);
|
2010-02-19 08:07:01 +08:00
|
|
|
|
2019-08-09 11:56:47 +08:00
|
|
|
release_pages(osd_data->pages, num_pages);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
ceph_put_wrbuffer_cap_refs(ci, total_pages, snapc);
|
|
|
|
|
|
|
|
osd_data = osd_req_op_extent_osd_data(req, 0);
|
2013-04-03 14:28:58 +08:00
|
|
|
if (osd_data->pages_from_pool)
|
|
|
|
mempool_free(osd_data->pages,
|
2010-03-26 17:40:33 +08:00
|
|
|
ceph_sb_to_client(inode->i_sb)->wb_pagevec_pool);
|
2009-10-07 02:31:09 +08:00
|
|
|
else
|
2013-04-03 14:28:58 +08:00
|
|
|
kfree(osd_data->pages);
|
2009-10-07 02:31:09 +08:00
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initiate async writeback
|
|
|
|
*/
|
|
|
|
static int ceph_writepages_start(struct address_space *mapping,
|
|
|
|
struct writeback_control *wbc)
|
|
|
|
{
|
|
|
|
struct inode *inode = mapping->host;
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2013-05-31 16:48:29 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
|
|
|
struct ceph_vino vino = ceph_vino(inode);
|
2017-09-01 16:53:58 +08:00
|
|
|
pgoff_t index, start_index, end = -1;
|
2010-04-01 12:52:10 +08:00
|
|
|
struct ceph_snap_context *snapc = NULL, *last_snapc = NULL, *pgsnapc;
|
2009-10-07 02:31:09 +08:00
|
|
|
struct pagevec pvec;
|
|
|
|
int rc = 0;
|
2017-02-28 06:28:32 +08:00
|
|
|
unsigned int wsize = i_blocksize(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
struct ceph_osd_request *req = NULL;
|
2017-08-30 11:36:06 +08:00
|
|
|
struct ceph_writeback_ctl ceph_wbc;
|
2017-09-03 00:04:31 +08:00
|
|
|
bool should_loop, range_whole = false;
|
2018-03-04 16:36:01 +08:00
|
|
|
bool done = false;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-07-21 17:20:10 +08:00
|
|
|
dout("writepages_start %p (mode=%s)\n", inode,
|
2009-10-07 02:31:09 +08:00
|
|
|
wbc->sync_mode == WB_SYNC_NONE ? "NONE" :
|
|
|
|
(wbc->sync_mode == WB_SYNC_ALL ? "ALL" : "HOLD"));
|
|
|
|
|
2016-12-26 17:26:34 +08:00
|
|
|
if (READ_ONCE(fsc->mount_state) == CEPH_MOUNT_SHUTDOWN) {
|
2016-04-15 13:56:12 +08:00
|
|
|
if (ci->i_wrbuffer_ref > 0) {
|
|
|
|
pr_warn_ratelimited(
|
|
|
|
"writepage_start %p %lld forced umount\n",
|
|
|
|
inode, ceph_ino(inode));
|
|
|
|
}
|
2015-07-01 17:03:23 +08:00
|
|
|
mapping_set_error(mapping, -EIO);
|
2009-10-07 02:31:09 +08:00
|
|
|
return -EIO; /* we're in a forced umount, don't write! */
|
|
|
|
}
|
2017-07-11 17:34:46 +08:00
|
|
|
if (fsc->mount_options->wsize < wsize)
|
2010-04-07 06:14:15 +08:00
|
|
|
wsize = fsc->mount_options->wsize;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-11-16 09:37:52 +08:00
|
|
|
pagevec_init(&pvec);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-09-03 00:04:31 +08:00
|
|
|
start_index = wbc->range_cyclic ? mapping->writeback_index : 0;
|
2017-09-01 16:53:58 +08:00
|
|
|
index = start_index;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
retry:
|
|
|
|
/* find oldest snap context with dirty data */
|
2017-09-02 10:50:48 +08:00
|
|
|
snapc = get_oldest_context(inode, &ceph_wbc, NULL);
|
2009-10-07 02:31:09 +08:00
|
|
|
if (!snapc) {
|
|
|
|
/* hmm, why does writepages get called when there
|
|
|
|
is no dirty data? */
|
|
|
|
dout(" no snap context with dirty data?\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
dout(" oldest snapc is %p seq %lld (%d snaps)\n",
|
|
|
|
snapc, snapc->seq, snapc->num_snaps);
|
2013-05-31 16:48:29 +08:00
|
|
|
|
2017-09-01 16:53:58 +08:00
|
|
|
should_loop = false;
|
|
|
|
if (ceph_wbc.head_snapc && snapc != last_snapc) {
|
|
|
|
/* where to start/end? */
|
|
|
|
if (wbc->range_cyclic) {
|
|
|
|
index = start_index;
|
|
|
|
end = -1;
|
|
|
|
if (index > 0)
|
|
|
|
should_loop = true;
|
|
|
|
dout(" cyclic, start at %lu\n", index);
|
|
|
|
} else {
|
|
|
|
index = wbc->range_start >> PAGE_SHIFT;
|
|
|
|
end = wbc->range_end >> PAGE_SHIFT;
|
|
|
|
if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
|
|
|
|
range_whole = true;
|
|
|
|
dout(" not cyclic, %lu to %lu\n", index, end);
|
|
|
|
}
|
|
|
|
} else if (!ceph_wbc.head_snapc) {
|
|
|
|
/* Do not respect wbc->range_{start,end}. Dirty pages
|
|
|
|
* in that range can be associated with newer snapc.
|
|
|
|
* They are not writeable until we write all dirty pages
|
|
|
|
* associated with 'snapc' get written */
|
2018-03-06 15:14:54 +08:00
|
|
|
if (index > 0)
|
2017-09-01 16:53:58 +08:00
|
|
|
should_loop = true;
|
|
|
|
dout(" non-head snapc, range whole\n");
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2017-09-01 16:53:58 +08:00
|
|
|
|
|
|
|
ceph_put_snap_context(last_snapc);
|
2009-10-07 02:31:09 +08:00
|
|
|
last_snapc = snapc;
|
|
|
|
|
2018-03-04 16:36:01 +08:00
|
|
|
while (!done && index <= end) {
|
2016-01-07 16:00:17 +08:00
|
|
|
int num_ops = 0, op_idx;
|
2017-08-31 19:20:40 +08:00
|
|
|
unsigned i, pvec_pages, max_pages, locked_pages = 0;
|
2016-01-07 16:00:17 +08:00
|
|
|
struct page **pages = NULL, **data_pages;
|
2013-03-15 03:09:05 +08:00
|
|
|
mempool_t *pool = NULL; /* Becomes non-null if mempool used */
|
2009-10-07 02:31:09 +08:00
|
|
|
struct page *page;
|
2017-08-31 19:20:40 +08:00
|
|
|
pgoff_t strip_unit_end = 0;
|
2016-01-07 16:00:17 +08:00
|
|
|
u64 offset = 0, len = 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2017-08-31 19:20:40 +08:00
|
|
|
max_pages = wsize >> PAGE_SHIFT;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
get_more_pages:
|
2017-11-16 09:35:16 +08:00
|
|
|
pvec_pages = pagevec_lookup_range_nr_tag(&pvec, mapping, &index,
|
2017-11-16 09:34:41 +08:00
|
|
|
end, PAGECACHE_TAG_DIRTY,
|
2017-11-16 09:35:16 +08:00
|
|
|
max_pages - locked_pages);
|
2017-11-16 09:34:41 +08:00
|
|
|
dout("pagevec_lookup_range_tag got %d\n", pvec_pages);
|
2009-10-07 02:31:09 +08:00
|
|
|
if (!pvec_pages && !locked_pages)
|
|
|
|
break;
|
|
|
|
for (i = 0; i < pvec_pages && locked_pages < max_pages; i++) {
|
|
|
|
page = pvec.pages[i];
|
|
|
|
dout("? %p idx %lu\n", page, page->index);
|
|
|
|
if (locked_pages == 0)
|
|
|
|
lock_page(page); /* first page */
|
|
|
|
else if (!trylock_page(page))
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* only dirty pages, or our accounting breaks */
|
|
|
|
if (unlikely(!PageDirty(page)) ||
|
|
|
|
unlikely(page->mapping != mapping)) {
|
|
|
|
dout("!dirty or !mapping %p\n", page);
|
|
|
|
unlock_page(page);
|
2017-08-31 16:55:48 +08:00
|
|
|
continue;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2018-03-04 16:36:01 +08:00
|
|
|
/* only if matching snap context */
|
|
|
|
pgsnapc = page_snap_context(page);
|
|
|
|
if (pgsnapc != snapc) {
|
|
|
|
dout("page snapc %p %lld != oldest %p %lld\n",
|
|
|
|
pgsnapc, pgsnapc->seq, snapc, snapc->seq);
|
2018-03-06 15:14:54 +08:00
|
|
|
if (!should_loop &&
|
|
|
|
!ceph_wbc.head_snapc &&
|
|
|
|
wbc->sync_mode != WB_SYNC_NONE)
|
|
|
|
should_loop = true;
|
2009-10-07 02:31:09 +08:00
|
|
|
unlock_page(page);
|
2018-03-04 16:36:01 +08:00
|
|
|
continue;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2017-08-30 11:36:06 +08:00
|
|
|
if (page_offset(page) >= ceph_wbc.i_size) {
|
|
|
|
dout("%p page eof %llu\n",
|
|
|
|
page, ceph_wbc.i_size);
|
2019-07-24 10:26:09 +08:00
|
|
|
if ((ceph_wbc.size_stable ||
|
|
|
|
page_offset(page) >= i_size_read(inode)) &&
|
|
|
|
clear_page_dirty_for_io(page))
|
2018-03-04 16:36:01 +08:00
|
|
|
mapping->a_ops->invalidatepage(page,
|
|
|
|
0, PAGE_SIZE);
|
|
|
|
unlock_page(page);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (strip_unit_end && (page->index > strip_unit_end)) {
|
|
|
|
dout("end of strip unit %p\n", page);
|
2009-10-07 02:31:09 +08:00
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (PageWriteback(page)) {
|
2017-08-31 16:55:48 +08:00
|
|
|
if (wbc->sync_mode == WB_SYNC_NONE) {
|
|
|
|
dout("%p under writeback\n", page);
|
|
|
|
unlock_page(page);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
dout("waiting on writeback %p\n", page);
|
|
|
|
wait_on_page_writeback(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!clear_page_dirty_for_io(page)) {
|
|
|
|
dout("%p !clear_page_dirty_for_io\n", page);
|
|
|
|
unlock_page(page);
|
2017-08-31 16:55:48 +08:00
|
|
|
continue;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
2013-03-15 03:09:05 +08:00
|
|
|
/*
|
|
|
|
* We have something to write. If this is
|
|
|
|
* the first locked page this time through,
|
2016-01-07 16:00:17 +08:00
|
|
|
* calculate max possinle write size and
|
|
|
|
* allocate a page array
|
2013-03-15 03:09:05 +08:00
|
|
|
*/
|
2009-10-07 02:31:09 +08:00
|
|
|
if (locked_pages == 0) {
|
2016-01-07 16:00:17 +08:00
|
|
|
u64 objnum;
|
|
|
|
u64 objoff;
|
2018-02-17 16:29:58 +08:00
|
|
|
u32 xlen;
|
2016-01-07 16:00:17 +08:00
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
/* prepare async write request */
|
2013-03-15 03:09:05 +08:00
|
|
|
offset = (u64)page_offset(page);
|
2018-02-17 16:29:58 +08:00
|
|
|
ceph_calc_file_object_mapping(&ci->i_layout,
|
|
|
|
offset, wsize,
|
|
|
|
&objnum, &objoff,
|
|
|
|
&xlen);
|
|
|
|
len = xlen;
|
2011-05-03 17:45:16 +08:00
|
|
|
|
2017-07-21 17:20:10 +08:00
|
|
|
num_ops = 1;
|
2016-01-07 16:00:17 +08:00
|
|
|
strip_unit_end = page->index +
|
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 20:29:47 +08:00
|
|
|
((len - 1) >> PAGE_SHIFT);
|
2013-03-15 03:09:05 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
BUG_ON(pages);
|
2013-03-15 03:09:05 +08:00
|
|
|
max_pages = calc_pages_for(0, (u64)len);
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(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 tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- 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;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- 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;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
pages = kmalloc_array(max_pages,
|
|
|
|
sizeof(*pages),
|
|
|
|
GFP_NOFS);
|
2013-03-15 03:09:05 +08:00
|
|
|
if (!pages) {
|
|
|
|
pool = fsc->wb_pagevec_pool;
|
|
|
|
pages = mempool_alloc(pool, GFP_NOFS);
|
2013-03-15 03:09:05 +08:00
|
|
|
BUG_ON(!pages);
|
2013-03-15 03:09:05 +08:00
|
|
|
}
|
2016-01-07 16:00:17 +08:00
|
|
|
|
|
|
|
len = 0;
|
|
|
|
} else if (page->index !=
|
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 20:29:47 +08:00
|
|
|
(offset + len) >> PAGE_SHIFT) {
|
2016-01-07 16:00:17 +08:00
|
|
|
if (num_ops >= (pool ? CEPH_OSD_SLAB_OPS :
|
|
|
|
CEPH_OSD_MAX_OPS)) {
|
|
|
|
redirty_page_for_writepage(wbc, page);
|
|
|
|
unlock_page(page);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
num_ops++;
|
|
|
|
offset = (u64)page_offset(page);
|
|
|
|
len = 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* note position of first page in pvec */
|
|
|
|
dout("%p will write page %p idx %lu\n",
|
|
|
|
inode, page, page->index);
|
2009-12-19 05:51:57 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
if (atomic_long_inc_return(&fsc->writeback_count) >
|
|
|
|
CONGESTION_ON_THRESH(
|
2010-04-07 06:14:15 +08:00
|
|
|
fsc->mount_options->congestion_kb)) {
|
2017-04-12 18:24:33 +08:00
|
|
|
set_bdi_congested(inode_to_bdi(inode),
|
2010-08-04 01:25:11 +08:00
|
|
|
BLK_RW_ASYNC);
|
2009-12-19 05:51:57 +08:00
|
|
|
}
|
|
|
|
|
2017-08-31 16:55:48 +08:00
|
|
|
|
|
|
|
pages[locked_pages++] = page;
|
|
|
|
pvec.pages[i] = NULL;
|
|
|
|
|
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 20:29:47 +08:00
|
|
|
len += PAGE_SIZE;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* did we get anything? */
|
|
|
|
if (!locked_pages)
|
|
|
|
goto release_pvec_pages;
|
|
|
|
if (i) {
|
2017-08-31 16:55:48 +08:00
|
|
|
unsigned j, n = 0;
|
|
|
|
/* shift unused page to beginning of pvec */
|
|
|
|
for (j = 0; j < pvec_pages; j++) {
|
|
|
|
if (!pvec.pages[j])
|
|
|
|
continue;
|
|
|
|
if (n < j)
|
|
|
|
pvec.pages[n] = pvec.pages[j];
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
pvec.nr = n;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
if (pvec_pages && i == pvec_pages &&
|
|
|
|
locked_pages < max_pages) {
|
|
|
|
dout("reached end pvec, trying for more\n");
|
2017-08-31 16:55:48 +08:00
|
|
|
pagevec_release(&pvec);
|
2009-10-07 02:31:09 +08:00
|
|
|
goto get_more_pages;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
new_request:
|
2013-03-15 03:09:05 +08:00
|
|
|
offset = page_offset(pages[0]);
|
2016-01-07 16:00:17 +08:00
|
|
|
len = wsize;
|
|
|
|
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc,
|
|
|
|
&ci->i_layout, vino,
|
|
|
|
offset, &len, 0, num_ops,
|
2017-08-30 11:36:06 +08:00
|
|
|
CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,
|
|
|
|
snapc, ceph_wbc.truncate_seq,
|
|
|
|
ceph_wbc.truncate_size, false);
|
2016-01-07 16:00:17 +08:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc,
|
|
|
|
&ci->i_layout, vino,
|
|
|
|
offset, &len, 0,
|
|
|
|
min(num_ops,
|
|
|
|
CEPH_OSD_SLAB_OPS),
|
|
|
|
CEPH_OSD_OP_WRITE,
|
2017-02-12 01:48:41 +08:00
|
|
|
CEPH_OSD_FLAG_WRITE,
|
2017-08-30 11:36:06 +08:00
|
|
|
snapc, ceph_wbc.truncate_seq,
|
|
|
|
ceph_wbc.truncate_size, true);
|
2016-01-07 16:00:17 +08:00
|
|
|
BUG_ON(IS_ERR(req));
|
2015-06-18 03:10:58 +08:00
|
|
|
}
|
2016-01-07 16:00:17 +08:00
|
|
|
BUG_ON(len < page_offset(pages[locked_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 20:29:47 +08:00
|
|
|
PAGE_SIZE - offset);
|
2016-01-07 16:00:17 +08:00
|
|
|
|
|
|
|
req->r_callback = writepages_finish;
|
|
|
|
req->r_inode = inode;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
/* Format the osd request message and submit the write */
|
|
|
|
len = 0;
|
|
|
|
data_pages = pages;
|
|
|
|
op_idx = 0;
|
|
|
|
for (i = 0; i < locked_pages; i++) {
|
|
|
|
u64 cur_offset = page_offset(pages[i]);
|
|
|
|
if (offset + len != cur_offset) {
|
2017-07-21 17:20:10 +08:00
|
|
|
if (op_idx + 1 == req->r_num_ops)
|
2016-01-07 16:00:17 +08:00
|
|
|
break;
|
|
|
|
osd_req_op_extent_dup_last(req, op_idx,
|
|
|
|
cur_offset - offset);
|
|
|
|
dout("writepages got pages at %llu~%llu\n",
|
|
|
|
offset, len);
|
|
|
|
osd_req_op_extent_osd_data_pages(req, op_idx,
|
|
|
|
data_pages, len, 0,
|
2013-04-05 14:27:12 +08:00
|
|
|
!!pool, false);
|
2016-01-07 16:00:17 +08:00
|
|
|
osd_req_op_extent_update(req, op_idx, len);
|
2013-03-15 03:09:05 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
len = 0;
|
|
|
|
offset = cur_offset;
|
|
|
|
data_pages = pages + i;
|
|
|
|
op_idx++;
|
|
|
|
}
|
|
|
|
|
|
|
|
set_page_writeback(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 20:29:47 +08:00
|
|
|
len += PAGE_SIZE;
|
2016-01-07 16:00:17 +08:00
|
|
|
}
|
|
|
|
|
2017-08-30 11:36:06 +08:00
|
|
|
if (ceph_wbc.size_stable) {
|
|
|
|
len = min(len, ceph_wbc.i_size - offset);
|
2016-01-07 16:00:17 +08:00
|
|
|
} else if (i == locked_pages) {
|
|
|
|
/* writepages_finish() clears writeback pages
|
|
|
|
* according to the data length, so make sure
|
|
|
|
* data length covers all locked pages */
|
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 20:29:47 +08:00
|
|
|
u64 min_len = len + 1 - PAGE_SIZE;
|
2017-08-30 11:36:06 +08:00
|
|
|
len = get_writepages_data_length(inode, pages[i - 1],
|
|
|
|
offset);
|
2016-01-07 16:00:17 +08:00
|
|
|
len = max(len, min_len);
|
|
|
|
}
|
|
|
|
dout("writepages got pages at %llu~%llu\n", offset, len);
|
2013-03-15 03:09:05 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
osd_req_op_extent_osd_data_pages(req, op_idx, data_pages, len,
|
|
|
|
0, !!pool, false);
|
|
|
|
osd_req_op_extent_update(req, op_idx, len);
|
2013-03-15 03:09:05 +08:00
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
BUG_ON(op_idx + 1 != req->r_num_ops);
|
|
|
|
|
|
|
|
pool = NULL;
|
|
|
|
if (i < locked_pages) {
|
|
|
|
BUG_ON(num_ops <= req->r_num_ops);
|
|
|
|
num_ops -= req->r_num_ops;
|
|
|
|
locked_pages -= i;
|
|
|
|
|
|
|
|
/* allocate new pages array for next request */
|
|
|
|
data_pages = pages;
|
treewide: kmalloc() -> kmalloc_array()
The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
kmalloc(a * b, gfp)
with:
kmalloc_array(a * b, gfp)
as well as handling cases of:
kmalloc(a * b * c, gfp)
with:
kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kmalloc(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 tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kmalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kmalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kmalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kmalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kmalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kmalloc(
- 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;
@@
(
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
(
- 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;
@@
(
kmalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kmalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kmalloc(
- 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;
@@
(
kmalloc(sizeof(THING) * C2, ...)
|
kmalloc(sizeof(TYPE) * C2, ...)
|
kmalloc(C1 * C2 * C3, ...)
|
kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * E2
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kmalloc
+ kmalloc_array
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 04:55:00 +08:00
|
|
|
pages = kmalloc_array(locked_pages, sizeof(*pages),
|
|
|
|
GFP_NOFS);
|
2016-01-07 16:00:17 +08:00
|
|
|
if (!pages) {
|
|
|
|
pool = fsc->wb_pagevec_pool;
|
|
|
|
pages = mempool_alloc(pool, GFP_NOFS);
|
|
|
|
BUG_ON(!pages);
|
|
|
|
}
|
|
|
|
memcpy(pages, data_pages + i,
|
|
|
|
locked_pages * sizeof(*pages));
|
|
|
|
memset(data_pages + i, 0,
|
|
|
|
locked_pages * sizeof(*pages));
|
|
|
|
} else {
|
|
|
|
BUG_ON(num_ops != req->r_num_ops);
|
|
|
|
index = pages[i - 1]->index + 1;
|
|
|
|
/* request message now owns the pages array */
|
|
|
|
pages = NULL;
|
|
|
|
}
|
2013-03-15 03:09:05 +08:00
|
|
|
|
2018-07-14 04:18:37 +08:00
|
|
|
req->r_mtime = inode->i_mtime;
|
2011-05-13 06:48:16 +08:00
|
|
|
rc = ceph_osdc_start_request(&fsc->client->osdc, req, true);
|
|
|
|
BUG_ON(rc);
|
2009-10-07 02:31:09 +08:00
|
|
|
req = NULL;
|
|
|
|
|
2016-01-07 16:00:17 +08:00
|
|
|
wbc->nr_to_write -= i;
|
|
|
|
if (pages)
|
|
|
|
goto new_request;
|
|
|
|
|
2017-09-01 16:53:58 +08:00
|
|
|
/*
|
|
|
|
* We stop writing back only if we are not doing
|
|
|
|
* integrity sync. In case of integrity sync we have to
|
|
|
|
* keep going until we have written all the pages
|
|
|
|
* we tagged for writeback prior to entering this loop.
|
|
|
|
*/
|
|
|
|
if (wbc->nr_to_write <= 0 && wbc->sync_mode == WB_SYNC_NONE)
|
2018-03-04 16:36:01 +08:00
|
|
|
done = true;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
release_pvec_pages:
|
|
|
|
dout("pagevec_release on %d pages (%p)\n", (int)pvec.nr,
|
|
|
|
pvec.nr ? pvec.pages[0] : NULL);
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (should_loop && !done) {
|
|
|
|
/* more to do; loop back to beginning of file */
|
|
|
|
dout("writepages looping back to beginning of file\n");
|
2017-09-01 16:53:58 +08:00
|
|
|
end = start_index - 1; /* OK even when start_index == 0 */
|
2017-09-01 17:03:16 +08:00
|
|
|
|
|
|
|
/* to write dirty pages associated with next snapc,
|
|
|
|
* we need to wait until current writes complete */
|
|
|
|
if (wbc->sync_mode != WB_SYNC_NONE &&
|
|
|
|
start_index == 0 && /* all dirty pages were checked */
|
|
|
|
!ceph_wbc.head_snapc) {
|
|
|
|
struct page *page;
|
|
|
|
unsigned i, nr;
|
|
|
|
index = 0;
|
|
|
|
while ((index <= end) &&
|
|
|
|
(nr = pagevec_lookup_tag(&pvec, mapping, &index,
|
2017-11-16 09:35:19 +08:00
|
|
|
PAGECACHE_TAG_WRITEBACK))) {
|
2017-09-01 17:03:16 +08:00
|
|
|
for (i = 0; i < nr; i++) {
|
|
|
|
page = pvec.pages[i];
|
|
|
|
if (page_snap_context(page) != snapc)
|
|
|
|
continue;
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
}
|
|
|
|
pagevec_release(&pvec);
|
|
|
|
cond_resched();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-01 16:53:58 +08:00
|
|
|
start_index = 0;
|
2009-10-07 02:31:09 +08:00
|
|
|
index = 0;
|
|
|
|
goto retry;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wbc->range_cyclic || (range_whole && wbc->nr_to_write > 0))
|
|
|
|
mapping->writeback_index = index;
|
|
|
|
|
|
|
|
out:
|
2016-04-26 21:05:29 +08:00
|
|
|
ceph_osdc_put_request(req);
|
2017-09-01 16:53:58 +08:00
|
|
|
ceph_put_snap_context(last_snapc);
|
|
|
|
dout("writepages dend - startone, rc = %d\n", rc);
|
2009-10-07 02:31:09 +08:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See if a given @snapc is either writeable, or already written.
|
|
|
|
*/
|
|
|
|
static int context_is_writeable_or_written(struct inode *inode,
|
|
|
|
struct ceph_snap_context *snapc)
|
|
|
|
{
|
2017-09-02 10:50:48 +08:00
|
|
|
struct ceph_snap_context *oldest = get_oldest_context(inode, NULL, NULL);
|
2010-04-01 13:01:38 +08:00
|
|
|
int ret = !oldest || snapc->seq <= oldest->seq;
|
|
|
|
|
|
|
|
ceph_put_snap_context(oldest);
|
|
|
|
return ret;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are only allowed to write into/dirty the page if the page is
|
|
|
|
* clean, or already dirty within the same snap context.
|
2010-03-20 04:27:53 +08:00
|
|
|
*
|
|
|
|
* called with page locked.
|
|
|
|
* return success with page locked,
|
|
|
|
* or any failure (incl -EAGAIN) with page unlocked.
|
2009-10-07 02:31:09 +08:00
|
|
|
*/
|
2010-02-10 03:02:51 +08:00
|
|
|
static int ceph_update_writeable_page(struct file *file,
|
|
|
|
loff_t pos, unsigned len,
|
|
|
|
struct page *page)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2016-04-15 13:56:12 +08:00
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
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 20:29:47 +08:00
|
|
|
loff_t page_off = pos & PAGE_MASK;
|
|
|
|
int pos_in_page = pos & ~PAGE_MASK;
|
2009-10-07 02:31:09 +08:00
|
|
|
int end_in_page = pos_in_page + len;
|
|
|
|
loff_t i_size;
|
|
|
|
int r;
|
2010-04-01 12:52:10 +08:00
|
|
|
struct ceph_snap_context *snapc, *oldest;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2016-12-26 17:26:34 +08:00
|
|
|
if (READ_ONCE(fsc->mount_state) == CEPH_MOUNT_SHUTDOWN) {
|
2016-04-15 13:56:12 +08:00
|
|
|
dout(" page %p forced umount\n", page);
|
|
|
|
unlock_page(page);
|
|
|
|
return -EIO;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
retry_locked:
|
|
|
|
/* writepages currently holds page lock, but if we change that later, */
|
|
|
|
wait_on_page_writeback(page);
|
|
|
|
|
2012-05-28 14:44:30 +08:00
|
|
|
snapc = page_snap_context(page);
|
2010-04-01 12:52:10 +08:00
|
|
|
if (snapc && snapc != ci->i_head_snapc) {
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* this page is already dirty in another (older) snap
|
|
|
|
* context! is it writeable now?
|
|
|
|
*/
|
2017-09-02 10:50:48 +08:00
|
|
|
oldest = get_oldest_context(inode, NULL, NULL);
|
2010-04-01 12:52:10 +08:00
|
|
|
if (snapc->seq > oldest->seq) {
|
2010-04-01 13:01:38 +08:00
|
|
|
ceph_put_snap_context(oldest);
|
2009-10-07 02:31:09 +08:00
|
|
|
dout(" page %p snapc %p not current or oldest\n",
|
2010-04-01 13:01:38 +08:00
|
|
|
page, snapc);
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* queue for writeback, and wait for snapc to
|
|
|
|
* be writeable or written
|
|
|
|
*/
|
2010-04-01 13:01:38 +08:00
|
|
|
snapc = ceph_get_snap_context(snapc);
|
2009-10-07 02:31:09 +08:00
|
|
|
unlock_page(page);
|
2010-02-10 07:24:44 +08:00
|
|
|
ceph_queue_writeback(inode);
|
2016-05-13 11:30:24 +08:00
|
|
|
r = wait_event_killable(ci->i_cap_wq,
|
2009-10-07 02:31:09 +08:00
|
|
|
context_is_writeable_or_written(inode, snapc));
|
|
|
|
ceph_put_snap_context(snapc);
|
2010-03-20 04:27:53 +08:00
|
|
|
if (r == -ERESTARTSYS)
|
|
|
|
return r;
|
2010-02-10 03:02:51 +08:00
|
|
|
return -EAGAIN;
|
2009-10-07 02:31:09 +08:00
|
|
|
}
|
2010-04-01 13:01:38 +08:00
|
|
|
ceph_put_snap_context(oldest);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/* yay, writeable, do it now (without dropping page lock) */
|
|
|
|
dout(" page %p snapc %p not current, but oldest\n",
|
|
|
|
page, snapc);
|
|
|
|
if (!clear_page_dirty_for_io(page))
|
|
|
|
goto retry_locked;
|
|
|
|
r = writepage_nounlock(page, NULL);
|
|
|
|
if (r < 0)
|
2017-08-04 11:22:31 +08:00
|
|
|
goto fail_unlock;
|
2009-10-07 02:31:09 +08:00
|
|
|
goto retry_locked;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (PageUptodate(page)) {
|
|
|
|
dout(" page %p already uptodate\n", page);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* full 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 20:29:47 +08:00
|
|
|
if (pos_in_page == 0 && len == PAGE_SIZE)
|
2009-10-07 02:31:09 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* past end of file? */
|
2015-12-30 11:32:46 +08:00
|
|
|
i_size = i_size_read(inode);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
if (page_off >= i_size ||
|
|
|
|
(pos_in_page == 0 && (pos+len) >= i_size &&
|
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 20:29:47 +08:00
|
|
|
end_in_page - pos_in_page != PAGE_SIZE)) {
|
2009-10-07 02:31:09 +08:00
|
|
|
dout(" zeroing %p 0 - %d and %d - %d\n",
|
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 20:29:47 +08:00
|
|
|
page, pos_in_page, end_in_page, (int)PAGE_SIZE);
|
2009-10-07 02:31:09 +08:00
|
|
|
zero_user_segments(page,
|
|
|
|
0, pos_in_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 20:29:47 +08:00
|
|
|
end_in_page, PAGE_SIZE);
|
2009-10-07 02:31:09 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we need to read it. */
|
2017-08-04 11:22:31 +08:00
|
|
|
r = ceph_do_readpage(file, page);
|
|
|
|
if (r < 0) {
|
|
|
|
if (r == -EINPROGRESS)
|
|
|
|
return -EAGAIN;
|
|
|
|
goto fail_unlock;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
goto retry_locked;
|
2017-08-04 11:22:31 +08:00
|
|
|
fail_unlock:
|
2009-10-07 02:31:09 +08:00
|
|
|
unlock_page(page);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-02-10 03:02:51 +08:00
|
|
|
/*
|
|
|
|
* We are only allowed to write into/dirty the page if the page is
|
|
|
|
* clean, or already dirty within the same snap context.
|
|
|
|
*/
|
|
|
|
static int ceph_write_begin(struct file *file, struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
|
struct page **pagep, void **fsdata)
|
|
|
|
{
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2010-02-10 03:02:51 +08:00
|
|
|
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 20:29:47 +08:00
|
|
|
pgoff_t index = pos >> PAGE_SHIFT;
|
2013-05-02 12:15:58 +08:00
|
|
|
int r;
|
2010-02-10 03:02:51 +08:00
|
|
|
|
|
|
|
do {
|
2010-03-20 04:27:53 +08:00
|
|
|
/* get a page */
|
2010-02-10 03:02:51 +08:00
|
|
|
page = grab_cache_page_write_begin(mapping, index, 0);
|
2013-05-02 12:15:58 +08:00
|
|
|
if (!page)
|
|
|
|
return -ENOMEM;
|
2010-02-10 03:02:51 +08:00
|
|
|
|
|
|
|
dout("write_begin file %p inode %p page %p %d~%d\n", file,
|
2010-08-04 01:25:11 +08:00
|
|
|
inode, page, (int)pos, (int)len);
|
2010-02-10 03:02:51 +08:00
|
|
|
|
|
|
|
r = ceph_update_writeable_page(file, pos, len, page);
|
2015-03-21 05:36:56 +08:00
|
|
|
if (r < 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 20:29:47 +08:00
|
|
|
put_page(page);
|
2015-03-21 05:36:56 +08:00
|
|
|
else
|
|
|
|
*pagep = page;
|
2010-02-10 03:02:51 +08:00
|
|
|
} while (r == -EAGAIN);
|
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2009-10-07 02:31:09 +08:00
|
|
|
/*
|
|
|
|
* we don't do anything in here that simple_write_end doesn't do
|
2015-04-30 14:40:54 +08:00
|
|
|
* except adjust dirty page accounting
|
2009-10-07 02:31:09 +08:00
|
|
|
*/
|
|
|
|
static int ceph_write_end(struct file *file, struct address_space *mapping,
|
|
|
|
loff_t pos, unsigned len, unsigned copied,
|
|
|
|
struct page *page, void *fsdata)
|
|
|
|
{
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(file);
|
2017-05-22 12:03:32 +08:00
|
|
|
bool check_cap = false;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
dout("write_end file %p inode %p page %p %d~%d (%d)\n", file,
|
|
|
|
inode, page, (int)pos, (int)copied, (int)len);
|
|
|
|
|
|
|
|
/* zero the stale part of the page if we did a short copy */
|
2016-09-06 10:20:03 +08:00
|
|
|
if (!PageUptodate(page)) {
|
|
|
|
if (copied < len) {
|
|
|
|
copied = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
SetPageUptodate(page);
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/* did file size increase? */
|
2015-12-30 11:32:46 +08:00
|
|
|
if (pos+copied > i_size_read(inode))
|
2009-10-07 02:31:09 +08:00
|
|
|
check_cap = ceph_inode_set_size(inode, pos+copied);
|
|
|
|
|
|
|
|
set_page_dirty(page);
|
|
|
|
|
2016-09-06 10:20:03 +08:00
|
|
|
out:
|
2009-10-07 02:31:09 +08:00
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
if (check_cap)
|
|
|
|
ceph_check_caps(ceph_inode(inode), CHECK_CAPS_AUTHONLY, NULL);
|
|
|
|
|
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* we set .direct_IO to indicate direct io is supported, but since we
|
|
|
|
* intercept O_DIRECT reads and writes early, this function should
|
|
|
|
* never get called.
|
|
|
|
*/
|
2016-04-07 23:51:58 +08:00
|
|
|
static ssize_t ceph_direct_io(struct kiocb *iocb, struct iov_iter *iter)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
|
|
|
WARN_ON(1);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
const struct address_space_operations ceph_aops = {
|
|
|
|
.readpage = ceph_readpage,
|
|
|
|
.readpages = ceph_readpages,
|
|
|
|
.writepage = ceph_writepage,
|
|
|
|
.writepages = ceph_writepages_start,
|
|
|
|
.write_begin = ceph_write_begin,
|
|
|
|
.write_end = ceph_write_end,
|
|
|
|
.set_page_dirty = ceph_set_page_dirty,
|
|
|
|
.invalidatepage = ceph_invalidatepage,
|
|
|
|
.releasepage = ceph_releasepage,
|
|
|
|
.direct_IO = ceph_direct_io,
|
|
|
|
};
|
|
|
|
|
2016-05-10 18:40:28 +08:00
|
|
|
static void ceph_block_sigs(sigset_t *oldset)
|
|
|
|
{
|
|
|
|
sigset_t mask;
|
|
|
|
siginitsetinv(&mask, sigmask(SIGKILL));
|
|
|
|
sigprocmask(SIG_BLOCK, &mask, oldset);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void ceph_restore_sigs(sigset_t *oldset)
|
|
|
|
{
|
|
|
|
sigprocmask(SIG_SETMASK, oldset, NULL);
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* vm ops
|
|
|
|
*/
|
2018-07-24 00:02:24 +08:00
|
|
|
static vm_fault_t ceph_filemap_fault(struct vm_fault *vmf)
|
2013-11-28 14:28:14 +08:00
|
|
|
{
|
2017-02-25 06:56:41 +08:00
|
|
|
struct vm_area_struct *vma = vmf->vma;
|
2013-11-28 14:28:14 +08:00
|
|
|
struct inode *inode = file_inode(vma->vm_file);
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_file_info *fi = vma->vm_file->private_data;
|
2014-11-14 22:10:07 +08:00
|
|
|
struct page *pinned_page = NULL;
|
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 20:29:47 +08:00
|
|
|
loff_t off = vmf->pgoff << PAGE_SHIFT;
|
2018-07-24 00:02:24 +08:00
|
|
|
int want, got, err;
|
2016-05-10 18:40:28 +08:00
|
|
|
sigset_t oldset;
|
2018-07-24 00:02:24 +08:00
|
|
|
vm_fault_t ret = VM_FAULT_SIGBUS;
|
2016-05-10 18:40:28 +08:00
|
|
|
|
|
|
|
ceph_block_sigs(&oldset);
|
2013-11-28 14:28:14 +08:00
|
|
|
|
|
|
|
dout("filemap_fault %p %llx.%llx %llu~%zd trying to get caps\n",
|
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 20:29:47 +08:00
|
|
|
inode, ceph_vinop(inode), off, (size_t)PAGE_SIZE);
|
2013-11-28 14:28:14 +08:00
|
|
|
if (fi->fmode & CEPH_FILE_MODE_LAZY)
|
|
|
|
want = CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO;
|
|
|
|
else
|
|
|
|
want = CEPH_CAP_FILE_CACHE;
|
2016-05-10 18:40:28 +08:00
|
|
|
|
|
|
|
got = 0;
|
2019-07-25 20:16:43 +08:00
|
|
|
err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_RD, want, -1,
|
|
|
|
&got, &pinned_page);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0)
|
2016-05-10 18:40:28 +08:00
|
|
|
goto out_restore;
|
2016-05-10 18:59:13 +08:00
|
|
|
|
2013-11-28 14:28:14 +08:00
|
|
|
dout("filemap_fault %p %llu~%zd got cap refs on %s\n",
|
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 20:29:47 +08:00
|
|
|
inode, off, (size_t)PAGE_SIZE, ceph_cap_string(got));
|
2013-11-28 14:28:14 +08:00
|
|
|
|
2014-11-14 22:36:18 +08:00
|
|
|
if ((got & (CEPH_CAP_FILE_CACHE | CEPH_CAP_FILE_LAZYIO)) ||
|
2016-10-25 10:51:55 +08:00
|
|
|
ci->i_inline_version == CEPH_INLINE_NONE) {
|
2017-12-15 11:15:36 +08:00
|
|
|
CEPH_DEFINE_RW_CONTEXT(rw_ctx, got);
|
|
|
|
ceph_add_rw_context(fi, &rw_ctx);
|
2017-02-25 06:56:41 +08:00
|
|
|
ret = filemap_fault(vmf);
|
2017-12-15 11:15:36 +08:00
|
|
|
ceph_del_rw_context(fi, &rw_ctx);
|
2018-07-24 00:02:24 +08:00
|
|
|
dout("filemap_fault %p %llu~%zd drop cap refs %s ret %x\n",
|
|
|
|
inode, off, (size_t)PAGE_SIZE,
|
|
|
|
ceph_cap_string(got), ret);
|
2016-10-25 10:51:55 +08:00
|
|
|
} else
|
2018-07-24 00:02:24 +08:00
|
|
|
err = -EAGAIN;
|
2013-11-28 14:28:14 +08:00
|
|
|
|
2014-11-14 22:10:07 +08:00
|
|
|
if (pinned_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 20:29:47 +08:00
|
|
|
put_page(pinned_page);
|
2013-11-28 14:28:14 +08:00
|
|
|
ceph_put_cap_refs(ci, got);
|
|
|
|
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err != -EAGAIN)
|
2016-05-10 18:40:28 +08:00
|
|
|
goto out_restore;
|
2014-11-14 22:36:18 +08:00
|
|
|
|
|
|
|
/* read inline 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 20:29:47 +08:00
|
|
|
if (off >= PAGE_SIZE) {
|
2014-11-14 22:36:18 +08:00
|
|
|
/* does not support inline data > PAGE_SIZE */
|
|
|
|
ret = VM_FAULT_SIGBUS;
|
|
|
|
} else {
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
struct page *page = find_or_create_page(mapping, 0,
|
2015-11-07 08:28:49 +08:00
|
|
|
mapping_gfp_constraint(mapping,
|
|
|
|
~__GFP_FS));
|
2014-11-14 22:36:18 +08:00
|
|
|
if (!page) {
|
|
|
|
ret = VM_FAULT_OOM;
|
2016-05-10 18:40:28 +08:00
|
|
|
goto out_inline;
|
2014-11-14 22:36:18 +08:00
|
|
|
}
|
2018-07-24 00:02:24 +08:00
|
|
|
err = __ceph_do_getattr(inode, page,
|
2014-11-14 22:36:18 +08:00
|
|
|
CEPH_STAT_CAP_INLINE_DATA, true);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0 || off >= i_size_read(inode)) {
|
2014-11-14 22:36:18 +08:00
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2019-01-05 03:30:29 +08:00
|
|
|
ret = vmf_error(err);
|
2016-05-10 18:40:28 +08:00
|
|
|
goto out_inline;
|
2014-11-14 22:36:18 +08:00
|
|
|
}
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < PAGE_SIZE)
|
|
|
|
zero_user_segment(page, err, PAGE_SIZE);
|
2014-11-14 22:36:18 +08:00
|
|
|
else
|
|
|
|
flush_dcache_page(page);
|
|
|
|
SetPageUptodate(page);
|
|
|
|
vmf->page = page;
|
|
|
|
ret = VM_FAULT_MAJOR | VM_FAULT_LOCKED;
|
2016-05-10 18:40:28 +08:00
|
|
|
out_inline:
|
2018-07-24 00:02:24 +08:00
|
|
|
dout("filemap_fault %p %llu~%zd read inline data ret %x\n",
|
2016-05-10 18:40:28 +08:00
|
|
|
inode, off, (size_t)PAGE_SIZE, ret);
|
2014-11-14 22:36:18 +08:00
|
|
|
}
|
2016-05-10 18:40:28 +08:00
|
|
|
out_restore:
|
|
|
|
ceph_restore_sigs(&oldset);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0)
|
|
|
|
ret = vmf_error(err);
|
2016-05-10 18:59:13 +08:00
|
|
|
|
2013-11-28 14:28:14 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2009-10-07 02:31:09 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Reuse write_begin here for simplicity.
|
|
|
|
*/
|
2018-07-24 00:02:24 +08:00
|
|
|
static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf)
|
2009-10-07 02:31:09 +08:00
|
|
|
{
|
2017-02-25 06:56:41 +08:00
|
|
|
struct vm_area_struct *vma = vmf->vma;
|
2013-01-24 06:07:38 +08:00
|
|
|
struct inode *inode = file_inode(vma->vm_file);
|
2013-11-28 14:28:14 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_file_info *fi = vma->vm_file->private_data;
|
2015-06-10 17:26:13 +08:00
|
|
|
struct ceph_cap_flush *prealloc_cf;
|
2013-11-28 14:28:14 +08:00
|
|
|
struct page *page = vmf->page;
|
2012-10-02 23:25:51 +08:00
|
|
|
loff_t off = page_offset(page);
|
2013-11-28 14:28:14 +08:00
|
|
|
loff_t size = i_size_read(inode);
|
|
|
|
size_t len;
|
2018-07-24 00:02:24 +08:00
|
|
|
int want, got, err;
|
2016-05-10 18:40:28 +08:00
|
|
|
sigset_t oldset;
|
2018-07-24 00:02:24 +08:00
|
|
|
vm_fault_t ret = VM_FAULT_SIGBUS;
|
2012-06-12 22:20:24 +08:00
|
|
|
|
2015-06-10 17:26:13 +08:00
|
|
|
prealloc_cf = ceph_alloc_cap_flush();
|
|
|
|
if (!prealloc_cf)
|
2016-05-10 18:59:13 +08:00
|
|
|
return VM_FAULT_OOM;
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2019-08-01 22:06:40 +08:00
|
|
|
sb_start_pagefault(inode->i_sb);
|
2016-05-10 18:40:28 +08:00
|
|
|
ceph_block_sigs(&oldset);
|
2015-06-10 17:26:13 +08:00
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
if (ci->i_inline_version != CEPH_INLINE_NONE) {
|
|
|
|
struct page *locked_page = NULL;
|
|
|
|
if (off == 0) {
|
|
|
|
lock_page(page);
|
|
|
|
locked_page = page;
|
|
|
|
}
|
2018-07-24 00:02:24 +08:00
|
|
|
err = ceph_uninline_data(vma->vm_file, locked_page);
|
2014-11-14 22:38:29 +08:00
|
|
|
if (locked_page)
|
|
|
|
unlock_page(locked_page);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0)
|
2015-06-10 17:26:13 +08:00
|
|
|
goto out_free;
|
2014-11-14 22:38:29 +08: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 20:29:47 +08:00
|
|
|
if (off + PAGE_SIZE <= size)
|
|
|
|
len = PAGE_SIZE;
|
2009-10-07 02:31:09 +08:00
|
|
|
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 20:29:47 +08:00
|
|
|
len = size & ~PAGE_MASK;
|
2009-10-07 02:31:09 +08:00
|
|
|
|
2013-11-28 14:28:14 +08:00
|
|
|
dout("page_mkwrite %p %llx.%llx %llu~%zd getting caps i_size %llu\n",
|
|
|
|
inode, ceph_vinop(inode), off, len, size);
|
|
|
|
if (fi->fmode & CEPH_FILE_MODE_LAZY)
|
|
|
|
want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;
|
|
|
|
else
|
|
|
|
want = CEPH_CAP_FILE_BUFFER;
|
2016-05-10 18:40:28 +08:00
|
|
|
|
|
|
|
got = 0;
|
2019-07-25 20:16:43 +08:00
|
|
|
err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_WR, want, off + len,
|
2016-05-10 18:40:28 +08:00
|
|
|
&got, NULL);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0)
|
2016-05-10 18:40:28 +08:00
|
|
|
goto out_free;
|
2016-05-10 18:59:13 +08:00
|
|
|
|
2013-11-28 14:28:14 +08:00
|
|
|
dout("page_mkwrite %p %llu~%zd got cap refs on %s\n",
|
|
|
|
inode, off, len, ceph_cap_string(got));
|
|
|
|
|
|
|
|
/* Update time before taking page lock */
|
|
|
|
file_update_time(vma->vm_file);
|
2019-06-06 20:57:27 +08:00
|
|
|
inode_inc_iversion_raw(inode);
|
2010-02-10 03:02:51 +08:00
|
|
|
|
2016-05-10 19:09:06 +08:00
|
|
|
do {
|
|
|
|
lock_page(page);
|
2010-02-10 03:02:51 +08:00
|
|
|
|
2020-02-14 04:24:22 +08:00
|
|
|
if (page_mkwrite_check_truncate(page, inode) < 0) {
|
2016-05-10 19:09:06 +08:00
|
|
|
unlock_page(page);
|
|
|
|
ret = VM_FAULT_NOPAGE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2018-07-24 00:02:24 +08:00
|
|
|
err = ceph_update_writeable_page(vma->vm_file, off, len, page);
|
|
|
|
if (err >= 0) {
|
2016-05-10 19:09:06 +08:00
|
|
|
/* success. we'll keep the page locked. */
|
|
|
|
set_page_dirty(page);
|
|
|
|
ret = VM_FAULT_LOCKED;
|
|
|
|
}
|
2018-07-24 00:02:24 +08:00
|
|
|
} while (err == -EAGAIN);
|
2010-02-10 03:02:51 +08:00
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
if (ret == VM_FAULT_LOCKED ||
|
|
|
|
ci->i_inline_version != CEPH_INLINE_NONE) {
|
2013-11-28 14:28:14 +08:00
|
|
|
int dirty;
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2014-11-14 22:38:29 +08:00
|
|
|
ci->i_inline_version = CEPH_INLINE_NONE;
|
2015-06-10 17:26:13 +08:00
|
|
|
dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_FILE_WR,
|
|
|
|
&prealloc_cf);
|
2013-11-28 14:28:14 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
if (dirty)
|
|
|
|
__mark_inode_dirty(inode, dirty);
|
|
|
|
}
|
|
|
|
|
2018-07-24 00:02:24 +08:00
|
|
|
dout("page_mkwrite %p %llu~%zd dropping cap refs on %s ret %x\n",
|
2013-11-28 14:28:14 +08:00
|
|
|
inode, off, len, ceph_cap_string(got), ret);
|
|
|
|
ceph_put_cap_refs(ci, got);
|
2015-06-10 17:26:13 +08:00
|
|
|
out_free:
|
2016-05-10 18:40:28 +08:00
|
|
|
ceph_restore_sigs(&oldset);
|
2019-08-01 22:06:40 +08:00
|
|
|
sb_end_pagefault(inode->i_sb);
|
2015-06-10 17:26:13 +08:00
|
|
|
ceph_free_cap_flush(prealloc_cf);
|
2018-07-24 00:02:24 +08:00
|
|
|
if (err < 0)
|
|
|
|
ret = vmf_error(err);
|
2009-10-07 02:31:09 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2014-11-14 21:41:55 +08:00
|
|
|
void ceph_fill_inline_data(struct inode *inode, struct page *locked_page,
|
|
|
|
char *data, size_t len)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = inode->i_mapping;
|
|
|
|
struct page *page;
|
|
|
|
|
|
|
|
if (locked_page) {
|
|
|
|
page = locked_page;
|
|
|
|
} else {
|
|
|
|
if (i_size_read(inode) == 0)
|
|
|
|
return;
|
|
|
|
page = find_or_create_page(mapping, 0,
|
2015-11-07 08:28:49 +08:00
|
|
|
mapping_gfp_constraint(mapping,
|
|
|
|
~__GFP_FS));
|
2014-11-14 21:41:55 +08:00
|
|
|
if (!page)
|
|
|
|
return;
|
|
|
|
if (PageUptodate(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 20:29:47 +08:00
|
|
|
put_page(page);
|
2014-11-14 21:41:55 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-19 18:10:10 +08:00
|
|
|
dout("fill_inline_data %p %llx.%llx len %zu locked_page %p\n",
|
2014-11-14 21:41:55 +08:00
|
|
|
inode, ceph_vinop(inode), len, locked_page);
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
void *kaddr = kmap_atomic(page);
|
|
|
|
memcpy(kaddr, data, len);
|
|
|
|
kunmap_atomic(kaddr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (page != locked_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 20:29:47 +08:00
|
|
|
if (len < PAGE_SIZE)
|
|
|
|
zero_user_segment(page, len, PAGE_SIZE);
|
2014-11-14 21:41:55 +08:00
|
|
|
else
|
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2014-11-14 21:41:55 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
int ceph_uninline_data(struct file *filp, struct page *locked_page)
|
|
|
|
{
|
|
|
|
struct inode *inode = file_inode(filp);
|
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
|
|
|
|
struct ceph_osd_request *req;
|
|
|
|
struct page *page = NULL;
|
|
|
|
u64 len, inline_version;
|
|
|
|
int err = 0;
|
|
|
|
bool from_pagecache = false;
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
inline_version = ci->i_inline_version;
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
|
|
|
|
dout("uninline_data %p %llx.%llx inline_version %llu\n",
|
|
|
|
inode, ceph_vinop(inode), inline_version);
|
|
|
|
|
|
|
|
if (inline_version == 1 || /* initial version, no data */
|
|
|
|
inline_version == CEPH_INLINE_NONE)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (locked_page) {
|
|
|
|
page = locked_page;
|
|
|
|
WARN_ON(!PageUptodate(page));
|
|
|
|
} else if (ceph_caps_issued(ci) &
|
|
|
|
(CEPH_CAP_FILE_CACHE|CEPH_CAP_FILE_LAZYIO)) {
|
|
|
|
page = find_get_page(inode->i_mapping, 0);
|
|
|
|
if (page) {
|
|
|
|
if (PageUptodate(page)) {
|
|
|
|
from_pagecache = true;
|
|
|
|
lock_page(page);
|
|
|
|
} 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 20:29:47 +08:00
|
|
|
put_page(page);
|
2014-11-14 22:38:29 +08:00
|
|
|
page = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (page) {
|
|
|
|
len = i_size_read(inode);
|
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 20:29:47 +08:00
|
|
|
if (len > PAGE_SIZE)
|
|
|
|
len = PAGE_SIZE;
|
2014-11-14 22:38:29 +08:00
|
|
|
} else {
|
|
|
|
page = __page_cache_alloc(GFP_NOFS);
|
|
|
|
if (!page) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
err = __ceph_do_getattr(inode, page,
|
|
|
|
CEPH_STAT_CAP_INLINE_DATA, true);
|
|
|
|
if (err < 0) {
|
|
|
|
/* no inline data */
|
|
|
|
if (err == -ENODATA)
|
|
|
|
err = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
len = err;
|
|
|
|
}
|
|
|
|
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
|
|
|
|
ceph_vino(inode), 0, &len, 0, 1,
|
2017-02-12 01:48:41 +08:00
|
|
|
CEPH_OSD_OP_CREATE, CEPH_OSD_FLAG_WRITE,
|
2016-02-16 22:00:24 +08:00
|
|
|
NULL, 0, 0, false);
|
2014-11-14 22:38:29 +08:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2018-07-14 04:18:37 +08:00
|
|
|
req->r_mtime = inode->i_mtime;
|
2014-11-14 22:38:29 +08:00
|
|
|
err = ceph_osdc_start_request(&fsc->client->osdc, req, false);
|
|
|
|
if (!err)
|
|
|
|
err = ceph_osdc_wait_request(&fsc->client->osdc, req);
|
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
req = ceph_osdc_new_request(&fsc->client->osdc, &ci->i_layout,
|
|
|
|
ceph_vino(inode), 0, &len, 1, 3,
|
2017-02-12 01:48:41 +08:00
|
|
|
CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,
|
2016-02-16 22:00:24 +08:00
|
|
|
NULL, ci->i_truncate_seq,
|
|
|
|
ci->i_truncate_size, false);
|
2014-11-14 22:38:29 +08:00
|
|
|
if (IS_ERR(req)) {
|
|
|
|
err = PTR_ERR(req);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
osd_req_op_extent_osd_data_pages(req, 1, &page, len, 0, false, false);
|
|
|
|
|
2015-04-13 11:25:07 +08:00
|
|
|
{
|
|
|
|
__le64 xattr_buf = cpu_to_le64(inline_version);
|
|
|
|
err = osd_req_op_xattr_init(req, 0, CEPH_OSD_OP_CMPXATTR,
|
|
|
|
"inline_version", &xattr_buf,
|
|
|
|
sizeof(xattr_buf),
|
|
|
|
CEPH_OSD_CMPXATTR_OP_GT,
|
|
|
|
CEPH_OSD_CMPXATTR_MODE_U64);
|
|
|
|
if (err)
|
|
|
|
goto out_put;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
char xattr_buf[32];
|
|
|
|
int xattr_len = snprintf(xattr_buf, sizeof(xattr_buf),
|
|
|
|
"%llu", inline_version);
|
|
|
|
err = osd_req_op_xattr_init(req, 2, CEPH_OSD_OP_SETXATTR,
|
|
|
|
"inline_version",
|
|
|
|
xattr_buf, xattr_len, 0, 0);
|
|
|
|
if (err)
|
|
|
|
goto out_put;
|
|
|
|
}
|
2014-11-14 22:38:29 +08:00
|
|
|
|
2018-07-14 04:18:37 +08:00
|
|
|
req->r_mtime = inode->i_mtime;
|
2014-11-14 22:38:29 +08:00
|
|
|
err = ceph_osdc_start_request(&fsc->client->osdc, req, false);
|
|
|
|
if (!err)
|
|
|
|
err = ceph_osdc_wait_request(&fsc->client->osdc, req);
|
2020-03-20 11:45:01 +08:00
|
|
|
|
|
|
|
ceph_update_write_latency(&fsc->mdsc->metric, req->r_start_latency,
|
|
|
|
req->r_end_latency, err);
|
|
|
|
|
2014-11-14 22:38:29 +08:00
|
|
|
out_put:
|
|
|
|
ceph_osdc_put_request(req);
|
|
|
|
if (err == -ECANCELED)
|
|
|
|
err = 0;
|
|
|
|
out:
|
|
|
|
if (page && page != locked_page) {
|
|
|
|
if (from_pagecache) {
|
|
|
|
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 20:29:47 +08:00
|
|
|
put_page(page);
|
2014-11-14 22:38:29 +08:00
|
|
|
} else
|
|
|
|
__free_pages(page, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
dout("uninline_data %p %llx.%llx inline_version %llu = %d\n",
|
|
|
|
inode, ceph_vinop(inode), inline_version, err);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2015-09-10 06:39:26 +08:00
|
|
|
static const struct vm_operations_struct ceph_vmops = {
|
2013-11-28 14:28:14 +08:00
|
|
|
.fault = ceph_filemap_fault,
|
2009-10-07 02:31:09 +08:00
|
|
|
.page_mkwrite = ceph_page_mkwrite,
|
|
|
|
};
|
|
|
|
|
|
|
|
int ceph_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
{
|
|
|
|
struct address_space *mapping = file->f_mapping;
|
|
|
|
|
|
|
|
if (!mapping->a_ops->readpage)
|
|
|
|
return -ENOEXEC;
|
|
|
|
file_accessed(file);
|
|
|
|
vma->vm_ops = &ceph_vmops;
|
|
|
|
return 0;
|
|
|
|
}
|
2015-04-27 15:33:28 +08:00
|
|
|
|
|
|
|
enum {
|
|
|
|
POOL_READ = 1,
|
|
|
|
POOL_WRITE = 2,
|
|
|
|
};
|
|
|
|
|
2016-03-07 09:35:06 +08:00
|
|
|
static int __ceph_pool_perm_get(struct ceph_inode_info *ci,
|
|
|
|
s64 pool, struct ceph_string *pool_ns)
|
2015-04-27 15:33:28 +08:00
|
|
|
{
|
|
|
|
struct ceph_fs_client *fsc = ceph_inode_to_client(&ci->vfs_inode);
|
|
|
|
struct ceph_mds_client *mdsc = fsc->mdsc;
|
|
|
|
struct ceph_osd_request *rd_req = NULL, *wr_req = NULL;
|
|
|
|
struct rb_node **p, *parent;
|
|
|
|
struct ceph_pool_perm *perm;
|
|
|
|
struct page **pages;
|
2016-03-07 09:35:06 +08:00
|
|
|
size_t pool_ns_len;
|
2015-04-27 15:33:28 +08:00
|
|
|
int err = 0, err2 = 0, have = 0;
|
|
|
|
|
|
|
|
down_read(&mdsc->pool_perm_rwsem);
|
|
|
|
p = &mdsc->pool_perm_tree.rb_node;
|
|
|
|
while (*p) {
|
|
|
|
perm = rb_entry(*p, struct ceph_pool_perm, node);
|
|
|
|
if (pool < perm->pool)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else if (pool > perm->pool)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else {
|
2016-03-07 09:35:06 +08:00
|
|
|
int ret = ceph_compare_string(pool_ns,
|
|
|
|
perm->pool_ns,
|
|
|
|
perm->pool_ns_len);
|
|
|
|
if (ret < 0)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else if (ret > 0)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else {
|
|
|
|
have = perm->perm;
|
|
|
|
break;
|
|
|
|
}
|
2015-04-27 15:33:28 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
up_read(&mdsc->pool_perm_rwsem);
|
|
|
|
if (*p)
|
|
|
|
goto out;
|
|
|
|
|
2016-03-07 09:35:06 +08:00
|
|
|
if (pool_ns)
|
|
|
|
dout("__ceph_pool_perm_get pool %lld ns %.*s no perm cached\n",
|
|
|
|
pool, (int)pool_ns->len, pool_ns->str);
|
|
|
|
else
|
|
|
|
dout("__ceph_pool_perm_get pool %lld no perm cached\n", pool);
|
2015-04-27 15:33:28 +08:00
|
|
|
|
|
|
|
down_write(&mdsc->pool_perm_rwsem);
|
2016-03-07 09:35:06 +08:00
|
|
|
p = &mdsc->pool_perm_tree.rb_node;
|
2015-04-27 15:33:28 +08:00
|
|
|
parent = NULL;
|
|
|
|
while (*p) {
|
|
|
|
parent = *p;
|
|
|
|
perm = rb_entry(parent, struct ceph_pool_perm, node);
|
|
|
|
if (pool < perm->pool)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else if (pool > perm->pool)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else {
|
2016-03-07 09:35:06 +08:00
|
|
|
int ret = ceph_compare_string(pool_ns,
|
|
|
|
perm->pool_ns,
|
|
|
|
perm->pool_ns_len);
|
|
|
|
if (ret < 0)
|
|
|
|
p = &(*p)->rb_left;
|
|
|
|
else if (ret > 0)
|
|
|
|
p = &(*p)->rb_right;
|
|
|
|
else {
|
|
|
|
have = perm->perm;
|
|
|
|
break;
|
|
|
|
}
|
2015-04-27 15:33:28 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (*p) {
|
|
|
|
up_write(&mdsc->pool_perm_rwsem);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2016-02-16 22:00:24 +08:00
|
|
|
rd_req = ceph_osdc_alloc_request(&fsc->client->osdc, NULL,
|
2015-04-27 15:33:28 +08:00
|
|
|
1, false, GFP_NOFS);
|
|
|
|
if (!rd_req) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
rd_req->r_flags = CEPH_OSD_FLAG_READ;
|
|
|
|
osd_req_op_init(rd_req, 0, CEPH_OSD_OP_STAT, 0);
|
|
|
|
rd_req->r_base_oloc.pool = pool;
|
2016-03-07 09:35:06 +08:00
|
|
|
if (pool_ns)
|
|
|
|
rd_req->r_base_oloc.pool_ns = ceph_get_string(pool_ns);
|
2016-04-30 01:54:20 +08:00
|
|
|
ceph_oid_printf(&rd_req->r_base_oid, "%llx.00000000", ci->i_vino.ino);
|
2015-04-27 15:33:28 +08:00
|
|
|
|
2016-04-27 20:15:51 +08:00
|
|
|
err = ceph_osdc_alloc_messages(rd_req, GFP_NOFS);
|
|
|
|
if (err)
|
|
|
|
goto out_unlock;
|
2015-04-27 15:33:28 +08:00
|
|
|
|
2016-02-16 22:00:24 +08:00
|
|
|
wr_req = ceph_osdc_alloc_request(&fsc->client->osdc, NULL,
|
2015-04-27 15:33:28 +08:00
|
|
|
1, false, GFP_NOFS);
|
|
|
|
if (!wr_req) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
2017-02-12 01:48:41 +08:00
|
|
|
wr_req->r_flags = CEPH_OSD_FLAG_WRITE;
|
2015-04-27 15:33:28 +08:00
|
|
|
osd_req_op_init(wr_req, 0, CEPH_OSD_OP_CREATE, CEPH_OSD_OP_FLAG_EXCL);
|
2016-04-28 22:07:23 +08:00
|
|
|
ceph_oloc_copy(&wr_req->r_base_oloc, &rd_req->r_base_oloc);
|
2016-04-30 01:54:20 +08:00
|
|
|
ceph_oid_copy(&wr_req->r_base_oid, &rd_req->r_base_oid);
|
2015-04-27 15:33:28 +08:00
|
|
|
|
2016-04-27 20:15:51 +08:00
|
|
|
err = ceph_osdc_alloc_messages(wr_req, GFP_NOFS);
|
|
|
|
if (err)
|
|
|
|
goto out_unlock;
|
2015-04-27 15:33:28 +08:00
|
|
|
|
|
|
|
/* one page should be large enough for STAT data */
|
|
|
|
pages = ceph_alloc_page_vector(1, GFP_KERNEL);
|
|
|
|
if (IS_ERR(pages)) {
|
|
|
|
err = PTR_ERR(pages);
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
osd_req_op_raw_data_in_pages(rd_req, 0, pages, PAGE_SIZE,
|
|
|
|
0, false, true);
|
|
|
|
err = ceph_osdc_start_request(&fsc->client->osdc, rd_req, false);
|
|
|
|
|
2018-07-14 04:18:37 +08:00
|
|
|
wr_req->r_mtime = ci->vfs_inode.i_mtime;
|
2015-04-27 15:33:28 +08:00
|
|
|
err2 = ceph_osdc_start_request(&fsc->client->osdc, wr_req, false);
|
|
|
|
|
|
|
|
if (!err)
|
|
|
|
err = ceph_osdc_wait_request(&fsc->client->osdc, rd_req);
|
|
|
|
if (!err2)
|
|
|
|
err2 = ceph_osdc_wait_request(&fsc->client->osdc, wr_req);
|
|
|
|
|
|
|
|
if (err >= 0 || err == -ENOENT)
|
|
|
|
have |= POOL_READ;
|
2019-07-25 20:16:47 +08:00
|
|
|
else if (err != -EPERM) {
|
|
|
|
if (err == -EBLACKLISTED)
|
|
|
|
fsc->blacklisted = true;
|
2015-04-27 15:33:28 +08:00
|
|
|
goto out_unlock;
|
2019-07-25 20:16:47 +08:00
|
|
|
}
|
2015-04-27 15:33:28 +08:00
|
|
|
|
|
|
|
if (err2 == 0 || err2 == -EEXIST)
|
|
|
|
have |= POOL_WRITE;
|
|
|
|
else if (err2 != -EPERM) {
|
2019-07-25 20:16:47 +08:00
|
|
|
if (err2 == -EBLACKLISTED)
|
|
|
|
fsc->blacklisted = true;
|
2015-04-27 15:33:28 +08:00
|
|
|
err = err2;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
2016-03-07 09:35:06 +08:00
|
|
|
pool_ns_len = pool_ns ? pool_ns->len : 0;
|
|
|
|
perm = kmalloc(sizeof(*perm) + pool_ns_len + 1, GFP_NOFS);
|
2015-04-27 15:33:28 +08:00
|
|
|
if (!perm) {
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
perm->pool = pool;
|
|
|
|
perm->perm = have;
|
2016-03-07 09:35:06 +08:00
|
|
|
perm->pool_ns_len = pool_ns_len;
|
|
|
|
if (pool_ns_len > 0)
|
|
|
|
memcpy(perm->pool_ns, pool_ns->str, pool_ns_len);
|
|
|
|
perm->pool_ns[pool_ns_len] = 0;
|
|
|
|
|
2015-04-27 15:33:28 +08:00
|
|
|
rb_link_node(&perm->node, parent, p);
|
|
|
|
rb_insert_color(&perm->node, &mdsc->pool_perm_tree);
|
|
|
|
err = 0;
|
|
|
|
out_unlock:
|
|
|
|
up_write(&mdsc->pool_perm_rwsem);
|
|
|
|
|
2016-04-26 21:05:29 +08:00
|
|
|
ceph_osdc_put_request(rd_req);
|
|
|
|
ceph_osdc_put_request(wr_req);
|
2015-04-27 15:33:28 +08:00
|
|
|
out:
|
|
|
|
if (!err)
|
|
|
|
err = have;
|
2016-03-07 09:35:06 +08:00
|
|
|
if (pool_ns)
|
|
|
|
dout("__ceph_pool_perm_get pool %lld ns %.*s result = %d\n",
|
|
|
|
pool, (int)pool_ns->len, pool_ns->str, err);
|
|
|
|
else
|
|
|
|
dout("__ceph_pool_perm_get pool %lld result = %d\n", pool, err);
|
2015-04-27 15:33:28 +08:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2019-07-25 20:16:43 +08:00
|
|
|
int ceph_pool_perm_check(struct inode *inode, int need)
|
2015-04-27 15:33:28 +08:00
|
|
|
{
|
2019-07-25 20:16:43 +08:00
|
|
|
struct ceph_inode_info *ci = ceph_inode(inode);
|
2016-03-07 09:35:06 +08:00
|
|
|
struct ceph_string *pool_ns;
|
2019-07-25 20:16:43 +08:00
|
|
|
s64 pool;
|
2015-04-27 15:33:28 +08:00
|
|
|
int ret, flags;
|
|
|
|
|
2016-12-13 16:03:26 +08:00
|
|
|
if (ci->i_vino.snap != CEPH_NOSNAP) {
|
|
|
|
/*
|
|
|
|
* Pool permission check needs to write to the first object.
|
|
|
|
* But for snapshot, head of the first object may have alread
|
|
|
|
* been deleted. Skip check to avoid creating orphan object.
|
|
|
|
*/
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-07-25 20:16:43 +08:00
|
|
|
if (ceph_test_mount_opt(ceph_inode_to_client(inode),
|
2015-04-27 15:33:28 +08:00
|
|
|
NOPOOLPERM))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
|
|
|
flags = ci->i_ceph_flags;
|
2016-02-03 21:24:49 +08:00
|
|
|
pool = ci->i_layout.pool_id;
|
2015-04-27 15:33:28 +08:00
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
check:
|
|
|
|
if (flags & CEPH_I_POOL_PERM) {
|
|
|
|
if ((need & CEPH_CAP_FILE_RD) && !(flags & CEPH_I_POOL_RD)) {
|
2016-02-03 21:24:49 +08:00
|
|
|
dout("ceph_pool_perm_check pool %lld no read perm\n",
|
2015-04-27 15:33:28 +08:00
|
|
|
pool);
|
|
|
|
return -EPERM;
|
|
|
|
}
|
|
|
|
if ((need & CEPH_CAP_FILE_WR) && !(flags & CEPH_I_POOL_WR)) {
|
2016-02-03 21:24:49 +08:00
|
|
|
dout("ceph_pool_perm_check pool %lld no write perm\n",
|
2015-04-27 15:33:28 +08:00
|
|
|
pool);
|
|
|
|
return -EPERM;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-07 09:35:06 +08:00
|
|
|
pool_ns = ceph_try_get_string(ci->i_layout.pool_ns);
|
|
|
|
ret = __ceph_pool_perm_get(ci, pool, pool_ns);
|
|
|
|
ceph_put_string(pool_ns);
|
2015-04-27 15:33:28 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
flags = CEPH_I_POOL_PERM;
|
|
|
|
if (ret & POOL_READ)
|
|
|
|
flags |= CEPH_I_POOL_RD;
|
|
|
|
if (ret & POOL_WRITE)
|
|
|
|
flags |= CEPH_I_POOL_WR;
|
|
|
|
|
|
|
|
spin_lock(&ci->i_ceph_lock);
|
2016-03-07 09:35:06 +08:00
|
|
|
if (pool == ci->i_layout.pool_id &&
|
|
|
|
pool_ns == rcu_dereference_raw(ci->i_layout.pool_ns)) {
|
|
|
|
ci->i_ceph_flags |= flags;
|
2015-04-27 15:33:28 +08:00
|
|
|
} else {
|
2016-02-03 21:24:49 +08:00
|
|
|
pool = ci->i_layout.pool_id;
|
2015-04-27 15:33:28 +08:00
|
|
|
flags = ci->i_ceph_flags;
|
|
|
|
}
|
|
|
|
spin_unlock(&ci->i_ceph_lock);
|
|
|
|
goto check;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ceph_pool_perm_destroy(struct ceph_mds_client *mdsc)
|
|
|
|
{
|
|
|
|
struct ceph_pool_perm *perm;
|
|
|
|
struct rb_node *n;
|
|
|
|
|
|
|
|
while (!RB_EMPTY_ROOT(&mdsc->pool_perm_tree)) {
|
|
|
|
n = rb_first(&mdsc->pool_perm_tree);
|
|
|
|
perm = rb_entry(n, struct ceph_pool_perm, node);
|
|
|
|
rb_erase(n, &mdsc->pool_perm_tree);
|
|
|
|
kfree(perm);
|
|
|
|
}
|
|
|
|
}
|