Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: fix the racy object accounting

Just use a spinlock to protect them.

v2: Rebase onto the new object create refcount fix patch.

v3: Don't kill dev_priv->mm.object_memory as requested by Chris and
hence just use a spinlock instead of atomic_t.

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=67287
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

+6
+1
drivers/gpu/drm/i915/i915_dma.c
··· 1478 1478 spin_lock_init(&dev_priv->gpu_error.lock); 1479 1479 spin_lock_init(&dev_priv->backlight.lock); 1480 1480 spin_lock_init(&dev_priv->uncore.lock); 1481 + spin_lock_init(&dev_priv->mm.object_stat_lock); 1481 1482 mutex_init(&dev_priv->dpio_lock); 1482 1483 mutex_init(&dev_priv->rps.hw_lock); 1483 1484 mutex_init(&dev_priv->modeset_restore_lock);
+1
drivers/gpu/drm/i915/i915_drv.h
··· 935 935 struct drm_i915_gem_phys_object *phys_objs[I915_MAX_PHYS_OBJECT]; 936 936 937 937 /* accounting, useful for userland debugging */ 938 + spinlock_t object_stat_lock; 938 939 size_t object_memory; 939 940 u32 object_count; 940 941 };
+4
drivers/gpu/drm/i915/i915_gem.c
··· 75 75 static void i915_gem_info_add_obj(struct drm_i915_private *dev_priv, 76 76 size_t size) 77 77 { 78 + spin_lock(&dev_priv->mm.object_stat_lock); 78 79 dev_priv->mm.object_count++; 79 80 dev_priv->mm.object_memory += size; 81 + spin_unlock(&dev_priv->mm.object_stat_lock); 80 82 } 81 83 82 84 static void i915_gem_info_remove_obj(struct drm_i915_private *dev_priv, 83 85 size_t size) 84 86 { 87 + spin_lock(&dev_priv->mm.object_stat_lock); 85 88 dev_priv->mm.object_count--; 86 89 dev_priv->mm.object_memory -= size; 90 + spin_unlock(&dev_priv->mm.object_stat_lock); 87 91 } 88 92 89 93 static int