p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Matthew Wilcox (Oracle) 2020-08-14 17:30:33 -07:00 committed by Linus Torvalds
parent 6ffbb45826
commit af3bbc12df
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvdimm/btt.c
View File

@ -1490,10 +1490,8 @@ static int btt_rw_page(struct block_device *bdev, sector_t sector,
{ {
struct btt *btt = bdev->bd_disk->private_data; struct btt *btt = bdev->bd_disk->private_data;
int rc; int rc;
unsigned int len;
len = hpage_nr_pages(page) * PAGE_SIZE; rc = btt_do_bvec(btt, NULL, page, thp_size(page), 0, op, sector);
rc = btt_do_bvec(btt, NULL, page, len, 0, op, sector);
if (rc == 0) if (rc == 0)
page_endio(page, op_is_write(op), 0); page_endio(page, op_is_write(op), 0);

6
drivers/nvdimm/pmem.c
View File

@ -238,11 +238,9 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
blk_status_t rc; blk_status_t rc;
if (op_is_write(op)) if (op_is_write(op))
rc = pmem_do_write(pmem, page, 0, sector, rc = pmem_do_write(pmem, page, 0, sector, thp_size(page));
hpage_nr_pages(page) * PAGE_SIZE);
else else
rc = pmem_do_read(pmem, page, 0, sector, rc = pmem_do_read(pmem, page, 0, sector, thp_size(page));
hpage_nr_pages(page) * PAGE_SIZE);
/* /*
* The ->rw_page interface is subtle and tricky. The core * The ->rw_page interface is subtle and tricky. The core
* retries on any error, so we can only invoke page_endio() in * retries on any error, so we can only invoke page_endio() in

11
include/linux/huge_mm.h
View File

@ -462,4 +462,15 @@ static inline bool thp_migration_supported(void)
} }
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ #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 */ #endif /* _LINUX_HUGE_MM_H */

2
mm/internal.h
View File

@ -396,7 +396,7 @@ vma_address(struct page *page, struct vm_area_struct *vma)
unsigned long start, end; unsigned long start, end;
start = __vma_address(page, vma); 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 */ /* page should be within @vma mapping range */
VM_BUG_ON_VMA(end < vma->vm_start || start >= vma->vm_end, vma); VM_BUG_ON_VMA(end < vma->vm_start || start >= vma->vm_end, vma);

2
mm/page_io.c
View File

@ -40,7 +40,7 @@ static struct bio *get_swap_bio(gfp_t gfp_flags,
bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9; bio->bi_iter.bi_sector <<= PAGE_SHIFT - 9;
bio->bi_end_io = end_io; 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; return bio;
} }

4
mm/page_vma_mapped.c
View File

@ -227,7 +227,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
if (pvmw->address >= pvmw->vma->vm_end || if (pvmw->address >= pvmw->vma->vm_end ||
pvmw->address >= pvmw->address >=
__vma_address(pvmw->page, pvmw->vma) + __vma_address(pvmw->page, pvmw->vma) +
hpage_nr_pages(pvmw->page) * PAGE_SIZE) thp_size(pvmw->page))
return not_found(pvmw); return not_found(pvmw);
/* Did we cross page table boundary? */ /* Did we cross page table boundary? */
if (pvmw->address % PMD_SIZE == 0) { 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; unsigned long start, end;
start = __vma_address(page, vma); 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)) if (unlikely(end < vma->vm_start || start >= vma->vm_end))
return 0; return 0;