From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Christian_K=c3=b6nig?= Subject: Re: [PATCH 1/3] locking/ww_mutex: cleanup lock->ctx usage in amdgpu Date: Mon, 19 Feb 2018 17:29:46 +0100 Message-ID: <2e696981-6b4a-e292-c16a-0f3477dbf8ce@gmail.com> References: <20180215141944.4332-1-christian.koenig@amd.com> <20180219152421.GQ22199@phenom.ffwll.local> <20180219161544.GY22199@phenom.ffwll.local> Reply-To: christian.koenig@amd.com Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180219161544.GY22199@phenom.ffwll.local> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: christian.koenig@amd.com, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: amd-gfx.lists.freedesktop.org QW0gMTkuMDIuMjAxOCB1bSAxNzoxNSBzY2hyaWViIERhbmllbCBWZXR0ZXI6Cj4gT24gTW9uLCBG ZWIgMTksIDIwMTggYXQgMDQ6NDE6NTVQTSArMDEwMCwgQ2hyaXN0aWFuIEvDtm5pZyB3cm90ZToK Pj4gQW0gMTkuMDIuMjAxOCB1bSAxNjoyNCBzY2hyaWViIERhbmllbCBWZXR0ZXI6Cj4+PiBPbiBU aHUsIEZlYiAxNSwgMjAxOCBhdCAwMzoxOTo0MlBNICswMTAwLCBDaHJpc3RpYW4gS8O2bmlnIHdy b3RlOgo+Pj4+IGFtZGdwdSBuZWVkcyB0byB2ZXJpZnkgaWYgdXNlcnNwYWNlIHNlbmRzIHVzIHZh bGlkIGFkZHJlc3NlcyBhbmQgdGhlIHNpbXBsZXN0Cj4+Pj4gd2F5IG9mIGRvaW5nIHRoaXMgaXMg dG8gY2hlY2sgaWYgdGhlIGJ1ZmZlciBvYmplY3QgaXMgbG9ja2VkIHdpdGggdGhlIHRpY2tldAo+ Pj4+IG9mIHRoZSBjdXJyZW50IHN1Ym1pc3Npb24uCj4+Pj4KPj4+PiBDbGVhbiB1cCB0aGUgYWNj ZXNzIHRvIHRoZSB3d19tdXRleCBpbnRlcm5hbHMgYnkgcHJvdmlkaW5nIGEgZnVuY3Rpb24KPj4+ PiBmb3IgdGhpcyBhbmQgZXh0ZW5kIHRoZSBjaGVjayB0byB0aGUgdGhyZWFkIG93bmluZyB0aGUg dW5kZXJseWluZyBtdXRleC4KPj4+Pgo+Pj4+IFNpZ25lZC1vZmYtYnk6IENocmlzdGlhbiBLw7Zu aWcgPGNocmlzdGlhbi5rb2VuaWdAYW1kLmNvbT4KPj4+PiAtLS0KPj4+PiAgICBkcml2ZXJzL2dw dS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyB8ICAzICsrLQo+Pj4+ICAgIGluY2x1ZGUvbGlu dXgvd3dfbXV0ZXguaCAgICAgICAgICAgICAgIHwgMTcgKysrKysrKysrKysrKysrKysKPj4+PiAg ICAyIGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPj4+Pgo+ Pj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfY3MuYyBi L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCj4+Pj4gaW5kZXggZWFhM2Ni MGMzYWQxLi40YzA0YjU2MGUzNTggMTAwNjQ0Cj4+Pj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2Ft ZC9hbWRncHUvYW1kZ3B1X2NzLmMKPj4+PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdw dS9hbWRncHVfY3MuYwo+Pj4+IEBAIC0xNTk0LDcgKzE1OTQsOCBAQCBpbnQgYW1kZ3B1X2NzX2Zp bmRfbWFwcGluZyhzdHJ1Y3QgYW1kZ3B1X2NzX3BhcnNlciAqcGFyc2VyLAo+Pj4+ICAgIAkqbWFw ID0gbWFwcGluZzsKPj4+PiAgICAJLyogRG91YmxlIGNoZWNrIHRoYXQgdGhlIEJPIGlzIHJlc2Vy dmVkIGJ5IHRoaXMgQ1MgKi8KPj4+PiAtCWlmIChSRUFEX09OQ0UoKCpibyktPnRiby5yZXN2LT5s b2NrLmN0eCkgIT0gJnBhcnNlci0+dGlja2V0KQo+Pj4+ICsJaWYgKCF3d19tdXRleF9pc19vd25l ZF9ieSgmKCpibyktPnRiby5yZXN2LT5sb2NrLCBjdXJyZW50LAo+Pj4+ICsJCQkJICAmcGFyc2Vy LT50aWNrZXQpKQo+Pj4+ICAgIAkJcmV0dXJuIC1FSU5WQUw7Cj4+Pj4gICAgCWlmICghKCgqYm8p LT5mbGFncyAmIEFNREdQVV9HRU1fQ1JFQVRFX1ZSQU1fQ09OVElHVU9VUykpIHsKPj4+PiBkaWZm IC0tZ2l0IGEvaW5jbHVkZS9saW51eC93d19tdXRleC5oIGIvaW5jbHVkZS9saW51eC93d19tdXRl eC5oCj4+Pj4gaW5kZXggMzlmZGExOTViZjc4Li5kZDU4MGRiMjg5ZTggMTAwNjQ0Cj4+Pj4gLS0t IGEvaW5jbHVkZS9saW51eC93d19tdXRleC5oCj4+Pj4gKysrIGIvaW5jbHVkZS9saW51eC93d19t dXRleC5oCj4+Pj4gQEAgLTM1OCw0ICszNTgsMjEgQEAgc3RhdGljIGlubGluZSBib29sIHd3X211 dGV4X2lzX2xvY2tlZChzdHJ1Y3Qgd3dfbXV0ZXggKmxvY2spCj4+Pj4gICAgCXJldHVybiBtdXRl eF9pc19sb2NrZWQoJmxvY2stPmJhc2UpOwo+Pj4+ICAgIH0KPj4+PiArLyoqCj4+Pj4gKyAqIHd3 X211dGV4X2lzX293bmVkX2J5IC0gaXMgdGhlIHcvdyBtdXRleCBsb2NrZWQgYnkgdGhpcyB0YXNr IGluIHRoYXQgY29udGV4dAo+Pj4+ICsgKiBAbG9jazogdGhlIG11dGV4IHRvIGJlIHF1ZXJpZWQK Pj4+PiArICogQHRhc2s6IHRoZSB0YXNrIHN0cnVjdHVyZSB0byBjaGVjawo+Pj4+ICsgKiBAY3R4 OiB0aGUgdy93IGFjcXVpcmUgY29udGV4dCB0byB0ZXN0Cj4+Pj4gKyAqCj4+Pj4gKyAqIFJldHVy bnMgdHJ1ZSBpZiB0aGUgbXV0ZXggaXMgbG9ja2VkIGluIHRoZSBjb250ZXh0IGJ5IHRoZSBnaXZl biB0YXNrLCBmYWxzZQo+Pj4+ICsgKiBvdGhlcndpc2UuCj4+Pj4gKyAqLwo+Pj4+ICtzdGF0aWMg aW5saW5lIGJvb2wgd3dfbXV0ZXhfaXNfb3duZWRfYnkoc3RydWN0IHd3X211dGV4ICpsb2NrLAo+ Pj4+ICsJCQkJCXN0cnVjdCB0YXNrX3N0cnVjdCAqdGFzaywKPj4+PiArCQkJCQlzdHJ1Y3Qgd3df YWNxdWlyZV9jdHggKmN0eCkKPj4+PiArewo+Pj4+ICsJcmV0dXJuIGxpa2VseShfX211dGV4X293 bmVyKCZsb2NrLT5iYXNlKSA9PSB0YXNrKSAmJgo+Pj4+ICsJCVJFQURfT05DRShsb2NrLT5jdHgp ID09IGN0eDsKPj4+IEp1c3QgY29tcGFyaW5nIHRoZSBjb250ZXh0IHNob3VsZCBiZSBnb29kIGVu b3VnaC4gSWYgeW91IGV2ZXIgcGFzcyBhCj4+PiB3d19hY3F1aXJlX2N0eCB3aGljaCBkb2VzIG5v dCBiZWxvbmcgdG8geW91ciBvd24gdGhyZWFkIHlvdXIgc2VyaW91c2x5Cj4+PiB3cmVha2luZyB0 aGluZ3MgbXVjaCB3b3JzZSBhbHJlYWR5IChhbmQgaWYgd2UgZG8gY2F0Y2ggdGhhdCwgc2hvdWxk Cj4+PiBwcm9iYWJseSBsb2NrIHRoZSBjdHggdG8gYSBnaXZlbiB0YXNrIHdoZW4gd3ctbXV0ZXgg ZGVidWdnaW5nIGlzIGVuYWJsZWQpLgo+Pj4KPj4+IFRoYXQgYWxzbyBzaW1wbGlmaWVzIHRoZSBm dW5jdGlvbiBzaWduYXR1cmUuCj4+Pgo+Pj4gT2YgY291cnNlIHRoYXQgbWVhbnMgaWYgeW91IGRv bid0IGhhdmUgYSBjdHgsIHlvdSBjYW4ndCB0ZXN0IG93bmVyc2hpcCBvZgo+Pj4gYSB3d19tdXRl LCBidXQgSSB0aGluayB0aGF0J3Mgbm90IGEgcmVhbGx5IHZhbGlkIHVzZS1jYXNlLgo+PiBXZWxs IGV4YWN0bHkgdGhhdCBpcyB0aGUgdXNlIGNhc2UgaW4gVFRNLCBzZWUgcGF0Y2ggIzMgaW4gdGhp cyBzZXJpZXMuCj4+Cj4+IEluIFRUTSB0aGUgZXZpY3RlZCBCT3MgYXJlIHRyeWxvY2tlZCBhbmQg c28gd2UgbmVlZCBhIHdheSBvZiB0ZXN0aW5nIGZvcgo+PiBvd25lcnNoaXAgd2l0aG91dCBhIGNv bnRleHQuCj4gSSBkb24ndCB0aGluayB5b3VyIGZpbmFsIHBhdGNoIHRvIGtlZXAgd3dfbXV0ZXgg bG9ja2VkIHVudGlsIHRoZSBlbmQKPiB3b3Jrcy4gWW91IGNhbid0IHJlYWxseSBuZXN0IHd3X211 dGV4X3RyeWxvY2sgd2l0aCB3d19tdXRleCBhdCB3aWxsIChzaW5jZQo+IHRyeWxvY2sgYnlwYXNz ZXMgdGhlIGVudGlyZSBkZWFkbG9jayBhdm9pZGFuY2UpLgoKV2VsbCB0aGF0IGlzIG5vdCBhIHBy b2JsZW0gYXQgYWxsLiBTZWUgd2UgZG9uJ3QgbmVzdCB0cnlsb2NrIHdpdGggbm9ybWFsIApsb2Nr IGFjcXVpcmluZywgY2F1c2UgdGhhdCB3b3VsZCBpbmRlZWQgYnlwYXNzIHRoZSB3aG9sZSBkZWFk bG9jayBkZXRlY3Rpb24uCgpJbnN0ZWFkIHdlIGZpcnN0IHVzZSB3d19tdXRleF9hY3F1aXJlIHRv IGxvY2sgYWxsIEJPcyB3aGljaCBhcmUgbmVlZGVkIApmb3IgYSBjb21tYW5kIHN1Ym1pc3Npb24s IGluY2x1ZGluZyB0aGUgZGVhZGxvY2sgZGV0ZWN0aW9uLgoKVGhlbiBhbGwgYWRkaXRpb25hbCBC T3Mgd2hpY2ggbmVlZGVkIHRvIGJlIGV2aWN0ZWQgdG8gZnVsZmlsbCB0aGUgCmN1cnJlbnQgcmVx dWVzdCBhcmUgdHJ5bG9ja2VkLgoKPiBJZiB0aGlzIGlzIHJlYWxseSB3aGF0IHlvdSB3YW50IHRv IGRvLCB0aGVuIHdlIG5lZWQgYQo+IHd3X211dGV4X3RyeWxvY2tfY3R4LCB3aGljaCBhbHNvIGZp bGxzIG91dCB0aGUgY3R4IHZhbHVlIChzbyB0aGF0IG90aGVyCj4gdGhyZWFkcyBjYW4gY29ycmVj dGx5IHJlc29sdmUgZGVhZGxvY2tzIHdoZW4geW91IGhvbGQgdGhhdCBsb2NrIHdoaWxlCj4gdHJ5 aW5nIHRvIGdyYWIgYWRkaXRpb25hbCBsb2NrcykuIEluIHdoaWNoIGNhc2UgeW91IHJlYWxseSBk b24ndCBuZWVkIHRoZQo+IHRhc2sgcG9pbnRlci4KCkFjdHVhbGx5IGNvbnNpZGVyZWQgdGhhdCBh cyB3ZWxsLCBidXQgaXQgdHVybmVkIG91dCB0aGF0IHRoaXMgaXMgZXhhY3RseSAKd2hhdCBJIGRv bid0IHdhbnQuCgpDYXVzZSB0aGVuIHdlIHdvdWxkbid0IGJlIGFibGUgdG8gZGlzdGluY3Qgd3df bXV0ZXggbG9ja2VkIHdpdGggYSAKY29udGV4dCAoYmVjYXVzZSB0aGV5IGFyZSBwYXJ0IG9mIHRo ZSBzdWJtaXNzaW9uKSBhbmQgd2l0aG91dCAoYmVjYXVzZSAKVFRNIHRyeWxvY2tlZCB0aGVtKS4K Cj4gWWVzIGl0J3MgYSBkaXNhcHBvaW50bWVudCB0aGF0IGxvY2tkZXAgZG9lc24ndCBjb3JyZWN0 bHkgdHJhY2sgdHJ5bG9ja3MsCj4gaXQganVzdCBkb2VzIGJhc2ljIHNhbml0eSBjaGVja3MsIGJ1 dCB0aGVuIGRyb3BzIHRoZW0gb24gdGhlIGZsb29yIHdydAo+IGRlcGVuY3kgdHJhY2tpbmcuIEp1 c3QgaW4gY2FzZSB5b3Ugd29uZGVyIHdoeSB5b3UncmUgbm90IGdldHRpbmcgYQo+IGxvY2tkZXBz IHNwbGF0IGZvciB0aGlzLiBVbmZvcnR1bmF0ZWx5IEkgZG9uJ3QgdW5kZXJzdGFuZCBsb2NrZGVw IGVub3VnaAo+IHRvIGJlIGFibGUgdG8gZml4IHRoaXMgZ2FwLgoKU29ycnkgdG8gZGlzYXBwb2lu dCB5b3UsIGJ1dCBsb2NrZGVwIGlzIGluZGVlZCBjYXBhYmxlIHRvIGNvcnJlY3RseSAKdHJhY2sg dGhvc2UgdHJ5bG9ja2VkIEJPcy4KCkdvdCBxdWl0ZSBhIGJ1bmNoIG9mIHdhcm5pbmcgYmVmb3Jl IEkgd2FzIGFibGUgdG8gcmVzb2x2ZSB0byB0aGlzIHNvbHV0aW9uLgoKQ2hyaXN0aWFuLgoKPiAt RGFuaWVsCj4KPj4gQ2hyaXN0aWFuLgo+Pgo+Pj4gICAgQW5kIG5vdCBuZWVkZWQKPj4+IGZvciBj bWQgc3VibWlzc2lvbiwgd2hlcmUgeW91IG5lZWQgdGhlIGN0eCBhbnl3YXkuCj4+Pgo+Pj4gQmVz aWRlcyB0aGlzIGludGVyZmFjZSBuaXQgbG9va3MgYWxsIGdvb2QuIFdpdGggdGhlIHRhc2sgY2hl Y2smcGFyYW1ldGVyCj4+PiByZW1vdmVkOgo+Pj4KPj4+IFJldmlld2VkLWJ5OiBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPgo+Pj4KPj4+IC1EYW5pZWwKPj4+Cj4+Pj4gK30K Pj4+PiArCj4+Pj4gICAgI2VuZGlmCj4+Pj4gLS0gCj4+Pj4gMi4xNC4xCj4+Pj4KPj4+PiBfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+Pj4+IGRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKPj4+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+Pj4g aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK Pj4gX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPj4gZHJp LWRldmVsIG1haWxpbmcgbGlzdAo+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+ IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753252AbeBSQ3u (ORCPT ); Mon, 19 Feb 2018 11:29:50 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:44339 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753099AbeBSQ3t (ORCPT ); Mon, 19 Feb 2018 11:29:49 -0500 X-Google-Smtp-Source: AH8x226sWkWOkFospRrVGbBBFV9NLe6J2euIboYNmrpNTbOukJMRrXEeiITSva60TgcLU3pfCUFOig== Reply-To: christian.koenig@amd.com Subject: Re: [PATCH 1/3] locking/ww_mutex: cleanup lock->ctx usage in amdgpu To: christian.koenig@amd.com, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20180215141944.4332-1-christian.koenig@amd.com> <20180219152421.GQ22199@phenom.ffwll.local> <20180219161544.GY22199@phenom.ffwll.local> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <2e696981-6b4a-e292-c16a-0f3477dbf8ce@gmail.com> Date: Mon, 19 Feb 2018 17:29:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180219161544.GY22199@phenom.ffwll.local> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 19.02.2018 um 17:15 schrieb Daniel Vetter: > On Mon, Feb 19, 2018 at 04:41:55PM +0100, Christian König wrote: >> Am 19.02.2018 um 16:24 schrieb Daniel Vetter: >>> On Thu, Feb 15, 2018 at 03:19:42PM +0100, Christian König wrote: >>>> amdgpu needs to verify if userspace sends us valid addresses and the simplest >>>> way of doing this is to check if the buffer object is locked with the ticket >>>> of the current submission. >>>> >>>> Clean up the access to the ww_mutex internals by providing a function >>>> for this and extend the check to the thread owning the underlying mutex. >>>> >>>> Signed-off-by: Christian König >>>> --- >>>> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ++- >>>> include/linux/ww_mutex.h | 17 +++++++++++++++++ >>>> 2 files changed, 19 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >>>> index eaa3cb0c3ad1..4c04b560e358 100644 >>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c >>>> @@ -1594,7 +1594,8 @@ int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, >>>> *map = mapping; >>>> /* Double check that the BO is reserved by this CS */ >>>> - if (READ_ONCE((*bo)->tbo.resv->lock.ctx) != &parser->ticket) >>>> + if (!ww_mutex_is_owned_by(&(*bo)->tbo.resv->lock, current, >>>> + &parser->ticket)) >>>> return -EINVAL; >>>> if (!((*bo)->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)) { >>>> diff --git a/include/linux/ww_mutex.h b/include/linux/ww_mutex.h >>>> index 39fda195bf78..dd580db289e8 100644 >>>> --- a/include/linux/ww_mutex.h >>>> +++ b/include/linux/ww_mutex.h >>>> @@ -358,4 +358,21 @@ static inline bool ww_mutex_is_locked(struct ww_mutex *lock) >>>> return mutex_is_locked(&lock->base); >>>> } >>>> +/** >>>> + * ww_mutex_is_owned_by - is the w/w mutex locked by this task in that context >>>> + * @lock: the mutex to be queried >>>> + * @task: the task structure to check >>>> + * @ctx: the w/w acquire context to test >>>> + * >>>> + * Returns true if the mutex is locked in the context by the given task, false >>>> + * otherwise. >>>> + */ >>>> +static inline bool ww_mutex_is_owned_by(struct ww_mutex *lock, >>>> + struct task_struct *task, >>>> + struct ww_acquire_ctx *ctx) >>>> +{ >>>> + return likely(__mutex_owner(&lock->base) == task) && >>>> + READ_ONCE(lock->ctx) == ctx; >>> Just comparing the context should be good enough. If you ever pass a >>> ww_acquire_ctx which does not belong to your own thread your seriously >>> wreaking things much worse already (and if we do catch that, should >>> probably lock the ctx to a given task when ww-mutex debugging is enabled). >>> >>> That also simplifies the function signature. >>> >>> Of course that means if you don't have a ctx, you can't test ownership of >>> a ww_mute, but I think that's not a really valid use-case. >> Well exactly that is the use case in TTM, see patch #3 in this series. >> >> In TTM the evicted BOs are trylocked and so we need a way of testing for >> ownership without a context. > I don't think your final patch to keep ww_mutex locked until the end > works. You can't really nest ww_mutex_trylock with ww_mutex at will (since > trylock bypasses the entire deadlock avoidance). Well that is not a problem at all. See we don't nest trylock with normal lock acquiring, cause that would indeed bypass the whole deadlock detection. Instead we first use ww_mutex_acquire to lock all BOs which are needed for a command submission, including the deadlock detection. Then all additional BOs which needed to be evicted to fulfill the current request are trylocked. > If this is really what you want to do, then we need a > ww_mutex_trylock_ctx, which also fills out the ctx value (so that other > threads can correctly resolve deadlocks when you hold that lock while > trying to grab additional locks). In which case you really don't need the > task pointer. Actually considered that as well, but it turned out that this is exactly what I don't want. Cause then we wouldn't be able to distinct ww_mutex locked with a context (because they are part of the submission) and without (because TTM trylocked them). > Yes it's a disappointment that lockdep doesn't correctly track trylocks, > it just does basic sanity checks, but then drops them on the floor wrt > depency tracking. Just in case you wonder why you're not getting a > lockdeps splat for this. Unfortunately I don't understand lockdep enough > to be able to fix this gap. Sorry to disappoint you, but lockdep is indeed capable to correctly track those trylocked BOs. Got quite a bunch of warning before I was able to resolve to this solution. Christian. > -Daniel > >> Christian. >> >>> And not needed >>> for cmd submission, where you need the ctx anyway. >>> >>> Besides this interface nit looks all good. With the task check¶meter >>> removed: >>> >>> Reviewed-by: Daniel Vetter >>> >>> -Daniel >>> >>>> +} >>>> + >>>> #endif >>>> -- >>>> 2.14.1 >>>> >>>> _______________________________________________ >>>> 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