On 20/07/16 14:02, [email protected] wrote:
> From: Vijaya Kumar K <[email protected]>
>
> vgic_attr_regs_access() handles only 32-bit register
> value. Introduce union ureg to handle both 32 and 64 bit
> register size.
>
> Signed-off-by: Vijaya Kumar K <[email protected]>
> ---
> virt/kvm/arm/vgic/vgic-kvm-device.c | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/virt/kvm/arm/vgic/vgic-kvm-device.c
> b/virt/kvm/arm/vgic/vgic-kvm-device.c
> index cc843fe..cace996 100644
> --- a/virt/kvm/arm/vgic/vgic-kvm-device.c
> +++ b/virt/kvm/arm/vgic/vgic-kvm-device.c
> @@ -19,6 +19,11 @@
> #include <asm/kvm_mmu.h>
> #include "vgic.h"
>
> +union ureg {
> + u32 reg32;
> + u64 reg64;
> +};
> +
Please don't. That's pointlessly ugly, and creates type confusion. I
want to see explicit types, all the time.
> /* common helpers */
>
> static int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr,
> @@ -255,7 +260,7 @@ void kvm_register_vgic_device(unsigned long type)
> */
> static int vgic_attr_regs_access(struct kvm_device *dev,
> struct kvm_device_attr *attr,
> - u32 *reg, bool is_write)
> + union ureg *reg, bool is_write)
Just pass a u64 pointer here...
> {
> gpa_t addr;
> int cpuid, ret, c;
> @@ -293,10 +298,10 @@ static int vgic_attr_regs_access(struct kvm_device *dev,
u32 tmp32;
if (is_write)
tmp32 = *reg;
>
> switch (attr->group) {
> case KVM_DEV_ARM_VGIC_GRP_CPU_REGS:
> - ret = vgic_v2_cpuif_uaccess(vcpu, is_write, addr, reg);
> + ret = vgic_v2_cpuif_uaccess(vcpu, is_write, addr, ®->reg32);
use tmp32 here.
> break;
> case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
> - ret = vgic_v2_dist_uaccess(vcpu, is_write, addr, reg);
> + ret = vgic_v2_dist_uaccess(vcpu, is_write, addr, ®->reg32);
> break;
> default:
> ret = -EINVAL;
and in the epilogue:
if (!is_write)
*reg = tmp32;
> @@ -328,9 +333,9 @@ static int vgic_v2_set_attr(struct kvm_device *dev,
> case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
> case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
> u32 __user *uaddr = (u32 __user *)(long)attr->addr;
> - u32 reg;
> + union ureg reg;
>
> - if (get_user(reg, uaddr))
> + if (get_user(reg.reg32, uaddr))
> return -EFAULT;
>
> return vgic_attr_regs_access(dev, attr, ®, true);
> @@ -353,12 +358,12 @@ static int vgic_v2_get_attr(struct kvm_device *dev,
> case KVM_DEV_ARM_VGIC_GRP_DIST_REGS:
> case KVM_DEV_ARM_VGIC_GRP_CPU_REGS: {
> u32 __user *uaddr = (u32 __user *)(long)attr->addr;
> - u32 reg = 0;
> + union ureg reg;
>
> ret = vgic_attr_regs_access(dev, attr, ®, false);
> if (ret)
> return ret;
> - return put_user(reg, uaddr);
> + return put_user(reg.reg32, uaddr);
> }
> }
>
>
Same thing everywhere.
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
