From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/3] drm/scheduler: Don't call wait_event_killable for signaled process. Date: Tue, 24 Apr 2018 23:40:27 +0200 Message-ID: <20180424214027.GG25142@phenom.ffwll.local> References: <1524583836-12130-1-git-send-email-andrey.grodzovsky@amd.com> <1524583836-12130-3-git-send-email-andrey.grodzovsky@amd.com> <7313704c-0693-0bb9-8818-99cd2b7c0ca0@daenzer.net> <20180424194418.GE25142@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Andrey Grodzovsky Cc: David.Panariti@amd.com, Michel =?iso-8859-1?Q?D=E4nzer?= , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, oleg@redhat.com, amd-gfx@lists.freedesktop.org, Alexander.Deucher@amd.com, akpm@linux-foundation.org, Christian.Koenig@amd.com, ebiederm@xmission.com List-Id: amd-gfx.lists.freedesktop.org T24gVHVlLCBBcHIgMjQsIDIwMTggYXQgMDU6MDI6NDBQTSAtMDQwMCwgQW5kcmV5IEdyb2R6b3Zz a3kgd3JvdGU6Cj4gCj4gCj4gT24gMDQvMjQvMjAxOCAwMzo0NCBQTSwgRGFuaWVsIFZldHRlciB3 cm90ZToKPiA+IE9uIFR1ZSwgQXByIDI0LCAyMDE4IGF0IDA1OjQ2OjUyUE0gKzAyMDAsIE1pY2hl bCBEw6RuemVyIHdyb3RlOgo+ID4gPiBBZGRpbmcgdGhlIGRyaS1kZXZlbCBsaXN0LCBzaW5jZSB0 aGlzIGlzIGRyaXZlciBpbmRlcGVuZGVudCBjb2RlLgo+ID4gPiAKPiA+ID4gCj4gPiA+IE9uIDIw MTgtMDQtMjQgMDU6MzAgUE0sIEFuZHJleSBHcm9kem92c2t5IHdyb3RlOgo+ID4gPiA+IEF2b2lk IGNhbGxpbmcgd2FpdF9ldmVudF9raWxsYWJsZSB3aGVuIHlvdSBhcmUgcG9zc2libHkgYmVpbmcg Y2FsbGVkCj4gPiA+ID4gZnJvbSBnZXRfc2lnbmFsIHJvdXRpbmUgc2luY2UgaW4gdGhhdCBjYXNl IHlvdSBlbmQgdXAgaW4gYSBkZWFkbG9jawo+ID4gPiA+IHdoZXJlIHlvdSBhcmUgYWxyZWF5IGJs b2NrZWQgaW4gc2luZ2xhIHByb2Nlc3NpbmcgYW55IHRyeWluZyB0byB3YWl0Cj4gPiA+IE11bHRp cGxlIHR5cG9zIGhlcmUsICJbLi4uXSBhbHJlYWR5IGJsb2NrZWQgaW4gc2lnbmFsIHByb2Nlc3Np bmcgYW5kIFsuLi5dIj8KPiA+ID4gCj4gPiA+IAo+ID4gPiA+IG9uIGEgbmV3IHNpZ25hbC4KPiA+ ID4gPiAKPiA+ID4gPiBTaWduZWQtb2ZmLWJ5OiBBbmRyZXkgR3JvZHpvdnNreSA8YW5kcmV5Lmdy b2R6b3Zza3lAYW1kLmNvbT4KPiA+ID4gPiAtLS0KPiA+ID4gPiAgIGRyaXZlcnMvZ3B1L2RybS9z Y2hlZHVsZXIvZ3B1X3NjaGVkdWxlci5jIHwgNSArKystLQo+ID4gPiA+ICAgMSBmaWxlIGNoYW5n ZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKPiA+ID4gPiAKPiA+ID4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxlci9ncHVfc2NoZWR1bGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL2dwdV9zY2hlZHVsZXIuYwo+ID4gPiA+IGluZGV4IDA4OGZm MmIuLjA5ZmQyNTggMTAwNjQ0Cj4gPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxl ci9ncHVfc2NoZWR1bGVyLmMKPiA+ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVy L2dwdV9zY2hlZHVsZXIuYwo+ID4gPiA+IEBAIC0yMjcsOSArMjI3LDEwIEBAIHZvaWQgZHJtX3Nj aGVkX2VudGl0eV9kb19yZWxlYXNlKHN0cnVjdCBkcm1fZ3B1X3NjaGVkdWxlciAqc2NoZWQsCj4g PiA+ID4gICAJCXJldHVybjsKPiA+ID4gPiAgIAkvKioKPiA+ID4gPiAgIAkgKiBUaGUgY2xpZW50 IHdpbGwgbm90IHF1ZXVlIG1vcmUgSUJzIGR1cmluZyB0aGlzIGZpbmksIGNvbnN1bWUgZXhpc3Rp bmcKPiA+ID4gPiAtCSAqIHF1ZXVlZCBJQnMgb3IgZGlzY2FyZCB0aGVtIG9uIFNJR0tJTEwKPiA+ ID4gPiArCSAqIHF1ZXVlZCBJQnMgb3IgZGlzY2FyZCB0aGVtIHdoZW4gaW4gZGVhdGggc2lnbmFs IHN0YXRlIHNpbmNlCj4gPiA+ID4gKwkgKiB3YWl0X2V2ZW50X2tpbGxhYmxlIGNhbid0IHJlY2Vp dmUgc2lnbmFscyBpbiB0aGF0IHN0YXRlLgo+ID4gPiA+ICAgCSovCj4gPiA+ID4gLQlpZiAoKGN1 cnJlbnQtPmZsYWdzICYgUEZfU0lHTkFMRUQpICYmIGN1cnJlbnQtPmV4aXRfY29kZSA9PSBTSUdL SUxMKQo+ID4gPiA+ICsJaWYgKGN1cnJlbnQtPmZsYWdzICYgUEZfU0lHTkFMRUQpCj4gPiBZb3Ug d2FudCBmYXRhbF9zaWduYWxfcGVuZGluZygpIGhlcmUsIGluc3RlYWQgb2YgaW52ZW50aW5nIHlv dXIgb3duIGJyb2tlbgo+ID4gdmVyc2lvbi4KPiAKPiBJIHJlbHkgb24gY3VycmVudC0+ZmxhZ3Mg JiBQRl9TSUdOQUxFRCBiZWNhdXNlIHRoaXMgYmVpbmcgc2V0IGZyb20gd2l0aGluCj4gZ2V0X3Np Z25hbCwKPiBtZWFuaW5nIEkgYW0gd2l0aGluIHNpZ25hbCBwcm9jZXNzaW5nwqAgaW4gd2hpY2gg Y2FzZSBJIHdhbnQgdG8gYXZvaWQgYW55Cj4gc2lnbmFsIGJhc2VkIHdhaXQgZm9yIHRoYXQgdGFz aywKPiBGcm9tIHdoYXQgaSBzZWUgaW4gdGhlIGNvZGUsIHRhc2tfc3RydWN0LnBlbmRpbmcuc2ln bmFsIGlzIGJlaW5nIHNldCBmb3IKPiBvdGhlciB0aHJlYWRzIGluIHNhbWUKPiBncm91cCAoemFw X290aGVyX3RocmVhZHMpIG9yIGZvciBvdGhlciBzY2VuYXJpb3MsIHRob3NlIHRhc2sgYXJlIHN0 aWxsIGFibGUKPiB0byByZWNlaXZlIHNpZ25hbHMKPiBzbyBjYWxsaW5nIHdhaXRfZXZlbnRfa2ls bGFibGUgdGhlcmUgd2lsbCBub3QgaGF2ZSBwcm9ibGVtLgo+ID4gPiA+ICAgCQllbnRpdHktPmZp bmlfc3RhdHVzID0gLUVSRVNUQVJUU1lTOwo+ID4gPiA+ICAgCWVsc2UKPiA+ID4gPiAgIAkJZW50 aXR5LT5maW5pX3N0YXR1cyA9IHdhaXRfZXZlbnRfa2lsbGFibGUoc2NoZWQtPmpvYl9zY2hlZHVs ZWQsCj4gPiBCdXQgcmVhbGx5IHRoaXMgc21lbGxzIGxpa2UgYSBidWcgaW4gd2FpdF9ldmVudF9r aWxsYWJsZSwgc2luY2UKPiA+IHdhaXRfZXZlbnRfaW50ZXJydXB0aWJsZSBkb2VzIG5vdCBzdWZm ZXIgZnJvbSB0aGUgc2FtZSBidWcuIEl0IHdpbGwgcmV0dXJuCj4gPiBpbW1lZGlhdGVseSB3aGVu IHRoZXJlJ3MgYSBzaWduYWwgcGVuZGluZy4KPiAKPiBFdmVuIHdoZW4gd2FpdF9ldmVudF9pbnRl cnJ1cHRpYmxlIGlzIGNhbGxlZCBhcyBmb2xsb3dpbmcgLQo+IC4uLi0+ZG9fc2lnbmFsLT5nZXRf c2lnbmFsLT4uLi4uLT53YWl0X2V2ZW50X2ludGVycnVwdGlibGUgPwo+IEkgaGF2ZW4ndCB0cmll ZCBpdCBidXQgd2FpdF9ldmVudF9pbnRlcnJ1cHRpYmxlIGlzIHZlcnkgbXVjaCBhbGlrZSB0bwo+ IHdhaXRfZXZlbnRfa2lsbGFibGUgc28gSSB3b3VsZCBhc3N1bWUgaXQgd2lsbCBhbHNvCj4gbm90 IGJlIGludGVycnVwdGVkIGlmIGNhbGxlZCBsaWtlIHRoYXQuIChXaWxsIGdpdmUgaXQgYSB0cnkg anVzdCBvdXQgb2YKPiBjdXJpb3NpdHkgYW55d2F5KQoKd2FpdF9ldmVudF9raWxsYWJlbCBkb2Vz bid0IGNoZWNrIGZvciBmYXRhbF9zaWduYWxfcGVuZGluZyBiZWZvcmUgY2FsbGluZwpzY2hlZHVs ZSwgc28gZGVmaW5pdGVseSBoYXMgYSBuaWNlIHJhY2UgdGhlcmUuCgpCdXQgaWYgeW91J3JlIHN1 cmUgdGhhdCB5b3UgcmVhbGx5IG5lZWQgdG8gY2hlY2sgUEZfU0lHTkFMRUQsIHRoZW4gSSdtCmhv bmVzdGx5IG5vdCBjbGVhciBvbiB3aGF0IHlvdSdyZSB0cnlpbmcgdG8gcHVsbCBvZmYgaGVyZS4g WW91ciBzcGFyc2UKZXhwbGFuYXRpb24gb2Ygd2hhdCBoYXBwZW5zIGlzbid0IGVub3VnaCwgc2lu Y2UgSSBoYXZlIG5vIGlkZWEgaG93IHlvdSBjYW4KZ2V0IGZyb20gZ2V0X3NpZ25hbCgpIHRvIHRo ZSBhYm92ZSB3YWl0X2V2ZW50X2tpbGxhYmxlIGNhbGxzaXRlLgotRGFuaWVsCgo+IAo+IEFuZHJl eQo+IAo+ID4gCj4gPiBJIHRoaW5rIHRoaXMgc2hvdWxkIGJlIGZpeGVkIGluIGNvcmUgY29kZSwg bm90IHBhcGVyZWQgb3ZlciBpbiBzb21lCj4gPiBzdWJzeXN0ZW0uCj4gPiAtRGFuaWVsCj4gPiAK PiA+ID4gCj4gPiA+IC0tIAo+ID4gPiBFYXJ0aGxpbmcgTWljaGVsIETDpG56ZXIgICAgICAgICAg ICAgICB8ICAgICAgICAgICAgICAgaHR0cDovL3d3dy5hbWQuY29tCj4gPiA+IExpYnJlIHNvZnR3 YXJlIGVudGh1c2lhc3QgICAgICAgICAgICAgfCAgICAgICAgICAgICBNZXNhIGFuZCBYIGRldmVs b3Blcgo+ID4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+ID4gPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gPiA+IGRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKPiA+ID4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJ bnRlbCBDb3Jwb3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1k ZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcv bWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751155AbeDXVkc (ORCPT ); Tue, 24 Apr 2018 17:40:32 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36920 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826AbeDXVkb (ORCPT ); Tue, 24 Apr 2018 17:40:31 -0400 X-Google-Smtp-Source: AIpwx49q3d08+sunu8x3aBIFs0oczWDIX6h/wtqfzeXU5yYl8/dGIECs6PIJ1AJbgppVncIAmCQRvg== Date: Tue, 24 Apr 2018 23:40:27 +0200 From: Daniel Vetter To: Andrey Grodzovsky Cc: Michel =?iso-8859-1?Q?D=E4nzer?= , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, David.Panariti@amd.com, oleg@redhat.com, ebiederm@xmission.com, Alexander.Deucher@amd.com, akpm@linux-foundation.org, Christian.Koenig@amd.com Subject: Re: [PATCH 2/3] drm/scheduler: Don't call wait_event_killable for signaled process. Message-ID: <20180424214027.GG25142@phenom.ffwll.local> Mail-Followup-To: Andrey Grodzovsky , Michel =?iso-8859-1?Q?D=E4nzer?= , linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, David.Panariti@amd.com, oleg@redhat.com, ebiederm@xmission.com, Alexander.Deucher@amd.com, akpm@linux-foundation.org, Christian.Koenig@amd.com References: <1524583836-12130-1-git-send-email-andrey.grodzovsky@amd.com> <1524583836-12130-3-git-send-email-andrey.grodzovsky@amd.com> <7313704c-0693-0bb9-8818-99cd2b7c0ca0@daenzer.net> <20180424194418.GE25142@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 4.15.0-1-amd64 User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 24, 2018 at 05:02:40PM -0400, Andrey Grodzovsky wrote: > > > On 04/24/2018 03:44 PM, Daniel Vetter wrote: > > On Tue, Apr 24, 2018 at 05:46:52PM +0200, Michel Dänzer wrote: > > > Adding the dri-devel list, since this is driver independent code. > > > > > > > > > On 2018-04-24 05:30 PM, Andrey Grodzovsky wrote: > > > > Avoid calling wait_event_killable when you are possibly being called > > > > from get_signal routine since in that case you end up in a deadlock > > > > where you are alreay blocked in singla processing any trying to wait > > > Multiple typos here, "[...] already blocked in signal processing and [...]"? > > > > > > > > > > on a new signal. > > > > > > > > Signed-off-by: Andrey Grodzovsky > > > > --- > > > > drivers/gpu/drm/scheduler/gpu_scheduler.c | 5 +++-- > > > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/scheduler/gpu_scheduler.c b/drivers/gpu/drm/scheduler/gpu_scheduler.c > > > > index 088ff2b..09fd258 100644 > > > > --- a/drivers/gpu/drm/scheduler/gpu_scheduler.c > > > > +++ b/drivers/gpu/drm/scheduler/gpu_scheduler.c > > > > @@ -227,9 +227,10 @@ void drm_sched_entity_do_release(struct drm_gpu_scheduler *sched, > > > > return; > > > > /** > > > > * The client will not queue more IBs during this fini, consume existing > > > > - * queued IBs or discard them on SIGKILL > > > > + * queued IBs or discard them when in death signal state since > > > > + * wait_event_killable can't receive signals in that state. > > > > */ > > > > - if ((current->flags & PF_SIGNALED) && current->exit_code == SIGKILL) > > > > + if (current->flags & PF_SIGNALED) > > You want fatal_signal_pending() here, instead of inventing your own broken > > version. > > I rely on current->flags & PF_SIGNALED because this being set from within > get_signal, > meaning I am within signal processing  in which case I want to avoid any > signal based wait for that task, > From what i see in the code, task_struct.pending.signal is being set for > other threads in same > group (zap_other_threads) or for other scenarios, those task are still able > to receive signals > so calling wait_event_killable there will not have problem. > > > > entity->fini_status = -ERESTARTSYS; > > > > else > > > > entity->fini_status = wait_event_killable(sched->job_scheduled, > > But really this smells like a bug in wait_event_killable, since > > wait_event_interruptible does not suffer from the same bug. It will return > > immediately when there's a signal pending. > > Even when wait_event_interruptible is called as following - > ...->do_signal->get_signal->....->wait_event_interruptible ? > I haven't tried it but wait_event_interruptible is very much alike to > wait_event_killable so I would assume it will also > not be interrupted if called like that. (Will give it a try just out of > curiosity anyway) wait_event_killabel doesn't check for fatal_signal_pending before calling schedule, so definitely has a nice race there. But if you're sure that you really need to check PF_SIGNALED, then I'm honestly not clear on what you're trying to pull off here. Your sparse explanation of what happens isn't enough, since I have no idea how you can get from get_signal() to the above wait_event_killable callsite. -Daniel > > Andrey > > > > > I think this should be fixed in core code, not papered over in some > > subsystem. > > -Daniel > > > > > > > > -- > > > Earthling Michel Dänzer | http://www.amd.com > > > Libre software enthusiast | Mesa and X developer > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch