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 003A3C4167E for ; Tue, 1 Mar 2022 20:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238025AbiCAUTx (ORCPT ); Tue, 1 Mar 2022 15:19:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237846AbiCAUSg (ORCPT ); Tue, 1 Mar 2022 15:18:36 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 875DA340E7 for ; Tue, 1 Mar 2022 12:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646165873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kbtnGrIoAXkidAZTj8FmIyhuel5W031FIJwbUY20FAA=; b=QeHSnPwcGqPowM17j08m8fdc1RMPdGb83K6lINecxmUgSUUoEka05hzbpnNUYr+27yNtvI uR82X/jEUdCU3dI+ZPQZGHv7atfA50+8zFYXpYUQ2RLN312erqcvu5lg1vN4hySl81iklw ++icgX40TpjrVppa8O4QDEfbrb6xJ0M= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-q1_niGX3MHeDY2N_oV1trQ-1; Tue, 01 Mar 2022 15:17:52 -0500 X-MC-Unique: q1_niGX3MHeDY2N_oV1trQ-1 Received: by mail-wm1-f70.google.com with SMTP id ay7-20020a05600c1e0700b003813d7a7d03so1735889wmb.1 for ; Tue, 01 Mar 2022 12:17:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=kbtnGrIoAXkidAZTj8FmIyhuel5W031FIJwbUY20FAA=; b=IWpB4Y2YIs3aQf7NdOCF9u1G2LBwYPr/B+oS76q7Fe04B6ZKzxFOmFg0NUA8DY0b25 YWuvMGCK/SWF8bh7jC0JQN5cFJ0TvDv1jg7v1RgTUPw/6noiGN0apy1NUyhmZmTumPsj 8QPqDmCptvBMpp7RFiRkOq3T7Pz8YeaEPohs2eydlOvh4TaEbtFBD/N2UTRPZB5ZcJ6j cW2MOMYya95MnW5hCUlFg/pYvYSfVvUt8Kdfa02nGX0R5MBkG6GoBidIWKyu07MQUigz +VSlEI9AnK5EUHcDnZVFu2cNpkqOUDxiwH4OijtCzG9Lj6jKeDDHkfA6iOeinZW7VkZq zeZw== X-Gm-Message-State: AOAM532gMZIEjBBAfZvXpZdMFTeK+zt27qL2xvQXdFs2iBR3gfDlbpWc p0LfbQymuD8piiIw+CZVK4IpzZYiICUmYDuNAwBKJ85GjZSiIR/ffXn/l9+ZvcIJ8pAAtJg89IP JqO1fp83jPVovCfCEc7ZTfQ4G X-Received: by 2002:a05:600c:4e08:b0:381:9094:6b3c with SMTP id b8-20020a05600c4e0800b0038190946b3cmr3338835wmq.103.1646165870999; Tue, 01 Mar 2022 12:17:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHRA1O1tPDB9klqjpvqfr2MK6rdobahePsJyhIS2BUsCgaysLn9yR7ZHPI3cYyFrk3Va3iAQ== X-Received: by 2002:a05:600c:4e08:b0:381:9094:6b3c with SMTP id b8-20020a05600c4e0800b0038190946b3cmr3338828wmq.103.1646165870783; Tue, 01 Mar 2022 12:17:50 -0800 (PST) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.googlemail.com with ESMTPSA id k15-20020adff5cf000000b001e4b8fde355sm14482929wrp.73.2022.03.01.12.17.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 01 Mar 2022 12:17:50 -0800 (PST) Message-ID: <2619b94d-d1e8-5185-5533-506421ca7281@redhat.com> Date: Tue, 1 Mar 2022 21:17:49 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH AUTOSEL 5.15 05/23] KVM: Fix lockdep false negative during host resume Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wanpeng Li , kvm@vger.kernel.org References: <20220301201629.18547-1-sashal@kernel.org> <20220301201629.18547-5-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20220301201629.18547-5-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/1/22 21:16, Sasha Levin wrote: > 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 13aff136e6eef..5309b3eaa0470 100644 > --- a/virt/kvm/kvm_main.c > +++ b/virt/kvm/kvm_main.c > @@ -5416,9 +5416,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); > } > } Acked-by: Paolo Bonzini