drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
Subsystems (3)
PATCH 1/5 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
--- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 229 ++++++++++++++++-- drivers/gpu/drm/i915/gem/i915_gem_object.c | 13 + drivers/gpu/drm/i915/gem/i915_gem_object.h | 9 +- .../gpu/drm/i915/gem/i915_gem_object_types.h | 19 ++ .../drm/i915/gem/selftests/i915_gem_mman.c | 12 +- 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 | 2 +- drivers/gpu/drm/i915/i915_vma.c | 15 +- drivers/gpu/drm/i915/i915_vma.h | 3 + 12 files changed, 274 insertions(+), 50 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_domain.c +1 -1
@@ -254,7 +254,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 +203 -26
305 lines not on this page · raw message
drivers/gpu/drm/i915/gem/i915_gem_object.c +13 -0
@@ -59,6 +59,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;
@@ -156,6 +159,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)) {
@@ -181,6 +186,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 +6 -3
@@ -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
@@ -376,7 +376,7 @@ 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_gtt (struct drm_i915_gem_object *obj);void i915_gem_object_release_mmap (struct drm_i915_gem_object *obj);void
@@ -462,6 +462,9 @@ int i915_gem_object_wait(struct drm_i915_gem_object *obj,int i915_gem_object_wait_priority (struct drm_i915_gem_object *obj,unsigned int flags,const struct i915_sched_attr *attr); + +void i915_mmap_offset_destroy (struct i915_mmap_offset *mmo,struct mutex *mutex); +#define I915_PRIORITY_DISPLAY I915_USER_PRIORITY(I915_PRIORITY_MAX)#endif
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +19 -0
@@ -62,6 +62,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;
@@ -117,6 +131,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/selftests/i915_gem_mman.c +10 -2
@@ -557,15 +557,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; }
@@ -601,6 +606,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 resv, *hole; +/* Ownership transferred to parent gem object in create_mmap_offset */ +struct i915_mmap_offset *mmo =kzalloc (sizeof (*mmo),GFP_KERNEL );u64 hole_start, hole_end;int loop, err;
@@ -644,9 +651,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; }
drivers/gpu/drm/i915/gt/intel_reset.c +6 -1
@@ -667,8 +667,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
@@ -2646,18 +2646,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,
@@ -2746,7 +2740,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,
@@ -2757,7 +2750,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 +1 -2
@@ -1932,8 +1932,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);
@@ -1958,6 +1956,7 @@ 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); +int i915_gem_mmap (struct file *filp,struct vm_area_struct *vma);vm_fault_t i915_gem_fault (struct vm_fault *vmf);int i915_gem_open (struct drm_i915_private *i915,struct drm_file *file);
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -853,7 +853,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_vma.c +10 -5
@@ -1058,7 +1058,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);
@@ -1070,10 +1070,15 @@ void i915_vma_revoke_mmap(struct i915_vma *vma)GEM_BUG_ON (!vma->obj->userfault_count); 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, - vma->size, -1 ); + +if (vma->mmo) { + node = &vma->mmo->vma_node; + +unmap_mapping_range (vma->vm->i915->drm.anon_inode->i_mapping, +drm_vma_node_offset_addr (node) + vma_offset, + vma->size, +1 ); + }i915_vma_unset_userfault (vma);if (!--vma->obj->userfault_count)
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/5 drm/i915: define i915_ggtt_has_aperture
From: Daniele Ceraolo Spurio <[email protected]>
The following patches in the series will use it to avoid certain operations when the mappable aperture is not available in HW.
--- drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_gem_gtt.h +5 -0
@@ -575,6 +575,11 @@ void i915_ggtt_disable_guc(struct i915_ggtt *ggtt);int i915_init_ggtt (struct drm_i915_private *dev_priv);void i915_ggtt_driver_release (struct drm_i915_private *dev_priv); +static inline bool i915_ggtt_has_aperture (struct i915_ggtt *ggtt) +{ +return ggtt->mappable_end >0 ; +} +int i915_ppgtt_init_hw (struct intel_gt *gt);struct i915_ppgtt *i915_ppgtt_create (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/5 drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET
In reply to Abdiel JanulgueThis 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
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 44 ++++++++++++++++++- .../gpu/drm/i915/gem/i915_gem_object_types.h | 3 ++ include/uapi/drm/i915_drm.h | 27 +++++++++++- 3 files changed, 71 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +42 -2
@@ -144,6 +144,9 @@ static unsigned int tile_row_pages(const struct drm_i915_gem_object *obj)* 3 - Remove implicit set-domain(GTT) and synchronisation on initial * pagefault; swapin remains transparent. * +* 4 - Support multiple fault handlers per object depending on object's +* backing storage (a.k.a. MMAP_OFFSET). +* * Restrictions: * * * snoopable objects cannot be accessed via the GTT. It can cause machine
@@ -171,7 +174,7 @@ static unsigned int tile_row_pages(const struct drm_i915_gem_object *obj)*/ int i915_gem_mmap_gtt_version (void ) { -return 3 ; +return 4 ; } static inline struct i915_ggtt_view
@@ -534,6 +537,35 @@ __assign_gem_object_mmap_data(struct drm_file *file,return ret; } +static int gem_mmap_offset (struct drm_device *dev,void *data, +struct drm_file *file) +{ +struct drm_i915_gem_mmap_offset *args = data; +enum i915_mmap_type type; + +switch (args->flags) { +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 )) +return -ENODEV ; + type =I915_MMAP_TYPE_UC ; +break ; +default : +return -EINVAL ; + + }; + +return __assign_gem_object_mmap_data (file, args->handle, type, + &args->offset); +} +/** * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing * @dev: DRM device
@@ -553,7 +585,15 @@ int i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, struct drm_file *file) { - struct drm_i915_gem_mmap_gtt *args = data; + struct drm_i915_gem_mmap_offset *args = data; +struct drm_i915_private *i915 =to_i915 (dev); + +if (args->flags) +return gem_mmap_offset (dev, data, file); + +if (!i915_ggtt_has_aperture (&i915->ggtt)) +/* No aperture, cannot mmap via legacy GTT */ +return -ENODEV ; return __assign_gem_object_mmap_data(file, args->handle, I915_MMAP_TYPE_GTT,
drivers/gpu/drm/i915/gem/i915_gem_object_types.h +3 -0
@@ -64,6 +64,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 {
include/uapi/drm/i915_drm.h +26 -1
@@ -394,7 +394,7 @@ typedef struct _drm_i915_sarea {#define DRM_IOCTL_I915_GEM_PREAD DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_PREAD, struct drm_i915_gem_pread)#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_GTT 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 +793,31 @@ 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_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
PATCH 4/5 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 | 13 +++++++++++++ drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 2 ++ 3 files changed, 16 insertions(+)
drivers/gpu/drm/i915/gem/i915_gem_mman.c +13 -0
@@ -566,6 +566,19 @@ static int gem_mmap_offset(struct drm_device *dev, void *data, &args->offset); } +int +i915_gem_mmap_dumb (struct drm_file *file, +struct drm_device *dev, +u32 handle, +u64 *offset) +{ +enum i915_mmap_type mmap_type =boot_cpu_has (X86_FEATURE_PAT ) ? +I915_MMAP_TYPE_WC :I915_MMAP_TYPE_GTT ; + +return __assign_gem_object_mmap_data (file, handle, mmap_type, + offset); +} +/** * i915_gem_mmap_gtt_ioctl - prepare an object for GTT mmap'ing * @dev: DRM device
drivers/gpu/drm/i915/i915_drv.c +1 -0
@@ -2750,6 +2750,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,
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -1932,6 +1932,8 @@ 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_dumb (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);
Signature · 6 lines
2.23.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/5 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
--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 128 ++++++++++++++++++----- 1 file changed, 103 insertions(+), 25 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"
@@ -200,6 +201,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
@@ -339,30 +404,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 ; }
Signature · 6 lines
2.23.0 _______________________________________________ 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/5] 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/5] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
URL : https://patchwork.freedesktop.org/series/68444/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 88eb039e9a04 drm/i915: Allow i915 to manage the vma offset nodes instead of drm core -:335: CHECK:BRACES: Blank lines aren't necessary before a close brace '}' #335: FILE: drivers/gpu/drm/i915/gem/i915_gem_mman.c:643: + + }
-:501: CHECK:LINE_SPACING: Please don't use multiple blank lines #501: FILE: drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c:573:
+
total: 0 errors, 0 warnings, 2 checks, 553 lines checked 7dd672c3aff7 drm/i915: define i915_ggtt_has_aperture 90555c09925c drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET -:128: WARNING:LONG_LINE: line over 100 characters #128: FILE: include/uapi/drm/i915_drm.h:397:
+#define DRM_IOCTL_I915_GEM_MMAP_GTT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP_GTT, struct drm_i915_gem_mmap_offset)
total: 0 errors, 1 warnings, 0 checks, 116 lines checked 027840f85446 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:571:
+i915_gem_mmap_dumb(struct drm_file *file,
+ struct drm_device *dev,
-:57: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #57: FILE: drivers/gpu/drm/i915/i915_drv.h:1936:
+int i915_gem_mmap_dumb(struct drm_file *file_priv, struct drm_device *dev,
+ u32 handle, u64 *offset);
total: 0 errors, 0 warnings, 2 checks, 34 lines checked 2ca60ea8faed 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.BAT: failure for series starting with [1/5] 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/5] drm/i915: Allow i915 to manage the vma offset nodes instead of drm core
URL : https://patchwork.freedesktop.org/series/68444/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_7158 -> Patchwork_14942
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_14942 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_14942, 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_14942/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_14942:
### 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_7158/fi-gdg-551/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/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_7158/fi-ilk-650/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/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_7158/fi-elk-e7500/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-elk-e7500/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-a:
- fi-bwr-2160: [PASS][7] -> [FAIL][8] +5 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-bwr-2160/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/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_7158/fi-blb-e6850/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/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_7158/fi-bsw-kefka/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-bsw-kefka/igt@[email protected]
* igt@runner@aborted:
- fi-bdw-gvtdvm: NOTRUN -> [FAIL][13]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-bdw-gvtdvm/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_14942 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_create@basic-files:
- fi-bdw-gvtdvm: [PASS][14] -> [TIMEOUT][15] ([fdo#111220])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-bdw-gvtdvm/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-bdw-gvtdvm/igt@[email protected]
* igt@gem_ctx_switch@legacy-render:
- fi-bxt-dsi: [PASS][16] -> [INCOMPLETE][17] ([fdo#103927] / [fdo#111381])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-bxt-dsi/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-bxt-dsi/igt@[email protected]
* igt@gem_ringfill@basic-default-interruptible:
- fi-icl-u3: [PASS][18] -> [DMESG-WARN][19] ([fdo#107724])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-icl-u3/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: [PASS][20] -> [FAIL][21] ([fdo#109483])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-icl-u2/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-icl-u2/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [PASS][22] -> [DMESG-WARN][23] ([fdo#102614])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-hsw-peppy/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-hsw-peppy/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-n2820: [PASS][24] -> [FAIL][25] ([fdo#103191]) +4 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-byt-n2820/igt@[email protected]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-byt-n2820/igt@[email protected]
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-byt-j1900: [PASS][26] -> [FAIL][27] ([fdo#103191]) +4 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-byt-j1900/igt@[email protected]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-byt-j1900/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-glk-dsi: [PASS][28] -> [FAIL][29] ([fdo#103191]) +3 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-glk-dsi/igt@[email protected]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-glk-dsi/igt@[email protected]
#### Possible fixes ####
* igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq: [FAIL][30] ([fdo#108511]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-skl-6770hq/igt@[email protected]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-skl-6770hq/igt@[email protected]
* {igt@i915_selftest@live_gt_heartbeat}:
- fi-kbl-x1275: [DMESG-FAIL][32] ([fdo#112096]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-kbl-x1275/igt@i915_selftest@live_gt_heartbeat.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-kbl-x1275/igt@i915_selftest@live_gt_heartbeat.html
* igt@kms_addfb_basic@bad-pitch-256:
- fi-icl-u3: [DMESG-WARN][34] ([fdo#107724]) -> [PASS][35] +2 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-icl-u3/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-icl-u3/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][36] ([fdo#111045] / [fdo#111096]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7158/fi-kbl-7500u/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14942/fi-kbl-7500u/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109483]: https://bugs.freedesktop.org/show_bug.cgi?id=109483
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111220]: https://bugs.freedesktop.org/show_bug.cgi?id=111220
[fdo#111381]: https://bugs.freedesktop.org/show_bug.cgi?id=111381
[fdo#111880]: https://bugs.freedesktop.org/show_bug.cgi?id=111880
[fdo#112057]: https://bugs.freedesktop.org/show_bug.cgi?id=112057
[fdo#112096]: https://bugs.freedesktop.org/show_bug.cgi?id=112096
Participating hosts (54 -> 44)
------------------------------
Missing (10): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-skl-6260u fi-ctg-p8600 fi-cfl-8109u fi-icl-y fi-byt-clapper fi-bdw-samus
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7158 -> Patchwork_14942
CI-20190529: 20190529
CI_DRM_7158: ef9cbeb564bd97c1e62555981bca80843473dde5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5235: da9abbab69be80dd00812a4607a4ea2dffcc4544 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_14942: 2ca60ea8faedb721ceee8c67c4bf024e5d9c4d34 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
2ca60ea8faed drm/i915: Add cpu fault handler for mmap_offset 027840f85446 drm/i915: cpu-map based dumb buffers90555c09925c drm/i915: Introduce DRM_I915_GEM_MMAP_OFFSET7dd672c3aff7 drm/i915: define i915_ggtt_has_aperture88eb039e9a04 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_14942/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx