<html><head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> Turns out Steven's patch was already in so i just cherry-picked the change from drm-next-misc Emily - it's in. Andrey <div class="moz-cite-prefix">On 12/3/19 2:59 PM, Deucher, Alexander wrote: </div> <blockquote type="cite" cite="mid:MWHPR12MB135874597AF738D51965F925F7420@MWHPR12MB1358.namprd12.prod.outlook.com"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> [AMD Official Use Only - Internal Distribution Only] <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Cherry pick whatever dependencies you need or pick the older version of the patch. Either way works.</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);"> Alex </div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: Grodzovsky, Andrey <a class="moz-txt-link-rfc2396E" href="mailto:Andrey.Grodzovsky@amd.com"><Andrey.Grodzovsky@amd.com></a> Sent: Tuesday, December 3, 2019 2:57 PM To: Deucher, Alexander <a class="moz-txt-link-rfc2396E" href="mailto:Alexander.Deucher@amd.com"><Alexander.Deucher@amd.com></a>; Deng, Emily <a class="moz-txt-link-rfc2396E" href="mailto:Emily.Deng@amd.com"><Emily.Deng@amd.com></a> Cc: <a class="moz-txt-link-abbreviated" href="mailto:dri-devel@lists.freedesktop.org">dri-devel@lists.freedesktop.org</a> <a class="moz-txt-link-rfc2396E" href="mailto:dri-devel@lists.freedesktop.org"><dri-devel@lists.freedesktop.org></a>; <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx@lists.freedesktop.org"><amd-gfx@lists.freedesktop.org></a>; Koenig, Christian <a class="moz-txt-link-rfc2396E" href="mailto:Christian.Koenig@amd.com"><Christian.Koenig@amd.com></a>; <a class="moz-txt-link-abbreviated" href="mailto:steven.price@arm.com">steven.price@arm.com</a> <a class="moz-txt-link-rfc2396E" href="mailto:steven.price@arm.com"><steven.price@arm.com></a> Subject: Re: [PATCH v4] drm/scheduler: Avoid accessing freed bad job. <div> </div> </div> <div style="background-color:#FFFFFF"> I don't think i can apply this patch 'as is' as this has dependency on patch by Steven which also wasn't applied yet - 588b982 Steven Price 6 weeks ago drm: Don't free jobs in wait_event_interruptible() Andrey <div class="x_moz-cite-prefix">On 12/3/19 2:44 PM, Deucher, Alexander wrote: </div> <blockquote type="cite"> <style type="text/css" style="display:none">  </style> [AMD Official Use Only - Internal Distribution Only] <div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> Please go ahead an apply whatever version is necessary for amd-staging-drm-next.</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> </div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> Alex</div> <div style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)"> </div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="x_divRplyFwdMsg" dir="ltr">From: Grodzovsky, Andrey <a class="x_moz-txt-link-rfc2396E" href="mailto:Andrey.Grodzovsky@amd.com" moz-do-not-send="true"><Andrey.Grodzovsky@amd.com></a> Sent: Tuesday, December 3, 2019 2:10 PM To: Deng, Emily <a class="x_moz-txt-link-rfc2396E" href="mailto:Emily.Deng@amd.com" moz-do-not-send="true"> <Emily.Deng@amd.com></a>; Deucher, Alexander <a class="x_moz-txt-link-rfc2396E" href="mailto:Alexander.Deucher@amd.com" moz-do-not-send="true"> <Alexander.Deucher@amd.com></a> Cc: <a class="x_moz-txt-link-abbreviated" href="mailto:dri-devel@lists.freedesktop.org" moz-do-not-send="true"> dri-devel@lists.freedesktop.org</a> <a class="x_moz-txt-link-rfc2396E" href="mailto:dri-devel@lists.freedesktop.org" moz-do-not-send="true"> <dri-devel@lists.freedesktop.org></a>; <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"> amd-gfx@lists.freedesktop.org</a> <a class="x_moz-txt-link-rfc2396E" href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"> <amd-gfx@lists.freedesktop.org></a>; Koenig, Christian <a class="x_moz-txt-link-rfc2396E" href="mailto:Christian.Koenig@amd.com" moz-do-not-send="true"> <Christian.Koenig@amd.com></a>; <a class="x_moz-txt-link-abbreviated" href="mailto:steven.price@arm.com" moz-do-not-send="true"> steven.price@arm.com</a> <a class="x_moz-txt-link-rfc2396E" href="mailto:steven.price@arm.com" moz-do-not-send="true"> <steven.price@arm.com></a> Subject: Re: [PATCH v4] drm/scheduler: Avoid accessing freed bad job. <div> </div> </div> <div class="x_BodyFragment"> <div class="x_PlainText">Yes - Christian just pushed it to drm-next-misc - I guess Alex/Christian didn't pull to amd-staging-drm-next yet. Andrey On 12/2/19 2:24 PM, Deng, Emily wrote: > [AMD Official Use Only - Internal Distribution Only] > > Hi Andrey, > Seems this patch is still not in amd-staging-drm-next? > > Best wishes > Emily Deng > > > >> -----Original Message----- >> From: Deng, Emily >> Sent: Tuesday, November 26, 2019 4:41 PM >> To: Grodzovsky, Andrey <a class="x_moz-txt-link-rfc2396E" href="mailto:Andrey.Grodzovsky@amd.com" moz-do-not-send="true"> <Andrey.Grodzovsky@amd.com></a> >> Cc: <a class="x_moz-txt-link-abbreviated" href="mailto:dri-devel@lists.freedesktop.org" moz-do-not-send="true"> dri-devel@lists.freedesktop.org</a>; <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"> amd-gfx@lists.freedesktop.org</a>; Koenig, >> Christian <a class="x_moz-txt-link-rfc2396E" href="mailto:Christian.Koenig@amd.com" moz-do-not-send="true"> <Christian.Koenig@amd.com></a>; <a class="x_moz-txt-link-abbreviated" href="mailto:steven.price@arm.com" moz-do-not-send="true"> steven.price@arm.com</a> >> Subject: RE: [PATCH v4] drm/scheduler: Avoid accessing freed bad job. >> >> [AMD Official Use Only - Internal Distribution Only] >> >> Reviewed-by: Emily Deng <a class="x_moz-txt-link-rfc2396E" href="mailto:Emily.Deng@amd.com" moz-do-not-send="true"> <Emily.Deng@amd.com></a> >> >>> -----Original Message----- >>> From: Grodzovsky, Andrey <a class="x_moz-txt-link-rfc2396E" href="mailto:Andrey.Grodzovsky@amd.com" moz-do-not-send="true"> <Andrey.Grodzovsky@amd.com></a> >>> Sent: Tuesday, November 26, 2019 7:37 AM >>> Cc: <a class="x_moz-txt-link-abbreviated" href="mailto:dri-devel@lists.freedesktop.org" moz-do-not-send="true"> dri-devel@lists.freedesktop.org</a>; <a class="x_moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org" moz-do-not-send="true"> amd-gfx@lists.freedesktop.org</a>; >>> Koenig, Christian <a class="x_moz-txt-link-rfc2396E" href="mailto:Christian.Koenig@amd.com" moz-do-not-send="true"> <Christian.Koenig@amd.com></a>; Deng, Emily >>> <a class="x_moz-txt-link-rfc2396E" href="mailto:Emily.Deng@amd.com" moz-do-not-send="true"><Emily.Deng@amd.com></a>; <a class="x_moz-txt-link-abbreviated" href="mailto:steven.price@arm.com" moz-do-not-send="true">steven.price@arm.com</a> >>> Subject: Re: [PATCH v4] drm/scheduler: Avoid accessing freed bad job. >>> >>> Ping >>> >>> Andrey >>> >>> On 11/25/19 3:51 PM, Andrey Grodzovsky wrote: >>>> Problem: >>>> Due to a race between drm_sched_cleanup_jobs in sched thread and >>>> drm_sched_job_timedout in timeout work there is a possiblity that bad >>>> job was already freed while still being accessed from the timeout >>>> thread. >>>> >>>> Fix: >>>> Instead of just peeking at the bad job in the mirror list remove it >>>> from the list under lock and then put it back later when we are >>>> garanteed no race with main sched thread is possible which is after >>>> the thread is parked. >>>> >>>> v2: Lock around processing ring_mirror_list in drm_sched_cleanup_jobs. >>>> >>>> v3: Rebase on top of drm-misc-next. v2 is not needed anymore as >>>> drm_sched_get_cleanup_job already has a lock there. >>>> >>>> v4: Fix comments to relfect latest code in drm-misc. >>>> >>>> Signed-off-by: Andrey Grodzovsky <a class="x_moz-txt-link-rfc2396E" href="mailto:andrey.grodzovsky@amd.com" moz-do-not-send="true"> <andrey.grodzovsky@amd.com></a> >>>> Reviewed-by: Christian König <a class="x_moz-txt-link-rfc2396E" href="mailto:christian.koenig@amd.com" moz-do-not-send="true"> <christian.koenig@amd.com></a> >>>> Tested-by: Emily Deng <a class="x_moz-txt-link-rfc2396E" href="mailto:Emily.Deng@amd.com" moz-do-not-send="true"> <Emily.Deng@amd.com></a> >>>> --- >>>> drivers/gpu/drm/scheduler/sched_main.c | 27 >>> +++++++++++++++++++++++++++ >>>> 1 file changed, 27 insertions(+) >>>> >>>> diff --git a/drivers/gpu/drm/scheduler/sched_main.c >>>> b/drivers/gpu/drm/scheduler/sched_main.c >>>> index 6774955..1bf9c40 100644 >>>> --- a/drivers/gpu/drm/scheduler/sched_main.c >>>> +++ b/drivers/gpu/drm/scheduler/sched_main.c >>>> @@ -284,10 +284,21 @@ static void drm_sched_job_timedout(struct >>> work_struct *work) >>>> unsigned long flags; >>>> >>>> sched = container_of(work, struct drm_gpu_scheduler, >>>> work_tdr.work); >>>> + >>>> + /* Protects against concurrent deletion in >>> drm_sched_get_cleanup_job */ >>>> + spin_lock_irqsave(&sched->job_list_lock, flags); >>>> job = list_first_entry_or_null(&sched->ring_mirror_list, >>>> struct drm_sched_job, node); >>>> >>>> if (job) { >>>> + /* >>>> + * Remove the bad job so it cannot be freed by concurrent >>>> + * drm_sched_cleanup_jobs. It will be reinserted back after >>> sched->thread >>>> + * is parked at which point it's safe. >>>> + */ >>>> + list_del_init(&job->node); >>>> + spin_unlock_irqrestore(&sched->job_list_lock, flags); >>>> + >>>> job->sched->ops->timedout_job(job); >>>> >>>> /* >>>> @@ -298,6 +309,8 @@ static void drm_sched_job_timedout(struct >>> work_struct *work) >>>> job->sched->ops->free_job(job); >>>> sched->free_guilty = false; >>>> } >>>> + } else { >>>> + spin_unlock_irqrestore(&sched->job_list_lock, flags); >>>> } >>>> >>>> spin_lock_irqsave(&sched->job_list_lock, flags); @@ -370,6 +383,20 >>>> @@ void drm_sched_stop(struct drm_gpu_scheduler *sched, struct >>> drm_sched_job *bad) >>>> kthread_park(sched->thread); >>>> >>>> /* >>>> + * Reinsert back the bad job here - now it's safe as >>>> + * drm_sched_get_cleanup_job cannot race against us and release the >>>> + * bad job at this point - we parked (waited for) any in progress >>>> + * (earlier) cleanups and drm_sched_get_cleanup_job will not be >>> called >>>> + * now until the scheduler thread is unparked. >>>> + */ >>>> + if (bad && bad->sched == sched) >>>> + /* >>>> + * Add at the head of the queue to reflect it was the earliest >>>> + * job extracted. >>>> + */ >>>> + list_add(&bad->node, &sched->ring_mirror_list); >>>> + >>>> + /* >>>> * Iterate the job list from later to earlier one and either deactive >>>> * their HW callbacks or remove them from mirror list if they already >>>> * signaled. </div> </div> </div> </blockquote> </div> </div> </blockquote> </body> </html>