From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC4EAC433F5 for ; Tue, 1 Mar 2022 20:25:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238168AbiCAUY7 (ORCPT ); Tue, 1 Mar 2022 15:24:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238548AbiCAUXW (ORCPT ); Tue, 1 Mar 2022 15:23:22 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27FDEA2532; Tue, 1 Mar 2022 12:20:40 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 329EA60B5B; Tue, 1 Mar 2022 20:20:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52F6FC340EE; Tue, 1 Mar 2022 20:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646166002; bh=kW4eneYh7QtO52uhohixRI5r/Y8sRpEttiz/pqhpL4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ozYTZOagGaJWCX3OH9jLuIP+PelQCtJplbdaJEZyPDRn/rjq5CvPDxCMkAwrhvNFS naqth4N4SkaWxo8gv4zLJxzhAOw+tSo1tgtaP0NnM2RW8AE5CT2rDZZACgTrozNpMB pAtBVVZzLZ+T8hyTXZ8rGMzre0SNbdml45VizXtvhE+1oN50DKzX/wRhirC9qt3AIg syTbx37s+NRvSKmwK1fPQAQXVbLFDbJ/AHQyl15XGsRigYTdQX60RYspiACKPUbAd/ OO6KT9Z4udBJSJi9Cy36VvEUWRUj+LNhH/RoOLDZktN2JthMu8eydWJpkIgRO156cQ oMLDPn/HT63FQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wanpeng Li , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 02/11] KVM: Fix lockdep false negative during host resume Date: Tue, 1 Mar 2022 15:19:35 -0500 Message-Id: <20220301201951.19066-2-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220301201951.19066-1-sashal@kernel.org> References: <20220301201951.19066-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Wanpeng Li [ Upstream commit 4cb9a998b1ce25fad74a82f5a5c45a4ef40de337 ] 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: 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. Signed-off-by: Wanpeng Li Message-Id: <1644920142-81249-1-git-send-email-wanpengli@tencent.com> Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- virt/kvm/kvm_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f31976010622f..adda0c6672b56 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4427,9 +4427,7 @@ static int kvm_suspend(void) static void kvm_resume(void) { if (kvm_usage_count) { -#ifdef CONFIG_LOCKDEP - WARN_ON(lockdep_is_held(&kvm_count_lock)); -#endif + lockdep_assert_not_held(&kvm_count_lock); hardware_enable_nolock(NULL); } } -- 2.34.1