Commit 4453545b authored by David Gow's avatar David Gow Committed by Christian König
Browse files

drm: buddy_allocator: Fix buddy allocator init on 32-bit systems 



The drm buddy allocator tests were broken on 32-bit systems, as
rounddown_pow_of_two() takes a long, and the buddy allocator handles
64-bit sizes even on 32-bit systems.

This can be reproduced with the drm_buddy_allocator KUnit tests on i386:
	./tools/testing/kunit/kunit.py run --arch i386 \
	--kunitconfig ./drivers/gpu/drm/tests drm_buddy

(It results in kernel BUG_ON() when too many blocks are created, due to
the block size being too small.)

This was independently uncovered (and fixed) by Luís Mendes, whose patch
added a new u64 variant of rounddown_pow_of_two(). This version instead
recalculates the size based on the order.

Reported-by: default avatarLuís Mendes <luis.p.mendes@gmail.com>
Link: https://lore.kernel.org/lkml/CAEzXK1oghXAB_KpKpm=-CviDQbNaH0qfgYTSSjZgvvyj4U78AA@mail.gmail.com/T/


Signed-off-by: default avatarDavid Gow <davidgow@google.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarArunpravin Paneer Selvam <arunpravin.paneerselvam@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230329065532.2122295-1-davidgow@google.com


Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
parent 30fb97ba

drivers/gpu/drm/drm_buddy.c

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ int drm_buddy_init(struct drm_buddy *mm, u64 size, u64 chunk_size) 
		unsigned int order;

		u64 root_size;



		root_size = rounddown_pow_of_two(size);

		order = ilog2(root_size) - ilog2(chunk_size);

		order = ilog2(size) - ilog2(chunk_size);

		root_size = chunk_size << order;



		root = drm_block_alloc(mm, NULL, order, offset);

		if (!root)