From: "Christian König" <christian.koenig@amd.com>
To: "Jani Nikula" <jani.nikula@linux.intel.com>,
"David Gow" <davidgow@google.com>,
"Luís Mendes" <luis.p.mendes@gmail.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maíra Canal" <mairacanal@riseup.net>,
"Arthur Grillo" <arthurgrillo@riseup.net>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] drm: buddy_allocator: Fix buddy allocator init on 32-bit systems
Date: Thu, 30 Mar 2023 12:56:27 +0200 [thread overview]
Message-ID: <e1af591e-a183-9b22-f533-297934e15e30@amd.com> (raw)
In-Reply-To: <878rfe4iis.fsf@intel.com>
Am 30.03.23 um 12:53 schrieb Jani Nikula:
> On Wed, 29 Mar 2023, David Gow <davidgow@google.com> wrote:
>> 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: Luís Mendes <luis.p.mendes@gmail.com>
>> Link: https://lore.kernel.org/lkml/CAEzXK1oghXAB_KpKpm=-CviDQbNaH0qfgYTSSjZgvvyj4U78AA@mail.gmail.com/T/
>> Signed-off-by: David Gow <davidgow@google.com>
>> ---
>> drivers/gpu/drm/drm_buddy.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/drm_buddy.c b/drivers/gpu/drm/drm_buddy.c
>> index 3d1f50f481cf..7098f125b54a 100644
>> --- a/drivers/gpu/drm/drm_buddy.c
>> +++ b/drivers/gpu/drm/drm_buddy.c
>> @@ -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;
> Just noticed near the beginning of the function there's also:
>
> if (!is_power_of_2(chunk_size))
> return -EINVAL;
>
> which is also wrong for 32-bit.
Yeah, but that isn't vital. We just use u64 for the chunk_size for
consistency.
In reality I wouldn't except more than 256K here.
Regards,
Christian.
>
>
> BR,
> Jani.
>
>
>>
>> root = drm_block_alloc(mm, NULL, order, offset);
>> if (!root)
next prev parent reply other threads:[~2023-03-30 10:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-29 6:55 David Gow
2023-03-29 6:55 ` [PATCH 2/2] drm: test: Fix 32-bit issue in drm_buddy_test David Gow
2023-03-29 9:39 ` Jani Nikula
2023-03-29 9:42 ` Jani Nikula
2023-03-29 10:54 ` Maíra Canal
2023-03-29 11:28 ` Jani Nikula
2023-03-29 13:14 ` Christian König
2023-03-29 7:04 ` [PATCH 1/2] drm: buddy_allocator: Fix buddy allocator init on 32-bit systems Christian König
2023-03-30 10:53 ` Jani Nikula
2023-03-30 10:56 ` Christian König [this message]
2023-03-30 11:12 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e1af591e-a183-9b22-f533-297934e15e30@amd.com \
--to=christian.koenig@amd.com \
--cc=airlied@gmail.com \
--cc=arthurgrillo@riseup.net \
--cc=daniel@ffwll.ch \
--cc=davidgow@google.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luis.p.mendes@gmail.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mairacanal@riseup.net \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®