From: Anirudh Rayabharam <anirudh@anirudhrb.com>
From: Anirudh Rayabharam (Microsoft) <anirudh@anirudhrb.com>
Move hyperv detection earlier in the boot. The goal is to detect hyperv
and the type of partition we're running in before the GICv3 setup.
This will be used in the subsequent patches to allocate an SGI for use
by the hyperv subsystem.
Signed-off-by: Anirudh Rayabharam (Microsoft) <anirudh@anirudhrb.com>
---
arch/arm64/hyperv/mshyperv.c | 18 ++++++++++++++----
arch/arm64/include/asm/mshyperv.h | 2 ++
arch/arm64/kernel/setup.c | 6 ++++++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/hyperv/mshyperv.c b/arch/arm64/hyperv/mshyperv.c
index 4fdc26ade1d7..cc443a5d6c71 100644
--- a/arch/arm64/hyperv/mshyperv.c
+++ b/arch/arm64/hyperv/mshyperv.c
@@ -17,6 +17,7 @@
#include <linux/cpuhotplug.h>
#include <asm/mshyperv.h>
+static bool hyperv_detected;
static bool hyperv_initialized;
int hv_get_hypervisor_version(union hv_hypervisor_version_info *info)
@@ -70,20 +71,21 @@ static bool __init hyperv_detect_via_smccc(void)
return arm_smccc_hypervisor_has_uuid(&hyperv_uuid);
}
-static int __init hyperv_init(void)
+void __init hyperv_early_init(void)
{
struct hv_get_vp_registers_output result;
u64 guest_id;
- int ret;
/*
* Allow for a kernel built with CONFIG_HYPERV to be running in
* a non-Hyper-V environment.
*
- * In such cases, do nothing and return success.
+ * In such cases, do nothing and return.
*/
if (!hyperv_detect_via_acpi() && !hyperv_detect_via_smccc())
- return 0;
+ return;
+
+ hyperv_detected = true;
/* Setup the guest ID */
guest_id = hv_generate_guest_id(LINUX_VERSION_CODE);
@@ -103,6 +105,14 @@ static int __init hyperv_init(void)
ms_hyperv.misc_features);
hv_identify_partition_type();
+}
+
+static int __init hyperv_init(void)
+{
+ int ret;
+
+ if (!hyperv_detected)
+ return 0;
ret = hv_common_init();
if (ret)
diff --git a/arch/arm64/include/asm/mshyperv.h b/arch/arm64/include/asm/mshyperv.h
index b721d3134ab6..58fde70c2e39 100644
--- a/arch/arm64/include/asm/mshyperv.h
+++ b/arch/arm64/include/asm/mshyperv.h
@@ -53,6 +53,8 @@ static inline u64 hv_get_non_nested_msr(unsigned int reg)
return hv_get_msr(reg);
}
+void hyperv_early_init(void);
+
/* SMCCC hypercall parameters */
#define HV_SMCCC_FUNC_NUMBER 1
#define HV_FUNC_ID ARM_SMCCC_CALL_VAL( \
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 23c05dc7a8f2..eccf5f19da6b 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -54,6 +54,7 @@
#include <asm/efi.h>
#include <asm/xen/hypervisor.h>
#include <asm/mmu_context.h>
+#include <asm/mshyperv.h>
static int num_standard_resources;
static struct resource *standard_resources;
@@ -354,6 +355,11 @@ void __init __no_sanitize_address setup_arch(char **cmdline_p)
else
psci_acpi_init();
+ /*
+ * This must come after psci init since Hyper-V detection uses SMCCC
+ */
+ hyperv_early_init();
+
arm64_rsi_init();
init_bootcpu_ops();
--
2.34.1Hi Anirudh,
kernel test robot noticed the following build warnings:
[auto build test WARNING on next-20251125]
[also build test WARNING on v6.18-rc7]
[cannot apply to arm64/for-next/core tip/irq/core arnd-asm-generic/master linus/master v6.18-rc7 v6.18-rc6 v6.18-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Anirudh-Raybharam/arm64-hyperv-move-hyperv-detection-earlier-in-boot/20251126-011057
base: next-20251125
patch link: https://lore.kernel.org/r/20251125170124.2443340-2-anirudh%40anirudhrb.com
patch subject: [PATCH 1/3] arm64: hyperv: move hyperv detection earlier in boot
config: arm64-randconfig-003-20251127 (https://download.01.org/0day-ci/archive/20251127/202511271709.lBS024jA-lkp@intel.com/config)
compiler: aarch64-linux-gcc (GCC) 9.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251127/202511271709.lBS024jA-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511271709.lBS024jA-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from arch/arm64/include/asm/mshyperv.h:66,
from arch/arm64/kernel/setup.c:57:
include/asm-generic/mshyperv.h:326:38: error: return type is an incomplete type
326 | static inline enum hv_isolation_type hv_get_isolation_type(void)
| ^~~~~~~~~~~~~~~~~~~~~
include/asm-generic/mshyperv.h: In function 'hv_get_isolation_type':
include/asm-generic/mshyperv.h:328:9: error: 'HV_ISOLATION_TYPE_NONE' undeclared (first use in this function)
328 | return HV_ISOLATION_TYPE_NONE;
| ^~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/mshyperv.h:328:9: note: each undeclared identifier is reported only once for each function it appears in
>> include/asm-generic/mshyperv.h:328:9: warning: 'return' with a value, in function returning void [-Wreturn-type]
include/asm-generic/mshyperv.h:326:38: note: declared here
326 | static inline enum hv_isolation_type hv_get_isolation_type(void)
| ^~~~~~~~~~~~~~~~~~~~~
vim +/return +328 include/asm-generic/mshyperv.h
7ad9bb9d0f357d Wei Liu 2021-09-10 289
3817854ba89201 Nuno Das Neves 2025-03-14 290 #define _hv_status_fmt(fmt) "%s: Hyper-V status: %#x = %s: " fmt
3817854ba89201 Nuno Das Neves 2025-03-14 291 #define hv_status_printk(level, status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 292 do { \
3817854ba89201 Nuno Das Neves 2025-03-14 293 u64 __status = (status); \
3817854ba89201 Nuno Das Neves 2025-03-14 294 pr_##level(_hv_status_fmt(fmt), __func__, hv_result(__status), \
3817854ba89201 Nuno Das Neves 2025-03-14 295 hv_result_to_string(__status), ##__VA_ARGS__); \
3817854ba89201 Nuno Das Neves 2025-03-14 296 } while (0)
3817854ba89201 Nuno Das Neves 2025-03-14 297 #define hv_status_err(status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 298 hv_status_printk(err, status, fmt, ##__VA_ARGS__)
3817854ba89201 Nuno Das Neves 2025-03-14 299 #define hv_status_debug(status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 300 hv_status_printk(debug, status, fmt, ##__VA_ARGS__)
3817854ba89201 Nuno Das Neves 2025-03-14 301
3817854ba89201 Nuno Das Neves 2025-03-14 302 const char *hv_result_to_string(u64 hv_status);
9d8731a1757bef Nuno Das Neves 2025-02-21 303 int hv_result_to_errno(u64 status);
f3a99e761efa61 Tianyu Lan 2020-04-06 304 void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die);
765e33f5211ab6 Michael Kelley 2019-05-30 305 bool hv_is_hyperv_initialized(void);
b96f86534fa310 Dexuan Cui 2019-11-19 306 bool hv_is_hibernation_supported(void);
a6c76bb08dc7f7 Andrea Parri (Microsoft 2021-02-01 307) enum hv_isolation_type hv_get_isolation_type(void);
a6c76bb08dc7f7 Andrea Parri (Microsoft 2021-02-01 308) bool hv_is_isolation_supported(void);
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 309 bool hv_isolation_type_snp(void);
20c89a559e00df Tianyu Lan 2021-10-25 310 u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size);
d6e0228d265f29 Dexuan Cui 2023-08-24 311 u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2);
3e1b611515d286 Tianyu Lan 2025-09-18 312 void hv_enable_coco_interrupt(unsigned int cpu, unsigned int vector, bool set);
a156ad8c508209 Roman Kisel 2025-10-08 313 void hv_para_set_sint_proxy(bool enable);
e6eeb3c782739c Roman Kisel 2025-10-08 314 u64 hv_para_get_synic_register(unsigned int reg);
e6eeb3c782739c Roman Kisel 2025-10-08 315 void hv_para_set_synic_register(unsigned int reg, u64 val);
765e33f5211ab6 Michael Kelley 2019-05-30 316 void hyperv_cleanup(void);
6dc2a774cb4fdb Sunil Muthuswamy 2021-03-23 317 bool hv_query_ext_cap(u64 cap_query);
37200078ed6aa2 Michael Kelley 2022-03-24 318 void hv_setup_dma_ops(struct device *dev, bool coherent);
765e33f5211ab6 Michael Kelley 2019-05-30 319 #else /* CONFIG_HYPERV */
db912b8954c23a Nuno Das Neves 2025-02-21 320 static inline void hv_identify_partition_type(void) {}
765e33f5211ab6 Michael Kelley 2019-05-30 321 static inline bool hv_is_hyperv_initialized(void) { return false; }
b96f86534fa310 Dexuan Cui 2019-11-19 322 static inline bool hv_is_hibernation_supported(void) { return false; }
765e33f5211ab6 Michael Kelley 2019-05-30 323 static inline void hyperv_cleanup(void) {}
f2580a907e5c0e Michael Kelley 2024-03-18 324 static inline void ms_hyperv_late_init(void) {}
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 325 static inline bool hv_is_isolation_supported(void) { return false; }
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 326 static inline enum hv_isolation_type hv_get_isolation_type(void)
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 327 {
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 @328 return HV_ISOLATION_TYPE_NONE;
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 329 }
765e33f5211ab6 Michael Kelley 2019-05-30 330 #endif /* CONFIG_HYPERV */
765e33f5211ab6 Michael Kelley 2019-05-30 331
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi Anirudh,
kernel test robot noticed the following build errors:
[auto build test ERROR on next-20251125]
[also build test ERROR on v6.18-rc7]
[cannot apply to arm64/for-next/core tip/irq/core arnd-asm-generic/master linus/master v6.18-rc7 v6.18-rc6 v6.18-rc5]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Anirudh-Raybharam/arm64-hyperv-move-hyperv-detection-earlier-in-boot/20251126-011057
base: next-20251125
patch link: https://lore.kernel.org/r/20251125170124.2443340-2-anirudh%40anirudhrb.com
patch subject: [PATCH 1/3] arm64: hyperv: move hyperv detection earlier in boot
config: arm64-allnoconfig (https://download.01.org/0day-ci/archive/20251126/202511260546.RGx7vwyX-lkp@intel.com/config)
compiler: aarch64-linux-gcc (GCC) 15.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251126/202511260546.RGx7vwyX-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202511260546.RGx7vwyX-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from arch/arm64/include/asm/mshyperv.h:66,
from arch/arm64/kernel/setup.c:57:
>> include/asm-generic/mshyperv.h:326:38: error: return type is an incomplete type
326 | static inline enum hv_isolation_type hv_get_isolation_type(void)
| ^~~~~~~~~~~~~~~~~~~~~
include/asm-generic/mshyperv.h: In function 'hv_get_isolation_type':
>> include/asm-generic/mshyperv.h:328:16: error: 'HV_ISOLATION_TYPE_NONE' undeclared (first use in this function)
328 | return HV_ISOLATION_TYPE_NONE;
| ^~~~~~~~~~~~~~~~~~~~~~
include/asm-generic/mshyperv.h:328:16: note: each undeclared identifier is reported only once for each function it appears in
>> include/asm-generic/mshyperv.h:328:16: error: 'return' with a value, in function returning void [-Wreturn-mismatch]
include/asm-generic/mshyperv.h:326:38: note: declared here
326 | static inline enum hv_isolation_type hv_get_isolation_type(void)
| ^~~~~~~~~~~~~~~~~~~~~
vim +326 include/asm-generic/mshyperv.h
7ad9bb9d0f357d Wei Liu 2021-09-10 289
3817854ba89201 Nuno Das Neves 2025-03-14 290 #define _hv_status_fmt(fmt) "%s: Hyper-V status: %#x = %s: " fmt
3817854ba89201 Nuno Das Neves 2025-03-14 291 #define hv_status_printk(level, status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 292 do { \
3817854ba89201 Nuno Das Neves 2025-03-14 293 u64 __status = (status); \
3817854ba89201 Nuno Das Neves 2025-03-14 294 pr_##level(_hv_status_fmt(fmt), __func__, hv_result(__status), \
3817854ba89201 Nuno Das Neves 2025-03-14 295 hv_result_to_string(__status), ##__VA_ARGS__); \
3817854ba89201 Nuno Das Neves 2025-03-14 296 } while (0)
3817854ba89201 Nuno Das Neves 2025-03-14 297 #define hv_status_err(status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 298 hv_status_printk(err, status, fmt, ##__VA_ARGS__)
3817854ba89201 Nuno Das Neves 2025-03-14 299 #define hv_status_debug(status, fmt, ...) \
3817854ba89201 Nuno Das Neves 2025-03-14 300 hv_status_printk(debug, status, fmt, ##__VA_ARGS__)
3817854ba89201 Nuno Das Neves 2025-03-14 301
3817854ba89201 Nuno Das Neves 2025-03-14 302 const char *hv_result_to_string(u64 hv_status);
9d8731a1757bef Nuno Das Neves 2025-02-21 303 int hv_result_to_errno(u64 status);
f3a99e761efa61 Tianyu Lan 2020-04-06 304 void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die);
765e33f5211ab6 Michael Kelley 2019-05-30 305 bool hv_is_hyperv_initialized(void);
b96f86534fa310 Dexuan Cui 2019-11-19 306 bool hv_is_hibernation_supported(void);
a6c76bb08dc7f7 Andrea Parri (Microsoft 2021-02-01 307) enum hv_isolation_type hv_get_isolation_type(void);
a6c76bb08dc7f7 Andrea Parri (Microsoft 2021-02-01 308) bool hv_is_isolation_supported(void);
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 309 bool hv_isolation_type_snp(void);
20c89a559e00df Tianyu Lan 2021-10-25 310 u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size);
d6e0228d265f29 Dexuan Cui 2023-08-24 311 u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2);
3e1b611515d286 Tianyu Lan 2025-09-18 312 void hv_enable_coco_interrupt(unsigned int cpu, unsigned int vector, bool set);
a156ad8c508209 Roman Kisel 2025-10-08 313 void hv_para_set_sint_proxy(bool enable);
e6eeb3c782739c Roman Kisel 2025-10-08 314 u64 hv_para_get_synic_register(unsigned int reg);
e6eeb3c782739c Roman Kisel 2025-10-08 315 void hv_para_set_synic_register(unsigned int reg, u64 val);
765e33f5211ab6 Michael Kelley 2019-05-30 316 void hyperv_cleanup(void);
6dc2a774cb4fdb Sunil Muthuswamy 2021-03-23 317 bool hv_query_ext_cap(u64 cap_query);
37200078ed6aa2 Michael Kelley 2022-03-24 318 void hv_setup_dma_ops(struct device *dev, bool coherent);
765e33f5211ab6 Michael Kelley 2019-05-30 319 #else /* CONFIG_HYPERV */
db912b8954c23a Nuno Das Neves 2025-02-21 320 static inline void hv_identify_partition_type(void) {}
765e33f5211ab6 Michael Kelley 2019-05-30 321 static inline bool hv_is_hyperv_initialized(void) { return false; }
b96f86534fa310 Dexuan Cui 2019-11-19 322 static inline bool hv_is_hibernation_supported(void) { return false; }
765e33f5211ab6 Michael Kelley 2019-05-30 323 static inline void hyperv_cleanup(void) {}
f2580a907e5c0e Michael Kelley 2024-03-18 324 static inline void ms_hyperv_late_init(void) {}
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 325 static inline bool hv_is_isolation_supported(void) { return false; }
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 @326 static inline enum hv_isolation_type hv_get_isolation_type(void)
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 327 {
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 @328 return HV_ISOLATION_TYPE_NONE;
0cc4f6d9f0b9f2 Tianyu Lan 2021-10-25 329 }
765e33f5211ab6 Michael Kelley 2019-05-30 330 #endif /* CONFIG_HYPERV */
765e33f5211ab6 Michael Kelley 2019-05-30 331
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.