Skip to content

Commit 63afbe7

Browse files
wildea01chazy
authored andcommitted
kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform
If the physical address of GICV isn't page-aligned, then we end up creating a stage-2 mapping of the page containing it, which causes us to map neighbouring memory locations directly into the guest. As an example, consider a platform with GICV at physical 0x2c02f000 running a 64k-page host kernel. If qemu maps this into the guest at 0x80010000, then guest physical addresses 0x80010000 - 0x8001efff will map host physical region 0x2c020000 - 0x2c02efff. Accesses to these physical regions may cause UNPREDICTABLE behaviour, for example, on the Juno platform this will cause an SError exception to EL3, which brings down the entire physical CPU resulting in RCU stalls / HYP panics / host crashing / wasted weeks of debugging. SBSA recommends that systems alias the 4k GICV across the bounding 64k region, in which case GICV physical could be described as 0x2c020000 in the above scenario. This patch fixes the problem by failing the vgic probe if the physical base address or the size of GICV aren't page-aligned. Note that this generated a warning in dmesg about freeing enabled IRQs, so I had to move the IRQ enabling later in the probe. Cc: Christoffer Dall <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Gleb Natapov <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Joel Schopp <[email protected]> Cc: Don Dutile <[email protected]> Acked-by: Peter Maydell <[email protected]> Acked-by: Joel Schopp <[email protected]> Acked-by: Marc Zyngier <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Christoffer Dall <[email protected]>
1 parent bb18b52 commit 63afbe7

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

virt/kvm/arm/vgic.c

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,17 +1526,33 @@ int kvm_vgic_hyp_init(void)
15261526
goto out_unmap;
15271527
}
15281528

1529-
kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
1530-
vctrl_res.start, vgic_maint_irq);
1531-
on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);
1532-
15331529
if (of_address_to_resource(vgic_node, 3, &vcpu_res)) {
15341530
kvm_err("Cannot obtain VCPU resource\n");
15351531
ret = -ENXIO;
15361532
goto out_unmap;
15371533
}
1534+
1535+
if (!PAGE_ALIGNED(vcpu_res.start)) {
1536+
kvm_err("GICV physical address 0x%llx not page aligned\n",
1537+
(unsigned long long)vcpu_res.start);
1538+
ret = -ENXIO;
1539+
goto out_unmap;
1540+
}
1541+
1542+
if (!PAGE_ALIGNED(resource_size(&vcpu_res))) {
1543+
kvm_err("GICV size 0x%llx not a multiple of page size 0x%lx\n",
1544+
(unsigned long long)resource_size(&vcpu_res),
1545+
PAGE_SIZE);
1546+
ret = -ENXIO;
1547+
goto out_unmap;
1548+
}
1549+
15381550
vgic_vcpu_base = vcpu_res.start;
15391551

1552+
kvm_info("%s@%llx IRQ%d\n", vgic_node->name,
1553+
vctrl_res.start, vgic_maint_irq);
1554+
on_each_cpu(vgic_init_maintenance_interrupt, NULL, 1);
1555+
15401556
goto out;
15411557

15421558
out_unmap:

0 commit comments

Comments
 (0)