mm, drm/ttm: Fix pte insertion with customized protection
Subsystems (5)
v5 cover mm, drm/ttm: Fix pte insertion with customized protection
From: Thomas Hellstrom <[email protected]>
The drm/ttm module is using a modified on-stack copy of the struct vm_area_struct to be able to set a page protection with customized caching. Fix that by adding a vmf_insert_mixed_prot() function similar to the existing vmf_insert_pfn_prot() for use with drm/ttm.
Patches are acked to be merged through a drm tree.
Changes since v1:
*) Formatting fixes in patch 1
*) Updated commit message of patch 2.
Changes since v2:
*) Moved vmf_insert_mixed_prot() export to patch 2 (Michal Hocko) *) Documented under which conditions it's safe to use a page protection
different from struct vm_area_struct::vm_page_prot. (Michal Hocko)
Changes since v3:
*) More documentation regarding under which conditions it's safe to use a
page protection different from struct vm_area_struct::vm_page_prot. This time also in core vm. (Michal Hocko)
Changes since v4:
*) Fixed a typo
*) Added acks.
Signature · 1 line
2.21.0
PATCH v5 1/2 mm: Add a vmf_insert_mixed_prot() function
From: Thomas Hellstrom <[email protected]>
The TTM module today uses a hack to be able to set a different page protection than struct vm_area_struct::vm_page_prot. To be able to do this properly, add the needed vm functionality as vmf_insert_mixed_prot().
--- include/linux/mm.h | 2 ++ include/linux/mm_types.h | 7 ++++++- mm/memory.c | 43 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 5 deletions(-)
include/linux/mm.h +2 -0
@@ -2548,6 +2548,8 @@ vm_fault_t vmf_insert_pfn_prot(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, pgprot_t pgprot);vm_fault_t vmf_insert_mixed (struct vm_area_struct *vma,unsigned long addr,pfn_t pfn); +vm_fault_t vmf_insert_mixed_prot (struct vm_area_struct *vma,unsigned long addr, +pfn_t pfn,pgprot_t pgprot);vm_fault_t vmf_insert_mixed_mkwrite (struct vm_area_struct *vma,unsigned long addr,pfn_t pfn);int vm_iomap_memory (struct vm_area_struct *vma,phys_addr_t start,unsigned long len);
include/linux/mm_types.h +6 -1
@@ -307,7 +307,12 @@ struct vm_area_struct {/* Second cache line starts here. */ struct mm_struct *vm_mm;/* The address space we belong to. */ -pgprot_t vm_page_prot;/* Access permissions of this VMA. */ + +/* +* Access permissions of this VMA. +* See vmf_insert_mixed_prot() for discussion. +*/ +pgprot_t vm_page_prot;unsigned long vm_flags;/* Flags, see mm.h. */ /*
mm/memory.c +39 -4
71 lines not on this page · raw message
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v5 2/2 mm, drm/ttm: Fix vm page protection handling
In reply to Thomas Hellström (VMware)From: Thomas Hellstrom <[email protected]>
TTM graphics buffer objects may, transparently to user-space, move between IO and system memory. When that happens, all PTEs pointing to the old location are zapped before the move and then faulted in again if needed. When that happens, the page protection caching mode- and encryption bits may change and be different from those of struct vm_area_struct::vm_page_prot.
We were using an ugly hack to set the page protection correctly. Fix that and instead export and use vmf_insert_mixed_prot() or use vmf_insert_pfn_prot().
Also get the default page protection from
struct vm_area_struct::vm_page_prot rather than using vm_get_page_prot(). This way we catch modifications done by the vm system for drivers that want write-notification.
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 22 +++++++++++++++------- mm/memory.c | 1 + 2 files changed, 16 insertions(+), 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_vm.c +15 -7
@@ -173,7 +173,6 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, pgoff_t num_prefault) {struct vm_area_struct *vma = vmf->vma; -struct vm_area_struct cvma = *vma;struct ttm_buffer_object *bo = vma->vm_private_data;struct ttm_bo_device *bdev = bo->bdev;unsigned long page_offset;
@@ -244,7 +243,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, goto out_io_unlock; } - cvma.vm_page_prot =ttm_io_prot (bo->mem.placement, prot); + prot =ttm_io_prot (bo->mem.placement, prot);if (!bo->mem.bus.is_iomem) {struct ttm_operation_ctx ctx = { .interruptible = false,
@@ -260,7 +259,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, } }else {/* Iomem should not be marked encrypted */ - cvma.vm_page_prot =pgprot_decrypted (cvma.vm_page_prot); + prot =pgprot_decrypted (prot); }/*
@@ -283,11 +282,20 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault *vmf, pfn =page_to_pfn (page); } +/* +* Note that the value of @prot at this point may differ from +* the value of @vma->vm_page_prot in the caching- and +* encryption bits. This is because the exact location of the +* data may not be known at mmap() time and may also change +* at arbitrary times while the data is mmap'ed. +* See vmf_insert_mixed_prot() for a discussion. +*/ if (vma->vm_flags &VM_MIXEDMAP ) - ret =vmf_insert_mixed (&cvma, address, -__pfn_to_pfn_t (pfn,PFN_DEV )); + ret =vmf_insert_mixed_prot (vma, address, +__pfn_to_pfn_t (pfn,PFN_DEV ), + prot);else - ret =vmf_insert_pfn (&cvma, address, pfn); + ret =vmf_insert_pfn_prot (vma, address, pfn, prot);/* Never error on prefaulted PTEs */ if (unlikely ((ret &VM_FAULT_ERROR ))) {
@@ -319,7 +327,7 @@ vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf)if (ret)return ret; - prot =vm_get_page_prot (vma->vm_flags); + prot = vma->vm_page_prot; ret =ttm_bo_vm_fault_reserved (vmf, prot,TTM_BO_VM_NUM_PREFAULT );if (ret ==VM_FAULT_RETRY && !(vmf->flags &FAULT_FLAG_RETRY_NOWAIT ))return ret;
mm/memory.c +1 -0
@@ -1798,6 +1798,7 @@ vm_fault_t vmf_insert_mixed_prot(struct vm_area_struct *vma, unsigned long addr, {return __vm_insert_mixed (vma, addr, pfn, pgprot, false); } +EXPORT_SYMBOL (vmf_insert_mixed_prot);vm_fault_t vmf_insert_mixed (struct vm_area_struct *vma,unsigned long addr,pfn_t pfn)
Signature · 6 lines
2.21.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
TTM or vmwgfx tree? Re: [PATCH v5 0/2] mm, drm/ttm: Fix pte insertion with customized protection
In reply to Thomas Hellström (VMware)Hi Christian,
Quoted 8 lines · Thomas Hellström (VMware)
From: Thomas Hellstrom <[email protected]>
The drm/ttm module is using a modified on-stack copy of the struct
vm_area_structto be able to set a page protection with customized caching. Fix that by adding avmf_insert_mixed_prot()function similar to the existingvmf_insert_pfn_prot()for use with drm/ttm.Patches are acked to be merged through a drm tree.
This small patchset should be ready to be merged now, with acks from Andrew.
Do you want to take it through the ttm tree, or should I ask Dave / Daniel to pull it separately?
Note that similar to the vmwgfx coherent patches, Linus has indicated that he wants separate pull requests for stuff like this that touches mm.
Thanks,
Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: TTM or vmwgfx tree? Re: [PATCH v5 0/2] mm, drm/ttm: Fix pte insertion with customized protection
Am 15.01.20 um 13:45 schrieb Thomas Hellström (VMware):
Quoted 10 lines
Hi Christian,
Quoted 7 lines · Thomas Hellström (VMware)
From: Thomas Hellstrom <[email protected]>
The drm/ttm module is using a modified on-stack copy of the struct
vm_area_structto be able to set a page protection with customized caching. Fix that by adding avmf_insert_mixed_prot()function similar to the existingvmf_insert_pfn_prot()for use with drm/ttm.
Quoted 7 lines
Quoted 1 line
Patches are acked to be merged through a drm tree.
This small patchset should be ready to be merged now, with acks from Andrew.
Do you want to take it through the ttm tree, or should I ask Dave / Daniel to pull it separately?
Note that similar to the vmwgfx coherent patches, Linus has indicated that he wants separate pull requests for stuff like this that touches mm.
Better ask Dave in this case or merge through drm-misc-next. The later is where I push all those little cross driver cleanup patches recently and that seems to work fine.
Regards,
Christian.
Quoted 6 lines
Thanks,
Thomas
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel