Commit af3bbc12 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Linus Torvalds
Browse files

mm: add thp_size 



This function returns the number of bytes in a THP.  It is like
page_size(), but compiles to just PAGE_SIZE if CONFIG_TRANSPARENT_HUGEPAGE
is disabled.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarWilliam Kucharski <william.kucharski@oracle.com>
Reviewed-by: default avatarZi Yan <ziy@nvidia.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Link: http://lkml.kernel.org/r/20200629151959.15779-5-willy@infradead.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6ffbb458

drivers/nvdimm/btt.c

+1 −3
Original line number Diff line number Diff line
@@ -1490,10 +1490,8 @@ static int btt_rw_page(struct block_device *bdev, sector_t sector, 
{

	struct btt *btt = bdev->bd_disk->private_data;

	int rc;

	unsigned int len;



	len = hpage_nr_pages(page) * PAGE_SIZE;

	rc = btt_do_bvec(btt, NULL, page, len, 0, op, sector);

	rc = btt_do_bvec(btt, NULL, page, thp_size(page), 0, op, sector);

	if (rc == 0)

		page_endio(page, op_is_write(op), 0);

drivers/nvdimm/pmem.c

+2 −4
Original line number Diff line number Diff line
@@ -238,11 +238,9 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector, 
	blk_status_t rc;



	if (op_is_write(op))

		rc = pmem_do_write(pmem, page, 0, sector,

				   hpage_nr_pages(page) * PAGE_SIZE);

		rc = pmem_do_write(pmem, page, 0, sector, thp_size(page));

	else

		rc = pmem_do_read(pmem, page, 0, sector,

				   hpage_nr_pages(page) * PAGE_SIZE);

		rc = pmem_do_read(pmem, page, 0, sector, thp_size(page));

	/*

	 * The ->rw_page interface is subtle and tricky.  The core

	 * retries on any error, so we can only invoke page_endio() in

include/linux/huge_mm.h

+11 −0
Original line number Diff line number Diff line
@@ -462,4 +462,15 @@ static inline bool thp_migration_supported(void) 
}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */



/**

 * thp_size - Size of a transparent huge page.

 * @page: Head page of a transparent huge page.

 *

 * Return: Number of bytes in this page.

 */

static inline unsigned long thp_size(struct page *page)

{

	return PAGE_SIZE << thp_order(page);

}



#endif /* _LINUX_HUGE_MM_H */

mm/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ vma_address(struct page *page, struct vm_area_struct *vma) 
	unsigned long start, end;



	start = __vma_address(page, vma);

	end = start + PAGE_SIZE * (hpage_nr_pages(page) - 1);

	end = start + thp_size(page) - PAGE_SIZE;



	/* page should be within @vma mapping range */

	VM_BUG_ON_VMA(end < vma->vm_start || start >= vma->vm_end, vma);

mm/page_io.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct bio *get_swap_bio(gfp_t gfp_flags, 
		bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9;

		bio->bi_end_io = end_io;



		bio_add_page(bio, page, PAGE_SIZE * hpage_nr_pages(page), 0);

		bio_add_page(bio, page, thp_size(page), 0);

	}

	return bio;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE