Commit 8632e9b5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hyperv fixes from Wei Liu:

 - a series from Tianyu Lan to fix crash reporting on Hyper-V

 - three miscellaneous cleanup patches

* tag 'hyperv-fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux:
  x86/Hyper-V: Report crash data in die() when panic_on_oops is set
  x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set
  x86/Hyper-V: Report crash register data or kmsg before running crash kernel
  x86/Hyper-V: Trigger crash enlightenment only once during system crash.
  x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump
  x86/Hyper-V: Unload vmbus channel in hv panic callback
  x86: hyperv: report value of misc_features
  hv_debugfs: Make hv_debug_root static
  hv: hyperv_vmbus.h: Replace zero-length array with flexible-array member
parents 6cc9306b f3a99e76

arch/x86/hyperv/hv_init.c

+5 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/mm.h>

#include <linux/hyperv.h>

#include <linux/slab.h>

#include <linux/kernel.h>

#include <linux/cpuhotplug.h>

#include <linux/syscore_ops.h>

#include <clocksource/hyperv_timer.h>
@@ -419,11 +420,14 @@ void hyperv_cleanup(void) 
}

EXPORT_SYMBOL_GPL(hyperv_cleanup);



void hyperv_report_panic(struct pt_regs *regs, long err)

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

{

	static bool panic_reported;

	u64 guest_id;



	if (in_die && !panic_on_oops)

		return;



	/*

	 * We prefer to report panic on 'die' chain as we have proper

	 * registers to report, but if we miss it (e.g. on BUG()) we need

arch/x86/kernel/cpu/mshyperv.c

+12 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ static void __init ms_hyperv_init_platform(void) 
	ms_hyperv.misc_features = cpuid_edx(HYPERV_CPUID_FEATURES);

	ms_hyperv.hints    = cpuid_eax(HYPERV_CPUID_ENLIGHTMENT_INFO);



	pr_info("Hyper-V: features 0x%x, hints 0x%x\n",

		ms_hyperv.features, ms_hyperv.hints);

	pr_info("Hyper-V: features 0x%x, hints 0x%x, misc 0x%x\n",

		ms_hyperv.features, ms_hyperv.hints, ms_hyperv.misc_features);



	ms_hyperv.max_vp_index = cpuid_eax(HYPERV_CPUID_IMPLEMENT_LIMITS);

	ms_hyperv.max_lp_index = cpuid_ebx(HYPERV_CPUID_IMPLEMENT_LIMITS);
@@ -263,6 +263,16 @@ static void __init ms_hyperv_init_platform(void) 
			cpuid_eax(HYPERV_CPUID_NESTED_FEATURES);

	}



	/*

	 * Hyper-V expects to get crash register data or kmsg when

	 * crash enlightment is available and system crashes. Set

	 * crash_kexec_post_notifiers to be true to make sure that

	 * calling crash enlightment interface before running kdump

	 * kernel.

	 */

	if (ms_hyperv.misc_features & HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE)

		crash_kexec_post_notifiers = true;



#ifdef CONFIG_X86_LOCAL_APIC

	if (ms_hyperv.features & HV_X64_ACCESS_FREQUENCY_MSRS &&

	    ms_hyperv.misc_features & HV_FEATURE_FREQUENCY_MSRS_AVAILABLE) {

drivers/hv/channel_mgmt.c

+3 −0
Original line number Diff line number Diff line
@@ -839,6 +839,9 @@ void vmbus_initiate_unload(bool crash) 
{

	struct vmbus_channel_message_header hdr;



	if (xchg(&vmbus_connection.conn_state, DISCONNECTED) == DISCONNECTED)

		return;



	/* Pre-Win2012R2 hosts don't support reconnect */

	if (vmbus_proto_version < VERSION_WIN8_1)

		return;

drivers/hv/hv_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 


#include "hyperv_vmbus.h"



struct dentry *hv_debug_root;

static struct dentry *hv_debug_root;



static int hv_debugfs_delay_get(void *data, u64 *val)

{

drivers/hv/hyperv_vmbus.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ struct vmbus_msginfo { 
	struct list_head msglist_entry;



	/* The message itself */

	unsigned char msg[0];

	unsigned char msg[];

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE