From: Matthew Wilcox <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 07/25] mm: Introduce thp_size
Date: Tue, 11 Feb 2020 20:18:27 -0800 [thread overview]
Message-ID: <20200212041845.25879-8-willy@infradead.org> (raw)
In-Reply-To: <20200212041845.25879-1-willy@infradead.org>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
This is like page_size(), but compiles down to just PAGE_SIZE if THP
are disabled. Convert the users of hpage_nr_pages() which would prefer
this interface.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
drivers/nvdimm/btt.c | 4 +---
drivers/nvdimm/pmem.c | 3 +--
include/linux/huge_mm.h | 2 ++
mm/internal.h | 2 +-
mm/page_io.c | 2 +-
mm/page_vma_mapped.c | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 0d04ea3d9fd7..5d6a2a22f5a0 100644
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -1488,10 +1488,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);
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 4eae441f86c9..9c71c81f310f 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -223,8 +223,7 @@ static int pmem_rw_page(struct block_device *bdev, sector_t sector,
struct pmem_device *pmem = bdev->bd_queue->queuedata;
blk_status_t rc;
- rc = pmem_do_bvec(pmem, page, hpage_nr_pages(page) * PAGE_SIZE,
- 0, op, sector);
+ rc = pmem_do_bvec(pmem, page, thp_size(page), 0, op, sector);
/*
* The ->rw_page interface is subtle and tricky. The core
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index 16367e2f771e..3680ae2d9019 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -232,6 +232,7 @@ static inline spinlock_t *pud_trans_huge_lock(pud_t *pud,
}
#define hpage_nr_pages(page) (long)compound_nr(page)
+#define thp_size(page) page_size(page)
struct page *follow_devmap_pmd(struct vm_area_struct *vma, unsigned long addr,
pmd_t *pmd, int flags, struct dev_pagemap **pgmap);
@@ -286,6 +287,7 @@ static inline struct list_head *page_deferred_list(struct page *page)
#define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; })
#define hpage_nr_pages(x) 1L
+#define thp_size(x) PAGE_SIZE
static inline bool __transparent_hugepage_enabled(struct vm_area_struct *vma)
{
diff --git a/mm/internal.h b/mm/internal.h
index 41b93c4b3ab7..390d81d8b85f 100644
--- a/mm/internal.h
+++ b/mm/internal.h
@@ -358,7 +358,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);
diff --git a/mm/page_io.c b/mm/page_io.c
index 76965be1d40e..dd935129e3cb 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -41,7 +41,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;
}
diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c
index 719c35246cfa..e65629c056e8 100644
--- a/mm/page_vma_mapped.c
+++ b/mm/page_vma_mapped.c
@@ -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;
--
2.25.0
next prev parent reply other threads:[~2020-02-12 4:19 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 4:18 [PATCH v2 00/25] Large pages in the page cache Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 01/25] mm: Use vm_fault error code directly Matthew Wilcox
2020-02-12 7:34 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 02/25] mm: Optimise find_subpage for !THP Matthew Wilcox
2020-02-12 7:41 ` Christoph Hellwig
2020-02-12 13:02 ` Matthew Wilcox
2020-02-12 17:52 ` Christoph Hellwig
2020-02-13 13:50 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 03/25] mm: Use VM_BUG_ON_PAGE in clear_page_dirty_for_io Matthew Wilcox
2020-02-12 7:38 ` Christoph Hellwig
2020-02-13 13:50 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 04/25] mm: Unexport find_get_entry Matthew Wilcox
2020-02-12 7:37 ` Christoph Hellwig
2020-02-13 13:51 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 05/25] mm: Fix documentation of FGP flags Matthew Wilcox
2020-02-12 7:42 ` Christoph Hellwig
2020-02-12 19:11 ` Matthew Wilcox
2020-02-13 14:00 ` Kirill A. Shutemov
2020-02-13 13:59 ` Kirill A. Shutemov
2020-02-13 14:34 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 06/25] mm: Allow hpages to be arbitrary order Matthew Wilcox
2020-02-13 14:11 ` Kirill A. Shutemov
2020-02-13 14:30 ` Matthew Wilcox
2020-02-12 4:18 ` Matthew Wilcox [this message]
2020-02-13 14:19 ` [PATCH v2 07/25] mm: Introduce thp_size Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 08/25] mm: Introduce thp_order Matthew Wilcox
2020-02-13 14:20 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 09/25] fs: Add a filesystem flag for large pages Matthew Wilcox
2020-02-12 7:43 ` Christoph Hellwig
2020-02-12 14:59 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 10/25] fs: Introduce i_blocks_per_page Matthew Wilcox
2020-02-12 7:44 ` Christoph Hellwig
2020-02-12 15:05 ` Matthew Wilcox
2020-02-12 17:54 ` Christoph Hellwig
2020-02-13 15:40 ` Kirill A. Shutemov
2020-02-13 16:07 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 11/25] fs: Make page_mkwrite_check_truncate thp-aware Matthew Wilcox
2020-02-13 15:44 ` Kirill A. Shutemov
2020-02-13 16:26 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 12/25] mm: Add file_offset_of_ helpers Matthew Wilcox
2020-02-12 7:46 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 13/25] fs: Add zero_user_large Matthew Wilcox
2020-02-14 13:52 ` Kirill A. Shutemov
2020-02-14 16:03 ` Matthew Wilcox
2020-02-18 14:16 ` Kirill A. Shutemov
2020-02-18 16:13 ` Matthew Wilcox
2020-02-18 17:10 ` Kirill A. Shutemov
2020-02-18 18:07 ` Matthew Wilcox
2020-02-21 12:42 ` Kirill A. Shutemov
2020-02-12 4:18 ` [PATCH v2 14/25] iomap: Support arbitrarily many blocks per page Matthew Wilcox
2020-02-12 8:05 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 15/25] iomap: Support large pages in iomap_adjust_read_range Matthew Wilcox
2020-02-12 8:11 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 16/25] iomap: Support large pages in read paths Matthew Wilcox
2020-02-12 8:13 ` Christoph Hellwig
2020-02-12 17:45 ` Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 17/25] iomap: Support large pages in write paths Matthew Wilcox
2020-02-12 8:17 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 18/25] iomap: Inline data shouldn't see large pages Matthew Wilcox
2020-02-12 8:05 ` Christoph Hellwig
2020-02-12 4:18 ` [PATCH v2 19/25] xfs: Support " Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 20/25] mm: Make prep_transhuge_page return its argument Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 21/25] mm: Add __page_cache_alloc_order Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 22/25] mm: Allow large pages to be added to the page cache Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 23/25] mm: Allow large pages to be removed from " Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 24/25] mm: Add large page readahead Matthew Wilcox
2020-02-12 4:18 ` [PATCH v2 25/25] mm: Align THP mappings for non-DAX Matthew Wilcox
2020-02-12 7:50 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200212041845.25879-8-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).