Commit 64019a2e authored by Peter Xu's avatar Peter Xu Committed by Linus Torvalds
Browse files

mm/gup: remove task_struct pointer for all gup code 



After the cleanup of page fault accounting, gup does not need to pass
task_struct around any more.  Remove that parameter in the whole gup
stack.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Link: http://lkml.kernel.org/r/20200707225021.200906-26-peterx@redhat.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a2beb5f1

arch/arc/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ fault: 
		 goto fail;



	mmap_read_lock(current->mm);

	ret = fixup_user_fault(current, current->mm, (unsigned long) uaddr,

	ret = fixup_user_fault(current->mm, (unsigned long) uaddr,

			       FAULT_FLAG_WRITE, NULL);

	mmap_read_unlock(current->mm);

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -2768,7 +2768,7 @@ static struct page *get_map_page(struct kvm *kvm, u64 uaddr) 
	struct page *page = NULL;



	mmap_read_lock(kvm->mm);

	get_user_pages_remote(NULL, kvm->mm, uaddr, 1, FOLL_WRITE,

	get_user_pages_remote(kvm->mm, uaddr, 1, FOLL_WRITE,

			      &page, NULL, NULL);

	mmap_read_unlock(kvm->mm);

	return page;

arch/s390/kvm/kvm-s390.c

+1 −1
Original line number Diff line number Diff line
@@ -1892,7 +1892,7 @@ static long kvm_s390_set_skeys(struct kvm *kvm, struct kvm_s390_skeys *args) 


		r = set_guest_storage_key(current->mm, hva, keys[i], 0);

		if (r) {

			r = fixup_user_fault(current, current->mm, hva,

			r = fixup_user_fault(current->mm, hva,

					     FAULT_FLAG_WRITE, &unlocked);

			if (r)

				break;

arch/s390/kvm/priv.c

+4 −4
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ retry: 
	rc = get_guest_storage_key(current->mm, vmaddr, &key);



	if (rc) {

		rc = fixup_user_fault(current, current->mm, vmaddr,

		rc = fixup_user_fault(current->mm, vmaddr,

				      FAULT_FLAG_WRITE, &unlocked);

		if (!rc) {

			mmap_read_unlock(current->mm);
@@ -319,7 +319,7 @@ retry: 
	mmap_read_lock(current->mm);

	rc = reset_guest_reference_bit(current->mm, vmaddr);

	if (rc < 0) {

		rc = fixup_user_fault(current, current->mm, vmaddr,

		rc = fixup_user_fault(current->mm, vmaddr,

				      FAULT_FLAG_WRITE, &unlocked);

		if (!rc) {

			mmap_read_unlock(current->mm);
@@ -390,7 +390,7 @@ static int handle_sske(struct kvm_vcpu *vcpu) 
						m3 & SSKE_MC);



		if (rc < 0) {

			rc = fixup_user_fault(current, current->mm, vmaddr,

			rc = fixup_user_fault(current->mm, vmaddr,

					      FAULT_FLAG_WRITE, &unlocked);

			rc = !rc ? -EAGAIN : rc;

		}
@@ -1094,7 +1094,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) 
			rc = cond_set_guest_storage_key(current->mm, vmaddr,

							key, NULL, nq, mr, mc);

			if (rc < 0) {

				rc = fixup_user_fault(current, current->mm, vmaddr,

				rc = fixup_user_fault(current->mm, vmaddr,

						      FAULT_FLAG_WRITE, &unlocked);

				rc = !rc ? -EAGAIN : rc;

			}

arch/s390/mm/gmap.c

+2 −2
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ retry: 
		rc = vmaddr;

		goto out_up;

	}

	if (fixup_user_fault(current, gmap->mm, vmaddr, fault_flags,

	if (fixup_user_fault(gmap->mm, vmaddr, fault_flags,

			     &unlocked)) {

		rc = -EFAULT;

		goto out_up;
@@ -879,7 +879,7 @@ static int gmap_pte_op_fixup(struct gmap *gmap, unsigned long gaddr, 


	BUG_ON(gmap_is_shadow(gmap));

	fault_flags = (prot == PROT_WRITE) ? FAULT_FLAG_WRITE : 0;

	if (fixup_user_fault(current, mm, vmaddr, fault_flags, &unlocked))

	if (fixup_user_fault(mm, vmaddr, fault_flags, &unlocked))

		return -EFAULT;

	if (unlocked)

		/* lost mmap_lock, caller has to retry __gmap_translate */

CRA Git | Maintained and supported by SUSTech CRA and CCSE