[PATCH v4 15/15] drm/i915: Use ttm mmap handling for ttm bo's.
Thomas Hellström
thomas.hellstrom at linux.intel.com
Wed May 26 17:40:55 UTC 2021
On 5/26/21 1:32 PM, Thomas Hellström wrote:
> From: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
>
> Use the ttm handlers for servicing page faults, and vm_access.
>
> We do our own validation of read-only access, otherwise use the
> ttm handlers as much as possible.
>
> Because the ttm handlers expect the vma_node at vma->base, we slightly
> need to massage the mmap handlers to look at vma_node->driver_private
> to fetch the bo, if it's NULL, we assume i915's normal mmap_offset uapi
> is used.
>
> This is the easiest way to achieve compatibility without changing ttm's
> semantics.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_mman.c | 78 +++++++----
> drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 +-
> .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 +
> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 +-
> drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 122 +++++++++++++++++-
> .../drm/i915/gem/selftests/i915_gem_mman.c | 90 +++++++------
> drivers/gpu/drm/i915/selftests/igt_mmap.c | 25 +++-
> drivers/gpu/drm/i915/selftests/igt_mmap.h | 12 +-
> 8 files changed, 247 insertions(+), 92 deletions(-)
There are a couple of checkpatch.pl --strict warnings/checks with this
patch.
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> index fd1c9714f8d8..af04ea593091 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
> @@ -19,6 +19,7 @@
> #include "i915_gem_mman.h"
> #include "i915_trace.h"
> #include "i915_user_extensions.h"
> +#include "i915_gem_ttm.h"
> #include "i915_vma.h"
>
> static inline bool
> @@ -622,6 +623,8 @@ mmap_offset_attach(struct drm_i915_gem_object *obj,
> struct i915_mmap_offset *mmo;
> int err;
>
> + GEM_BUG_ON(obj->ops->mmap_offset || obj->ops->mmap_ops);
> +
> mmo = lookup_mmo(obj, mmap_type);
> if (mmo)
> goto out;
> @@ -664,40 +667,47 @@ mmap_offset_attach(struct drm_i915_gem_object *obj,
> }
>
> static int
> -__assign_mmap_offset(struct drm_file *file,
> - u32 handle,
> +__assign_mmap_offset(struct drm_i915_gem_object *obj,
> enum i915_mmap_type mmap_type,
> - u64 *offset)
> + u64 *offset, struct drm_file *file)
> {
> - struct drm_i915_gem_object *obj;
> struct i915_mmap_offset *mmo;
> - int err;
>
> - obj = i915_gem_object_lookup(file, handle);
> - if (!obj)
> - return -ENOENT;
> + if (i915_gem_object_never_mmap(obj))
> + return -ENODEV;
>
> - if (i915_gem_object_never_mmap(obj)) {
> - err = -ENODEV;
> - goto out;
> + if (obj->ops->mmap_offset) {
> + *offset = obj->ops->mmap_offset(obj);
> + return 0;
> }
>
> if (mmap_type != I915_MMAP_TYPE_GTT &&
> !i915_gem_object_has_struct_page(obj) &&
> - !i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_IOMEM)) {
> - err = -ENODEV;
> - goto out;
> - }
> + !i915_gem_object_type_has(obj, I915_GEM_OBJECT_HAS_IOMEM))
> + return -ENODEV;
>
> mmo = mmap_offset_attach(obj, mmap_type, file);
> - if (IS_ERR(mmo)) {
> - err = PTR_ERR(mmo);
> - goto out;
> - }
> + if (IS_ERR(mmo))
> + return PTR_ERR(mmo);
>
> *offset = drm_vma_node_offset_addr(&mmo->vma_node);
> - err = 0;
> -out:
> + return 0;
> +}
> +
> +static int
> +__assign_mmap_offset_handle(struct drm_file *file,
> + u32 handle,
> + enum i915_mmap_type mmap_type,
> + u64 *offset)
> +{
> + struct drm_i915_gem_object *obj;
> + int err;
> +
> + obj = i915_gem_object_lookup(file, handle);
> + if (!obj)
> + return -ENOENT;
> +
> + err = __assign_mmap_offset(obj, mmap_type, offset, file);
> i915_gem_object_put(obj);
> return err;
> }
> @@ -717,7 +727,7 @@ i915_gem_dumb_mmap_offset(struct drm_file *file,
> else
> mmap_type = I915_MMAP_TYPE_GTT;
>
> - return __assign_mmap_offset(file, handle, mmap_type, offset);
> + return __assign_mmap_offset_handle(file, handle, mmap_type, offset);
> }
>
> /**
> @@ -785,7 +795,7 @@ i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data,
> return -EINVAL;
> }
>
> - return __assign_mmap_offset(file, args->handle, type, &args->offset);
> + return __assign_mmap_offset_handle(file, args->handle, type, &args->offset);
> }
>
> static void vm_open(struct vm_area_struct *vma)
> @@ -889,8 +899,16 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> * destroyed and will be invalid when the vma manager lock
> * is released.
> */
> - mmo = container_of(node, struct i915_mmap_offset, vma_node);
> - obj = i915_gem_object_get_rcu(mmo->obj);
> + if (!node->driver_private) {
> + mmo = container_of(node, struct i915_mmap_offset, vma_node);
> + obj = i915_gem_object_get_rcu(mmo->obj);
> +
> + GEM_BUG_ON(obj && obj->ops->mmap_ops);
> + } else {
> + obj = i915_gem_object_get_rcu(container_of(node, struct drm_i915_gem_object, base.vma_node));
> +
> + GEM_BUG_ON(obj && !obj->ops->mmap_ops);
> + }
> }
> drm_vma_offset_unlock_lookup(dev->vma_offset_manager);
> rcu_read_unlock();
> @@ -912,7 +930,6 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> }
>
> vma->vm_flags |= VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP;
> - vma->vm_private_data = mmo;
>
> /*
> * We keep the ref on mmo->obj, not vm_file, but we require
> @@ -926,6 +943,15 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma)
> /* Drop the initial creation reference, the vma is now holding one. */
> fput(anon);
>
> + if (obj->ops->mmap_ops) {
> + vma->vm_page_prot = pgprot_decrypted(vm_get_page_prot(vma->vm_flags));
> + vma->vm_ops = obj->ops->mmap_ops;
> + vma->vm_private_data = node->driver_private;
> + return 0;
> + }
> +
> + vma->vm_private_data = mmo;
> +
> switch (mmo->mmap_type) {
> case I915_MMAP_TYPE_WC:
> vma->vm_page_prot =
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index a3ad8cf4eefd..ff59e6c640e6 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -342,14 +342,14 @@ struct scatterlist *
> __i915_gem_object_get_sg(struct drm_i915_gem_object *obj,
> struct i915_gem_object_page_iter *iter,
> unsigned int n,
> - unsigned int *offset, bool allow_alloc);
> + unsigned int *offset, bool allow_alloc, bool dma);
>
> static inline struct scatterlist *
> i915_gem_object_get_sg(struct drm_i915_gem_object *obj,
> unsigned int n,
> unsigned int *offset, bool allow_alloc)
> {
> - return __i915_gem_object_get_sg(obj, &obj->mm.get_page, n, offset, allow_alloc);
> + return __i915_gem_object_get_sg(obj, &obj->mm.get_page, n, offset, allow_alloc, false);
> }
>
> static inline struct scatterlist *
> @@ -357,7 +357,7 @@ i915_gem_object_get_sg_dma(struct drm_i915_gem_object *obj,
> unsigned int n,
> unsigned int *offset, bool allow_alloc)
> {
> - return __i915_gem_object_get_sg(obj, &obj->mm.get_dma_page, n, offset, allow_alloc);
> + return __i915_gem_object_get_sg(obj, &obj->mm.get_dma_page, n, offset, allow_alloc, true);
> }
>
> struct page *
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
> index 68313474e6a6..2a23b77424b3 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h
> @@ -61,6 +61,7 @@ struct drm_i915_gem_object_ops {
> const struct drm_i915_gem_pread *arg);
> int (*pwrite)(struct drm_i915_gem_object *obj,
> const struct drm_i915_gem_pwrite *arg);
> + u64 (*mmap_offset)(struct drm_i915_gem_object *obj);
>
> int (*dmabuf_export)(struct drm_i915_gem_object *obj);
>
> @@ -79,6 +80,7 @@ struct drm_i915_gem_object_ops {
> void (*delayed_free)(struct drm_i915_gem_object *obj);
> void (*release)(struct drm_i915_gem_object *obj);
>
> + const struct vm_operations_struct *mmap_ops;
> const char *name; /* friendly name for debug, e.g. lockdep classes */
> };
>
> @@ -328,6 +330,7 @@ struct drm_i915_gem_object {
>
> struct {
> struct sg_table *cached_io_st;
> + struct i915_gem_object_page_iter get_io_page;
> bool created:1;
> } ttm;
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> index 6444e097016d..086005c1c7ea 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> @@ -467,9 +467,8 @@ __i915_gem_object_get_sg(struct drm_i915_gem_object *obj,
> struct i915_gem_object_page_iter *iter,
> unsigned int n,
> unsigned int *offset,
> - bool allow_alloc)
> + bool allow_alloc, bool dma)
> {
> - const bool dma = iter == &obj->mm.get_dma_page;
> struct scatterlist *sg;
> unsigned int idx, count;
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> index 17598930a99e..d0be957326e0 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
> @@ -13,6 +13,7 @@
> #include "gem/i915_gem_object.h"
> #include "gem/i915_gem_region.h"
> #include "gem/i915_gem_ttm.h"
> +#include "gem/i915_gem_mman.h"
>
> #define I915_PL_LMEM0 TTM_PL_PRIV
> #define I915_PL_SYSTEM TTM_PL_SYSTEM
> @@ -158,11 +159,20 @@ static int i915_ttm_move_notify(struct ttm_buffer_object *bo)
>
> static void i915_ttm_free_cached_io_st(struct drm_i915_gem_object *obj)
> {
> - if (obj->ttm.cached_io_st) {
> - sg_free_table(obj->ttm.cached_io_st);
> - kfree(obj->ttm.cached_io_st);
> - obj->ttm.cached_io_st = NULL;
> - }
> + struct radix_tree_iter iter;
> + void __rcu **slot;
> +
> + if (!obj->ttm.cached_io_st)
> + return;
> +
> + rcu_read_lock();
> + radix_tree_for_each_slot(slot, &obj->ttm.get_io_page.radix, &iter, 0)
> + radix_tree_delete(&obj->ttm.get_io_page.radix, iter.index);
> + rcu_read_unlock();
> +
> + sg_free_table(obj->ttm.cached_io_st);
> + kfree(obj->ttm.cached_io_st);
> + obj->ttm.cached_io_st = NULL;
> }
>
> static void i915_ttm_purge(struct drm_i915_gem_object *obj)
> @@ -338,12 +348,42 @@ static int i915_ttm_move(struct ttm_buffer_object *bo, bool evict,
> ttm_bo_move_sync_cleanup(bo, dst_mem);
> i915_ttm_free_cached_io_st(obj);
>
> - if (!dst_man->use_tt)
> + if (!dst_man->use_tt) {
> obj->ttm.cached_io_st = dst_st;
> + obj->ttm.get_io_page.sg_pos = dst_st->sgl;
> + obj->ttm.get_io_page.sg_idx = 0;
> + }
>
> return 0;
> }
>
> +static int i915_ttm_io_mem_reserve(struct ttm_device *bdev, struct ttm_resource *mem)
> +{
> + if (mem->mem_type < I915_PL_LMEM0)
> + return 0;
> +
> + /* We may need to revisit this later, but this allows all caching to be used in mmap */
> + mem->bus.caching = ttm_cached;
Since we're now using the TTM bo offsets, we might as well just make
this ttm_write_combined now.
> + mem->bus.is_iomem = true;
> +
> + return 0;
> +}
> +
> +static unsigned long i915_ttm_io_mem_pfn(struct ttm_buffer_object *bo,
> + unsigned long page_offset)
> +{
> + struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo);
> + unsigned long base = obj->mm.region->iomap.base - obj->mm.region->region.start;
> + struct scatterlist *sg;
> + unsigned int ofs;
> +
> + GEM_WARN_ON(bo->ttm);
> +
> + sg = __i915_gem_object_get_sg(obj, &obj->ttm.get_io_page, page_offset, &ofs, true, true);
> +
> + return ((base + sg_dma_address(sg)) >> PAGE_SHIFT) + ofs;
> +}
> +
> static struct ttm_device_funcs i915_ttm_bo_driver = {
> .ttm_tt_create = i915_ttm_tt_create,
> .ttm_tt_unpopulate = i915_ttm_tt_unpopulate,
> @@ -354,6 +394,8 @@ static struct ttm_device_funcs i915_ttm_bo_driver = {
> .verify_access = NULL,
> .swap_notify = i915_ttm_swap_notify,
> .delete_mem_notify = i915_ttm_delete_mem_notify,
> + .io_mem_reserve = i915_ttm_io_mem_reserve,
> + .io_mem_pfn = i915_ttm_io_mem_pfn,
> };
>
> /**
> @@ -461,7 +503,68 @@ static void i915_ttm_delayed_free(struct drm_i915_gem_object *obj)
> }
> }
>
> -static const struct drm_i915_gem_object_ops i915_gem_ttm_obj_ops = {
> +static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
> +{
> + struct vm_area_struct *area = vmf->vma;
> + struct drm_i915_gem_object *obj =
> + i915_ttm_to_gem(area->vm_private_data);
> +
> + /* Sanity check that we allow writing into this object */
> + if (unlikely(i915_gem_object_is_readonly(obj) &&
> + area->vm_flags & VM_WRITE))
> + return VM_FAULT_SIGBUS;
> +
> + return ttm_bo_vm_fault(vmf);
> +}
> +
> +static int
> +vm_access_ttm(struct vm_area_struct *area, unsigned long addr,
> + void *buf, int len, int write)
> +{
> + struct drm_i915_gem_object *obj =
> + i915_ttm_to_gem(area->vm_private_data);
> +
> + if (i915_gem_object_is_readonly(obj) && write)
> + return -EACCES;
> +
> + return ttm_bo_vm_access(area, addr, buf, len, write);
> +}
> +
> +static void ttm_vm_open(struct vm_area_struct *vma)
> +{
> + struct drm_i915_gem_object *obj =
> + i915_ttm_to_gem(vma->vm_private_data);
> +
> + GEM_BUG_ON(!obj);
> + i915_gem_object_get(obj);
> +}
> +
> +static void ttm_vm_close(struct vm_area_struct *vma)
> +{
> + struct drm_i915_gem_object *obj =
> + i915_ttm_to_gem(vma->vm_private_data);
> +
> + GEM_BUG_ON(!obj);
> + i915_gem_object_put(obj);
> +}
> +
> +
> +static const struct vm_operations_struct vm_ops_ttm = {
> + .fault = vm_fault_ttm,
> + .access = vm_access_ttm,
> + .open = ttm_vm_open,
> + .close = ttm_vm_close,
> +};
> +
> +static u64 i915_ttm_mmap_offset(struct drm_i915_gem_object *obj)
> +{
> + /* The ttm_bo must be allocated with I915_BO_ALLOC_USER */
> + GEM_BUG_ON(!drm_mm_node_allocated(&obj->base.vma_node.vm_node));
> +
> + return drm_vma_node_offset_addr(&obj->base.vma_node);
> +}
> +
> +const struct drm_i915_gem_object_ops i915_gem_ttm_obj_ops = {
> .name = "i915_gem_object_ttm",
> .flags = I915_GEM_OBJECT_HAS_IOMEM,
>
> @@ -470,6 +573,8 @@ static const struct drm_i915_gem_object_ops i915_gem_ttm_obj_ops = {
> .truncate = i915_ttm_purge,
> .adjust_lru = i915_ttm_adjust_lru,
> .delayed_free = i915_ttm_delayed_free,
> + .mmap_offset = i915_ttm_mmap_offset,
> + .mmap_ops = &vm_ops_ttm,
> };
>
> void i915_ttm_bo_destroy(struct ttm_buffer_object *bo)
Put a mutex_destroy(&obj->ttm.get_io_page.lock) here?
> @@ -518,6 +623,8 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem,
> i915_gem_object_make_unshrinkable(obj);
> obj->read_domains = I915_GEM_DOMAIN_WC | I915_GEM_DOMAIN_GTT;
> i915_gem_object_set_cache_coherency(obj, I915_CACHE_NONE);
> + INIT_RADIX_TREE(&obj->ttm.get_io_page.radix, GFP_KERNEL | __GFP_NOWARN);
> + mutex_init(&obj->ttm.get_io_page.lock);
>
> bo_type = (obj->flags & I915_BO_ALLOC_USER) ? ttm_bo_type_device :
> ttm_bo_type_kernel;
> @@ -529,6 +636,7 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem,
> * Similarly, in delayed_destroy, we can't call ttm_bo_put()
> * until successful initialization.
> */
> + obj->base.vma_node.driver_private = i915_gem_to_ttm(obj);
> ret = ttm_bo_init(&i915->bdev, i915_gem_to_ttm(obj), size,
> bo_type, &i915_sys_placement, alignment,
> true, NULL, NULL, i915_ttm_bo_destroy);
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> index 05a3b29f545e..ca69a29b7f2a 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -578,16 +578,17 @@ static bool assert_mmap_offset(struct drm_i915_private *i915,
> int expected)
> {
> struct drm_i915_gem_object *obj;
> - struct i915_mmap_offset *mmo;
> + u64 offset;
> + int ret;
>
> obj = i915_gem_object_create_internal(i915, size);
> if (IS_ERR(obj))
> - return false;
> + return expected && expected == PTR_ERR(obj);
>
> - mmo = mmap_offset_attach(obj, I915_MMAP_OFFSET_GTT, NULL);
> + ret = __assign_mmap_offset(obj, I915_MMAP_TYPE_GTT, &offset, NULL);
> i915_gem_object_put(obj);
>
> - return PTR_ERR_OR_ZERO(mmo) == expected;
> + return ret == expected;
> }
>
> static void disable_retire_worker(struct drm_i915_private *i915)
> @@ -622,8 +623,8 @@ static int igt_mmap_offset_exhaustion(void *arg)
> struct drm_mm *mm = &i915->drm.vma_offset_manager->vm_addr_space_mm;
> struct drm_i915_gem_object *obj;
> struct drm_mm_node *hole, *next;
> - struct i915_mmap_offset *mmo;
> int loop, err = 0;
> + u64 offset;
>
> /* Disable background reaper */
> disable_retire_worker(i915);
> @@ -684,13 +685,13 @@ static int igt_mmap_offset_exhaustion(void *arg)
> obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
> if (IS_ERR(obj)) {
> err = PTR_ERR(obj);
> + pr_err("Unable to create object for reclaimed hole\n");
> goto out;
> }
>
> - mmo = mmap_offset_attach(obj, I915_MMAP_OFFSET_GTT, NULL);
> - if (IS_ERR(mmo)) {
> + err = __assign_mmap_offset(obj, I915_MMAP_TYPE_GTT, &offset, NULL);
> + if (err) {
> pr_err("Unable to insert object into reclaimed hole\n");
> - err = PTR_ERR(mmo);
> goto err_obj;
> }
>
> @@ -865,10 +866,10 @@ static int __igt_mmap(struct drm_i915_private *i915,
> struct drm_i915_gem_object *obj,
> enum i915_mmap_type type)
> {
> - struct i915_mmap_offset *mmo;
> struct vm_area_struct *area;
> unsigned long addr;
> int err, i;
> + u64 offset;
>
> if (!can_mmap(obj, type))
> return 0;
> @@ -879,11 +880,11 @@ static int __igt_mmap(struct drm_i915_private *i915,
> if (err)
> return err;
>
> - mmo = mmap_offset_attach(obj, type, NULL);
> - if (IS_ERR(mmo))
> - return PTR_ERR(mmo);
> + err = __assign_mmap_offset(obj, type, &offset, NULL);
> + if (err)
> + return err;
>
> - addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
> + addr = igt_mmap_offset(i915, offset, obj->base.size, PROT_WRITE, MAP_SHARED);
> if (IS_ERR_VALUE(addr))
> return addr;
>
> @@ -897,13 +898,6 @@ static int __igt_mmap(struct drm_i915_private *i915,
> goto out_unmap;
> }
>
> - if (area->vm_private_data != mmo) {
> - pr_err("%s: vm_area_struct did not point back to our mmap_offset object!\n",
> - obj->mm.region->name);
> - err = -EINVAL;
> - goto out_unmap;
> - }
> -
> for (i = 0; i < obj->base.size / sizeof(u32); i++) {
> u32 __user *ux = u64_to_user_ptr((u64)(addr + i * sizeof(*ux)));
> u32 x;
> @@ -961,7 +955,7 @@ static int igt_mmap(void *arg)
> struct drm_i915_gem_object *obj;
> int err;
>
> - obj = i915_gem_object_create_region(mr, sizes[i], 0);
> + obj = i915_gem_object_create_region(mr, sizes[i], I915_BO_ALLOC_USER);
> if (obj == ERR_PTR(-ENODEV))
> continue;
>
> @@ -1004,12 +998,12 @@ static int __igt_mmap_access(struct drm_i915_private *i915,
> struct drm_i915_gem_object *obj,
> enum i915_mmap_type type)
> {
> - struct i915_mmap_offset *mmo;
> unsigned long __user *ptr;
> unsigned long A, B;
> unsigned long x, y;
> unsigned long addr;
> int err;
> + u64 offset;
>
> memset(&A, 0xAA, sizeof(A));
> memset(&B, 0xBB, sizeof(B));
> @@ -1017,11 +1011,11 @@ static int __igt_mmap_access(struct drm_i915_private *i915,
> if (!can_mmap(obj, type) || !can_access(obj))
> return 0;
>
> - mmo = mmap_offset_attach(obj, type, NULL);
> - if (IS_ERR(mmo))
> - return PTR_ERR(mmo);
> + err = __assign_mmap_offset(obj, type, &offset, NULL);
> + if (err)
> + return err;
>
> - addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
> + addr = igt_mmap_offset(i915, offset, obj->base.size, PROT_WRITE, MAP_SHARED);
> if (IS_ERR_VALUE(addr))
> return addr;
> ptr = (unsigned long __user *)addr;
> @@ -1081,7 +1075,7 @@ static int igt_mmap_access(void *arg)
> struct drm_i915_gem_object *obj;
> int err;
>
> - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0);
> + obj = i915_gem_object_create_region(mr, PAGE_SIZE, I915_BO_ALLOC_USER);
> if (obj == ERR_PTR(-ENODEV))
> continue;
>
> @@ -1111,11 +1105,11 @@ static int __igt_mmap_gpu(struct drm_i915_private *i915,
> enum i915_mmap_type type)
> {
> struct intel_engine_cs *engine;
> - struct i915_mmap_offset *mmo;
> unsigned long addr;
> u32 __user *ux;
> u32 bbe;
> int err;
> + u64 offset;
>
> /*
> * Verify that the mmap access into the backing store aligns with
> @@ -1132,11 +1126,11 @@ static int __igt_mmap_gpu(struct drm_i915_private *i915,
> if (err)
> return err;
>
> - mmo = mmap_offset_attach(obj, type, NULL);
> - if (IS_ERR(mmo))
> - return PTR_ERR(mmo);
> + err = __assign_mmap_offset(obj, type, &offset, NULL);
> + if (err)
> + return err;
>
> - addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
> + addr = igt_mmap_offset(i915, offset, obj->base.size, PROT_WRITE, MAP_SHARED);
> if (IS_ERR_VALUE(addr))
> return addr;
>
> @@ -1226,7 +1220,7 @@ static int igt_mmap_gpu(void *arg)
> struct drm_i915_gem_object *obj;
> int err;
>
> - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0);
> + obj = i915_gem_object_create_region(mr, PAGE_SIZE, I915_BO_ALLOC_USER);
> if (obj == ERR_PTR(-ENODEV))
> continue;
>
> @@ -1303,18 +1297,18 @@ static int __igt_mmap_revoke(struct drm_i915_private *i915,
> struct drm_i915_gem_object *obj,
> enum i915_mmap_type type)
> {
> - struct i915_mmap_offset *mmo;
> unsigned long addr;
> int err;
> + u64 offset;
>
> if (!can_mmap(obj, type))
> return 0;
>
> - mmo = mmap_offset_attach(obj, type, NULL);
> - if (IS_ERR(mmo))
> - return PTR_ERR(mmo);
> + err = __assign_mmap_offset(obj, type, &offset, NULL);
> + if (err)
> + return err;
>
> - addr = igt_mmap_node(i915, &mmo->vma_node, 0, PROT_WRITE, MAP_SHARED);
> + addr = igt_mmap_offset(i915, offset, obj->base.size, PROT_WRITE, MAP_SHARED);
> if (IS_ERR_VALUE(addr))
> return addr;
>
> @@ -1350,10 +1344,20 @@ static int __igt_mmap_revoke(struct drm_i915_private *i915,
> }
> }
>
> - err = check_absent(addr, obj->base.size);
> - if (err) {
> - pr_err("%s: was not absent\n", obj->mm.region->name);
> - goto out_unmap;
> + if (!obj->ops->mmap_ops) {
> + err = check_absent(addr, obj->base.size);
> + if (err) {
> + pr_err("%s: was not absent\n", obj->mm.region->name);
> + goto out_unmap;
> + }
> + } else {
> + /* ttm allows access to evicted regions by design */
> +
> + err = check_present(addr, obj->base.size);
> + if (err) {
> + pr_err("%s: was not present\n", obj->mm.region->name);
> + goto out_unmap;
> + }
> }
>
> out_unmap:
> @@ -1371,7 +1375,7 @@ static int igt_mmap_revoke(void *arg)
> struct drm_i915_gem_object *obj;
> int err;
>
> - obj = i915_gem_object_create_region(mr, PAGE_SIZE, 0);
> + obj = i915_gem_object_create_region(mr, PAGE_SIZE, I915_BO_ALLOC_USER);
> if (obj == ERR_PTR(-ENODEV))
> continue;
>
> diff --git a/drivers/gpu/drm/i915/selftests/igt_mmap.c b/drivers/gpu/drm/i915/selftests/igt_mmap.c
> index 583a4ff8b8c9..e8286c28de91 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_mmap.c
> +++ b/drivers/gpu/drm/i915/selftests/igt_mmap.c
> @@ -9,15 +9,28 @@
> #include "i915_drv.h"
> #include "igt_mmap.h"
>
> -unsigned long igt_mmap_node(struct drm_i915_private *i915,
> - struct drm_vma_offset_node *node,
> - unsigned long addr,
> - unsigned long prot,
> - unsigned long flags)
> +unsigned long igt_mmap_offset(struct drm_i915_private *i915,
> + u64 offset,
> + unsigned long size,
> + unsigned long prot,
> + unsigned long flags)
> {
> + struct drm_vma_offset_node *node;
> struct file *file;
> + unsigned long addr;
> int err;
>
> + /* no need to refcount, we own this object */
> + drm_vma_offset_lock_lookup(i915->drm.vma_offset_manager);
> + node = drm_vma_offset_exact_lookup_locked(i915->drm.vma_offset_manager,
> + offset / PAGE_SIZE, size / PAGE_SIZE);
> + drm_vma_offset_unlock_lookup(i915->drm.vma_offset_manager);
> +
> + if (GEM_WARN_ON(!node)) {
> + pr_info("Failed to lookup %Lx\n", offset);
Checkpatch warning here iirc.
> + return -ENOENT;
> + }
> +
> /* Pretend to open("/dev/dri/card0") */
> file = mock_drm_getfile(i915->drm.primary, O_RDWR);
> if (IS_ERR(file))
> @@ -29,7 +42,7 @@ unsigned long igt_mmap_node(struct drm_i915_private *i915,
> goto out_file;
> }
>
> - addr = vm_mmap(file, addr, drm_vma_node_size(node) << PAGE_SHIFT,
> + addr = vm_mmap(file, 0, drm_vma_node_size(node) << PAGE_SHIFT,
> prot, flags, drm_vma_node_offset_addr(node));
>
> drm_vma_node_revoke(node, file->private_data);
> diff --git a/drivers/gpu/drm/i915/selftests/igt_mmap.h b/drivers/gpu/drm/i915/selftests/igt_mmap.h
> index 6e716cb59d7e..acbe34d81a6d 100644
> --- a/drivers/gpu/drm/i915/selftests/igt_mmap.h
> +++ b/drivers/gpu/drm/i915/selftests/igt_mmap.h
> @@ -7,13 +7,15 @@
> #ifndef IGT_MMAP_H
> #define IGT_MMAP_H
>
> +#include <linux/types.h>
> +
> struct drm_i915_private;
> struct drm_vma_offset_node;
>
> -unsigned long igt_mmap_node(struct drm_i915_private *i915,
> - struct drm_vma_offset_node *node,
> - unsigned long addr,
> - unsigned long prot,
> - unsigned long flags);
> +unsigned long igt_mmap_offset(struct drm_i915_private *i915,
> + u64 offset,
> + unsigned long size,
> + unsigned long prot,
> + unsigned long flags);
>
> #endif /* IGT_MMAP_H */
/Thomas
More information about the dri-devel
mailing list