<!DOCTYPE html> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> </head> <body> Am 11.12.23 um 05:29 schrieb Wang, Beyond: <blockquote type="cite" cite="mid:BY5PR12MB41949AE4BD8E4178962FFDE5F78FA@BY5PR12MB4194.namprd12.prod.outlook.com"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style>@font-face {font-family:"Cambria Math"; panose-1:2 4 5 3 5 4 6 3 2 4;}@font-face {font-family:DengXian; panose-1:2 1 6 0 3 1 1 1 1 1;}@font-face {font-family:Calibri; panose-1:2 15 5 2 2 2 4 3 2 4;}@font-face {font-family:"\@DengXian"; panose-1:2 1 6 0 3 1 1 1 1 1;}p.MsoNormal, li.MsoNormal, div.MsoNormal {margin:0cm; font-size:11.0pt; font-family:"Calibri",sans-serif; mso-ligatures:standardcontextual;}a:link, span.MsoHyperlink {mso-style-priority:99; color:#0563C1; text-decoration:underline;}span.EmailStyle17 {mso-style-type:personal-compose; font-family:"Calibri",sans-serif; color:windowtext;}.MsoChpDefault {mso-style-type:export-only; font-family:"Calibri",sans-serif;}div.WordSection1 {page:WordSection1;}</style> [AMD Official Use Only - General] <div> <div class="WordSection1"> Subject: [PATCH 1/1] drm/amdgpu: fix ftrace event amdgpu_bo_move always move on same heap<o:p></o:p> <o:p> </o:p> Issue: during evict or validate happened on amdgpu_bo, the 'from' and<o:p></o:p> 'to' is always same in ftrace event of amdgpu_bo_move<o:p></o:p> <o:p> </o:p> where calling the 'trace_amdgpu_bo_move', the comment says move_notify<o:p></o:p> is called before move happens, but actually it is called after move<o:p></o:p> happens, here the new_mem is same as bo->resource<o:p></o:p> <o:p> </o:p> Fix: pass old_mem instead when calling amdgpu_bo_move_notify </div> </div> </blockquote> Good catch, but the tracepoint should probably be removed altogether. amdgpu_bo_move_notify() is more for invalidation the mappings when something is moved or released. We should rather add that to amdgpu_bo_move(). Regards, Christian. <blockquote type="cite" cite="mid:BY5PR12MB41949AE4BD8E4178962FFDE5F78FA@BY5PR12MB4194.namprd12.prod.outlook.com"> <div> <div class="WordSection1"> <o:p></o:p> <o:p> </o:p> Signed-off-by: Wang, Beyond <a href="mailto:Wang.Beyond@amd.com" moz-do-not-send="true" class="moz-txt-link-freetext"> Wang.Beyond@amd.com</a><o:p></o:p> ---<o:p></o:p> drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 10 +++++-----<o:p></o:p> drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +-<o:p></o:p> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-<o:p></o:p> 3 files changed, 7 insertions(+), 7 deletions(-)<o:p></o:p> <o:p> </o:p> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c<o:p></o:p> index 7416799..0288495 100644<o:p></o:p> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c<o:p></o:p> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c<o:p></o:p> @@ -1282,7 +1282,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,<o:p></o:p> * amdgpu_bo_move_notify - notification about a memory move<o:p></o:p> * @bo: pointer to a buffer object<o:p></o:p> * @evict: if this move is evicting the buffer from the graphics address space<o:p></o:p> - * @new_mem: new information of the bufer object<o:p></o:p> + * @old_mem: old information of the buffer object<o:p></o:p> *<o:p></o:p> * Marks the corresponding &amdgpu_bo buffer object as invalid, also performs<o:p></o:p> * bookkeeping.<o:p></o:p> @@ -1290,11 +1290,11 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,<o:p></o:p> */<o:p></o:p> void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,<o:p></o:p> bool evict,<o:p></o:p> - struct ttm_resource *new_mem)<o:p></o:p> + struct ttm_resource *old_mem)<o:p></o:p> {<o:p></o:p> struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);<o:p></o:p> struct amdgpu_bo *abo;<o:p></o:p> - struct ttm_resource *old_mem = bo->resource;<o:p></o:p> + struct ttm_resource *new_mem = bo->resource;<o:p></o:p> <o:p> </o:p> if (!amdgpu_bo_is_amdgpu_bo(bo))<o:p></o:p> return;<o:p></o:p> @@ -1315,10 +1315,10 @@ void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,<o:p></o:p> atomic64_inc(&adev->num_evictions);<o:p></o:p> <o:p> </o:p> /* update statistics */<o:p></o:p> - if (!new_mem)<o:p></o:p> + if (!old_mem || !new_mem)<o:p></o:p> return;<o:p></o:p> <o:p> </o:p> - /* move_notify is called before move happens */<o:p></o:p> + /* move_notify is called after move happens in amdgpu_bo_move */<o:p></o:p> trace_amdgpu_bo_move(abo, new_mem->mem_type, old_mem->mem_type);<o:p></o:p> }<o:p></o:p> <o:p> </o:p> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h<o:p></o:p> index 876acde..88be4b8 100644<o:p></o:p> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h<o:p></o:p> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h<o:p></o:p> @@ -362,7 +362,7 @@ int amdgpu_bo_get_metadata(struct amdgpu_bo *bo, void *buffer,<o:p></o:p> uint64_t *flags);<o:p></o:p> void amdgpu_bo_move_notify(struct ttm_buffer_object *bo,<o:p></o:p> bool evict,<o:p></o:p> - struct ttm_resource *new_mem);<o:p></o:p> + struct ttm_resource *old_mem);<o:p></o:p> void amdgpu_bo_release_notify(struct ttm_buffer_object *bo);<o:p></o:p> vm_fault_t amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo);<o:p></o:p> void amdgpu_bo_fence(struct amdgpu_bo *bo, struct dma_fence *fence,<o:p></o:p> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c<o:p></o:p> index 41ed6a3..8cc85d3 100644<o:p></o:p> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c<o:p></o:p> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c<o:p></o:p> @@ -579,7 +579,7 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,<o:p></o:p> out:<o:p></o:p> /* update statistics */<o:p></o:p> atomic64_add(bo->base.size, &adev->num_bytes_moved);<o:p></o:p> - amdgpu_bo_move_notify(bo, evict, new_mem);<o:p></o:p> + amdgpu_bo_move_notify(bo, evict, old_mem);<o:p></o:p> return 0;<o:p></o:p> }<o:p></o:p> <o:p> </o:p> --<o:p></o:p> 2.34.1<o:p></o:p> </div> </div> </blockquote> </body> </html>