From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [PATCH 6/8] drm/panfrost: Make sure imported/exported BOs are never purged Date: Fri, 29 Nov 2019 15:52:04 +0100 Message-ID: <20191129155204.3fe150ca@collabora.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-7-boris.brezillon@collabora.com> <4094e136-a6e3-9a0d-9b56-8c196217e4d4@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4094e136-a6e3-9a0d-9b56-8c196217e4d4@arm.com> Sender: stable-owner@vger.kernel.org To: Steven Price Cc: Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , stable@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Fri, 29 Nov 2019 14:45:41 +0000 Steven Price wrote: > On 29/11/2019 13:59, Boris Brezillon wrote: > > We don't want imported/exported BOs to be purges, as those are shared > > s/purges/purged/ > > > with other processes that might still use them. We should also refuse > > to export a BO if it's been marked purgeable or has already been purged. > > > > Fixes: 013b65101315 ("drm/panfrost: Add madvise and shrinker support") > > Cc: > > Signed-off-by: Boris Brezillon > > --- > > drivers/gpu/drm/panfrost/panfrost_drv.c | 19 ++++++++++++++++- > > drivers/gpu/drm/panfrost/panfrost_gem.c | 27 +++++++++++++++++++++++++ > > 2 files changed, 45 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c > > index 1c67ac434e10..751df975534f 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_drv.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_drv.c > > @@ -343,6 +343,7 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data, > > struct drm_panfrost_madvise *args = data; > > struct panfrost_device *pfdev = dev->dev_private; > > struct drm_gem_object *gem_obj; > > + int ret; > > > > gem_obj = drm_gem_object_lookup(file_priv, args->handle); > > if (!gem_obj) { > > @@ -350,6 +351,19 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data, > > return -ENOENT; > > } > > > > + /* > > + * We don't want to mark exported/imported BOs as purgeable: we're not > > + * the only owner in that case. > > + */ > > + mutex_lock(&dev->object_name_lock); > > + if (gem_obj->dma_buf) > > + ret = -EINVAL; > > + else > > + ret = 0; > > + > > + if (ret) > > + goto out_unlock_object_name; > > + > > This might be better by setting ret = 0 at the beginning of the > function. This can then be re-written as the more normal: > > if (gem_obj->dma_buf) { > ret = -EINVAL; > goto out_unlock_object_name; > ] Agreed. > > > mutex_lock(&pfdev->shrinker_lock); > > args->retained = drm_gem_shmem_madvise(gem_obj, args->madv); > > > > @@ -364,8 +378,11 @@ static int panfrost_ioctl_madvise(struct drm_device *dev, void *data, > > } > > mutex_unlock(&pfdev->shrinker_lock); > > > > +out_unlock_object_name: > > + mutex_unlock(&dev->object_name_lock); > > + > > drm_gem_object_put_unlocked(gem_obj); > > - return 0; > > + return ret; > > } > > > > int panfrost_unstable_ioctl_check(void) > > diff --git a/drivers/gpu/drm/panfrost/panfrost_gem.c b/drivers/gpu/drm/panfrost/panfrost_gem.c > > index 92a95210a899..31d6417dd21c 100644 > > --- a/drivers/gpu/drm/panfrost/panfrost_gem.c > > +++ b/drivers/gpu/drm/panfrost/panfrost_gem.c > > @@ -99,6 +99,32 @@ void panfrost_gem_close(struct drm_gem_object *obj, struct drm_file *file_priv) > > spin_unlock(&priv->mm_lock); > > } > > > > +static struct dma_buf * > > +panfrost_gem_export(struct drm_gem_object *obj, int flags) > > +{ > > + struct panfrost_gem_object *bo = to_panfrost_bo(obj); > > + int ret; > > + > > + /* > > + * We must make sure the BO has not been marked purgeable/purged before > > + * adding the mapping. > > + * Note that we don't need to protect this test with a lock because > > + * &drm_gem_object_funcs.export() is called with > > + * &drm_device.object_lock held, and panfrost_ioctl_madvise() takes > > + * this lock before calling drm_gem_shmem_madvise() (the function that > > + * modifies bo->base.madv). > > + */ > > + if (bo->base.madv == PANFROST_MADV_WILLNEED) > > + ret = -EINVAL; > > + else > > + ret = 0; > > + > > + if (ret) > > + return ERR_PTR(ret); > > No need for ret here: > > if (bo->base.madv == PANFROST_MADV_WILLNEED) > return ERR_PTR(-EINVAL); This if/else section was previously surrounded by a lock/unlock, hence the convoluted logic. I'll rework as suggested. Thanks. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9746AC33CB8 for ; Fri, 29 Nov 2019 14:52:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 779FF215A5 for ; Fri, 29 Nov 2019 14:52:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 779FF215A5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DC2616E927; Fri, 29 Nov 2019 14:52:10 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48B9C6E927 for ; Fri, 29 Nov 2019 14:52:09 +0000 (UTC) Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:5cf4:84a1:2763:fe0d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id EC8CC292A51; Fri, 29 Nov 2019 14:52:07 +0000 (GMT) Date: Fri, 29 Nov 2019 15:52:04 +0100 From: Boris Brezillon To: Steven Price Subject: Re: [PATCH 6/8] drm/panfrost: Make sure imported/exported BOs are never purged Message-ID: <20191129155204.3fe150ca@collabora.com> In-Reply-To: <4094e136-a6e3-9a0d-9b56-8c196217e4d4@arm.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-7-boris.brezillon@collabora.com> <4094e136-a6e3-9a0d-9b56-8c196217e4d4@arm.com> Organization: Collabora X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable@vger.kernel.org, dri-devel@lists.freedesktop.org, Rob Herring , Alyssa Rosenzweig Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191129145204.80wZFmQ_hNcMkqegGu0v65AQ0Qd3awfxzfe2d43hbso@z> T24gRnJpLCAyOSBOb3YgMjAxOSAxNDo0NTo0MSArMDAwMApTdGV2ZW4gUHJpY2UgPHN0ZXZlbi5w cmljZUBhcm0uY29tPiB3cm90ZToKCj4gT24gMjkvMTEvMjAxOSAxMzo1OSwgQm9yaXMgQnJlemls bG9uIHdyb3RlOgo+ID4gV2UgZG9uJ3Qgd2FudCBpbXBvcnRlZC9leHBvcnRlZCBCT3MgdG8gYmUg cHVyZ2VzLCBhcyB0aG9zZSBhcmUgc2hhcmVkICAKPiAKPiBzL3B1cmdlcy9wdXJnZWQvCj4gCj4g PiB3aXRoIG90aGVyIHByb2Nlc3NlcyB0aGF0IG1pZ2h0IHN0aWxsIHVzZSB0aGVtLiBXZSBzaG91 bGQgYWxzbyByZWZ1c2UKPiA+IHRvIGV4cG9ydCBhIEJPIGlmIGl0J3MgYmVlbiBtYXJrZWQgcHVy Z2VhYmxlIG9yIGhhcyBhbHJlYWR5IGJlZW4gcHVyZ2VkLgo+ID4gCj4gPiBGaXhlczogMDEzYjY1 MTAxMzE1ICgiZHJtL3BhbmZyb3N0OiBBZGQgbWFkdmlzZSBhbmQgc2hyaW5rZXIgc3VwcG9ydCIp Cj4gPiBDYzogPHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+Cj4gPiBTaWduZWQtb2ZmLWJ5OiBCb3Jp cyBCcmV6aWxsb24gPGJvcmlzLmJyZXppbGxvbkBjb2xsYWJvcmEuY29tPgo+ID4gLS0tCj4gPiAg ZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Rydi5jIHwgMTkgKysrKysrKysrKysr KysrKy0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZ2VtLmMgfCAyNyAr KysrKysrKysrKysrKysrKysrKysrKysrCj4gPiAgMiBmaWxlcyBjaGFuZ2VkLCA0NSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pCj4gPiAKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFu ZnJvc3RfZHJ2LmMKPiA+IGluZGV4IDFjNjdhYzQzNGUxMC4uNzUxZGY5NzU1MzRmIDEwMDY0NAo+ ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2Rydi5jCj4gPiArKysg Yi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKPiA+IEBAIC0zNDMsNiAr MzQzLDcgQEAgc3RhdGljIGludCBwYW5mcm9zdF9pb2N0bF9tYWR2aXNlKHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHZvaWQgKmRhdGEsCj4gPiAgCXN0cnVjdCBkcm1fcGFuZnJvc3RfbWFkdmlzZSAq YXJncyA9IGRhdGE7Cj4gPiAgCXN0cnVjdCBwYW5mcm9zdF9kZXZpY2UgKnBmZGV2ID0gZGV2LT5k ZXZfcHJpdmF0ZTsKPiA+ICAJc3RydWN0IGRybV9nZW1fb2JqZWN0ICpnZW1fb2JqOwo+ID4gKwlp bnQgcmV0Owo+ID4gIAo+ID4gIAlnZW1fb2JqID0gZHJtX2dlbV9vYmplY3RfbG9va3VwKGZpbGVf cHJpdiwgYXJncy0+aGFuZGxlKTsKPiA+ICAJaWYgKCFnZW1fb2JqKSB7Cj4gPiBAQCAtMzUwLDYg KzM1MSwxOSBAQCBzdGF0aWMgaW50IHBhbmZyb3N0X2lvY3RsX21hZHZpc2Uoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiA+ICAJCXJldHVybiAtRU5PRU5UOwo+ID4gIAl9Cj4g PiAgCj4gPiArCS8qCj4gPiArCSAqIFdlIGRvbid0IHdhbnQgdG8gbWFyayBleHBvcnRlZC9pbXBv cnRlZCBCT3MgYXMgcHVyZ2VhYmxlOiB3ZSdyZSBub3QKPiA+ICsJICogdGhlIG9ubHkgb3duZXIg aW4gdGhhdCBjYXNlLgo+ID4gKwkgKi8KPiA+ICsJbXV0ZXhfbG9jaygmZGV2LT5vYmplY3RfbmFt ZV9sb2NrKTsKPiA+ICsJaWYgKGdlbV9vYmotPmRtYV9idWYpCj4gPiArCQlyZXQgPSAtRUlOVkFM Owo+ID4gKwllbHNlCj4gPiArCQlyZXQgPSAwOwo+ID4gKwo+ID4gKwlpZiAocmV0KQo+ID4gKwkJ Z290byBvdXRfdW5sb2NrX29iamVjdF9uYW1lOwo+ID4gKyAgCj4gCj4gVGhpcyBtaWdodCBiZSBi ZXR0ZXIgYnkgc2V0dGluZyByZXQgPSAwIGF0IHRoZSBiZWdpbm5pbmcgb2YgdGhlCj4gZnVuY3Rp b24uIFRoaXMgY2FuIHRoZW4gYmUgcmUtd3JpdHRlbiBhcyB0aGUgbW9yZSBub3JtYWw6Cj4gCj4g CWlmIChnZW1fb2JqLT5kbWFfYnVmKSB7Cj4gCQlyZXQgPSAtRUlOVkFMOwo+IAkJZ290byBvdXRf dW5sb2NrX29iamVjdF9uYW1lOwo+IAldCgpBZ3JlZWQuCgo+IAo+ID4gIAltdXRleF9sb2NrKCZw ZmRldi0+c2hyaW5rZXJfbG9jayk7Cj4gPiAgCWFyZ3MtPnJldGFpbmVkID0gZHJtX2dlbV9zaG1l bV9tYWR2aXNlKGdlbV9vYmosIGFyZ3MtPm1hZHYpOwo+ID4gIAo+ID4gQEAgLTM2NCw4ICszNzgs MTEgQEAgc3RhdGljIGludCBwYW5mcm9zdF9pb2N0bF9tYWR2aXNlKHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYsIHZvaWQgKmRhdGEsCj4gPiAgCX0KPiA+ICAJbXV0ZXhfdW5sb2NrKCZwZmRldi0+c2hy aW5rZXJfbG9jayk7Cj4gPiAgCj4gPiArb3V0X3VubG9ja19vYmplY3RfbmFtZToKPiA+ICsJbXV0 ZXhfdW5sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOwo+ID4gKwo+ID4gIAlkcm1fZ2VtX29i amVjdF9wdXRfdW5sb2NrZWQoZ2VtX29iaik7Cj4gPiAtCXJldHVybiAwOwo+ID4gKwlyZXR1cm4g cmV0Owo+ID4gIH0KPiA+ICAKPiA+ICBpbnQgcGFuZnJvc3RfdW5zdGFibGVfaW9jdGxfY2hlY2so dm9pZCkKPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rf Z2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZ2VtLmMKPiA+IGluZGV4 IDkyYTk1MjEwYTg5OS4uMzFkNjQxN2RkMjFjIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUv ZHJtL3BhbmZyb3N0L3BhbmZyb3N0X2dlbS5jCj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFu ZnJvc3QvcGFuZnJvc3RfZ2VtLmMKPiA+IEBAIC05OSw2ICs5OSwzMiBAQCB2b2lkIHBhbmZyb3N0 X2dlbV9jbG9zZShzdHJ1Y3QgZHJtX2dlbV9vYmplY3QgKm9iaiwgc3RydWN0IGRybV9maWxlICpm aWxlX3ByaXYpCj4gPiAgCXNwaW5fdW5sb2NrKCZwcml2LT5tbV9sb2NrKTsKPiA+ICB9Cj4gPiAg Cj4gPiArc3RhdGljIHN0cnVjdCBkbWFfYnVmICoKPiA+ICtwYW5mcm9zdF9nZW1fZXhwb3J0KHN0 cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBpbnQgZmxhZ3MpCj4gPiArewo+ID4gKwlzdHJ1Y3Qg cGFuZnJvc3RfZ2VtX29iamVjdCAqYm8gPSB0b19wYW5mcm9zdF9ibyhvYmopOwo+ID4gKwlpbnQg cmV0Owo+ID4gKwo+ID4gKwkvKgo+ID4gKwkgKiBXZSBtdXN0IG1ha2Ugc3VyZSB0aGUgQk8gaGFz IG5vdCBiZWVuIG1hcmtlZCBwdXJnZWFibGUvcHVyZ2VkIGJlZm9yZQo+ID4gKwkgKiBhZGRpbmcg dGhlIG1hcHBpbmcuCj4gPiArCSAqIE5vdGUgdGhhdCB3ZSBkb24ndCBuZWVkIHRvIHByb3RlY3Qg dGhpcyB0ZXN0IHdpdGggYSBsb2NrIGJlY2F1c2UKPiA+ICsJICogJmRybV9nZW1fb2JqZWN0X2Z1 bmNzLmV4cG9ydCgpIGlzIGNhbGxlZCB3aXRoCj4gPiArCSAqICZkcm1fZGV2aWNlLm9iamVjdF9s b2NrIGhlbGQsIGFuZCBwYW5mcm9zdF9pb2N0bF9tYWR2aXNlKCkgdGFrZXMKPiA+ICsJICogdGhp cyBsb2NrIGJlZm9yZSBjYWxsaW5nIGRybV9nZW1fc2htZW1fbWFkdmlzZSgpICh0aGUgZnVuY3Rp b24gdGhhdAo+ID4gKwkgKiBtb2RpZmllcyBiby0+YmFzZS5tYWR2KS4KPiA+ICsJICovCj4gPiAr CWlmIChiby0+YmFzZS5tYWR2ID09IFBBTkZST1NUX01BRFZfV0lMTE5FRUQpCj4gPiArCQlyZXQg PSAtRUlOVkFMOwo+ID4gKwllbHNlCj4gPiArCQlyZXQgPSAwOwo+ID4gKwo+ID4gKwlpZiAocmV0 KQo+ID4gKwkJcmV0dXJuIEVSUl9QVFIocmV0KTsgIAo+IAo+IE5vIG5lZWQgZm9yIHJldCBoZXJl Ogo+IAo+IAlpZiAoYm8tPmJhc2UubWFkdiA9PSBQQU5GUk9TVF9NQURWX1dJTExORUVEKQo+IAkJ cmV0dXJuIEVSUl9QVFIoLUVJTlZBTCk7CgpUaGlzIGlmL2Vsc2Ugc2VjdGlvbiB3YXMgcHJldmlv dXNseSBzdXJyb3VuZGVkIGJ5IGEgbG9jay91bmxvY2ssIGhlbmNlCnRoZSBjb252b2x1dGVkIGxv Z2ljLiBJJ2xsIHJld29yayBhcyBzdWdnZXN0ZWQuCgpUaGFua3MuCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=