From patchwork Tue Mar 3 17:44:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 229965 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=unavailable 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 EB978C3F2C6 for ; Tue, 3 Mar 2020 18:03:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C04E7214DB for ; Tue, 3 Mar 2020 18:03:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258590; bh=thZk40I7Hn4qEUK8h9Expb/raHha+dGzZtgNhoDyxbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ebP8NGSyuQupCH74Jpll5MdH0Dlnkb9avN5LcCD4lD96Sq/P4jU1eXJULx0ALe/kc 9qTsAoKMpUy5ALK2/T134HIQ1RucaJKKl4NXs+Ray5XcePoBOvIefPbKtZBz4TOIoF MS8DV6Y7Q1pQMxvcXpyF4YPpG9eaBZwfXF90SJFE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388103AbgCCSB6 (ORCPT ); Tue, 3 Mar 2020 13:01:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:46408 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388100AbgCCSB6 (ORCPT ); Tue, 3 Mar 2020 13:01:58 -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 4E28F20866; Tue, 3 Mar 2020 18:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583258517; bh=thZk40I7Hn4qEUK8h9Expb/raHha+dGzZtgNhoDyxbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UT6Vsa/s+kUkJocSygKXKdRV6BnAaf3Wv5SBEdZr5Mp4p7/maaE+5IRP7WUmbCkq7 72cHTt2IsrGenonXOvaPWE6KM1fdhvQWdJ+15SqxEVnfO59hj2YnRfMstR+E8yrqWo 6+EpVOjmcF7u7duy4//dmzy/ctWl6LrpUL4N05Pw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Christopherson , Paolo Bonzini Subject: [PATCH 4.19 80/87] KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path Date: Tue, 3 Mar 2020 18:44:11 +0100 Message-Id: <20200303174357.452893316@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200303174349.075101355@linuxfoundation.org> References: <20200303174349.075101355@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 @@ -8695,10 +8695,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); }