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 17:07:57 +03:00
// SPDX-License-Identifier: GPL-2.0
2005-04-17 02:20:36 +04:00
/*
* fs / mpage . c
*
* Copyright ( C ) 2002 , Linus Torvalds .
*
* Contains functions related to preparing and submitting BIOs which contain
* multiple pagecache pages .
*
2008-10-16 09:01:59 +04:00
* 15 May2002 Andrew Morton
2005-04-17 02:20:36 +04:00
* Initial version
* 27 Jun2002 axboe @ suse . de
* use bio_add_page ( ) to build bio ' s just the right size
*/
# include <linux/kernel.h>
2011-11-17 08:57:37 +04:00
# include <linux/export.h>
2005-04-17 02:20:36 +04:00
# include <linux/mm.h>
# include <linux/kdev_t.h>
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
# include <linux/gfp.h>
2005-04-17 02:20:36 +04:00
# include <linux/bio.h>
# include <linux/fs.h>
# include <linux/buffer_head.h>
# include <linux/blkdev.h>
# include <linux/highmem.h>
# include <linux/prefetch.h>
# include <linux/mpage.h>
2016-03-16 00:55:15 +03:00
# include <linux/mm_inline.h>
2005-04-17 02:20:36 +04:00
# include <linux/writeback.h>
# include <linux/backing-dev.h>
# include <linux/pagevec.h>
2011-05-26 20:01:43 +04:00
# include <linux/cleancache.h>
2014-10-10 02:26:55 +04:00
# include "internal.h"
2005-04-17 02:20:36 +04:00
/*
* I / O completion handler for multipage BIOs .
*
* The mpage code never puts partial pages into a BIO ( except for end - of - file ) .
* If a page does not map to a contiguous run of blocks then it simply falls
* back to block_read_full_page ( ) .
*
* Why is this ? If a page ' s completion depends on a number of different BIOs
* which can complete in any order ( or at the same time ) then determining the
* status of that page is hard . See end_buffer_async_read ( ) for the details .
* There is no point in duplicating all that complexity .
*/
2015-07-20 16:29:37 +03:00
static void mpage_end_io ( struct bio * bio )
2005-04-17 02:20:36 +04:00
{
2013-11-08 00:20:26 +04:00
struct bio_vec * bv ;
int i ;
2005-04-17 02:20:36 +04:00
2013-11-08 00:20:26 +04:00
bio_for_each_segment_all ( bv , bio , i ) {
struct page * page = bv - > bv_page ;
2017-06-03 10:38:06 +03:00
page_endio ( page , op_is_write ( bio_op ( bio ) ) ,
blk_status_to_errno ( bio - > bi_status ) ) ;
2013-11-08 00:20:26 +04:00
}
2005-04-17 02:20:36 +04:00
bio_put ( bio ) ;
}
2016-06-05 22:31:59 +03:00
static struct bio * mpage_bio_submit ( int op , int op_flags , struct bio * bio )
2005-04-17 02:20:36 +04:00
{
2011-01-14 02:45:51 +03:00
bio - > bi_end_io = mpage_end_io ;
2016-06-05 22:31:59 +03:00
bio_set_op_attrs ( bio , op , op_flags ) ;
guard_bio_eod ( op , bio ) ;
2016-06-05 22:31:41 +03:00
submit_bio ( bio ) ;
2005-04-17 02:20:36 +04:00
return NULL ;
}
static struct bio *
mpage_alloc ( struct block_device * bdev ,
sector_t first_sector , int nr_vecs ,
2005-10-07 10:46:04 +04:00
gfp_t gfp_flags )
2005-04-17 02:20:36 +04:00
{
struct bio * bio ;
2016-07-27 01:24:53 +03:00
/* Restrict the given (page cache) mask for slab allocations */
gfp_flags & = GFP_KERNEL ;
2005-04-17 02:20:36 +04:00
bio = bio_alloc ( gfp_flags , nr_vecs ) ;
if ( bio = = NULL & & ( current - > flags & PF_MEMALLOC ) ) {
while ( ! bio & & ( nr_vecs / = 2 ) )
bio = bio_alloc ( gfp_flags , nr_vecs ) ;
}
if ( bio ) {
2017-08-23 20:10:32 +03:00
bio_set_dev ( bio , bdev ) ;
2013-10-12 02:44:27 +04:00
bio - > bi_iter . bi_sector = first_sector ;
2005-04-17 02:20:36 +04:00
}
return bio ;
}
/*
* support function for mpage_readpages . The fs supplied get_block might
* return an up to date buffer . This is used to map that buffer into
* the page , which allows readpage to avoid triggering a duplicate call
* to get_block .
*
* The idea is to avoid adding buffers to pages that don ' t already have
* them . So when the buffer is up to date and the page size = = block size ,
* this marks the page up to date instead of adding new buffers .
*/
static void
map_buffer_to_page ( struct page * page , struct buffer_head * bh , int page_block )
{
struct inode * inode = page - > mapping - > host ;
struct buffer_head * page_bh , * head ;
int block = 0 ;
if ( ! page_has_buffers ( page ) ) {
/*
* don ' t make any buffers if there is only one buffer on
* the page and the page just needs to be set up to date
*/
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 15:29:47 +03:00
if ( inode - > i_blkbits = = PAGE_SHIFT & &
2005-04-17 02:20:36 +04:00
buffer_uptodate ( bh ) ) {
SetPageUptodate ( page ) ;
return ;
}
2017-02-28 01:28:32 +03:00
create_empty_buffers ( page , i_blocksize ( inode ) , 0 ) ;
2005-04-17 02:20:36 +04:00
}
head = page_buffers ( page ) ;
page_bh = head ;
do {
if ( block = = page_block ) {
page_bh - > b_state = bh - > b_state ;
page_bh - > b_bdev = bh - > b_bdev ;
page_bh - > b_blocknr = bh - > b_blocknr ;
break ;
}
page_bh = page_bh - > b_this_page ;
block + + ;
} while ( page_bh ! = head ) ;
}
2006-03-26 13:38:01 +04:00
/*
* This is the worker routine which does all the work of mapping the disk
* blocks and constructs largest possible bios , submits them for IO if the
* blocks are not contiguous on the disk .
*
* We pass a buffer_head back and forth and use its buffer_mapped ( ) flag to
* represent the validity of its disk mapping and to decide when to do the next
* get_block ( ) call .
*/
2005-04-17 02:20:36 +04:00
static struct bio *
do_mpage_readpage ( struct bio * bio , struct page * page , unsigned nr_pages ,
2006-03-26 13:38:01 +04:00
sector_t * last_block_in_bio , struct buffer_head * map_bh ,
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 01:28:24 +03:00
unsigned long * first_logical_block , get_block_t get_block ,
gfp_t gfp )
2005-04-17 02:20:36 +04:00
{
struct inode * inode = page - > mapping - > host ;
const unsigned blkbits = inode - > i_blkbits ;
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 15:29:47 +03:00
const unsigned blocks_per_page = PAGE_SIZE > > blkbits ;
2005-04-17 02:20:36 +04:00
const unsigned blocksize = 1 < < blkbits ;
sector_t block_in_file ;
sector_t last_block ;
2006-03-26 13:38:01 +04:00
sector_t last_block_in_file ;
2005-04-17 02:20:36 +04:00
sector_t blocks [ MAX_BUF_PER_PAGE ] ;
unsigned page_block ;
unsigned first_hole = blocks_per_page ;
struct block_device * bdev = NULL ;
int length ;
int fully_mapped = 1 ;
2006-03-26 13:38:01 +04:00
unsigned nblocks ;
unsigned relative_block ;
2005-04-17 02:20:36 +04:00
if ( page_has_buffers ( page ) )
goto confused ;
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 15:29:47 +03:00
block_in_file = ( sector_t ) page - > index < < ( PAGE_SHIFT - blkbits ) ;
2006-03-26 13:38:01 +04:00
last_block = block_in_file + nr_pages * blocks_per_page ;
last_block_in_file = ( i_size_read ( inode ) + blocksize - 1 ) > > blkbits ;
if ( last_block > last_block_in_file )
last_block = last_block_in_file ;
page_block = 0 ;
/*
* Map blocks using the result from the previous get_blocks call first .
*/
nblocks = map_bh - > b_size > > blkbits ;
if ( buffer_mapped ( map_bh ) & & block_in_file > * first_logical_block & &
block_in_file < ( * first_logical_block + nblocks ) ) {
unsigned map_offset = block_in_file - * first_logical_block ;
unsigned last = nblocks - map_offset ;
for ( relative_block = 0 ; ; relative_block + + ) {
if ( relative_block = = last ) {
clear_buffer_mapped ( map_bh ) ;
break ;
}
if ( page_block = = blocks_per_page )
break ;
blocks [ page_block ] = map_bh - > b_blocknr + map_offset +
relative_block ;
page_block + + ;
block_in_file + + ;
}
bdev = map_bh - > b_bdev ;
}
/*
* Then do more get_blocks calls until we are done with this page .
*/
map_bh - > b_page = page ;
while ( page_block < blocks_per_page ) {
map_bh - > b_state = 0 ;
map_bh - > b_size = 0 ;
2005-04-17 02:20:36 +04:00
if ( block_in_file < last_block ) {
2006-03-26 13:38:01 +04:00
map_bh - > b_size = ( last_block - block_in_file ) < < blkbits ;
if ( get_block ( inode , block_in_file , map_bh , 0 ) )
2005-04-17 02:20:36 +04:00
goto confused ;
2006-03-26 13:38:01 +04:00
* first_logical_block = block_in_file ;
2005-04-17 02:20:36 +04:00
}
2006-03-26 13:38:01 +04:00
if ( ! buffer_mapped ( map_bh ) ) {
2005-04-17 02:20:36 +04:00
fully_mapped = 0 ;
if ( first_hole = = blocks_per_page )
first_hole = page_block ;
2006-03-26 13:38:01 +04:00
page_block + + ;
block_in_file + + ;
2005-04-17 02:20:36 +04:00
continue ;
}
/* some filesystems will copy data into the page during
* the get_block call , in which case we don ' t want to
* read it again . map_buffer_to_page copies the data
* we just collected from get_block into the page ' s buffers
* so readpage doesn ' t have to repeat the get_block call
*/
2006-03-26 13:38:01 +04:00
if ( buffer_uptodate ( map_bh ) ) {
map_buffer_to_page ( page , map_bh , page_block ) ;
2005-04-17 02:20:36 +04:00
goto confused ;
}
if ( first_hole ! = blocks_per_page )
goto confused ; /* hole -> non-hole */
/* Contiguous blocks? */
2006-03-26 13:38:01 +04:00
if ( page_block & & blocks [ page_block - 1 ] ! = map_bh - > b_blocknr - 1 )
2005-04-17 02:20:36 +04:00
goto confused ;
2006-03-26 13:38:01 +04:00
nblocks = map_bh - > b_size > > blkbits ;
for ( relative_block = 0 ; ; relative_block + + ) {
if ( relative_block = = nblocks ) {
clear_buffer_mapped ( map_bh ) ;
break ;
} else if ( page_block = = blocks_per_page )
break ;
blocks [ page_block ] = map_bh - > b_blocknr + relative_block ;
page_block + + ;
block_in_file + + ;
}
bdev = map_bh - > b_bdev ;
2005-04-17 02:20:36 +04:00
}
if ( first_hole ! = blocks_per_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 15:29:47 +03:00
zero_user_segment ( page , first_hole < < blkbits , PAGE_SIZE ) ;
2005-04-17 02:20:36 +04:00
if ( first_hole = = 0 ) {
SetPageUptodate ( page ) ;
unlock_page ( page ) ;
goto out ;
}
} else if ( fully_mapped ) {
SetPageMappedToDisk ( page ) ;
}
2011-05-26 20:01:43 +04:00
if ( fully_mapped & & blocks_per_page = = 1 & & ! PageUptodate ( page ) & &
cleancache_get_page ( page ) = = 0 ) {
SetPageUptodate ( page ) ;
goto confused ;
}
2005-04-17 02:20:36 +04:00
/*
* This page will go to BIO . Do we need to send this BIO off first ?
*/
if ( bio & & ( * last_block_in_bio ! = blocks [ 0 ] - 1 ) )
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
alloc_new :
if ( bio = = NULL ) {
2014-06-05 03:07:46 +04:00
if ( first_hole = = blocks_per_page ) {
if ( ! bdev_read_page ( bdev , blocks [ 0 ] < < ( blkbits - 9 ) ,
page ) )
goto out ;
}
2005-04-17 02:20:36 +04:00
bio = mpage_alloc ( bdev , blocks [ 0 ] < < ( blkbits - 9 ) ,
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 01:28:24 +03:00
min_t ( int , nr_pages , BIO_MAX_PAGES ) , gfp ) ;
2005-04-17 02:20:36 +04:00
if ( bio = = NULL )
goto confused ;
}
length = first_hole < < blkbits ;
if ( bio_add_page ( bio , page , length , 0 ) < length ) {
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
goto alloc_new ;
}
2009-01-07 01:39:02 +03:00
relative_block = block_in_file - * first_logical_block ;
nblocks = map_bh - > b_size > > blkbits ;
if ( ( buffer_boundary ( map_bh ) & & relative_block = = nblocks ) | |
( first_hole ! = blocks_per_page ) )
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
else
* last_block_in_bio = blocks [ blocks_per_page - 1 ] ;
out :
return bio ;
confused :
if ( bio )
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
if ( ! PageUptodate ( page ) )
block_read_full_page ( page , get_block ) ;
else
unlock_page ( page ) ;
goto out ;
}
2005-05-01 19:59:26 +04:00
/**
2008-03-01 09:02:31 +03:00
* mpage_readpages - populate an address space with some pages & start reads against them
2005-05-01 19:59:26 +04:00
* @ mapping : the address_space
* @ pages : The address of a list_head which contains the target pages . These
* pages have their - > index populated and are otherwise uninitialised .
* The page at @ pages - > prev has the lowest file offset , and reads should be
* issued in @ pages - > prev to @ pages - > next order .
* @ nr_pages : The number of pages at * @ pages
* @ get_block : The filesystem ' s block mapper function .
*
* This function walks the pages and the blocks within each page , building and
* emitting large BIOs .
*
* If anything unusual happens , such as :
*
* - encountering a page which has buffers
* - encountering a page which has a non - hole after a hole
* - encountering a page with non - contiguous blocks
*
* then this code just gives up and calls the buffer_head - based read function .
* It does handle a page which has holes at the end - that is a common case :
2016-04-01 15:29:48 +03:00
* the end - of - file on blocksize < PAGE_SIZE setups .
2005-05-01 19:59:26 +04:00
*
* BH_Boundary explanation :
*
* There is a problem . The mpage read code assembles several pages , gets all
* their disk mappings , and then submits them all . That ' s fine , but obtaining
* the disk mappings may require I / O . Reads of indirect blocks , for example .
*
* So an mpage read of the first 16 blocks of an ext2 file will cause I / O to be
* submitted in the following order :
2017-05-12 13:45:42 +03:00
*
2005-05-01 19:59:26 +04:00
* 12 0 1 2 3 4 5 6 7 8 9 10 11 13 14 15 16
2008-03-01 09:02:31 +03:00
*
2005-05-01 19:59:26 +04:00
* because the indirect block has to be read to get the mappings of blocks
* 13 , 14 , 15 , 16. Obviously , this impacts performance .
*
* So what we do it to allow the filesystem ' s get_block ( ) function to set
* BH_Boundary when it maps block 11. BH_Boundary says : mapping of the block
* after this one will require I / O against a block which is probably close to
* this one . So you should push what I / O you have currently accumulated .
*
* This all causes the disk requests to be issued in the correct order .
*/
2005-04-17 02:20:36 +04:00
int
mpage_readpages ( struct address_space * mapping , struct list_head * pages ,
unsigned nr_pages , get_block_t get_block )
{
struct bio * bio = NULL ;
unsigned page_idx ;
sector_t last_block_in_bio = 0 ;
2006-03-26 13:38:01 +04:00
struct buffer_head map_bh ;
unsigned long first_logical_block = 0 ;
2016-07-27 01:24:53 +03:00
gfp_t gfp = readahead_gfp_mask ( mapping ) ;
2005-04-17 02:20:36 +04:00
2009-05-13 23:13:42 +04:00
map_bh . b_state = 0 ;
map_bh . b_size = 0 ;
2005-04-17 02:20:36 +04:00
for ( page_idx = 0 ; page_idx < nr_pages ; page_idx + + ) {
2016-03-16 00:55:15 +03:00
struct page * page = lru_to_page ( pages ) ;
2005-04-17 02:20:36 +04:00
prefetchw ( & page - > flags ) ;
list_del ( & page - > lru ) ;
2007-10-16 12:24:57 +04:00
if ( ! add_to_page_cache_lru ( page , mapping ,
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 01:28:24 +03:00
page - > index ,
gfp ) ) {
2005-04-17 02:20:36 +04:00
bio = do_mpage_readpage ( bio , page ,
nr_pages - page_idx ,
2006-03-26 13:38:01 +04:00
& last_block_in_bio , & map_bh ,
& first_logical_block ,
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 01:28:24 +03:00
get_block , gfp ) ;
2005-04-17 02:20:36 +04: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 15:29:47 +03:00
put_page ( page ) ;
2005-04-17 02:20:36 +04:00
}
BUG_ON ( ! list_empty ( pages ) ) ;
if ( bio )
2016-06-05 22:31:59 +03:00
mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
EXPORT_SYMBOL ( mpage_readpages ) ;
/*
* This isn ' t called much at all
*/
int mpage_readpage ( struct page * page , get_block_t get_block )
{
struct bio * bio = NULL ;
sector_t last_block_in_bio = 0 ;
2006-03-26 13:38:01 +04:00
struct buffer_head map_bh ;
unsigned long first_logical_block = 0 ;
2015-11-07 03:28:49 +03:00
gfp_t gfp = mapping_gfp_constraint ( page - > mapping , GFP_KERNEL ) ;
2005-04-17 02:20:36 +04:00
2009-05-13 23:13:42 +04:00
map_bh . b_state = 0 ;
map_bh . b_size = 0 ;
2006-03-26 13:38:01 +04:00
bio = do_mpage_readpage ( bio , page , 1 , & last_block_in_bio ,
mm, fs: obey gfp_mapping for add_to_page_cache()
Commit 6afdb859b710 ("mm: do not ignore mapping_gfp_mask in page cache
allocation paths") has caught some users of hardcoded GFP_KERNEL used in
the page cache allocation paths. This, however, wasn't complete and
there were others which went unnoticed.
Dave Chinner has reported the following deadlock for xfs on loop device:
: With the recent merge of the loop device changes, I'm now seeing
: XFS deadlock on my single CPU, 1GB RAM VM running xfs/073.
:
: The deadlocked is as follows:
:
: kloopd1: loop_queue_read_work
: xfs_file_iter_read
: lock XFS inode XFS_IOLOCK_SHARED (on image file)
: page cache read (GFP_KERNEL)
: radix tree alloc
: memory reclaim
: reclaim XFS inodes
: log force to unpin inodes
: <wait for log IO completion>
:
: xfs-cil/loop1: <does log force IO work>
: xlog_cil_push
: xlog_write
: <loop issuing log writes>
: xlog_state_get_iclog_space()
: <blocks due to all log buffers under write io>
: <waits for IO completion>
:
: kloopd1: loop_queue_write_work
: xfs_file_write_iter
: lock XFS inode XFS_IOLOCK_EXCL (on image file)
: <wait for inode to be unlocked>
:
: i.e. the kloopd, with it's split read and write work queues, has
: introduced a dependency through memory reclaim. i.e. that writes
: need to be able to progress for reads make progress.
:
: The problem, fundamentally, is that mpage_readpages() does a
: GFP_KERNEL allocation, rather than paying attention to the inode's
: mapping gfp mask, which is set to GFP_NOFS.
:
: The didn't used to happen, because the loop device used to issue
: reads through the splice path and that does:
:
: error = add_to_page_cache_lru(page, mapping, index,
: GFP_KERNEL & mapping_gfp_mask(mapping));
This has changed by commit aa4d86163e4 ("block: loop: switch to VFS
ITER_BVEC").
This patch changes mpage_readpage{s} to follow gfp mask set for the
mapping. There are, however, other places which are doing basically the
same.
lustre:ll_dir_filler is doing GFP_KERNEL from the function which
apparently uses GFP_NOFS for other allocations so let's make this
consistent.
cifs:readpages_get_pages is called from cifs_readpages and
__cifs_readpages_from_fscache called from the same path obeys mapping
gfp.
ramfs_nommu_expand_for_mapping is hardcoding GFP_KERNEL as well
regardless it uses mapping_gfp_mask for the page allocation.
ext4_mpage_readpages is the called from the page cache allocation path
same as read_pages and read_cache_pages
As I've noticed in my previous post I cannot say I would be happy about
sprinkling mapping_gfp_mask all over the place and it sounds like we
should drop gfp_mask argument altogether and use it internally in
__add_to_page_cache_locked that would require all the filesystems to use
mapping gfp consistently which I am not sure is the case here. From a
quick glance it seems that some file system use it all the time while
others are selective.
Signed-off-by: Michal Hocko <mhocko@suse.com>
Reported-by: Dave Chinner <david@fromorbit.com>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-10-16 01:28:24 +03:00
& map_bh , & first_logical_block , get_block , gfp ) ;
2005-04-17 02:20:36 +04:00
if ( bio )
2016-06-05 22:31:59 +03:00
mpage_bio_submit ( REQ_OP_READ , 0 , bio ) ;
2005-04-17 02:20:36 +04:00
return 0 ;
}
EXPORT_SYMBOL ( mpage_readpage ) ;
/*
* Writing is not so simple .
*
* If the page has buffers then they will be used for obtaining the disk
* mapping . We only support pages which are fully mapped - and - dirty , with a
* special case for pages which are unmapped at the end : end - of - file .
*
* If the page has no buffers ( preferred ) then the page is mapped here .
*
* If all blocks are found to be contiguous then the page can go into the
* BIO . Otherwise fall back to the mapping ' s writepage ( ) .
*
* FIXME : This code wants an estimate of how many pages are still to be
* written , so it can intelligently allocate a suitably - sized BIO . For now ,
* just allocate full - size ( 16 - page ) BIOs .
*/
2007-05-11 09:22:51 +04:00
2009-03-31 01:41:20 +04:00
struct mpage_data {
struct bio * bio ;
sector_t last_block_in_bio ;
get_block_t * get_block ;
unsigned use_writepage ;
} ;
2014-06-05 03:07:44 +04:00
/*
* We have our BIO , so we can now mark the buffers clean . Make
* sure to only clean buffers which we know we ' ll be writing .
*/
static void clean_buffers ( struct page * page , unsigned first_unmapped )
{
unsigned buffer_counter = 0 ;
struct buffer_head * bh , * head ;
if ( ! page_has_buffers ( page ) )
return ;
head = page_buffers ( page ) ;
bh = head ;
do {
if ( buffer_counter + + = = first_unmapped )
break ;
clear_buffer_dirty ( bh ) ;
bh = bh - > b_this_page ;
} while ( bh ! = head ) ;
/*
* we cannot drop the bh if the page is not uptodate or a concurrent
* readpage would fail to serialize with the bh and it would read from
* disk before we reach the platter .
*/
if ( buffer_heads_over_limit & & PageUptodate ( page ) )
try_to_free_buffers ( page ) ;
}
2017-10-14 01:58:15 +03:00
/*
* For situations where we want to clean all buffers attached to a page .
* We don ' t need to calculate how many buffers are attached to the page ,
* we just need to specify a number larger than the maximum number of buffers .
*/
void clean_page_buffers ( struct page * page )
{
clean_buffers ( page , ~ 0U ) ;
}
2009-03-31 01:41:20 +04:00
static int __mpage_writepage ( struct page * page , struct writeback_control * wbc ,
2008-07-12 03:27:31 +04:00
void * data )
2005-04-17 02:20:36 +04:00
{
2007-05-11 09:22:51 +04:00
struct mpage_data * mpd = data ;
struct bio * bio = mpd - > bio ;
2005-04-17 02:20:36 +04:00
struct address_space * mapping = page - > mapping ;
struct inode * inode = page - > mapping - > host ;
const unsigned blkbits = inode - > i_blkbits ;
unsigned long end_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 15:29:47 +03:00
const unsigned blocks_per_page = PAGE_SIZE > > blkbits ;
2005-04-17 02:20:36 +04:00
sector_t last_block ;
sector_t block_in_file ;
sector_t blocks [ MAX_BUF_PER_PAGE ] ;
unsigned page_block ;
unsigned first_unmapped = blocks_per_page ;
struct block_device * bdev = NULL ;
int boundary = 0 ;
sector_t boundary_block = 0 ;
struct block_device * boundary_bdev = NULL ;
int length ;
struct buffer_head map_bh ;
loff_t i_size = i_size_read ( inode ) ;
2007-05-11 09:22:51 +04:00
int ret = 0 ;
2016-11-01 19:00:38 +03:00
int op_flags = wbc_to_write_flags ( wbc ) ;
2005-04-17 02:20:36 +04:00
if ( page_has_buffers ( page ) ) {
struct buffer_head * head = page_buffers ( page ) ;
struct buffer_head * bh = head ;
/* If they're all mapped and dirty, do it */
page_block = 0 ;
do {
BUG_ON ( buffer_locked ( bh ) ) ;
if ( ! buffer_mapped ( bh ) ) {
/*
* unmapped dirty buffers are created by
* __set_page_dirty_buffers - > mmapped data
*/
if ( buffer_dirty ( bh ) )
goto confused ;
if ( first_unmapped = = blocks_per_page )
first_unmapped = page_block ;
continue ;
}
if ( first_unmapped ! = blocks_per_page )
goto confused ; /* hole -> non-hole */
if ( ! buffer_dirty ( bh ) | | ! buffer_uptodate ( bh ) )
goto confused ;
if ( page_block ) {
if ( bh - > b_blocknr ! = blocks [ page_block - 1 ] + 1 )
goto confused ;
}
blocks [ page_block + + ] = bh - > b_blocknr ;
boundary = buffer_boundary ( bh ) ;
if ( boundary ) {
boundary_block = bh - > b_blocknr ;
boundary_bdev = bh - > b_bdev ;
}
bdev = bh - > b_bdev ;
} while ( ( bh = bh - > b_this_page ) ! = head ) ;
if ( first_unmapped )
goto page_is_mapped ;
/*
* Page has buffers , but they are all unmapped . The page was
* created by pagein or read over a hole which was handled by
* block_read_full_page ( ) . If this address_space is also
* using mpage_readpages then this can rarely happen .
*/
goto confused ;
}
/*
* The page has no buffers : map it to disk
*/
BUG_ON ( ! PageUptodate ( 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 15:29:47 +03:00
block_in_file = ( sector_t ) page - > index < < ( PAGE_SHIFT - blkbits ) ;
2005-04-17 02:20:36 +04:00
last_block = ( i_size - 1 ) > > blkbits ;
map_bh . b_page = page ;
for ( page_block = 0 ; page_block < blocks_per_page ; ) {
map_bh . b_state = 0 ;
2006-03-26 13:38:00 +04:00
map_bh . b_size = 1 < < blkbits ;
2007-05-11 09:22:51 +04:00
if ( mpd - > get_block ( inode , block_in_file , & map_bh , 1 ) )
2005-04-17 02:20:36 +04:00
goto confused ;
if ( buffer_new ( & map_bh ) )
2016-11-04 20:08:15 +03:00
clean_bdev_bh_alias ( & map_bh ) ;
2005-04-17 02:20:36 +04:00
if ( buffer_boundary ( & map_bh ) ) {
boundary_block = map_bh . b_blocknr ;
boundary_bdev = map_bh . b_bdev ;
}
if ( page_block ) {
if ( map_bh . b_blocknr ! = blocks [ page_block - 1 ] + 1 )
goto confused ;
}
blocks [ page_block + + ] = map_bh . b_blocknr ;
boundary = buffer_boundary ( & map_bh ) ;
bdev = map_bh . b_bdev ;
if ( block_in_file = = last_block )
break ;
block_in_file + + ;
}
BUG_ON ( page_block = = 0 ) ;
first_unmapped = page_block ;
page_is_mapped :
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 15:29:47 +03:00
end_index = i_size > > PAGE_SHIFT ;
2005-04-17 02:20:36 +04:00
if ( page - > index > = end_index ) {
/*
* The page straddles i_size . It must be zeroed out on each
2009-12-12 00:35:40 +03:00
* and every writepage invocation because it may be mmapped .
2005-04-17 02:20:36 +04:00
* " A file is mapped in multiples of the page size. For a file
* that is not a multiple of the page size , the remaining memory
* is zeroed when mapped , and writes to that region are not
* written out to the file . "
*/
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 15:29:47 +03:00
unsigned offset = i_size & ( PAGE_SIZE - 1 ) ;
2005-04-17 02:20:36 +04:00
if ( page - > index > end_index | | ! offset )
goto confused ;
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 15:29:47 +03:00
zero_user_segment ( page , offset , PAGE_SIZE ) ;
2005-04-17 02:20:36 +04:00
}
/*
* This page will go to BIO . Do we need to send this BIO off first ?
*/
2007-05-11 09:22:51 +04:00
if ( bio & & mpd - > last_block_in_bio ! = blocks [ 0 ] - 1 )
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_WRITE , op_flags , bio ) ;
2005-04-17 02:20:36 +04:00
alloc_new :
if ( bio = = NULL ) {
2014-06-05 03:07:46 +04:00
if ( first_unmapped = = blocks_per_page ) {
if ( ! bdev_write_page ( bdev , blocks [ 0 ] < < ( blkbits - 9 ) ,
2017-10-14 01:58:15 +03:00
page , wbc ) )
2014-06-05 03:07:46 +04:00
goto out ;
}
2005-04-17 02:20:36 +04:00
bio = mpage_alloc ( bdev , blocks [ 0 ] < < ( blkbits - 9 ) ,
2015-05-19 15:31:01 +03:00
BIO_MAX_PAGES , GFP_NOFS | __GFP_HIGH ) ;
2005-04-17 02:20:36 +04:00
if ( bio = = NULL )
goto confused ;
2015-05-23 00:14:04 +03:00
2015-06-02 17:39:48 +03:00
wbc_init_bio ( wbc , bio ) ;
2017-06-27 18:30:05 +03:00
bio - > bi_write_hint = inode - > i_write_hint ;
2005-04-17 02:20:36 +04:00
}
/*
* Must try to add the page before marking the buffer clean or
* the confused fail path above ( OOM ) will be very confused when
* it finds all bh marked clean ( i . e . it will not write anything )
*/
2015-05-28 21:50:51 +03:00
wbc_account_io ( wbc , page , PAGE_SIZE ) ;
2005-04-17 02:20:36 +04:00
length = first_unmapped < < blkbits ;
if ( bio_add_page ( bio , page , length , 0 ) < length ) {
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_WRITE , op_flags , bio ) ;
2005-04-17 02:20:36 +04:00
goto alloc_new ;
}
2014-06-05 03:07:44 +04:00
clean_buffers ( page , first_unmapped ) ;
2005-04-17 02:20:36 +04:00
BUG_ON ( PageWriteback ( page ) ) ;
set_page_writeback ( page ) ;
unlock_page ( page ) ;
if ( boundary | | ( first_unmapped ! = blocks_per_page ) ) {
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_WRITE , op_flags , bio ) ;
2005-04-17 02:20:36 +04:00
if ( boundary_block ) {
write_boundary_block ( boundary_bdev ,
boundary_block , 1 < < blkbits ) ;
}
} else {
2007-05-11 09:22:51 +04:00
mpd - > last_block_in_bio = blocks [ blocks_per_page - 1 ] ;
2005-04-17 02:20:36 +04:00
}
goto out ;
confused :
if ( bio )
2016-06-05 22:31:59 +03:00
bio = mpage_bio_submit ( REQ_OP_WRITE , op_flags , bio ) ;
2005-04-17 02:20:36 +04:00
2007-05-11 09:22:51 +04:00
if ( mpd - > use_writepage ) {
ret = mapping - > a_ops - > writepage ( page , wbc ) ;
2005-04-17 02:20:36 +04:00
} else {
2007-05-11 09:22:51 +04:00
ret = - EAGAIN ;
2005-04-17 02:20:36 +04:00
goto out ;
}
/*
* The caller has a ref on the inode , so * mapping is stable
*/
2007-05-11 09:22:51 +04:00
mapping_set_error ( mapping , ret ) ;
2005-04-17 02:20:36 +04:00
out :
2007-05-11 09:22:51 +04:00
mpd - > bio = bio ;
return ret ;
2005-04-17 02:20:36 +04:00
}
/**
2008-03-01 09:02:31 +03:00
* mpage_writepages - walk the list of dirty pages of the given address space & writepage ( ) all of them
2005-04-17 02:20:36 +04:00
* @ mapping : address space structure to write
* @ wbc : subtract the number of written pages from * @ wbc - > nr_to_write
* @ get_block : the filesystem ' s block mapper function .
* If this is NULL then use a_ops - > writepage . Otherwise , go
* direct - to - BIO .
*
* This is a library function , which implements the writepages ( )
* address_space_operation .
*
* If a page is already under I / O , generic_writepages ( ) skips it , even
* if it ' s dirty . This is desirable behaviour for memory - cleaning writeback ,
* but it is INCORRECT for data - integrity system calls such as fsync ( ) . fsync ( )
* and msync ( ) need to guarantee that all the data which was dirty at the time
* the call was made get new I / O started against them . If wbc - > sync_mode is
* WB_SYNC_ALL then we were called for data integrity and we must wait for
* existing IO to complete .
*/
int
mpage_writepages ( struct address_space * mapping ,
struct writeback_control * wbc , get_block_t get_block )
{
2010-06-22 14:52:14 +04:00
struct blk_plug plug ;
2007-05-11 09:22:51 +04:00
int ret ;
2010-06-22 14:52:14 +04:00
blk_start_plug ( & plug ) ;
2007-05-11 09:22:51 +04:00
if ( ! get_block )
ret = generic_writepages ( mapping , wbc ) ;
else {
struct mpage_data mpd = {
. bio = NULL ,
. last_block_in_bio = 0 ,
. get_block = get_block ,
. use_writepage = 1 ,
} ;
ret = write_cache_pages ( mapping , wbc , __mpage_writepage , & mpd ) ;
2015-09-15 17:27:25 +03:00
if ( mpd . bio ) {
2016-06-05 22:31:59 +03:00
int op_flags = ( wbc - > sync_mode = = WB_SYNC_ALL ?
2016-11-01 16:40:10 +03:00
REQ_SYNC : 0 ) ;
2016-06-05 22:31:59 +03:00
mpage_bio_submit ( REQ_OP_WRITE , op_flags , mpd . bio ) ;
2015-09-15 17:27:25 +03:00
}
2005-04-17 02:20:36 +04:00
}
2010-06-22 14:52:14 +04:00
blk_finish_plug ( & plug ) ;
2005-04-17 02:20:36 +04:00
return ret ;
}
EXPORT_SYMBOL ( mpage_writepages ) ;
int mpage_writepage ( struct page * page , get_block_t get_block ,
struct writeback_control * wbc )
{
2007-05-11 09:22:51 +04:00
struct mpage_data mpd = {
. bio = NULL ,
. last_block_in_bio = 0 ,
. get_block = get_block ,
. use_writepage = 0 ,
} ;
int ret = __mpage_writepage ( page , wbc , & mpd ) ;
2015-09-15 17:27:25 +03:00
if ( mpd . bio ) {
2016-06-05 22:31:59 +03:00
int op_flags = ( wbc - > sync_mode = = WB_SYNC_ALL ?
2016-11-01 16:40:10 +03:00
REQ_SYNC : 0 ) ;
2016-06-05 22:31:59 +03:00
mpage_bio_submit ( REQ_OP_WRITE , op_flags , mpd . bio ) ;
2015-09-15 17:27:25 +03:00
}
2005-04-17 02:20:36 +04:00
return ret ;
}
EXPORT_SYMBOL ( mpage_writepage ) ;