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

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

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

Pull hyperv updates from Wei Liu:

 - Use Hyper-V entropy to seed guest random number generator (Michael
   Kelley)

 - Convert to platform remove callback returning void for vmbus (Uwe
   Kleine-König)

 - Introduce hv_get_hypervisor_version function (Nuno Das Neves)

 - Rename some HV_REGISTER_* defines for consistency (Nuno Das Neves)

 - Change prefix of generic HV_REGISTER_* MSRs to HV_MSR_* (Nuno Das
   Neves)

 - Cosmetic changes for hv_spinlock.c (Purna Pavan Chandra Aekkaladevi)

 - Use per cpu initial stack for vtl context (Saurabh Sengar)

* tag 'hyperv-next-signed-20240320' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  x86/hyperv: Use Hyper-V entropy to seed guest random number generator
  x86/hyperv: Cosmetic changes for hv_spinlock.c
  hyperv-tlfs: Rename some HV_REGISTER_* defines for consistency
  hv: vmbus: Convert to platform remove callback returning void
  mshyperv: Introduce hv_get_hypervisor_version function
  x86/hyperv: Use per cpu initial stack for vtl context
  hyperv-tlfs: Change prefix of generic HV_REGISTER_* MSRs to HV_MSR_*
parents 7b65c810 f2580a90

arch/arm64/hyperv/hv_core.c

+7 −7
Original line number Diff line number Diff line
@@ -160,22 +160,22 @@ void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die) 
		return;

	panic_reported = true;



	guest_id = hv_get_vpreg(HV_REGISTER_GUEST_OSID);

	guest_id = hv_get_vpreg(HV_REGISTER_GUEST_OS_ID);



	/*

	 * Hyper-V provides the ability to store only 5 values.

	 * Pick the passed in error value, the guest_id, the PC,

	 * and the SP.

	 */

	hv_set_vpreg(HV_REGISTER_CRASH_P0, err);

	hv_set_vpreg(HV_REGISTER_CRASH_P1, guest_id);

	hv_set_vpreg(HV_REGISTER_CRASH_P2, regs->pc);

	hv_set_vpreg(HV_REGISTER_CRASH_P3, regs->sp);

	hv_set_vpreg(HV_REGISTER_CRASH_P4, 0);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P0, err);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P1, guest_id);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P2, regs->pc);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P3, regs->sp);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_P4, 0);



	/*

	 * Let Hyper-V know there is crash data available

	 */

	hv_set_vpreg(HV_REGISTER_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);

	hv_set_vpreg(HV_REGISTER_GUEST_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);

}

EXPORT_SYMBOL_GPL(hyperv_report_panic);

arch/arm64/hyperv/mshyperv.c

+11 −11
Original line number Diff line number Diff line
@@ -19,10 +19,17 @@ 


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;

}



static int __init hyperv_init(void)

{

	struct hv_get_vp_registers_output	result;

	u32	a, b, c, d;

	u64	guest_id;

	int	ret;
@@ -39,7 +46,7 @@ static int __init hyperv_init(void) 


	/* Setup the guest ID */

	guest_id = hv_generate_guest_id(LINUX_VERSION_CODE);

	hv_set_vpreg(HV_REGISTER_GUEST_OSID, guest_id);

	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);
@@ -54,15 +61,6 @@ static int __init hyperv_init(void) 
		ms_hyperv.features, ms_hyperv.priv_high, ms_hyperv.hints,

		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;

	pr_info("Hyper-V: Host Build %d.%d.%d.%d-%d-%d\n",

		b >> 16, b & 0xFFFF, a,	d & 0xFFFFFF, c, d >> 24);



	ret = hv_common_init();

	if (ret)

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

	}



	ms_hyperv_late_init();



	hyperv_initialized = true;

	return 0;

}

arch/arm64/include/asm/hyperv-tlfs.h

+19 −26
Original line number Diff line number Diff line
@@ -21,14 +21,6 @@ 
 * byte ordering of Linux running on ARM64, so no special handling is required.

 */



/*

 * These Hyper-V registers provide information equivalent to the CPUID

 * instruction on x86/x64.

 */

#define HV_REGISTER_HYPERVISOR_VERSION		0x00000100 /*CPUID 0x40000002 */

#define HV_REGISTER_FEATURES			0x00000200 /*CPUID 0x40000003 */

#define HV_REGISTER_ENLIGHTENMENTS		0x00000201 /*CPUID 0x40000004 */



/*

 * Group C Features. See the asm-generic version of hyperv-tlfs.h

 * for a description of Feature Groups.
@@ -41,28 +33,29 @@ 
#define HV_STIMER_DIRECT_MODE_AVAILABLE		BIT(13)



/*

 * Synthetic register definitions equivalent to MSRs on x86/x64

 * To support arch-generic code calling hv_set/get_register:

 * - On x86, HV_MSR_ indicates an MSR accessed via rdmsrl/wrmsrl

 * - On ARM, HV_MSR_ indicates a VP register accessed via hypercall

 */

#define HV_REGISTER_CRASH_P0		0x00000210

#define HV_REGISTER_CRASH_P1		0x00000211

#define HV_REGISTER_CRASH_P2		0x00000212

#define HV_REGISTER_CRASH_P3		0x00000213

#define HV_REGISTER_CRASH_P4		0x00000214

#define HV_REGISTER_CRASH_CTL		0x00000215

#define HV_MSR_CRASH_P0		(HV_REGISTER_GUEST_CRASH_P0)

#define HV_MSR_CRASH_P1		(HV_REGISTER_GUEST_CRASH_P1)

#define HV_MSR_CRASH_P2		(HV_REGISTER_GUEST_CRASH_P2)

#define HV_MSR_CRASH_P3		(HV_REGISTER_GUEST_CRASH_P3)

#define HV_MSR_CRASH_P4		(HV_REGISTER_GUEST_CRASH_P4)

#define HV_MSR_CRASH_CTL	(HV_REGISTER_GUEST_CRASH_CTL)



#define HV_REGISTER_GUEST_OSID		0x00090002

#define HV_REGISTER_VP_INDEX		0x00090003

#define HV_REGISTER_TIME_REF_COUNT	0x00090004

#define HV_REGISTER_REFERENCE_TSC	0x00090017

#define HV_MSR_VP_INDEX		(HV_REGISTER_VP_INDEX)

#define HV_MSR_TIME_REF_COUNT	(HV_REGISTER_TIME_REF_COUNT)

#define HV_MSR_REFERENCE_TSC	(HV_REGISTER_REFERENCE_TSC)



#define HV_REGISTER_SINT0		0x000A0000

#define HV_REGISTER_SCONTROL		0x000A0010

#define HV_REGISTER_SIEFP		0x000A0012

#define HV_REGISTER_SIMP		0x000A0013

#define HV_REGISTER_EOM			0x000A0014

#define HV_MSR_SINT0		(HV_REGISTER_SINT0)

#define HV_MSR_SCONTROL		(HV_REGISTER_SCONTROL)

#define HV_MSR_SIEFP		(HV_REGISTER_SIEFP)

#define HV_MSR_SIMP		(HV_REGISTER_SIMP)

#define HV_MSR_EOM		(HV_REGISTER_EOM)



#define HV_REGISTER_STIMER0_CONFIG	0x000B0000

#define HV_REGISTER_STIMER0_COUNT	0x000B0001

#define HV_MSR_STIMER0_CONFIG	(HV_REGISTER_STIMER0_CONFIG)

#define HV_MSR_STIMER0_COUNT	(HV_REGISTER_STIMER0_COUNT)



union hv_msi_entry {

	u64 as_uint64[2];

arch/arm64/include/asm/mshyperv.h

+2 −2
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ void hv_set_vpreg(u32 reg, u64 value); 
u64 hv_get_vpreg(u32 reg);

void hv_get_vpreg_128(u32 reg, struct hv_get_vp_registers_output *result);



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

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

{

	hv_set_vpreg(reg, value);

}



static inline u64 hv_get_register(unsigned int reg)

static inline u64 hv_get_msr(unsigned int reg)

{

	return hv_get_vpreg(reg);

}

arch/x86/hyperv/hv_init.c

+4 −4
Original line number Diff line number Diff line
@@ -667,14 +667,14 @@ void hyperv_cleanup(void) 
	hv_hypercall_pg = NULL;



	/* Reset the hypercall page */

	hypercall_msr.as_uint64 = hv_get_register(HV_X64_MSR_HYPERCALL);

	hypercall_msr.as_uint64 = hv_get_msr(HV_X64_MSR_HYPERCALL);

	hypercall_msr.enable = 0;

	hv_set_register(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);

	hv_set_msr(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);



	/* Reset the TSC page */

	tsc_msr.as_uint64 = hv_get_register(HV_X64_MSR_REFERENCE_TSC);

	tsc_msr.as_uint64 = hv_get_msr(HV_X64_MSR_REFERENCE_TSC);

	tsc_msr.enable = 0;

	hv_set_register(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);

	hv_set_msr(HV_X64_MSR_REFERENCE_TSC, tsc_msr.as_uint64);

}



void hyperv_report_panic(struct pt_regs *regs, long err, bool in_die)