On 2/7/19 6:31 PM, Naoya Horiguchi wrote:
On Thu, Feb 07, 2019 at 10:50:55AM -0800, Mike Kravetz wrote:
On 1/30/19 1:14 PM, Mike Kravetz wrote:
+++ b/fs/hugetlbfs/inode.c @@ -859,6 +859,16 @@ static int hugetlbfs_migrate_page(struct address_space *mapping, rc = migrate_huge_page_move_mapping(mapping, newpage, page); if (rc != MIGRATEPAGE_SUCCESS) return rc;
- /*
* page_private is subpool pointer in hugetlb pages, transfer* if needed.*/- if (page_private(page) && !page_private(newpage)) {
set_page_private(newpage, page_private(page));set_page_private(page, 0);You don't have to copy PagePrivate flag?
Well my original thought was no. For hugetlb pages, PagePrivate is not associated with page_private. It indicates a reservation was consumed. It is set when a hugetlb page is newly allocated and the allocation is associated with a reservation and the global reservation count is decremented. When the page is added to the page cache or rmap, PagePrivate is cleared. If the page is free'ed before being added to page cache or rmap, PagePrivate tells free_huge_page to restore (increment) the reserve count as we did not 'instantiate' the page.
So, PagePrivate is only set from the time a huge page is allocated until it is added to page cache or rmap. My original thought was that the page could not be migrated during this time. However, I am not sure if that reasoning is correct. The page is not locked, so it would appear that it could be migrated? But, if it can be migrated at this time then perhaps there are bigger issues for the (hugetlb) page fault code?
- }
- if (mode != MIGRATE_SYNC_NO_COPY) migrate_page_copy(newpage, page); else
diff --git a/mm/migrate.c b/mm/migrate.c index f7e4bfdc13b7..0d9708803553 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -703,8 +703,14 @@ void migrate_page_states(struct page *newpage, struct page *page) */ if (PageSwapCache(page)) ClearPageSwapCache(page);
- ClearPagePrivate(page);
- set_page_private(page, 0);
- /*
* Unlikely, but PagePrivate and page_private could potentially* contain information needed at hugetlb free page time.*/- if (!PageHuge(page)) {
ClearPagePrivate(page);set_page_private(page, 0);- }
# This argument is mainly for existing code...
According to the comment on migrate_page():
/* * Common logic to directly migrate a single LRU page suitable for * pages that do not use PagePrivate/PagePrivate2. * * Pages are locked upon entry and exit. */ int migrate_page(struct address_space *mapping, ...So this common logic assumes that page_private is not used, so why do we explicitly clear page_private in migrate_page_states()?
Perhaps someone else knows. If not, I can do some git research and try to find out why.
buffer_migrate_page(), which is commonly used for the case when page_private is used, does that clearing outside migrate_page_states(). So I thought that hugetlbfs_migrate_page() could do in the similar manner. IOW, migrate_page_states() should not do anything on PagePrivate. But there're a few other .migratepage callbacks, and I'm not sure all of them are safe for the change, so this approach might not fit for a small fix.
I will look at those as well unless someone knows without researching.
# BTW, there seems a typo in $SUBJECT.
Thanks!