drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
Subsystems (3)
PATCH 1/4 drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
Have i915 replace the core drm_gem_mmap implementation to overcome its limitation in having only a single mmap offset node per gem object. This change allows us to have multiple mmap offsets per object and enables a mmapping instance to use unique fault-handlers per user vma.
This allows i915 to store extra data within vma->vm_private_data and assign the pagefault ops for each mmap instance allowing objects to use multiple fault handlers depending on its backing storage.
v2:
- Fix race condition exposed by gem_mmap_gtt@close-race. Simplify lifetime management of the mmap offset objects be ensuring it is owned by the parent gem object instead of refcounting.
- Track mmo used by fencing to Avoid locking when revoking mmaps during GPU reset.
- Rebase.
v3:
- Simplify mmo tracking
v4:
- use vma->mmo in __i915_gem_object_release_mmap_gtt
v5:
- Revoke CPU mmaps on i915_gem_object_unbind() since unlike GTT mmaps, they don't have bound i915_vmas objects. Rebase.
v6: Minor tweaks, header re-org (Chris)
--- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 3 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 243 +++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 28 ++ drivers/gpu/drm/i915/gem/i915_gem_object.c | 14 + drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 19 ++ drivers/gpu/drm/i915/gem/i915_gem_pages.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + .../drm/i915/gem/selftests/i915_gem_mman.c | 21 +- drivers/gpu/drm/i915/gt/intel_reset.c | 7 +- drivers/gpu/drm/i915/i915_drv.c | 10 +- drivers/gpu/drm/i915/i915_drv.h | 3 - drivers/gpu/drm/i915/i915_gem.c | 3 +- drivers/gpu/drm/i915/i915_getparam.c | 1 + drivers/gpu/drm/i915/i915_vma.c | 3 +- drivers/gpu/drm/i915/i915_vma.h | 3 + 16 files changed, 313 insertions(+), 56 deletions(-) create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_mman.h
drivers/gpu/drm/i915/gem/i915_gem_domain.c +2 -1
@@ -13,6 +13,7 @@#include "i915_gem_object.h" #include "i915_vma.h" #include "i915_gem_lmem.h" +#include "i915_gem_mman.h" static void __i915_gem_object_flush_for_display (struct drm_i915_gem_object *obj) {
@@ -255,7 +256,7 @@ int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, }if (obj->userfault_count) -__i915_gem_object_release_mmap (obj); +__i915_gem_object_release_mmap_gtt (obj);/* * As we no longer need a fence for GTT access,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +210 -33
327 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_mman.h new file +28 -0
@@ -0,0 +1,28 @@ +/* +* SPDX-License-Identifier: MIT +* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __I915_GEM_MMAN_H__ +#define __I915_GEM_MMAN_H__ + +#include <linux/mm_types.h> +#include <linux/types.h> + +struct drm_device ; +struct drm_file ; +struct drm_i915_gem_object ; +struct file ; +struct i915_mmap_offset ; +struct mutex ; + +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma); +vm_fault_t i915_gem_fault (struct vm_fault *vmf); +void i915_mmap_offset_destroy (struct i915_mmap_offset *mmo,struct mutex *mutex); + +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); +void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj); + +#endif
drivers/gpu/drm/i915/gem/i915_gem_object.c +14 -0
@@ -29,6 +29,7 @@#include "i915_drv.h" #include "i915_gem_clflush.h" #include "i915_gem_context.h" +#include "i915_gem_mman.h" #include "i915_gem_object.h" #include "i915_globals.h" #include "i915_trace.h"
@@ -61,6 +62,9 @@ void i915_gem_object_init(struct drm_i915_gem_object *obj,INIT_LIST_HEAD (&obj->lut_list); +mutex_init (&obj->mmo_lock); +INIT_LIST_HEAD (&obj->mmap_offsets); +init_rcu_head (&obj->rcu); obj->ops = ops;
@@ -158,6 +162,8 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915, wakeref =intel_runtime_pm_get (&i915->runtime_pm);llist_for_each_entry_safe (obj, on, freed, freed) { +struct i915_mmap_offset *mmo, *mn; +trace_i915_gem_object_destroy (obj);if (!list_empty (&obj->vma.list)) {
@@ -183,6 +189,14 @@ static void __i915_gem_free_objects(struct drm_i915_private *i915,spin_unlock (&obj->vma.lock); } +i915_gem_object_release_mmap (obj); + +list_for_each_entry_safe (mmo, mn, &obj->mmap_offsets, offset) { + mmo->obj =NULL ; +i915_mmap_offset_destroy (mmo, &obj->mmo_lock); + } + +GEM_BUG_ON (!list_empty (&obj->mmap_offsets));GEM_BUG_ON (atomic_read (&obj->bind_count));GEM_BUG_ON (obj->userfault_count);GEM_BUG_ON (!list_empty (&obj->lut_list));
drivers/gpu/drm/i915/gem/i915_gem_object.h +2 -5
@@ -132,13 +132,13 @@ void i915_gem_object_unlock_fence(struct drm_i915_gem_object *obj,static inline void i915_gem_object_set_readonly (struct drm_i915_gem_object *obj) { - obj->base.vma_node.readonly = true; + obj->readonly = true; }static inline bool i915_gem_object_is_readonly (const struct drm_i915_gem_object *obj) { -return obj->base.vma_node.readonly; +return obj->readonly; } static inline bool
@@ -387,9 +387,6 @@ static inline void i915_gem_object_unpin_map(struct drm_i915_gem_object *obj)i915_gem_object_unpin_pages (obj); } -void __i915_gem_object_release_mmap (struct drm_i915_gem_object *obj); -void i915_gem_object_release_mmap (struct drm_i915_gem_object *obj); -void i915_gem_object_flush_write_domain (struct drm_i915_gem_object *obj,unsigned int flush_domains);
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +19 -0
@@ -63,6 +63,20 @@ struct drm_i915_gem_object_ops {void (*release)(struct drm_i915_gem_object *obj); }; +enum i915_mmap_type { +I915_MMAP_TYPE_GTT =0 , +}; + +struct i915_mmap_offset { +struct drm_device *dev; +struct drm_vma_offset_node vma_node; +struct drm_i915_gem_object *obj; +struct drm_file *file; +enum i915_mmap_type mmap_type; + +struct list_head offset; +}; +struct drm_i915_gem_object {struct drm_gem_object base;
@@ -118,6 +132,11 @@ struct drm_i915_gem_object {unsigned int userfault_count;struct list_head userfault_link; +/* Protects access to mmap offsets */ +struct mutex mmo_lock; +struct list_head mmap_offsets; + bool readonly:1; + I915_SELFTEST_DECLARE(struct list_head st_link);unsigned long flags;
drivers/gpu/drm/i915/gem/i915_gem_pages.c +3 -0
@@ -8,6 +8,7 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" #include "i915_gem_lmem.h" +#include "i915_gem_mman.h" void __i915_gem_object_set_pages(struct drm_i915_gem_object *obj, struct sg_table *pages,
@@ -207,6 +208,8 @@ int __i915_gem_object_put_pages(struct drm_i915_gem_object *obj) goto unlock; } +i915_gem_object_release_mmap_offset (obj); +/* * ->put_pages might need to allocate memory for the bit17 swizzle * array, hence protect them from being reaped by removing them from gtt
drivers/gpu/drm/i915/gem/i915_gem_tiling.c +1 -0
@@ -11,6 +11,7 @@#include "i915_drv.h" #include "i915_gem.h" #include "i915_gem_ioctls.h" +#include "i915_gem_mman.h" #include "i915_gem_object.h" /**
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +19 -2
@@ -564,15 +564,20 @@ static bool assert_mmap_offset(struct drm_i915_private *i915, int expected) {struct drm_i915_gem_object *obj; +/* Ownership transferred to parent gem object in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );int err; obj =i915_gem_object_create_internal (i915, size);if (IS_ERR (obj))return PTR_ERR (obj); - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo); +if (err) +kfree (mmo);i915_gem_object_put (obj); +return err == expected; }
@@ -608,6 +613,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; +/* Ownership transferred to parent gem object in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );int loop, err;/* Disable background reaper */
@@ -672,9 +679,10 @@ static int igt_mmap_offset_exhaustion(void *arg) goto out; } - err =create_mmap_offset (obj); + err =create_mmap_offset (obj, mmo);if (err) {pr_err ("Unable to insert object into reclaimed hole\n" ); +kfree (mmo); goto err_obj; }
@@ -919,6 +927,15 @@ static int igt_mmap_gtt_revoke(void *arg) }GEM_BUG_ON (atomic_read (&obj->bind_count)); +if (type !=I915_MMAP_TYPE_GTT ) { +__i915_gem_object_put_pages (obj); +if (i915_gem_object_has_pages (obj)) { +pr_err ("Failed to put-pages object!\n" ); + err = -EINVAL ; + goto out_unmap; + } + } + err =check_absent (addr, obj->base.size);if (err) goto out_unmap;
drivers/gpu/drm/i915/gt/intel_reset.c +6 -1
@@ -678,8 +678,13 @@ static void revoke_mmaps(struct intel_gt *gt)continue ;GEM_BUG_ON (vma->fence != >->ggtt->fence_regs[i]); - node = &vma->obj->base.vma_node; + +if (!vma->mmo) +continue ; + + node = &vma->mmo->vma_node; vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; + unmap_mapping_range(gt->i915->drm.anon_inode->i_mapping, drm_vma_node_offset_addr(node) + vma_offset, vma->size,
drivers/gpu/drm/i915/i915_drv.c +1 -9
@@ -2662,18 +2662,12 @@ const struct dev_pm_ops i915_pm_ops = { .runtime_resume = intel_runtime_resume, }; -static const struct vm_operations_struct i915_gem_vm_ops = { - .fault = i915_gem_fault, - .open = drm_gem_vm_open, - .close = drm_gem_vm_close, -}; -static const struct file_operations i915_driver_fops = { .owner =THIS_MODULE , .open = drm_open, .release = drm_release, .unlocked_ioctl = drm_ioctl, - .mmap = drm_gem_mmap, + .mmap = i915_gem_mmap, .poll = drm_poll, .read = drm_read, .compat_ioctl = i915_compat_ioctl,
@@ -2762,7 +2756,6 @@ static struct drm_driver driver = { .gem_close_object = i915_gem_close_object, .gem_free_object_unlocked = i915_gem_free_object, - .gem_vm_ops = &i915_gem_vm_ops, .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
@@ -2773,7 +2766,6 @@ static struct drm_driver driver = { .get_scanout_position = i915_get_crtc_scanoutpos, .dumb_create = i915_gem_dumb_create, - .dumb_map_offset = i915_gem_mmap_gtt, .ioctls = i915_ioctls, .num_ioctls = ARRAY_SIZE(i915_ioctls), .fops = &i915_driver_fops,
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -1861,8 +1861,6 @@ i915_mutex_lock_interruptible(struct drm_device *dev)int i915_gem_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -int i915_gem_mmap_gtt (struct drm_file *file_priv,struct drm_device *dev, -u32 handle,u64 *offset);int i915_gem_mmap_gtt_version (void );int __must_check i915_gem_set_global_seqno (struct drm_device *dev,u32 seqno);
@@ -1886,7 +1884,6 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv);void i915_gem_suspend (struct drm_i915_private *dev_priv);void i915_gem_suspend_late (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv); -vm_fault_t i915_gem_fault (struct vm_fault *vmf);int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file);void i915_gem_release (struct drm_device *dev,struct drm_file *file);
drivers/gpu/drm/i915/i915_gem.c +2 -1
@@ -44,6 +44,7 @@#include "gem/i915_gem_clflush.h" #include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_mman.h" #include "gem/i915_gem_pm.h" #include "gt/intel_engine_user.h" #include "gt/intel_gt.h"
@@ -854,7 +855,7 @@ void i915_gem_runtime_suspend(struct drm_i915_private *i915)list_for_each_entry_safe (obj, on, &i915->ggtt.userfault_list, userfault_link) -__i915_gem_object_release_mmap (obj); +__i915_gem_object_release_mmap_gtt (obj);/* * The fence will be lost when the device powers down. If any were
drivers/gpu/drm/i915/i915_getparam.c +1 -0
@@ -2,6 +2,7 @@* SPDX-License-Identifier: MIT */ +#include "gem/i915_gem_mman.h" #include "gt/intel_engine_user.h" #include "i915_drv.h"
drivers/gpu/drm/i915/i915_vma.c +2 -1
@@ -1054,7 +1054,7 @@ static void __i915_vma_iounmap(struct i915_vma *vma)void i915_vma_revoke_mmap (struct i915_vma *vma) { -struct drm_vma_offset_node *node = &vma->obj->base.vma_node; +struct drm_vma_offset_node *node;u64 vma_offset;lockdep_assert_held (&vma->vm->mutex);
@@ -1065,6 +1065,7 @@ void i915_vma_revoke_mmap(struct i915_vma *vma)GEM_BUG_ON (!i915_vma_is_map_and_fenceable (vma));GEM_BUG_ON (!vma->obj->userfault_count); + node = &vma->mmo->vma_node; vma_offset = vma->ggtt_view.partial.offset <<PAGE_SHIFT ; unmap_mapping_range(vma->vm->i915->drm.anon_inode->i_mapping, drm_vma_node_offset_addr(node) + vma_offset,
drivers/gpu/drm/i915/i915_vma.h +3 -0
@@ -63,6 +63,9 @@ struct i915_vma {u64 display_alignment;struct i915_page_sizes page_sizes; +/* mmap-offset associated with fencing for this vma */ +struct i915_mmap_offset *mmo; +u32 fence_size;u32 fence_alignment;
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/4 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
This is really just an alias of mmap_gtt. The 'mmap offset' nomenclature comes from the value returned by this ioctl which is the offset into the device fd which userpace uses with mmap(2).
mmap_gtt was our initial mmap_offset implementation, this extends our CPU mmap support to allow additional fault handlers that depends on the object's backing pages.
Note that we multiplex mmap_gtt and mmap_offset through the same ioctl, and use the zero extending behaviour of drm to differentiate between them, when we inspect the flags.
v2:
- Drop the alias, just rename the struct (Chris)
- Don't bail out on no PAT when doing WB mmaps
- Prepare uAPI for further extensions
v3:
- drop MMAP_OFFSET_FLAGS
v4:
- Tweaks, header re-org
--- drivers/gpu/drm/i915/gem/i915_gem_ioctls.h | 4 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 42 ++++++++++++++++--- drivers/gpu/drm/i915/gem/i915_gem_mman.h | 1 + .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 ++ drivers/gpu/drm/i915/i915_drv.c | 3 +- drivers/gpu/drm/i915/i915_drv.h | 1 - include/uapi/drm/i915_drm.h | 27 ++++++++++++ 7 files changed, 72 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_ioctls.h +2 -2
@@ -28,8 +28,8 @@ int i915_gem_madvise_ioctl(struct drm_device *dev, void *data, struct drm_file *file);int i915_gem_mmap_ioctl (struct drm_device *dev,void *data,struct drm_file *file); -int i915_gem_mmap_gtt_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int i915_gem_mmap_offset_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);int i915_gem_pread_ioctl (struct drm_device *dev,void *data,struct drm_file *file); int i915_gem_pwrite_ioctl(struct drm_device *dev, void *data,
drivers/gpu/drm/i915/gem/i915_gem_mman.c +37 -5
67 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_mman.h +1 -0
@@ -24,5 +24,6 @@ void i915_mmap_offset_destroy(struct i915_mmap_offset *mmo, struct mutex *mutex)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);void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj); +int i915_gem_mmap_gtt_version (void );#endif
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3 -0
@@ -65,6 +65,9 @@ struct drm_i915_gem_object_ops {enum i915_mmap_type {I915_MMAP_TYPE_GTT =0 , +I915_MMAP_TYPE_WC , +I915_MMAP_TYPE_WB , +I915_MMAP_TYPE_UC , };struct i915_mmap_offset {
drivers/gpu/drm/i915/i915_drv.c +2 -1
@@ -61,6 +61,7 @@#include "gem/i915_gem_context.h" #include "gem/i915_gem_ioctls.h" +#include "gem/i915_gem_mman.h" #include "gt/intel_gt.h" #include "gt/intel_gt_pm.h" #include "gt/intel_rc6.h"
@@ -2714,7 +2715,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_PREAD , i915_gem_pread_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_PWRITE , i915_gem_pwrite_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_MMAP , i915_gem_mmap_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_GTT , i915_gem_mmap_gtt_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_GEM_MMAP_OFFSET , i915_gem_mmap_offset_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SET_DOMAIN , i915_gem_set_domain_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_SW_FINISH , i915_gem_sw_finish_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_SET_TILING, i915_gem_set_tiling_ioctl, DRM_RENDER_ALLOW),
drivers/gpu/drm/i915/i915_drv.h +0 -1
@@ -1861,7 +1861,6 @@ i915_mutex_lock_interruptible(struct drm_device *dev)int i915_gem_dumb_create (struct drm_file *file_priv,struct drm_device *dev,struct drm_mode_create_dumb *args); -int i915_gem_mmap_gtt_version (void );int __must_check i915_gem_set_global_seqno (struct drm_device *dev,u32 seqno);
include/uapi/drm/i915_drm.h +27 -0
@@ -395,6 +395,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)#define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)#define DRM_IOCTL_I915_GEM_MMAP_GTT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt) +#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_offset)#define DRM_IOCTL_I915_GEM_SET_DOMAIN DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)#define DRM_IOCTL_I915_GEM_SW_FINISH DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)#define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
@@ -793,6 +794,32 @@ struct drm_i915_gem_mmap_gtt {__u64 offset; }; +struct drm_i915_gem_mmap_offset { +/** Handle for the object being mapped. */ +__u32 handle; +__u32 pad; +/** +* Fake offset to use for subsequent mmap call +* +* This is a fixed-size type for 32/64 compatibility. +*/ +__u64 offset; + +/** +* Flags for extended behaviour. +* +* It is mandatory that either one of the MMAP_OFFSET flags +* should be passed here. +*/ +__u64 flags; +#define I915_MMAP_OFFSET_GTT 0 +#define I915_MMAP_OFFSET_WC 1 +#define I915_MMAP_OFFSET_WB 2 +#define I915_MMAP_OFFSET_UC 3 + +__u64 extensions; +}; +struct drm_i915_gem_set_domain {/** Handle for the object */ __u32 handle;
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
Quoting Abdiel Janulgue (2019-11-15 11:45:47)
Quoted 27 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +25
-1+i915_gem_mmap_offset_ioctl(struct drm_device *dev, void *data, + struct drm_file *file) { -struct drm_i915_gem_mmap_gtt *args = data; + struct drm_i915_private *i915 = to_i915(dev); +struct drm_i915_gem_mmap_offset *args = data; +enum i915_mmap_type type; + +switch (args->flags) { +case I915_MMAP_OFFSET_GTT : +if (!i915_ggtt_has_aperture (&i915->ggtt)) +return -ENODEV ; + type =I915_MMAP_TYPE_GTT ; +break ; + +case I915_MMAP_OFFSET_WC : +if (!boot_cpu_has (X86_FEATURE_PAT )) +return -ENODEV ; + type =I915_MMAP_TYPE_WC ; +break ; + +case I915_MMAP_OFFSET_WB : + type =I915_MMAP_TYPE_WB ; +break ; + +case I915_MMAP_OFFSET_UC : +if (!boot_cpu_has (X86_FEATURE_PAT ))
drivers/gpu/drm/i915/gem/i915_gem_mman.c __assign_gem_object_mmap_data(struct drm_file *file, · line 594
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +7
-0+return -ENODEV ; + type =I915_MMAP_TYPE_UC ; +break ; + +default : +return -EINVAL ; + } return __assign_gem_object_mmap_data(file, args->handle, I915_MMAP_TYPE_GTT,
s/TYPE_GTT/type/?
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/4] drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
In reply to Abdiel JanulgueQuoting Abdiel Janulgue (2019-11-15 11:45:47)
Quoted 28 lines
include/uapi/drm/i915_drm.h +13
-0@@ -395,6 +395,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PWRITE DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PWRITE, struct drm_i915_gem_pwrite)#define DRM_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct drm_i915_gem_mmap)#define DRM_IOCTL_I915_GEM_MMAP_GTT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_gtt) +#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_offset)#define DRM_IOCTL_I915_GEM_SET_DOMAIN DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SET_DOMAIN, struct drm_i915_gem_set_domain)#define DRM_IOCTL_I915_GEM_SW_FINISH DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)#define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)@@ -793,6 +794,32 @@ struct drm_i915_gem_mmap_gtt {__u64 offset; }; +struct drm_i915_gem_mmap_offset { +/** Handle for the object being mapped. */ +__u32 handle; +__u32 pad; +/** +* Fake offset to use for subsequent mmap call +* +* This is a fixed-size type for 32/64 compatibility. +*/ +__u64 offset; + +/**
include/uapi/drm/i915_drm.h struct drm_i915_gem_mmap_gtt { · line 818
Quoted 10 lines
include/uapi/drm/i915_drm.h +10
-0+* Flags for extended behaviour. +* +* It is mandatory that either one of the MMAP_OFFSET flags +* should be passed here. +*/ +__u64 flags; +#define I915_MMAP_OFFSET_GTT 0 +#define I915_MMAP_OFFSET_WC 1 +#define I915_MMAP_OFFSET_WB 2 +#define I915_MMAP_OFFSET_UC 3
The only question left here is should we
#define I915_MMAP_USE_EXTENSIONS (1 << 8)
from the start and add the dummy user extension handler to ease adaption.
Otherwise the uABI looks correct; though it merits doing something like
struct drm_i915_gem_mmap_gtt arg = { valid state }; u64 redzone[16];
memset(redzone, 0xc5, sizeof(redzone));igt_assert_eq(ioctl(I915_GEM_MMAP_GTT, &arg), 0);
as that would have failed with the earlier patch. A useful exercise to work through to make sure you understand why.
Please write that igt asap.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/4 drm/i915: cpu-map based dumb buffers
In reply to Abdiel JanulguePrefer CPU WC mmaps via our new mmap offset plumbing otherwise fall- back to GTT mmaps when hw doesn't support PAT
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 1 + 3 files changed, 21 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +18 -0
@@ -540,6 +540,24 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; } +int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{ +enum i915_mmap_type mmap_type; + +if (boot_cpu_has (X86_FEATURE_PAT )) + mmap_type =I915_MMAP_TYPE_WC ; +else if (!i915_ggtt_has_aperture (&to_i915 (dev)->ggtt)) +return -ENODEV ; +else + mmap_type =I915_MMAP_TYPE_GTT ; + +return __assign_gem_object_mmap_data (file, handle, mmap_type, offset); +} +/** * i915_gem_mmap_offset_ioctl - prepare an object for GTT mmap'ing * @dev: DRM device
drivers/gpu/drm/i915/gem/i915_gem_mman.h +2 -0
@@ -24,6 +24,8 @@ void i915_mmap_offset_destroy(struct i915_mmap_offset *mmo, struct mutex *mutex)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);void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj); +int i915_gem_mmap_dumb (struct drm_file *file_priv,struct drm_device *dev, +u32 handle,u64 *offset);int i915_gem_mmap_gtt_version (void );#endif
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -2767,6 +2767,7 @@ static struct drm_driver driver = { .get_scanout_position = i915_get_crtc_scanoutpos, .dumb_create = i915_gem_dumb_create, + .dumb_map_offset = i915_gem_mmap_dumb, .ioctls = i915_ioctls, .num_ioctls = ARRAY_SIZE(i915_ioctls), .fops = &i915_driver_fops,
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/4] drm/i915: cpu-map based dumb buffers
Quoting Abdiel Janulgue (2019-11-15 11:45:48)
Quoted 25 lines
Prefer CPU WC mmaps via our new mmap offset plumbing otherwise fall- back to GTT mmaps when hw doesn't support PAT
Signed-off-by Abdiel Janulgue <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 1 + 3 files changed, 21 insertions(+)drivers/gpu/drm/i915/gem/i915_gem_mman.c +6
-0@@ -540,6 +540,24 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; } +int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{
drivers/gpu/drm/i915/gem/i915_gem_mman.c __assign_gem_object_mmap_data(struct drm_file *file, · line 558
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-0+enum i915_mmap_type mmap_type; + +if (boot_cpu_has (X86_FEATURE_PAT )) + mmap_type =I915_MMAP_TYPE_WC ; +else if (!i915_ggtt_has_aperture (&to_i915 (dev)->ggtt)) +return -ENODEV ; +else + mmap_type =I915_MMAP_TYPE_GTT ; + +return __assign_gem_object_mmap_data (file, handle, mmap_type, offset);
Looks ok. Just a few nagging doubts about potential existing misuse by userspace, such as are very using tiling on their dumb buffer, are they passing in a non-dumb handle?
Of course we will need to beat igt into shape first, as a few pipe-crc results suggests some not smart use of dumb buffers.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Acked-byRe: [PATCH 3/4] drm/i915: cpu-map based dumb buffers
Quoting Chris Wilson (2019-11-15 13:54:16)
Quoted 32 lines
Quoting Abdiel Janulgue (2019-11-15 11:45:48)
Quoted 31 lines
Prefer CPU WC mmaps via our new mmap offset plumbing otherwise fall- back to GTT mmaps when hw doesn't support PAT
Signed-off-by Abdiel Janulgue <[email protected]>Cc Matthew Auld <[email protected]>--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/gem/i915_gem_mman.h | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 1 + 3 files changed, 21 insertions(+)drivers/gpu/drm/i915/gem/i915_gem_mman.c +12
-0@@ -540,6 +540,24 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; } +int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{ +enum i915_mmap_type mmap_type; + +if (boot_cpu_has (X86_FEATURE_PAT )) + mmap_type =I915_MMAP_TYPE_WC ; +else if (!i915_ggtt_has_aperture (&to_i915 (dev)->ggtt)) +return -ENODEV ;
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c __assign_gem_object_mmap_data(struct drm_file *file, · line 558
Quoted 4 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +4
-0+else + mmap_type =I915_MMAP_TYPE_GTT ; + +return __assign_gem_object_mmap_data (file, handle, mmap_type, offset);Looks ok. Just a few nagging doubts about potential existing misuse by userspace, such as are very using tiling on their dumb buffer, are they passing in a non-dumb handle?
Userspace review pending.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/4 drm/i915: Add cpu fault handler for mmap_offset
In reply to Abdiel JanulgueFault handler to handle missing pages for shmem-backed objects.
v2: bail out of inserting PTEs when failing to insert the
fault address
v3: has struct page check
v4: Add self-test for validating CPU fault handler to ensure PTEs
are revoked when an object is unbound.
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 128 ++++++++++++++---- .../drm/i915/gem/selftests/i915_gem_mman.c | 47 +++++-- 2 files changed, 141 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +103 -25
@@ -5,6 +5,7 @@*/ #include <linux/mman.h> +#include <linux/pfn_t.h> #include <linux/sizes.h> #include "gt/intel_gt.h"
@@ -201,6 +202,70 @@ compute_partial_view(const struct drm_i915_gem_object *obj,return view; } +static vm_fault_t i915_error_to_vmf_fault (int err) +{ +switch (err) { +default : +WARN_ONCE (err,"unhandled error in %s: %i\n" , __func__, err); +/* fallthrough */ +case -EIO :/* shmemfs failure from swap device */ +case -EFAULT :/* purged object */ +case -ENODEV :/* bad object, how did you get here! */ +return VM_FAULT_SIGBUS ; + +case -ENOSPC :/* shmemfs allocation failure */ +case -ENOMEM :/* our allocation failure */ +return VM_FAULT_OOM ; + +case 0 : +case -EAGAIN : +case -ERESTARTSYS : +case -EINTR : +case -EBUSY : +/* +* EBUSY is ok: this just means that another thread +* already did the job. +*/ +return VM_FAULT_NOPAGE ; + } +} + +static vm_fault_t i915_gem_fault_cpu (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; +vm_fault_t vmf_ret; +unsigned long i, size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ; +int ret; + +if (!i915_gem_object_has_struct_page (obj)) +return VM_FAULT_SIGBUS ; + +/* 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++) { +struct page *page =i915_gem_object_get_page (obj, i); + + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +page_to_pfn (page)); +if (vmf_ret !=VM_FAULT_NOPAGE ) +break ; + } + +i915_gem_object_unpin_pages (obj); + +return vmf_ret; +} +/** * i915_gem_fault - fault a page into the GTT * @vmf: fault info
@@ -340,30 +405,7 @@ vm_fault_t i915_gem_fault(struct vm_fault *vmf)intel_runtime_pm_put (rpm, wakeref);i915_gem_object_unpin_pages (obj); err: -switch (ret) { -default : -WARN_ONCE (ret,"unhandled error in %s: %i\n" , __func__, ret); -/* fallthrough */ -case -EIO :/* shmemfs failure from swap device */ -case -EFAULT :/* purged object */ -case -ENODEV :/* bad object, how did you get here! */ -return VM_FAULT_SIGBUS ; - -case -ENOSPC :/* shmemfs allocation failure */ -case -ENOMEM :/* our allocation failure */ -return VM_FAULT_OOM ; - -case 0 : -case -EAGAIN : -case -ERESTARTSYS : -case -EINTR : -case -EBUSY : -/* -* EBUSY is ok: this just means that another thread -* already did the job. -*/ -return VM_FAULT_NOPAGE ; - } +return i915_error_to_vmf_fault (ret); }void __i915_gem_object_release_mmap_gtt (struct drm_i915_gem_object *obj)
@@ -650,6 +692,33 @@ static const struct vm_operations_struct i915_gem_gtt_vm_ops = { .close = i915_gem_vm_close, }; +static const struct vm_operations_struct i915_gem_cpu_vm_ops = { + .fault = i915_gem_fault_cpu, + .open = i915_gem_vm_open, + .close = i915_gem_vm_close, +}; + +static void set_vmdata_mmap_offset (struct i915_mmap_offset *mmo,struct vm_area_struct *vma) +{ +switch (mmo->mmap_type) { +case I915_MMAP_TYPE_WC : + vma->vm_page_prot = +pgprot_writecombine (vm_get_page_prot (vma->vm_flags)); +break ; +case I915_MMAP_TYPE_WB : + vma->vm_page_prot =vm_get_page_prot (vma->vm_flags); +break ; +case I915_MMAP_TYPE_UC : + vma->vm_page_prot = +pgprot_noncached (vm_get_page_prot (vma->vm_flags)); +break ; +default : +break ; + } + + vma->vm_ops = &i915_gem_cpu_vm_ops; +} +/* 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 * be able to resolve multiple mmap offsets which could be tied
@@ -717,7 +786,16 @@ int i915_gem_mmap(struct file *filp, struct vm_area_struct *vma) vma->vm_page_prot =pgprot_decrypted (vma->vm_page_prot); vma->vm_private_data = mmo; - vma->vm_ops = &i915_gem_gtt_vm_ops; +switch (mmo->mmap_type) { +case I915_MMAP_TYPE_WC : +case I915_MMAP_TYPE_WB : +case I915_MMAP_TYPE_UC : +set_vmdata_mmap_offset (mmo, vma); +break ; +case I915_MMAP_TYPE_GTT : + vma->vm_ops = &i915_gem_gtt_vm_ops; +break ; + }return 0 ; }
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +38 -9
115 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/4] drm/i915: Add cpu fault handler for mmap_offset
Quoting Abdiel Janulgue (2019-11-15 11:45:49)
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +11
-0+static vm_fault_t i915_gem_fault_cpu (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; +vm_fault_t vmf_ret; +unsigned long i, size = area->vm_end - area->vm_start; +bool write = area->vm_flags &VM_WRITE ; +int ret; + +if (!i915_gem_object_has_struct_page (obj))
drivers/gpu/drm/i915/gem/i915_gem_mman.c compute_partial_view(const struct drm_i915_gem_object *obj, · line 253
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-0+return VM_FAULT_SIGBUS ; + +/* 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); +
It is probably a good idea to mention here how we revoke the PTE.
/* PTEs are revoked in obj->ops->put_pages() */
drivers/gpu/drm/i915/gem/i915_gem_mman.c compute_partial_view(const struct drm_i915_gem_object *obj, · line 266
Quoted 13 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +13
-0+for (i =0 ; i < size >>PAGE_SHIFT ; i++) { +struct page *page =i915_gem_object_get_page (obj, i); + + vmf_ret =vmf_insert_pfn (area, + (unsigned long )area->vm_start + i *PAGE_SIZE , +page_to_pfn (page)); +if (vmf_ret !=VM_FAULT_NOPAGE ) +break ; + } + +i915_gem_object_unpin_pages (obj); + +return vmf_ret;
With the revoke + selftests in place, this looks correct.
There might be room for fine tuning (not pin/mapping the whole object), but that has been a concern for a long time and remains a concern :) -Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
In reply to Abdiel Janulgue== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
URL : https://patchwork.freedesktop.org/series/69522/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip a0ff7bbb56ea drm/i915: Allow i915 to manage the vma offset nodes instead of drm core -:368: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #368: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:646: + + }
-:399: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #399:
new file mode 100644
-:404: WARNING:SPDX_LICENSE_TAG: Missing or malformed SPDX-License-Identifier tag in line 1 #404: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.h:1:
+/*
-:405: WARNING:SPDX_LICENSE_TAG: Misplaced SPDX-License-Identifier tag - use line 1 instead #405: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.h:2:
+ * SPDX-License-Identifier: MIT
-:600: CHECK:LINE_SPACING: Please don't use multiple blank lines #600: FILE: drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c:580:
+
-:747: WARNING:SPDX_LICENSE_TAG: Misplaced SPDX-License-Identifier tag - use line 1 instead #747: FILE: drivers/gpu/drm/i915/i915_getparam.c:2:
* SPDX-License-Identifier: MIT
total: 0 errors, 4 warnings, 2 checks, 648 lines checked bb6e6f21d2f9 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET -:187: WARNING:LONG_LINE: line over 100 characters #187: FILE: include/uapi/drm/i915_drm.h:398:
+#define DRM_IOCTL_I915_GEM_MMAP_OFFSET DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_offset)
total: 0 errors, 1 warnings, 0 checks, 153 lines checked 52a0eee7cfa2 drm/i915: cpu-map based dumb buffers
-:22: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #22: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:545:
+i915_gem_mmap_dumb(struct drm_file *file,
+ struct drm_device *dev,
-:32: WARNING:UNNECESSARY_ELSE: else is not generally useful after a break or return #32: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:555:
+ return -ENODEV;
+ else
-:50: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #50: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.h:28:
+int i915_gem_mmap_dumb(struct drm_file *file_priv, struct drm_device *dev,
+ u32 handle, u64 *offset);
total: 0 errors, 1 warnings, 2 checks, 39 lines checked 27a373a960f1 drm/i915: Add cpu fault handler for mmap_offset
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
In reply to Abdiel Janulgue== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
URL : https://patchwork.freedesktop.org/series/69522/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Sparse version: v0.6.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Abdiel Janulgue (2019-11-15 11:45:46)
drivers/gpu/drm/i915/gem/i915_gem_mman.c void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj) · line 430
Quoted 11 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +10
-1-static int create_mmap_offset (struct drm_i915_gem_object *obj) +void i915_gem_object_release_mmap_offset (struct drm_i915_gem_object *obj) +{ +struct i915_mmap_offset *mmo; + +mutex_lock (&obj->mmo_lock); +list_for_each_entry (mmo, &obj->mmap_offsets, offset) { +/* vma_node_unmap for GTT mmaps handled already in +* __i915_gem_object_release_mmap_gtt +*/ +if (mmo->mmap_type !=I915_MMAP_TYPE_GTT )
Tempted to say always do it, but that would be a waste indeed.
drivers/gpu/drm/i915/gem/i915_gem_mman.c void i915_gem_object_release_mmap(struct drm_i915_gem_object *obj)
Quoted 10 lines
drivers/gpu/drm/i915/gem/i915_gem_mman.c +9
-0+drm_vma_node_unmap (&mmo->vma_node, + obj->base.dev->anon_inode->i_mapping); + } +mutex_unlock (&obj->mmo_lock); +} +void i915_mmap_offset_destroy (struct i915_mmap_offset *mmo,struct mutex *mutex) +{ +if (mmo->file) +drm_vma_node_revoke (&mmo->vma_node, mmo->file);
Wait a sec.
The mmo is global, one per object per type. Not one per object per type per client.
We shouldn't be associated with a single mmo->file. That is enough address space magnification for a single process to be able to exhaust the entire global address space...
How's this meant to work?
drivers/gpu/drm/i915/gem/i915_gem_object_types.h struct drm_i915_gem_object { · line 138
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +4
-0@@ -118,6 +132,11 @@ struct drm_i915_gem_object {unsigned int userfault_count;struct list_head userfault_link; +/* Protects access to mmap offsets */ +struct mutex mmo_lock; +struct list_head mmap_offsets; + bool readonly:1;
Go on, steal a bit from flags.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
In reply to Abdiel Janulgue== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
URL : https://patchwork.freedesktop.org/series/69522/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7352 -> Patchwork_15278
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_15278 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_15278, 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_15278/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_15278:
### IGT changes ###
#### Possible regressions ####
* igt@kms_pipe_crc_basic@hang-read-crc-pipe-a:
- fi-gdg-551: [PASS][1] -> [FAIL][2] +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-gdg-551/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-gdg-551/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-ilk-650: [PASS][3] -> [FAIL][4] +6 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-ilk-650/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-ilk-650/igt@[email protected]
- fi-elk-e7500: [PASS][5] -> [FAIL][6] +6 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-elk-e7500/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-elk-e7500/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-bwr-2160: [PASS][7] -> [FAIL][8] +4 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-bwr-2160/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-bwr-2160/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-blb-e6850: [PASS][9] -> [FAIL][10] +6 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-blb-e6850/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-blb-e6850/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-bsw-kefka: [PASS][11] -> [FAIL][12] +4 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-bsw-kefka/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-bsw-kefka/igt@[email protected]
#### Warnings ####
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7500u: [DMESG-WARN][13] ([fdo#102505] / [fdo#103558] / [fdo#105079] / [fdo#105602]) -> [FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-kbl-7500u/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-kbl-7500u/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_15278 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_module_load@reload-no-display:
- fi-skl-lmem: [PASS][15] -> [DMESG-WARN][16] ([fdo#112261])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-skl-lmem/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-skl-lmem/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-bsw-n3050: [PASS][17] -> [DMESG-FAIL][18] ([fdo#112176])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-bsw-n3050/igt@i915_selftest@live_blt.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-bsw-n3050/igt@i915_selftest@live_blt.html
* igt@i915_selftest@live_gem_contexts:
- fi-cfl-8700k: [PASS][19] -> [INCOMPLETE][20] ([fdo#111700])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-cfl-8700k/igt@i915_selftest@live_gem_contexts.html
* igt@kms_chamelium@hdmi-crc-fast:
- fi-kbl-7500u: [PASS][21] -> [FAIL][22] ([fdo#109635 ])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-kbl-7500u/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-kbl-7500u/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [PASS][23] -> [FAIL][24] ([fdo#111407])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-kbl-7500u/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-kbl-7500u/igt@[email protected]
* igt@kms_flip@basic-flip-vs-wf_vblank:
- fi-skl-6770hq: [PASS][25] -> [DMESG-WARN][26] ([fdo#105541])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-wf_vblank.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-skl-6770hq/igt@kms_flip@basic-flip-vs-wf_vblank.html
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-n2820: [PASS][27] -> [FAIL][28] ([fdo#103191]) +5 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-byt-n2820/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-byt-n2820/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-j1900: [PASS][29] -> [FAIL][30] ([fdo#103191]) +4 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-byt-j1900/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-byt-j1900/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-glk-dsi: [PASS][31] -> [FAIL][32] ([fdo#103191]) +3 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-glk-dsi/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-glk-dsi/igt@[email protected]
* igt@kms_setmode@basic-clone-single-crtc:
- fi-skl-6770hq: [PASS][33] -> [WARN][34] ([fdo#112252])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-skl-6770hq/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-skl-6770hq/igt@[email protected]
#### Possible fixes ####
* igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq: [INCOMPLETE][35] -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-skl-6770hq/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-skl-6770hq/igt@[email protected]
* igt@i915_selftest@live_blt:
- fi-bsw-nick: [DMESG-FAIL][37] ([fdo#112176]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7352/fi-bsw-nick/igt@i915_selftest@live_blt.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/fi-bsw-nick/igt@i915_selftest@live_blt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103558]: https://bugs.freedesktop.org/show_bug.cgi?id=103558
[fdo#105079]: https://bugs.freedesktop.org/show_bug.cgi?id=105079
[fdo#105541]: https://bugs.freedesktop.org/show_bug.cgi?id=105541
[fdo#105602]: https://bugs.freedesktop.org/show_bug.cgi?id=105602
[fdo#109635 ]: https://bugs.freedesktop.org/show_bug.cgi?id=109635
[fdo#109964]: https://bugs.freedesktop.org/show_bug.cgi?id=109964
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#111700]: https://bugs.freedesktop.org/show_bug.cgi?id=111700
[fdo#112176]: https://bugs.freedesktop.org/show_bug.cgi?id=112176
[fdo#112252]: https://bugs.freedesktop.org/show_bug.cgi?id=112252
[fdo#112261]: https://bugs.freedesktop.org/show_bug.cgi?id=112261
[fdo#112298]: https://bugs.freedesktop.org/show_bug.cgi?id=112298
Participating hosts (53 -> 44)
------------------------------
Missing (9): fi-ilk-m540 fi-tgl-u fi-hsw-4200u fi-byt-squawks fi-icl-u2 fi-bsw-cyan fi-ctg-p8600 fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7352 -> Patchwork_15278
CI-20190529: 20190529
CI_DRM_7352: 9d6a1b13121af95e05798c72a76bf00207816f0e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5288: ff4551e36cd8e573ceb1e450d17a12e3298dc04c @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_15278: 27a373a960f145240b543afdd6a2f933ed11af96 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
27a373a960f1 drm/i915: Add cpu fault handler for mmap_offset 52a0eee7cfa2 drm/i915: cpu-map based dumb buffersbb6e6f21d2f9 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSETa0ff7bbb56ea drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15278/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx