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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 36678C54FCF for ; Mon, 23 Mar 2020 15:29:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1632C20753 for ; Mon, 23 Mar 2020 15:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727163AbgCWP3M (ORCPT ); Mon, 23 Mar 2020 11:29:12 -0400 Received: from mga09.intel.com ([134.134.136.24]:14129 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727053AbgCWP3M (ORCPT ); Mon, 23 Mar 2020 11:29:12 -0400 IronPort-SDR: QB2Z9ymZQxS1PBRqR3lovvOtD+t0AGFEnR4IYuYJJzlcWp/fAgIJrjX9bu8tklMeHk1FDARKvI gurRqvKpjsmQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2020 08:29:10 -0700 IronPort-SDR: yayqoarf0l9NveDHmC/sqla8uNPjr0N8shaxffNuAwPkByVFjT7hsOSfphorNwP7R2dv9kN0mF tMgMyB8VORFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,296,1580803200"; d="scan'208";a="269910183" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.202]) by fmsmga004.fm.intel.com with ESMTP; 23 Mar 2020 08:29:09 -0700 Date: Mon, 23 Mar 2020 08:29:09 -0700 From: Sean Christopherson To: Vitaly Kuznetsov Cc: Paolo Bonzini , Paul Mackerras , Christian Borntraeger , Janosch Frank , David Hildenbrand , Cornelia Huck , 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: Re: [PATCH v3 2/9] KVM: x86: Move init-only kvm_x86_ops to separate struct Message-ID: <20200323152909.GE28711@linux.intel.com> References: <20200321202603.19355-1-sean.j.christopherson@intel.com> <20200321202603.19355-3-sean.j.christopherson@intel.com> <87lfnr9sqn.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87lfnr9sqn.fsf@vitty.brq.redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Mon, Mar 23, 2020 at 01:10:40PM +0100, Vitaly Kuznetsov wrote: > Sean Christopherson writes: > > > + > > + .runtime_ops = &svm_x86_ops, > > +}; > > Unrelated to your patch but I think we can make the naming of some of > these functions more consistend on SVM/VMX, in particular I'd suggest > > has_svm() -> cpu_has_svm_support() > is_disabled -> svm_disabled_by_bios() > ... > (see below for VMX) > > > + > > static int __init svm_init(void) > > { > > - return kvm_init(&svm_x86_ops, sizeof(struct vcpu_svm), > > + return kvm_init(&svm_init_ops, sizeof(struct vcpu_svm), > > __alignof__(struct vcpu_svm), THIS_MODULE); > > } > > > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > > index 07299a957d4a..ffcdcc86f5b7 100644 > > --- a/arch/x86/kvm/vmx/vmx.c > > +++ b/arch/x86/kvm/vmx/vmx.c > > @@ -7842,11 +7842,8 @@ static bool vmx_check_apicv_inhibit_reasons(ulong bit) > > } > > > > static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { > > - .cpu_has_kvm_support = cpu_has_kvm_support, > > - .disabled_by_bios = vmx_disabled_by_bios, > > - .hardware_setup = hardware_setup, > > .hardware_unsetup = hardware_unsetup, > > - .check_processor_compatibility = vmx_check_processor_compat, > > + > > .hardware_enable = hardware_enable, > > .hardware_disable = hardware_disable, > > .cpu_has_accelerated_tpr = report_flexpriority, > > @@ -7981,6 +7978,15 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { > > .apic_init_signal_blocked = vmx_apic_init_signal_blocked, > > }; > > > > +static struct kvm_x86_init_ops vmx_init_ops __initdata = { > > + .cpu_has_kvm_support = cpu_has_kvm_support, > > + .disabled_by_bios = vmx_disabled_by_bios, > > + .check_processor_compatibility = vmx_check_processor_compat, > > + .hardware_setup = hardware_setup, > > cpu_has_kvm_support() -> cpu_has_vmx_support() > hardware_setup() -> vmx_hardware_setup() Preaching to the choir on this one. The VMX functions without prefixes in in particular annoy me to no end, e.g. hardware_setup(). Though the worst is probably ".vcpu_create = vmx_create_vcpu", if I had a nickel for every time I've tried to find vmx_vcpu_create()... What if we added a macro to auto-generate the common/required hooks? E.g.: static struct kvm_x86_ops vmx_x86_ops __ro_after_init = { MANDATORY_KVM_X86_OPS(vmx), .pmu_ops = &intel_pmu_ops, ... }; That'd enforce consistent naming, and would provide a bit of documentation as to which hooks are optional, e.g. many of the nested hooks, and which must be defined for KVM to function.