Commit 0710f9a6 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: Use uaccess functions for GICv3 {sc}active 



We recently rewrote the sactive and cactive handlers to take the kvm
lock for guest accesses to these registers.  However, when accessed from
userspace this lock is already held.  Unfortunately we forgot to change
the private accessors for GICv3, because these are redistributor
registers and not distributor registers.

Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
parent abd72296

virt/kvm/arm/vgic/vgic-mmio-v3.c

+8 −6
Original line number Diff line number Diff line
@@ -528,12 +528,14 @@ static const struct vgic_register_region vgic_v3_sgibase_registers[] = { 
		vgic_mmio_read_pending, vgic_mmio_write_cpending,

		vgic_mmio_read_raz, vgic_mmio_write_wi, 4,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GICR_ISACTIVER0,

		vgic_mmio_read_active, vgic_mmio_write_sactive, 4,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GICR_ICACTIVER0,

		vgic_mmio_read_active, vgic_mmio_write_cactive, 4,

		VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH_UACCESS(GICR_ISACTIVER0,

		vgic_mmio_read_active, vgic_mmio_write_sactive,

		NULL, vgic_mmio_uaccess_write_sactive,

		4, VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH_UACCESS(GICR_ICACTIVER0,

		vgic_mmio_read_active, vgic_mmio_write_cactive,

		NULL, vgic_mmio_uaccess_write_cactive,

		4, VGIC_ACCESS_32bit),

	REGISTER_DESC_WITH_LENGTH(GICR_IPRIORITYR0,

		vgic_mmio_read_priority, vgic_mmio_write_priority, 32,

		VGIC_ACCESS_32bit | VGIC_ACCESS_8bit),