Message-ID: <189ed5d9-88b4-eed3-7388-f02dcadecb51@redhat.com>
Date:   Fri, 7 Jan 2022 18:01:14 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.0
Subject: Re: [PATCH] KVM: SEV: Add lock subtyping in sev_lock_two_vms so
 lockdep doesn't report false dependencies
Content-Language: en-US
To:     Wanpeng Li <kernellwp@gmail.com>, linux-kernel@vger.kernel.org,
        kvm@vger.kernel.org
Cc:     Sean Christopherson <seanjc@google.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>
References: <1641364863-26331-1-git-send-email-wanpengli@tencent.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
In-Reply-To: <1641364863-26331-1-git-send-email-wanpengli@tencent.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 1/5/22 07:41, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
> 
> Both source and dest vms' kvm->locks are held in sev_lock_two_vms,
> we should mark one with different subtype to avoid false positives
> from lockdep.
> 
> Fixes: c9d61dcb0bc26 (KVM: SEV: accept signals in sev_lock_two_vms)
> Reported-by: Yiru Xu <xyru1999@gmail.com>
> Tested-by: Jinrong Liang <cloudliang@tencent.com>
> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
>   arch/x86/kvm/svm/sev.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
> index 7656a2c..be28831 100644
> --- a/arch/x86/kvm/svm/sev.c
> +++ b/arch/x86/kvm/svm/sev.c
> @@ -1565,7 +1565,7 @@ static int sev_lock_two_vms(struct kvm *dst_kvm, struct kvm *src_kvm)
>   	r = -EINTR;
>   	if (mutex_lock_killable(&dst_kvm->lock))
>   		goto release_src;
> -	if (mutex_lock_killable(&src_kvm->lock))
> +	if (mutex_lock_killable_nested(&src_kvm->lock, SINGLE_DEPTH_NESTING))
>   		goto unlock_dst;
>   	return 0;
>   

Queued, thanks.

Paolo