From: Andrew Morton <akpm@linux-foundation.org> To: stable@vger.kernel.org, naoya.horiguchi@nec.com, mike.kravetz@oracle.com, akpm@linux-foundation.org, patches@lists.linux.dev, linux-mm@kvack.org, mm-commits@vger.kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org Subject: [patch 10/14] hugetlb: do not demote poisoned hugetlb pages Date: Thu, 14 Apr 2022 19:13:52 -0700 [thread overview] Message-ID: <20220415021352.EAC8DC385A5@smtp.kernel.org> (raw) In-Reply-To: <20220414191240.9f86d15a3e3afd848a9839a6@linux-foundation.org> From: Mike Kravetz <mike.kravetz@oracle.com> Subject: hugetlb: do not demote poisoned hugetlb pages It is possible for poisoned hugetlb pages to reside on the free lists. The huge page allocation routines which dequeue entries from the free lists make a point of avoiding poisoned pages. There is no such check and avoidance in the demote code path. If a hugetlb page on the is on a free list, poison will only be set in the head page rather then the page with the actual error. If such a page is demoted, then the poison flag may follow the wrong page. A page without error could have poison set, and a page with poison could not have the flag set. Check for poison before attempting to demote a hugetlb page. Also, return -EBUSY to the caller if only poisoned pages are on the free list. Link: https://lkml.kernel.org/r/20220307215707.50916-1-mike.kravetz@oracle.com Fixes: 8531fc6f52f5 ("hugetlb: add hugetlb demote page support") Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Naoya Horiguchi <naoya.horiguchi@nec.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/hugetlb.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) --- a/mm/hugetlb.c~hugetlb-do-not-demote-poisoned-hugetlb-pages +++ a/mm/hugetlb.c @@ -3475,7 +3475,6 @@ static int demote_pool_huge_page(struct { int nr_nodes, node; struct page *page; - int rc = 0; lockdep_assert_held(&hugetlb_lock); @@ -3486,15 +3485,19 @@ static int demote_pool_huge_page(struct } for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) { - if (!list_empty(&h->hugepage_freelists[node])) { - page = list_entry(h->hugepage_freelists[node].next, - struct page, lru); - rc = demote_free_huge_page(h, page); - break; + list_for_each_entry(page, &h->hugepage_freelists[node], lru) { + if (PageHWPoison(page)) + continue; + + return demote_free_huge_page(h, page); } } - return rc; + /* + * Only way to get here is if all pages on free lists are poisoned. + * Return -EBUSY so that caller will not retry. + */ + return -EBUSY; } #define HSTATE_ATTR_RO(_name) \ _
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Morton <akpm@linux-foundation.org> To: stable@vger.kernel.org,naoya.horiguchi@nec.com,mike.kravetz@oracle.com,akpm@linux-foundation.org,patches@lists.linux.dev,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org Subject: [patch 10/14] hugetlb: do not demote poisoned hugetlb pages Date: Thu, 14 Apr 2022 19:13:52 -0700 [thread overview] Message-ID: <20220415021352.EAC8DC385A5@smtp.kernel.org> (raw) In-Reply-To: <20220414191240.9f86d15a3e3afd848a9839a6@linux-foundation.org> From: Mike Kravetz <mike.kravetz@oracle.com> Subject: hugetlb: do not demote poisoned hugetlb pages It is possible for poisoned hugetlb pages to reside on the free lists. The huge page allocation routines which dequeue entries from the free lists make a point of avoiding poisoned pages. There is no such check and avoidance in the demote code path. If a hugetlb page on the is on a free list, poison will only be set in the head page rather then the page with the actual error. If such a page is demoted, then the poison flag may follow the wrong page. A page without error could have poison set, and a page with poison could not have the flag set. Check for poison before attempting to demote a hugetlb page. Also, return -EBUSY to the caller if only poisoned pages are on the free list. Link: https://lkml.kernel.org/r/20220307215707.50916-1-mike.kravetz@oracle.com Fixes: 8531fc6f52f5 ("hugetlb: add hugetlb demote page support") Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com> Reviewed-by: Naoya Horiguchi <naoya.horiguchi@nec.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- mm/hugetlb.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) --- a/mm/hugetlb.c~hugetlb-do-not-demote-poisoned-hugetlb-pages +++ a/mm/hugetlb.c @@ -3475,7 +3475,6 @@ static int demote_pool_huge_page(struct { int nr_nodes, node; struct page *page; - int rc = 0; lockdep_assert_held(&hugetlb_lock); @@ -3486,15 +3485,19 @@ static int demote_pool_huge_page(struct } for_each_node_mask_to_free(h, nr_nodes, node, nodes_allowed) { - if (!list_empty(&h->hugepage_freelists[node])) { - page = list_entry(h->hugepage_freelists[node].next, - struct page, lru); - rc = demote_free_huge_page(h, page); - break; + list_for_each_entry(page, &h->hugepage_freelists[node], lru) { + if (PageHWPoison(page)) + continue; + + return demote_free_huge_page(h, page); } } - return rc; + /* + * Only way to get here is if all pages on free lists are poisoned. + * Return -EBUSY so that caller will not retry. + */ + return -EBUSY; } #define HSTATE_ATTR_RO(_name) \ _
next prev parent reply other threads:[~2022-04-15 2:13 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-15 2:12 incoming Andrew Morton 2022-04-15 2:13 ` [patch 01/14] MAINTAINERS: Broadcom internal lists aren't maintainers Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 02/14] tmpfs: fix regressions from wider use of ZERO_PAGE Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 22:10 ` Linus Torvalds 2022-04-15 22:21 ` Matthew Wilcox 2022-04-15 22:41 ` Hugh Dickins 2022-04-16 6:36 ` Borislav Petkov 2022-04-16 14:07 ` Mark Hemment 2022-04-16 17:28 ` Borislav Petkov 2022-04-16 17:42 ` Linus Torvalds 2022-04-16 21:15 ` Borislav Petkov 2022-04-17 19:41 ` Borislav Petkov 2022-04-17 20:56 ` Linus Torvalds 2022-04-18 10:15 ` Borislav Petkov 2022-04-18 17:10 ` Linus Torvalds 2022-04-19 9:17 ` Borislav Petkov 2022-04-19 16:41 ` Linus Torvalds 2022-04-19 17:48 ` Borislav Petkov 2022-04-21 15:06 ` Borislav Petkov 2022-04-21 16:50 ` Linus Torvalds 2022-04-21 17:22 ` Linus Torvalds 2022-04-24 19:37 ` Borislav Petkov 2022-04-24 19:54 ` Linus Torvalds 2022-04-24 20:24 ` Linus Torvalds 2022-04-27 0:14 ` Borislav Petkov 2022-04-27 1:29 ` Linus Torvalds 2022-04-27 10:41 ` Borislav Petkov 2022-04-27 16:00 ` Linus Torvalds 2022-05-04 18:56 ` Borislav Petkov 2022-05-04 19:22 ` Linus Torvalds 2022-05-04 20:18 ` Borislav Petkov 2022-05-04 20:40 ` Linus Torvalds 2022-05-04 21:01 ` Borislav Petkov 2022-05-04 21:09 ` Linus Torvalds 2022-05-10 9:31 ` clear_user (was: [patch 02/14] tmpfs: fix regressions from wider use of ZERO_PAGE) Borislav Petkov 2022-05-10 17:17 ` Linus Torvalds 2022-05-10 17:28 ` Linus Torvalds 2022-05-10 18:10 ` Borislav Petkov 2022-05-10 18:57 ` Borislav Petkov 2022-05-24 12:32 ` [PATCH] x86/clear_user: Make it faster Borislav Petkov 2022-05-24 16:51 ` Linus Torvalds 2022-05-24 17:30 ` Borislav Petkov 2022-05-25 12:11 ` Mark Hemment 2022-05-27 11:28 ` Borislav Petkov 2022-05-27 11:10 ` Ingo Molnar 2022-06-22 14:21 ` Borislav Petkov 2022-06-22 15:06 ` Linus Torvalds 2022-06-22 20:14 ` Borislav Petkov 2022-06-22 21:07 ` Linus Torvalds 2022-06-23 9:41 ` Borislav Petkov 2022-07-05 17:01 ` [PATCH -final] " Borislav Petkov 2022-07-06 9:24 ` Alexey Dobriyan 2022-07-11 10:33 ` Borislav Petkov 2022-07-12 12:32 ` Alexey Dobriyan 2022-08-06 12:49 ` Borislav Petkov 2022-08-18 10:44 ` [tip: x86/cpu] " tip-bot2 for Borislav Petkov 2022-04-15 2:13 ` [patch 03/14] mm/secretmem: fix panic when growing a memfd_secret Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 04/14] irq_work: use kasan_record_aux_stack_noalloc() record callstack Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 05/14] kasan: fix hw tags enablement when KUNIT tests are disabled Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 06/14] mm, kfence: support kmem_dump_obj() for KFENCE objects Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 07/14] mm, page_alloc: fix build_zonerefs_node() Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 08/14] mm: fix unexpected zeroed page mapping with zram swap Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 09/14] mm: compaction: fix compiler warning when CONFIG_COMPACTION=n Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` Andrew Morton [this message] 2022-04-15 2:13 ` [patch 10/14] hugetlb: do not demote poisoned hugetlb pages Andrew Morton 2022-04-15 2:13 ` [patch 11/14] revert "fs/binfmt_elf: fix PT_LOAD p_align values for loaders" Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:13 ` [patch 12/14] revert "fs/binfmt_elf: use PT_LOAD p_align values for static PIE" Andrew Morton 2022-04-15 2:13 ` Andrew Morton 2022-04-15 2:14 ` [patch 13/14] mm/vmalloc: fix spinning drain_vmap_work after reading from /proc/vmcore Andrew Morton 2022-04-15 2:14 ` Andrew Morton 2022-04-15 2:14 ` [patch 14/14] mm: kmemleak: take a full lowmem check in kmemleak_*_phys() Andrew Morton 2022-04-15 2:14 ` Andrew Morton
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220415021352.EAC8DC385A5@smtp.kernel.org \ --to=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mike.kravetz@oracle.com \ --cc=mm-commits@vger.kernel.org \ --cc=naoya.horiguchi@nec.com \ --cc=patches@lists.linux.dev \ --cc=stable@vger.kernel.org \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.