nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mm, soft-offline: convert parameter to pfn

Browse source 
Currently soft_offline_page() receives struct page, and its sibling
memory_failure() receives pfn.  This discrepancy looks weird and makes
precheck on pfn validity tricky.  So let's align them.

Link: http://lkml.kernel.org/r/20191016234706.GA5493@www9186uo.sakura.ne.jp
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Cc: David Hildenbrand <david@redhat.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Oscar Salvador <osalvador@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Naoya Horiguchi 2019-11-30 17:53:38 -08:00 committed by Linus Torvalds
parent 996ff7a08d
commit feec24a613
4 changed files with 12 additions and 18 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/base/memory.c
View file

@ -538,12 +538,7 @@ static ssize_t soft_offline_page_store(struct device *dev,
if (kstrtoull(buf, 0, &pfn) < 0) if (kstrtoull(buf, 0, &pfn) < 0)
return -EINVAL; return -EINVAL;
pfn >>= PAGE_SHIFT; pfn >>= PAGE_SHIFT;
if (!pfn_valid(pfn)) ret = soft_offline_page(pfn, 0);
return -ENXIO;
/* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
if (!pfn_to_online_page(pfn))
return -EIO;
ret = soft_offline_page(pfn_to_page(pfn), 0);
return ret == 0 ? count : ret; return ret == 0 ? count : ret;
} }

2
include/linux/mm.h
View file

@ -2773,7 +2773,7 @@ extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery; extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access); extern void shake_page(struct page *p, int access);
extern atomic_long_t num_poisoned_pages __read_mostly; extern atomic_long_t num_poisoned_pages __read_mostly;
extern int soft_offline_page(struct page *page, int flags); extern int soft_offline_page(unsigned long pfn, int flags);
/* /*

2
mm/madvise.c
View file

@ -895,7 +895,7 @@ static int madvise_inject_error(int behavior,
pr_info("Soft offlining pfn %#lx at process virtual address %#lx\n", pr_info("Soft offlining pfn %#lx at process virtual address %#lx\n",
pfn, start); pfn, start);
ret = soft_offline_page(page, MF_COUNT_INCREASED); ret = soft_offline_page(pfn, MF_COUNT_INCREASED);
if (ret) if (ret)
return ret; return ret;
continue; continue;

19
mm/memory-failure.c
View file

@ -1476,7 +1476,7 @@ static void memory_failure_work_func(struct work_struct *work)
if (!gotten) if (!gotten)
break; break;
if (entry.flags & MF_SOFT_OFFLINE) if (entry.flags & MF_SOFT_OFFLINE)
soft_offline_page(pfn_to_page(entry.pfn), entry.flags); soft_offline_page(entry.pfn, entry.flags);
else else
memory_failure(entry.pfn, entry.flags); memory_failure(entry.pfn, entry.flags);
} }
@ -1857,7 +1857,7 @@ static int soft_offline_free_page(struct page *page)
/** /**
* soft_offline_page - Soft offline a page. * soft_offline_page - Soft offline a page.
* @page: page to offline * @pfn: pfn to soft-offline
* @flags: flags. Same as memory_failure(). * @flags: flags. Same as memory_failure().
* *
* Returns 0 on success, otherwise negated errno. * Returns 0 on success, otherwise negated errno.
@ -1877,18 +1877,17 @@ static int soft_offline_free_page(struct page *page)
* This is not a 100% solution for all memory, but tries to be * This is not a 100% solution for all memory, but tries to be
* ``good enough'' for the majority of memory. * ``good enough'' for the majority of memory.
*/ */
int soft_offline_page(struct page *page, int flags) int soft_offline_page(unsigned long pfn, int flags)
{ {
int ret; int ret;
unsigned long pfn = page_to_pfn(page); struct page *page;
if (is_zone_device_page(page)) { if (!pfn_valid(pfn))
pr_debug_ratelimited("soft_offline: %#lx page is device page\n", return -ENXIO;
pfn); /* Only online pages can be soft-offlined (esp., not ZONE_DEVICE). */
if (flags & MF_COUNT_INCREASED) page = pfn_to_online_page(pfn);
put_page(page); if (!page)
return -EIO; return -EIO;
}
if (PageHWPoison(page)) { if (PageHWPoison(page)) {
pr_info("soft offline: %#lx page already poisoned\n", pfn); pr_info("soft offline: %#lx page already poisoned\n", pfn);