mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
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: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: William Kucharski <william.kucharski@oracle.com> Reviewed-by: Zi 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: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6ffbb45826
commit
af3bbc12df
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -227,7 +227,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
|
|||
if (pvmw->address >= pvmw->vma->vm_end ||
|
||||
pvmw->address >=
|
||||
__vma_address(pvmw->page, pvmw->vma) +
|
||||
hpage_nr_pages(pvmw->page) * PAGE_SIZE)
|
||||
thp_size(pvmw->page))
|
||||
return not_found(pvmw);
|
||||
/* Did we cross page table boundary? */
|
||||
if (pvmw->address % PMD_SIZE == 0) {
|
||||
|
@ -268,7 +268,7 @@ int page_mapped_in_vma(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;
|
||||
|
||||
if (unlikely(end < vma->vm_start || start >= vma->vm_end))
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue