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

Commit 6e0a0431 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Christian Borntraeger
Browse files

KVM: s390/mm: cleanup gmap function arguments, variable names 



Make the order of arguments for the gmap calls more consistent,
if the gmap pointer is passed it is always the first argument.
In addition distinguish between guest address and user address
by naming the variables gaddr for a guest address and vmaddr for
a user address.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 9da4e380

arch/s390/include/asm/pgtable.h

+7 −7
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ struct gmap_pgtable { 
 */

struct gmap_notifier {

	struct list_head list;

	void (*notifier_call)(struct gmap *gmap, unsigned long address);

	void (*notifier_call)(struct gmap *gmap, unsigned long gaddr);

};



struct gmap *gmap_alloc(struct mm_struct *mm);
@@ -844,12 +844,12 @@ void gmap_disable(struct gmap *gmap); 
int gmap_map_segment(struct gmap *gmap, unsigned long from,

		     unsigned long to, unsigned long len);

int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len);

unsigned long __gmap_translate(unsigned long address, struct gmap *);

unsigned long gmap_translate(unsigned long address, struct gmap *);

unsigned long __gmap_fault(unsigned long address, struct gmap *);

unsigned long gmap_fault(unsigned long address, struct gmap *);

void gmap_discard(unsigned long from, unsigned long to, struct gmap *);

void __gmap_zap(unsigned long address, struct gmap *);

unsigned long __gmap_translate(struct gmap *, unsigned long gaddr);

unsigned long gmap_translate(struct gmap *, unsigned long gaddr);

unsigned long __gmap_fault(struct gmap *, unsigned long gaddr);

unsigned long gmap_fault(struct gmap *, unsigned long gaddr);

void gmap_discard(struct gmap *, unsigned long from, unsigned long to);

void __gmap_zap(struct gmap *, unsigned long gaddr);

bool gmap_test_and_clear_dirty(unsigned long address, struct gmap *);

arch/s390/kvm/diag.c

+4 −4
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ static int diag_release_pages(struct kvm_vcpu *vcpu) 


	/* we checked for start > end above */

	if (end < prefix || start >= prefix + 2 * PAGE_SIZE) {

		gmap_discard(start, end, vcpu->arch.gmap);

		gmap_discard(vcpu->arch.gmap, start, end);

	} else {

		if (start < prefix)

			gmap_discard(start, prefix, vcpu->arch.gmap);

			gmap_discard(vcpu->arch.gmap, start, prefix);

		if (end >= prefix)

			gmap_discard(prefix + 2 * PAGE_SIZE,

				     end, vcpu->arch.gmap);

			gmap_discard(vcpu->arch.gmap,

				     prefix + 2 * PAGE_SIZE, end);

	}

	return 0;

}

arch/s390/kvm/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ static int kvm_s390_adapter_map(struct kvm *kvm, unsigned int id, __u64 addr) 
	}

	INIT_LIST_HEAD(&map->list);

	map->guest_addr = addr;

	map->addr = gmap_translate(addr, kvm->arch.gmap);

	map->addr = gmap_translate(kvm->arch.gmap, addr);

	if (map->addr == -EFAULT) {

		ret = -EFAULT;

		goto out;

arch/s390/kvm/kvm-s390.c

+2 −2
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ long kvm_arch_fault_in_page(struct kvm_vcpu *vcpu, gpa_t gpa, int writable) 
	hva_t hva;

	long rc;



	hva = gmap_fault(gpa, vcpu->arch.gmap);

	hva = gmap_fault(vcpu->arch.gmap, gpa);

	if (IS_ERR_VALUE(hva))

		return (long)hva;

	down_read(&mm->mmap_sem);
@@ -1683,7 +1683,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, 
	}

#endif

	case KVM_S390_VCPU_FAULT: {

		r = gmap_fault(arg, vcpu->arch.gmap);

		r = gmap_fault(vcpu->arch.gmap, arg);

		if (!IS_ERR_VALUE(r))

			r = 0;

		break;

arch/s390/kvm/priv.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static int handle_essa(struct kvm_vcpu *vcpu) 
			/* invalid entry */

			break;

		/* try to free backing */

		__gmap_zap(cbrle, gmap);

		__gmap_zap(gmap, cbrle);

	}

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

	if (i < entries)