[PATCH] kernel: event: core: Change return type to vm_fault_t

[PATCH] kernel: event: core: Change return type to vm_fault_t

[Souptick Joarder]

Use new return type vm_fault_t for fault handler and
page_mkwrite handler in struct vm_operations_struct.

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
---
 kernel/events/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 96db9ae..d09f1c4 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4918,11 +4918,11 @@ void perf_event_update_userpage(struct perf_event *event)
 }
 EXPORT_SYMBOL_GPL(perf_event_update_userpage);

-static int perf_mmap_fault(struct vm_fault *vmf)
+static vm_fault_t perf_mmap_fault(struct vm_fault *vmf)
 {
 	struct perf_event *event = vmf->vma->vm_file->private_data;
 	struct ring_buffer *rb;
-	int ret = VM_FAULT_SIGBUS;
+	vm_fault_t ret = VM_FAULT_SIGBUS;

 	if (vmf->flags & FAULT_FLAG_MKWRITE) {
 		if (vmf->pgoff == 0)
--
1.9.1

Re: [PATCH] kernel: event: core: Change return type to vm_fault_t

[Peter Zijlstra]

On Sun, Apr 15, 2018 at 01:58:31AM +0530, Souptick Joarder wrote:
> Use new return type vm_fault_t for fault handler and
> page_mkwrite handler in struct vm_operations_struct.
> 
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
> ---
>  kernel/events/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 96db9ae..d09f1c4 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -4918,11 +4918,11 @@ void perf_event_update_userpage(struct perf_event *event)
>  }
>  EXPORT_SYMBOL_GPL(perf_event_update_userpage);
> 
> -static int perf_mmap_fault(struct vm_fault *vmf)
> +static vm_fault_t perf_mmap_fault(struct vm_fault *vmf)

I'm fine with the patch, but shouldn't this be part of a larger series /
cocinelle script?

Even if not everything that has a (struct vm_fault *) argument is a
fault handler, you could still match on the function being assigned to
vm_operations_struct::fault.

So ACK on the patch, but please don't do this with a slow trickle of
individual patches.

Re: [PATCH] kernel: event: core: Change return type to vm_fault_t

[Souptick Joarder]

> I'm fine with the patch, but shouldn't this be part of a larger series /
> cocinelle script?
>

This one is trivial but many others are not.
As part of this clean up we have fixed many
existing bugs in fault handlers of drivers/
file systems. Also we are replacing existing
vm_insert_foo() with new vmf_insert_foo()
in fault handlers (wherever applicable).
Refer - 1c8f422059ae5da07db7406ab916203f9417e396
in 4.17-rc1

Re: [PATCH] kernel: event: core: Change return type to vm_fault_t

[Souptick Joarder]

On Fri, Apr 20, 2018 at 5:18 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
>> I'm fine with the patch, but shouldn't this be part of a larger series /
>> cocinelle script?
>>
>
> This one is trivial but many others are not.
> As part of this clean up we have fixed many
> existing bugs in fault handlers of drivers/
> file systems. Also we are replacing existing
> vm_insert_foo() with new vmf_insert_foo()
> in fault handlers (wherever applicable).
> Refer - 1c8f422059ae5da07db7406ab916203f9417e396
> in 4.17-rc1

Any further comment on this patch ?

Re: [PATCH] kernel: event: core: Change return type to vm_fault_t

[Souptick Joarder]

On Thu, May 10, 2018 at 7:54 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> On Fri, Apr 20, 2018 at 5:18 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
>>> I'm fine with the patch, but shouldn't this be part of a larger series /
>>> cocinelle script?
>>>
>>
>> This one is trivial but many others are not.
>> As part of this clean up we have fixed many
>> existing bugs in fault handlers of drivers/
>> file systems. Also we are replacing existing
>> vm_insert_foo() with new vmf_insert_foo()
>> in fault handlers (wherever applicable).
>> Refer - 1c8f422059ae5da07db7406ab916203f9417e396
>> in 4.17-rc1
>
> Any further comment on this patch ?

Peter, if no further comment, we would like to get this patch
in queue for 4.18.

Re: [PATCH] kernel: event: core: Change return type to vm_fault_t

[Peter Zijlstra]

On Thu, May 17, 2018 at 07:55:13PM +0530, Souptick Joarder wrote:
> On Thu, May 10, 2018 at 7:54 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> > On Fri, Apr 20, 2018 at 5:18 PM, Souptick Joarder <jrdr.linux@gmail.com> wrote:
> >>> I'm fine with the patch, but shouldn't this be part of a larger series /
> >>> cocinelle script?
> >>>
> >>
> >> This one is trivial but many others are not.
> >> As part of this clean up we have fixed many
> >> existing bugs in fault handlers of drivers/
> >> file systems. Also we are replacing existing
> >> vm_insert_foo() with new vmf_insert_foo()
> >> in fault handlers (wherever applicable).
> >> Refer - 1c8f422059ae5da07db7406ab916203f9417e396
> >> in 4.17-rc1
> >
> > Any further comment on this patch ?
> 
> Peter, if no further comment, we would like to get this patch
> in queue for 4.18.

Nah, I still think you're doing this wrong by trickling single patches,
but have at.

Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>