All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yang, Sheng" <sheng.yang@intel.com>
To: kvm@vger.kernel.org
Subject: [PATCH 3/4] KVM: VMX: Add capability report of Intel hardware
Date: Thu, 19 Jun 2008 18:44:09 +0800	[thread overview]
Message-ID: <200806191844.09550.sheng.yang@intel.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 2404 bytes --]

From 5b4842db131758b2edf8cdaf28f5f3d3557ed766 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@intel.com>
Date: Thu, 19 Jun 2008 18:41:43 +0800
Subject: [PATCH] KVM: VMX: Add capability report of Intel hardware


Signed-off-by: Sheng Yang <sheng.yang@intel.com>
---
 arch/x86/kvm/vmx.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0fbbf6d..8b207b3 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -119,6 +119,9 @@ struct vmx_capability {
 	u32 vpid;
 } vmx_capability;

+#define VMX_FEATURE_MAX_LEN	256
+static char vmx_feature_string[VMX_FEATURE_MAX_LEN] = "VMX: ";
+
 #define VMX_SEGMENT_FIELD(seg)					\
 	[VCPU_SREG_##seg] = {                                   \
 		.selector = GUEST_##seg##_SELECTOR,		\
@@ -1237,6 +1240,22 @@ static __init int alloc_kvm_area(void)
 	return 0;
 }

+static __init void build_feature_report(void)
+{
+	if (cpu_has_vmx_msr_bitmap())
+		strlcat(vmx_feature_string,
+			"msr_bitmap ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_virtual_nmis())
+		strlcat(vmx_feature_string, "vnmi ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_tpr_shadow())
+		strlcat(vmx_feature_string,
+			"flexpriority ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_ept())
+		strlcat(vmx_feature_string, "ept ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_vpid())
+		strlcat(vmx_feature_string, "vpid ", VMX_FEATURE_MAX_LEN);
+}
+
 static __init int hardware_setup(void)
 {
 	if (setup_vmcs_config(&vmcs_config) < 0)
@@ -1245,6 +1264,8 @@ static __init int hardware_setup(void)
 	if (boot_cpu_has(X86_FEATURE_NX))
 		kvm_enable_efer_bits(EFER_NX);

+	build_feature_report();
+
 	return alloc_kvm_area();
 }

@@ -3235,6 +3256,11 @@ static struct kvm_x86_ops vmx_x86_ops = {
 	.get_tdp_level = get_ept_level,
 };

+static int vmx_feature_show(char *page)
+{
+	return sprintf(page, "%s\n", vmx_feature_string);
+}
+
 static int __init vmx_init(void)
 {
 	void *va;
@@ -3293,6 +3319,8 @@ static int __init vmx_init(void)

 	ept_sync_global();

+	kvm_register_hw_feature_report(vmx_feature_show);
+
 	return 0;

 out2:
@@ -3310,6 +3338,8 @@ static void __exit vmx_exit(void)
 	__free_page(vmx_io_bitmap_b);
 	__free_page(vmx_io_bitmap_a);

+	kvm_unregister_hw_feature_report();
+
 	kvm_exit();
 }

--
1.5.5


[-- Attachment #2: 0003-KVM-VMX-Add-capability-report-of-Intel-hardware.patch --]
[-- Type: text/x-diff, Size: 2415 bytes --]

From 5b4842db131758b2edf8cdaf28f5f3d3557ed766 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@intel.com>
Date: Thu, 19 Jun 2008 18:41:43 +0800
Subject: [PATCH] KVM: VMX: Add capability report of Intel hardware


Signed-off-by: Sheng Yang <sheng.yang@intel.com>
---
 arch/x86/kvm/vmx.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 0fbbf6d..8b207b3 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -119,6 +119,9 @@ struct vmx_capability {
 	u32 vpid;
 } vmx_capability;
 
+#define VMX_FEATURE_MAX_LEN	256
+static char vmx_feature_string[VMX_FEATURE_MAX_LEN] = "VMX: ";
+
 #define VMX_SEGMENT_FIELD(seg)					\
 	[VCPU_SREG_##seg] = {                                   \
 		.selector = GUEST_##seg##_SELECTOR,		\
@@ -1237,6 +1240,22 @@ static __init int alloc_kvm_area(void)
 	return 0;
 }
 
+static __init void build_feature_report(void)
+{
+	if (cpu_has_vmx_msr_bitmap())
+		strlcat(vmx_feature_string,
+			"msr_bitmap ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_virtual_nmis())
+		strlcat(vmx_feature_string, "vnmi ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_tpr_shadow())
+		strlcat(vmx_feature_string,
+			"flexpriority ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_ept())
+		strlcat(vmx_feature_string, "ept ", VMX_FEATURE_MAX_LEN);
+	if (cpu_has_vmx_vpid())
+		strlcat(vmx_feature_string, "vpid ", VMX_FEATURE_MAX_LEN);
+}
+
 static __init int hardware_setup(void)
 {
 	if (setup_vmcs_config(&vmcs_config) < 0)
@@ -1245,6 +1264,8 @@ static __init int hardware_setup(void)
 	if (boot_cpu_has(X86_FEATURE_NX))
 		kvm_enable_efer_bits(EFER_NX);
 
+	build_feature_report();
+
 	return alloc_kvm_area();
 }
 
@@ -3235,6 +3256,11 @@ static struct kvm_x86_ops vmx_x86_ops = {
 	.get_tdp_level = get_ept_level,
 };
 
+static int vmx_feature_show(char *page)
+{
+	return sprintf(page, "%s\n", vmx_feature_string);
+}
+
 static int __init vmx_init(void)
 {
 	void *va;
@@ -3293,6 +3319,8 @@ static int __init vmx_init(void)
 
 	ept_sync_global();
 
+	kvm_register_hw_feature_report(vmx_feature_show);
+
 	return 0;
 
 out2:
@@ -3310,6 +3338,8 @@ static void __exit vmx_exit(void)
 	__free_page(vmx_io_bitmap_b);
 	__free_page(vmx_io_bitmap_a);
 
+	kvm_unregister_hw_feature_report();
+
 	kvm_exit();
 }
 
-- 
1.5.5


             reply	other threads:[~2008-06-19 10:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-19 10:44 Yang, Sheng [this message]
2008-06-20  3:26 ` [PATCH 3/4] KVM: VMX: Add capability report of Intel hardware Yang, Sheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=200806191844.09550.sheng.yang@intel.com \
    --to=sheng.yang@intel.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.