Re: [PATCH v7 12/17] KVM: s390: pv: refactoring of kvm_s390_pv_deinit_vm

[Janosch Frank <frankja@linux.ibm.com>]

On 2/4/22 16:53, Claudio Imbrenda wrote:
> Refactor kvm_s390_pv_deinit_vm to improve readability and simplify the
> improvements that are coming in subsequent patches.
> 
> No functional change intended.
> 
> [note: this can potentially be squashed into the next patch, I factored
> it out to simplify the review process]
> 

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>

> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
>   arch/s390/kvm/pv.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
> index d3b8fd9b5b3e..4e4728ec83a7 100644
> --- a/arch/s390/kvm/pv.c
> +++ b/arch/s390/kvm/pv.c
> @@ -180,17 +180,17 @@ int kvm_s390_pv_deinit_vm(struct kvm *kvm, u16 *rc, u16 *rrc)
>   	cc = uv_cmd_nodata(kvm_s390_pv_get_handle(kvm),
>   			   UVC_CMD_DESTROY_SEC_CONF, rc, rrc);
>   	WRITE_ONCE(kvm->arch.gmap->guest_handle, 0);
> -	if (!cc)
> -		atomic_dec(&kvm->mm->context.protected_count);
> -	KVM_UV_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", *rc, *rrc);
> -	WARN_ONCE(cc, "protvirt destroy vm failed rc %x rrc %x", *rc, *rrc);
> -	/* Intended memory leak on "impossible" error */
>   	if (!cc) {
> +		atomic_dec(&kvm->mm->context.protected_count);
>   		kvm_s390_pv_dealloc_vm(kvm);
> -		return 0;
> +	} else {
> +		/* Intended memory leak on "impossible" error */
> +		s390_replace_asce(kvm->arch.gmap);
>   	}
> -	s390_replace_asce(kvm->arch.gmap);
> -	return -EIO;
> +	KVM_UV_EVENT(kvm, 3, "PROTVIRT DESTROY VM: rc %x rrc %x", *rc, *rrc);
> +	WARN_ONCE(cc, "protvirt destroy vm failed rc %x rrc %x", *rc, *rrc);
> +
> +	return cc ? -EIO : 0;
>   }
>   
>   static void kvm_s390_pv_mmu_notifier_release(struct mmu_notifier *subscription,
>