From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756012AbeDQQSo (ORCPT ); Tue, 17 Apr 2018 12:18:44 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:32817 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755718AbeDQQSl (ORCPT ); Tue, 17 Apr 2018 12:18:41 -0400 X-Google-Smtp-Source: AIpwx487dDvosL32KbUt5DzMbDefY26aEMm+POTAIHrDJmarlGFG0ofTeRbjGu64baqJc8oYDIbZ1Bt4a2hv0I8ljVc= MIME-Version: 1.0 X-Originating-IP: [212.51.149.109] In-Reply-To: <87h8o9g8be.fsf@intel.com> References: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> <87h8o9g8be.fsf@intel.com> From: Daniel Vetter Date: Tue, 17 Apr 2018 18:18:40 +0200 X-Google-Sender-Auth: Ijpkb-nHRjLM1sMeg2zE3Z_CUw4 Message-ID: Subject: Re: [PATCH] gpu: drm: i915: Change return type to vm_fault_t To: Jani Nikula Cc: Souptick Joarder , Joonas Lahtinen , Rodrigo Vivi , Dave Airlie , intel-gfx , Matthew Wilcox , Linux Kernel Mailing List , dri-devel Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 17, 2018 at 5:29 PM, Jani Nikula wrote: > On Tue, 17 Apr 2018, Souptick Joarder wrote: >> Use new return type vm_fault_t for fault handler. For >> now, this is just documenting that the function returns >> a VM_FAULT value rather than an errno. Once all instances >> are converted, vm_fault_t will become a distinct type. >> >> Reference id -> 1c8f422059ae ("mm: change return type to >> vm_fault_t") >> >> Signed-off-by: Souptick Joarder >> --- >> drivers/gpu/drm/i915/i915_drv.h | 3 ++- >> drivers/gpu/drm/i915/i915_gem.c | 15 ++++++++------- >> 2 files changed, 10 insertions(+), 8 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index a42deeb..95b0d50 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -51,6 +51,7 @@ >> #include >> #include >> #include >> +#include >> >> #include "i915_params.h" >> #include "i915_reg.h" >> @@ -3363,7 +3364,7 @@ int i915_gem_wait_for_idle(struct drm_i915_private *dev_priv, >> unsigned int flags); >> int __must_check i915_gem_suspend(struct drm_i915_private *dev_priv); >> void i915_gem_resume(struct drm_i915_private *dev_priv); >> -int i915_gem_fault(struct vm_fault *vmf); >> +vm_fault_t i915_gem_fault(struct vm_fault *vmf); >> int i915_gem_object_wait(struct drm_i915_gem_object *obj, >> unsigned int flags, >> long timeout, >> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c >> index dd89abd..bdac690 100644 >> --- a/drivers/gpu/drm/i915/i915_gem.c >> +++ b/drivers/gpu/drm/i915/i915_gem.c >> @@ -1882,7 +1882,7 @@ int i915_gem_mmap_gtt_version(void) >> * The current feature set supported by i915_gem_fault() and thus GTT mmaps >> * is exposed via I915_PARAM_MMAP_GTT_VERSION (see i915_gem_mmap_gtt_version). >> */ >> -int i915_gem_fault(struct vm_fault *vmf) >> +vm_fault_t i915_gem_fault(struct vm_fault *vmf) >> { >> #define MIN_CHUNK_PAGES ((1 << 20) >> PAGE_SHIFT) /* 1 MiB */ >> struct vm_area_struct *area = vmf->vma; >> @@ -1895,6 +1895,7 @@ int i915_gem_fault(struct vm_fault *vmf) >> pgoff_t page_offset; >> unsigned int flags; >> int ret; >> + vm_fault_t retval; > > What's the point of changing the name? An unnecessary change. int ret; already exists and is used. You can't also have a vm_fault_t ret; on top of that :-) -Daniel > > BR, > Jani. > >> >> /* We don't use vmf->pgoff since that has the fake offset */ >> page_offset = (vmf->address - area->vm_start) >> PAGE_SHIFT; >> @@ -2000,7 +2001,7 @@ int i915_gem_fault(struct vm_fault *vmf) >> * and so needs to be reported. >> */ >> if (!i915_terminally_wedged(&dev_priv->gpu_error)) { >> - ret = VM_FAULT_SIGBUS; >> + retval = VM_FAULT_SIGBUS; >> break; >> } >> case -EAGAIN: >> @@ -2017,21 +2018,21 @@ int i915_gem_fault(struct vm_fault *vmf) >> * EBUSY is ok: this just means that another thread >> * already did the job. >> */ >> - ret = VM_FAULT_NOPAGE; >> + retval = VM_FAULT_NOPAGE; >> break; >> case -ENOMEM: >> - ret = VM_FAULT_OOM; >> + retval = VM_FAULT_OOM; >> break; >> case -ENOSPC: >> case -EFAULT: >> - ret = VM_FAULT_SIGBUS; >> + retval = VM_FAULT_SIGBUS; >> break; >> default: >> WARN_ONCE(ret, "unhandled error in i915_gem_fault: %i\n", ret); >> - ret = VM_FAULT_SIGBUS; >> + retval = VM_FAULT_SIGBUS; >> break; >> } >> - return ret; >> + return retval; >> } >> >> static void __i915_gem_object_release_mmap(struct drm_i915_gem_object *obj) >> -- >> 1.9.1 >> > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] gpu: drm: i915: Change return type to vm_fault_t Date: Tue, 17 Apr 2018 18:18:40 +0200 Message-ID: References: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> <87h8o9g8be.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-io0-x242.google.com (mail-io0-x242.google.com [IPv6:2607:f8b0:4001:c06::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8E80D89E05 for ; Tue, 17 Apr 2018 16:18:41 +0000 (UTC) Received: by mail-io0-x242.google.com with SMTP id g9so4297872iob.11 for ; Tue, 17 Apr 2018 09:18:41 -0700 (PDT) In-Reply-To: <87h8o9g8be.fsf@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jani Nikula Cc: dri-devel , Dave Airlie , intel-gfx , Linux Kernel Mailing List , Matthew Wilcox , Souptick Joarder , Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCBBcHIgMTcsIDIwMTggYXQgNToyOSBQTSwgSmFuaSBOaWt1bGEKPGphbmkubmlrdWxh QGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4gT24gVHVlLCAxNyBBcHIgMjAxOCwgU291cHRpY2sg Sm9hcmRlciA8anJkci5saW51eEBnbWFpbC5jb20+IHdyb3RlOgo+PiBVc2UgbmV3IHJldHVybiB0 eXBlIHZtX2ZhdWx0X3QgZm9yIGZhdWx0IGhhbmRsZXIuIEZvcgo+PiBub3csIHRoaXMgaXMganVz dCBkb2N1bWVudGluZyB0aGF0IHRoZSBmdW5jdGlvbiByZXR1cm5zCj4+IGEgVk1fRkFVTFQgdmFs dWUgcmF0aGVyIHRoYW4gYW4gZXJybm8uIE9uY2UgYWxsIGluc3RhbmNlcwo+PiBhcmUgY29udmVy dGVkLCB2bV9mYXVsdF90IHdpbGwgYmVjb21lIGEgZGlzdGluY3QgdHlwZS4KPj4KPj4gUmVmZXJl bmNlIGlkIC0+IDFjOGY0MjIwNTlhZSAoIm1tOiBjaGFuZ2UgcmV0dXJuIHR5cGUgdG8KPj4gdm1f ZmF1bHRfdCIpCj4+Cj4+IFNpZ25lZC1vZmYtYnk6IFNvdXB0aWNrIEpvYXJkZXIgPGpyZHIubGlu dXhAZ21haWwuY29tPgo+PiAtLS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg fCAgMyArKy0KPj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMgfCAxNSArKysrKysr Ky0tLS0tLS0KPj4gIDIgZmlsZXMgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlv bnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2Lmgg Yi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4+IGluZGV4IGE0MmRlZWIuLjk1YjBk NTAgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKPj4gKysr IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+PiBAQCAtNTEsNiArNTEsNyBAQAo+ PiAgI2luY2x1ZGUgPGRybS9kcm1fZ2VtLmg+Cj4+ICAjaW5jbHVkZSA8ZHJtL2RybV9hdXRoLmg+ Cj4+ICAjaW5jbHVkZSA8ZHJtL2RybV9jYWNoZS5oPgo+PiArI2luY2x1ZGUgPGxpbnV4L21tX3R5 cGVzLmg+Cj4+Cj4+ICAjaW5jbHVkZSAiaTkxNV9wYXJhbXMuaCIKPj4gICNpbmNsdWRlICJpOTE1 X3JlZy5oIgo+PiBAQCAtMzM2Myw3ICszMzY0LDcgQEAgaW50IGk5MTVfZ2VtX3dhaXRfZm9yX2lk bGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+PiAgICAgICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgaW50IGZsYWdzKTsKPj4gIGludCBfX211c3RfY2hlY2sgaTkxNV9n ZW1fc3VzcGVuZChzdHJ1Y3QgZHJtX2k5MTVfcHJpdmF0ZSAqZGV2X3ByaXYpOwo+PiAgdm9pZCBp OTE1X2dlbV9yZXN1bWUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPj4gLWlu dCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZik7Cj4+ICt2bV9mYXVsdF90IGk5 MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKTsKPj4gIGludCBpOTE1X2dlbV9vYmpl Y3Rfd2FpdChzdHJ1Y3QgZHJtX2k5MTVfZ2VtX29iamVjdCAqb2JqLAo+PiAgICAgICAgICAgICAg ICAgICAgICAgIHVuc2lnbmVkIGludCBmbGFncywKPj4gICAgICAgICAgICAgICAgICAgICAgICBs b25nIHRpbWVvdXQsCj4+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dl bS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+PiBpbmRleCBkZDg5YWJkLi5i ZGFjNjkwIDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5jCj4+ ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPj4gQEAgLTE4ODIsNyArMTg4 Miw3IEBAIGludCBpOTE1X2dlbV9tbWFwX2d0dF92ZXJzaW9uKHZvaWQpCj4+ICAgKiBUaGUgY3Vy cmVudCBmZWF0dXJlIHNldCBzdXBwb3J0ZWQgYnkgaTkxNV9nZW1fZmF1bHQoKSBhbmQgdGh1cyBH VFQgbW1hcHMKPj4gICAqIGlzIGV4cG9zZWQgdmlhIEk5MTVfUEFSQU1fTU1BUF9HVFRfVkVSU0lP TiAoc2VlIGk5MTVfZ2VtX21tYXBfZ3R0X3ZlcnNpb24pLgo+PiAgICovCj4+IC1pbnQgaTkxNV9n ZW1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4+ICt2bV9mYXVsdF90IGk5MTVfZ2VtX2Zh dWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+PiAgewo+PiAgI2RlZmluZSBNSU5fQ0hVTktfUEFH RVMgKCgxIDw8IDIwKSA+PiBQQUdFX1NISUZUKSAvKiAxIE1pQiAqLwo+PiAgICAgICBzdHJ1Y3Qg dm1fYXJlYV9zdHJ1Y3QgKmFyZWEgPSB2bWYtPnZtYTsKPj4gQEAgLTE4OTUsNiArMTg5NSw3IEBA IGludCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPj4gICAgICAgcGdvZmZf dCBwYWdlX29mZnNldDsKPj4gICAgICAgdW5zaWduZWQgaW50IGZsYWdzOwo+PiAgICAgICBpbnQg cmV0Owo+PiArICAgICB2bV9mYXVsdF90IHJldHZhbDsKPgo+IFdoYXQncyB0aGUgcG9pbnQgb2Yg Y2hhbmdpbmcgdGhlIG5hbWU/IEFuIHVubmVjZXNzYXJ5IGNoYW5nZS4KCmludCByZXQ7CgphbHJl YWR5IGV4aXN0cyBhbmQgaXMgdXNlZC4gWW91IGNhbid0IGFsc28gaGF2ZSBhIHZtX2ZhdWx0X3Qg cmV0OyBvbgp0b3Agb2YgdGhhdCA6LSkKLURhbmllbAoKPgo+IEJSLAo+IEphbmkuCj4KPj4KPj4g ICAgICAgLyogV2UgZG9uJ3QgdXNlIHZtZi0+cGdvZmYgc2luY2UgdGhhdCBoYXMgdGhlIGZha2Ug b2Zmc2V0ICovCj4+ICAgICAgIHBhZ2Vfb2Zmc2V0ID0gKHZtZi0+YWRkcmVzcyAtIGFyZWEtPnZt X3N0YXJ0KSA+PiBQQUdFX1NISUZUOwo+PiBAQCAtMjAwMCw3ICsyMDAxLDcgQEAgaW50IGk5MTVf Z2VtX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+PiAgICAgICAgICAgICAgICAqIGFuZCBz byBuZWVkcyB0byBiZSByZXBvcnRlZC4KPj4gICAgICAgICAgICAgICAgKi8KPj4gICAgICAgICAg ICAgICBpZiAoIWk5MTVfdGVybWluYWxseV93ZWRnZWQoJmRldl9wcml2LT5ncHVfZXJyb3IpKSB7 Cj4+IC0gICAgICAgICAgICAgICAgICAgICByZXQgPSBWTV9GQVVMVF9TSUdCVVM7Cj4+ICsgICAg ICAgICAgICAgICAgICAgICByZXR2YWwgPSBWTV9GQVVMVF9TSUdCVVM7Cj4+ICAgICAgICAgICAg ICAgICAgICAgICBicmVhazsKPj4gICAgICAgICAgICAgICB9Cj4+ICAgICAgIGNhc2UgLUVBR0FJ TjoKPj4gQEAgLTIwMTcsMjEgKzIwMTgsMjEgQEAgaW50IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2 bV9mYXVsdCAqdm1mKQo+PiAgICAgICAgICAgICAgICAqIEVCVVNZIGlzIG9rOiB0aGlzIGp1c3Qg bWVhbnMgdGhhdCBhbm90aGVyIHRocmVhZAo+PiAgICAgICAgICAgICAgICAqIGFscmVhZHkgZGlk IHRoZSBqb2IuCj4+ICAgICAgICAgICAgICAgICovCj4+IC0gICAgICAgICAgICAgcmV0ID0gVk1f RkFVTFRfTk9QQUdFOwo+PiArICAgICAgICAgICAgIHJldHZhbCA9IFZNX0ZBVUxUX05PUEFHRTsK Pj4gICAgICAgICAgICAgICBicmVhazsKPj4gICAgICAgY2FzZSAtRU5PTUVNOgo+PiAtICAgICAg ICAgICAgIHJldCA9IFZNX0ZBVUxUX09PTTsKPj4gKyAgICAgICAgICAgICByZXR2YWwgPSBWTV9G QVVMVF9PT007Cj4+ICAgICAgICAgICAgICAgYnJlYWs7Cj4+ICAgICAgIGNhc2UgLUVOT1NQQzoK Pj4gICAgICAgY2FzZSAtRUZBVUxUOgo+PiAtICAgICAgICAgICAgIHJldCA9IFZNX0ZBVUxUX1NJ R0JVUzsKPj4gKyAgICAgICAgICAgICByZXR2YWwgPSBWTV9GQVVMVF9TSUdCVVM7Cj4+ICAgICAg ICAgICAgICAgYnJlYWs7Cj4+ICAgICAgIGRlZmF1bHQ6Cj4+ICAgICAgICAgICAgICAgV0FSTl9P TkNFKHJldCwgInVuaGFuZGxlZCBlcnJvciBpbiBpOTE1X2dlbV9mYXVsdDogJWlcbiIsIHJldCk7 Cj4+IC0gICAgICAgICAgICAgcmV0ID0gVk1fRkFVTFRfU0lHQlVTOwo+PiArICAgICAgICAgICAg IHJldHZhbCA9IFZNX0ZBVUxUX1NJR0JVUzsKPj4gICAgICAgICAgICAgICBicmVhazsKPj4gICAg ICAgfQo+PiAtICAgICByZXR1cm4gcmV0Owo+PiArICAgICByZXR1cm4gcmV0dmFsOwo+PiAgfQo+ Pgo+PiAgc3RhdGljIHZvaWQgX19pOTE1X2dlbV9vYmplY3RfcmVsZWFzZV9tbWFwKHN0cnVjdCBk cm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCj4+IC0tCj4+IDEuOS4xCj4+Cj4KPiAtLQo+IEphbmkg TmlrdWxhLCBJbnRlbCBPcGVuIFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgo+IF9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcg bGlzdAo+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAoKCgotLSAKRGFuaWVsIFZl dHRlcgpTb2Z0d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KKzQxICgwKSA3OSAzNjUg NTcgNDggLSBodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK