From nobody Wed Nov 5 10:04:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533910117552617.4245296603143; Fri, 10 Aug 2018 07:08:37 -0700 (PDT) Received: from localhost ([::1]:56442 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo85k-0004Du-83 for importer@patchew.org; Fri, 10 Aug 2018 10:08:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fo84G-0003L3-8R for qemu-devel@nongnu.org; Fri, 10 Aug 2018 10:07:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fo84D-0002i2-3C for qemu-devel@nongnu.org; Fri, 10 Aug 2018 10:07:04 -0400 Received: from mga12.intel.com ([192.55.52.136]:34474) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fo84C-0002Qr-PB for qemu-devel@nongnu.org; Fri, 10 Aug 2018 10:07:01 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2018 07:06:38 -0700 Received: from sqa-gate.sh.intel.com (HELO robert-ivt.tsp.org) ([10.239.48.212]) by FMSMGA003.fm.intel.com with ESMTP; 10 Aug 2018 07:06:36 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,219,1531810800"; d="scan'208";a="71780468" From: Robert Hoo To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com, thomas.lendacky@amd.com Date: Fri, 10 Aug 2018 22:06:28 +0800 Message-Id: <1533909989-56115-3-git-send-email-robert.hu@linux.intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533909989-56115-1-git-send-email-robert.hu@linux.intel.com> References: <1533909989-56115-1-git-send-email-robert.hu@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: [Qemu-devel] [PATCH v3 2/3] kvm: Add support to KVM_GET_MSR_FEATURE_INDEX_LIST and KVM_GET_MSRS system ioctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: robert.hu@intel.com, Robert Hoo , qemu-devel@nongnu.org, jingqi.liu@intel.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add kvm_get_supported_feature_msrs() to get supported MSR feature index lis= t. Add kvm_arch_get_supported_msr_feature() to get each MSR features value. kvm_get_supported_feature_msrs() is called in kvm_arch_init(). kvm_arch_get_supported_msr_feature() is called by x86_cpu_get_supported_feature_word(). Signed-off-by: Robert Hoo --- include/sysemu/kvm.h | 2 ++ target/i386/kvm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 81 insertions(+) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 0b64b8e..97d8d9d 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -463,6 +463,8 @@ int kvm_vm_check_extension(KVMState *s, unsigned int ex= tension); =20 uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, uint32_t index, int reg); +uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index); + =20 void kvm_set_sigmask_len(KVMState *s, unsigned int sigmask_len); =20 diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9313602..70d8606 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -107,6 +107,7 @@ static int has_pit_state2; static bool has_msr_mcg_ext_ctl; =20 static struct kvm_cpuid2 *cpuid_cache; +static struct kvm_msr_list *kvm_feature_msrs; =20 int kvm_has_pit_state2(void) { @@ -420,6 +421,41 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, return ret; } =20 +uint32_t kvm_arch_get_supported_msr_feature(KVMState *s, uint32_t index) +{ + struct { + struct kvm_msrs info; + struct kvm_msr_entry entries[1]; + } msr_data; + uint32_t ret; + + /*Check if the requested feature MSR is supported*/ + int i; + for (i =3D 0; i < kvm_feature_msrs->nmsrs; i++) { + if (index =3D=3D kvm_feature_msrs->indices[i]) { + break; + } + } + if (i >=3D kvm_feature_msrs->nmsrs) { + fprintf(stderr, "Requested MSR (index=3D %d) is not supported.\n",= index); + return 0; + } + + msr_data.info.nmsrs =3D 1; + msr_data.entries[0].index =3D index; + + ret =3D kvm_ioctl(s, KVM_GET_MSRS, &msr_data); + + if (ret !=3D 1) { + fprintf(stderr, "KVM get MSR (index=3D0x%x) feature failed, %s\n", + index, strerror(-ret)); + exit(1); + } + + return msr_data.entries[0].data; +} + + typedef struct HWPoisonPage { ram_addr_t ram_addr; QLIST_ENTRY(HWPoisonPage) list; @@ -1238,7 +1274,45 @@ void kvm_arch_do_init_vcpu(X86CPU *cpu) env->mp_state =3D KVM_MP_STATE_INIT_RECEIVED; } } +static int kvm_get_supported_feature_msrs(KVMState *s) +{ + static int kvm_supported_feature_msrs; + int ret =3D 0; + + if (kvm_supported_feature_msrs =3D=3D 0) { + struct kvm_msr_list msr_list; + + kvm_supported_feature_msrs++; + + msr_list.nmsrs =3D 0; + ret =3D kvm_ioctl(s, KVM_GET_MSR_FEATURE_INDEX_LIST, &msr_list); + if (ret < 0 && ret !=3D -E2BIG) { + return ret; + } + + assert(msr_list.nmsrs > 0); + kvm_feature_msrs =3D (struct kvm_msr_list *) \ + g_malloc0(sizeof(msr_list) + + msr_list.nmsrs * sizeof(msr_list.indices[0])); + if (kvm_feature_msrs =3D=3D NULL) { + fprintf(stderr, "Failed to allocate space for KVM Feature MSRs" + "which has %d MSRs\n", msr_list.nmsrs); + return -1; + } + + kvm_feature_msrs->nmsrs =3D msr_list.nmsrs; + ret =3D kvm_ioctl(s, KVM_GET_MSR_FEATURE_INDEX_LIST, kvm_feature_m= srs); =20 + if (ret < 0) { /*ioctl failure*/ + fprintf(stderr, "Fetch KVM feature MSRs failed: %s\n", + strerror(-ret)); + g_free(kvm_feature_msrs); + return ret; + } + } + + return 0; +} static int kvm_get_supported_msrs(KVMState *s) { static int kvm_supported_msrs; @@ -1400,6 +1474,11 @@ int kvm_arch_init(MachineState *ms, KVMState *s) return ret; } =20 + ret =3D kvm_get_supported_feature_msrs(s); + if (ret < 0) { + return ret; + } + uname(&utsname); lm_capable_kernel =3D strcmp(utsname.machine, "x86_64") =3D=3D 0; =20 --=20 1.8.3.1