Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Hi Abdiel,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip next-20191210]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url:
https://github.com/0day-ci/linux/commits/Abdiel-Janulgue/drm-i915-Add-lmem-fault-handler/20191212-031235
base: git://anongit.freedesktop.org/drm-intel for-linux-next
If you fix the issue, kindly add following tag
Reported-by: kbuild test robot
Reported-by: Dan Carpenter
smatch warnings:
drivers/gpu/drm/i915/gem/i915_gem_lmem.c:40 vm_fault_lmem() error:
uninitialized symbol 'vmf_ret'.
#
https://github.com/0day-ci/linux/commit/527bcb241421b5b3cea4909756095ae07d6a
git remote add linux-review https://github.com/0day-ci/linux
git remote update linux-review
git checkout 527bcb241421b5b3cea4909756095ae07d6a
vim +/vmf_ret +40 drivers/gpu/drm/i915/gem/i915_gem_lmem.c
527bcb2414 Abdiel Janulgue 2019-12-11 12 vm_fault_t vm_fault_lmem(struct
vm_fault *vmf)
527bcb2414 Abdiel Janulgue 2019-12-11 13 {
527bcb2414 Abdiel Janulgue 2019-12-11 14 struct vm_area_struct *area =
vmf->vma;
527bcb2414 Abdiel Janulgue 2019-12-11 15 struct i915_mmap_offset *priv =
area->vm_private_data;
527bcb2414 Abdiel Janulgue 2019-12-11 16 struct drm_i915_gem_object *obj
= priv->obj;
527bcb2414 Abdiel Janulgue 2019-12-11 17 unsigned long size =
area->vm_end - area->vm_start;
527bcb2414 Abdiel Janulgue 2019-12-11 18 bool write = area->vm_flags &
VM_WRITE;
527bcb2414 Abdiel Janulgue 2019-12-11 19 vm_fault_t vmf_ret;
^^^
527bcb2414 Abdiel Janulgue 2019-12-11 20 int i, ret;
527bcb2414 Abdiel Janulgue 2019-12-11 21
527bcb2414 Abdiel Janulgue 2019-12-11 22 /* Sanity check that we allow
writing into this object */
527bcb2414 Abdiel Janulgue 2019-12-11 23 if
(i915_gem_object_is_readonly(obj) && write)
527bcb2414 Abdiel Janulgue 2019-12-11 24 return VM_FAULT_SIGBUS;
527bcb2414 Abdiel Janulgue 2019-12-11 25
527bcb2414 Abdiel Janulgue 2019-12-11 26 ret =
i915_gem_object_pin_pages(obj);
527bcb2414 Abdiel Janulgue 2019-12-11 27 if (ret)
527bcb2414 Abdiel Janulgue 2019-12-11 28 return
i915_error_to_vmf_fault(ret);
527bcb2414 Abdiel Janulgue 2019-12-11 29
527bcb2414 Abdiel Janulgue 2019-12-11 30 for (i = 0; i < size >>
PAGE_SHIFT; i++) {
Can size be less than a page?
527bcb2414 Abdiel Janulgue 2019-12-11 31 vmf_ret =
vmf_insert_pfn(area,
527bcb2414 Abdiel Janulgue 2019-12-11 32
(unsigned long)area->vm_start + i * PAGE_SIZE,
527bcb2414 Abdiel Janulgue 2019-12-11 33
i915_gem_object_lmem_io_pfn(obj, i));
527bcb2414 Abdiel Janulgue 2019-12-11 34 if (vmf_ret !=
VM_FAULT_NOPAGE)
527bcb2414 Abdiel Janulgue 2019-12-11 35 break;
527bcb2414 Abdiel Janulgue 2019-12-11 36 }
527bcb2414 Abdiel Janulgue 2019-12-11 37
527bcb2414 Abdiel Janulgue 2019-12-11 38
i915_gem_object_unpin_pages(obj);
527bcb2414 Abdiel Janulgue 2019-12-11 39
527bcb2414 Abdiel Janulgue 2019-12-11 @40 return vmf_ret;
527bcb2414 Abdiel Janulgue 2019-12-11 41 }
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org Intel Corporation
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
On 12/12/2019 17.19, Chris Wilson wrote:
> Quoting Matthew Auld (2019-12-12 15:11:02)
>> On Thu, 12 Dec 2019 at 14:20, Chris Wilson wrote:
>>>
>>> Quoting Abdiel Janulgue (2019-12-12 11:34:38)
Fault handler to handle missing pages for lmem objects.
v3: Add get_vm_cpu_ops, iterate over all memory regions in the
lmem selftest, use remap_io_mapping.
Signed-off-by: Abdiel Janulgue
Signed-off-by: Matthew Auld
Cc: Chris Wilson
Cc: Joonas Lahtinen
---
drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
.../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
5 files changed, 188 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 0e2bf6b7e143..bbe625935005 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -6,8 +6,36 @@
#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_iomem(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;
+ struct intel_memory_region *mem = obj->mm.region;
+ unsigned long size = area->vm_end - area->vm_start;
+ bool write = area->vm_flags & VM_WRITE;
+ int 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);
+
+ ret = remap_io_mapping(area, area->vm_start,
+ i915_gem_object_lmem_io_pfn(obj, 0), size,
+ >iomap);
>>>
>>> So this implementation only works with contiguous objects, right?
>>
>> Hmm can't we go back to what we had before, so support !contiguous also?
>
> The fun part is that you can do both :) Do a discontiguous
> remap_io_mapping() The queue part is that remap_io_mapping() avoids the
> O(N^2), and should give us O(N) instead.
So just to be clear,
if (obj->flags & I915_BO_ALLOC_CONTIGUOUS) {
remap_io_mapping(...)
} else {
for(...)
vmf_insert_pfn()
}
??
- Abdiel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Matthew Auld (2019-12-12 15:11:02)
> On Thu, 12 Dec 2019 at 14:20, Chris Wilson wrote:
> >
> > Quoting Abdiel Janulgue (2019-12-12 11:34:38)
> > > Fault handler to handle missing pages for lmem objects.
> > >
> > > v3: Add get_vm_cpu_ops, iterate over all memory regions in the
> > > lmem selftest, use remap_io_mapping.
> > >
> > > Signed-off-by: Abdiel Janulgue
> > > Signed-off-by: Matthew Auld
> > > Cc: Chris Wilson
> > > Cc: Joonas Lahtinen
> > > ---
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
> > > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> > > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
> > > drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> > > .../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
> > > 5 files changed, 188 insertions(+), 28 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > > b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > > index 0e2bf6b7e143..bbe625935005 100644
> > > --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > > @@ -6,8 +6,36 @@
> > > #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_iomem(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;
> > > + struct intel_memory_region *mem = obj->mm.region;
> > > + unsigned long size = area->vm_end - area->vm_start;
> > > + bool write = area->vm_flags & VM_WRITE;
> > > + int 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);
> > > +
> > > + ret = remap_io_mapping(area, area->vm_start,
> > > + i915_gem_object_lmem_io_pfn(obj, 0), size,
> > > + >iomap);
> >
> > So this implementation only works with contiguous objects, right?
>
> Hmm can't we go back to what we had before, so support !contiguous also?
The fun part is that you can do both :) Do a discontiguous
remap_io_mapping() The queue part is that remap_io_mapping() avoids the
O(N^2), and should give us O(N) instead.
> Also do we need to reject !(WC | UC) somewhere for local-memory?
We don't strictly need to (caveat emptor), same rules apply for
incoherent device memory, you have clflush around your access. It may
not be advised, but sometimes it is better.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
On Thu, 12 Dec 2019 at 14:20, Chris Wilson wrote:
>
> Quoting Abdiel Janulgue (2019-12-12 11:34:38)
> > Fault handler to handle missing pages for lmem objects.
> >
> > v3: Add get_vm_cpu_ops, iterate over all memory regions in the
> > lmem selftest, use remap_io_mapping.
> >
> > Signed-off-by: Abdiel Janulgue
> > Signed-off-by: Matthew Auld
> > Cc: Chris Wilson
> > Cc: Joonas Lahtinen
> > ---
> > drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
> > drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> > drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
> > drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> > .../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
> > 5 files changed, 188 insertions(+), 28 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > index 0e2bf6b7e143..bbe625935005 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > @@ -6,8 +6,36 @@
> > #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_iomem(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;
> > + struct intel_memory_region *mem = obj->mm.region;
> > + unsigned long size = area->vm_end - area->vm_start;
> > + bool write = area->vm_flags & VM_WRITE;
> > + int 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);
> > +
> > + ret = remap_io_mapping(area, area->vm_start,
> > + i915_gem_object_lmem_io_pfn(obj, 0), size,
> > + >iomap);
>
> So this implementation only works with contiguous objects, right?
Hmm can't we go back to what we had before, so support !contiguous also?
Also do we need to reject !(WC | UC) somewhere for local-memory?
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Abdiel Janulgue (2019-12-12 11:34:38)
> Fault handler to handle missing pages for lmem objects.
>
> v3: Add get_vm_cpu_ops, iterate over all memory regions in the
> lmem selftest, use remap_io_mapping.
>
> Signed-off-by: Abdiel Janulgue
> Signed-off-by: Matthew Auld
> Cc: Chris Wilson
> Cc: Joonas Lahtinen
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
> drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> .../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
> 5 files changed, 188 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 0e2bf6b7e143..bbe625935005 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -6,8 +6,36 @@
> #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_iomem(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;
> + struct intel_memory_region *mem = obj->mm.region;
> + unsigned long size = area->vm_end - area->vm_start;
> + bool write = area->vm_flags & VM_WRITE;
> + int 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);
> +
> + ret = remap_io_mapping(area, area->vm_start,
> + i915_gem_object_lmem_io_pfn(obj, 0), size,
> + >iomap);
So this implementation only works with contiguous objects, right?
if (GEM_WARN_ON(obj_noncontiguous(obj)))
return VM_FAULT_SIGBUS;
I think for future awareness.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Abdiel Janulgue (2019-12-12 11:34:38)
> Fault handler to handle missing pages for lmem objects.
>
> v3: Add get_vm_cpu_ops, iterate over all memory regions in the
> lmem selftest, use remap_io_mapping.
>
> Signed-off-by: Abdiel Janulgue
> Signed-off-by: Matthew Auld
> Cc: Chris Wilson
> Cc: Joonas Lahtinen
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
> drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> .../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
> 5 files changed, 188 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 0e2bf6b7e143..bbe625935005 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -6,8 +6,36 @@
> #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_iomem(struct vm_fault *vmf)
I would push this back to being with the vm_ops and making it static,
over choosing a more appropriate name. I think we will prefer having the
fault routines next to each other for making common future changes.
> +{
> + struct vm_area_struct *area = vmf->vma;
> + struct i915_mmap_offset *priv = area->vm_private_data;
> + struct drm_i915_gem_object *obj = priv->obj;
> + struct intel_memory_region *mem = obj->mm.region;
> + unsigned long size = area->vm_end - area->vm_start;
> + bool write = area->vm_flags & VM_WRITE;
> + int 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);
> +
> + ret = remap_io_mapping(area, area->vm_start,
> + i915_gem_object_lmem_io_pfn(obj, 0), size,
> + >iomap);
> +
> + i915_gem_object_unpin_pages(obj);
In terms of behaviour, I think this is correct. The PTE do not persist
past the lifetime of the lmem allocation so we cannot peek at other
user's data.
> +
> + return i915_error_to_vmf_fault(ret);
> +}
> +
> const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = {
> .flags = I915_GEM_OBJECT_HAS_IOMEM,
>
> @@ -56,6 +84,18 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object
> *obj,
> return io_mapping_map_wc(>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;
> +
> + return (mem->io_start + offset) >> PAGE_SHIFT;
> +}
> +
> bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
> {
> return obj->ops == _gem_lmem_obj_ops;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> index 7c176b8b7d2f..36a412ace3cf 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> @@ -7,6 +7,7 @@
> #define __I915_GEM_LMEM_H
>
> #include
> +#include
>
> 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_iomem(struct vm_fault *vmf);
> +
> struct drm_i915_gem_object *
> i915_gem_object_create_lmem(struct drm_i915_private *i915,
> resource_size_t size,
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> index 879fff8adc48..958ca2033379 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> @@ -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:
> @@
[Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Fault handler to handle missing pages for lmem objects.
v3: Add get_vm_cpu_ops, iterate over all memory regions in the
lmem selftest, use remap_io_mapping.
Signed-off-by: Abdiel Janulgue
Signed-off-by: Matthew Auld
Cc: Chris Wilson
Cc: Joonas Lahtinen
---
drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 40 +
drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 32 +++-
drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
.../drm/i915/gem/selftests/i915_gem_mman.c| 137 +++---
5 files changed, 188 insertions(+), 28 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 0e2bf6b7e143..bbe625935005 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -6,8 +6,36 @@
#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_iomem(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;
+ struct intel_memory_region *mem = obj->mm.region;
+ unsigned long size = area->vm_end - area->vm_start;
+ bool write = area->vm_flags & VM_WRITE;
+ int 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);
+
+ ret = remap_io_mapping(area, area->vm_start,
+ i915_gem_object_lmem_io_pfn(obj, 0), size,
+ >iomap);
+
+ i915_gem_object_unpin_pages(obj);
+
+ return i915_error_to_vmf_fault(ret);
+}
+
const struct drm_i915_gem_object_ops i915_gem_lmem_obj_ops = {
.flags = I915_GEM_OBJECT_HAS_IOMEM,
@@ -56,6 +84,18 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,
return io_mapping_map_wc(>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;
+
+ return (mem->io_start + offset) >> PAGE_SHIFT;
+}
+
bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
{
return obj->ops == _gem_lmem_obj_ops;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
index 7c176b8b7d2f..36a412ace3cf 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
@@ -7,6 +7,7 @@
#define __I915_GEM_LMEM_H
#include
+#include
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_iomem(struct vm_fault *vmf);
+
struct drm_i915_gem_object *
i915_gem_object_create_lmem(struct drm_i915_private *i915,
resource_size_t size,
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 879fff8adc48..958ca2033379 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -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:
@@ -216,6 +217,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+ case -ENXIO:
return VM_FAULT_OOM;
case 0:
@@ -560,7 +562,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_type_has(obj, I915_GEM_OBJECT_HAS_STRUCT_PAGE |
+ I915_GEM_OBJECT_HAS_IOMEM)) {
err = -ENODEV;
goto out;
}
@@ -694,6 +697,25 @@ static const
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Abdiel Janulgue (2019-12-11 05:59:07)
> Fault handler to handle missing pages for lmem objects.
>
> v2: Handle ENXIO in fault error, account for offset in region start
> for fake lmem (Matt).
> Add selftest (Chris).
>
> Signed-off-by: Abdiel Janulgue
> Signed-off-by: Matthew Auld
> Cc: Chris Wilson
> Cc: Joonas Lahtinen
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 44
> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 ++-
> drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> .../drm/i915/gem/selftests/i915_gem_mman.c| 105 ++
> 5 files changed, 147 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 0e2bf6b7e143..7e6d8d1546e3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -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;
> + }
So why aren't we using remap_io_mapping() ?
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Abdiel Janulgue (2019-12-11 05:59:07)
> Fault handler to handle missing pages for lmem objects.
>
> v2: Handle ENXIO in fault error, account for offset in region start
> for fake lmem (Matt).
> Add selftest (Chris).
>
> Signed-off-by: Abdiel Janulgue
> Signed-off-by: Matthew Auld
> Cc: Chris Wilson
> Cc: Joonas Lahtinen
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 44
> drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 ++-
> drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
> .../drm/i915/gem/selftests/i915_gem_mman.c| 105 ++
> 5 files changed, 147 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 0e2bf6b7e143..7e6d8d1546e3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -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,18 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object
> *obj,
> return io_mapping_map_wc(>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;
> +
> + return (mem->io_start + offset) >> PAGE_SHIFT;
> +}
> +
> bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
> {
> return obj->ops == _gem_lmem_obj_ops;
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> index 7c176b8b7d2f..917ebef1529f 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
> @@ -7,6 +7,7 @@
> #define __I915_GEM_LMEM_H
>
> #include
> +#include
>
> 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,
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> index 879fff8adc48..c67c07905df5 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> @@ -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:
> @@ -216,6 +217,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)
>
> case -ENOSPC: /* shmemfs allocation failure */
> case -ENOMEM: /* our allocation failure */
> + case
[Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Fault handler to handle missing pages for lmem objects.
v2: Handle ENXIO in fault error, account for offset in region start
for fake lmem (Matt).
Add selftest (Chris).
Signed-off-by: Abdiel Janulgue
Signed-off-by: Matthew Auld
Cc: Chris Wilson
Cc: Joonas Lahtinen
---
drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 44
drivers/gpu/drm/i915/gem/i915_gem_lmem.h | 6 +
drivers/gpu/drm/i915/gem/i915_gem_mman.c | 16 ++-
drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 +
.../drm/i915/gem/selftests/i915_gem_mman.c| 105 ++
5 files changed, 147 insertions(+), 25 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 0e2bf6b7e143..7e6d8d1546e3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -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,18 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,
return io_mapping_map_wc(>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;
+
+ return (mem->io_start + offset) >> PAGE_SHIFT;
+}
+
bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
{
return obj->ops == _gem_lmem_obj_ops;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
index 7c176b8b7d2f..917ebef1529f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
@@ -7,6 +7,7 @@
#define __I915_GEM_LMEM_H
#include
+#include
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,
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 879fff8adc48..c67c07905df5 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -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:
@@ -216,6 +217,7 @@ static vm_fault_t i915_error_to_vmf_fault(int err)
case -ENOSPC: /* shmemfs allocation failure */
case -ENOMEM: /* our allocation failure */
+ case -ENXIO:
return VM_FAULT_OOM;
case 0:
@@ -560,7 +562,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) &&
+
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Quoting Matthew Auld (2019-12-05 10:20:55)
> On Thu, 5 Dec 2019 at 10:14, Abdiel Janulgue
> wrote:
> >
> > Fault handler to handle missing pages for lmem objects.
> >
> > Signed-off-by: Abdiel Janulgue
> > Signed-off-by: Matthew Auld
> > Cc: Chris Wilson
> > Cc: Joonas Lahtinen
> > ---
> > 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(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > index 0e2bf6b7e143..78ac8d160cd7 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> > @@ -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);
>
> Don't we need to handle -ENXIO in i915_error_to_vmf_fault?
>
> > +
> > + 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(>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.
And so one asks for the selftests...
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
On Thu, 5 Dec 2019 at 10:14, Abdiel Janulgue
wrote:
>
> Fault handler to handle missing pages for lmem objects.
>
> Signed-off-by: Abdiel Janulgue
> Signed-off-by: Matthew Auld
> Cc: Chris Wilson
> Cc: Joonas Lahtinen
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 0e2bf6b7e143..78ac8d160cd7 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -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);
Don't we need to handle -ENXIO in i915_error_to_vmf_fault?
> +
> + 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(>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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
[Intel-gfx] [PATCH] drm/i915: Add lmem fault handler
Fault handler to handle missing pages for lmem objects.
Signed-off-by: Abdiel Janulgue
Signed-off-by: Matthew Auld
Cc: Chris Wilson
Cc: Joonas Lahtinen
---
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(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 0e2bf6b7e143..78ac8d160cd7 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -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(>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 == _gem_lmem_obj_ops;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
index 7c176b8b7d2f..917ebef1529f 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.h
@@ -7,6 +7,7 @@
#define __I915_GEM_LMEM_H
#include
+#include
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,
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
index 3a3f30bc8ac7..5f6451ede53d 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -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 @@
