|
@@ -28,6 +28,7 @@
|
|
#include <linux/swap.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/dma-buf.h>
|
|
#include <linux/dma-buf.h>
|
|
|
|
+#include <linux/vmalloc.h>
|
|
#include <drm/drmP.h>
|
|
#include <drm/drmP.h>
|
|
#include <drm/i915_drm.h>
|
|
#include <drm/i915_drm.h>
|
|
|
|
|
|
@@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)
|
|
return NOTIFY_DONE;
|
|
return NOTIFY_DONE;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int
|
|
|
|
+i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr)
|
|
|
|
+{
|
|
|
|
+ struct drm_i915_private *dev_priv =
|
|
|
|
+ container_of(nb, struct drm_i915_private, mm.vmap_notifier);
|
|
|
|
+ struct drm_device *dev = dev_priv->dev;
|
|
|
|
+ unsigned long timeout = msecs_to_jiffies(5000) + 1;
|
|
|
|
+ unsigned long freed_pages;
|
|
|
|
+ bool was_interruptible;
|
|
|
|
+ bool unlock;
|
|
|
|
+
|
|
|
|
+ while (!i915_gem_shrinker_lock(dev, &unlock) && --timeout) {
|
|
|
|
+ schedule_timeout_killable(1);
|
|
|
|
+ if (fatal_signal_pending(current))
|
|
|
|
+ return NOTIFY_DONE;
|
|
|
|
+ }
|
|
|
|
+ if (timeout == 0) {
|
|
|
|
+ pr_err("Unable to purge GPU vmaps due to lock contention.\n");
|
|
|
|
+ return NOTIFY_DONE;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ was_interruptible = dev_priv->mm.interruptible;
|
|
|
|
+ dev_priv->mm.interruptible = false;
|
|
|
|
+
|
|
|
|
+ freed_pages = i915_gem_shrink_all(dev_priv);
|
|
|
|
+
|
|
|
|
+ dev_priv->mm.interruptible = was_interruptible;
|
|
|
|
+ if (unlock)
|
|
|
|
+ mutex_unlock(&dev->struct_mutex);
|
|
|
|
+
|
|
|
|
+ *(unsigned long *)ptr += freed_pages;
|
|
|
|
+ return NOTIFY_DONE;
|
|
|
|
+}
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* i915_gem_shrinker_init - Initialize i915 shrinker
|
|
* i915_gem_shrinker_init - Initialize i915 shrinker
|
|
* @dev_priv: i915 device
|
|
* @dev_priv: i915 device
|
|
@@ -371,6 +406,9 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)
|
|
|
|
|
|
dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
|
|
dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
|
|
WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));
|
|
WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));
|
|
|
|
+
|
|
|
|
+ dev_priv->mm.vmap_notifier.notifier_call = i915_gem_shrinker_vmap;
|
|
|
|
+ WARN_ON(register_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -381,6 +419,7 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)
|
|
*/
|
|
*/
|
|
void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)
|
|
void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)
|
|
{
|
|
{
|
|
|
|
+ WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));
|
|
WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
|
|
WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
|
|
unregister_shrinker(&dev_priv->mm.shrinker);
|
|
unregister_shrinker(&dev_priv->mm.shrinker);
|
|
}
|
|
}
|