(Only have my iPhone, sorry)

Hey it compiled on x86 and passed xfstests, good enough for an RFC.  I
thought kbuild testbot did these and since it hadn’t emailed me yet I
assumed I didn’t break anything (a bad assumption I know). I’ll go through
more thoroughly, but it for sure compiles on x86.  Thanks,

Josef

On Tue, Sep 25, 2018 at 8:22 PM Dave Chinner <david@fromorbit.com> wrote:

> On Tue, Sep 25, 2018 at 11:30:04AM -0400, Josef Bacik wrote:
> > In preparation for caching pages during filemap faults we need to push
> > the struct vm_fault up a level into the arch page fault handlers, since
> > they are the ones responsible for retrying if we unlock the mmap_sem.
> >
> > Signed-off-by: Josef Bacik <josef@toxicpanda.com>
> > ---
> >  arch/alpha/mm/fault.c         |  4 ++-
> >  arch/arc/mm/fault.c           |  2 ++
> >  arch/arm/mm/fault.c           | 18 ++++++++-----
> >  arch/arm64/mm/fault.c         | 18 +++++++------
> >  arch/hexagon/mm/vm_fault.c    |  4 ++-
> >  arch/ia64/mm/fault.c          |  4 ++-
> >  arch/m68k/mm/fault.c          |  5 ++--
> >  arch/microblaze/mm/fault.c    |  4 ++-
> >  arch/mips/mm/fault.c          |  4 ++-
> >  arch/nds32/mm/fault.c         |  5 ++--
> >  arch/nios2/mm/fault.c         |  4 ++-
> >  arch/openrisc/mm/fault.c      |  5 ++--
> >  arch/parisc/mm/fault.c        |  5 ++--
> >  arch/powerpc/mm/copro_fault.c |  4 ++-
> >  arch/powerpc/mm/fault.c       |  4 ++-
> >  arch/riscv/mm/fault.c         |  2 ++
> >  arch/s390/mm/fault.c          |  4 ++-
> >  arch/sh/mm/fault.c            |  4 ++-
> >  arch/sparc/mm/fault_32.c      |  6 ++++-
> >  arch/sparc/mm/fault_64.c      |  2 ++
> >  arch/um/kernel/trap.c         |  4 ++-
> >  arch/unicore32/mm/fault.c     | 17 +++++++-----
> >  arch/x86/mm/fault.c           |  4 ++-
> >  arch/xtensa/mm/fault.c        |  4 ++-
> >  drivers/iommu/amd_iommu_v2.c  |  4 ++-
> >  drivers/iommu/intel-svm.c     |  6 +++--
> >  include/linux/mm.h            | 16 +++++++++---
> >  mm/gup.c                      |  8 ++++--
> >  mm/hmm.c                      |  4 ++-
> >  mm/ksm.c                      | 10 ++++---
> >  mm/memory.c                   | 61
> +++++++++++++++++++++----------------------
> >  31 files changed, 157 insertions(+), 89 deletions(-)
> >
> > diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
> > index d73dc473fbb9..3c98dfef03a9 100644
> > --- a/arch/alpha/mm/fault.c
> > +++ b/arch/alpha/mm/fault.c
> > @@ -84,6 +84,7 @@ asmlinkage void
> >  do_page_fault(unsigned long address, unsigned long mmcsr,
> >             long cause, struct pt_regs *regs)
> >  {
> > +     struct vm_fault vmf = {};
> >       struct vm_area_struct * vma;
> >       struct mm_struct *mm = current->mm;
> >       const struct exception_table_entry *fixup;
> > @@ -148,7 +149,8 @@ do_page_fault(unsigned long address, unsigned long
> mmcsr,
> >       /* If for any reason at all we couldn't handle the fault,
> >          make sure we exit gracefully rather than endlessly redo
> >          the fault.  */
> > -     fault = handle_mm_fault(vma, address, flags);
> > +     vm_fault_init(&vmfs, vma, flags, address);
> > +     fault = handle_mm_fault(&vmf);
>
> Doesn't compile.
>
> > --- a/arch/arm/mm/fault.c
> > +++ b/arch/arm/mm/fault.c
> > @@ -225,17 +225,17 @@ static inline bool access_error(unsigned int fsr,
> struct vm_area_struct *vma)
> >  }
> >
> >  static vm_fault_t __kprobes
> > -__do_page_fault(struct mm_struct *mm, unsigned long addr, unsigned int
> fsr,
> > -             unsigned int flags, struct task_struct *tsk)
> > +__do_page_fault(struct mm_struct *mm, struct vm_fault *vm, unsigned int
> fsr,
>
> vm_fault is *vm....
>
> > +             struct task_struct *tsk)
> >  {
> >       struct vm_area_struct *vma;
> >       vm_fault_t fault;
> >
> > -     vma = find_vma(mm, addr);
> > +     vma = find_vma(mm, vmf->address);
>
> So this doesn't compile.
>
> >
> >  check_stack:
> > -     if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma, addr))
> > +     if (vma->vm_flags & VM_GROWSDOWN && !expand_stack(vma,
> vmf->address))
> >               goto good_area;
> >  out:
> >       return fault;
> > @@ -424,6 +424,7 @@ static bool is_el0_instruction_abort(unsigned int
> esr)
> >  static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
> >                                  struct pt_regs *regs)
> >  {
> > +     struct vm_fault vmf = {};
> >       struct task_struct *tsk;
> >       struct mm_struct *mm;
> >       struct siginfo si;
> > @@ -493,7 +494,8 @@ static int __kprobes do_page_fault(unsigned long
> addr, unsigned int esr,
> >  #endif
> >       }
> >
> > -     fault = __do_page_fault(mm, addr, mm_flags, vm_flags, tsk);
> > +     vm_fault_init(&vmf, NULL, addr, mm_flags);
> > +     fault = __do_page_fault(mm, vmf, vm_flags, tsk);
>
> I'm betting this doesn't compile, either.
>
> /me stops looking.
>
> Cheers,
>
> Dave.
> --
> Dave Chinner
> david@fromorbit.com
>