From: kys@exchange.microsoft.com
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com,
vkuznets@redhat.com, jasowang@redhat.com,
leann.ogasawara@canonical.com, rkagan@virtuozzo.com,
x86@kernel.org, tglx@linutronix.de, hpa@zytor.com
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Subject: [PATCH 07/18] Drivers: hv: vmbus: Move the crash notification function
Date: Fri, 30 Dec 2016 13:36:01 -0800 [thread overview]
Message-ID: <1483133772-29776-7-git-send-email-kys@exchange.microsoft.com> (raw)
In-Reply-To: <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com>
From: K. Y. Srinivasan <kys@microsoft.com>
As part of the effort to separate out architecture specific code, move the
crash notification function.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
---
arch/x86/hyperv/hv_init.c | 26 ++++++++++++++++++++++++++
arch/x86/include/asm/mshyperv.h | 1 +
arch/x86/include/uapi/asm/hyperv.h | 8 ++++++++
drivers/hv/hyperv_vmbus.h | 10 ----------
drivers/hv/vmbus_drv.c | 25 -------------------------
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c
index 940a970..299cafb 100644
--- a/arch/x86/hyperv/hv_init.c
+++ b/arch/x86/hyperv/hv_init.c
@@ -208,3 +208,29 @@ u64 hv_do_hypercall(u64 control, void *input, void *output)
#endif /* !x86_64 */
}
EXPORT_SYMBOL_GPL(hv_do_hypercall);
+
+void hyperv_report_panic(struct pt_regs *regs)
+{
+ static bool panic_reported;
+
+ /*
+ * 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
+ * to report it on 'panic'.
+ */
+ if (panic_reported)
+ return;
+ panic_reported = true;
+
+ wrmsrl(HV_X64_MSR_CRASH_P0, regs->ip);
+ wrmsrl(HV_X64_MSR_CRASH_P1, regs->ax);
+ wrmsrl(HV_X64_MSR_CRASH_P2, regs->bx);
+ wrmsrl(HV_X64_MSR_CRASH_P3, regs->cx);
+ wrmsrl(HV_X64_MSR_CRASH_P4, regs->dx);
+
+ /*
+ * Let Hyper-V know there is crash data available
+ */
+ wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);
+}
+EXPORT_SYMBOL_GPL(hyperv_report_panic);
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
index 54729e3..64e682d 100644
--- a/arch/x86/include/asm/mshyperv.h
+++ b/arch/x86/include/asm/mshyperv.h
@@ -114,5 +114,6 @@ static inline __u64 generate_guest_id(__u64 d_info1, __u64 kernel_version,
#if IS_ENABLED(CONFIG_HYPERV)
void hyperv_init(void);
+void hyperv_report_panic(struct pt_regs *regs);
#endif
#endif
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h
index 9b1a918..3a20ccf 100644
--- a/arch/x86/include/uapi/asm/hyperv.h
+++ b/arch/x86/include/uapi/asm/hyperv.h
@@ -73,6 +73,9 @@
*/
#define HV_X64_MSR_STAT_PAGES_AVAILABLE (1 << 8)
+/* Crash MSR available */
+#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE (1 << 10)
+
/*
* Feature identification: EBX indicates which flags were specified at
* partition creation. The format is the same as the partition creation
@@ -144,6 +147,11 @@
*/
#define HV_X64_RELAXED_TIMING_RECOMMENDED (1 << 5)
+/*
+ * Crash notification flag.
+ */
+#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63)
+
/* MSR used to identify the guest OS. */
#define HV_X64_MSR_GUEST_OS_ID 0x40000000
diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
index a7e35c8..59eb28c 100644
--- a/drivers/hv/hyperv_vmbus.h
+++ b/drivers/hv/hyperv_vmbus.h
@@ -40,16 +40,6 @@
*/
#define HV_UTIL_NEGO_TIMEOUT 55
-#define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE 0x400
-
-#define HV_X64_MSR_CRASH_P0 0x40000100
-#define HV_X64_MSR_CRASH_P1 0x40000101
-#define HV_X64_MSR_CRASH_P2 0x40000102
-#define HV_X64_MSR_CRASH_P3 0x40000103
-#define HV_X64_MSR_CRASH_P4 0x40000104
-#define HV_X64_MSR_CRASH_CTL 0x40000105
-
-#define HV_CRASH_CTL_CRASH_NOTIFY (1ULL << 63)
/* Define version of the synthetic interrupt controller. */
#define HV_SYNIC_VERSION (1)
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index 565bdd1..8e81346 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -56,31 +56,6 @@ struct vmbus_dynid {
static int hyperv_cpuhp_online;
-static void hyperv_report_panic(struct pt_regs *regs)
-{
- static bool panic_reported;
-
- /*
- * 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
- * to report it on 'panic'.
- */
- if (panic_reported)
- return;
- panic_reported = true;
-
- wrmsrl(HV_X64_MSR_CRASH_P0, regs->ip);
- wrmsrl(HV_X64_MSR_CRASH_P1, regs->ax);
- wrmsrl(HV_X64_MSR_CRASH_P2, regs->bx);
- wrmsrl(HV_X64_MSR_CRASH_P3, regs->cx);
- wrmsrl(HV_X64_MSR_CRASH_P4, regs->dx);
-
- /*
- * Let Hyper-V know there is crash data available
- */
- wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);
-}
-
static int hyperv_panic_event(struct notifier_block *nb, unsigned long val,
void *args)
{
--
1.7.4.1
next prev parent reply other threads:[~2016-12-30 19:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-30 21:35 [PATCH 00/18] Drivers: hv: vmbus: Restructure architecture specific code kys
2016-12-30 21:35 ` [PATCH 01/18] Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents kys
2016-12-30 21:35 ` [PATCH 02/18] Drivers: hv: vmbus: Move the definition of generate_guest_id() kys
2016-12-30 21:35 ` [PATCH 03/18] Drivers: hv vmbus: Move Hypercall page setup out of common code kys
2016-12-30 21:35 ` [PATCH 04/18] Drivers: hv: vmbus: Move Hypercall invocation code " kys
2016-12-30 21:35 ` [PATCH 05/18] Drivers: hv: vmbus: Consolidate all Hyper-V specific clocksource code kys
2016-12-30 21:36 ` [PATCH 06/18] Drivers: hv: vmbus: Move the extracting of Hypervisor version information kys
2016-12-30 21:36 ` kys [this message]
2016-12-30 21:36 ` [PATCH 08/18] Drivers: hv: vmbus: Move the check for hypercall page setup kys
2016-12-30 21:36 ` [PATCH 09/18] Drivers: hv: vmbus: Move the code to signal end of message kys
2016-12-30 21:36 ` [PATCH 10/18] Drivers: hv: vmbus: Restructure the clockevents code kys
2016-12-30 21:36 ` [PATCH 11/18] Drivers: hv: util: Use hv_get_current_tick() to get current tick kys
2016-12-30 21:36 ` [PATCH 12/18] Drivers: hv: vmbus: Get rid of an unsused variable kys
2016-12-30 21:36 ` [PATCH 13/18] Drivers: hv: vmbus: Define APIs to manipulate the message page kys
2016-12-30 21:36 ` [PATCH 14/18] Drivers: hv: vmbus: Define APIs to manipulate the event page kys
2016-12-30 21:36 ` [PATCH 15/18] Drivers: hv: vmbus: Define APIs to manipulate the synthetic interrupt controller kys
2016-12-30 21:36 ` [PATCH 16/18] Drivers: hv: vmbus: Define an API to retrieve virtual processor index kys
2016-12-30 21:36 ` [PATCH 17/18] Drivers: hv: vmbus: Define an APIs to manage interrupt state kys
2016-12-30 21:36 ` [PATCH 18/18] Drivers: hv: vmbus: Cleanup hyperv_vmbus.h kys
2017-01-10 17:27 ` [PATCH 01/18] Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents Greg KH
2017-01-12 2:32 ` KY Srinivasan
2017-01-12 18:29 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483133772-29776-7-git-send-email-kys@exchange.microsoft.com \
--to=kys@exchange.microsoft.com \
--cc=apw@canonical.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jasowang@redhat.com \
--cc=kys@microsoft.com \
--cc=leann.ogasawara@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=rkagan@virtuozzo.com \
--cc=tglx@linutronix.de \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®