git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/net/davinci_emac.c: Fix continuation line formats
[safe/jmp/linux-2.6]
/
mm
/
madvise.c
diff --git
a/mm/madvise.c
b/mm/madvise.c
index
18970ae
..
319528b
100644
(file)
--- a/
mm/madvise.c
+++ b/
mm/madvise.c
@@
-9,6
+9,7
@@
#include <linux/pagemap.h>
#include <linux/syscalls.h>
#include <linux/mempolicy.h>
#include <linux/pagemap.h>
#include <linux/syscalls.h>
#include <linux/mempolicy.h>
+#include <linux/page-isolation.h>
#include <linux/hugetlb.h>
#include <linux/sched.h>
#include <linux/ksm.h>
#include <linux/hugetlb.h>
#include <linux/sched.h>
#include <linux/ksm.h>
@@
-222,7
+223,7
@@
static long madvise_remove(struct vm_area_struct *vma,
/*
* Error injection support for memory error handling.
*/
/*
* Error injection support for memory error handling.
*/
-static int madvise_hwpoison(unsigned long start, unsigned long end)
+static int madvise_hwpoison(
int bhv,
unsigned long start, unsigned long end)
{
int ret = 0;
{
int ret = 0;
@@
-230,14
+231,21
@@
static int madvise_hwpoison(unsigned long start, unsigned long end)
return -EPERM;
for (; start < end; start += PAGE_SIZE) {
struct page *p;
return -EPERM;
for (; start < end; start += PAGE_SIZE) {
struct page *p;
- int ret = get_user_pages(current, current->mm, start, 1,
- 0, 0, &p, NULL);
+ int ret = get_user_pages_fast(start, 1, 0, &p);
if (ret != 1)
return ret;
if (ret != 1)
return ret;
+ if (bhv == MADV_SOFT_OFFLINE) {
+ printk(KERN_INFO "Soft offlining page %lx at %lx\n",
+ page_to_pfn(p), start);
+ ret = soft_offline_page(p, MF_COUNT_INCREASED);
+ if (ret)
+ break;
+ continue;
+ }
printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n",
page_to_pfn(p), start);
/* Ignore return value for now */
printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n",
page_to_pfn(p), start);
/* Ignore return value for now */
- __memory_failure(page_to_pfn(p), 0,
1
);
+ __memory_failure(page_to_pfn(p), 0,
MF_COUNT_INCREASED
);
}
return ret;
}
}
return ret;
}
@@
-334,8
+342,8
@@
SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
size_t len;
#ifdef CONFIG_MEMORY_FAILURE
size_t len;
#ifdef CONFIG_MEMORY_FAILURE
- if (behavior == MADV_HWPOISON)
- return madvise_hwpoison(start, start+len_in);
+ if (behavior == MADV_HWPOISON
|| behavior == MADV_SOFT_OFFLINE
)
+ return madvise_hwpoison(
behavior,
start, start+len_in);
#endif
if (!madvise_behavior_valid(behavior))
return error;
#endif
if (!madvise_behavior_valid(behavior))
return error;