Commit 38cf0bb7 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: vgic-v3: Use u32 to manage the line level from userspace 



Despite the userspace ABI clearly defining the bits dealt with by
KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO as a __u32, the kernel uses a u64.

Use a u32 to match the userspace ABI, which will subsequently lead
to some simplifications.

Reviewed-by: default avatarReiji Watanabe <reijiw@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 71c3c775

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

+5 −1
Original line number Diff line number Diff line
@@ -570,10 +570,14 @@ static int vgic_v3_attr_regs_access(struct kvm_device *dev, 
		info = (attr->attr & KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK) >>

			KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT;

		if (info == VGIC_LEVEL_INFO_LINE_LEVEL) {

			if (is_write)

				tmp32 = *reg;

			intid = attr->attr &

				KVM_DEV_ARM_VGIC_LINE_LEVEL_INTID_MASK;

			ret = vgic_v3_line_level_info_uaccess(vcpu, is_write,

							      intid, reg);

							      intid, &tmp32);

			if (!is_write)

				*reg = tmp32;

		} else {

			ret = -EINVAL;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ int vgic_v3_redist_uaccess(struct kvm_vcpu *vcpu, bool is_write, 
}



int vgic_v3_line_level_info_uaccess(struct kvm_vcpu *vcpu, bool is_write,

				    u32 intid, u64 *val)

				    u32 intid, u32 *val)

{

	if (intid % 32)

		return -EINVAL;

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

+3 −3
Original line number Diff line number Diff line
@@ -775,10 +775,10 @@ void vgic_mmio_write_config(struct kvm_vcpu *vcpu, 
	}

}



u64 vgic_read_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid)

u32 vgic_read_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid)

{

	int i;

	u64 val = 0;

	u32 val = 0;

	int nr_irqs = vcpu->kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS;



	for (i = 0; i < 32; i++) {
@@ -798,7 +798,7 @@ u64 vgic_read_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid) 
}



void vgic_write_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid,

				    const u64 val)

				    const u32 val)

{

	int i;

	int nr_irqs = vcpu->kvm->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS;

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

+2 −2
Original line number Diff line number Diff line
@@ -207,10 +207,10 @@ void vgic_mmio_write_config(struct kvm_vcpu *vcpu, 
int vgic_uaccess(struct kvm_vcpu *vcpu, struct vgic_io_device *dev,

		 bool is_write, int offset, u32 *val);



u64 vgic_read_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid);

u32 vgic_read_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid);



void vgic_write_irq_line_level_info(struct kvm_vcpu *vcpu, u32 intid,

				    const u64 val);

				    const u32 val);



unsigned int vgic_v2_init_dist_iodev(struct vgic_io_device *dev);

arch/arm64/kvm/vgic/vgic.h

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ int vgic_v3_cpu_sysregs_uaccess(struct kvm_vcpu *vcpu, 
				struct kvm_device_attr *attr, bool is_write);

int vgic_v3_has_cpu_sysregs_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr);

int vgic_v3_line_level_info_uaccess(struct kvm_vcpu *vcpu, bool is_write,

				    u32 intid, u64 *val);

				    u32 intid, u32 *val);

int kvm_register_vgic_device(unsigned long type);

void vgic_set_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);

void vgic_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);