From patchwork Thu Jul 27 19:54:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuno Das Neves X-Patchwork-Id: 127145 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b8e4:0:b0:3e9:de7a:15be with SMTP id v4csp1375787vqw; Thu, 27 Jul 2023 13:27:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlFvBPnbP2WCi6WbOLXc8m1dl5II4aHeuaDU11TjrQ65bRWQYvFaXTCQoIRyPQgPETmU13pD X-Received: by 2002:a05:6402:3581:b0:522:3ae0:aeb8 with SMTP id y1-20020a056402358100b005223ae0aeb8mr3694884edc.18.1690489653523; Thu, 27 Jul 2023 13:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690489653; cv=none; d=google.com; s=arc-20160816; b=f5MOKDS+6dGDgsCnebDCyedyRhHkTwSP/4OCRMQXCnFvjj+fynlYrwfgufiBYoWgvz /YHKVlwJ6sXA5/8ctJjlvRh9PXjEH09vqkQZ0NqgVjNNmFT8wBiVELENG0jVKn1vDOWJ EgLmyjiSL0y92ZVV9jWOzWsdSId3OdwWpLZWHHyY2pnmoNNulLco0+q3EqFotxLJHwFQ wKSkYCB4Ip0q0J5UCkEYOdfHucaj2XfL9crQcOFOXa0dgPPaE5mJUesWhm+EIPuajfWY C7e5VgihtJjWvMKc41hO4r8W6mOSvIGUUNEAL5rHOa8h1v/n1l6A5FcFHOlksYmg7DQl wvqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature:dkim-filter; bh=0PJ7eDmDDctHDQnCW9IdU9wuREPSO54L5rkNENDb8ic=; fh=y8tS7hHyMnVm4J/EG8JBk7xmqgMCnIiFB1dTM3zggRY=; b=Vu06fhR+3XD6yFSXHEOXoEOvtNqZBrwYuZHXx9yPTfBH/C0gIdfHbHyd0K/Zl+529D pTxs+CbZ4AjjCs50HSLfuQ1swZmJVIX9yDiG/BiV34FoS0le1H9Yr3yXTNWjA+yqvZmQ n+f6aFcjdvQIOH0Z/OTMCq6kukyTXdYtADFQDQXRkkowoSx2vEN9VXa66iW7LLfDydsv KQ0VX7TEyEG6HeiR8UDWgjhhKSAOMG3QCpSYWXw3IIoSlZAkIqC1D/6ExL8IUkoK38EU EujBCBTpS2ZLuHIkr6LY6DWHS+8GswJx1Og7rCHTYEnECzHFVC9P4v9nmiUztSFAnS35 UOEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=QEAyXocv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020aa7df91000000b005225522e9a0si1485724edy.597.2023.07.27.13.27.09; Thu, 27 Jul 2023 13:27:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=QEAyXocv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232760AbjG0Tzx (ORCPT + 99 others); Thu, 27 Jul 2023 15:55:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231483AbjG0Ty7 (ORCPT ); Thu, 27 Jul 2023 15:54:59 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 433E72D7D; Thu, 27 Jul 2023 12:54:57 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 8EFD62380B38; Thu, 27 Jul 2023 12:54:56 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8EFD62380B38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1690487696; bh=0PJ7eDmDDctHDQnCW9IdU9wuREPSO54L5rkNENDb8ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QEAyXocvShHlsEAXQmjrdcPTJd4CA1MUFHuILXlKxFfQwdicxDPCKLE7kV3qUzFm2 kZvLsjGsrF4U2kiBRuuTj3HOuMEJZhOklE5hDg7uvGY8XVC2sOCRuW88IH1LobuHup HumZNqPhXcGC2OkywyY94RPSssISUX2H0pShnUh8= From: Nuno Das Neves 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: mikelley@microsoft.com, kys@microsoft.com, wei.liu@kernel.org, haiyangz@microsoft.com, decui@microsoft.com, ssengar@linux.microsoft.com, mukeshrathor@microsoft.com, stanislav.kinsburskiy@gmail.com, jinankjain@linux.microsoft.com, apais@linux.microsoft.com, Tianyu.Lan@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 02/15] mshyperv: Introduce hv_get_hypervisor_version Date: Thu, 27 Jul 2023 12:54:37 -0700 Message-Id: <1690487690-2428-3-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772606878952201982 X-GMAIL-MSGID: 1772606878952201982 x86_64 and arm64 implementations to get the hypervisor version information. Also introduce hv_hypervisor_version_info structure to simplify parsing the fields. Replace the existing parsing when printing the version numbers. Signed-off-by: Nuno Das Neves --- 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 a406454578f0..d44c358ce45c 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 57f6a5879b30..e44291e902ae 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -328,13 +328,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"; @@ -388,16 +405,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));