linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Muchun Song <songmuchun@bytedance.com>
To: mike.kravetz@oracle.com, akpm@linux-foundation.org
Cc: n-horiguchi@ah.jp.nec.com, ak@linux.intel.com, mhocko@suse.cz,
	linux-mm@kvack.org, linux-kernel@vger.kernel.org,
	Muchun Song <songmuchun@bytedance.com>
Subject: [PATCH v2 2/6] mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
Date: Wed,  6 Jan 2021 16:47:35 +0800	[thread overview]
Message-ID: <20210106084739.63318-3-songmuchun@bytedance.com> (raw)
In-Reply-To: <20210106084739.63318-1-songmuchun@bytedance.com>

Because we only can isolate a active page via isolate_huge_page()
and hugetlbfs_fallocate() forget to mark it as active, we cannot
isolate and migrate those pages.

Only export set_page_huge_active, just leave clear_page_huge_active
as static. Because there are no external users.

Fixes: 70c3547e36f5 (hugetlbfs: add hugetlbfs_fallocate())
Signed-off-by: Muchun Song <songmuchun@bytedance.com>
---
 fs/hugetlbfs/inode.c    | 3 ++-
 include/linux/hugetlb.h | 2 ++
 mm/hugetlb.c            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index b5c109703daa..21c20fd5f9ee 100644
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -735,9 +735,10 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset,
 
 		mutex_unlock(&hugetlb_fault_mutex_table[hash]);
 
+		set_page_huge_active(page);
 		/*
 		 * unlock_page because locked by add_to_page_cache()
-		 * page_put due to reference from alloc_huge_page()
+		 * put_page() due to reference from alloc_huge_page()
 		 */
 		unlock_page(page);
 		put_page(page);
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index ebca2ef02212..b5807f23caf8 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -770,6 +770,8 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma,
 }
 #endif
 
+void set_page_huge_active(struct page *page);
+
 #else	/* CONFIG_HUGETLB_PAGE */
 struct hstate {};
 
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 1f3bf1710b66..4741d60f8955 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1348,7 +1348,7 @@ bool page_huge_active(struct page *page)
 }
 
 /* never called for tail page */
-static void set_page_huge_active(struct page *page)
+void set_page_huge_active(struct page *page)
 {
 	VM_BUG_ON_PAGE(!PageHeadHuge(page), page);
 	SetPagePrivate(&page[1]);
-- 
2.11.0



  parent reply	other threads:[~2021-01-06  8:49 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-06  8:47 [PATCH v2 0/6] Fix some bugs about HugeTLB code Muchun Song
2021-01-06  8:47 ` [PATCH v2 1/6] mm: migrate: do not migrate HugeTLB page whose refcount is one Muchun Song
2021-01-06 16:13   ` Michal Hocko
2021-01-07  2:52     ` [External] " Muchun Song
2021-01-07 11:16       ` Michal Hocko
2021-01-07 11:24         ` Muchun Song
2021-01-07 11:48           ` Michal Hocko
2021-01-06  8:47 ` Muchun Song [this message]
2021-01-06 16:35   ` [PATCH v2 2/6] mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page Michal Hocko
2021-01-06 19:30     ` Mike Kravetz
2021-01-06 20:02       ` Michal Hocko
2021-01-06 21:07         ` Mike Kravetz
2021-01-07  8:36           ` Michal Hocko
2021-01-07  2:58     ` [External] " Muchun Song
2021-01-06  8:47 ` [PATCH v2 3/6] mm: hugetlb: fix a race between freeing and dissolving the page Muchun Song
2021-01-06 16:56   ` Michal Hocko
2021-01-06 20:58     ` Mike Kravetz
2021-01-07  3:08       ` [External] " Muchun Song
2021-01-07  8:40       ` Michal Hocko
2021-01-08  0:52         ` Mike Kravetz
2021-01-08  8:28           ` Michal Hocko
2021-01-07  5:39     ` [External] " Muchun Song
2021-01-07  8:41       ` Michal Hocko
2021-01-07  8:53         ` Muchun Song
2021-01-07 11:18           ` Michal Hocko
2021-01-07 11:38             ` Muchun Song
2021-01-07 12:38               ` Michal Hocko
2021-01-07 12:59                 ` Muchun Song
2021-01-07 14:11                   ` Michal Hocko
2021-01-07 15:11                     ` Muchun Song
2021-01-08  1:06                       ` Mike Kravetz
2021-01-08  2:38                         ` Muchun Song
2021-01-08  8:43                       ` Michal Hocko
2021-01-08  9:01                         ` Muchun Song
2021-01-08  9:31                           ` Michal Hocko
2021-01-08 10:08                             ` Muchun Song
2021-01-08 11:44                               ` Michal Hocko
2021-01-08 11:52                                 ` Muchun Song
2021-01-08 12:04                                   ` Michal Hocko
2021-01-08 12:24                                     ` Muchun Song
2021-01-06  8:47 ` [PATCH v2 4/6] mm: hugetlb: add return -EAGAIN for dissolve_free_huge_page Muchun Song
2021-01-06 17:07   ` Michal Hocko
2021-01-07  3:11     ` [External] " Muchun Song
2021-01-07  8:39       ` Michal Hocko
2021-01-07  9:01         ` Muchun Song
2021-01-07 11:22           ` Michal Hocko
2021-01-06  8:47 ` [PATCH v2 5/6] mm: hugetlb: fix a race between isolating and freeing page Muchun Song
2021-01-06 17:10   ` Michal Hocko
2021-01-06  8:47 ` [PATCH v2 6/6] mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active Muchun Song
2021-01-06 17:16   ` Michal Hocko
2021-01-08 22:24   ` Mike Kravetz
2021-01-09  4:07     ` [External] " Muchun Song
2021-01-07  9:30 ` [PATCH v2 0/6] Fix some bugs about HugeTLB code David Hildenbrand
2021-01-07  9:40   ` [External] " Muchun Song
2021-01-07 10:10     ` David Hildenbrand
2021-01-07 10:16       ` Muchun Song

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=20210106084739.63318-3-songmuchun@bytedance.com \
    --to=songmuchun@bytedance.com \
    --cc=ak@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.cz \
    --cc=mike.kravetz@oracle.com \
    --cc=n-horiguchi@ah.jp.nec.com \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox