Commit 7be1b9b8 authored by Chris Wilson's avatar Chris Wilson

drm/mm: Break long searches in fragmented address spaces

We try hard to select a suitable hole in the drm_mm first time. But if
that is unsuccessful, we then have to look at neighbouring nodes, and
this requires traversing the rbtree. Walking the rbtree can be slow
(much slower than a linear list for deep trees), and if the drm_mm has
been purposefully fragmented our search can be trapped for a long, long
time. For non-preemptible kernels, we need to break up long CPU bound
sections by manually checking for cond_resched(); similarly we should
also bail out if we have been told to terminate. (In an ideal world, we
would break for any signal, but we need to trade off having to perform
the search again after ERESTARTSYS, which again may form a trap of
making no forward progress.)
Reported-by: default avatarZbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200207151720.2812125-1-chris@chris-wilson.co.uk
parent 78a7b61a
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include <linux/export.h> #include <linux/export.h>
#include <linux/interval_tree_generic.h> #include <linux/interval_tree_generic.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/sched/signal.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/stacktrace.h> #include <linux/stacktrace.h>
...@@ -366,6 +367,11 @@ next_hole(struct drm_mm *mm, ...@@ -366,6 +367,11 @@ next_hole(struct drm_mm *mm,
struct drm_mm_node *node, struct drm_mm_node *node,
enum drm_mm_insert_mode mode) enum drm_mm_insert_mode mode)
{ {
/* Searching is slow; check if we ran out of time/patience */
cond_resched();
if (fatal_signal_pending(current))
return NULL;
switch (mode) { switch (mode) {
default: default:
case DRM_MM_INSERT_BEST: case DRM_MM_INSERT_BEST:
...@@ -557,7 +563,7 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm, ...@@ -557,7 +563,7 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm,
return 0; return 0;
} }
return -ENOSPC; return signal_pending(current) ? -ERESTARTSYS : -ENOSPC;
} }
EXPORT_SYMBOL(drm_mm_insert_node_in_range); EXPORT_SYMBOL(drm_mm_insert_node_in_range);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment