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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FA16C3F2C6 for ; Tue, 3 Mar 2020 17:58:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4141B20728 for ; Tue, 3 Mar 2020 17:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258321; bh=sh0b3s9bLsqmhWeiQxrBH/nVixsNoQcyH5HaOhUxV2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UcljlczKpvoq6Ev1YITCUzdejja7hiE8FyxKv3Jll/az87rCOXh8qqt7iGyrB5WvC YB5Jh5fS0VzFGXX8zH3nTUrQ4jbaI8J7M4ZjbeLLxRMh+xAnFvM0Z6zG2kX9+rltEu X47cfGm3WF8RU1v/kRZFo3au2uWQPo4BfKgV0GQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387445AbgCCR6k (ORCPT ); Tue, 3 Mar 2020 12:58:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:41524 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387427AbgCCR6j (ORCPT ); Tue, 3 Mar 2020 12:58:39 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4D8C120728; Tue, 3 Mar 2020 17:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258318; bh=sh0b3s9bLsqmhWeiQxrBH/nVixsNoQcyH5HaOhUxV2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uZQAlkM90DQiq449j2JQFRdK7y9S56LYsM1BPSR9BOXKHcDihN8nsrAr4lsMT/WzX uhi/meTmel7oXvGpFPUyWhae8BYhwIQLTRYPi3bufLnXkvDs58SlurATY6d6WExKNt J7jbTqRTtIsXJ/w0+YLn7/n+59KwPyt4VqegkPWo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Christopherson , Paolo Bonzini Subject: [PATCH 5.4 135/152] KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path Date: Tue, 3 Mar 2020 18:43:53 +0100 Message-Id: <20200303174318.156741029@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174302.523080016@linuxfoundation.org> References: <20200303174302.523080016@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson commit 9d979c7e6ff43ca3200ffcb74f57415fd633a2da upstream. x86 does not load its MMU until KVM_RUN, which cannot be invoked until after vCPU creation succeeds. Given that kvm_arch_vcpu_destroy() is called if and only if vCPU creation fails, it is impossible for the MMU to be loaded. Note, the bogus kvm_mmu_unload() call was added during an unrelated refactoring of vCPU allocation, i.e. was presumably added as an opportunstic "fix" for a perceived leak. Fixes: fb3f0f51d92d1 ("KVM: Dynamically allocate vcpus") Signed-off-by: Sean Christopherson Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/x86.c | 4 ---- 1 file changed, 4 deletions(-) --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9194,10 +9194,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vc { vcpu->arch.apf.msr_val = 0; - vcpu_load(vcpu); - kvm_mmu_unload(vcpu); - vcpu_put(vcpu); - kvm_arch_vcpu_free(vcpu); }