drm/i915/lmem: Limit block size to 4G
Subsystems (2)
PATCH v2 1/1 drm/i915/lmem: Limit block size to 4G
From: Venkata Sandeep Dhanalakota <[email protected]>
Block sizes are only limited by the largest power-of-two that will fit in the region size, but to construct an object we also require feeding it into an sg list, where the upper limit of the sg entry is at most UINT_MAX. Therefore to prevent issues with allocating blocks that are too large, add the flag I915_ALLOC_MAX_SEGMENT_SIZE which should limit block sizes to the i915_sg_segment_size().
v2: (matt)
- query the max segment.
- prefer flag to limit block size to 4G, since it's best not to assume the user will feed the blocks into an sg list.
- simple selftest so we don't have to guess.
Cc Niranjana Vishwanathapura <[email protected]>
Cc Matthew Auld <[email protected]>
Cc CQ Tang <[email protected]>
Signed-off-by Venkata Sandeep Dhanalakota <[email protected]>
Signed-off-by Matthew Auld <[email protected]>
Reviewed-by Chris Wilson <[email protected]>
--- drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 +- drivers/gpu/drm/i915/intel_memory_region.c | 18 ++++++- drivers/gpu/drm/i915/intel_memory_region.h | 5 +- .../drm/i915/selftests/intel_memory_region.c | 50 +++++++++++++++++++ 4 files changed, 71 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_region.c +1 -1
@@ -42,7 +42,7 @@ i915_gem_object_get_pages_buddy(struct drm_i915_gem_object *obj)return -ENOMEM ; } - flags =I915_ALLOC_MIN_PAGE_SIZE ; + flags =I915_ALLOC_MIN_PAGE_SIZE |I915_ALLOC_MAX_SEGMENT_SIZE ;if (obj->flags &I915_BO_ALLOC_CONTIGUOUS ) flags |=I915_ALLOC_CONTIGUOUS ;
drivers/gpu/drm/i915/intel_memory_region.c +17 -1
@@ -72,6 +72,7 @@ __intel_memory_region_get_pages_buddy(struct intel_memory_region *mem, struct list_head *blocks) {unsigned int min_order =0 ; +unsigned int max_order;unsigned long n_pages;GEM_BUG_ON (!IS_ALIGNED (size, mem->mm.chunk_size));
@@ -92,13 +93,28 @@ __intel_memory_region_get_pages_buddy(struct intel_memory_region *mem, n_pages = size >>ilog2 (mem->mm.chunk_size); +/* +* If we going to feed this into an sg list we should limit the block +* sizes such that we don't exceed the i915_sg_segment_size(). +*/ +if (flags &I915_ALLOC_MAX_SEGMENT_SIZE ) { +unsigned int max_segment =i915_sg_segment_size (); + +if (GEM_WARN_ON (max_segment < mem->mm.chunk_size)) + max_order =0 ; +else + max_order =ilog2 (max_segment) -ilog2 (mem->mm.chunk_size); + }else { + max_order = mem->mm.max_order; + } +mutex_lock (&mem->mm_lock); do { struct i915_buddy_block *block; unsigned int order; - order = fls(n_pages) - 1; + order = min_t(u32, fls(n_pages) - 1, max_order); GEM_BUG_ON(order > mem->mm.max_order); GEM_BUG_ON(order < min_order);
drivers/gpu/drm/i915/intel_memory_region.h +3 -2
@@ -44,8 +44,9 @@ enum intel_region_id {#define MEMORY_TYPE_FROM_REGION (r) (ilog2((r) >> INTEL_MEMORY_TYPE_SHIFT))#define MEMORY_INSTANCE_FROM_REGION (r) (ilog2((r) & 0xffff)) -#define I915_ALLOC_MIN_PAGE_SIZE BIT(0) -#define I915_ALLOC_CONTIGUOUS BIT(1) +#define I915_ALLOC_MIN_PAGE_SIZE BIT(0) +#define I915_ALLOC_CONTIGUOUS BIT(1) +#define I915_ALLOC_MAX_SEGMENT_SIZE BIT(2)#define for_each_memory_region (mr, i915, id) \ for (id = 0; id < ARRAY_SIZE((i915)->mm.regions); id++) \
drivers/gpu/drm/i915/selftests/intel_memory_region.c +50 -0
62 lines not on this page · raw message
Signature · 6 lines
2.26.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx