From patchwork Sat Mar 21 20:25:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 11451345 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 8456913B1 for ; Sat, 21 Mar 2020 20:26:19 +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 60E6F2076E for ; Sat, 21 Mar 2020 20:26:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AuDnViMa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60E6F2076E 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=Km0iARIFJ2WCL2iI8TqLH8K3iAUiriJrFOFYMOcBdVU=; b=AuDnViMa/4YBtc bxWfqoTdRiGMSLbqHoR8lFT3XN8CiwydO15zndSzXS229q95kduO1c3XV9EfVf6eLHPMbLH3fdzW9 5uOPArJfhBTFF7mIsXfMpqQXJZagHn05mH1erjDZAKRmCs9ReSYSPC8PDOP7C9LJ4zNNEhcDEyB7H qUXcocbvVub62o1HR0loDI1XeOY2wJ264oSeKDOkONIYHDXOg1v4QfRBvONSeEArq+gzGqQNQ7qVO D4EugH2wlY0PgMh+4knFZev9I8vpHEoRSRGyoiEO1ph7dLc2Td7i3/0ZOdnD2KijHIRKo/gDkc6eU 5rfGZiDFWktWq4daLYuQ==; 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 1jFkhB-0000PN-FS; Sat, 21 Mar 2020 20:26:13 +0000 Received: from mga18.intel.com ([134.134.136.126]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jFkh8-0000NI-C4 for linux-arm-kernel@lists.infradead.org; Sat, 21 Mar 2020 20:26:11 +0000 IronPort-SDR: wXqwIkm3wQs3RXHHiEdAhKrSqeaU5D49gdujwKYkx8qvCxMRx2u9oMoKcod0neJ9dt1APWJSDj H3A6dhM/xdUg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2020 13:26:05 -0700 IronPort-SDR: wc7DG86xh4vPeKd3LZfA/TbWv8x9O/HuKQW/jGF3O4aUFN/qKwYCQ8SRM7iJWo2KoQnsDSJboM NHtSa3M5ZLog== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,289,1580803200"; d="scan'208";a="280773532" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.202]) by fmsmga002.fm.intel.com with ESMTP; 21 Mar 2020 13:26:04 -0700 From: Sean Christopherson To: Paolo Bonzini Subject: [PATCH v3 0/9] KVM: Move x86 init ops to separate struct Date: Sat, 21 Mar 2020 13:25:54 -0700 Message-Id: <20200321202603.19355-1-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200321_132610_451600_F5723859 X-CRM114-Status: GOOD ( 14.32 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [134.134.136.126 listed in list.dnswl.org] 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: linux-arm-kernel@lists.infradead.org, Wanpeng Li , Janosch Frank , kvm@vger.kernel.org, David Hildenbrand , Marc Zyngier , Joerg Roedel , Cornelia Huck , linux-mips@vger.kernel.org, Sean Christopherson , linux-kernel@vger.kernel.org, Paul Mackerras , Christian Borntraeger , James Morse , kvm-ppc@vger.kernel.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 The non-x86 part of this series is wholly contained in patch 01. Compared to other recent kvm-wide changes, this one is very straightforward (famous last words). Like a few other architectures, e.g. PPC, x86 uses a set of global hooks to call back into vendor code on demand. A handlful of the x86 hooks are used only within the scope of kvm_init(). This series moves the init-only hooks to a separate struct, partly to clean up the code a bit, but mainly so that the runtime hooks can be made available only after the x86 vendor has completed its ->hardware_setup(). While working on a different series I spent a fair bit of time scratching my as to why a kvm_x86_ops wasn't working, and eventually realized VMX's callback wasn't "ready" because the vmcs_config hadn't yet been populated. Due to lack of a cross-compiling setup, the non-x86 changes in patch 01 are untested. v3: - Rebase to kvm/queue, d55c9d4009c7 ("KVM: nSVM: check for EFER ... "). Conflicts galore, but all mechanical in nature. - Drop an SVM patch that was obsoleted by kvm/queue. - Collect an ack. [Marc] v2: - Rebase to kvm/queue, 2c2787938512 ("KVM: selftests: Stop ...") - Collect tags. [Cornelia] - Add a patch to make kvm_x86_ops its own instance and copy {vmx,svm}_x86_ops by value, which saves a memory access on every invocation of a kvm_x86_ops hook. [Paolo] - Add patches to tag {vmx,svm}_x86_ops as __initdata after they're copied by value. Sean Christopherson (9): KVM: Pass kvm_init()'s opaque param to additional arch funcs KVM: x86: Move init-only kvm_x86_ops to separate struct KVM: VMX: Move hardware_setup() definition below vmx_x86_ops KVM: VMX: Configure runtime hooks using vmx_x86_ops KVM: x86: Set kvm_x86_ops only after ->hardware_setup() completes KVM: x86: Copy kvm_x86_ops by value to eliminate layer of indirection KVM: x86: Drop __exit from kvm_x86_ops' hardware_unsetup() KVM: VMX: Annotate vmx_x86_ops as __initdata KVM: SVM: Annotate svm_x86_ops as __initdata arch/mips/kvm/mips.c | 4 +- arch/powerpc/kvm/powerpc.c | 4 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/x86/include/asm/kvm_host.h | 33 +-- arch/x86/kvm/cpuid.c | 4 +- arch/x86/kvm/hyperv.c | 8 +- arch/x86/kvm/kvm_cache_regs.h | 10 +- arch/x86/kvm/lapic.c | 30 +-- arch/x86/kvm/mmu.h | 8 +- arch/x86/kvm/mmu/mmu.c | 32 +-- arch/x86/kvm/pmu.c | 30 +-- arch/x86/kvm/pmu.h | 2 +- arch/x86/kvm/svm.c | 19 +- arch/x86/kvm/trace.h | 4 +- arch/x86/kvm/vmx/nested.c | 17 +- arch/x86/kvm/vmx/nested.h | 3 +- arch/x86/kvm/vmx/vmx.c | 371 ++++++++++++++++---------------- arch/x86/kvm/x86.c | 370 +++++++++++++++---------------- arch/x86/kvm/x86.h | 4 +- include/linux/kvm_host.h | 4 +- virt/kvm/arm/arm.c | 4 +- virt/kvm/kvm_main.c | 18 +- 22 files changed, 507 insertions(+), 476 deletions(-)