Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3539280ybt; Tue, 23 Jun 2020 05:00:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGHBnZAG3FS90NEyxME0nXLzla28huAxdbiaU0MuCdVMemzfcZ1rMaB8HXJBi1iBuhpvB0 X-Received: by 2002:a05:6402:549:: with SMTP id i9mr21479500edx.159.1592913629935; Tue, 23 Jun 2020 05:00:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592913629; cv=none; d=google.com; s=arc-20160816; b=TFfYOY2kZGoXglk0RJaV2E4XREksGn/10uYvqzbdSyswRJ5cWpl/y8pARizqxAxVll 1FW8rdFa3ttsbF2Zw1Oy4deM+3ojfl1mMnqdPrfSD34mXSIPr4Sb48E/BYCsHFawsN6k 0PWA+ByN/ycZL63mxhUfEEGoH6Dy9i1r9isUc40rATpIA7QpPy1aTyoEcHOwA/BmQjf7 XRp3JuxtecyE+R3lgK4NnyfYvvFcm2P58B2x2BYvdHYsFtmZtwTqX6jxLCFoGwh2Jklc 2qb9KsxDsxkjfYD8111ksX++bl4fGsjRcIPNFZnuzD/C+rWYgLCnooFxxgWcEQgzh6tM /nPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=pjdiI2woeKCyv3N+lcQjTr5BRJ7h8vFjoA6N1l4i010=; b=cppiLzsOedIf+DBvnuLELf7XsA9cqWmvOpdIqKdRR5NNTZw0rbf5eMBrz03w1UVhIq R1DXHxOoEoYbNHYxyL5YodQXNZvE2p0M53TK4BZUMLdCYD3HxaeM5I9JoTOUMldlwszT 0XTXEyC3pqjZcGHpzigpAIEiK+5H+kUn4i5BJVbPeCC6XWEnIE7MGf1lx5oRbkkWGjM4 APPSBIcYpqw4oFznDYwvfPWcwt9V6LkCDn6Rc89JpWbBD7JEesAqmgoPmo0MDs/uU3Pw Orgxp/5xUBUtRTrQlhIsWXB5ZSt7ziDoJqVSgrZmtN2hUbAMiyYcXVDmvIQc09IWAtcz j9sQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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. [23.128.96.18]) by mx.google.com with ESMTP id 88si2472546edr.154.2020.06.23.05.00.07; Tue, 23 Jun 2020 05:00:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S1732510AbgFWL6W (ORCPT + 99 others); Tue, 23 Jun 2020 07:58:22 -0400 Received: from mga05.intel.com ([192.55.52.43]:58474 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732333AbgFWL6V (ORCPT ); Tue, 23 Jun 2020 07:58:21 -0400 IronPort-SDR: PIlYuRk389QU4nB7axuXkyLlby9Pd0ObtWGRJI44Jj/0rfeDlUtsdyp7AJQzRPdmQEUntBkNJr zZ8TtICRBkpA== X-IronPort-AV: E=McAfee;i="6000,8403,9660"; a="228710021" X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="228710021" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2020 04:58:21 -0700 IronPort-SDR: Bl9ke7FbJRHMn+rrIwBEbdYADJmeC7EVQg6ou+uNdm0TXzolbkxhl/Lye+UQPBNsnTp1zbfhTY 6cX/OJSFmWog== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,271,1589266800"; d="scan'208";a="285745012" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by orsmga007.jf.intel.com with ESMTP; 23 Jun 2020 04:58:18 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov Cc: Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [PATCH v2 0/7] Refactor handling flow of SET_CPUID* Date: Tue, 23 Jun 2020 19:58:09 +0800 Message-Id: <20200623115816.24132-1-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This serial is the extended version of https://lkml.kernel.org/r/20200528151927.14346-1-xiaoyao.li@intel.com First two patches are bug fixing, and the others aim to refactor the flow of SET_CPUID* as: 1. cpuid check: check if userspace provides legal CPUID settings; 2. cpuid update: Update some special CPUID bits based on current vcpu state, e.g., OSXSAVE, OSPKE, ... 3. update vcpu model: Update vcpu model (settings) based on the final CPUID settings. v2: - rebase to kvm/queue: a037ff353ba6 ("Merge branch 'kvm-master' into HEAD") - change the name of kvm_update_state_based_on_cpuid() to kvm_update_vcpu_model() [Sean] - Add patch 5 to rename kvm_x86_ops.cpuid_date() to kvm_x86_ops.update_vcpu_model() v1: https://lkml.kernel.org/r/20200529085545.29242-1-xiaoyao.li@intel.com Xiaoyao Li (7): KVM: X86: Reset vcpu->arch.cpuid_nent to 0 if SET_CPUID fails KVM: X86: Go on updating other CPUID leaves when leaf 1 is absent KVM: X86: Introduce kvm_check_cpuid() KVM: X86: Split kvm_update_cpuid() KVM: X86: Rename cpuid_update() to update_vcpu_model() KVM: X86: Move kvm_x86_ops.update_vcpu_model() into kvm_update_vcpu_model() KVM: X86: Move kvm_apic_set_version() to kvm_update_vcpu_model() arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/cpuid.c | 108 ++++++++++++++++++++------------ arch/x86/kvm/cpuid.h | 3 +- arch/x86/kvm/svm/svm.c | 4 +- arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/vmx/vmx.c | 4 +- arch/x86/kvm/x86.c | 1 + 7 files changed, 77 insertions(+), 47 deletions(-) -- 2.18.2