On 2019-05-24 15:22:51 [-0700], Hugh Dickins wrote:
> I've now run a couple of hours of load successfully with Mike's patch
> to GUP, no problem; but whatever the merits of that patch in general,
> I agree with Andrew that fault_in_pages_writeable() seems altogether
> more appropriate for copy_fpstate_to_sigframe(), and have now run a
> couple of hours of load successfully with this instead (rewrite to taste):
so this patch instead of Mike's GUP patch fixes the issue you observed?
Is this just a taste question or limitation of the function in general?
I'm asking because it has been suggested and is used in MPX code (in the
signal path but .mmap) and I'm not aware of any limitation. But as I
wrote earlier to akpm, if the MM folks suggest to use this instead I am
happy to switch.
> --- 5.2-rc1/arch/x86/kernel/fpu/signal.c
> +++ linux/arch/x86/kernel/fpu/signal.c
> @@ -3,6 +3,7 @@
> * FPU signal frame handling routines.
> */
>
> +#include <linux/pagemap.h>
> #include <linux/compat.h>
> #include <linux/cpu.h>
>
> @@ -189,15 +190,7 @@ retry:
> fpregs_unlock();
>
> if (ret) {
> - int aligned_size;
> - int nr_pages;
> -
> - aligned_size = offset_in_page(buf_fx) + fpu_user_xstate_size;
> - nr_pages = DIV_ROUND_UP(aligned_size, PAGE_SIZE);
> -
> - ret = get_user_pages_unlocked((unsigned long)buf_fx, nr_pages,
> - NULL, FOLL_WRITE);
> - if (ret == nr_pages)
> + if (!fault_in_pages_writeable(buf_fx, fpu_user_xstate_size))
> goto retry;
> return -EFAULT;
> }
>
> (I did wonder whether there needs to be an access_ok() check on buf_fx;
> but if so, then I think it would already have been needed before the
> earlier copy_fpregs_to_sigframe(); but I didn't get deep enough into
> that to be sure, nor into whether access_ok() check on buf covers buf_fx.)
There is an access_ok() at the begin of copy_fpregs_to_sigframe(). The
memory is allocated from user's stack and there is (later) an
access_ok() for the whole region (which can be more than the memory used
by the FPU code).
> Hugh
Sebastian
