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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 6F98AC433FF for ; Tue, 13 Aug 2019 06:10:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CFE520679 for ; Tue, 13 Aug 2019 06:10:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727343AbfHMGKQ (ORCPT ); Tue, 13 Aug 2019 02:10:16 -0400 Received: from mga06.intel.com ([134.134.136.31]:20205 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727407AbfHMGKP (ORCPT ); Tue, 13 Aug 2019 02:10:15 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Aug 2019 23:09:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,380,1559545200"; d="scan'208";a="178576821" Received: from unknown (HELO localhost) ([10.239.159.128]) by orsmga003.jf.intel.com with ESMTP; 12 Aug 2019 23:09:38 -0700 Date: Tue, 13 Aug 2019 14:11:22 +0800 From: Yang Weijiang To: Sean Christopherson Cc: Yang Weijiang , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, mst@redhat.com, rkrcmar@redhat.com, jmattson@google.com Subject: Re: [PATCH v6 2/8] KVM: x86: Add a helper function for CPUID(0xD,n>=1) enumeration Message-ID: <20190813061121.GF2432@local-michael-cet-test> References: <20190725031246.8296-1-weijiang.yang@intel.com> <20190725031246.8296-3-weijiang.yang@intel.com> <20190812221811.GB4996@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190812221811.GB4996@linux.intel.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Mon, Aug 12, 2019 at 03:18:11PM -0700, Sean Christopherson wrote: > On Thu, Jul 25, 2019 at 11:12:40AM +0800, Yang Weijiang wrote: > > To make the code look clean, wrap CPUID(0xD,n>=1) enumeration > > code in a helper function now. > > > > Signed-off-by: Yang Weijiang > > --- > > arch/x86/kvm/cpuid.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 44 insertions(+) > > > > diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c > > index 4992e7c99588..29cbde7538a3 100644 > > --- a/arch/x86/kvm/cpuid.c > > +++ b/arch/x86/kvm/cpuid.c > > @@ -313,6 +313,50 @@ static int __do_cpuid_ent_emulated(struct kvm_cpuid_entry2 *entry, > > return 0; > > } > > > > +static inline int __do_cpuid_dx_leaf(struct kvm_cpuid_entry2 *entry, int *nent, > > 'dx' makes me think of the generic reference to RDX vs EDX. Maybe > __do_cpuid_0xd_leaf()? > OK, will change it. > > + int maxnent, u64 xss_mask, u64 xcr0_mask, > > + u32 eax_mask) > > +{ > > + int idx, i; > > + u64 mask; > > + u64 supported; > > + > > + for (idx = 1, i = 1; idx < 64; ++idx) { > > Rather than loop here, I think it makes sense to loop in the caller to > make the code consistent with do_cpuid_7_mask() added by commit > > 54d360d41211 ("KVM: cpuid: extract do_cpuid_7_mask and support multiple subleafs") > OK, will follow the patch to modify the helper. > > + mask = ((u64)1 << idx); > > + if (*nent >= maxnent) > > + return -EINVAL; > > + > > + do_cpuid_1_ent(&entry[i], 0xD, idx); > > + if (idx == 1) { > > + entry[i].eax &= eax_mask; > > + cpuid_mask(&entry[i].eax, CPUID_D_1_EAX); > > + supported = xcr0_mask | xss_mask; > > + entry[i].ebx = 0; > > + entry[i].edx = 0; > > + entry[i].ecx &= xss_mask; > > + if (entry[i].eax & (F(XSAVES) | F(XSAVEC))) { > > + entry[i].ebx = > > + xstate_required_size(supported, > > + true); > > + } > > + } else { > > + supported = (entry[i].ecx & 1) ? xss_mask : > > + xcr0_mask; > > + if (entry[i].eax == 0 || !(supported & mask)) > > + continue; > > + entry[i].ecx &= 1; > > + entry[i].edx = 0; > > + if (entry[i].ecx) > > + entry[i].ebx = 0; > > + } > > + entry[i].flags |= > > + KVM_CPUID_FLAG_SIGNIFCANT_INDEX; > > + ++*nent; > > + ++i; > > + } > > + return 0; > > +} > > + > > Extracting code into a helper should be done in the same patch that the > existing code is replaced with a call to the helper, i.e. the chunk of the > next patch that invokes the helper should be squashed with this patch. > OK, will squash this patch in next release. > > static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, > > u32 index, int *nent, int maxnent) > > { > > -- > > 2.17.2 > >