diff options
| author | Chris Wilson | 2018-01-19 15:46:57 +0100 |
|---|---|---|
| committer | Chris Wilson | 2018-01-19 22:13:38 +0100 |
| commit | f0111b04ff43ec237fb4419f164a7d1ed1d02bcf (patch) | |
| tree | 5ee4872226b41f6aaaeb0eef2584bbf08e889afb /drivers/gpu/drm/i915/i915_gem_request.c | |
| parent | drm/i915/guc: Keep GuC log disabled by default (diff) | |
| download | kernel-qcow2-linux-f0111b04ff43ec237fb4419f164a7d1ed1d02bcf.tar.gz kernel-qcow2-linux-f0111b04ff43ec237fb4419f164a7d1ed1d02bcf.tar.xz kernel-qcow2-linux-f0111b04ff43ec237fb4419f164a7d1ed1d02bcf.zip | |
drm/i915: Shrink the request kmem_cache on allocation error
If we fail to allocate a new request, make sure we recover the pages
that are in the process of being freed by inserting an RCU barrier.
v2: Comment before the shrink and barrier in the error path.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180119144657.22606-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_request.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_request.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_request.c b/drivers/gpu/drm/i915/i915_gem_request.c index 72bdc203716f..a0f451b4a4e8 100644 --- a/drivers/gpu/drm/i915/i915_gem_request.c +++ b/drivers/gpu/drm/i915/i915_gem_request.c @@ -696,6 +696,17 @@ i915_gem_request_alloc(struct intel_engine_cs *engine, if (ret) goto err_unreserve; + /* + * We've forced the client to stall and catch up with whatever + * backlog there might have been. As we are assuming that we + * caused the mempressure, now is an opportune time to + * recover as much memory from the request pool as is possible. + * Having already penalized the client to stall, we spend + * a little extra time to re-optimise page allocation. + */ + kmem_cache_shrink(dev_priv->requests); + rcu_barrier(); /* Recover the TYPESAFE_BY_RCU pages */ + req = kmem_cache_alloc(dev_priv->requests, GFP_KERNEL); if (!req) { ret = -ENOMEM; |