KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_ADDR

This patch implements the KVM_DEV_ARM_VGIC_GRP_ADDR group which
enables to set the base address of GIC regions as seen by the guest.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>

1 files changed, 38 insertions, 0 deletions

diff --git a/virt/kvm/arm/vgic/vgic-kvm-device.c b/virt/kvm/arm/vgic/vgic-kvm-device.c
index 082829a764dd..a7090970be72 100644
--- a/virt/kvm/arm/vgic/vgic-kvm-device.c
+++ b/virt/kvm/arm/vgic/vgic-kvm-device.c
@@ -112,6 +112,17 @@ static int vgic_set_common_attr(struct kvm_device *dev,
         int r;
 
         switch (attr->group) {
+        case KVM_DEV_ARM_VGIC_GRP_ADDR: {
+                u64 __user *uaddr = (u64 __user *)(long)attr->addr;
+                u64 addr;
+                unsigned long type = (unsigned long)attr->attr;
+
+                if (copy_from_user(&addr, uaddr, sizeof(addr)))
+                        return -EFAULT;
+
+                r = kvm_vgic_addr(dev->kvm, type, &addr, true);
+                return (r == -ENODEV) ? -ENXIO : r;
+        }
         case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
                 u32 __user *uaddr = (u32 __user *)(long)attr->addr;
                 u32 val;
@@ -164,6 +175,19 @@ static int vgic_get_common_attr(struct kvm_device *dev,
         int r = -ENXIO;
 
         switch (attr->group) {
+        case KVM_DEV_ARM_VGIC_GRP_ADDR: {
+                u64 __user *uaddr = (u64 __user *)(long)attr->addr;
+                u64 addr;
+                unsigned long type = (unsigned long)attr->attr;
+
+                r = kvm_vgic_addr(dev->kvm, type, &addr, false);
+                if (r)
+                        return (r == -ENODEV) ? -ENXIO : r;
+
+                if (copy_to_user(uaddr, &addr, sizeof(addr)))
+                        return -EFAULT;
+                break;
+        }
         case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: {
                 u32 __user *uaddr = (u32 __user *)(long)attr->addr;
 
@@ -227,6 +251,13 @@ static int vgic_v2_has_attr(struct kvm_device *dev,
                             struct kvm_device_attr *attr)
 {
         switch (attr->group) {
+        case KVM_DEV_ARM_VGIC_GRP_ADDR:
+                switch (attr->attr) {
+                case KVM_VGIC_V2_ADDR_TYPE_DIST:
+                case KVM_VGIC_V2_ADDR_TYPE_CPU:
+                        return 0;
+                }
+                break;
         case KVM_DEV_ARM_VGIC_GRP_NR_IRQS:
                 return 0;
         case KVM_DEV_ARM_VGIC_GRP_CTRL:
@@ -267,6 +298,13 @@ static int vgic_v3_has_attr(struct kvm_device *dev,
                             struct kvm_device_attr *attr)
 {
         switch (attr->group) {
+        case KVM_DEV_ARM_VGIC_GRP_ADDR:
+                switch (attr->attr) {
+                case KVM_VGIC_V3_ADDR_TYPE_DIST:
+                case KVM_VGIC_V3_ADDR_TYPE_REDIST:
+                        return 0;
+                }
+                break;
         case KVM_DEV_ARM_VGIC_GRP_NR_IRQS:
                 return 0;
         case KVM_DEV_ARM_VGIC_GRP_CTRL: