Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63ae602c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'gup_flag-cleanups' 

Merge the gup_flags cleanups from Lorenzo Stoakes:
 "This patch series adjusts functions in the get_user_pages* family such
  that desired FOLL_* flags are passed as an argument rather than
  implied by flags.

  The purpose of this change is to make the use of FOLL_FORCE explicit
  so it is easier to grep for and clearer to callers that this flag is
  being used.  The use of FOLL_FORCE is an issue as it overrides missing
  VM_READ/VM_WRITE flags for the VMA whose pages we are reading
  from/writing to, which can result in surprising behaviour.

  The patch series came out of the discussion around commit 38e08854
  ("mm: check VMA flags to avoid invalid PROT_NONE NUMA balancing"),
  which addressed a BUG_ON() being triggered when a page was faulted in
  with PROT_NONE set but having been overridden by FOLL_FORCE.
  do_numa_page() was run on the assumption the page _must_ be one marked
  for NUMA node migration as an actual PROT_NONE page would have been
  dealt with prior to this code path, however FOLL_FORCE introduced a
  situation where this assumption did not hold.

  See

      https://marc.info/?l=linux-mm&m=147585445805166

  for the patch proposal"

Additionally, there's a fix for an ancient bug related to FOLL_FORCE and
FOLL_WRITE by me.

[ This branch was rebased recently to add a few more acked-by's and
  reviewed-by's ]

* gup_flag-cleanups:
  mm: replace access_process_vm() write parameter with gup_flags
  mm: replace access_remote_vm() write parameter with gup_flags
  mm: replace __access_remote_vm() write parameter with gup_flags
  mm: replace get_user_pages_remote() write/force parameters with gup_flags
  mm: replace get_user_pages() write/force parameters with gup_flags
  mm: replace get_vaddr_frames() write/force parameters with gup_flags
  mm: replace get_user_pages_locked() write/force parameters with gup_flags
  mm: replace get_user_pages_unlocked() write/force parameters with gup_flags
  mm: remove write/force parameters from __get_user_pages_unlocked()
  mm: remove write/force parameters from __get_user_pages_locked()
  mm: remove gup_flags FOLL_WRITE games from __get_user_pages()
parents 1a1891d7 f307ab6d

arch/alpha/kernel/ptrace.c

+6 −3
Original line number Diff line number Diff line
@@ -157,14 +157,16 @@ put_reg(struct task_struct *task, unsigned long regno, unsigned long data) 
static inline int

read_int(struct task_struct *task, unsigned long addr, int * data)

{

	int copied = access_process_vm(task, addr, data, sizeof(int), 0);

	int copied = access_process_vm(task, addr, data, sizeof(int),

			FOLL_FORCE);

	return (copied == sizeof(int)) ? 0 : -EIO;

}



static inline int

write_int(struct task_struct *task, unsigned long addr, int data)

{

	int copied = access_process_vm(task, addr, &data, sizeof(int), 1);

	int copied = access_process_vm(task, addr, &data, sizeof(int),

			FOLL_FORCE | FOLL_WRITE);

	return (copied == sizeof(int)) ? 0 : -EIO;

}
@@ -281,7 +283,8 @@ long arch_ptrace(struct task_struct *child, long request, 
	/* When I and D space are separate, these will need to be fixed.  */

	case PTRACE_PEEKTEXT: /* read word at location addr. */

	case PTRACE_PEEKDATA:

		copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);

		copied = access_process_vm(child, addr, &tmp, sizeof(tmp),

				FOLL_FORCE);

		ret = -EIO;

		if (copied != sizeof(tmp))

			break;

arch/blackfin/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ long arch_ptrace(struct task_struct *child, long request, 
			case BFIN_MEM_ACCESS_CORE:

			case BFIN_MEM_ACCESS_CORE_ONLY:

				copied = access_process_vm(child, addr, &tmp,

				                           to_copy, 0);

							   to_copy, FOLL_FORCE);

				if (copied)

					break;
@@ -324,7 +324,8 @@ long arch_ptrace(struct task_struct *child, long request, 
			case BFIN_MEM_ACCESS_CORE:

			case BFIN_MEM_ACCESS_CORE_ONLY:

				copied = access_process_vm(child, addr, &data,

				                           to_copy, 1);

				                           to_copy,

							   FOLL_FORCE | FOLL_WRITE);

				break;

			case BFIN_MEM_ACCESS_DMA:

				if (safe_dma_memcpy(paddr, &data, to_copy))

arch/cris/arch-v32/drivers/cryptocop.c

+1 −3
Original line number Diff line number Diff line
@@ -2722,7 +2722,6 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig 
	err = get_user_pages((unsigned long int)(oper.indata + prev_ix),

			     noinpages,

			     0,  /* read access only for in data */

			     0, /* no force */

			     inpages,

			     NULL);
@@ -2736,8 +2735,7 @@ static int cryptocop_ioctl_process(struct inode *inode, struct file *filp, unsig 
	if (oper.do_cipher){

		err = get_user_pages((unsigned long int)oper.cipher_outdata,

				     nooutpages,

				     1, /* write access for out data */

				     0, /* no force */

				     FOLL_WRITE, /* write access for out data */

				     outpages,

				     NULL);

		up_read(&current->mm->mmap_sem);

arch/cris/arch-v32/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ long arch_ptrace(struct task_struct *child, long request, 
				/* The trampoline page is globally mapped, no page table to traverse.*/

				tmp = *(unsigned long*)addr;

			} else {

				copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);

				copied = access_process_vm(child, addr, &tmp, sizeof(tmp), FOLL_FORCE);



				if (copied != sizeof(tmp))

					break;
@@ -279,7 +279,7 @@ static int insn_size(struct task_struct *child, unsigned long pc) 
  int opsize = 0;



  /* Read the opcode at pc (do what PTRACE_PEEKTEXT would do). */

  copied = access_process_vm(child, pc, &opcode, sizeof(opcode), 0);

  copied = access_process_vm(child, pc, &opcode, sizeof(opcode), FOLL_FORCE);

  if (copied != sizeof(opcode))

    return 0;

arch/ia64/kernel/err_inject.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr, 
	u64 virt_addr=simple_strtoull(buf, NULL, 16);

	int ret;



	ret = get_user_pages(virt_addr, 1, VM_READ, 0, NULL, NULL);

	ret = get_user_pages(virt_addr, 1, FOLL_WRITE, NULL, NULL);

	if (ret<=0) {

#ifdef ERR_INJ_DEBUG

		printk("Virtual address %lx is not existing.\n",virt_addr);