* [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
@ 2018-04-17 13:47 Souptick Joarder
2018-04-18 8:24 ` Thierry Reding
2018-05-14 12:59 ` Thierry Reding
0 siblings, 2 replies; 8+ messages in thread
From: Souptick Joarder @ 2018-04-17 13:47 UTC (permalink / raw)
To: thierry.reding, airlied, jonathanh
Cc: dri-devel, linux-tegra, linux-kernel, willy
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")
Previously vm_insert_page() returns err which driver
mapped into VM_FAULT_* type. The new function
vmf_insert_page() will replace this inefficiency by
returning VM_FAULT_* type.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
drivers/gpu/drm/tegra/gem.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 49b9bf2..6121493 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
return 0;
}
-static int tegra_bo_fault(struct vm_fault *vmf)
+static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *gem = vma->vm_private_data;
struct tegra_bo *bo = to_tegra_bo(gem);
struct page *page;
pgoff_t offset;
- int err;
if (!bo->pages)
return VM_FAULT_SIGBUS;
@@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
page = bo->pages[offset];
- err = vm_insert_page(vma, vmf->address, page);
- switch (err) {
- case -EAGAIN:
- case 0:
- case -ERESTARTSYS:
- case -EINTR:
- case -EBUSY:
- return VM_FAULT_NOPAGE;
-
- case -ENOMEM:
- return VM_FAULT_OOM;
- }
-
- return VM_FAULT_SIGBUS;
+ return vmf_insert_page(vma, vmf->address, page);
}
const struct vm_operations_struct tegra_bo_vm_ops = {
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
2018-04-17 13:47 [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t Souptick Joarder
@ 2018-04-18 8:24 ` Thierry Reding
2018-05-14 12:59 ` Thierry Reding
1 sibling, 0 replies; 8+ messages in thread
From: Thierry Reding @ 2018-04-18 8:24 UTC (permalink / raw)
To: Souptick Joarder
Cc: airlied, linux-kernel, willy, jonathanh, dri-devel, linux-tegra
[-- Attachment #1.1: Type: text/plain, Size: 2147 bytes --]
On Tue, Apr 17, 2018 at 07:17:55PM +0530, 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")
>
> Previously vm_insert_page() returns err which driver
> mapped into VM_FAULT_* type. The new function
> vmf_insert_page() will replace this inefficiency by
> returning VM_FAULT_* type.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> ---
> drivers/gpu/drm/tegra/gem.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
> index 49b9bf2..6121493 100644
> --- a/drivers/gpu/drm/tegra/gem.c
> +++ b/drivers/gpu/drm/tegra/gem.c
> @@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
> return 0;
> }
>
> -static int tegra_bo_fault(struct vm_fault *vmf)
> +static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_gem_object *gem = vma->vm_private_data;
> struct tegra_bo *bo = to_tegra_bo(gem);
> struct page *page;
> pgoff_t offset;
> - int err;
>
> if (!bo->pages)
> return VM_FAULT_SIGBUS;
> @@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
> offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
> page = bo->pages[offset];
>
> - err = vm_insert_page(vma, vmf->address, page);
> - switch (err) {
> - case -EAGAIN:
> - case 0:
> - case -ERESTARTSYS:
> - case -EINTR:
> - case -EBUSY:
> - return VM_FAULT_NOPAGE;
> -
> - case -ENOMEM:
> - return VM_FAULT_OOM;
> - }
> -
> - return VM_FAULT_SIGBUS;
> + return vmf_insert_page(vma, vmf->address, page);
> }
This new function returns VM_FAULT_NOPAGE only for 0 and -EBUSY, whereas
we used to return VM_FAULT_NOPAGE for -EAGAIN, -ERESTARTSYS and -EINTR
as well. Was this previously wrong?
Thierry
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
@ 2018-04-18 8:24 ` Thierry Reding
0 siblings, 0 replies; 8+ messages in thread
From: Thierry Reding @ 2018-04-18 8:24 UTC (permalink / raw)
To: Souptick Joarder
Cc: airlied, jonathanh, dri-devel, linux-tegra, linux-kernel, willy
[-- Attachment #1: Type: text/plain, Size: 2147 bytes --]
On Tue, Apr 17, 2018 at 07:17:55PM +0530, 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")
>
> Previously vm_insert_page() returns err which driver
> mapped into VM_FAULT_* type. The new function
> vmf_insert_page() will replace this inefficiency by
> returning VM_FAULT_* type.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> ---
> drivers/gpu/drm/tegra/gem.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
> index 49b9bf2..6121493 100644
> --- a/drivers/gpu/drm/tegra/gem.c
> +++ b/drivers/gpu/drm/tegra/gem.c
> @@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
> return 0;
> }
>
> -static int tegra_bo_fault(struct vm_fault *vmf)
> +static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
> {
> struct vm_area_struct *vma = vmf->vma;
> struct drm_gem_object *gem = vma->vm_private_data;
> struct tegra_bo *bo = to_tegra_bo(gem);
> struct page *page;
> pgoff_t offset;
> - int err;
>
> if (!bo->pages)
> return VM_FAULT_SIGBUS;
> @@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
> offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
> page = bo->pages[offset];
>
> - err = vm_insert_page(vma, vmf->address, page);
> - switch (err) {
> - case -EAGAIN:
> - case 0:
> - case -ERESTARTSYS:
> - case -EINTR:
> - case -EBUSY:
> - return VM_FAULT_NOPAGE;
> -
> - case -ENOMEM:
> - return VM_FAULT_OOM;
> - }
> -
> - return VM_FAULT_SIGBUS;
> + return vmf_insert_page(vma, vmf->address, page);
> }
This new function returns VM_FAULT_NOPAGE only for 0 and -EBUSY, whereas
we used to return VM_FAULT_NOPAGE for -EAGAIN, -ERESTARTSYS and -EINTR
as well. Was this previously wrong?
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
2018-04-18 8:24 ` Thierry Reding
(?)
@ 2018-04-18 11:09 ` Souptick Joarder
-1 siblings, 0 replies; 8+ messages in thread
From: Souptick Joarder @ 2018-04-18 11:09 UTC (permalink / raw)
To: Thierry Reding
Cc: airlied, jonathanh, dri-devel, linux-tegra, linux-kernel, Matthew Wilcox
> This new function returns VM_FAULT_NOPAGE only for 0 and -EBUSY, whereas
> we used to return VM_FAULT_NOPAGE for -EAGAIN, -ERESTARTSYS and -EINTR
> as well.
Previously vm_insert_page unable to return VM_FAULT_ type due to which
different drivers
have their own mapping from err to VM_FAULT_ type. With new
vmf_insert_page() introduce
in 4.17-rc1 we have a common mapping for err to VM_FAULT_ which remain
same for every
drivers/file systems.
Was this previously wrong?
I think Matthew is the right person to answer this.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
2018-04-18 8:24 ` Thierry Reding
(?)
(?)
@ 2018-04-23 10:54 ` Matthew Wilcox
2018-05-11 18:20 ` Souptick Joarder
-1 siblings, 1 reply; 8+ messages in thread
From: Matthew Wilcox @ 2018-04-23 10:54 UTC (permalink / raw)
To: Thierry Reding
Cc: Souptick Joarder, airlied, jonathanh, dri-devel, linux-tegra,
linux-kernel
On Wed, Apr 18, 2018 at 10:24:39AM +0200, Thierry Reding wrote:
> > @@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
> > offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
> > page = bo->pages[offset];
> >
> > - err = vm_insert_page(vma, vmf->address, page);
> > - switch (err) {
> > - case -EAGAIN:
> > - case 0:
> > - case -ERESTARTSYS:
> > - case -EINTR:
> > - case -EBUSY:
> > - return VM_FAULT_NOPAGE;
> > -
> > - case -ENOMEM:
> > - return VM_FAULT_OOM;
> > - }
> > -
> > - return VM_FAULT_SIGBUS;
> > + return vmf_insert_page(vma, vmf->address, page);
> > }
>
> This new function returns VM_FAULT_NOPAGE only for 0 and -EBUSY, whereas
> we used to return VM_FAULT_NOPAGE for -EAGAIN, -ERESTARTSYS and -EINTR
> as well. Was this previously wrong?
Not so much wrong as unnecessary. vm_insert_page() can't return -EAGAIN,
-ERESTARTSYS or -EINTR.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
2018-04-23 10:54 ` Matthew Wilcox
@ 2018-05-11 18:20 ` Souptick Joarder
0 siblings, 0 replies; 8+ messages in thread
From: Souptick Joarder @ 2018-05-11 18:20 UTC (permalink / raw)
To: Matthew Wilcox
Cc: Thierry Reding, airlied, jonathanh, dri-devel, linux-tegra, linux-kernel
On Mon, Apr 23, 2018 at 4:24 PM, Matthew Wilcox <willy@infradead.org> wrote:
> On Wed, Apr 18, 2018 at 10:24:39AM +0200, Thierry Reding wrote:
>> > @@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
>> > offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
>> > page = bo->pages[offset];
>> >
>> > - err = vm_insert_page(vma, vmf->address, page);
>> > - switch (err) {
>> > - case -EAGAIN:
>> > - case 0:
>> > - case -ERESTARTSYS:
>> > - case -EINTR:
>> > - case -EBUSY:
>> > - return VM_FAULT_NOPAGE;
>> > -
>> > - case -ENOMEM:
>> > - return VM_FAULT_OOM;
>> > - }
>> > -
>> > - return VM_FAULT_SIGBUS;
>> > + return vmf_insert_page(vma, vmf->address, page);
>> > }
>>
>> This new function returns VM_FAULT_NOPAGE only for 0 and -EBUSY, whereas
>> we used to return VM_FAULT_NOPAGE for -EAGAIN, -ERESTARTSYS and -EINTR
>> as well. Was this previously wrong?
>
> Not so much wrong as unnecessary. vm_insert_page() can't return -EAGAIN,
> -ERESTARTSYS or -EINTR.
If no further comment on this patch, We would like to get this patch
queued for 4.18.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
2018-04-17 13:47 [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t Souptick Joarder
2018-04-18 8:24 ` Thierry Reding
@ 2018-05-14 12:59 ` Thierry Reding
1 sibling, 0 replies; 8+ messages in thread
From: Thierry Reding @ 2018-05-14 12:59 UTC (permalink / raw)
To: Souptick Joarder
Cc: airlied, jonathanh, dri-devel, linux-tegra, linux-kernel, willy
[-- Attachment #1: Type: text/plain, Size: 786 bytes --]
On Tue, Apr 17, 2018 at 07:17:55PM +0530, 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")
>
> Previously vm_insert_page() returns err which driver
> mapped into VM_FAULT_* type. The new function
> vmf_insert_page() will replace this inefficiency by
> returning VM_FAULT_* type.
>
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> ---
> drivers/gpu/drm/tegra/gem.c | 18 ++----------------
> 1 file changed, 2 insertions(+), 16 deletions(-)
Applied, thanks.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t
@ 2018-04-16 16:09 Souptick Joarder
0 siblings, 0 replies; 8+ messages in thread
From: Souptick Joarder @ 2018-04-16 16:09 UTC (permalink / raw)
To: thierry.reding, airlied, jonathanh; +Cc: linux-tegra, willy, dri-devel
Use new return type vm_fault_t for fault handler
in vm_operations_struct.
Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
---
drivers/gpu/drm/tegra/gem.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 49b9bf2..6121493 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -422,14 +422,13 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
return 0;
}
-static int tegra_bo_fault(struct vm_fault *vmf)
+static vm_fault_t tegra_bo_fault(struct vm_fault *vmf)
{
struct vm_area_struct *vma = vmf->vma;
struct drm_gem_object *gem = vma->vm_private_data;
struct tegra_bo *bo = to_tegra_bo(gem);
struct page *page;
pgoff_t offset;
- int err;
if (!bo->pages)
return VM_FAULT_SIGBUS;
@@ -437,20 +436,7 @@ static int tegra_bo_fault(struct vm_fault *vmf)
offset = (vmf->address - vma->vm_start) >> PAGE_SHIFT;
page = bo->pages[offset];
- err = vm_insert_page(vma, vmf->address, page);
- switch (err) {
- case -EAGAIN:
- case 0:
- case -ERESTARTSYS:
- case -EINTR:
- case -EBUSY:
- return VM_FAULT_NOPAGE;
-
- case -ENOMEM:
- return VM_FAULT_OOM;
- }
-
- return VM_FAULT_SIGBUS;
+ return vmf_insert_page(vma, vmf->address, page);
}
const struct vm_operations_struct tegra_bo_vm_ops = {
--
1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-05-14 12:59 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-17 13:47 [PATCH] gpu: drm: tegra: Adding new typedef vm_fault_t Souptick Joarder
2018-04-18 8:24 ` Thierry Reding
2018-04-18 8:24 ` Thierry Reding
2018-04-18 11:09 ` Souptick Joarder
2018-04-23 10:54 ` Matthew Wilcox
2018-05-11 18:20 ` Souptick Joarder
2018-05-14 12:59 ` Thierry Reding
-- strict thread matches above, loose matches on Subject: below --
2018-04-16 16:09 Souptick Joarder
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.