2013-10-09 23:00:56 +07:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2013 Fusion IO. All rights reserved.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public
|
|
|
|
* License v2 as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public
|
|
|
|
* License along with this program; if not, write to the
|
|
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
* Boston, MA 021110-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/pagemap.h>
|
|
|
|
#include <linux/sched.h>
|
2015-09-30 10:50:31 +07:00
|
|
|
#include <linux/slab.h>
|
2015-12-14 23:42:10 +07:00
|
|
|
#include <linux/sizes.h>
|
2013-10-09 23:00:56 +07:00
|
|
|
#include "btrfs-tests.h"
|
2016-06-01 18:18:26 +07:00
|
|
|
#include "../ctree.h"
|
2013-10-09 23:00:56 +07:00
|
|
|
#include "../extent_io.h"
|
|
|
|
|
|
|
|
#define PROCESS_UNLOCK (1 << 0)
|
|
|
|
#define PROCESS_RELEASE (1 << 1)
|
|
|
|
#define PROCESS_TEST_LOCKED (1 << 2)
|
|
|
|
|
|
|
|
static noinline int process_page_range(struct inode *inode, u64 start, u64 end,
|
|
|
|
unsigned long flags)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct page *pages[16];
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
unsigned long index = start >> PAGE_SHIFT;
|
|
|
|
unsigned long end_index = end >> PAGE_SHIFT;
|
2013-10-09 23:00:56 +07:00
|
|
|
unsigned long nr_pages = end_index - index + 1;
|
|
|
|
int i;
|
|
|
|
int count = 0;
|
|
|
|
int loops = 0;
|
|
|
|
|
|
|
|
while (nr_pages > 0) {
|
|
|
|
ret = find_get_pages_contig(inode->i_mapping, index,
|
|
|
|
min_t(unsigned long, nr_pages,
|
|
|
|
ARRAY_SIZE(pages)), pages);
|
|
|
|
for (i = 0; i < ret; i++) {
|
|
|
|
if (flags & PROCESS_TEST_LOCKED &&
|
|
|
|
!PageLocked(pages[i]))
|
|
|
|
count++;
|
|
|
|
if (flags & PROCESS_UNLOCK && PageLocked(pages[i]))
|
|
|
|
unlock_page(pages[i]);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(pages[i]);
|
2013-10-09 23:00:56 +07:00
|
|
|
if (flags & PROCESS_RELEASE)
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(pages[i]);
|
2013-10-09 23:00:56 +07:00
|
|
|
}
|
|
|
|
nr_pages -= ret;
|
|
|
|
index += ret;
|
|
|
|
cond_resched();
|
|
|
|
loops++;
|
|
|
|
if (loops > 100000) {
|
|
|
|
printk(KERN_ERR "stuck in a loop, start %Lu, end %Lu, nr_pages %lu, ret %d\n", start, end, nr_pages, ret);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2016-06-01 18:18:25 +07:00
|
|
|
static int test_find_delalloc(u32 sectorsize)
|
2013-10-09 23:00:56 +07:00
|
|
|
{
|
|
|
|
struct inode *inode;
|
|
|
|
struct extent_io_tree tmp;
|
|
|
|
struct page *page;
|
|
|
|
struct page *locked_page = NULL;
|
|
|
|
unsigned long index = 0;
|
2015-12-14 23:42:10 +07:00
|
|
|
u64 total_dirty = SZ_256M;
|
|
|
|
u64 max_bytes = SZ_128M;
|
2013-10-09 23:00:56 +07:00
|
|
|
u64 start, end, test_start;
|
|
|
|
u64 found;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
|
2015-09-30 10:50:31 +07:00
|
|
|
test_msg("Running find delalloc tests\n");
|
|
|
|
|
2013-10-09 23:00:56 +07:00
|
|
|
inode = btrfs_new_test_inode();
|
|
|
|
if (!inode) {
|
|
|
|
test_msg("Failed to allocate test inode\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2017-05-05 22:57:13 +07:00
|
|
|
extent_io_tree_init(&tmp, inode);
|
2013-10-09 23:00:56 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* First go through and create and mark all of our pages dirty, we pin
|
|
|
|
* everything to make sure our pages don't get evicted and screw up our
|
|
|
|
* test.
|
|
|
|
*/
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
for (index = 0; index < (total_dirty >> PAGE_SHIFT); index++) {
|
2016-01-22 16:28:24 +07:00
|
|
|
page = find_or_create_page(inode->i_mapping, index, GFP_KERNEL);
|
2013-10-09 23:00:56 +07:00
|
|
|
if (!page) {
|
|
|
|
test_msg("Failed to allocate test page\n");
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
SetPageDirty(page);
|
|
|
|
if (index) {
|
|
|
|
unlock_page(page);
|
|
|
|
} else {
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
get_page(page);
|
2013-10-09 23:00:56 +07:00
|
|
|
locked_page = page;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test this scenario
|
|
|
|
* |--- delalloc ---|
|
|
|
|
* |--- search ---|
|
|
|
|
*/
|
2016-06-01 18:18:25 +07:00
|
|
|
set_extent_delalloc(&tmp, 0, sectorsize - 1, NULL);
|
2013-10-09 23:00:56 +07:00
|
|
|
start = 0;
|
|
|
|
end = 0;
|
|
|
|
found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
|
|
|
|
&end, max_bytes);
|
|
|
|
if (!found) {
|
|
|
|
test_msg("Should have found at least one delalloc\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
2016-06-01 18:18:25 +07:00
|
|
|
if (start != 0 || end != (sectorsize - 1)) {
|
|
|
|
test_msg("Expected start 0 end %u, got start %llu end %llu\n",
|
|
|
|
sectorsize - 1, start, end);
|
2013-10-09 23:00:56 +07:00
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
unlock_extent(&tmp, start, end);
|
|
|
|
unlock_page(locked_page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(locked_page);
|
2013-10-09 23:00:56 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Test this scenario
|
|
|
|
*
|
|
|
|
* |--- delalloc ---|
|
|
|
|
* |--- search ---|
|
|
|
|
*/
|
2015-12-14 23:42:10 +07:00
|
|
|
test_start = SZ_64M;
|
2013-10-09 23:00:56 +07:00
|
|
|
locked_page = find_lock_page(inode->i_mapping,
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
test_start >> PAGE_SHIFT);
|
2013-10-09 23:00:56 +07:00
|
|
|
if (!locked_page) {
|
|
|
|
test_msg("Couldn't find the locked page\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
2016-06-01 18:18:25 +07:00
|
|
|
set_extent_delalloc(&tmp, sectorsize, max_bytes - 1, NULL);
|
2013-10-09 23:00:56 +07:00
|
|
|
start = test_start;
|
|
|
|
end = 0;
|
|
|
|
found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
|
|
|
|
&end, max_bytes);
|
|
|
|
if (!found) {
|
|
|
|
test_msg("Couldn't find delalloc in our range\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (start != test_start || end != max_bytes - 1) {
|
|
|
|
test_msg("Expected start %Lu end %Lu, got start %Lu, end "
|
|
|
|
"%Lu\n", test_start, max_bytes - 1, start, end);
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (process_page_range(inode, start, end,
|
|
|
|
PROCESS_TEST_LOCKED | PROCESS_UNLOCK)) {
|
|
|
|
test_msg("There were unlocked pages in the range\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
unlock_extent(&tmp, start, end);
|
|
|
|
/* locked_page was unlocked above */
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(locked_page);
|
2013-10-09 23:00:56 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Test this scenario
|
|
|
|
* |--- delalloc ---|
|
|
|
|
* |--- search ---|
|
|
|
|
*/
|
2016-06-01 18:18:25 +07:00
|
|
|
test_start = max_bytes + sectorsize;
|
2013-10-09 23:00:56 +07:00
|
|
|
locked_page = find_lock_page(inode->i_mapping, test_start >>
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
PAGE_SHIFT);
|
2013-10-09 23:00:56 +07:00
|
|
|
if (!locked_page) {
|
2016-05-20 08:18:45 +07:00
|
|
|
test_msg("Couldn't find the locked page\n");
|
2013-10-09 23:00:56 +07:00
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
start = test_start;
|
|
|
|
end = 0;
|
|
|
|
found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
|
|
|
|
&end, max_bytes);
|
|
|
|
if (found) {
|
|
|
|
test_msg("Found range when we shouldn't have\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (end != (u64)-1) {
|
|
|
|
test_msg("Did not return the proper end offset\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Test this scenario
|
|
|
|
* [------- delalloc -------|
|
|
|
|
* [max_bytes]|-- search--|
|
|
|
|
*
|
|
|
|
* We are re-using our test_start from above since it works out well.
|
|
|
|
*/
|
2016-04-27 04:54:39 +07:00
|
|
|
set_extent_delalloc(&tmp, max_bytes, total_dirty - 1, NULL);
|
2013-10-09 23:00:56 +07:00
|
|
|
start = test_start;
|
|
|
|
end = 0;
|
|
|
|
found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
|
|
|
|
&end, max_bytes);
|
|
|
|
if (!found) {
|
|
|
|
test_msg("Didn't find our range\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (start != test_start || end != total_dirty - 1) {
|
|
|
|
test_msg("Expected start %Lu end %Lu, got start %Lu end %Lu\n",
|
|
|
|
test_start, total_dirty - 1, start, end);
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (process_page_range(inode, start, end,
|
|
|
|
PROCESS_TEST_LOCKED | PROCESS_UNLOCK)) {
|
|
|
|
test_msg("Pages in range were not all locked\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
unlock_extent(&tmp, start, end);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now to test where we run into a page that is no longer dirty in the
|
|
|
|
* range we want to find.
|
|
|
|
*/
|
2015-12-14 23:42:10 +07:00
|
|
|
page = find_get_page(inode->i_mapping,
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
(max_bytes + SZ_1M) >> PAGE_SHIFT);
|
2013-10-09 23:00:56 +07:00
|
|
|
if (!page) {
|
|
|
|
test_msg("Couldn't find our page\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
ClearPageDirty(page);
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(page);
|
2013-10-09 23:00:56 +07:00
|
|
|
|
|
|
|
/* We unlocked it in the previous test */
|
|
|
|
lock_page(locked_page);
|
|
|
|
start = test_start;
|
|
|
|
end = 0;
|
|
|
|
/*
|
|
|
|
* Currently if we fail to find dirty pages in the delalloc range we
|
2016-04-01 19:29:48 +07:00
|
|
|
* will adjust max_bytes down to PAGE_SIZE and then re-search. If
|
2013-10-09 23:00:56 +07:00
|
|
|
* this changes at any point in the future we will need to fix this
|
|
|
|
* tests expected behavior.
|
|
|
|
*/
|
|
|
|
found = find_lock_delalloc_range(inode, &tmp, locked_page, &start,
|
|
|
|
&end, max_bytes);
|
|
|
|
if (!found) {
|
|
|
|
test_msg("Didn't find our range\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
if (start != test_start && end != test_start + PAGE_SIZE - 1) {
|
2013-10-09 23:00:56 +07:00
|
|
|
test_msg("Expected start %Lu end %Lu, got start %Lu end %Lu\n",
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
test_start, test_start + PAGE_SIZE - 1, start,
|
2013-10-09 23:00:56 +07:00
|
|
|
end);
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
if (process_page_range(inode, start, end, PROCESS_TEST_LOCKED |
|
|
|
|
PROCESS_UNLOCK)) {
|
|
|
|
test_msg("Pages in range were not all locked\n");
|
|
|
|
goto out_bits;
|
|
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
out_bits:
|
2016-04-27 04:54:39 +07:00
|
|
|
clear_extent_bits(&tmp, 0, total_dirty - 1, (unsigned)-1);
|
2013-10-09 23:00:56 +07:00
|
|
|
out:
|
|
|
|
if (locked_page)
|
mm, fs: get rid of PAGE_CACHE_* and page_cache_{get,release} macros
PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} macros were introduced *long* time
ago with promise that one day it will be possible to implement page
cache with bigger chunks than PAGE_SIZE.
This promise never materialized. And unlikely will.
We have many places where PAGE_CACHE_SIZE assumed to be equal to
PAGE_SIZE. And it's constant source of confusion on whether
PAGE_CACHE_* or PAGE_* constant should be used in a particular case,
especially on the border between fs and mm.
Global switching to PAGE_CACHE_SIZE != PAGE_SIZE would cause to much
breakage to be doable.
Let's stop pretending that pages in page cache are special. They are
not.
The changes are pretty straight-forward:
- <foo> << (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- <foo> >> (PAGE_CACHE_SHIFT - PAGE_SHIFT) -> <foo>;
- PAGE_CACHE_{SIZE,SHIFT,MASK,ALIGN} -> PAGE_{SIZE,SHIFT,MASK,ALIGN};
- page_cache_get() -> get_page();
- page_cache_release() -> put_page();
This patch contains automated changes generated with coccinelle using
script below. For some reason, coccinelle doesn't patch header files.
I've called spatch for them manually.
The only adjustment after coccinelle is revert of changes to
PAGE_CAHCE_ALIGN definition: we are going to drop it later.
There are few places in the code where coccinelle didn't reach. I'll
fix them manually in a separate patch. Comments and documentation also
will be addressed with the separate patch.
virtual patch
@@
expression E;
@@
- E << (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
expression E;
@@
- E >> (PAGE_CACHE_SHIFT - PAGE_SHIFT)
+ E
@@
@@
- PAGE_CACHE_SHIFT
+ PAGE_SHIFT
@@
@@
- PAGE_CACHE_SIZE
+ PAGE_SIZE
@@
@@
- PAGE_CACHE_MASK
+ PAGE_MASK
@@
expression E;
@@
- PAGE_CACHE_ALIGN(E)
+ PAGE_ALIGN(E)
@@
expression E;
@@
- page_cache_get(E)
+ get_page(E)
@@
expression E;
@@
- page_cache_release(E)
+ put_page(E)
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2016-04-01 19:29:47 +07:00
|
|
|
put_page(locked_page);
|
2013-10-09 23:00:56 +07:00
|
|
|
process_page_range(inode, 0, total_dirty - 1,
|
|
|
|
PROCESS_UNLOCK | PROCESS_RELEASE);
|
|
|
|
iput(inode);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-09-23 07:24:23 +07:00
|
|
|
static int check_eb_bitmap(unsigned long *bitmap, struct extent_buffer *eb,
|
|
|
|
unsigned long len)
|
2016-06-01 18:18:30 +07:00
|
|
|
{
|
2016-09-23 07:24:23 +07:00
|
|
|
unsigned long i;
|
|
|
|
|
|
|
|
for (i = 0; i < len * BITS_PER_BYTE; i++) {
|
|
|
|
int bit, bit1;
|
|
|
|
|
|
|
|
bit = !!test_bit(i, bitmap);
|
|
|
|
bit1 = !!extent_buffer_test_bit(eb, 0, i);
|
|
|
|
if (bit1 != bit) {
|
|
|
|
test_msg("Bits do not match\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bit1 = !!extent_buffer_test_bit(eb, i / BITS_PER_BYTE,
|
|
|
|
i % BITS_PER_BYTE);
|
|
|
|
if (bit1 != bit) {
|
|
|
|
test_msg("Offset bits do not match\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2016-06-01 18:18:30 +07:00
|
|
|
}
|
|
|
|
|
2015-09-30 10:50:31 +07:00
|
|
|
static int __test_eb_bitmaps(unsigned long *bitmap, struct extent_buffer *eb,
|
|
|
|
unsigned long len)
|
|
|
|
{
|
2016-09-23 07:24:23 +07:00
|
|
|
unsigned long i, j;
|
|
|
|
u32 x;
|
|
|
|
int ret;
|
2015-09-30 10:50:31 +07:00
|
|
|
|
|
|
|
memset(bitmap, 0, len);
|
2016-11-09 00:09:03 +07:00
|
|
|
memzero_extent_buffer(eb, 0, len);
|
2015-09-30 10:50:31 +07:00
|
|
|
if (memcmp_extent_buffer(eb, bitmap, 0, len) != 0) {
|
|
|
|
test_msg("Bitmap was not zeroed\n");
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
bitmap_set(bitmap, 0, len * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE);
|
2016-09-23 07:24:23 +07:00
|
|
|
ret = check_eb_bitmap(bitmap, eb, len);
|
|
|
|
if (ret) {
|
2015-09-30 10:50:31 +07:00
|
|
|
test_msg("Setting all bits failed\n");
|
2016-09-23 07:24:23 +07:00
|
|
|
return ret;
|
2015-09-30 10:50:31 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
bitmap_clear(bitmap, 0, len * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_clear(eb, 0, 0, len * BITS_PER_BYTE);
|
2016-09-23 07:24:23 +07:00
|
|
|
ret = check_eb_bitmap(bitmap, eb, len);
|
|
|
|
if (ret) {
|
2015-09-30 10:50:31 +07:00
|
|
|
test_msg("Clearing all bits failed\n");
|
2016-09-23 07:24:23 +07:00
|
|
|
return ret;
|
2015-09-30 10:50:31 +07:00
|
|
|
}
|
|
|
|
|
2016-06-01 18:18:26 +07:00
|
|
|
/* Straddling pages test */
|
|
|
|
if (len > PAGE_SIZE) {
|
|
|
|
bitmap_set(bitmap,
|
|
|
|
(PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
|
|
|
|
sizeof(long) * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_set(eb, PAGE_SIZE - sizeof(long) / 2, 0,
|
|
|
|
sizeof(long) * BITS_PER_BYTE);
|
2016-09-23 07:24:23 +07:00
|
|
|
ret = check_eb_bitmap(bitmap, eb, len);
|
|
|
|
if (ret) {
|
2016-06-01 18:18:26 +07:00
|
|
|
test_msg("Setting straddling pages failed\n");
|
2016-09-23 07:24:23 +07:00
|
|
|
return ret;
|
2016-06-01 18:18:26 +07:00
|
|
|
}
|
2015-09-30 10:50:31 +07:00
|
|
|
|
2016-06-01 18:18:26 +07:00
|
|
|
bitmap_set(bitmap, 0, len * BITS_PER_BYTE);
|
|
|
|
bitmap_clear(bitmap,
|
|
|
|
(PAGE_SIZE - sizeof(long) / 2) * BITS_PER_BYTE,
|
|
|
|
sizeof(long) * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_set(eb, 0, 0, len * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_clear(eb, PAGE_SIZE - sizeof(long) / 2, 0,
|
|
|
|
sizeof(long) * BITS_PER_BYTE);
|
2016-09-23 07:24:23 +07:00
|
|
|
ret = check_eb_bitmap(bitmap, eb, len);
|
|
|
|
if (ret) {
|
2016-06-01 18:18:26 +07:00
|
|
|
test_msg("Clearing straddling pages failed\n");
|
2016-09-23 07:24:23 +07:00
|
|
|
return ret;
|
2016-06-01 18:18:26 +07:00
|
|
|
}
|
2015-09-30 10:50:31 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generate a wonky pseudo-random bit pattern for the sake of not using
|
|
|
|
* something repetitive that could miss some hypothetical off-by-n bug.
|
|
|
|
*/
|
|
|
|
x = 0;
|
2016-09-23 07:24:23 +07:00
|
|
|
bitmap_clear(bitmap, 0, len * BITS_PER_BYTE);
|
|
|
|
extent_buffer_bitmap_clear(eb, 0, 0, len * BITS_PER_BYTE);
|
|
|
|
for (i = 0; i < len * BITS_PER_BYTE / 32; i++) {
|
|
|
|
x = (0x19660dULL * (u64)x + 0x3c6ef35fULL) & 0xffffffffU;
|
|
|
|
for (j = 0; j < 32; j++) {
|
|
|
|
if (x & (1U << j)) {
|
|
|
|
bitmap_set(bitmap, i * 32 + j, 1);
|
|
|
|
extent_buffer_bitmap_set(eb, 0, i * 32 + j, 1);
|
|
|
|
}
|
2015-09-30 10:50:31 +07:00
|
|
|
}
|
2016-09-23 07:24:23 +07:00
|
|
|
}
|
2015-09-30 10:50:31 +07:00
|
|
|
|
2016-09-23 07:24:23 +07:00
|
|
|
ret = check_eb_bitmap(bitmap, eb, len);
|
|
|
|
if (ret) {
|
|
|
|
test_msg("Random bit pattern failed\n");
|
|
|
|
return ret;
|
2015-09-30 10:50:31 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-06-01 18:18:25 +07:00
|
|
|
static int test_eb_bitmaps(u32 sectorsize, u32 nodesize)
|
2015-09-30 10:50:31 +07:00
|
|
|
{
|
2016-06-15 20:22:56 +07:00
|
|
|
struct btrfs_fs_info *fs_info;
|
2016-06-01 18:18:25 +07:00
|
|
|
unsigned long len;
|
2015-09-30 10:50:31 +07:00
|
|
|
unsigned long *bitmap;
|
|
|
|
struct extent_buffer *eb;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
test_msg("Running extent buffer bitmap tests\n");
|
2016-06-01 18:18:26 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* In ppc64, sectorsize can be 64K, thus 4 * 64K will be larger than
|
|
|
|
* BTRFS_MAX_METADATA_BLOCKSIZE.
|
|
|
|
*/
|
|
|
|
len = (sectorsize < BTRFS_MAX_METADATA_BLOCKSIZE)
|
|
|
|
? sectorsize * 4 : sectorsize;
|
2015-09-30 10:50:31 +07:00
|
|
|
|
2016-06-15 20:22:56 +07:00
|
|
|
fs_info = btrfs_alloc_dummy_fs_info(len, len);
|
|
|
|
|
2016-01-22 16:28:24 +07:00
|
|
|
bitmap = kmalloc(len, GFP_KERNEL);
|
2015-09-30 10:50:31 +07:00
|
|
|
if (!bitmap) {
|
|
|
|
test_msg("Couldn't allocate test bitmap\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2016-06-15 20:22:56 +07:00
|
|
|
eb = __alloc_dummy_extent_buffer(fs_info, 0, len);
|
2015-09-30 10:50:31 +07:00
|
|
|
if (!eb) {
|
|
|
|
test_msg("Couldn't allocate test extent buffer\n");
|
|
|
|
kfree(bitmap);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = __test_eb_bitmaps(bitmap, eb, len);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
/* Do it over again with an extent buffer which isn't page-aligned. */
|
|
|
|
free_extent_buffer(eb);
|
2016-06-01 18:18:25 +07:00
|
|
|
eb = __alloc_dummy_extent_buffer(NULL, nodesize / 2, len);
|
2015-09-30 10:50:31 +07:00
|
|
|
if (!eb) {
|
|
|
|
test_msg("Couldn't allocate test extent buffer\n");
|
|
|
|
kfree(bitmap);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = __test_eb_bitmaps(bitmap, eb, len);
|
|
|
|
out:
|
|
|
|
free_extent_buffer(eb);
|
|
|
|
kfree(bitmap);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-06-01 18:18:25 +07:00
|
|
|
int btrfs_test_extent_io(u32 sectorsize, u32 nodesize)
|
2013-10-09 23:00:56 +07:00
|
|
|
{
|
2015-09-30 10:50:31 +07:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
test_msg("Running extent I/O tests\n");
|
|
|
|
|
2016-06-01 18:18:25 +07:00
|
|
|
ret = test_find_delalloc(sectorsize);
|
2015-09-30 10:50:31 +07:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
2016-06-01 18:18:25 +07:00
|
|
|
ret = test_eb_bitmaps(sectorsize, nodesize);
|
2015-09-30 10:50:31 +07:00
|
|
|
out:
|
|
|
|
test_msg("Extent I/O tests finished\n");
|
|
|
|
return ret;
|
2013-10-09 23:00:56 +07:00
|
|
|
}
|