Commit da385309 authored by Eric Auger's avatar Eric Auger Committed by Marc Zyngier
Browse files

KVM: arm64: Simplify argument passing to vgic_uaccess_[read|write] 



vgic_uaccess() takes a struct vgic_io_device argument, converts it
to a struct kvm_io_device and passes it to the read/write accessor
functions, which convert it back to a struct vgic_io_device.
Avoid the indirection by passing the struct vgic_io_device argument
directly to vgic_uaccess_{read,write}.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210405163941.510258-7-eric.auger@redhat.com
parent 298c41b8

arch/arm64/kvm/vgic/vgic-mmio.c

+4 −6
Original line number Diff line number Diff line
@@ -938,10 +938,9 @@ vgic_get_mmio_region(struct kvm_vcpu *vcpu, struct vgic_io_device *iodev, 
	return region;

}



static int vgic_uaccess_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

static int vgic_uaccess_read(struct kvm_vcpu *vcpu, struct vgic_io_device *iodev,

			     gpa_t addr, u32 *val)

{

	struct vgic_io_device *iodev = kvm_to_vgic_iodev(dev);

	const struct vgic_register_region *region;

	struct kvm_vcpu *r_vcpu;
@@ -960,10 +959,9 @@ static int vgic_uaccess_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev, 
	return 0;

}



static int vgic_uaccess_write(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,

static int vgic_uaccess_write(struct kvm_vcpu *vcpu, struct vgic_io_device *iodev,

			      gpa_t addr, const u32 *val)

{

	struct vgic_io_device *iodev = kvm_to_vgic_iodev(dev);

	const struct vgic_register_region *region;

	struct kvm_vcpu *r_vcpu;
@@ -986,9 +984,9 @@ int vgic_uaccess(struct kvm_vcpu *vcpu, struct vgic_io_device *dev, 
		 bool is_write, int offset, u32 *val)

{

	if (is_write)

		return vgic_uaccess_write(vcpu, &dev->dev, offset, val);

		return vgic_uaccess_write(vcpu, dev, offset, val);

	else

		return vgic_uaccess_read(vcpu, &dev->dev, offset, val);

		return vgic_uaccess_read(vcpu, dev, offset, val);

}



static int dispatch_mmio_read(struct kvm_vcpu *vcpu, struct kvm_io_device *dev,