* [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check
@ 2024-02-27 3:51 Lance Yang
2024-02-27 19:13 ` Yang Shi
0 siblings, 1 reply; 3+ messages in thread
From: Lance Yang @ 2024-02-27 3:51 UTC (permalink / raw)
To: akpm
Cc: shy828301, mhocko, zokeefe, david, songmuchun, peterx, minchan,
linux-mm, linux-kernel, Lance Yang
Previously, we removed the mm from mm_slot and dropped mm_count
if the MMF_THP_DISABLE flag was set. However, we didn't re-add
the mm back after clearing the MMF_THP_DISABLE flag. Additionally,
We add a check for the MMF_THP_DISABLE flag in hugepage_vma_revalidate().
Fixes: 879c6000e191 ("mm/khugepaged: bypassing unnecessary scans with MMF_DISABLE_THP check")
Signed-off-by: Lance Yang <ioworker0@gmail.com>
Suggested-by: Yang Shi <shy828301@gmail.com>
---
mm/khugepaged.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 2771fc043b3b..1c0073daad82 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -920,7 +920,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address,
{
struct vm_area_struct *vma;
- if (unlikely(hpage_collapse_test_exit(mm)))
+ if (unlikely(hpage_collapse_test_exit_or_disable(mm)))
return SCAN_ANY_PROCESS;
*vmap = vma = find_vma(mm, address);
@@ -1428,7 +1428,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot)
lockdep_assert_held(&khugepaged_mm_lock);
- if (hpage_collapse_test_exit_or_disable(mm)) {
+ if (hpage_collapse_test_exit(mm)) {
/* free mm_slot */
hash_del(&slot->hash);
list_del(&slot->mm_node);
@@ -2456,7 +2456,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
* Release the current mm_slot if this mm is about to die, or
* if we scanned all vmas of this mm.
*/
- if (hpage_collapse_test_exit_or_disable(mm) || !vma) {
+ if (hpage_collapse_test_exit(mm) || !vma) {
/*
* Make sure that if mm_users is reaching zero while
* khugepaged runs here, khugepaged_exit will find
--
2.33.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check
2024-02-27 3:51 [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check Lance Yang
@ 2024-02-27 19:13 ` Yang Shi
2024-02-27 19:18 ` David Hildenbrand
0 siblings, 1 reply; 3+ messages in thread
From: Yang Shi @ 2024-02-27 19:13 UTC (permalink / raw)
To: Lance Yang
Cc: akpm, mhocko, zokeefe, david, songmuchun, peterx, minchan,
linux-mm, linux-kernel
On Mon, Feb 26, 2024 at 7:51 PM Lance Yang <ioworker0@gmail.com> wrote:
>
> Previously, we removed the mm from mm_slot and dropped mm_count
> if the MMF_THP_DISABLE flag was set. However, we didn't re-add
> the mm back after clearing the MMF_THP_DISABLE flag. Additionally,
> We add a check for the MMF_THP_DISABLE flag in hugepage_vma_revalidate().
>
> Fixes: 879c6000e191 ("mm/khugepaged: bypassing unnecessary scans with MMF_DISABLE_THP check")
I think Andrew will fold this fix into your original patch.
>
> Signed-off-by: Lance Yang <ioworker0@gmail.com>
> Suggested-by: Yang Shi <shy828301@gmail.com>
Reviewed-by: Yang Shi <shy828301@gmail.com>
> ---
> mm/khugepaged.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/khugepaged.c b/mm/khugepaged.c
> index 2771fc043b3b..1c0073daad82 100644
> --- a/mm/khugepaged.c
> +++ b/mm/khugepaged.c
> @@ -920,7 +920,7 @@ static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address,
> {
> struct vm_area_struct *vma;
>
> - if (unlikely(hpage_collapse_test_exit(mm)))
> + if (unlikely(hpage_collapse_test_exit_or_disable(mm)))
> return SCAN_ANY_PROCESS;
>
> *vmap = vma = find_vma(mm, address);
> @@ -1428,7 +1428,7 @@ static void collect_mm_slot(struct khugepaged_mm_slot *mm_slot)
>
> lockdep_assert_held(&khugepaged_mm_lock);
>
> - if (hpage_collapse_test_exit_or_disable(mm)) {
> + if (hpage_collapse_test_exit(mm)) {
> /* free mm_slot */
> hash_del(&slot->hash);
> list_del(&slot->mm_node);
> @@ -2456,7 +2456,7 @@ static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result,
> * Release the current mm_slot if this mm is about to die, or
> * if we scanned all vmas of this mm.
> */
> - if (hpage_collapse_test_exit_or_disable(mm) || !vma) {
> + if (hpage_collapse_test_exit(mm) || !vma) {
> /*
> * Make sure that if mm_users is reaching zero while
> * khugepaged runs here, khugepaged_exit will find
> --
> 2.33.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check
2024-02-27 19:13 ` Yang Shi
@ 2024-02-27 19:18 ` David Hildenbrand
0 siblings, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2024-02-27 19:18 UTC (permalink / raw)
To: Yang Shi, Lance Yang
Cc: akpm, mhocko, zokeefe, songmuchun, peterx, minchan, linux-mm,
linux-kernel
On 27.02.24 20:13, Yang Shi wrote:
> On Mon, Feb 26, 2024 at 7:51 PM Lance Yang <ioworker0@gmail.com> wrote:
>>
>> Previously, we removed the mm from mm_slot and dropped mm_count
>> if the MMF_THP_DISABLE flag was set. However, we didn't re-add
>> the mm back after clearing the MMF_THP_DISABLE flag. Additionally,
>> We add a check for the MMF_THP_DISABLE flag in hugepage_vma_revalidate().
>>
>> Fixes: 879c6000e191 ("mm/khugepaged: bypassing unnecessary scans with MMF_DISABLE_THP check")
>
> I think Andrew will fold this fix into your original patch.
Unlikely, it's already in mm-stable.
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Cheers,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-27 19:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-27 3:51 [PATCH 1/1] mm/khugepaged: keep mm in mm_slot without MMF_DISABLE_THP check Lance Yang
2024-02-27 19:13 ` Yang Shi
2024-02-27 19:18 ` David Hildenbrand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox