From: Nuno Das Neves <nunodasneves@linux.microsoft.com>
To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
x86@kernel.org, linux-arm-kernel@lists.infradead.org,
linux-arch@vger.kernel.org
Cc: patches@lists.linux.dev, mikelley@microsoft.com,
kys@microsoft.com, wei.liu@kernel.org, haiyangz@microsoft.com,
decui@microsoft.com, apais@linux.microsoft.com,
Tianyu.Lan@microsoft.com, ssengar@linux.microsoft.com,
mukeshrathor@microsoft.com, stanislav.kinsburskiy@gmail.com,
jinankjain@linux.microsoft.com, vkuznets@redhat.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com, will@kernel.org,
catalin.marinas@arm.com
Subject: [PATCH v2 02/15] mshyperv: Introduce hv_get_hypervisor_version function
Date: Thu, 17 Aug 2023 15:01:38 -0700 [thread overview]
Message-ID: <1692309711-5573-3-git-send-email-nunodasneves@linux.microsoft.com> (raw)
In-Reply-To: <1692309711-5573-1-git-send-email-nunodasneves@linux.microsoft.com>
x86_64 and arm64 implementations to get the hypervisor version
information. Store these in hv_hypervisor_version_info structure to
simplify parsing the fields.
Replace the existing parsing when printing the version numbers at boot.
Signed-off-by: Nuno Das Neves <nunodasneves@linux.microsoft.com>
---
arch/arm64/hyperv/mshyperv.c | 23 +++++++++++-------
arch/x86/kernel/cpu/mshyperv.c | 40 ++++++++++++++++++++-----------
include/asm-generic/hyperv-tlfs.h | 23 ++++++++++++++++++
include/asm-generic/mshyperv.h | 2 ++
4 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/arch/arm64/hyperv/mshyperv.c b/arch/arm64/hyperv/mshyperv.c
index f1b8a04ee9f2..53bdd3bc81ac 100644
--- a/arch/arm64/hyperv/mshyperv.c
+++ b/arch/arm64/hyperv/mshyperv.c
@@ -19,10 +19,19 @@
static bool hyperv_initialized;
+int hv_get_hypervisor_version(union hv_hypervisor_version_info *info)
+{
+ hv_get_vpreg_128(HV_REGISTER_HYPERVISOR_VERSION,
+ (struct hv_get_vp_registers_output *)info);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(hv_get_hypervisor_version);
+
static int __init hyperv_init(void)
{
- struct hv_get_vp_registers_output result;
- u32 a, b, c, d;
+ struct hv_get_vp_registers_output result;
+ union hv_hypervisor_version_info version;
u64 guest_id;
int ret;
@@ -55,13 +64,11 @@ static int __init hyperv_init(void)
ms_hyperv.misc_features);
/* Get information about the Hyper-V host version */
- hv_get_vpreg_128(HV_REGISTER_HYPERVISOR_VERSION, &result);
- a = result.as32.a;
- b = result.as32.b;
- c = result.as32.c;
- d = result.as32.d;
+ hv_get_hypervisor_version(&version);
pr_info("Hyper-V: Host Build %d.%d.%d.%d-%d-%d\n",
- b >> 16, b & 0xFFFF, a, d & 0xFFFFFF, c, d >> 24);
+ version.major_version, version.minor_version,
+ version.build_number, version.service_number,
+ version.service_pack, version.service_branch);
ret = hv_common_init();
if (ret)
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 4d38cafe6f2c..e80e503c8cf5 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -313,13 +313,30 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus)
}
#endif
+int hv_get_hypervisor_version(union hv_hypervisor_version_info *info)
+{
+ unsigned int hv_max_functions;
+
+ hv_max_functions = cpuid_eax(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS);
+ if (hv_max_functions < HYPERV_CPUID_VERSION) {
+ pr_err("%s: Could not detect Hyper-V version\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ info->eax = cpuid_eax(HYPERV_CPUID_VERSION);
+ info->ebx = cpuid_ebx(HYPERV_CPUID_VERSION);
+ info->ecx = cpuid_ecx(HYPERV_CPUID_VERSION);
+ info->edx = cpuid_edx(HYPERV_CPUID_VERSION);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(hv_get_hypervisor_version);
+
static void __init ms_hyperv_init_platform(void)
{
int hv_max_functions_eax;
- int hv_host_info_eax;
- int hv_host_info_ebx;
- int hv_host_info_ecx;
- int hv_host_info_edx;
+ union hv_hypervisor_version_info version;
#ifdef CONFIG_PARAVIRT
pv_info.name = "Hyper-V";
@@ -373,16 +390,11 @@ static void __init ms_hyperv_init_platform(void)
/*
* Extract host information.
*/
- if (hv_max_functions_eax >= HYPERV_CPUID_VERSION) {
- hv_host_info_eax = cpuid_eax(HYPERV_CPUID_VERSION);
- hv_host_info_ebx = cpuid_ebx(HYPERV_CPUID_VERSION);
- hv_host_info_ecx = cpuid_ecx(HYPERV_CPUID_VERSION);
- hv_host_info_edx = cpuid_edx(HYPERV_CPUID_VERSION);
-
- pr_info("Hyper-V: Host Build %d.%d.%d.%d-%d-%d\n",
- hv_host_info_ebx >> 16, hv_host_info_ebx & 0xFFFF,
- hv_host_info_eax, hv_host_info_edx & 0xFFFFFF,
- hv_host_info_ecx, hv_host_info_edx >> 24);
+ if (hv_get_hypervisor_version(&version) == 0) {
+ pr_info("Hyper-V Host Build:%d-%d.%d-%d-%d.%d\n",
+ version.build_number, version.major_version,
+ version.minor_version, version.service_pack,
+ version.service_branch, version.service_number);
}
if (ms_hyperv.features & HV_ACCESS_FREQUENCY_MSRS &&
diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h
index f4e4cc4f965f..373f26efa18a 100644
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
@@ -786,6 +786,29 @@ struct hv_input_unmap_device_interrupt {
#define HV_SOURCE_SHADOW_NONE 0x0
#define HV_SOURCE_SHADOW_BRIDGE_BUS_RANGE 0x1
+/*
+ * Version info reported by hypervisor
+ */
+union hv_hypervisor_version_info {
+ struct {
+ u32 build_number;
+
+ u32 minor_version : 16;
+ u32 major_version : 16;
+
+ u32 service_pack;
+
+ u32 service_number : 24;
+ u32 service_branch : 8;
+ };
+ struct {
+ u32 eax;
+ u32 ebx;
+ u32 ecx;
+ u32 edx;
+ };
+};
+
/*
* The whole argument should fit in a page to be able to pass to the hypervisor
* in one hypercall.
diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
index 094c57320ed1..233c976344e5 100644
--- a/include/asm-generic/mshyperv.h
+++ b/include/asm-generic/mshyperv.h
@@ -153,6 +153,8 @@ static inline void vmbus_signal_eom(struct hv_message *msg, u32 old_msg_type)
}
}
+int hv_get_hypervisor_version(union hv_hypervisor_version_info *info);
+
void hv_setup_vmbus_handler(void (*handler)(void));
void hv_remove_vmbus_handler(void);
void hv_setup_stimer0_handler(void (*handler)(void));
--
2.25.1
next prev parent reply other threads:[~2023-08-17 22:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 22:01 [PATCH v2 00/15] Introduce /dev/mshv drivers Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 01/15] hyperv-tlfs: Change shared HV_REGISTER_* defines to HV_MSR_* Nuno Das Neves
2023-08-18 18:45 ` Wei Liu
2023-08-17 22:01 ` Nuno Das Neves [this message]
2023-08-17 23:14 ` [PATCH v2 02/15] mshyperv: Introduce hv_get_hypervisor_version function Dave Hansen
2023-08-17 23:43 ` Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 03/15] mshyperv: Introduce numa_node_to_proximity_domain_info Nuno Das Neves
2023-08-17 23:22 ` Dave Hansen
2023-08-18 0:17 ` Nuno Das Neves
2023-08-18 0:26 ` Dave Hansen
2023-08-17 22:01 ` [PATCH v2 04/15] asm-generic/mshyperv: Introduce hv_recommend_using_aeoi() Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 05/15] hyperv: Move hv_connection_id to hyperv-tlfs Nuno Das Neves
2023-08-18 23:22 ` Wei Liu
2023-08-17 22:01 ` [PATCH v2 06/15] hyperv-tlfs: Introduce hv_status_to_string and hv_status_to_errno Nuno Das Neves
2023-08-18 23:23 ` Wei Liu
2023-08-17 22:01 ` [PATCH v2 07/15] Drivers: hv: Move hv_call_deposit_pages and hv_call_create_vp to common code Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 08/15] Drivers: hv: Introduce per-cpu event ring tail Nuno Das Neves
2023-08-18 23:26 ` Wei Liu
2023-08-17 22:01 ` [PATCH v2 09/15] Drivers: hv: Introduce hv_output_arg_exists in hv_common.c Nuno Das Neves
2023-08-18 23:23 ` Wei Liu
2023-08-17 22:01 ` [PATCH v2 10/15] x86: hyperv: Add mshv_handler irq handler and setup function Nuno Das Neves
2023-08-29 7:47 ` Tianyu Lan
2023-08-17 22:01 ` [PATCH v2 11/15] Drivers: hv: export vmbus_isr, hv_context and hv_post_message Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 12/15] Documentation: Reserve ioctl number for mshv driver Nuno Das Neves
2023-08-18 23:24 ` Wei Liu
2023-08-17 22:01 ` [PATCH v2 13/15] uapi: hyperv: Add mshv driver headers hvhdk.h, hvhdk_mini.h, hvgdk.h, hvgdk_mini.h Nuno Das Neves
2023-08-17 23:01 ` Wei Liu
2023-08-19 10:26 ` Greg KH
2023-08-25 18:24 ` Nuno Das Neves
2023-10-10 22:49 ` Nuno Das Neves
2023-10-11 6:42 ` Greg KH
2023-10-12 1:56 ` Nuno Das Neves
2023-08-17 22:01 ` [PATCH v2 14/15] asm-generic: hyperv: Use mshv headers conditionally. Add asm-generic/hyperv-defs.h Nuno Das Neves
2023-08-18 23:30 ` Wei Liu
[not found] ` <1692309711-5573-16-git-send-email-nunodasneves@linux.microsoft.com>
2023-08-18 13:08 ` [PATCH v2 15/15] Drivers: hv: Add modules to expose /dev/mshv to VMMs running on Hyper-V Saurabh Singh Sengar
2023-08-18 18:59 ` Nuno Das Neves
2023-08-20 5:19 ` Saurabh Singh Sengar
2023-08-22 20:18 ` Nuno Das Neves
2023-08-23 7:40 ` Saurabh Singh Sengar
2023-08-25 18:26 ` Nuno Das Neves
2023-08-21 18:18 ` Saurabh Singh Sengar
2023-08-22 21:00 ` Nuno Das Neves
2023-08-24 18:31 ` Boqun Feng
2023-08-25 18:41 ` Nuno Das Neves
2023-08-25 20:15 ` Boqun Feng
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=1692309711-5573-3-git-send-email-nunodasneves@linux.microsoft.com \
--to=nunodasneves@linux.microsoft.com \
--cc=Tianyu.Lan@microsoft.com \
--cc=apais@linux.microsoft.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=dave.hansen@linux.intel.com \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hpa@zytor.com \
--cc=jinankjain@linux.microsoft.com \
--cc=kys@microsoft.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=mukeshrathor@microsoft.com \
--cc=patches@lists.linux.dev \
--cc=ssengar@linux.microsoft.com \
--cc=stanislav.kinsburskiy@gmail.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
--cc=x86@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).