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:14:58 +0100 Message-ID: <20191129151458.098349a6@collabora.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-7-boris.brezillon@collabora.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20191129135908.2439529-7-boris.brezillon@collabora.com> Sender: stable-owner@vger.kernel.org To: Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , Steven Price Cc: dri-devel@lists.freedesktop.org, stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org On Fri, 29 Nov 2019 14:59:06 +0100 Boris Brezillon wrote: > We don't want imported/exported BOs to be purges, as those are shared > 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; > + > 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. ^s/adding the mapping/exporting it/ > + * 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); > + > + return drm_gem_prime_export(obj, flags); > +} > + > static int panfrost_gem_pin(struct drm_gem_object *obj) > { > if (to_panfrost_bo(obj)->is_heap) > @@ -112,6 +138,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = { > .open = panfrost_gem_open, > .close = panfrost_gem_close, > .print_info = drm_gem_shmem_print_info, > + .export = panfrost_gem_export, > .pin = panfrost_gem_pin, > .unpin = drm_gem_shmem_unpin, > .get_sg_table = drm_gem_shmem_get_sg_table, 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 D77DDC43215 for ; Fri, 29 Nov 2019 14:15:04 +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 B7EC9208E4 for ; Fri, 29 Nov 2019 14:15:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B7EC9208E4 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 BB5746E919; Fri, 29 Nov 2019 14:15:03 +0000 (UTC) Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F7016E919 for ; Fri, 29 Nov 2019 14:15:02 +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 31B9E290E9C; Fri, 29 Nov 2019 14:15:01 +0000 (GMT) Date: Fri, 29 Nov 2019 15:14:58 +0100 From: Boris Brezillon To: Rob Herring , Tomeu Vizoso , Alyssa Rosenzweig , Steven Price Subject: Re: [PATCH 6/8] drm/panfrost: Make sure imported/exported BOs are never purged Message-ID: <20191129151458.098349a6@collabora.com> In-Reply-To: <20191129135908.2439529-7-boris.brezillon@collabora.com> References: <20191129135908.2439529-1-boris.brezillon@collabora.com> <20191129135908.2439529-7-boris.brezillon@collabora.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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191129141458.-cR9OgT1QtEf6_gl_V4JCFQy80kdd1FOjLimGjiI4Zg@z> T24gRnJpLCAyOSBOb3YgMjAxOSAxNDo1OTowNiArMDEwMApCb3JpcyBCcmV6aWxsb24gPGJvcmlz LmJyZXppbGxvbkBjb2xsYWJvcmEuY29tPiB3cm90ZToKCj4gV2UgZG9uJ3Qgd2FudCBpbXBvcnRl ZC9leHBvcnRlZCBCT3MgdG8gYmUgcHVyZ2VzLCBhcyB0aG9zZSBhcmUgc2hhcmVkCj4gd2l0aCBv dGhlciBwcm9jZXNzZXMgdGhhdCBtaWdodCBzdGlsbCB1c2UgdGhlbS4gV2Ugc2hvdWxkIGFsc28g cmVmdXNlCj4gdG8gZXhwb3J0IGEgQk8gaWYgaXQncyBiZWVuIG1hcmtlZCBwdXJnZWFibGUgb3Ig aGFzIGFscmVhZHkgYmVlbiBwdXJnZWQuCj4gCj4gRml4ZXM6IDAxM2I2NTEwMTMxNSAoImRybS9w YW5mcm9zdDogQWRkIG1hZHZpc2UgYW5kIHNocmlua2VyIHN1cHBvcnQiKQo+IENjOiA8c3RhYmxl QHZnZXIua2VybmVsLm9yZz4KPiBTaWduZWQtb2ZmLWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlz LmJyZXppbGxvbkBjb2xsYWJvcmEuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vcGFuZnJv c3QvcGFuZnJvc3RfZHJ2LmMgfCAxOSArKysrKysrKysrKysrKysrLQo+ICBkcml2ZXJzL2dwdS9k cm0vcGFuZnJvc3QvcGFuZnJvc3RfZ2VtLmMgfCAyNyArKysrKysrKysrKysrKysrKysrKysrKysr Cj4gIDIgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQo+IAo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZHJ2LmMKPiBpbmRleCAxYzY3YWM0MzRl MTAuLjc1MWRmOTc1NTM0ZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3Qv cGFuZnJvc3RfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rf ZHJ2LmMKPiBAQCAtMzQzLDYgKzM0Myw3IEBAIHN0YXRpYyBpbnQgcGFuZnJvc3RfaW9jdGxfbWFk dmlzZShzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLAo+ICAJc3RydWN0IGRybV9w YW5mcm9zdF9tYWR2aXNlICphcmdzID0gZGF0YTsKPiAgCXN0cnVjdCBwYW5mcm9zdF9kZXZpY2Ug KnBmZGV2ID0gZGV2LT5kZXZfcHJpdmF0ZTsKPiAgCXN0cnVjdCBkcm1fZ2VtX29iamVjdCAqZ2Vt X29iajsKPiArCWludCByZXQ7Cj4gIAo+ICAJZ2VtX29iaiA9IGRybV9nZW1fb2JqZWN0X2xvb2t1 cChmaWxlX3ByaXYsIGFyZ3MtPmhhbmRsZSk7Cj4gIAlpZiAoIWdlbV9vYmopIHsKPiBAQCAtMzUw LDYgKzM1MSwxOSBAQCBzdGF0aWMgaW50IHBhbmZyb3N0X2lvY3RsX21hZHZpc2Uoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiAgCQlyZXR1cm4gLUVOT0VOVDsKPiAgCX0KPiAg Cj4gKwkvKgo+ICsJICogV2UgZG9uJ3Qgd2FudCB0byBtYXJrIGV4cG9ydGVkL2ltcG9ydGVkIEJP cyBhcyBwdXJnZWFibGU6IHdlJ3JlIG5vdAo+ICsJICogdGhlIG9ubHkgb3duZXIgaW4gdGhhdCBj YXNlLgo+ICsJICovCj4gKwltdXRleF9sb2NrKCZkZXYtPm9iamVjdF9uYW1lX2xvY2spOwo+ICsJ aWYgKGdlbV9vYmotPmRtYV9idWYpCj4gKwkJcmV0ID0gLUVJTlZBTDsKPiArCWVsc2UKPiArCQly ZXQgPSAwOwo+ICsKPiArCWlmIChyZXQpCj4gKwkJZ290byBvdXRfdW5sb2NrX29iamVjdF9uYW1l Owo+ICsKPiAgCW11dGV4X2xvY2soJnBmZGV2LT5zaHJpbmtlcl9sb2NrKTsKPiAgCWFyZ3MtPnJl dGFpbmVkID0gZHJtX2dlbV9zaG1lbV9tYWR2aXNlKGdlbV9vYmosIGFyZ3MtPm1hZHYpOwo+ICAK PiBAQCAtMzY0LDggKzM3OCwxMSBAQCBzdGF0aWMgaW50IHBhbmZyb3N0X2lvY3RsX21hZHZpc2Uo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiAgCX0KPiAgCW11dGV4X3VubG9j aygmcGZkZXYtPnNocmlua2VyX2xvY2spOwo+ICAKPiArb3V0X3VubG9ja19vYmplY3RfbmFtZToK PiArCW11dGV4X3VubG9jaygmZGV2LT5vYmplY3RfbmFtZV9sb2NrKTsKPiArCj4gIAlkcm1fZ2Vt X29iamVjdF9wdXRfdW5sb2NrZWQoZ2VtX29iaik7Cj4gLQlyZXR1cm4gMDsKPiArCXJldHVybiBy ZXQ7Cj4gIH0KPiAgCj4gIGludCBwYW5mcm9zdF91bnN0YWJsZV9pb2N0bF9jaGVjayh2b2lkKQo+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZ2VtLmMgYi9k cml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3RfZ2VtLmMKPiBpbmRleCA5MmE5NTIxMGE4 OTkuLjMxZDY0MTdkZDIxYyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3Qv cGFuZnJvc3RfZ2VtLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZnJvc3QvcGFuZnJvc3Rf Z2VtLmMKPiBAQCAtOTksNiArOTksMzIgQEAgdm9pZCBwYW5mcm9zdF9nZW1fY2xvc2Uoc3RydWN0 IGRybV9nZW1fb2JqZWN0ICpvYmosIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQo+ICAJc3Bp bl91bmxvY2soJnByaXYtPm1tX2xvY2spOwo+ICB9Cj4gIAo+ICtzdGF0aWMgc3RydWN0IGRtYV9i dWYgKgo+ICtwYW5mcm9zdF9nZW1fZXhwb3J0KHN0cnVjdCBkcm1fZ2VtX29iamVjdCAqb2JqLCBp bnQgZmxhZ3MpCj4gK3sKPiArCXN0cnVjdCBwYW5mcm9zdF9nZW1fb2JqZWN0ICpibyA9IHRvX3Bh bmZyb3N0X2JvKG9iaik7Cj4gKwlpbnQgcmV0Owo+ICsKPiArCS8qCj4gKwkgKiBXZSBtdXN0IG1h a2Ugc3VyZSB0aGUgQk8gaGFzIG5vdCBiZWVuIG1hcmtlZCBwdXJnZWFibGUvcHVyZ2VkIGJlZm9y ZQo+ICsJICogYWRkaW5nIHRoZSBtYXBwaW5nLgoKCSAgIF5zL2FkZGluZyB0aGUgbWFwcGluZy9l eHBvcnRpbmcgaXQvCgo+ICsJICogTm90ZSB0aGF0IHdlIGRvbid0IG5lZWQgdG8gcHJvdGVjdCB0 aGlzIHRlc3Qgd2l0aCBhIGxvY2sgYmVjYXVzZQo+ICsJICogJmRybV9nZW1fb2JqZWN0X2Z1bmNz LmV4cG9ydCgpIGlzIGNhbGxlZCB3aXRoCj4gKwkgKiAmZHJtX2RldmljZS5vYmplY3RfbG9jayBo ZWxkLCBhbmQgcGFuZnJvc3RfaW9jdGxfbWFkdmlzZSgpIHRha2VzCj4gKwkgKiB0aGlzIGxvY2sg YmVmb3JlIGNhbGxpbmcgZHJtX2dlbV9zaG1lbV9tYWR2aXNlKCkgKHRoZSBmdW5jdGlvbiB0aGF0 Cj4gKwkgKiBtb2RpZmllcyBiby0+YmFzZS5tYWR2KS4KPiArCSAqLwo+ICsJaWYgKGJvLT5iYXNl Lm1hZHYgPT0gUEFORlJPU1RfTUFEVl9XSUxMTkVFRCkKPiArCQlyZXQgPSAtRUlOVkFMOwo+ICsJ ZWxzZQo+ICsJCXJldCA9IDA7Cj4gKwo+ICsJaWYgKHJldCkKPiArCQlyZXR1cm4gRVJSX1BUUihy ZXQpOwo+ICsKPiArCXJldHVybiBkcm1fZ2VtX3ByaW1lX2V4cG9ydChvYmosIGZsYWdzKTsKPiAr fQo+ICsKPiAgc3RhdGljIGludCBwYW5mcm9zdF9nZW1fcGluKHN0cnVjdCBkcm1fZ2VtX29iamVj dCAqb2JqKQo+ICB7Cj4gIAlpZiAodG9fcGFuZnJvc3RfYm8ob2JqKS0+aXNfaGVhcCkKPiBAQCAt MTEyLDYgKzEzOCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2dlbV9vYmplY3RfZnVuY3Mg cGFuZnJvc3RfZ2VtX2Z1bmNzID0gewo+ICAJLm9wZW4gPSBwYW5mcm9zdF9nZW1fb3BlbiwKPiAg CS5jbG9zZSA9IHBhbmZyb3N0X2dlbV9jbG9zZSwKPiAgCS5wcmludF9pbmZvID0gZHJtX2dlbV9z aG1lbV9wcmludF9pbmZvLAo+ICsJLmV4cG9ydCA9IHBhbmZyb3N0X2dlbV9leHBvcnQsCj4gIAku cGluID0gcGFuZnJvc3RfZ2VtX3BpbiwKPiAgCS51bnBpbiA9IGRybV9nZW1fc2htZW1fdW5waW4s Cj4gIAkuZ2V0X3NnX3RhYmxlID0gZHJtX2dlbV9zaG1lbV9nZXRfc2dfdGFibGUsCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw=