diff options
| author | Quentin Perret <qperret@google.com> | 2022-11-10 19:02:56 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2022-11-11 17:19:35 +0000 |
| commit | 27eb26bfff5d358d42911d04bbecc62e659ec32b (patch) | |
| tree | e60ac928666cb545cee520a9524ca1b60e752274 /arch/arm64/kvm/hyp | |
| parent | 73f38ef2ae531b180685173e0923225551434fcb (diff) | |
| download | linux-stable-27eb26bfff5d358d42911d04bbecc62e659ec32b.tar.gz linux-stable-27eb26bfff5d358d42911d04bbecc62e659ec32b.tar.bz2 linux-stable-27eb26bfff5d358d42911d04bbecc62e659ec32b.zip | |
KVM: arm64: Explicitly map 'kvm_vgic_global_state' at EL2
The pkvm hypervisor at EL2 may need to read the 'kvm_vgic_global_state'
variable from the host, for example when saving and restoring the state
of the virtual GIC.
Explicitly map 'kvm_vgic_global_state' in the stage-1 page-table of the
pKVM hypervisor rather than relying on mapping all of the host '.rodata'
section.
Tested-by: Vincent Donnefort <vdonnefort@google.com>
Signed-off-by: Quentin Perret <qperret@google.com>
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221110190259.26861-24-will@kernel.org
Diffstat (limited to 'arch/arm64/kvm/hyp')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 0f69c1393416..5a371ab236db 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -161,6 +161,11 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size, if (ret) return ret; + ret = pkvm_create_mappings(&kvm_vgic_global_state, + &kvm_vgic_global_state + 1, prot); + if (ret) + return ret; + return 0; } |