mm: hugetlb: delete dequeue_hwpoisoned_huge_page() (ddd40d8a) · Commits · 戴 / test

include/linux/hugetlb.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -116,7 +116,6 @@ int hugetlb_reserve_pages(struct inode *inode, long from, long to,
		vm_flags_t vm_flags);
		long hugetlb_unreserve_pages(struct inode *inode, long start, long end,
		long freed);
		int dequeue_hwpoisoned_huge_page(struct page *page);
		bool isolate_huge_page(struct page page, struct list_head list);
		void putback_active_hugepage(struct page *page);
		void free_huge_page(struct page *page);
		@@ -192,10 +191,6 @@ static inline void hugetlb_show_meminfo(void)
		#define hugetlb_mcopy_atomic_pte(dst_mm, dst_pte, dst_vma, dst_addr, \
		src_addr, pagep) ({ BUG(); 0; })
		#define huge_pte_offset(mm, address, sz) 0
		static inline int dequeue_hwpoisoned_huge_page(struct page *page)
		{
		return 0;
		}

		static inline bool isolate_huge_page(struct page page, struct list_head list)
		{

+0 −34

Original line number	Diff line number	Diff line
		@@ -4746,40 +4746,6 @@ follow_huge_pgd(struct mm_struct mm, unsigned long address, pgd_t pgd, int fla
		return pte_page((pte_t )pgd) + ((address & ~PGDIR_MASK) >> PAGE_SHIFT);
		}

		#ifdef CONFIG_MEMORY_FAILURE

		/*
		* This function is called from memory failure code.
		*/
		int dequeue_hwpoisoned_huge_page(struct page *hpage)
		{
		struct hstate *h = page_hstate(hpage);
		int nid = page_to_nid(hpage);
		int ret = -EBUSY;

		spin_lock(&hugetlb_lock);
		/*
		* Just checking !page_huge_active is not enough, because that could be
		* an isolated/hwpoisoned hugepage (which have >0 refcount).
		*/
		if (!page_huge_active(hpage) && !page_count(hpage)) {
		/*
		* Hwpoisoned hugepage isn't linked to activelist or freelist,
		* but dangling hpage->lru can trigger list-debug warnings
		* (this happens when we call unpoison_memory() on it),
		* so let it point to itself with list_del_init().
		*/
		list_del_init(&hpage->lru);
		set_page_refcounted(hpage);
		h->free_huge_pages--;
		h->free_huge_pages_node[nid]--;
		ret = 0;
		}
		spin_unlock(&hugetlb_lock);
		return ret;
		}
		#endif

		bool isolate_huge_page(struct page page, struct list_head list)
		{
		bool ret = true;

+0 −11

Original line number	Diff line number	Diff line
		@@ -1458,17 +1458,6 @@ int unpoison_memory(unsigned long pfn)
		}

		if (!get_hwpoison_page(p)) {
		/*
		* Since HWPoisoned hugepage should have non-zero refcount,
		* race between memory failure and unpoison seems to happen.
		* In such case unpoison fails and memory failure runs
		* to the end.
		*/
		if (PageHuge(page)) {
		unpoison_pr_info("Unpoison: Memory failure is now running on free hugepage %#lx\n",
		pfn, &unpoison_rs);
		return 0;
		}
		if (TestClearPageHWPoison(p))
		num_poisoned_pages_dec();
		unpoison_pr_info("Unpoison: Software-unpoisoned free page %#lx\n",