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

Commit 876ae234 authored by Eric Auger's avatar Eric Auger Committed by Christoffer Dall
Browse files

KVM: arm64: vgic-its: KVM_DEV_ARM_VGIC_GRP_ITS_REGS group 



The ITS KVM device exposes a new KVM_DEV_ARM_VGIC_GRP_ITS_REGS
group which allows the userspace to save/restore ITS registers.

At this stage the get/set/has operations are not yet implemented.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 4b7171ac

arch/arm/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_GRP_ITS_REGS	8

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)

arch/arm64/include/uapi/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct kvm_arch_memory_slot { 
#define KVM_DEV_ARM_VGIC_GRP_REDIST_REGS 5

#define KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS 6

#define KVM_DEV_ARM_VGIC_GRP_LEVEL_INFO  7

#define KVM_DEV_ARM_VGIC_GRP_ITS_REGS 8

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT	10

#define KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_MASK \

			(0x3fffffULL << KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT)

virt/kvm/arm/vgic/vgic-its.c

+35 −1
Original line number Diff line number Diff line
@@ -1466,6 +1466,19 @@ static void vgic_its_destroy(struct kvm_device *kvm_dev) 
	kfree(its);

}



int vgic_its_has_attr_regs(struct kvm_device *dev,

			   struct kvm_device_attr *attr)

{

	return -ENXIO;

}



int vgic_its_attr_regs_access(struct kvm_device *dev,

			      struct kvm_device_attr *attr,

			      u64 *reg, bool is_write)

{

	return -ENXIO;

}



static int vgic_its_has_attr(struct kvm_device *dev,

			     struct kvm_device_attr *attr)

{
@@ -1482,6 +1495,8 @@ static int vgic_its_has_attr(struct kvm_device *dev, 
			return 0;

		}

		break;

	case KVM_DEV_ARM_VGIC_GRP_ITS_REGS:

		return vgic_its_has_attr_regs(dev, attr);

	}

	return -ENXIO;

}
@@ -1521,6 +1536,15 @@ static int vgic_its_set_attr(struct kvm_device *dev, 
			return 0;

		}

		break;

	case KVM_DEV_ARM_VGIC_GRP_ITS_REGS: {

		u64 __user *uaddr = (u64 __user *)(long)attr->addr;

		u64 reg;



		if (get_user(reg, uaddr))

			return -EFAULT;



		return vgic_its_attr_regs_access(dev, attr, &reg, true);

	}

	}

	return -ENXIO;

}
@@ -1541,10 +1565,20 @@ static int vgic_its_get_attr(struct kvm_device *dev, 
		if (copy_to_user(uaddr, &addr, sizeof(addr)))

			return -EFAULT;

		break;

	}

	case KVM_DEV_ARM_VGIC_GRP_ITS_REGS: {

		u64 __user *uaddr = (u64 __user *)(long)attr->addr;

		u64 reg;

		int ret;



		ret = vgic_its_attr_regs_access(dev, attr, &reg, false);

		if (ret)

			return ret;

		return put_user(reg, uaddr);

	}

	default:

		return -ENXIO;

	}

	}



	return 0;

}