drm/i915: Add lmem fault handler
Subsystems (2)
PATCH 1/1 drm/i915: Add lmem fault handler
Fault handler to handle missing pages for lmem objects.
--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 43 ++++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 ++++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 15 +++++++-- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + 4 files changed, 63 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +43 -0
@@ -6,8 +6,40 @@#include "intel_memory_region.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_mman.h" #include "i915_drv.h" +vm_fault_t vm_fault_lmem (struct vm_fault *vmf) +{ +struct vm_area_struct *area = vmf->vma; +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; +unsigned long size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ; +vm_fault_t vmf_ret; +int i, ret; + +/* Sanity check that we allow writing into this object */ +if (i915_gem_object_is_readonly (obj) && write) +return VM_FAULT_SIGBUS ; + + ret =i915_gem_object_pin_pages (obj); +if (ret) +return i915_error_to_vmf_fault (ret); + +for (i =0 ; i < size >>PAGE_SHIFT ; i++) { + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +i915_gem_object_lmem_io_pfn (obj, i)); +if (vmf_ret !=VM_FAULT_NOPAGE ) +break ; + } + +i915_gem_object_unpin_pages (obj); + +return vmf_ret; +} +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_HAS_IOMEM ,
@@ -56,6 +88,17 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); } +unsigned long i915_gem_object_lmem_io_pfn (struct drm_i915_gem_object *obj, +unsigned long n) +{ +struct intel_memory_region *mem = obj->mm.region; +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n); + +return (mem->io_start + offset) >>PAGE_SHIFT ; +} +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj) {return obj->ops == &i915_gem_lmem_obj_ops;
drivers/gpu/drm/i915/gem/i915_gem_lmem.h +6 -0
@@ -7,6 +7,7 @@#define __I915_GEM_LMEM_H#include <linux/types.h> +#include <linux/mman.h> struct drm_i915_private ;struct drm_i915_gem_object ;
@@ -22,8 +23,13 @@ void __iomem * i915_gem_object_lmem_io_map_page_atomic(struct drm_i915_gem_object *obj, unsigned long n); +unsigned long i915_gem_object_lmem_io_pfn (struct drm_i915_gem_object *obj, +unsigned long n); +bool i915_gem_object_is_lmem (struct drm_i915_gem_object *obj); +vm_fault_t vm_fault_lmem (struct vm_fault *vmf); +struct drm_i915_gem_object * i915_gem_object_create_lmem(struct drm_i915_private *i915, resource_size_t size,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +13 -2
@@ -11,6 +11,7 @@#include "gt/intel_gt.h" #include "gt/intel_gt_requests.h" +#include "i915_gem_lmem.h" #include "i915_drv.h" #include "i915_gem_gtt.h" #include "i915_gem_ioctls.h"
@@ -203,7 +204,7 @@ compute_partial_view(const struct drm_i915_gem_object *obj,return view; } -static vm_fault_t i915_error_to_vmf_fault (int err) +vm_fault_t i915_error_to_vmf_fault (int err) {switch (err) {default :
@@ -560,7 +561,8 @@ __assign_mmap_offset(struct drm_file *file, }if (mmap_type !=I915_MMAP_TYPE_GTT && - !i915_gem_object_has_struct_page (obj)) { + !i915_gem_object_has_struct_page (obj) && + !i915_gem_object_is_lmem (obj)) { err = -ENODEV ; goto out; }
@@ -685,6 +687,12 @@ static const struct vm_operations_struct vm_ops_cpu = { .close = vm_close, }; +static const struct vm_operations_struct vm_ops_lmem = { + .fault = vm_fault_lmem, + .open = vm_open, + .close = vm_close, +}; +/* * This overcomes the limitation in drm_gem_mmap's assignment of a * drm_gem_object as the vma->vm_private_data. Since we need to
@@ -775,6 +783,9 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma) } vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); +if (i915_gem_object_is_lmem (mmo->obj)) + vma->vm_ops = &vm_ops_lmem; +return 0 ; }
drivers/gpu/drm/i915/gem/i915_gem_mman.h +1 -0
@@ -23,6 +23,7 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma);int i915_gem_dumb_mmap_offset (struct drm_file *file_priv,struct drm_device *dev,u32 handle,u64 *offset); +vm_fault_t i915_error_to_vmf_fault (int err);void __i915_gem_object_release_mmap_gtt (struct drm_i915_gem_object *obj);void i915_gem_object_release_mmap (struct drm_i915_gem_object *obj);
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 32 lines · Abdiel Janulgue
Fault handler to handle missing pages for lmem objects.
Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 43 ++++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 ++++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 15 +++++++-- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + 4 files changed, 63 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_lmem.c +8
-0@@ -6,8 +6,40 @@#include "intel_memory_region.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_mman.h" #include "i915_drv.h" +vm_fault_t vm_fault_lmem (struct vm_fault *vmf) +{ +struct vm_area_struct *area = vmf->vma; +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; +unsigned long size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ;
drivers/gpu/drm/i915/gem/i915_gem_lmem.c line 28
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +10
-0+vm_fault_t vmf_ret; +int i, ret; + +/* Sanity check that we allow writing into this object */ +if (i915_gem_object_is_readonly (obj) && write) +return VM_FAULT_SIGBUS ; + + ret =i915_gem_object_pin_pages (obj); +if (ret) +return i915_error_to_vmf_fault (ret);
Don't we need to handle -ENXIO in i915_error_to_vmf_fault?
Quoted 18 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +14
-0+ +for (i =0 ; i < size >>PAGE_SHIFT ; i++) { + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +i915_gem_object_lmem_io_pfn (obj, i)); +if (vmf_ret !=VM_FAULT_NOPAGE ) +break ; + } + +i915_gem_object_unpin_pages (obj); + +return vmf_ret; +} +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_HAS_IOMEM ,
drivers/gpu/drm/i915/gem/i915_gem_lmem.c i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj, · line 97
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +7
-0@@ -56,6 +88,17 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); } +unsigned long i915_gem_object_lmem_io_pfn (struct drm_i915_gem_object *obj, +unsigned long n) +{ +struct intel_memory_region *mem = obj->mm.region; +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n);
offset -= mem->region.start; for poor old fake local-memory.
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Matthew Auld (2019-12-05 10:20:55)
Quoted 68 lines
Quoted 32 lines · Abdiel Janulgue
Fault handler to handle missing pages for lmem objects.
Signed-off-by Abdiel Janulgue <[email protected]>Signed-off-by Matthew Auld <[email protected]>Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 43 ++++++++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 ++++ drivers/gpu/drm/i915/gem/i915_gem_mman.c | 15 +++++++-- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + 4 files changed, 63 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_lmem.c +8
-0@@ -6,8 +6,40 @@#include "intel_memory_region.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_lmem.h" +#include "gem/i915_gem_mman.h" #include "i915_drv.h" +vm_fault_t vm_fault_lmem (struct vm_fault *vmf) +{ +struct vm_area_struct *area = vmf->vma; +struct i915_mmap_offset *priv = area->vm_private_data; +struct drm_i915_gem_object *obj = priv->obj; +unsigned long size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ;drivers/gpu/drm/i915/gem/i915_gem_lmem.c line 28
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +10
-0+vm_fault_t vmf_ret; +int i, ret; + +/* Sanity check that we allow writing into this object */ +if (i915_gem_object_is_readonly (obj) && write) +return VM_FAULT_SIGBUS ; + + ret =i915_gem_object_pin_pages (obj); +if (ret) +return i915_error_to_vmf_fault (ret);Don't we need to handle
-ENXIOini915_error_to_vmf_fault?Quoted 21 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +14
-0+ +for (i =0 ; i < size >>PAGE_SHIFT ; i++) { + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +i915_gem_object_lmem_io_pfn (obj, i)); +if (vmf_ret !=VM_FAULT_NOPAGE ) +break ; + } + +i915_gem_object_unpin_pages (obj); + +return vmf_ret; +} +const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = { .flags =I915_GEM_OBJECT_HAS_IOMEM ,@@ -56,6 +88,17 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,return io_mapping_map_wc (&obj->mm.region->iomap, offset, size); }
Quoted 9 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj, · line 97
Quoted 7 lines
drivers/gpu/drm/i915/gem/i915_gem_lmem.c +7
-0+unsigned long i915_gem_object_lmem_io_pfn (struct drm_i915_gem_object *obj, +unsigned long n) +{ +struct intel_memory_region *mem = obj->mm.region; +resource_size_t offset; + + offset =i915_gem_object_get_dma_address (obj, n);offset -=
mem->region.start; for poor old fake local-memory.
And so one asks for the selftests...
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add lmem fault handler
In reply to Abdiel Janulgue== Series Details ==
== Series Details ==
Series: drm/i915: Add lmem fault handler
URL : https://patchwork.freedesktop.org/series/70485/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip f8cb5420a940 drm/i915: Add lmem fault handler -:138: WARNING:LEADING_SPACE: please, no spaces at the start of a line #138: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:691: + .fault = vm_fault_lmem,$
-:139: WARNING:LEADING_SPACE: please, no spaces at the start of a line #139: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:692:
+ .open = vm_open,$
-:140: WARNING:LEADING_SPACE: please, no spaces at the start of a line #140: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:693:
+ .close = vm_close,$
total: 0 errors, 3 warnings, 0 checks, 129 lines checked
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Add lmem fault handler
In reply to Abdiel Janulgue== Series Details ==
== Series Details ==
Series: drm/i915: Add lmem fault handler
URL : https://patchwork.freedesktop.org/series/70485/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7489 -> Patchwork_15599
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15599 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15599, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15599:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live_gem_contexts:
- fi-cfl-8700k: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
Known issues
------------
Here are the changes found in Patchwork_15599 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live_blt:
- fi-hsw-4770: [PASS][3] -> [DMESG-FAIL][4] ([i915#563])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-hsw-4770/igt@i915_selftest@live_blt.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-hsw-4770/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-hsw-peppy: [PASS][5] -> [INCOMPLETE][6] ([i915#694])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- {fi-tgl-guc}: [INCOMPLETE][7] ([fdo#111593]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-tgl-guc/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-tgl-guc/igt@[email protected]
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [DMESG-WARN][9] ([i915#592]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-skl-6770hq/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-skl-6770hq/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-byt-n2820: [DMESG-FAIL][11] ([i915#725]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-byt-n2820/igt@i915_selftest@live_blt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-byt-n2820/igt@i915_selftest@live_blt.html
#### Warnings ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-kbl-x1275: [DMESG-WARN][13] ([fdo#107139] / [i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][14] ([fdo#107139] / [i915#62] / [i915#92])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-kbl-x1275/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-kbl-x1275/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-kbl-x1275: [DMESG-WARN][15] ([i915#62] / [i915#92] / [i915#95]) -> [DMESG-WARN][16] ([i915#62] / [i915#92]) +8 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-kbl-x1275/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-kbl-x1275/igt@[email protected]
* igt@kms_flip@basic-flip-vs-modeset:
- fi-kbl-x1275: [DMESG-WARN][17] ([i915#62] / [i915#92]) -> [DMESG-WARN][18] ([i915#62] / [i915#92] / [i915#95]) +6 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7489/fi-kbl-x1275/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/fi-kbl-x1275/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
[fdo#111593]: https://bugs.freedesktop.org/show_bug.cgi?id=111593
[i915#109]: https://gitlab.freedesktop.org/drm/intel/issues/109
[i915#456]: https://gitlab.freedesktop.org/drm/intel/issues/456
[i915#472]: https://gitlab.freedesktop.org/drm/intel/issues/472
[i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
[i915#592]: https://gitlab.freedesktop.org/drm/intel/issues/592
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
[i915#710]: https://gitlab.freedesktop.org/drm/intel/issues/710
[i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
[i915#92]: https://gitlab.freedesktop.org/drm/intel/issues/92
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95
Participating hosts (53 -> 47)
------------------------------
Additional (1): fi-hsw-4770r
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7489 -> Patchwork_15599
CI-20190529: 20190529
CI_DRM_7489: 969b4daff0be9ed5dcefda656621bad5f9a06906 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5332: 59be90b3c76113d03a1bb095c4d4585e51058f4a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15599: f8cb5420a9408887d9337ce6d2c3c1cf6e285edc @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f8cb5420a940 drm/i915: Add lmem fault handler
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15599/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx