Re: [PATCH] KVM: vgic: Use warpper function to lock/unlock all vcpus in kvm_vgic_create()
From: Auger Eric
Date: Thu Nov 28 2019 - 04:08:08 EST
Hi,
On 11/28/19 4:09 AM, linmiaohe wrote:
> From: Miaohe Lin <linmiaohe@xxxxxxxxxx>
>
> Use warpper function lock_all_vcpus()/unlock_all_vcpus()
s/warpper/wrapper and also in the title.
> in kvm_vgic_create() to remove duplicated code dealing
> with locking and unlocking all vcpus in a vm.
>
> Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
> ---
> virt/kvm/arm/vgic/vgic-init.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
> index b3c5de48064c..53e3969dfb52 100644
> --- a/virt/kvm/arm/vgic/vgic-init.c
> +++ b/virt/kvm/arm/vgic/vgic-init.c
> @@ -70,7 +70,7 @@ void kvm_vgic_early_init(struct kvm *kvm)
> */
> int kvm_vgic_create(struct kvm *kvm, u32 type)
> {
> - int i, vcpu_lock_idx = -1, ret;
> + int i, ret;
> struct kvm_vcpu *vcpu;
>
> if (irqchip_in_kernel(kvm))
> @@ -92,11 +92,8 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
> * that no other VCPUs are run while we create the vgic.
> */
> ret = -EBUSY;
> - kvm_for_each_vcpu(i, vcpu, kvm) {
> - if (!mutex_trylock(&vcpu->mutex))
> - goto out_unlock;
> - vcpu_lock_idx = i;
> - }
> + if (!lock_all_vcpus(kvm))
> + return ret;
>
> kvm_for_each_vcpu(i, vcpu, kvm) {
> if (vcpu->arch.has_run_once)
> @@ -125,10 +122,7 @@ int kvm_vgic_create(struct kvm *kvm, u32 type)
> INIT_LIST_HEAD(&kvm->arch.vgic.rd_regions);
>
> out_unlock:
> - for (; vcpu_lock_idx >= 0; vcpu_lock_idx--) {
> - vcpu = kvm_get_vcpu(kvm, vcpu_lock_idx);
> - mutex_unlock(&vcpu->mutex);
> - }
> + unlock_all_vcpus(kvm);
> return ret;
> }
>
>
Besides, looks good to me
Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
Thanks
Eric