提交 8f520cbb 编写于 作者: O Oscar Salvador 提交者: Yang Yingliang

mm,hwpoison: kill put_hwpoison_page

mainline inclusion
from linux-v5.10-rc1
commit dd6e2402
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4LE22
CVE: NA

--------------------------------

keep put_hwpoison_page to avoid kapi change

After commit 4e41a30c ("mm: hwpoison: adjust for new thp
refcounting"), put_hwpoison_page got reduced to a put_page.  Let us just
use put_page instead.
Signed-off-by: NOscar Salvador <osalvador@suse.de>
Acked-by: NNaoya Horiguchi <naoya.horiguchi@nec.com>
Signed-off-by: NMa Wupeng <mawupeng1@huawei.com>
Reviewed-by: NKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 3cdaf5f9
...@@ -1126,7 +1126,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags) ...@@ -1126,7 +1126,7 @@ static int memory_failure_hugetlb(unsigned long pfn, int flags)
pr_err("Memory failure: %#lx: just unpoisoned\n", pfn); pr_err("Memory failure: %#lx: just unpoisoned\n", pfn);
num_poisoned_pages_dec(); num_poisoned_pages_dec();
unlock_page(head); unlock_page(head);
put_hwpoison_page(head); put_page(head);
return 0; return 0;
} }
...@@ -1327,7 +1327,7 @@ int memory_failure(unsigned long pfn, int flags) ...@@ -1327,7 +1327,7 @@ int memory_failure(unsigned long pfn, int flags)
pfn); pfn);
if (TestClearPageHWPoison(p)) if (TestClearPageHWPoison(p))
num_poisoned_pages_dec(); num_poisoned_pages_dec();
put_hwpoison_page(p); put_page(p);
res = -EBUSY; res = -EBUSY;
goto unlock_mutex; goto unlock_mutex;
} }
...@@ -1381,14 +1381,14 @@ int memory_failure(unsigned long pfn, int flags) ...@@ -1381,14 +1381,14 @@ int memory_failure(unsigned long pfn, int flags)
pr_err("Memory failure: %#lx: just unpoisoned\n", pfn); pr_err("Memory failure: %#lx: just unpoisoned\n", pfn);
num_poisoned_pages_dec(); num_poisoned_pages_dec();
unlock_page(p); unlock_page(p);
put_hwpoison_page(p); put_page(p);
goto unlock_mutex; goto unlock_mutex;
} }
if (hwpoison_filter(p)) { if (hwpoison_filter(p)) {
if (TestClearPageHWPoison(p)) if (TestClearPageHWPoison(p))
num_poisoned_pages_dec(); num_poisoned_pages_dec();
unlock_page(p); unlock_page(p);
put_hwpoison_page(p); put_page(p);
goto unlock_mutex; goto unlock_mutex;
} }
...@@ -1623,9 +1623,9 @@ int unpoison_memory(unsigned long pfn) ...@@ -1623,9 +1623,9 @@ int unpoison_memory(unsigned long pfn)
} }
unlock_page(page); unlock_page(page);
put_hwpoison_page(page); put_page(page);
if (freeit && !(pfn == my_zero_pfn(0) && page_count(p) == 1)) if (freeit && !(pfn == my_zero_pfn(0) && page_count(p) == 1))
put_hwpoison_page(page); put_page(page);
return 0; return 0;
} }
...@@ -1689,7 +1689,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) ...@@ -1689,7 +1689,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
/* /*
* Try to free it. * Try to free it.
*/ */
put_hwpoison_page(page); put_page(page);
shake_page(page, 1); shake_page(page, 1);
/* /*
...@@ -1698,7 +1698,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags) ...@@ -1698,7 +1698,7 @@ static int get_any_page(struct page *page, unsigned long pfn, int flags)
ret = __get_any_page(page, pfn, 0); ret = __get_any_page(page, pfn, 0);
if (ret == 1 && !PageLRU(page)) { if (ret == 1 && !PageLRU(page)) {
/* Drop page reference which is from __get_any_page() */ /* Drop page reference which is from __get_any_page() */
put_hwpoison_page(page); put_page(page);
pr_info("soft_offline: %#lx: unknown non LRU page type %lx (%pGp)\n", pr_info("soft_offline: %#lx: unknown non LRU page type %lx (%pGp)\n",
pfn, page->flags, &page->flags); pfn, page->flags, &page->flags);
return -EIO; return -EIO;
...@@ -1721,7 +1721,7 @@ static int soft_offline_huge_page(struct page *page, int flags) ...@@ -1721,7 +1721,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
lock_page(hpage); lock_page(hpage);
if (PageHWPoison(hpage)) { if (PageHWPoison(hpage)) {
unlock_page(hpage); unlock_page(hpage);
put_hwpoison_page(hpage); put_page(hpage);
pr_info("soft offline: %#lx hugepage already poisoned\n", pfn); pr_info("soft offline: %#lx hugepage already poisoned\n", pfn);
return -EBUSY; return -EBUSY;
} }
...@@ -1732,7 +1732,7 @@ static int soft_offline_huge_page(struct page *page, int flags) ...@@ -1732,7 +1732,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
* get_any_page() and isolate_huge_page() takes a refcount each, * get_any_page() and isolate_huge_page() takes a refcount each,
* so need to drop one here. * so need to drop one here.
*/ */
put_hwpoison_page(hpage); put_page(hpage);
if (!ret) { if (!ret) {
pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn); pr_info("soft offline: %#lx hugepage failed to isolate\n", pfn);
return -EBUSY; return -EBUSY;
...@@ -1781,7 +1781,7 @@ static int __soft_offline_page(struct page *page, int flags) ...@@ -1781,7 +1781,7 @@ static int __soft_offline_page(struct page *page, int flags)
wait_on_page_writeback(page); wait_on_page_writeback(page);
if (PageHWPoison(page)) { if (PageHWPoison(page)) {
unlock_page(page); unlock_page(page);
put_hwpoison_page(page); put_page(page);
pr_info("soft offline: %#lx page already poisoned\n", pfn); pr_info("soft offline: %#lx page already poisoned\n", pfn);
return -EBUSY; return -EBUSY;
} }
...@@ -1796,7 +1796,7 @@ static int __soft_offline_page(struct page *page, int flags) ...@@ -1796,7 +1796,7 @@ static int __soft_offline_page(struct page *page, int flags)
* would need to fix isolation locking first. * would need to fix isolation locking first.
*/ */
if (ret == 1) { if (ret == 1) {
put_hwpoison_page(page); put_page(page);
pr_info("soft_offline: %#lx: invalidated\n", pfn); pr_info("soft_offline: %#lx: invalidated\n", pfn);
SetPageHWPoison(page); SetPageHWPoison(page);
num_poisoned_pages_inc(); num_poisoned_pages_inc();
...@@ -1816,7 +1816,7 @@ static int __soft_offline_page(struct page *page, int flags) ...@@ -1816,7 +1816,7 @@ static int __soft_offline_page(struct page *page, int flags)
* Drop page reference which is came from get_any_page() * Drop page reference which is came from get_any_page()
* successful isolate_lru_page() already took another one. * successful isolate_lru_page() already took another one.
*/ */
put_hwpoison_page(page); put_page(page);
if (!ret) { if (!ret) {
LIST_HEAD(pagelist); LIST_HEAD(pagelist);
/* /*
...@@ -1860,7 +1860,7 @@ static int soft_offline_in_use_page(struct page *page, int flags) ...@@ -1860,7 +1860,7 @@ static int soft_offline_in_use_page(struct page *page, int flags)
pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page)); pr_info("soft offline: %#lx: non anonymous thp\n", page_to_pfn(page));
else else
pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page)); pr_info("soft offline: %#lx: thp split failed\n", page_to_pfn(page));
put_hwpoison_page(page); put_page(page);
return -EBUSY; return -EBUSY;
} }
unlock_page(page); unlock_page(page);
...@@ -1934,7 +1934,7 @@ int soft_offline_page(struct page *page, int flags) ...@@ -1934,7 +1934,7 @@ int soft_offline_page(struct page *page, int flags)
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);
if (flags & MF_COUNT_INCREASED) if (flags & MF_COUNT_INCREASED)
put_hwpoison_page(page); put_page(page);
return -EBUSY; return -EBUSY;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册