Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 15 Feb 2022 16:26:48 +0000
From:   Sean Christopherson <seanjc@google.com>
To:     Wanpeng Li <kernellwp@gmail.com>
Cc:     linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
        Paolo Bonzini <pbonzini@redhat.com>,
        Vitaly Kuznetsov <vkuznets@redhat.com>,
        Wanpeng Li <wanpengli@tencent.com>,
        Jim Mattson <jmattson@google.com>,
        Joerg Roedel <joro@8bytes.org>
Subject: Re: [PATCH] KVM: Fix lockdep false negative during host resume
Message-ID: <YgvUSCjukIxvpDlf@google.com>
References: <1644920142-81249-1-git-send-email-wanpengli@tencent.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1644920142-81249-1-git-send-email-wanpengli@tencent.com>
Precedence: bulk

On Tue, Feb 15, 2022, Wanpeng Li wrote:
> From: Wanpeng Li <wanpengli@tencent.com>
> 
> I saw the below splatting after the host suspended and resumed.
> 
>    WARNING: CPU: 0 PID: 2943 at kvm/arch/x86/kvm/../../../virt/kvm/kvm_main.c:5531 kvm_resume+0x2c/0x30 [kvm]
>    CPU: 0 PID: 2943 Comm: step_after_susp Tainted: G        W IOE     5.17.0-rc3+ #4
>    RIP: 0010:kvm_resume+0x2c/0x30 [kvm]
>    Call Trace:
>     <TASK>
>     syscore_resume+0x90/0x340
>     suspend_devices_and_enter+0xaee/0xe90
>     pm_suspend.cold+0x36b/0x3c2
>     state_store+0x82/0xf0
>     kernfs_fop_write_iter+0x1b6/0x260
>     new_sync_write+0x258/0x370
>     vfs_write+0x33f/0x510
>     ksys_write+0xc9/0x160
>     do_syscall_64+0x3b/0xc0
>     entry_SYSCALL_64_after_hwframe+0x44/0xae
> 
> lockdep_is_held() can return -1 when lockdep is disabled which triggers
> this warning. Let's use lockdep_assert_not_held() which can detect 
> incorrect calls while holding a lock and it also avoids false negatives
> when lockdep is disabled.
> 

Fixes: 2eb06c306a57 ("KVM: Fix spinlock taken warning during host resume")

> Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
> ---
>  virt/kvm/kvm_main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index 83c57bcc6eb6..3f861f33bfe0 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -5528,7 +5528,7 @@ static void kvm_resume(void)
>  {
>  	if (kvm_usage_count) {
>  #ifdef CONFIG_LOCKDEP

The #ifdef can be dropped, it was added only to omit the WARN_ON.

With that,

Reviewed-by: Sean Christopherson <seanjc@google.com>

> -		WARN_ON(lockdep_is_held(&kvm_count_lock));
> +		lockdep_assert_not_held(&kvm_count_lock);
>  #endif
>  		hardware_enable_nolock(NULL);
>  	}
> -- 
> 2.25.1
>