From patchwork Tue Oct 22 01:58:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 11203377 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 90883112B for ; Tue, 22 Oct 2019 01:59:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 69BDE21A4A for ; Tue, 22 Oct 2019 01:59:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="f2+bUCKo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 69BDE21A4A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=C5+RKbC6iu7GITgq6WPv92Sq6Pt5RgxEE89S0ORYvf0=; b=f2+bUCKosLDVbX YNFWOLsMaanXOV04eSm+xdleYUtp4nIut00PHDdJgrO3p3eXPjOcAkxHj/Aq16jES6enPaEuWEbN3 8hGMoUoCVaER7AZnBczdZgWlezygmcMkhcUdgWFh6qvB63bAlCTnlxaiiHLXq1DQJc2q/R571I3q6 JznINexmjFG/lgnVoOn8DR/fbCn43P8DvG+IwlAjkCWngF3LY7oHUB4Ic7CuJTpsyj1rI0ce/N5O6 hzaebEtcETfDMb29kpYxk4q0zrbfGAgAF1QwXruXhsfX1O0ur6SKuke1Rg/7G5HmiFmiU86+Vquzt LFwHYwet1FrvXWkpBsSg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMjSS-0003uR-TZ; Tue, 22 Oct 2019 01:59:36 +0000 Received: from mga07.intel.com ([134.134.136.100]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iMjSP-0003sH-2s for linux-arm-kernel@lists.infradead.org; Tue, 22 Oct 2019 01:59:34 +0000 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Oct 2019 18:59:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,325,1566889200"; d="scan'208";a="196293739" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.41]) by fmsmga008.fm.intel.com with ESMTP; 21 Oct 2019 18:59:30 -0700 From: Sean Christopherson To: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Subject: [PATCH 00/45] KVM: Refactor vCPU creation Date: Mon, 21 Oct 2019 18:58:40 -0700 Message-Id: <20191022015925.31916-1-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191021_185933_169668_C968CCF2 X-CRM114-Status: GOOD ( 14.09 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [134.134.136.100 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvm-ppc@vger.kernel.org, Wanpeng Li , kvm@vger.kernel.org, David Hildenbrand , Joerg Roedel , Cornelia Huck , linux-mips@vger.kernel.org, Sean Christopherson , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org, Vitaly Kuznetsov , Suzuki K Poulose , kvmarm@lists.cs.columbia.edu, Julien Thierry , Jim Mattson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org *************************** DISCLAIMER ********************************** The non-x86 arch specific patches are completely untested. Although the changes are conceptually straightforward, I'm not remotely confident that the patches are bug free, e.g. checkpatch caught several blatant typos that would break compilation. ************************************************************************* The end goal of this series is to strip down the interface between common KVM code and arch specific code so that there is precisely one arch hook for creating a vCPU and one hook for destroying a vCPU. In addition to cleaning up the code base, simplifying the interface gives architectures more freedom to organize their vCPU creation code. KVM's vCPU creation code is comically messy. kvm_vm_ioctl_create_vcpu() calls three separate arch hooks: init(), create() and setup(). The init() call is especially nasty as it's hidden away in a common KVM function, kvm_init_vcpu(), that for all intents and purposes must be immediately invoked after the vcpu object is allocated. Not to be outdone, vCPU destruction also has three arch hooks: uninit(), destroy() and free(), the latter of which isn't actually invoked by common KVM code, but the hook declaration still exists because architectures are relying on its forward declaration. Eliminating the extra arch hooks is relatively straightforward, just tedious. For the most part, there is no fundamental constraint that necessitated the proliferation of arch hooks, rather they crept in over time, usually when x86-centric code was moved out of generic KVM and into x86 code. E.g. kvm_arch_vcpu_setup() was added to allow x86 to do vcpu_load(), which can only be done after preempt_notifier initialization, but adding setup() overlooked the fact that the preempt_notifier was only initialized after kvm_arch_vcpu_create() because preemption support was added when x86's MMU setup (the vcpu_load() user) was called from common KVM code. For all intents and purposes, there is no true functional change in this series. The order of some allocations will change, and a few memory leaks are fixed, but the actual functionality of a guest should be unaffected. Patches 01-03 are bug fixes in error handling paths that were found by inspection when refactoring the associated code. Patches 04-43 refactor each arch implementation so that the unwanted arch hooks can be dropped without a functional change, e.g. move code out of kvm_arch_vcpu_setup() so that all implementations are empty, then drop the functions and caller. Patches 44-45 are minor clean up to eliminate kvm_vcpu_uninit(). The net result is to go from this: vcpu = kvm_arch_vcpu_create(kvm, id); | |-> kvm_vcpu_init() | |-> kvm_arch_vcpu_init() if (IS_ERR(vcpu)) { r = PTR_ERR(vcpu); goto vcpu_decrement; } preempt_notifier_init(&vcpu->preempt_notifier, &kvm_preempt_ops); r = kvm_arch_vcpu_setup(vcpu); if (r) goto vcpu_destroy; to this: r = kvm_arch_vcpu_precreate(kvm, id); if (r) goto vcpu_decrement; vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); if (!vcpu) { r = -ENOMEM; goto vcpu_decrement; } page = alloc_page(GFP_KERNEL | __GFP_ZERO); if (!page) { r = -ENOMEM; goto vcpu_free; } vcpu->run = page_address(page); kvm_vcpu_init(vcpu, kvm, id); r = kvm_arch_vcpu_create(vcpu); if (r) goto vcpu_free_run_page; Sean Christopherson (45): KVM: PPC: Book3S HV: Uninit vCPU if vcore creation fails KVM: PPC: Book3S PR: Free shared page if mmu initialization fails KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails KVM: VMX: Allocate VPID after initializing VCPU KVM: VMX: Use direct vcpu pointer during vCPU create/free KVM: SVM: Use direct vcpu pointer during vCPU create/free KVM: x86: Allocate vcpu struct in common x86 code KVM: x86: Move FPU allocation to common x86 code KVM: x86: Move allocation of pio_data page down a few lines KVM: x86: Move kvm_vcpu_init() invocation to common code KVM: PPC: e500mc: Add build-time assert that vcpu is at offset 0 KVM: PPC: Allocate vcpu struct in common PPC code KVM: PPC: Book3S PR: Allocate book3s and shadow vcpu after common init KVM: PPC: e500mc: Move reset of oldpir below call to kvm_vcpu_init() KVM: PPC: Move kvm_vcpu_init() invocation to common code KVM: MIPS: Use kvm_vcpu_cache to allocate vCPUs KVM: MIPS: Drop kvm_arch_vcpu_free() KVM: PPC: Drop kvm_arch_vcpu_free() KVM: arm: Drop kvm_arch_vcpu_free() KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path KVM: x86: Remove spurious clearing of async #PF MSR KVM: x86: Drop kvm_arch_vcpu_free() KVM: Remove kvm_arch_vcpu_free() declaration KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues KVM: s390: Move guts of kvm_arch_vcpu_init() into kvm_arch_vcpu_create() KVM: s390: Invoke kvm_vcpu_init() before allocating sie_page KVM: MIPS: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu KVM: x86: Invoke kvm_vcpu_uninit() immediately prior to freeing vcpu KVM: Introduce kvm_vcpu_destroy() KVM: Move vcpu alloc and init invocation to common code KVM: Unexport kvm_vcpu_cache and kvm_{un}init_vcpu() KVM: Move initialization of preempt notifier to kvm_vcpu_init() KVM: x86: Move guts of kvm_arch_vcpu_setup() into kvm_arch_vcpu_create() KVM: MIPS: Move .vcpu_setup() call to kvm_arch_vcpu_create() KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create() KVM: PPC: BookE: Setup vcpu during kvmppc_core_vcpu_create() KVM: Drop kvm_arch_vcpu_setup() KVM: x86: Move all vcpu init code into kvm_arch_vcpu_create() KVM: MIPS: Move all vcpu init code into kvm_arch_vcpu_create() KVM: ARM: Move all vcpu init code into kvm_arch_vcpu_create() KVM: PPC: Move all vcpu init code into kvm_arch_vcpu_create() KVM: arm64: Free sve_state via arm specific hook KVM: Drop kvm_arch_vcpu_init() and kvm_arch_vcpu_uninit() KVM: Move putting of vcpu->pid to kvm_vcpu_destroy() KVM: Move vcpu->run page allocation out of kvm_vcpu_init() arch/arm/include/asm/kvm_host.h | 2 +- arch/arm/kvm/guest.c | 5 - arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/kvm/guest.c | 5 - arch/arm64/kvm/reset.c | 2 +- arch/mips/kvm/mips.c | 84 ++++------- arch/powerpc/include/asm/kvm_ppc.h | 6 +- arch/powerpc/kvm/book3s.c | 9 +- arch/powerpc/kvm/book3s_hv.c | 27 +--- arch/powerpc/kvm/book3s_pr.c | 33 ++--- arch/powerpc/kvm/booke.c | 65 ++++---- arch/powerpc/kvm/e500.c | 34 +---- arch/powerpc/kvm/e500mc.c | 32 ++-- arch/powerpc/kvm/powerpc.c | 70 ++++----- arch/s390/include/asm/kvm_host.h | 1 - arch/s390/kvm/kvm-s390.c | 110 +++++++------- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/svm.c | 52 +------ arch/x86/kvm/vmx/vmx.c | 72 +++------ arch/x86/kvm/x86.c | 230 ++++++++++++++--------------- include/linux/kvm_host.h | 13 +- virt/kvm/arm/arm.c | 76 ++++------ virt/kvm/kvm_main.c | 71 +++++---- 23 files changed, 387 insertions(+), 616 deletions(-)