* [PATCH v2 0/2] mm, smaps: MMUPageSize for device-dax
@ 2018-02-10 0:38 Dave Jiang
2018-02-10 0:38 ` [PATCH v2 1/2] mm, hugetlbfs: introduce ->pagesize() to vm_operations_struct Dave Jiang
2018-02-10 0:38 ` [PATCH v2 2/2] device-dax: implement ->pagesize() for smaps to report MMUPageSize Dave Jiang
0 siblings, 2 replies; 3+ messages in thread
From: Dave Jiang @ 2018-02-10 0:38 UTC (permalink / raw)
To: akpm; +Cc: linux-mm, dan.j.williams, linux-nvdimm, linux-kernel, mhocko
Andrew,
>From Dan Williams:
Here is another occasion where we want special-case hugetlbfs enabling
to also apply to device-dax. I started to wonder what other hstate
conversions we might do beyond ->split() and ->pagesize(), but this
appears to be the last of the usages of hstate_vma() in
generic/non-hugetlbfs specific code paths.
v2:
I fixed up the powerpc build issue that Michal reported by restoring the
original location of the function and making the symbol weak.
---
Dan Williams (2):
mm, hugetlbfs: introduce ->pagesize() to vm_operations_struct
device-dax: implement ->pagesize() for smaps to report MMUPageSize
arch/powerpc/mm/hugetlbpage.c | 5 +----
drivers/dax/device.c | 10 ++++++++++
include/linux/mm.h | 1 +
mm/hugetlb.c | 23 ++++++++++++-----------
4 files changed, 24 insertions(+), 15 deletions(-)
--
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] mm, hugetlbfs: introduce ->pagesize() to vm_operations_struct
2018-02-10 0:38 [PATCH v2 0/2] mm, smaps: MMUPageSize for device-dax Dave Jiang
@ 2018-02-10 0:38 ` Dave Jiang
2018-02-10 0:38 ` [PATCH v2 2/2] device-dax: implement ->pagesize() for smaps to report MMUPageSize Dave Jiang
1 sibling, 0 replies; 3+ messages in thread
From: Dave Jiang @ 2018-02-10 0:38 UTC (permalink / raw)
To: akpm
Cc: Jane Chu, linux-nvdimm, Benjamin Herrenschmidt, linux-kernel,
mhocko, linux-mm, Paul Mackerras, Michael Ellerman,
dan.j.williams
From: Dan Williams <dan.j.williams@intel.com>
When device-dax is operating in huge-page mode we want it to behave like
hugetlbfs and report the MMU page mapping size that is being enforced by
the vma. Similar to commit 31383c6865a5 "mm, hugetlbfs: introduce
->split() to vm_operations_struct" it would be messy to teach
vma_mmu_pagesize() about device-dax page mapping sizes in the same
(hstate) way that hugetlbfs communicates this attribute. Instead, these
patches introduce a new ->pagesize() vm operation.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Reported-by: Jane Chu <jane.chu@oracle.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
arch/powerpc/mm/hugetlbpage.c | 5 +----
include/linux/mm.h | 1 +
mm/hugetlb.c | 23 ++++++++++++-----------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a9b9083c5e49..c6a2e577e842 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -568,10 +568,7 @@ unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
if (!radix_enabled())
return 1UL << mmu_psize_to_shift(psize);
#endif
- if (!is_vm_hugetlb_page(vma))
- return PAGE_SIZE;
-
- return huge_page_size(hstate_vma(vma));
+ return vma_kernel_pagesize(vma);
}
static inline bool is_power_of_4(unsigned long x)
diff --git a/include/linux/mm.h b/include/linux/mm.h
index ea818ff739cd..37b9aef91ec7 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -383,6 +383,7 @@ struct vm_operations_struct {
int (*huge_fault)(struct vm_fault *vmf, enum page_entry_size pe_size);
void (*map_pages)(struct vm_fault *vmf,
pgoff_t start_pgoff, pgoff_t end_pgoff);
+ unsigned long (*pagesize)(struct vm_area_struct * area);
/* notification that a previously read-only page is about to become
* writable, if an error is returned it will cause a SIGBUS */
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 9a334f5fb730..8fa069b5cb4d 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -637,14 +637,9 @@ EXPORT_SYMBOL_GPL(linear_hugepage_index);
*/
unsigned long vma_kernel_pagesize(struct vm_area_struct *vma)
{
- struct hstate *hstate;
-
- if (!is_vm_hugetlb_page(vma))
- return PAGE_SIZE;
-
- hstate = hstate_vma(vma);
-
- return 1UL << huge_page_shift(hstate);
+ if (vma->vm_ops && vma->vm_ops->pagesize)
+ return vma->vm_ops->pagesize(vma);
+ return PAGE_SIZE;
}
EXPORT_SYMBOL_GPL(vma_kernel_pagesize);
@@ -654,12 +649,10 @@ EXPORT_SYMBOL_GPL(vma_kernel_pagesize);
* architectures where it differs, an architecture-specific version of this
* function is required.
*/
-#ifndef vma_mmu_pagesize
-unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
+__weak unsigned long vma_mmu_pagesize(struct vm_area_struct *vma)
{
return vma_kernel_pagesize(vma);
}
-#endif
/*
* Flags for MAP_PRIVATE reservations. These are stored in the bottom
@@ -3132,6 +3125,13 @@ static int hugetlb_vm_op_split(struct vm_area_struct *vma, unsigned long addr)
return 0;
}
+static unsigned long hugetlb_vm_op_pagesize(struct vm_area_struct *vma)
+{
+ struct hstate *hstate = hstate_vma(vma);
+
+ return 1UL << huge_page_shift(hstate);
+}
+
/*
* We cannot handle pagefaults against hugetlb pages at all. They cause
* handle_mm_fault() to try to instantiate regular-sized pages in the
@@ -3149,6 +3149,7 @@ const struct vm_operations_struct hugetlb_vm_ops = {
.open = hugetlb_vm_op_open,
.close = hugetlb_vm_op_close,
.split = hugetlb_vm_op_split,
+ .pagesize = hugetlb_vm_op_pagesize,
};
static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page,
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] device-dax: implement ->pagesize() for smaps to report MMUPageSize
2018-02-10 0:38 [PATCH v2 0/2] mm, smaps: MMUPageSize for device-dax Dave Jiang
2018-02-10 0:38 ` [PATCH v2 1/2] mm, hugetlbfs: introduce ->pagesize() to vm_operations_struct Dave Jiang
@ 2018-02-10 0:38 ` Dave Jiang
1 sibling, 0 replies; 3+ messages in thread
From: Dave Jiang @ 2018-02-10 0:38 UTC (permalink / raw)
To: akpm
Cc: Jane Chu, linux-nvdimm, linux-kernel, mhocko, linux-mm, dan.j.williams
From: Dan Williams <dan.j.williams@intel.com>
Given that device-dax is making similar page mapping size guarantees as
hugetlbfs, emit the size in smaps and any other kernel path that
requests the mapping size of a vma.
Reported-by: Jane Chu <jane.chu@oracle.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
drivers/dax/device.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index 7b0bf825c4e7..b57cd5a7b0bd 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -439,10 +439,20 @@ static int dev_dax_split(struct vm_area_struct *vma, unsigned long addr)
return 0;
}
+static unsigned long dev_dax_pagesize(struct vm_area_struct *vma)
+{
+ struct file *filp = vma->vm_file;
+ struct dev_dax *dev_dax = filp->private_data;
+ struct dax_region *dax_region = dev_dax->region;
+
+ return dax_region->align;
+}
+
static const struct vm_operations_struct dax_vm_ops = {
.fault = dev_dax_fault,
.huge_fault = dev_dax_huge_fault,
.split = dev_dax_split,
+ .pagesize = dev_dax_pagesize,
};
static int dax_mmap(struct file *filp, struct vm_area_struct *vma)
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-10 0:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-10 0:38 [PATCH v2 0/2] mm, smaps: MMUPageSize for device-dax Dave Jiang
2018-02-10 0:38 ` [PATCH v2 1/2] mm, hugetlbfs: introduce ->pagesize() to vm_operations_struct Dave Jiang
2018-02-10 0:38 ` [PATCH v2 2/2] device-dax: implement ->pagesize() for smaps to report MMUPageSize Dave Jiang
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).