From: Abdiel Janulgue abdiel.janulgue@linux.intel.com
In the following patch we need to reserve regions unaccessible to the driver during initialization, so add back mem->reserved for collecting such regions.
Cc: Imre Deak imre.deak@intel.com Signed-off-by: Abdiel Janulgue abdiel.janulgue@linux.intel.com --- drivers/gpu/drm/i915/intel_memory_region.c | 2 + drivers/gpu/drm/i915/intel_memory_region.h | 2 + .../drm/i915/selftests/intel_memory_region.c | 89 +++++++++++++++++++ 3 files changed, 93 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c index c7a1d84e7ee8..554fdd7735a8 100644 --- a/drivers/gpu/drm/i915/intel_memory_region.c +++ b/drivers/gpu/drm/i915/intel_memory_region.c @@ -203,6 +203,7 @@ int intel_memory_region_init_buddy(struct intel_memory_region *mem)
void intel_memory_region_release_buddy(struct intel_memory_region *mem) { + i915_buddy_free_list(&mem->mm, &mem->reserved); i915_buddy_fini(&mem->mm); }
@@ -232,6 +233,7 @@ intel_memory_region_create(struct drm_i915_private *i915, mutex_init(&mem->objects.lock); INIT_LIST_HEAD(&mem->objects.list); INIT_LIST_HEAD(&mem->objects.purgeable); + INIT_LIST_HEAD(&mem->reserved);
mutex_init(&mem->mm_lock);
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h index 8da82cb2afe3..0bfc1fa36f74 100644 --- a/drivers/gpu/drm/i915/intel_memory_region.h +++ b/drivers/gpu/drm/i915/intel_memory_region.h @@ -97,6 +97,8 @@ struct intel_memory_region { struct intel_gt *gt; /* GT closest to this region. */ bool is_devmem; /* true for device memory */
+ struct list_head reserved; + dma_addr_t remap_addr;
struct { diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c index 93e067951e0f..9df0a4f657c1 100644 --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c @@ -134,6 +134,94 @@ static void igt_object_release(struct drm_i915_gem_object *obj) i915_gem_object_put(obj); }
+static int igt_reserve_range(struct intel_memory_region *mem, + struct list_head *reserved, + u64 offset, + u64 size) +{ + int ret; + LIST_HEAD(blocks); + + ret = i915_buddy_alloc_range(&mem->mm, &blocks, offset, size); + if (!ret) + list_splice_tail(&blocks, reserved); + + return ret; +} + +static int igt_mock_reserve(void *arg) +{ + struct drm_i915_gem_object *obj; + struct intel_memory_region *mem = arg; + resource_size_t avail = resource_size(&mem->region); + I915_RND_STATE(prng); + LIST_HEAD(objects); + LIST_HEAD(reserved); + u32 i, offset, count, *order; + u64 allocated, cur_avail; + const u32 chunk_size = SZ_32M; + int err = 0; + + count = avail / chunk_size; + order = i915_random_order(count, &prng); + if (!order) + return 0; + + /* Reserve a bunch of ranges within the region */ + for (i = 0; i < count; ++i) { + u64 start = order[i] * chunk_size; + u64 size = i915_prandom_u32_max_state(chunk_size, &prng); + + /* Allow for some really big holes */ + if (!size) + continue; + + size = round_up(size, PAGE_SIZE); + offset = igt_random_offset(&prng, 0, chunk_size, size, + PAGE_SIZE); + + err = igt_reserve_range(mem, &reserved, start + offset, size); + if (err) { + pr_err("%s failed to reserve range", __func__); + goto out_close; + } + + /* XXX: maybe sanity check the block range here? */ + avail -= size; + } + + /* Try to see if we can allocate from the remaining space */ + allocated = 0; + cur_avail = avail; + do { + u64 size = i915_prandom_u32_max_state(cur_avail, &prng); + + size = max_t(u64, round_up(size, PAGE_SIZE), (u64)PAGE_SIZE); + obj = igt_object_create(mem, &objects, size, 0); + + if (IS_ERR(obj)) { + if (PTR_ERR(obj) == -ENXIO) + break; + + err = PTR_ERR(obj); + goto out_close; + } + cur_avail -= size; + allocated += size; + } while (1); + + if (allocated != avail) { + pr_err("%s mismatch between allocation and free space", __func__); + err = -EINVAL; + } + +out_close: + kfree(order); + close_objects(mem, &objects); + i915_buddy_free_list(&mem->mm, &reserved); + return err; +} + static int igt_mock_contiguous(void *arg) { struct intel_memory_region *mem = arg; @@ -1180,6 +1268,7 @@ static int igt_lmem_pages_migrate(void *arg) int intel_memory_region_mock_selftests(void) { static const struct i915_subtest tests[] = { + SUBTEST(igt_mock_reserve), SUBTEST(igt_mock_fill), SUBTEST(igt_mock_contiguous), SUBTEST(igt_mock_splintered_region),