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
|
2015-04-08 12:00:32 +08:00
|
|
|
/*
|
|
|
|
* linux/fs/ext4/readpage.c
|
|
|
|
*
|
|
|
|
* Copyright (C) 2002, Linus Torvalds.
|
|
|
|
* Copyright (C) 2015, Google, Inc.
|
|
|
|
*
|
|
|
|
* This was originally taken from fs/mpage.c
|
|
|
|
*
|
|
|
|
* The intent is the ext4_mpage_readpages() function here is intended
|
|
|
|
* to replace mpage_readpages() in the general case, not just for
|
|
|
|
* encrypted files. It has some limitations (see below), where it
|
|
|
|
* will fall back to read_block_full_page(), but these limitations
|
|
|
|
* should only be hit when page_size != block_size.
|
|
|
|
*
|
|
|
|
* This will allow us to attach a callback function to support ext4
|
|
|
|
* encryption.
|
|
|
|
*
|
|
|
|
* 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 20:29:48 +08:00
|
|
|
* the end-of-file on blocksize < PAGE_SIZE setups.
|
2015-04-08 12:00:32 +08:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/export.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/kdev_t.h>
|
|
|
|
#include <linux/gfp.h>
|
|
|
|
#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>
|
|
|
|
#include <linux/writeback.h>
|
|
|
|
#include <linux/backing-dev.h>
|
|
|
|
#include <linux/pagevec.h>
|
|
|
|
#include <linux/cleancache.h>
|
|
|
|
|
|
|
|
#include "ext4.h"
|
|
|
|
|
2015-04-12 12:56:10 +08:00
|
|
|
static inline bool ext4_bio_encrypted(struct bio *bio)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_EXT4_FS_ENCRYPTION
|
|
|
|
return unlikely(bio->bi_private != NULL);
|
|
|
|
#else
|
|
|
|
return false;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2015-04-08 12:00:32 +08: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 21:29:37 +08:00
|
|
|
static void mpage_end_io(struct bio *bio)
|
2015-04-08 12:00:32 +08:00
|
|
|
{
|
|
|
|
struct bio_vec *bv;
|
|
|
|
int i;
|
|
|
|
|
2015-04-12 12:56:10 +08:00
|
|
|
if (ext4_bio_encrypted(bio)) {
|
2017-06-03 15:38:06 +08:00
|
|
|
if (bio->bi_status) {
|
2016-07-11 02:01:03 +08:00
|
|
|
fscrypt_release_ctx(bio->bi_private);
|
2015-04-12 12:56:10 +08:00
|
|
|
} else {
|
2018-04-19 02:09:47 +08:00
|
|
|
fscrypt_enqueue_decrypt_bio(bio->bi_private, bio);
|
2015-04-12 12:56:10 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2015-04-08 12:00:32 +08:00
|
|
|
bio_for_each_segment_all(bv, bio, i) {
|
|
|
|
struct page *page = bv->bv_page;
|
|
|
|
|
2017-06-03 15:38:06 +08:00
|
|
|
if (!bio->bi_status) {
|
2015-04-08 12:00:32 +08:00
|
|
|
SetPageUptodate(page);
|
|
|
|
} else {
|
|
|
|
ClearPageUptodate(page);
|
|
|
|
SetPageError(page);
|
|
|
|
}
|
|
|
|
unlock_page(page);
|
|
|
|
}
|
|
|
|
|
|
|
|
bio_put(bio);
|
|
|
|
}
|
|
|
|
|
|
|
|
int ext4_mpage_readpages(struct address_space *mapping,
|
|
|
|
struct list_head *pages, struct page *page,
|
|
|
|
unsigned nr_pages)
|
|
|
|
{
|
|
|
|
struct bio *bio = NULL;
|
|
|
|
sector_t last_block_in_bio = 0;
|
|
|
|
|
|
|
|
struct inode *inode = 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 20:29:47 +08:00
|
|
|
const unsigned blocks_per_page = PAGE_SIZE >> blkbits;
|
2015-04-08 12:00:32 +08:00
|
|
|
const unsigned blocksize = 1 << blkbits;
|
|
|
|
sector_t block_in_file;
|
|
|
|
sector_t last_block;
|
|
|
|
sector_t last_block_in_file;
|
|
|
|
sector_t blocks[MAX_BUF_PER_PAGE];
|
|
|
|
unsigned page_block;
|
|
|
|
struct block_device *bdev = inode->i_sb->s_bdev;
|
|
|
|
int length;
|
|
|
|
unsigned relative_block = 0;
|
|
|
|
struct ext4_map_blocks map;
|
|
|
|
|
|
|
|
map.m_pblk = 0;
|
|
|
|
map.m_lblk = 0;
|
|
|
|
map.m_len = 0;
|
|
|
|
map.m_flags = 0;
|
|
|
|
|
2016-07-06 04:32:32 +08:00
|
|
|
for (; nr_pages; nr_pages--) {
|
2015-04-08 12:00:32 +08:00
|
|
|
int fully_mapped = 1;
|
|
|
|
unsigned first_hole = blocks_per_page;
|
|
|
|
|
|
|
|
prefetchw(&page->flags);
|
|
|
|
if (pages) {
|
|
|
|
page = list_entry(pages->prev, struct page, lru);
|
|
|
|
list_del(&page->lru);
|
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 06:28:24 +08:00
|
|
|
if (add_to_page_cache_lru(page, mapping, page->index,
|
2016-07-27 06:24:53 +08:00
|
|
|
readahead_gfp_mask(mapping)))
|
2015-04-08 12:00:32 +08:00
|
|
|
goto next_page;
|
|
|
|
}
|
|
|
|
|
|
|
|
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 20:29:47 +08:00
|
|
|
block_in_file = (sector_t)page->index << (PAGE_SHIFT - blkbits);
|
2015-04-08 12:00:32 +08: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 previous result first.
|
|
|
|
*/
|
|
|
|
if ((map.m_flags & EXT4_MAP_MAPPED) &&
|
|
|
|
block_in_file > map.m_lblk &&
|
|
|
|
block_in_file < (map.m_lblk + map.m_len)) {
|
|
|
|
unsigned map_offset = block_in_file - map.m_lblk;
|
|
|
|
unsigned last = map.m_len - map_offset;
|
|
|
|
|
|
|
|
for (relative_block = 0; ; relative_block++) {
|
|
|
|
if (relative_block == last) {
|
|
|
|
/* needed? */
|
|
|
|
map.m_flags &= ~EXT4_MAP_MAPPED;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (page_block == blocks_per_page)
|
|
|
|
break;
|
|
|
|
blocks[page_block] = map.m_pblk + map_offset +
|
|
|
|
relative_block;
|
|
|
|
page_block++;
|
|
|
|
block_in_file++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Then do more ext4_map_blocks() calls until we are
|
|
|
|
* done with this page.
|
|
|
|
*/
|
|
|
|
while (page_block < blocks_per_page) {
|
|
|
|
if (block_in_file < last_block) {
|
|
|
|
map.m_lblk = block_in_file;
|
|
|
|
map.m_len = last_block - block_in_file;
|
|
|
|
|
|
|
|
if (ext4_map_blocks(NULL, inode, &map, 0) < 0) {
|
|
|
|
set_error_page:
|
|
|
|
SetPageError(page);
|
|
|
|
zero_user_segment(page, 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
|
|
|
PAGE_SIZE);
|
2015-04-08 12:00:32 +08:00
|
|
|
unlock_page(page);
|
|
|
|
goto next_page;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((map.m_flags & EXT4_MAP_MAPPED) == 0) {
|
|
|
|
fully_mapped = 0;
|
|
|
|
if (first_hole == blocks_per_page)
|
|
|
|
first_hole = page_block;
|
|
|
|
page_block++;
|
|
|
|
block_in_file++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (first_hole != blocks_per_page)
|
|
|
|
goto confused; /* hole -> non-hole */
|
|
|
|
|
|
|
|
/* Contiguous blocks? */
|
|
|
|
if (page_block && blocks[page_block-1] != map.m_pblk-1)
|
|
|
|
goto confused;
|
|
|
|
for (relative_block = 0; ; relative_block++) {
|
|
|
|
if (relative_block == map.m_len) {
|
|
|
|
/* needed? */
|
|
|
|
map.m_flags &= ~EXT4_MAP_MAPPED;
|
|
|
|
break;
|
|
|
|
} else if (page_block == blocks_per_page)
|
|
|
|
break;
|
|
|
|
blocks[page_block] = map.m_pblk+relative_block;
|
|
|
|
page_block++;
|
|
|
|
block_in_file++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (first_hole != blocks_per_page) {
|
|
|
|
zero_user_segment(page, first_hole << 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 20:29:47 +08:00
|
|
|
PAGE_SIZE);
|
2015-04-08 12:00:32 +08:00
|
|
|
if (first_hole == 0) {
|
|
|
|
SetPageUptodate(page);
|
|
|
|
unlock_page(page);
|
|
|
|
goto next_page;
|
|
|
|
}
|
|
|
|
} else if (fully_mapped) {
|
|
|
|
SetPageMappedToDisk(page);
|
|
|
|
}
|
|
|
|
if (fully_mapped && blocks_per_page == 1 &&
|
|
|
|
!PageUptodate(page) && cleancache_get_page(page) == 0) {
|
|
|
|
SetPageUptodate(page);
|
|
|
|
goto confused;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This page will go to BIO. Do we need to send this
|
|
|
|
* BIO off first?
|
|
|
|
*/
|
|
|
|
if (bio && (last_block_in_bio != blocks[0] - 1)) {
|
|
|
|
submit_and_realloc:
|
2016-06-06 03:31:41 +08:00
|
|
|
submit_bio(bio);
|
2015-04-08 12:00:32 +08:00
|
|
|
bio = NULL;
|
|
|
|
}
|
|
|
|
if (bio == NULL) {
|
2016-07-11 02:01:03 +08:00
|
|
|
struct fscrypt_ctx *ctx = NULL;
|
2015-04-12 12:56:10 +08:00
|
|
|
|
|
|
|
if (ext4_encrypted_inode(inode) &&
|
|
|
|
S_ISREG(inode->i_mode)) {
|
2016-07-11 02:01:03 +08:00
|
|
|
ctx = fscrypt_get_ctx(inode, GFP_NOFS);
|
2015-04-12 12:56:10 +08:00
|
|
|
if (IS_ERR(ctx))
|
|
|
|
goto set_error_page;
|
|
|
|
}
|
2015-04-08 12:00:32 +08:00
|
|
|
bio = bio_alloc(GFP_KERNEL,
|
2015-05-19 20:31:01 +08:00
|
|
|
min_t(int, nr_pages, BIO_MAX_PAGES));
|
2015-04-12 12:56:10 +08:00
|
|
|
if (!bio) {
|
|
|
|
if (ctx)
|
2016-07-11 02:01:03 +08:00
|
|
|
fscrypt_release_ctx(ctx);
|
2015-04-08 12:00:32 +08:00
|
|
|
goto set_error_page;
|
2015-04-12 12:56:10 +08:00
|
|
|
}
|
2017-08-24 01:10:32 +08:00
|
|
|
bio_set_dev(bio, bdev);
|
2015-04-08 12:00:32 +08:00
|
|
|
bio->bi_iter.bi_sector = blocks[0] << (blkbits - 9);
|
|
|
|
bio->bi_end_io = mpage_end_io;
|
2015-04-12 12:56:10 +08:00
|
|
|
bio->bi_private = ctx;
|
2016-06-06 03:31:48 +08:00
|
|
|
bio_set_op_attrs(bio, REQ_OP_READ, 0);
|
2015-04-08 12:00:32 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
length = first_hole << blkbits;
|
|
|
|
if (bio_add_page(bio, page, length, 0) < length)
|
|
|
|
goto submit_and_realloc;
|
|
|
|
|
|
|
|
if (((map.m_flags & EXT4_MAP_BOUNDARY) &&
|
|
|
|
(relative_block == map.m_len)) ||
|
|
|
|
(first_hole != blocks_per_page)) {
|
2016-06-06 03:31:41 +08:00
|
|
|
submit_bio(bio);
|
2015-04-08 12:00:32 +08:00
|
|
|
bio = NULL;
|
|
|
|
} else
|
|
|
|
last_block_in_bio = blocks[blocks_per_page - 1];
|
|
|
|
goto next_page;
|
|
|
|
confused:
|
|
|
|
if (bio) {
|
2016-06-06 03:31:41 +08:00
|
|
|
submit_bio(bio);
|
2015-04-08 12:00:32 +08:00
|
|
|
bio = NULL;
|
|
|
|
}
|
|
|
|
if (!PageUptodate(page))
|
|
|
|
block_read_full_page(page, ext4_get_block);
|
|
|
|
else
|
|
|
|
unlock_page(page);
|
|
|
|
next_page:
|
|
|
|
if (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
|
|
|
put_page(page);
|
2015-04-08 12:00:32 +08:00
|
|
|
}
|
|
|
|
BUG_ON(pages && !list_empty(pages));
|
|
|
|
if (bio)
|
2016-06-06 03:31:41 +08:00
|
|
|
submit_bio(bio);
|
2015-04-08 12:00:32 +08:00
|
|
|
return 0;
|
|
|
|
}
|