diff mbox series

[07/11] mm/huge_memory: Fix can_split_huge_page assumption of THP size

Message ID 20200908195539.25896-8-willy@infradead.org
State New
Headers show
Series Remove assumptions of THP size | expand

Commit Message

Matthew Wilcox Sept. 8, 2020, 7:55 p.m. UTC
Ask the page how many subpages it has instead of assuming it's PMD size.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 mm/huge_memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kirill A. Shutemov Sept. 9, 2020, 2:46 p.m. UTC | #1
On Tue, Sep 08, 2020 at 08:55:34PM +0100, Matthew Wilcox (Oracle) wrote:
> Ask the page how many subpages it has instead of assuming it's PMD size.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
SeongJae Park Sept. 15, 2020, 7:25 a.m. UTC | #2
On Tue,  8 Sep 2020 20:55:34 +0100 "Matthew Wilcox (Oracle)" <willy@infradead.org> wrote:

> Ask the page how many subpages it has instead of assuming it's PMD size.
> 
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

Reviewed-by: SeongJae Park <sjpark@amazon.de>


Thanks,
SeongJae Park
Huang\, Ying Sept. 16, 2020, 1:44 a.m. UTC | #3
"Matthew Wilcox (Oracle)" <willy@infradead.org> writes:

> Ask the page how many subpages it has instead of assuming it's PMD size.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> ---
>  mm/huge_memory.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index e9503b10df8f..8bf8caf66923 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -2546,9 +2546,9 @@ bool can_split_huge_page(struct page *page, int *pextra_pins)
>  
>  	/* Additional pins from page cache */
>  	if (PageAnon(page))
> -		extra_pins = PageSwapCache(page) ? HPAGE_PMD_NR : 0;
> +		extra_pins = PageSwapCache(page) ? thp_nr_pages(page) : 0;
>  	else
> -		extra_pins = HPAGE_PMD_NR;
> +		extra_pins = thp_nr_pages(page);
>  	if (pextra_pins)
>  		*pextra_pins = extra_pins;
>  	return total_mapcount(page) == page_count(page) - extra_pins - 1;

Acked-by: "Huang, Ying" <ying.huang@intel.com>

Best Regards,
Huang, Ying
diff mbox series

Patch

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e9503b10df8f..8bf8caf66923 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2546,9 +2546,9 @@  bool can_split_huge_page(struct page *page, int *pextra_pins)
 
 	/* Additional pins from page cache */
 	if (PageAnon(page))
-		extra_pins = PageSwapCache(page) ? HPAGE_PMD_NR : 0;
+		extra_pins = PageSwapCache(page) ? thp_nr_pages(page) : 0;
 	else
-		extra_pins = HPAGE_PMD_NR;
+		extra_pins = thp_nr_pages(page);
 	if (pextra_pins)
 		*pextra_pins = extra_pins;
 	return total_mapcount(page) == page_count(page) - extra_pins - 1;