From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com ([74.125.82.66]:34641 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338AbeEPJxH (ORCPT ); Wed, 16 May 2018 05:53:07 -0400 Received: by mail-wm0-f66.google.com with SMTP id a137-v6so214425wme.1 for ; Wed, 16 May 2018 02:53:07 -0700 (PDT) Date: Wed, 16 May 2018 11:53:03 +0200 From: Daniel Vetter To: Christoph Hellwig Cc: Souptick Joarder , Matthew Wilcox , linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, devel@lists.orangefs.org, ceph-devel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, ocfs2-devel@oss.oracle.com, linux-mtd@lists.infradead.org, dri-devel@lists.freedesktop.org, lustre-devel@lists.lustre.org, linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org Subject: Re: [PATCH 10/14] vgem: separate errno from VM_FAULT_* values Message-ID: <20180516095303.GH3438@phenom.ffwll.local> References: <20180516054348.15950-1-hch@lst.de> <20180516054348.15950-11-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20180516054348.15950-11-hch@lst.de> Sender: linux-btrfs-owner@vger.kernel.org List-ID: On Wed, May 16, 2018 at 07:43:44AM +0200, Christoph Hellwig wrote: > And streamline the code in vgem_fault with early returns so that it is > a little bit more readable. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/vgem/vgem_drv.c | 51 +++++++++++++++------------------ > 1 file changed, 23 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c > index 2524ff116f00..a261e0aab83a 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -61,12 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj) > kfree(vgem_obj); > } > > -static int vgem_gem_fault(struct vm_fault *vmf) > +static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_vgem_gem_object *obj = vma->vm_private_data; > /* We don't use vmf->pgoff since that has the fake offset */ > unsigned long vaddr = vmf->address; > + struct page *page; > int ret; > loff_t num_pages; > pgoff_t page_offset; > @@ -85,35 +86,29 @@ static int vgem_gem_fault(struct vm_fault *vmf) > ret = 0; > } > mutex_unlock(&obj->pages_lock); > - if (ret) { > - struct page *page; > - > - page = shmem_read_mapping_page( > - file_inode(obj->base.filp)->i_mapping, > - page_offset); > - if (!IS_ERR(page)) { > - vmf->page = page; > - ret = 0; > - } else switch (PTR_ERR(page)) { > - case -ENOSPC: > - case -ENOMEM: > - ret = VM_FAULT_OOM; > - break; > - case -EBUSY: > - ret = VM_FAULT_RETRY; > - break; > - case -EFAULT: > - case -EINVAL: > - ret = VM_FAULT_SIGBUS; > - break; > - default: > - WARN_ON(PTR_ERR(page)); > - ret = VM_FAULT_SIGBUS; > - break; > - } > + if (!ret) > + return 0; > + > + page = shmem_read_mapping_page(file_inode(obj->base.filp)->i_mapping, > + page_offset); > + if (!IS_ERR(page)) { > + vmf->page = page; > + return 0; > + } > > + switch (PTR_ERR(page)) { > + case -ENOSPC: > + case -ENOMEM: > + return VM_FAULT_OOM; > + case -EBUSY: > + return VM_FAULT_RETRY; > + case -EFAULT: > + case -EINVAL: > + return VM_FAULT_SIGBUS; > + default: > + WARN_ON(PTR_ERR(page)); > + return VM_FAULT_SIGBUS; > } > - return ret; Reviewed-by: Daniel Vetter Want me to merge this through drm-misc or plan to pick it up yourself? -Daniel > } > > static const struct vm_operations_struct vgem_gem_vm_ops = { > -- > 2.17.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 10/14] vgem: separate errno from VM_FAULT_* values Date: Wed, 16 May 2018 11:53:03 +0200 Message-ID: <20180516095303.GH3438@phenom.ffwll.local> References: <20180516054348.15950-1-hch@lst.de> <20180516054348.15950-11-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20180516054348.15950-11-hch@lst.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" List-Archive: List-Post: To: Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-btrfs@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Matthew Wilcox , linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, Souptick Joarder , linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, ceph-devel@vger.kernel.org, linux-ext4@vger.kernel.org, devel@lists.orangefs.org, lustre-devel@lists.lustre.org List-ID: T24gV2VkLCBNYXkgMTYsIDIwMTggYXQgMDc6NDM6NDRBTSArMDIwMCwgQ2hyaXN0b3BoIEhlbGx3 aWcgd3JvdGU6Cj4gQW5kIHN0cmVhbWxpbmUgdGhlIGNvZGUgaW4gdmdlbV9mYXVsdCB3aXRoIGVh cmx5IHJldHVybnMgc28gdGhhdCBpdCBpcwo+IGEgbGl0dGxlIGJpdCBtb3JlIHJlYWRhYmxlLgo+ IAo+IFNpZ25lZC1vZmYtYnk6IENocmlzdG9waCBIZWxsd2lnIDxoY2hAbHN0LmRlPgo+IC0tLQo+ ICBkcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2VtX2Rydi5jIHwgNTEgKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAyOCBk ZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9k cnYuYyBiL2RyaXZlcnMvZ3B1L2RybS92Z2VtL3ZnZW1fZHJ2LmMKPiBpbmRleCAyNTI0ZmYxMTZm MDAuLmEyNjFlMGFhYjgzYSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmdlbS92Z2Vt X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZnZW0vdmdlbV9kcnYuYwo+IEBAIC02MSwx MiArNjEsMTMgQEAgc3RhdGljIHZvaWQgdmdlbV9nZW1fZnJlZV9vYmplY3Qoc3RydWN0IGRybV9n ZW1fb2JqZWN0ICpvYmopCj4gIAlrZnJlZSh2Z2VtX29iaik7Cj4gIH0KPiAgCj4gLXN0YXRpYyBp bnQgdmdlbV9nZW1fZmF1bHQoc3RydWN0IHZtX2ZhdWx0ICp2bWYpCj4gK3N0YXRpYyB2bV9mYXVs dF90IHZnZW1fZ2VtX2ZhdWx0KHN0cnVjdCB2bV9mYXVsdCAqdm1mKQo+ICB7Cj4gIAlzdHJ1Y3Qg dm1fYXJlYV9zdHJ1Y3QgKnZtYSA9IHZtZi0+dm1hOwo+ICAJc3RydWN0IGRybV92Z2VtX2dlbV9v YmplY3QgKm9iaiA9IHZtYS0+dm1fcHJpdmF0ZV9kYXRhOwo+ICAJLyogV2UgZG9uJ3QgdXNlIHZt Zi0+cGdvZmYgc2luY2UgdGhhdCBoYXMgdGhlIGZha2Ugb2Zmc2V0ICovCj4gIAl1bnNpZ25lZCBs b25nIHZhZGRyID0gdm1mLT5hZGRyZXNzOwo+ICsJc3RydWN0IHBhZ2UgKnBhZ2U7Cj4gIAlpbnQg cmV0Owo+ICAJbG9mZl90IG51bV9wYWdlczsKPiAgCXBnb2ZmX3QgcGFnZV9vZmZzZXQ7Cj4gQEAg LTg1LDM1ICs4NiwyOSBAQCBzdGF0aWMgaW50IHZnZW1fZ2VtX2ZhdWx0KHN0cnVjdCB2bV9mYXVs dCAqdm1mKQo+ICAJCXJldCA9IDA7Cj4gIAl9Cj4gIAltdXRleF91bmxvY2soJm9iai0+cGFnZXNf bG9jayk7Cj4gLQlpZiAocmV0KSB7Cj4gLQkJc3RydWN0IHBhZ2UgKnBhZ2U7Cj4gLQo+IC0JCXBh Z2UgPSBzaG1lbV9yZWFkX21hcHBpbmdfcGFnZSgKPiAtCQkJCQlmaWxlX2lub2RlKG9iai0+YmFz ZS5maWxwKS0+aV9tYXBwaW5nLAo+IC0JCQkJCXBhZ2Vfb2Zmc2V0KTsKPiAtCQlpZiAoIUlTX0VS UihwYWdlKSkgewo+IC0JCQl2bWYtPnBhZ2UgPSBwYWdlOwo+IC0JCQlyZXQgPSAwOwo+IC0JCX0g ZWxzZSBzd2l0Y2ggKFBUUl9FUlIocGFnZSkpIHsKPiAtCQkJY2FzZSAtRU5PU1BDOgo+IC0JCQlj YXNlIC1FTk9NRU06Cj4gLQkJCQlyZXQgPSBWTV9GQVVMVF9PT007Cj4gLQkJCQlicmVhazsKPiAt CQkJY2FzZSAtRUJVU1k6Cj4gLQkJCQlyZXQgPSBWTV9GQVVMVF9SRVRSWTsKPiAtCQkJCWJyZWFr Owo+IC0JCQljYXNlIC1FRkFVTFQ6Cj4gLQkJCWNhc2UgLUVJTlZBTDoKPiAtCQkJCXJldCA9IFZN X0ZBVUxUX1NJR0JVUzsKPiAtCQkJCWJyZWFrOwo+IC0JCQlkZWZhdWx0Ogo+IC0JCQkJV0FSTl9P TihQVFJfRVJSKHBhZ2UpKTsKPiAtCQkJCXJldCA9IFZNX0ZBVUxUX1NJR0JVUzsKPiAtCQkJCWJy ZWFrOwo+IC0JCX0KPiArCWlmICghcmV0KQo+ICsJCXJldHVybiAwOwo+ICsKPiArCXBhZ2UgPSBz aG1lbV9yZWFkX21hcHBpbmdfcGFnZShmaWxlX2lub2RlKG9iai0+YmFzZS5maWxwKS0+aV9tYXBw aW5nLAo+ICsJCQlwYWdlX29mZnNldCk7Cj4gKwlpZiAoIUlTX0VSUihwYWdlKSkgewo+ICsJCXZt Zi0+cGFnZSA9IHBhZ2U7Cj4gKwkJcmV0dXJuIDA7Cj4gKwl9Cj4gIAo+ICsJc3dpdGNoIChQVFJf RVJSKHBhZ2UpKSB7Cj4gKwljYXNlIC1FTk9TUEM6Cj4gKwljYXNlIC1FTk9NRU06Cj4gKwkJcmV0 dXJuIFZNX0ZBVUxUX09PTTsKPiArCWNhc2UgLUVCVVNZOgo+ICsJCXJldHVybiBWTV9GQVVMVF9S RVRSWTsKPiArCWNhc2UgLUVGQVVMVDoKPiArCWNhc2UgLUVJTlZBTDoKPiArCQlyZXR1cm4gVk1f RkFVTFRfU0lHQlVTOwo+ICsJZGVmYXVsdDoKPiArCQlXQVJOX09OKFBUUl9FUlIocGFnZSkpOwo+ ICsJCXJldHVybiBWTV9GQVVMVF9TSUdCVVM7Cj4gIAl9Cj4gLQlyZXR1cm4gcmV0OwoKUmV2aWV3 ZWQtYnk6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+CgpXYW50IG1lIHRv IG1lcmdlIHRoaXMgdGhyb3VnaCBkcm0tbWlzYyBvciBwbGFuIHRvIHBpY2sgaXQgdXAgeW91cnNl bGY/Ci1EYW5pZWwKCj4gIH0KPiAgCj4gIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgdm1fb3BlcmF0aW9u c19zdHJ1Y3QgdmdlbV9nZW1fdm1fb3BzID0gewo+IC0tIAo+IDIuMTcuMAo+IAoKLS0gCkRhbmll bCBWZXR0ZXIKU29mdHdhcmUgRW5naW5lZXIsIEludGVsIENvcnBvcmF0aW9uCmh0dHA6Ly9ibG9n LmZmd2xsLmNoCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Wed, 16 May 2018 11:53:03 +0200 Subject: [lustre-devel] [PATCH 10/14] vgem: separate errno from VM_FAULT_* values In-Reply-To: <20180516054348.15950-11-hch@lst.de> References: <20180516054348.15950-1-hch@lst.de> <20180516054348.15950-11-hch@lst.de> Message-ID: <20180516095303.GH3438@phenom.ffwll.local> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Christoph Hellwig Cc: linux-arm-kernel@lists.infradead.org, linux-s390@vger.kernel.org, linux-btrfs@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Matthew Wilcox , linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, Souptick Joarder , linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, ceph-devel@vger.kernel.org, linux-ext4@vger.kernel.org, devel@lists.orangefs.org, lustre-devel@lists.lustre.org On Wed, May 16, 2018 at 07:43:44AM +0200, Christoph Hellwig wrote: > And streamline the code in vgem_fault with early returns so that it is > a little bit more readable. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/vgem/vgem_drv.c | 51 +++++++++++++++------------------ > 1 file changed, 23 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c > index 2524ff116f00..a261e0aab83a 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -61,12 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj) > kfree(vgem_obj); > } > > -static int vgem_gem_fault(struct vm_fault *vmf) > +static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_vgem_gem_object *obj = vma->vm_private_data; > /* We don't use vmf->pgoff since that has the fake offset */ > unsigned long vaddr = vmf->address; > + struct page *page; > int ret; > loff_t num_pages; > pgoff_t page_offset; > @@ -85,35 +86,29 @@ static int vgem_gem_fault(struct vm_fault *vmf) > ret = 0; > } > mutex_unlock(&obj->pages_lock); > - if (ret) { > - struct page *page; > - > - page = shmem_read_mapping_page( > - file_inode(obj->base.filp)->i_mapping, > - page_offset); > - if (!IS_ERR(page)) { > - vmf->page = page; > - ret = 0; > - } else switch (PTR_ERR(page)) { > - case -ENOSPC: > - case -ENOMEM: > - ret = VM_FAULT_OOM; > - break; > - case -EBUSY: > - ret = VM_FAULT_RETRY; > - break; > - case -EFAULT: > - case -EINVAL: > - ret = VM_FAULT_SIGBUS; > - break; > - default: > - WARN_ON(PTR_ERR(page)); > - ret = VM_FAULT_SIGBUS; > - break; > - } > + if (!ret) > + return 0; > + > + page = shmem_read_mapping_page(file_inode(obj->base.filp)->i_mapping, > + page_offset); > + if (!IS_ERR(page)) { > + vmf->page = page; > + return 0; > + } > > + switch (PTR_ERR(page)) { > + case -ENOSPC: > + case -ENOMEM: > + return VM_FAULT_OOM; > + case -EBUSY: > + return VM_FAULT_RETRY; > + case -EFAULT: > + case -EINVAL: > + return VM_FAULT_SIGBUS; > + default: > + WARN_ON(PTR_ERR(page)); > + return VM_FAULT_SIGBUS; > } > - return ret; Reviewed-by: Daniel Vetter Want me to merge this through drm-misc or plan to pick it up yourself? -Daniel > } > > static const struct vm_operations_struct vgem_gem_vm_ops = { > -- > 2.17.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel@ffwll.ch (Daniel Vetter) Date: Wed, 16 May 2018 11:53:03 +0200 Subject: [PATCH 10/14] vgem: separate errno from VM_FAULT_* values In-Reply-To: <20180516054348.15950-11-hch@lst.de> References: <20180516054348.15950-1-hch@lst.de> <20180516054348.15950-11-hch@lst.de> Message-ID: <20180516095303.GH3438@phenom.ffwll.local> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, May 16, 2018 at 07:43:44AM +0200, Christoph Hellwig wrote: > And streamline the code in vgem_fault with early returns so that it is > a little bit more readable. > > Signed-off-by: Christoph Hellwig > --- > drivers/gpu/drm/vgem/vgem_drv.c | 51 +++++++++++++++------------------ > 1 file changed, 23 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c > index 2524ff116f00..a261e0aab83a 100644 > --- a/drivers/gpu/drm/vgem/vgem_drv.c > +++ b/drivers/gpu/drm/vgem/vgem_drv.c > @@ -61,12 +61,13 @@ static void vgem_gem_free_object(struct drm_gem_object *obj) > kfree(vgem_obj); > } > > -static int vgem_gem_fault(struct vm_fault *vmf) > +static vm_fault_t vgem_gem_fault(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > struct drm_vgem_gem_object *obj = vma->vm_private_data; > /* We don't use vmf->pgoff since that has the fake offset */ > unsigned long vaddr = vmf->address; > + struct page *page; > int ret; > loff_t num_pages; > pgoff_t page_offset; > @@ -85,35 +86,29 @@ static int vgem_gem_fault(struct vm_fault *vmf) > ret = 0; > } > mutex_unlock(&obj->pages_lock); > - if (ret) { > - struct page *page; > - > - page = shmem_read_mapping_page( > - file_inode(obj->base.filp)->i_mapping, > - page_offset); > - if (!IS_ERR(page)) { > - vmf->page = page; > - ret = 0; > - } else switch (PTR_ERR(page)) { > - case -ENOSPC: > - case -ENOMEM: > - ret = VM_FAULT_OOM; > - break; > - case -EBUSY: > - ret = VM_FAULT_RETRY; > - break; > - case -EFAULT: > - case -EINVAL: > - ret = VM_FAULT_SIGBUS; > - break; > - default: > - WARN_ON(PTR_ERR(page)); > - ret = VM_FAULT_SIGBUS; > - break; > - } > + if (!ret) > + return 0; > + > + page = shmem_read_mapping_page(file_inode(obj->base.filp)->i_mapping, > + page_offset); > + if (!IS_ERR(page)) { > + vmf->page = page; > + return 0; > + } > > + switch (PTR_ERR(page)) { > + case -ENOSPC: > + case -ENOMEM: > + return VM_FAULT_OOM; > + case -EBUSY: > + return VM_FAULT_RETRY; > + case -EFAULT: > + case -EINVAL: > + return VM_FAULT_SIGBUS; > + default: > + WARN_ON(PTR_ERR(page)); > + return VM_FAULT_SIGBUS; > } > - return ret; Reviewed-by: Daniel Vetter Want me to merge this through drm-misc or plan to pick it up yourself? -Daniel > } > > static const struct vm_operations_struct vgem_gem_vm_ops = { > -- > 2.17.0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch