Skip to content

Commit 289a007

Browse files
committed
RISC-V: KVM: Expose APLIC registers as attributes of AIA irqchip
We expose APLIC registers as KVM device attributes of the in-kernel AIA irqchip device. This will allow KVM user-space to save/restore APLIC state using KVM device ioctls(). Signed-off-by: Anup Patel <apatel@ventanamicro.com> Reviewed-by: Atish Patra <atishp@rivosinc.com> Signed-off-by: Anup Patel <anup@brainfault.org>
1 parent 74967aa commit 289a007

4 files changed

Lines changed: 77 additions & 0 deletions

File tree

arch/riscv/include/asm/kvm_aia.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,9 @@ static inline void kvm_riscv_vcpu_aia_imsic_cleanup(struct kvm_vcpu *vcpu)
129129
{
130130
}
131131

132+
int kvm_riscv_aia_aplic_set_attr(struct kvm *kvm, unsigned long type, u32 v);
133+
int kvm_riscv_aia_aplic_get_attr(struct kvm *kvm, unsigned long type, u32 *v);
134+
int kvm_riscv_aia_aplic_has_attr(struct kvm *kvm, unsigned long type);
132135
int kvm_riscv_aia_aplic_inject(struct kvm *kvm, u32 source, bool level);
133136
int kvm_riscv_aia_aplic_init(struct kvm *kvm);
134137
void kvm_riscv_aia_aplic_cleanup(struct kvm *kvm);

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,12 @@ enum KVM_RISCV_SBI_EXT_ID {
249249
#define KVM_DEV_RISCV_AIA_GRP_CTRL 2
250250
#define KVM_DEV_RISCV_AIA_CTRL_INIT 0
251251

252+
/*
253+
* The device attribute type contains the memory mapped offset of the
254+
* APLIC register (range 0x0000-0x3FFF) and it must be 4-byte aligned.
255+
*/
256+
#define KVM_DEV_RISCV_AIA_GRP_APLIC 3
257+
252258
/* One single KVM irqchip, ie. the AIA */
253259
#define KVM_NR_IRQCHIPS 1
254260

arch/riscv/kvm/aia_aplic.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,49 @@ static struct kvm_io_device_ops aplic_iodoev_ops = {
501501
.write = aplic_mmio_write,
502502
};
503503

504+
int kvm_riscv_aia_aplic_set_attr(struct kvm *kvm, unsigned long type, u32 v)
505+
{
506+
int rc;
507+
508+
if (!kvm->arch.aia.aplic_state)
509+
return -ENODEV;
510+
511+
rc = aplic_mmio_write_offset(kvm, type, v);
512+
if (rc)
513+
return rc;
514+
515+
return 0;
516+
}
517+
518+
int kvm_riscv_aia_aplic_get_attr(struct kvm *kvm, unsigned long type, u32 *v)
519+
{
520+
int rc;
521+
522+
if (!kvm->arch.aia.aplic_state)
523+
return -ENODEV;
524+
525+
rc = aplic_mmio_read_offset(kvm, type, v);
526+
if (rc)
527+
return rc;
528+
529+
return 0;
530+
}
531+
532+
int kvm_riscv_aia_aplic_has_attr(struct kvm *kvm, unsigned long type)
533+
{
534+
int rc;
535+
u32 val;
536+
537+
if (!kvm->arch.aia.aplic_state)
538+
return -ENODEV;
539+
540+
rc = aplic_mmio_read_offset(kvm, type, &val);
541+
if (rc)
542+
return rc;
543+
544+
return 0;
545+
}
546+
504547
int kvm_riscv_aia_aplic_init(struct kvm *kvm)
505548
{
506549
int i, ret = 0;

arch/riscv/kvm/aia_device.c

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,15 @@ static int aia_set_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
365365
break;
366366
}
367367

368+
break;
369+
case KVM_DEV_RISCV_AIA_GRP_APLIC:
370+
if (copy_from_user(&nr, uaddr, sizeof(nr)))
371+
return -EFAULT;
372+
373+
mutex_lock(&dev->kvm->lock);
374+
r = kvm_riscv_aia_aplic_set_attr(dev->kvm, type, nr);
375+
mutex_unlock(&dev->kvm->lock);
376+
368377
break;
369378
}
370379

@@ -412,6 +421,20 @@ static int aia_get_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
412421
if (copy_to_user(uaddr, &addr, sizeof(addr)))
413422
return -EFAULT;
414423

424+
break;
425+
case KVM_DEV_RISCV_AIA_GRP_APLIC:
426+
if (copy_from_user(&nr, uaddr, sizeof(nr)))
427+
return -EFAULT;
428+
429+
mutex_lock(&dev->kvm->lock);
430+
r = kvm_riscv_aia_aplic_get_attr(dev->kvm, type, &nr);
431+
mutex_unlock(&dev->kvm->lock);
432+
if (r)
433+
return r;
434+
435+
if (copy_to_user(uaddr, &nr, sizeof(nr)))
436+
return -EFAULT;
437+
415438
break;
416439
}
417440

@@ -448,6 +471,8 @@ static int aia_has_attr(struct kvm_device *dev, struct kvm_device_attr *attr)
448471
return 0;
449472
}
450473
break;
474+
case KVM_DEV_RISCV_AIA_GRP_APLIC:
475+
return kvm_riscv_aia_aplic_has_attr(dev->kvm, attr->attr);
451476
}
452477

453478
return -ENXIO;

0 commit comments

Comments
 (0)