mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
KVM: arm64: vgic-its: Implement vgic_mmio_uaccess_write_its_iidr
The GITS_IIDR revision field is used to encode the migration ABI revision. So we need to restore it to check the table layout is readable by the destination. By writing the IIDR, userspace thus forces the ABI revision to be used and this must be less than or equal to the max revision KVM supports. Signed-off-by: Eric Auger <[email protected]> Reviewed-by: Christoffer Dall <[email protected]>
This commit is contained in:
parent
71afe470e2
commit
ab01c6bdac
2 changed files with 25 additions and 3 deletions
|
|
@ -434,7 +434,23 @@ static unsigned long vgic_mmio_read_its_iidr(struct kvm *kvm,
|
|||
struct vgic_its *its,
|
||||
gpa_t addr, unsigned int len)
|
||||
{
|
||||
return (PRODUCT_ID_KVM << 24) | (IMPLEMENTER_ARM << 0);
|
||||
u32 val;
|
||||
|
||||
val = (its->abi_rev << GITS_IIDR_REV_SHIFT) & GITS_IIDR_REV_MASK;
|
||||
val |= (PRODUCT_ID_KVM << GITS_IIDR_PRODUCTID_SHIFT) | IMPLEMENTER_ARM;
|
||||
return val;
|
||||
}
|
||||
|
||||
static int vgic_mmio_uaccess_write_its_iidr(struct kvm *kvm,
|
||||
struct vgic_its *its,
|
||||
gpa_t addr, unsigned int len,
|
||||
unsigned long val)
|
||||
{
|
||||
u32 rev = GITS_IIDR_REV(val);
|
||||
|
||||
if (rev >= NR_ITS_ABIS)
|
||||
return -EINVAL;
|
||||
return vgic_its_set_abi(its, rev);
|
||||
}
|
||||
|
||||
static unsigned long vgic_mmio_read_its_idregs(struct kvm *kvm,
|
||||
|
|
@ -1415,8 +1431,9 @@ static struct vgic_register_region its_registers[] = {
|
|||
REGISTER_ITS_DESC(GITS_CTLR,
|
||||
vgic_mmio_read_its_ctlr, vgic_mmio_write_its_ctlr, 4,
|
||||
VGIC_ACCESS_32bit),
|
||||
REGISTER_ITS_DESC(GITS_IIDR,
|
||||
vgic_mmio_read_its_iidr, its_mmio_write_wi, 4,
|
||||
REGISTER_ITS_DESC_UACCESS(GITS_IIDR,
|
||||
vgic_mmio_read_its_iidr, its_mmio_write_wi,
|
||||
vgic_mmio_uaccess_write_its_iidr, 4,
|
||||
VGIC_ACCESS_32bit),
|
||||
REGISTER_ITS_DESC(GITS_TYPER,
|
||||
vgic_mmio_read_its_typer, its_mmio_write_wi, 8,
|
||||
|
|
|
|||
Loading…
Reference in a new issue