Skip to content

Commit

Permalink
drm/i915/selftests: Move mock_vma to the heap to reduce stack_frame
Browse files Browse the repository at this point in the history
An i915_vma struct on the stack may push the frame over the limit, if
set conservatively, so move it to the heap.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191125124856.1761176-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Nov 25, 2019
1 parent 4f88f87 commit 34f5fe1
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,12 @@ static int lowlevel_hole(struct drm_i915_private *i915,
unsigned long end_time)
{
I915_RND_STATE(seed_prng);
struct i915_vma *mock_vma;
unsigned int size;
struct i915_vma mock_vma;

memset(&mock_vma, 0, sizeof(struct i915_vma));
mock_vma = kzalloc(sizeof(*mock_vma), GFP_KERNEL);
if (!mock_vma)
return -ENOMEM;

/* Keep creating larger objects until one cannot fit into the hole */
for (size = 12; (hole_end - hole_start) >> size; size++) {
Expand All @@ -239,8 +241,10 @@ static int lowlevel_hole(struct drm_i915_private *i915,
if (order)
break;
} while (count >>= 1);
if (!count)
if (!count) {
kfree(mock_vma);
return -ENOMEM;
}
GEM_BUG_ON(!order);

GEM_BUG_ON(count * BIT_ULL(size) > vm->total);
Expand Down Expand Up @@ -283,12 +287,12 @@ static int lowlevel_hole(struct drm_i915_private *i915,
vm->allocate_va_range(vm, addr, BIT_ULL(size)))
break;

mock_vma.pages = obj->mm.pages;
mock_vma.node.size = BIT_ULL(size);
mock_vma.node.start = addr;
mock_vma->pages = obj->mm.pages;
mock_vma->node.size = BIT_ULL(size);
mock_vma->node.start = addr;

with_intel_runtime_pm(&i915->runtime_pm, wakeref)
vm->insert_entries(vm, &mock_vma,
vm->insert_entries(vm, mock_vma,
I915_CACHE_NONE, 0);
}
count = n;
Expand All @@ -311,6 +315,7 @@ static int lowlevel_hole(struct drm_i915_private *i915,
cleanup_freed_objects(i915);
}

kfree(mock_vma);
return 0;
}

Expand Down

0 comments on commit 34f5fe1

Please sign in to comment.