From: "Christian König" <christian.koenig@amd.com>
To: Thomas Zimmermann <tzimmermann@suse.de>,
alexander.deucher@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com,
daniel@ffwll.ch, felix.kuehling@amd.com
Cc: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/amdgpu: Unmap BO memory before calling amdgpu_bo_unref()
Date: Fri, 21 Jun 2024 10:21:27 +0200 [thread overview]
Message-ID: <d5540c1e-aa66-40ad-ba7c-3c70d3ab3fad@amd.com> (raw)
In-Reply-To: <52f25080-4c56-45cc-b8e9-2ef4910803ed@suse.de>
Am 21.06.24 um 09:32 schrieb Thomas Zimmermann:
> Hi
>
> Am 20.06.24 um 17:50 schrieb Christian König:
>> Am 20.06.24 um 16:44 schrieb Thomas Zimmermann:
>>> Prepares for using ttm_bo_vmap() and ttm_bo_vunmap() in amdgpu. Both
>>> require the caller to hold the GEM reservation lock, which is not the
>>> case while releasing a buffer object. Hence, push a possible call to
>>> unmap out from the buffer-object release code. Warn if a buffer object
>>> with mapped pages is supposed to be released.
>>
>> Yeah, I've looked into this a while ago as well and that
>> unfortunately won't work like this.
>>
>> Amdgpu also uses ttm_bo_kmap() on user allocations, so the
>> amdgpu_bo_kunmap() in amdgpu_bo_destroy() is a must have.
>
> Is there a testcase (igt-gpu-tools ?) that runs this code? I've
> tested these patches by booting and running a 3d game under X11. But I
> didn't expect that to fully cover all cases.
You need a hardware generation and use case which needs patching or
inspection of IBs.
Video decoding on old SI or CIK hardware generation should probably do
the trick.
Regards,
Christian.
>
> Best regards
> Thomas
>
>>
>> On the other hand I'm pretty sure that calling ttm_bo_vunmap()
>> without holding the reservation lock is ok in this situation.
>>
>> After all it's guaranteed that nobody else is having a reference to
>> the BO any more.
>>
>> Regards,
>> Christian.
>>
>>>
>>> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 11 +++++++----
>>> 1 file changed, 7 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>>> index a1b7438c43dc8..d58b11ea0ead5 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
>>> @@ -58,7 +58,12 @@ static void amdgpu_bo_destroy(struct
>>> ttm_buffer_object *tbo)
>>> {
>>> struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
>>> - amdgpu_bo_kunmap(bo);
>>> + /*
>>> + * BO memory pages should be unmapped at this point. Call
>>> + * amdgpu_bo_kunmap() before releasing the BO.
>>> + */
>>> + if (drm_WARN_ON_ONCE(bo->tbo.base.dev, bo->kmap.bo))
>>> + amdgpu_bo_kunmap(bo);
>>> if (bo->tbo.base.import_attach)
>>> drm_prime_gem_destroy(&bo->tbo.base, bo->tbo.sg);
>>> @@ -450,9 +455,7 @@ void amdgpu_bo_free_kernel(struct amdgpu_bo
>>> **bo, u64 *gpu_addr,
>>> WARN_ON(amdgpu_ttm_adev((*bo)->tbo.bdev)->in_suspend);
>>> if (likely(amdgpu_bo_reserve(*bo, true) == 0)) {
>>> - if (cpu_addr)
>>> - amdgpu_bo_kunmap(*bo);
>>> -
>>> + amdgpu_bo_kunmap(*bo);
>>> amdgpu_bo_unpin(*bo);
>>> amdgpu_bo_unreserve(*bo);
>>> }
>>
>
next prev parent reply other threads:[~2024-06-21 8:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 14:44 [RFC PATCH 0/2] drm/amdgpu: Convert to ttm_bo_vmap() Thomas Zimmermann
2024-06-20 14:44 ` [PATCH 1/2] drm/amdgpu: Unmap BO memory before calling amdgpu_bo_unref() Thomas Zimmermann
2024-06-20 15:50 ` Christian König
2024-06-21 7:32 ` Thomas Zimmermann
2024-06-21 8:21 ` Christian König [this message]
2024-06-20 14:44 ` [PATCH 2/2] drm/amdgpu: Convert to ttm_bo_vmap() et al Thomas Zimmermann
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=d5540c1e-aa66-40ad-ba7c-3c70d3ab3fad@amd.com \
--to=christian.koenig@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=felix.kuehling@amd.com \
--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