Commit ef5a3c92 authored by Nuno Das Neves's avatar Nuno Das Neves Committed by Wei Liu
Browse files

hyperv: Switch from hyperv-tlfs.h to hyperv/hvhdk.h 



Switch to using hvhdk.h everywhere in the kernel. This header
includes all the new Hyper-V headers in include/hyperv, which form a
superset of the definitions found in hyperv-tlfs.h.

This makes it easier to add new Hyper-V interfaces without being
restricted to those in the TLFS doc (reflected in hyperv-tlfs.h).

To be more consistent with the original Hyper-V code, the names of
some definitions are changed slightly. Update those where needed.

Update comments in mshyperv.h files to point to include/hyperv for
adding new definitions.

Signed-off-by: default avatarNuno Das Neves <nunodasneves@linux.microsoft.com>
Reviewed-by: default avatarMichael Kelley <mhklinux@outlook.com>
Reviewed-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Signed-off-by: default avatarRoman Kisel <romank@linux.microsoft.com>
Reviewed-by: default avatarEaswar Hariharan <eahariha@linux.microsoft.com>
Link: https://lore.kernel.org/r/1732577084-2122-5-git-send-email-nunodasneves@linux.microsoft.com
Link: https://lore.kernel.org/r/20250108222138.1623703-3-romank@linux.microsoft.com


Signed-off-by: default avatarWei Liu <wei.liu@kernel.org>
parent e68bda71

arch/arm64/hyperv/hv_core.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/arm-smccc.h>

#include <linux/module.h>

#include <asm-generic/bug.h>

#include <asm/hyperv-tlfs.h>

#include <hyperv/hvhdk.h>

#include <asm/mshyperv.h>



/*

arch/arm64/hyperv/mshyperv.c

+2 −2
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ static int __init hyperv_init(void) 
	hv_set_vpreg(HV_REGISTER_GUEST_OS_ID, guest_id);



	/* Get the features and hints from Hyper-V */

	hv_get_vpreg_128(HV_REGISTER_FEATURES, &result);

	hv_get_vpreg_128(HV_REGISTER_PRIVILEGES_AND_FEATURES_INFO, &result);

	ms_hyperv.features = result.as32.a;

	ms_hyperv.priv_high = result.as32.b;

	ms_hyperv.misc_features = result.as32.c;



	hv_get_vpreg_128(HV_REGISTER_ENLIGHTENMENTS, &result);

	hv_get_vpreg_128(HV_REGISTER_FEATURES_INFO, &result);

	ms_hyperv.hints = result.as32.a;



	pr_info("Hyper-V: privilege flags low 0x%x, high 0x%x, hints 0x%x, misc 0x%x\n",

arch/arm64/include/asm/mshyperv.h

+3 −4
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ 
 * the ARM64 architecture.  See include/asm-generic/mshyperv.h for

 * definitions are that architecture independent.

 *

 * Definitions that are specified in the Hyper-V Top Level Functional

 * Spec (TLFS) should not go in this file, but should instead go in

 * hyperv-tlfs.h.

 * Definitions that are derived from Hyper-V code or headers should not go in

 * this file, but should instead go in the relevant files in include/hyperv.

 *

 * Copyright (C) 2021, Microsoft, Inc.

 *
@@ -20,7 +19,7 @@ 


#include <linux/types.h>

#include <linux/arm-smccc.h>

#include <asm/hyperv-tlfs.h>

#include <hyperv/hvhdk.h>



/*

 * Declare calls to get and set Hyper-V VP register values on ARM64, which

arch/x86/hyperv/hv_init.c

+10 −10
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/sev.h>

#include <asm/ibt.h>

#include <asm/hypervisor.h>

#include <asm/hyperv-tlfs.h>

#include <hyperv/hvhdk.h>

#include <asm/mshyperv.h>

#include <asm/idtentry.h>

#include <asm/set_memory.h>
@@ -415,24 +415,24 @@ static void __init hv_get_partition_id(void) 
static u8 __init get_vtl(void)

{

	u64 control = HV_HYPERCALL_REP_COMP_1 | HVCALL_GET_VP_REGISTERS;

	struct hv_get_vp_registers_input *input;

	struct hv_get_vp_registers_output *output;

	struct hv_input_get_vp_registers *input;

	struct hv_output_get_vp_registers *output;

	unsigned long flags;

	u64 ret;



	local_irq_save(flags);

	input = *this_cpu_ptr(hyperv_pcpu_input_arg);

	output = (struct hv_get_vp_registers_output *)input;

	output = (struct hv_output_get_vp_registers *)input;



	memset(input, 0, struct_size(input, element, 1));

	input->header.partitionid = HV_PARTITION_ID_SELF;

	input->header.vpindex = HV_VP_INDEX_SELF;

	input->header.inputvtl = 0;

	input->element[0].name0 = HV_X64_REGISTER_VSM_VP_STATUS;

	memset(input, 0, struct_size(input, names, 1));

	input->partition_id = HV_PARTITION_ID_SELF;

	input->vp_index = HV_VP_INDEX_SELF;

	input->input_vtl.as_uint8 = 0;

	input->names[0] = HV_REGISTER_VSM_VP_STATUS;



	ret = hv_do_hypercall(control, input, output);

	if (hv_result_success(ret)) {

		ret = output->as64.low & HV_X64_VTL_MASK;

		ret = output->values[0].reg8 & HV_X64_VTL_MASK;

	} else {

		pr_err("Failed to get VTL(error: %lld) exiting...\n", ret);

		BUG();

arch/x86/hyperv/hv_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags) 
		input->partition_id = partition_id;

		input->vp_index = vp_index;

		input->flags = flags;

		input->subnode_type = HvSubnodeAny;

		input->subnode_type = HV_SUBNODE_ANY;

		input->proximity_domain_info = hv_numa_node_to_pxm_info(node);

		status = hv_do_hypercall(HVCALL_CREATE_VP, input, NULL);

		local_irq_restore(irq_flags);