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=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=no 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 23B45C3F68F for ; Thu, 30 Jan 2020 00:10:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0338B206F0 for ; Thu, 30 Jan 2020 00:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727108AbgA3AK0 (ORCPT ); Wed, 29 Jan 2020 19:10:26 -0500 Received: from mga06.intel.com ([134.134.136.31]:48383 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726671AbgA3AK0 (ORCPT ); Wed, 29 Jan 2020 19:10:26 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2020 16:10:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,379,1574150400"; d="scan'208";a="261990342" Received: from sjchrist-coffee.jf.intel.com ([10.54.74.202]) by fmsmga002.fm.intel.com with ESMTP; 29 Jan 2020 16:10:24 -0800 From: Sean Christopherson To: Paolo Bonzini Cc: Paul Mackerras , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Marc Zyngier , James Morse , Julien Thierry , Suzuki K Poulose , linux-mips@vger.kernel.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org Subject: [PATCH 0/5] KVM: Move x86 init ops to separate struct Date: Wed, 29 Jan 2020 16:10:18 -0800 Message-Id: <20200130001023.24339-1-sean.j.christopherson@intel.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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. The SVM changes in patch 02 are fairly well tested, e.g. fudged things enough to ensure KVM didn't explode on a null pointer. Patch 05 is a bit scary as a rogue dereference of kvm_x86_ops before ->hardware_setup() will crash KVM (maybe the kernel?). I didn't find any obvious ways to use kvm_x86_ops on AMD, and tested on a few different Intel CPUs, so I'm reasonably confident that there are no existing violations. Sean Christopherson (5): 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 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 | 13 +- arch/x86/kvm/svm.c | 15 +- arch/x86/kvm/vmx/nested.c | 15 +- arch/x86/kvm/vmx/nested.h | 3 +- arch/x86/kvm/vmx/vmx.c | 345 ++++++++++++++++---------------- arch/x86/kvm/x86.c | 16 +- include/linux/kvm_host.h | 4 +- virt/kvm/arm/arm.c | 4 +- virt/kvm/kvm_main.c | 18 +- 12 files changed, 238 insertions(+), 207 deletions(-) -- 2.24.1