Re: [PATCH v2 6/7] KVM: s390: Fix overclearing ESCA in case of error

[Christian Borntraeger]

Am 13.07.26 um 17:08 schrieb Claudio Imbrenda:
> If an attempt is made to create a vCPU with an already existing ID,
> the duplicated vCPU will be destroyed. When destroying a vCPU, its
> ESCA entry will be cleared. In the above scenario, the spurious
> duplicate vCPU is destroyed, but the ESCA entry corresponding to the
> original vCPU is cleared.
>
> Fix by skipping clearing the ESCA entry if the vCPU creation was not
> successful, i.e. if the pointer to the ESCA in the state description is
> not set.
>
> Signed-off-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx>
> ---
>   arch/s390/kvm/kvm-s390.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index fc0a884d7f54..6339a327a7be 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -3458,7 +3458,7 @@ static void sca_del_vcpu(struct kvm_vcpu *vcpu)
>   {
>   	struct esca_block *sca = vcpu->kvm->arch.sca;
>   
> -	if (!kvm_s390_use_sca_entries())
> +	if (!kvm_s390_use_sca_entries() || !vcpu->arch.sie_block->scaol)
>   		return;

I think sashiko is right and we need to consider scaol and scaoh together.>   
>   	clear_bit_inv(vcpu->vcpu_id, (unsigned long *)sca->mcn);