From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] gpu: drm: i915: Change return type to vm_fault_t Date: Tue, 17 Apr 2018 18:29:41 +0300 Message-ID: <87h8o9g8be.fsf@intel.com> References: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Souptick Joarder , joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie Cc: intel-gfx@lists.freedesktop.org, willy@infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAxNyBBcHIgMjAxOCwgU291cHRpY2sgSm9hcmRlciA8anJkci5saW51eEBnbWFpbC5j b20+IHdyb3RlOgo+IFVzZSBuZXcgcmV0dXJuIHR5cGUgdm1fZmF1bHRfdCBmb3IgZmF1bHQgaGFu ZGxlci4gRm9yCj4gbm93LCB0aGlzIGlzIGp1c3QgZG9jdW1lbnRpbmcgdGhhdCB0aGUgZnVuY3Rp b24gcmV0dXJucwo+IGEgVk1fRkFVTFQgdmFsdWUgcmF0aGVyIHRoYW4gYW4gZXJybm8uIE9uY2Ug YWxsIGluc3RhbmNlcwo+IGFyZSBjb252ZXJ0ZWQsIHZtX2ZhdWx0X3Qgd2lsbCBiZWNvbWUgYSBk aXN0aW5jdCB0eXBlLgo+Cj4gUmVmZXJlbmNlIGlkIC0+IDFjOGY0MjIwNTlhZSAoIm1tOiBjaGFu Z2UgcmV0dXJuIHR5cGUgdG8KPiB2bV9mYXVsdF90IikKPgo+IFNpZ25lZC1vZmYtYnk6IFNvdXB0 aWNrIEpvYXJkZXIgPGpyZHIubGludXhAZ21haWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5oIHwgIDMgKystCj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVf Z2VtLmMgfCAxNSArKysrKysrKy0tLS0tLS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRp b25zKCspLCA4IGRlbGV0aW9ucygtKQo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9p OTE1L2k5MTVfZHJ2LmggYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Rydi5oCj4gaW5kZXgg YTQyZGVlYi4uOTViMGQ1MCAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5oCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuaAo+IEBAIC01MSw2 ICs1MSw3IEBACj4gICNpbmNsdWRlIDxkcm0vZHJtX2dlbS5oPgo+ICAjaW5jbHVkZSA8ZHJtL2Ry bV9hdXRoLmg+Cj4gICNpbmNsdWRlIDxkcm0vZHJtX2NhY2hlLmg+Cj4gKyNpbmNsdWRlIDxsaW51 eC9tbV90eXBlcy5oPgo+Cj4gICNpbmNsdWRlICJpOTE1X3BhcmFtcy5oIgo+ICAjaW5jbHVkZSAi aTkxNV9yZWcuaCIKPiBAQCAtMzM2Myw3ICszMzY0LDcgQEAgaW50IGk5MTVfZ2VtX3dhaXRfZm9y X2lkbGUoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2LAo+ICAJCQkgICB1bnNpZ25l ZCBpbnQgZmxhZ3MpOwo+ICBpbnQgX19tdXN0X2NoZWNrIGk5MTVfZ2VtX3N1c3BlbmQoc3RydWN0 IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPiAgdm9pZCBpOTE1X2dlbV9yZXN1bWUoc3Ry dWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KTsKPiAtaW50IGk5MTVfZ2VtX2ZhdWx0KHN0 cnVjdCB2bV9mYXVsdCAqdm1mKTsKPiArdm1fZmF1bHRfdCBpOTE1X2dlbV9mYXVsdChzdHJ1Y3Qg dm1fZmF1bHQgKnZtZik7Cj4gIGludCBpOTE1X2dlbV9vYmplY3Rfd2FpdChzdHJ1Y3QgZHJtX2k5 MTVfZ2VtX29iamVjdCAqb2JqLAo+ICAJCQkgdW5zaWduZWQgaW50IGZsYWdzLAo+ICAJCQkgbG9u ZyB0aW1lb3V0LAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2dlbS5j IGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+IGluZGV4IGRkODlhYmQuLmJkYWM2 OTAgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwo+ICsrKyBi L2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZ2VtLmMKPiBAQCAtMTg4Miw3ICsxODgyLDcgQEAg aW50IGk5MTVfZ2VtX21tYXBfZ3R0X3ZlcnNpb24odm9pZCkKPiAgICogVGhlIGN1cnJlbnQgZmVh dHVyZSBzZXQgc3VwcG9ydGVkIGJ5IGk5MTVfZ2VtX2ZhdWx0KCkgYW5kIHRodXMgR1RUIG1tYXBz Cj4gICAqIGlzIGV4cG9zZWQgdmlhIEk5MTVfUEFSQU1fTU1BUF9HVFRfVkVSU0lPTiAoc2VlIGk5 MTVfZ2VtX21tYXBfZ3R0X3ZlcnNpb24pLgo+ICAgKi8KPiAtaW50IGk5MTVfZ2VtX2ZhdWx0KHN0 cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICt2bV9mYXVsdF90IGk5MTVfZ2VtX2ZhdWx0KHN0cnVjdCB2 bV9mYXVsdCAqdm1mKQo+ICB7Cj4gICNkZWZpbmUgTUlOX0NIVU5LX1BBR0VTICgoMSA8PCAyMCkg Pj4gUEFHRV9TSElGVCkgLyogMSBNaUIgKi8KPiAgCXN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqYXJl YSA9IHZtZi0+dm1hOwo+IEBAIC0xODk1LDYgKzE4OTUsNyBAQCBpbnQgaTkxNV9nZW1fZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gIAlwZ29mZl90IHBhZ2Vfb2Zmc2V0Owo+ICAJdW5zaWdu ZWQgaW50IGZsYWdzOwo+ICAJaW50IHJldDsKPiArCXZtX2ZhdWx0X3QgcmV0dmFsOwoKV2hhdCdz IHRoZSBwb2ludCBvZiBjaGFuZ2luZyB0aGUgbmFtZT8gQW4gdW5uZWNlc3NhcnkgY2hhbmdlLgoK QlIsCkphbmkuCgo+Cj4gIAkvKiBXZSBkb24ndCB1c2Ugdm1mLT5wZ29mZiBzaW5jZSB0aGF0IGhh cyB0aGUgZmFrZSBvZmZzZXQgKi8KPiAgCXBhZ2Vfb2Zmc2V0ID0gKHZtZi0+YWRkcmVzcyAtIGFy ZWEtPnZtX3N0YXJ0KSA+PiBQQUdFX1NISUZUOwo+IEBAIC0yMDAwLDcgKzIwMDEsNyBAQCBpbnQg aTkxNV9nZW1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gIAkJICogYW5kIHNvIG5lZWRz IHRvIGJlIHJlcG9ydGVkLgo+ICAJCSAqLwo+ICAJCWlmICghaTkxNV90ZXJtaW5hbGx5X3dlZGdl ZCgmZGV2X3ByaXYtPmdwdV9lcnJvcikpIHsKPiAtCQkJcmV0ID0gVk1fRkFVTFRfU0lHQlVTOwo+ ICsJCQlyZXR2YWwgPSBWTV9GQVVMVF9TSUdCVVM7Cj4gIAkJCWJyZWFrOwo+ICAJCX0KPiAgCWNh c2UgLUVBR0FJTjoKPiBAQCAtMjAxNywyMSArMjAxOCwyMSBAQCBpbnQgaTkxNV9nZW1fZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gIAkJICogRUJVU1kgaXMgb2s6IHRoaXMganVzdCBtZWFu cyB0aGF0IGFub3RoZXIgdGhyZWFkCj4gIAkJICogYWxyZWFkeSBkaWQgdGhlIGpvYi4KPiAgCQkg Ki8KPiAtCQlyZXQgPSBWTV9GQVVMVF9OT1BBR0U7Cj4gKwkJcmV0dmFsID0gVk1fRkFVTFRfTk9Q QUdFOwo+ICAJCWJyZWFrOwo+ICAJY2FzZSAtRU5PTUVNOgo+IC0JCXJldCA9IFZNX0ZBVUxUX09P TTsKPiArCQlyZXR2YWwgPSBWTV9GQVVMVF9PT007Cj4gIAkJYnJlYWs7Cj4gIAljYXNlIC1FTk9T UEM6Cj4gIAljYXNlIC1FRkFVTFQ6Cj4gLQkJcmV0ID0gVk1fRkFVTFRfU0lHQlVTOwo+ICsJCXJl dHZhbCA9IFZNX0ZBVUxUX1NJR0JVUzsKPiAgCQlicmVhazsKPiAgCWRlZmF1bHQ6Cj4gIAkJV0FS Tl9PTkNFKHJldCwgInVuaGFuZGxlZCBlcnJvciBpbiBpOTE1X2dlbV9mYXVsdDogJWlcbiIsIHJl dCk7Cj4gLQkJcmV0ID0gVk1fRkFVTFRfU0lHQlVTOwo+ICsJCXJldHZhbCA9IFZNX0ZBVUxUX1NJ R0JVUzsKPiAgCQlicmVhazsKPiAgCX0KPiAtCXJldHVybiByZXQ7Cj4gKwlyZXR1cm4gcmV0dmFs Owo+ICB9Cj4KPiAgc3RhdGljIHZvaWQgX19pOTE1X2dlbV9vYmplY3RfcmVsZWFzZV9tbWFwKHN0 cnVjdCBkcm1faTkxNV9nZW1fb2JqZWN0ICpvYmopCj4gLS0KPiAxLjkuMQo+CgotLSAKSmFuaSBO aWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752546AbeDQP1B (ORCPT ); Tue, 17 Apr 2018 11:27:01 -0400 Received: from mga14.intel.com ([192.55.52.115]:61296 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750741AbeDQP1A (ORCPT ); Tue, 17 Apr 2018 11:27:00 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,464,1517904000"; d="scan'208";a="47649187" From: Jani Nikula To: Souptick Joarder , joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, airlied@linux.ie Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, willy@infradead.org Subject: Re: [PATCH] gpu: drm: i915: Change return type to vm_fault_t In-Reply-To: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20180417151127.GA31655@jordon-HP-15-Notebook-PC> Date: Tue, 17 Apr 2018 18:29:41 +0300 Message-ID: <87h8o9g8be.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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