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

Commit 768ae309 authored by Lorenzo Stoakes's avatar Lorenzo Stoakes Committed by Linus Torvalds
Browse files

mm: replace get_user_pages() write/force parameters with gup_flags 



This removes the 'write' and 'force' from get_user_pages() and replaces
them with 'gup_flags' to make the use of FOLL_FORCE explicit in callers
as use of this flag can result in surprising behaviour (and hence bugs)
within the mm subsystem.

Signed-off-by: default avatarLorenzo Stoakes <lstoakes@gmail.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7f23b350

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/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);

arch/x86/mm/mpx.c

+2 −3
Original line number Diff line number Diff line
@@ -544,10 +544,9 @@ static int mpx_resolve_fault(long __user *addr, int write) 
{

	long gup_ret;

	int nr_pages = 1;

	int force = 0;



	gup_ret = get_user_pages((unsigned long)addr, nr_pages, write,

			force, NULL, NULL);

	gup_ret = get_user_pages((unsigned long)addr, nr_pages,

			write ? FOLL_WRITE : 0,	NULL, NULL);

	/*

	 * get_user_pages() returns number of pages gotten.

	 * 0 means we failed to fault in and get anything,

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+5 −2
Original line number Diff line number Diff line
@@ -555,10 +555,13 @@ struct amdgpu_ttm_tt { 
int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages)

{

	struct amdgpu_ttm_tt *gtt = (void *)ttm;

	int write = !(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY);

	unsigned int flags = 0;

	unsigned pinned = 0;

	int r;



	if (!(gtt->userflags & AMDGPU_GEM_USERPTR_READONLY))

		flags |= FOLL_WRITE;



	if (gtt->userflags & AMDGPU_GEM_USERPTR_ANONONLY) {

		/* check that we only use anonymous memory

		   to prevent problems with writeback */
@@ -581,7 +584,7 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) 
		list_add(&guptask.list, &gtt->guptasks);

		spin_unlock(&gtt->guptasklock);



		r = get_user_pages(userptr, num_pages, write, 0, p, NULL);

		r = get_user_pages(userptr, num_pages, flags, p, NULL);



		spin_lock(&gtt->guptasklock);

		list_del(&guptask.list);

drivers/gpu/drm/radeon/radeon_ttm.c

+2 −1
Original line number Diff line number Diff line
@@ -566,7 +566,8 @@ static int radeon_ttm_tt_pin_userptr(struct ttm_tt *ttm) 
		uint64_t userptr = gtt->userptr + pinned * PAGE_SIZE;

		struct page **pages = ttm->pages + pinned;



		r = get_user_pages(userptr, num_pages, write, 0, pages, NULL);

		r = get_user_pages(userptr, num_pages, write ? FOLL_WRITE : 0,

				   pages, NULL);

		if (r < 0)

			goto release_pages;