From: Oscar Salvador <osalva...@suse.de>
Make a proper if-else condition for {hard,soft}-offline.
Signed-off-by: Oscar Salvador <osalva...@suse.de>
Signed-off-by: Naoya Horiguchi <naoya.horigu...@nec.com>
---
mm/madvise.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git v5.8-rc1-mmots-2020-06-20-21-44/mm/madvise.c
v5.8-rc1-mmots-2020-06-20-21-44_patched/mm/madvise.c
index 275b08edd428..bee1f4ac70d6 100644
--- v5.8-rc1-mmots-2020-06-20-21-44/mm/madvise.c
+++ v5.8-rc1-mmots-2020-06-20-21-44_patched/mm/madvise.c
@@ -869,16 +869,15 @@ static long madvise_remove(struct vm_area_struct *vma,
static int madvise_inject_error(int behavior,
unsigned long start, unsigned long end)
{
- struct page *page;
struct zone *zone;
unsigned long size;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
-
for (; start < end; start += size) {
unsigned long pfn;
+ struct page *page;
int ret;
ret = get_user_pages_fast(start, 1, 0, &page);
@@ -908,17 +907,14 @@ static int madvise_inject_error(int behavior,
if (behavior == MADV_SOFT_OFFLINE) {
pr_info("Soft offlining pfn %#lx at process virtual
address %#lx\n",
- pfn, start);
-
+ pfn, start);
ret = soft_offline_page(pfn, 0);
- if (ret)
- return ret;
- continue;
+ } else {
+ pr_info("Injecting memory failure for pfn %#lx at
process virtual address %#lx\n",
+ pfn, start);
+ ret = memory_failure(pfn, 0);
}
- pr_info("Injecting memory failure for pfn %#lx at process
virtual address %#lx\n",
- pfn, start);
- ret = memory_failure(pfn, 0);
if (ret)
return ret;
}
--
2.17.1
