From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sean Paul Subject: Re: [PATCH v2] drm: remove unnecessary fault wrappers Date: Tue, 31 Jan 2017 09:43:37 -0500 Message-ID: <20170131144337.GV20076@art_vandelay> References: <20170130203035.GS20076@art_vandelay> <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-qt0-x22f.google.com (mail-qt0-x22f.google.com [IPv6:2607:f8b0:400d:c0d::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0782E6E677 for ; Tue, 31 Jan 2017 14:43:40 +0000 (UTC) Received: by mail-qt0-x22f.google.com with SMTP id w20so166182455qtb.1 for ; Tue, 31 Jan 2017 06:43:39 -0800 (PST) Content-Disposition: inline In-Reply-To: <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Ross Zwisler Cc: Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBKYW4gMzAsIDIwMTcgYXQgMDM6MDk6MzlQTSAtMDcwMCwgUm9zcyBad2lzbGVyIHdy b3RlOgo+IFRoZSBmYXVsdCB3cmFwcGVycyBkcm1fdm1fZmF1bHQoKSwgZHJtX3ZtX3NobV9mYXVs dCgpLCBkcm1fdm1fZG1hX2ZhdWx0KCkKPiBhbmQgZHJtX3ZtX3NnX2ZhdWx0KCkgdXNlZCB0byBw cm92aWRlIGV4dHJhIGxvZ2ljIGJleW9uZCB3aGF0IHdhcyBpbiB0aGUKPiAiZHJtX2RvXyoiIHZl cnNpb25zIG9mIHRoZXNlIGZ1bmN0aW9ucywgYnV0IGFzIG9mIHRoaXMgY29tbWl0Ogo+IAo+IGNv bW1pdCBjYTBiMDdkOWE5NjkgKCJkcm06IGNvbnZlcnQgZHJtIGZyb20gbm9wYWdlIHRvIGZhdWx0 LiIpCj4gCj4gVGhleSBhcmUganVzdCB1bm5lY2Vzc2FyeSB3cmFwcGVycyB0aGF0IGRvIG5vdGhp bmcuICBSZW1vdmUgdGhlbSwgYW5kCj4gcmVuYW1lIHRoZSB0aGUgZHJtX2RvXyogZmF1bHQgaGFu ZGxlcnMgdG8gcmVtb3ZlIHRoZSAiZG9fIiBzaW5jZSB0aGV5IG5vCj4gbG9uZ2VyIGhhdmUgY29y cmVzcG9uZGluZyB3cmFwcGVycy4KPiAKClRoYW5rcyBmb3IgaHVtb3JpbmcgbXkgbml0IDotKQoK UmV2aWV3ZWQtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3JnPgoKPiBTaWduZWQt b2ZmLWJ5OiBSb3NzIFp3aXNsZXIgPHJvc3Muendpc2xlckBsaW51eC5pbnRlbC5jb20+Cj4gLS0t Cj4gCj4gVGhpcyBwYXRjaCBhcHBsaWVzIGNsZWFubHkgdG8gbW1vdHMvbWFzdGVyLCB3aGljaCBp cyBjdXJyZW50bHkgYXQKPiB2NC4xMC1yYzUtbW1vdHMtMjAxNy0wMS0yNi0xNS00OS4KPiAKPiAt LS0KPiAgZHJpdmVycy9ncHUvZHJtL2RybV92bS5jIHwgMzAgKysrKystLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDI1IGRlbGV0aW9u cygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX3ZtLmMgYi9kcml2ZXJz L2dwdS9kcm0vZHJtX3ZtLmMKPiBpbmRleCAwY2Q5OTNhLi4wMzlhMWUwIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9kcm1fdm0uYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fdm0u Ywo+IEBAIC05NSw3ICs5NSw3IEBAIHN0YXRpYyBwZ3Byb3RfdCBkcm1fZG1hX3Byb3QodWludDMy X3QgbWFwX3R5cGUsIHN0cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hKQo+ICAgKiBtYXAsIGdldCB0 aGUgcGFnZSwgaW5jcmVtZW50IHRoZSB1c2UgY291bnQgYW5kIHJldHVybiBpdC4KPiAgICovCj4g ICNpZiBJU19FTkFCTEVEKENPTkZJR19BR1ApCj4gLXN0YXRpYyBpbnQgZHJtX2RvX3ZtX2ZhdWx0 KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICtzdGF0aWMgaW50IGRybV92bV9mYXVsdChzdHJ1Y3Qg dm1fZmF1bHQgKnZtZikKPiAgewo+ICAJc3RydWN0IHZtX2FyZWFfc3RydWN0ICp2bWEgPSB2bWYt PnZtYTsKPiAgCXN0cnVjdCBkcm1fZmlsZSAqcHJpdiA9IHZtYS0+dm1fZmlsZS0+cHJpdmF0ZV9k YXRhOwo+IEBAIC0xNjgsNyArMTY4LDcgQEAgc3RhdGljIGludCBkcm1fZG9fdm1fZmF1bHQoc3Ry dWN0IHZtX2ZhdWx0ICp2bWYpCj4gIAlyZXR1cm4gVk1fRkFVTFRfU0lHQlVTOwkvKiBEaXNhbGxv dyBtcmVtYXAgKi8KPiAgfQo+ICAjZWxzZQo+IC1zdGF0aWMgaW50IGRybV9kb192bV9mYXVsdChz dHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiArc3RhdGljIGludCBkcm1fdm1fZmF1bHQoc3RydWN0IHZt X2ZhdWx0ICp2bWYpCj4gIHsKPiAgCXJldHVybiBWTV9GQVVMVF9TSUdCVVM7Cj4gIH0KPiBAQCAt MTgzLDcgKzE4Myw3IEBAIHN0YXRpYyBpbnQgZHJtX2RvX3ZtX2ZhdWx0KHN0cnVjdCB2bV9mYXVs dCAqdm1mKQo+ICAgKiBHZXQgdGhlIG1hcHBpbmcsIGZpbmQgdGhlIHJlYWwgcGh5c2ljYWwgcGFn ZSB0byBtYXAsIGdldCB0aGUgcGFnZSwgYW5kCj4gICAqIHJldHVybiBpdC4KPiAgICovCj4gLXN0 YXRpYyBpbnQgZHJtX2RvX3ZtX3NobV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiArc3Rh dGljIGludCBkcm1fdm1fc2htX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICB7Cj4gIAlz dHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSA9IHZtZi0+dm1hOwo+ICAJc3RydWN0IGRybV9sb2Nh bF9tYXAgKm1hcCA9IHZtYS0+dm1fcHJpdmF0ZV9kYXRhOwo+IEBAIC0yODUsNyArMjg1LDcgQEAg c3RhdGljIHZvaWQgZHJtX3ZtX3NobV9jbG9zZShzdHJ1Y3Qgdm1fYXJlYV9zdHJ1Y3QgKnZtYSkK PiAgICoKPiAgICogRGV0ZXJtaW5lIHRoZSBwYWdlIG51bWJlciBmcm9tIHRoZSBwYWdlIG9mZnNl dCBhbmQgZ2V0IGl0IGZyb20gZHJtX2RldmljZV9kbWE6OnBhZ2VsaXN0Lgo+ICAgKi8KPiAtc3Rh dGljIGludCBkcm1fZG9fdm1fZG1hX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICtzdGF0 aWMgaW50IGRybV92bV9kbWFfZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gIHsKPiAgCXN0 cnVjdCB2bV9hcmVhX3N0cnVjdCAqdm1hID0gdm1mLT52bWE7Cj4gIAlzdHJ1Y3QgZHJtX2ZpbGUg KnByaXYgPSB2bWEtPnZtX2ZpbGUtPnByaXZhdGVfZGF0YTsKPiBAQCAtMzIwLDcgKzMyMCw3IEBA IHN0YXRpYyBpbnQgZHJtX2RvX3ZtX2RtYV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiAg ICoKPiAgICogRGV0ZXJtaW5lIHRoZSBtYXAgb2Zmc2V0IGZyb20gdGhlIHBhZ2Ugb2Zmc2V0IGFu ZCBnZXQgaXQgZnJvbSBkcm1fc2dfbWVtOjpwYWdlbGlzdC4KPiAgICovCj4gLXN0YXRpYyBpbnQg ZHJtX2RvX3ZtX3NnX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICtzdGF0aWMgaW50IGRy bV92bV9zZ19mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiAgewo+ICAJc3RydWN0IHZtX2Fy ZWFfc3RydWN0ICp2bWEgPSB2bWYtPnZtYTsKPiAgCXN0cnVjdCBkcm1fbG9jYWxfbWFwICptYXAg PSB2bWEtPnZtX3ByaXZhdGVfZGF0YTsKPiBAQCAtMzQ3LDI2ICszNDcsNiBAQCBzdGF0aWMgaW50 IGRybV9kb192bV9zZ19mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiAgCXJldHVybiAwOwo+ ICB9Cj4gIAo+IC1zdGF0aWMgaW50IGRybV92bV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikK PiAtewo+IC0JcmV0dXJuIGRybV9kb192bV9mYXVsdCh2bWYpOwo+IC19Cj4gLQo+IC1zdGF0aWMg aW50IGRybV92bV9zaG1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gLXsKPiAtCXJldHVy biBkcm1fZG9fdm1fc2htX2ZhdWx0KHZtZik7Cj4gLX0KPiAtCj4gLXN0YXRpYyBpbnQgZHJtX3Zt X2RtYV9mYXVsdChzdHJ1Y3Qgdm1fZmF1bHQgKnZtZikKPiAtewo+IC0JcmV0dXJuIGRybV9kb192 bV9kbWFfZmF1bHQodm1mKTsKPiAtfQo+IC0KPiAtc3RhdGljIGludCBkcm1fdm1fc2dfZmF1bHQo c3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gLXsKPiAtCXJldHVybiBkcm1fZG9fdm1fc2dfZmF1bHQo dm1mKTsKPiAtfQo+IC0KPiAgLyoqIEFHUCB2aXJ0dWFsIG1lbW9yeSBvcGVyYXRpb25zICovCj4g IHN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm1fb3BlcmF0aW9uc19zdHJ1Y3QgZHJtX3ZtX29wcyA9IHsK PiAgCS5mYXVsdCA9IGRybV92bV9mYXVsdCwKPiAtLSAKPiAyLjcuNAoKLS0gClNlYW4gUGF1bCwg U29mdHdhcmUgRW5naW5lZXIsIEdvb2dsZSAvIENocm9taXVtIE9TCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJp LWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751175AbdAaOn6 (ORCPT ); Tue, 31 Jan 2017 09:43:58 -0500 Received: from mail-qt0-f175.google.com ([209.85.216.175]:35969 "EHLO mail-qt0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751106AbdAaOnp (ORCPT ); Tue, 31 Jan 2017 09:43:45 -0500 Date: Tue, 31 Jan 2017 09:43:37 -0500 From: Sean Paul To: Ross Zwisler Cc: linux-kernel@vger.kernel.org, Daniel Vetter , David Airlie , Jani Nikula , dri-devel@lists.freedesktop.org Subject: Re: [PATCH v2] drm: remove unnecessary fault wrappers Message-ID: <20170131144337.GV20076@art_vandelay> References: <20170130203035.GS20076@art_vandelay> <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485814179-28308-1-git-send-email-ross.zwisler@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 30, 2017 at 03:09:39PM -0700, Ross Zwisler wrote: > The fault wrappers drm_vm_fault(), drm_vm_shm_fault(), drm_vm_dma_fault() > and drm_vm_sg_fault() used to provide extra logic beyond what was in the > "drm_do_*" versions of these functions, but as of this commit: > > commit ca0b07d9a969 ("drm: convert drm from nopage to fault.") > > They are just unnecessary wrappers that do nothing. Remove them, and > rename the the drm_do_* fault handlers to remove the "do_" since they no > longer have corresponding wrappers. > Thanks for humoring my nit :-) Reviewed-by: Sean Paul > Signed-off-by: Ross Zwisler > --- > > This patch applies cleanly to mmots/master, which is currently at > v4.10-rc5-mmots-2017-01-26-15-49. > > --- > drivers/gpu/drm/drm_vm.c | 30 +++++------------------------- > 1 file changed, 5 insertions(+), 25 deletions(-) > > diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c > index 0cd993a..039a1e0 100644 > --- a/drivers/gpu/drm/drm_vm.c > +++ b/drivers/gpu/drm/drm_vm.c > @@ -95,7 +95,7 @@ static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma) > * map, get the page, increment the use count and return it. > */ > #if IS_ENABLED(CONFIG_AGP) > -static int drm_do_vm_fault(struct vm_fault *vmf) > +static int drm_vm_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_file *priv = vma->vm_file->private_data; > @@ -168,7 +168,7 @@ static int drm_do_vm_fault(struct vm_fault *vmf) > return VM_FAULT_SIGBUS; /* Disallow mremap */ > } > #else > -static int drm_do_vm_fault(struct vm_fault *vmf) > +static int drm_vm_fault(struct vm_fault *vmf) > { > return VM_FAULT_SIGBUS; > } > @@ -183,7 +183,7 @@ static int drm_do_vm_fault(struct vm_fault *vmf) > * Get the mapping, find the real physical page to map, get the page, and > * return it. > */ > -static int drm_do_vm_shm_fault(struct vm_fault *vmf) > +static int drm_vm_shm_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_local_map *map = vma->vm_private_data; > @@ -285,7 +285,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) > * > * Determine the page number from the page offset and get it from drm_device_dma::pagelist. > */ > -static int drm_do_vm_dma_fault(struct vm_fault *vmf) > +static int drm_vm_dma_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_file *priv = vma->vm_file->private_data; > @@ -320,7 +320,7 @@ static int drm_do_vm_dma_fault(struct vm_fault *vmf) > * > * Determine the map offset from the page offset and get it from drm_sg_mem::pagelist. > */ > -static int drm_do_vm_sg_fault(struct vm_fault *vmf) > +static int drm_vm_sg_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_local_map *map = vma->vm_private_data; > @@ -347,26 +347,6 @@ static int drm_do_vm_sg_fault(struct vm_fault *vmf) > return 0; > } > > -static int drm_vm_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_fault(vmf); > -} > - > -static int drm_vm_shm_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_shm_fault(vmf); > -} > - > -static int drm_vm_dma_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_dma_fault(vmf); > -} > - > -static int drm_vm_sg_fault(struct vm_fault *vmf) > -{ > - return drm_do_vm_sg_fault(vmf); > -} > - > /** AGP virtual memory operations */ > static const struct vm_operations_struct drm_vm_ops = { > .fault = drm_vm_fault, > -- > 2.7.4 -- Sean Paul, Software Engineer, Google / Chromium OS