KVM: arm64: Move double-checked lock to kvm_vgic_map_resources()

Browse source

kvm_vgic_map_resources() is called when a VCPU if first run and it maps all
the VGIC MMIO regions. To prevent double-initialization, the VGIC uses the
ready variable to keep track of the state of resources and the global KVM
mutex to protect against concurrent accesses. After the lock is taken, the
variable is checked again in case another VCPU took the lock between the
current VCPU reading ready equals false and taking the lock.

The double-checked lock pattern is spread across four different functions:
in kvm_vcpu_first_run_init(), in kvm_vgic_map_resource() and in
vgic_{v2,v3}_map_resources(), which makes it hard to reason about and
introduces minor code duplication. Consolidate the checks in
kvm_vgic_map_resources(), where the lock is taken.

No functional change intended.

Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201201150157.223625-4-alexandru.elisei@arm.com

...

This commit is contained in:

Alexandru Elisei 2020-12-01 15:01:55 +00:00 • committed by Marc Zyngier

parent f16570ba47

commit 1c91f06d29

4 changed files with 9 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

arch/arm64/kvm/arm.c

View file

6

arch/arm64/kvm/vgic/vgic-init.c

View file

3

arch/arm64/kvm/vgic/vgic-v2.c

View file

3

arch/arm64/kvm/vgic/vgic-v3.c

View file