Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp888714ybn; Wed, 25 Sep 2019 09:09:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzVyj2zoEhxtaLjC73xSbHE3Bq9S7RVq9f4cZRhQqKArFJn8rDrNsyoSI4pNO0hetAECz2i X-Received: by 2002:a50:a666:: with SMTP id d93mr3785962edc.217.1569427793981; Wed, 25 Sep 2019 09:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569427793; cv=none; d=google.com; s=arc-20160816; b=v4peQ9Pxq2Hr/Sy5+TyX/5ukUc998RUfoj0FN9YomQyO6SOPijJyDnUFpAqAxYZKbE 0xvxpSvpE7lLiXGjpkuDX8bZUil1qCRFugMgxLWGYv7tRcyv2fXbP8foEYMlAj/yWGj4 Vx8DL/1t2VJ5qtSwFonFjkWU7bX8ObtIYh+ff8E/+hCMH2Etl6uVwO9+aPFrTh/gvHEJ FtWmXJ1JwcMwKivJbejxqEPYe9cmy7lYOEQ/KsX1gPbQgwhp2JbjuSGXVqMDhqTDMYLI Blp+4ia0GG6HEoOijyPdnwXeJWBoSUtn8M2mYCo5HK1+e4ILynQaYOsVUyIfRkVExLkJ o+7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=G3IW+jWGTVDqPpmNr/OeL5WBYhZLi/HudpX15Ns4H3Q=; b=Nmr6mxGa8BdHSSVB6XnkLZZdGaZxNU/YEennLTr/ve/Jc3lqdo/ZDHomWtypzE7Ki9 SJlr98T/lrrbK34VkKaNeB1USkueO282a0TnM7wlpHyPldFdGxjiDw0ZDOOWXoQvo2eQ HbsRrxwIuOlcnMKaI1UEzuI77/gAORzqlyMlMx5Qo06UNZ7PQ6LcwBr4xVghH/h7Dpdu 7hQ4lYLY5g1CU1F53bwWmNKMGapbnzeGu6GcrUPf+dYm6ngkBDupVWEDB5q4hM5mLKOG sm/pVk4293+9d/1YTFxb7eWukjRZmcEVurmJDP2KnADTmR9ADcGvW5fWKQE3DuSN7C7v x4Lw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x15si3651524eda.53.2019.09.25.09.09.29; Wed, 25 Sep 2019 09:09:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388452AbfIWQNx (ORCPT + 99 others); Mon, 23 Sep 2019 12:13:53 -0400 Received: from mga11.intel.com ([192.55.52.93]:43957 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387827AbfIWQNx (ORCPT ); Mon, 23 Sep 2019 12:13:53 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 09:13:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,541,1559545200"; d="scan'208";a="213374766" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.41]) by fmsmga004.fm.intel.com with ESMTP; 23 Sep 2019 09:13:52 -0700 Date: Mon, 23 Sep 2019 09:13:52 -0700 From: Sean Christopherson To: Paolo Bonzini Cc: Andrea Arcangeli , Vitaly Kuznetsov , "Dr. David Alan Gilbert" , Marcelo Tosatti , Peter Xu , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 02/17] KVM: monolithic: x86: convert the kvm_x86_ops methods to external functions Message-ID: <20190923161352.GC18195@linux.intel.com> References: <20190920212509.2578-1-aarcange@redhat.com> <20190920212509.2578-3-aarcange@redhat.com> <9b188fb8-b930-047f-d1c0-fe27cbe27338@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9b188fb8-b930-047f-d1c0-fe27cbe27338@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 23, 2019 at 12:19:30PM +0200, Paolo Bonzini wrote: > On 20/09/19 23:24, Andrea Arcangeli wrote: > > diff --git a/arch/x86/kvm/svm_ops.c b/arch/x86/kvm/svm_ops.c > > new file mode 100644 > > index 000000000000..2aaabda92179 > > --- /dev/null > > +++ b/arch/x86/kvm/svm_ops.c > > @@ -0,0 +1,672 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * arch/x86/kvm/svm_ops.c > > + * > > + * Copyright 2019 Red Hat, Inc. > > + */ > > + > > +int kvm_x86_ops_cpu_has_kvm_support(void) > > +{ > > + return has_svm(); > > +} > > Can you just rename all the functions in vmx/ and svm.c, instead of > adding forwarders? Yeah, having kvm_x86_ be analogous to kvm_arch_ seems like the obvious approach. The necessary VMX and SVM renaming can be done in separate preparatory patches, and the conversion from kvm_x86_ops to direct calls would be fairly straightforward. Alternatively, what if we use macros in the call sites, e.g. keep/require vmx_ and svm_ prefixes for all functions, renaming VMX and SVM code as needed? E.g.: cpu_has_vmx_support -> vmx_supported_by_cpu cpu_has_svm_support -> svm_supported_by_cpu int vmx_disabled_by_bios(void) int svm_disabled_by_bios(void) #define X86_OP(name) kvm_x86_vendor##_##name int kvm_arch_init(void *opaque) { if (X86_OP(supported_by_cpu())) { printk(KERN_ERR "kvm: no hardware support\n"); r = -EOPNOTSUPP; goto out; } if (X86_OP(disabled_by_bios())) { printk(KERN_ERR "kvm: disabled by bios\n"); r = -EOPNOTSUPP; goto out; } } Pros: - Smaller patches due to less renaming in VMX and SVM - Calls to vendor code are very obvious - Stack traces contain vmx vs. svm instead of kvm_x86 Cons: - Macros - Annoying development environment, e.g. editors tend to struggle with macrofied funtion/variable names.