From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751794AbaHDIhK (ORCPT ); Mon, 4 Aug 2014 04:37:10 -0400 Received: from mail-bn1lp0140.outbound.protection.outlook.com ([207.46.163.140]:50166 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751108AbaHDIhI convert rfc822-to-8bit (ORCPT ); Mon, 4 Aug 2014 04:37:08 -0400 X-WSS-ID: 0N9RX9O-08-3J1-02 X-M-MSG: Message-ID: <53DF462B.2060102@amd.com> Date: Mon, 4 Aug 2014 10:36:59 +0200 From: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.0 MIME-Version: 1.0 To: Maarten Lankhorst , CC: , , , , , Subject: Re: [PATCH 09/19] drm/radeon: handle lockup in delayed work, v2 References: <20140731153245.15061.63023.stgit@patser> <20140731153342.15061.54264.stgit@patser> <53DBC1EC.1010001@amd.com> <53DBD269.80807@canonical.com> In-Reply-To: <53DBD269.80807@canonical.com> Content-Type: text/plain; charset="utf-8"; format=flowed X-Originating-IP: [10.224.152.180] Content-Transfer-Encoding: 8BIT X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.222;CTRY:US;IPV:NLI;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(6009001)(428002)(24454002)(51704005)(377424004)(189002)(199002)(85182001)(50986999)(102836001)(87936001)(83506001)(87266999)(76176999)(46102001)(54356999)(33656002)(84676001)(65816999)(31966008)(74662001)(99396002)(23676002)(74502001)(36756003)(68736004)(20776003)(47776003)(64706001)(64126003)(19580395003)(76482001)(44976005)(50466002)(83322001)(80316001)(19580405001)(81542001)(4396001)(97736001)(81342001)(65956001)(86362001)(80022001)(59896001)(77982001)(92726001)(92566001)(101416001)(79102001)(83072002)(85852003)(95666004)(93886004)(85306004)(105586002)(21056001)(85202003)(106466001)(107046002);DIR:OUT;SFP:;SCL:1;SRVR:BLUPR02MB033;H:atltwp02.amd.com;FPR:;MLV:sfv;PTR:InfoDomainNonexistent;MX:1;LANG:en; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 0293D40691 Authentication-Results: spf=none (sender IP is 165.204.84.222) smtp.mailfrom=Christian.Koenig@amd.com; X-OriginatorOrg: amd4.onmicrosoft.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Maarten, Sorry for the delay. I've got way to much todo recently. Am 01.08.2014 um 19:46 schrieb Maarten Lankhorst: > > On 01-08-14 18:35, Christian König wrote: >> Am 31.07.2014 um 17:33 schrieb Maarten Lankhorst: >>> Signed-off-by: Maarten Lankhorst >>> --- >>> V1 had a nasty bug breaking gpu lockup recovery. The fix is not >>> allowing radeon_fence_driver_check_lockup to take exclusive_lock, >>> and kill it during lockup recovery instead. >> That looks like the delayed work starts running as soon as we submit a fence, and not when it's needed for waiting. >> >> Since it's a backup for failing IRQs I would rather put it into radeon_irq_kms.c and start/stop it when the IRQs are started/stoped. > The delayed work is not just for failing irq's, it's also the handler that's used to detect lockups, which is why I trigger after processing fences, and reset the timer after processing. The idea was turning the delayed work on and off when we turn the irq on and off as well, processing of the delayed work handler can still happen in radeon_fence.c > > Specifically what happened was this scenario: > > - lock up occurs > - write lock taken by gpu_reset > - delayed work runs, tries to acquire read lock, blocks > - gpu_reset tries to cancel delayed work synchronously > - has to wait for delayed work to finish -> deadlock Why do you want to disable the work item from the lockup handler in the first place? Just take the exclusive lock in the work item, when it concurrently runs with the lockup handler it will just block for the lockup handler to complete. Regards, Christian. > ~Maarten From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= Subject: Re: [PATCH 09/19] drm/radeon: handle lockup in delayed work, v2 Date: Mon, 4 Aug 2014 10:36:59 +0200 Message-ID: <53DF462B.2060102@amd.com> References: <20140731153245.15061.63023.stgit@patser> <20140731153342.15061.54264.stgit@patser> <53DBC1EC.1010001@amd.com> <53DBD269.80807@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <53DBD269.80807@canonical.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst , airlied@linux.ie Cc: thellstrom@vmware.com, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, bskeggs@redhat.com, alexander.deucher@amd.com List-Id: nouveau.vger.kernel.org SGkgTWFhcnRlbiwKClNvcnJ5IGZvciB0aGUgZGVsYXkuIEkndmUgZ290IHdheSB0byBtdWNoIHRv ZG8gcmVjZW50bHkuCgpBbSAwMS4wOC4yMDE0IHVtIDE5OjQ2IHNjaHJpZWIgTWFhcnRlbiBMYW5r aG9yc3Q6Cj4KPiBPbiAwMS0wOC0xNCAxODozNSwgQ2hyaXN0aWFuIEvDtm5pZyB3cm90ZToKPj4g QW0gMzEuMDcuMjAxNCB1bSAxNzozMyBzY2hyaWViIE1hYXJ0ZW4gTGFua2hvcnN0Ogo+Pj4gU2ln bmVkLW9mZi1ieTogTWFhcnRlbiBMYW5raG9yc3QgPG1hYXJ0ZW4ubGFua2hvcnN0QGNhbm9uaWNh bC5jb20+Cj4+PiAtLS0KPj4+IFYxIGhhZCBhIG5hc3R5IGJ1ZyBicmVha2luZyBncHUgbG9ja3Vw IHJlY292ZXJ5LiBUaGUgZml4IGlzIG5vdAo+Pj4gYWxsb3dpbmcgcmFkZW9uX2ZlbmNlX2RyaXZl cl9jaGVja19sb2NrdXAgdG8gdGFrZSBleGNsdXNpdmVfbG9jaywKPj4+IGFuZCBraWxsIGl0IGR1 cmluZyBsb2NrdXAgcmVjb3ZlcnkgaW5zdGVhZC4KPj4gVGhhdCBsb29rcyBsaWtlIHRoZSBkZWxh eWVkIHdvcmsgc3RhcnRzIHJ1bm5pbmcgYXMgc29vbiBhcyB3ZSBzdWJtaXQgYSBmZW5jZSwgYW5k IG5vdCB3aGVuIGl0J3MgbmVlZGVkIGZvciB3YWl0aW5nLgo+Pgo+PiBTaW5jZSBpdCdzIGEgYmFj a3VwIGZvciBmYWlsaW5nIElSUXMgSSB3b3VsZCByYXRoZXIgcHV0IGl0IGludG8gcmFkZW9uX2ly cV9rbXMuYyBhbmQgc3RhcnQvc3RvcCBpdCB3aGVuIHRoZSBJUlFzIGFyZSBzdGFydGVkL3N0b3Bl ZC4KPiBUaGUgZGVsYXllZCB3b3JrIGlzIG5vdCBqdXN0IGZvciBmYWlsaW5nIGlycSdzLCBpdCdz IGFsc28gdGhlIGhhbmRsZXIgdGhhdCdzIHVzZWQgdG8gZGV0ZWN0IGxvY2t1cHMsIHdoaWNoIGlz IHdoeSBJIHRyaWdnZXIgYWZ0ZXIgcHJvY2Vzc2luZyBmZW5jZXMsIGFuZCByZXNldCB0aGUgdGlt ZXIgYWZ0ZXIgcHJvY2Vzc2luZy4KClRoZSBpZGVhIHdhcyB0dXJuaW5nIHRoZSBkZWxheWVkIHdv cmsgb24gYW5kIG9mZiB3aGVuIHdlIHR1cm4gdGhlIGlycSBvbiAKYW5kIG9mZiBhcyB3ZWxsLCBw cm9jZXNzaW5nIG9mIHRoZSBkZWxheWVkIHdvcmsgaGFuZGxlciBjYW4gc3RpbGwgaGFwcGVuIApp biByYWRlb25fZmVuY2UuYwoKPgo+IFNwZWNpZmljYWxseSB3aGF0IGhhcHBlbmVkIHdhcyB0aGlz IHNjZW5hcmlvOgo+Cj4gLSBsb2NrIHVwIG9jY3Vycwo+IC0gd3JpdGUgbG9jayB0YWtlbiBieSBn cHVfcmVzZXQKPiAtIGRlbGF5ZWQgd29yayBydW5zLCB0cmllcyB0byBhY3F1aXJlIHJlYWQgbG9j aywgYmxvY2tzCj4gLSBncHVfcmVzZXQgdHJpZXMgdG8gY2FuY2VsIGRlbGF5ZWQgd29yayBzeW5j aHJvbm91c2x5Cj4gLSBoYXMgdG8gd2FpdCBmb3IgZGVsYXllZCB3b3JrIHRvIGZpbmlzaCAtPiBk ZWFkbG9jawoKV2h5IGRvIHlvdSB3YW50IHRvIGRpc2FibGUgdGhlIHdvcmsgaXRlbSBmcm9tIHRo ZSBsb2NrdXAgaGFuZGxlciBpbiB0aGUgCmZpcnN0IHBsYWNlPwoKSnVzdCB0YWtlIHRoZSBleGNs dXNpdmUgbG9jayBpbiB0aGUgd29yayBpdGVtLCB3aGVuIGl0IGNvbmN1cnJlbnRseSBydW5zIAp3 aXRoIHRoZSBsb2NrdXAgaGFuZGxlciBpdCB3aWxsIGp1c3QgYmxvY2sgZm9yIHRoZSBsb2NrdXAg aGFuZGxlciB0byAKY29tcGxldGUuCgpSZWdhcmRzLApDaHJpc3RpYW4uCgo+IH5NYWFydGVuCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=