Commit a5b3d866 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hyperv-next-signed-20250324' of... 

Merge tag 'hyperv-next-signed-20250324' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux

Pull hyperv updates from Wei Liu:

 - Add support for running as the root partition in Hyper-V (Microsoft
   Hypervisor) by exposing /dev/mshv (Nuno and various people)

 - Add support for CPU offlining in Hyper-V (Hamza Mahfooz)

 - Misc fixes and cleanups (Roman Kisel, Tianyu Lan, Wei Liu, Michael
   Kelley, Thorsten Blum)

* tag 'hyperv-next-signed-20250324' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux: (24 commits)
  x86/hyperv: fix an indentation issue in mshyperv.h
  x86/hyperv: Add comments about hv_vpset and var size hypercall input args
  Drivers: hv: Introduce mshv_root module to expose /dev/mshv to VMMs
  hyperv: Add definitions for root partition driver to hv headers
  x86: hyperv: Add mshv_handler() irq handler and setup function
  Drivers: hv: Introduce per-cpu event ring tail
  Drivers: hv: Export some functions for use by root partition module
  acpi: numa: Export node_to_pxm()
  hyperv: Introduce hv_recommend_using_aeoi()
  arm64/hyperv: Add some missing functions to arm64
  x86/mshyperv: Add support for extended Hyper-V features
  hyperv: Log hypercall status codes as strings
  x86/hyperv: Fix check of return value from snp_set_vmsa()
  x86/hyperv: Add VTL mode callback for restarting the system
  x86/hyperv: Add VTL mode emergency restart callback
  hyperv: Remove unused union and structs
  hyperv: Add CONFIG_MSHV_ROOT to gate root partition support
  hyperv: Change hv_root_partition into a function
  hyperv: Convert hypercall statuses to linux error codes
  drivers/hv: add CPU offlining support
  ...
parents dce3ab4c 628cc040

Documentation/userspace-api/ioctl/ioctl-number.rst

+2 −0
Original line number Diff line number Diff line
@@ -370,6 +370,8 @@ Code Seq# Include File Comments 
0xB7  all    uapi/linux/remoteproc_cdev.h                            <mailto:linux-remoteproc@vger.kernel.org>

0xB7  all    uapi/linux/nsfs.h                                       <mailto:Andrei Vagin <avagin@openvz.org>>

0xB8  01-02  uapi/misc/mrvl_cn10k_dpi.h                              Marvell CN10K DPI driver

0xB8  all    uapi/linux/mshv.h                                       Microsoft Hyper-V /dev/mshv driver

                                                                     <mailto:linux-hyperv@vger.kernel.org>

0xC0  00-0F  linux/usb/iowarrior.h

0xCA  00-0F  uapi/misc/cxl.h

0xCA  10-2F  uapi/misc/ocxl.h

arch/arm64/hyperv/hv_core.c

+17 −0
Original line number Diff line number Diff line
@@ -53,6 +53,23 @@ u64 hv_do_fast_hypercall8(u16 code, u64 input) 
}

EXPORT_SYMBOL_GPL(hv_do_fast_hypercall8);



/*

 * hv_do_fast_hypercall16 -- Invoke the specified hypercall

 * with arguments in registers instead of physical memory.

 * Avoids the overhead of virt_to_phys for simple hypercalls.

 */

u64 hv_do_fast_hypercall16(u16 code, u64 input1, u64 input2)

{

	struct arm_smccc_res	res;

	u64			control;



	control = (u64)code | HV_HYPERCALL_FAST_BIT;



	arm_smccc_1_1_hvc(HV_FUNC_ID, control, input1, input2, &res);

	return res.a0;

}

EXPORT_SYMBOL_GPL(hv_do_fast_hypercall16);



/*

 * Set a single VP register to a 64-bit value.

 */

arch/arm64/hyperv/mshyperv.c

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ int hv_get_hypervisor_version(union hv_hypervisor_version_info *info) 


	return 0;

}

EXPORT_SYMBOL_GPL(hv_get_hypervisor_version);



static int __init hyperv_init(void)

{
@@ -61,6 +62,8 @@ static int __init hyperv_init(void) 
		ms_hyperv.features, ms_hyperv.priv_high, ms_hyperv.hints,

		ms_hyperv.misc_features);



	hv_identify_partition_type();



	ret = hv_common_init();

	if (ret)

		return ret;
@@ -72,6 +75,9 @@ static int __init hyperv_init(void) 
		return ret;

	}



	if (ms_hyperv.priv_high & HV_ACCESS_PARTITION_ID)

		hv_get_partition_id();



	ms_hyperv_late_init();



	hyperv_initialized = true;

arch/arm64/include/asm/mshyperv.h

+13 −0
Original line number Diff line number Diff line
@@ -40,6 +40,19 @@ static inline u64 hv_get_msr(unsigned int reg) 
	return hv_get_vpreg(reg);

}



/*

 * Nested is not supported on arm64

 */

static inline void hv_set_non_nested_msr(unsigned int reg, u64 value)

{

	hv_set_msr(reg, value);

}



static inline u64 hv_get_non_nested_msr(unsigned int reg)

{

	return hv_get_msr(reg);

}



/* SMCCC hypercall parameters */

#define HV_SMCCC_FUNC_NUMBER	1

#define HV_FUNC_ID	ARM_SMCCC_CALL_VAL(			\

arch/x86/hyperv/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-y			:= hv_init.o mmu.o nested.o irqdomain.o ivm.o

obj-$(CONFIG_X86_64)	+= hv_apic.o hv_proc.o

obj-$(CONFIG_X86_64)	+= hv_apic.o

obj-$(CONFIG_HYPERV_VTL_MODE)	+= hv_vtl.o



ifdef CONFIG_X86_64