提交 7dc58dee 编写于 作者: Z zhenwei pi 提交者: Paolo Bonzini

pvpanic: implement crashloaded event handling

Handle bit 1 write, then post event to monitor.

Suggested by Paolo, declear a new event, using GUEST_PANICKED could
cause upper layers to react by shutting down or rebooting the guest.

In advance for extention, add GuestPanicInformation in event message.
Signed-off-by: Nzhenwei pi <pizhenwei@bytedance.com>
Message-Id: <20200114023102.612548-3-pizhenwei@bytedance.com>
Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
上级 600d7b47
...@@ -19,9 +19,10 @@ Software should set only bits both itself and the device recognize. ...@@ -19,9 +19,10 @@ Software should set only bits both itself and the device recognize.
Bit Definition Bit Definition
-------------- --------------
bit 0: setting it indicates a guest panic has happened. bit 0: a guest panic has happened and should be processed by the host
bit 1: named crashloaded. setting it indicates a guest panic and run bit 1: a guest panic has happened and will be handled by the guest;
kexec to handle error by guest itself. the host should record it or report it, but should not affect
the execution of the guest.
ACPI Interface ACPI Interface
-------------- --------------
...@@ -30,13 +31,12 @@ pvpanic device is defined with ACPI ID "QEMU0001". Custom methods: ...@@ -30,13 +31,12 @@ pvpanic device is defined with ACPI ID "QEMU0001". Custom methods:
RDPT: To determine whether guest panic notification is supported. RDPT: To determine whether guest panic notification is supported.
Arguments: None Arguments: None
Return: Returns a byte, bit 0 set to indicate guest panic Return: Returns a byte, with the same semantics as the I/O port
notification is supported. Other bits are reserved and interface.
should be ignored.
WRPT: To send a guest panic event WRPT: To send a guest panic event
Arguments: Arg0 is a byte, with bit 0 set to indicate guest panic has Arguments: Arg0 is a byte to be written, with the same semantics as
happened. Other bits are reserved and should be cleared. the I/O interface.
Return: None Return: None
The ACPI device will automatically refer to the right port in case it The ACPI device will automatically refer to the right port in case it
......
...@@ -21,11 +21,13 @@ ...@@ -21,11 +21,13 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/misc/pvpanic.h" #include "hw/misc/pvpanic.h"
/* The bit of supported pv event */ /* The bit of supported pv event, TODO: include uapi header and remove this */
#define PVPANIC_F_PANICKED 0 #define PVPANIC_F_PANICKED 0
#define PVPANIC_F_CRASHLOADED 1
/* The pv event value */ /* The pv event value */
#define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED) #define PVPANIC_PANICKED (1 << PVPANIC_F_PANICKED)
#define PVPANIC_CRASHLOADED (1 << PVPANIC_F_CRASHLOADED)
#define ISA_PVPANIC_DEVICE(obj) \ #define ISA_PVPANIC_DEVICE(obj) \
OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC) OBJECT_CHECK(PVPanicState, (obj), TYPE_PVPANIC)
...@@ -34,7 +36,7 @@ static void handle_event(int event) ...@@ -34,7 +36,7 @@ static void handle_event(int event)
{ {
static bool logged; static bool logged;
if (event & ~PVPANIC_PANICKED && !logged) { if (event & ~(PVPANIC_PANICKED | PVPANIC_CRASHLOADED) && !logged) {
qemu_log_mask(LOG_GUEST_ERROR, "pvpanic: unknown event %#x.\n", event); qemu_log_mask(LOG_GUEST_ERROR, "pvpanic: unknown event %#x.\n", event);
logged = true; logged = true;
} }
...@@ -43,6 +45,11 @@ static void handle_event(int event) ...@@ -43,6 +45,11 @@ static void handle_event(int event)
qemu_system_guest_panicked(NULL); qemu_system_guest_panicked(NULL);
return; return;
} }
if (event & PVPANIC_CRASHLOADED) {
qemu_system_guest_crashloaded(NULL);
return;
}
} }
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
......
...@@ -63,6 +63,7 @@ ShutdownCause qemu_reset_requested_get(void); ...@@ -63,6 +63,7 @@ ShutdownCause qemu_reset_requested_get(void);
void qemu_system_killed(int signal, pid_t pid); void qemu_system_killed(int signal, pid_t pid);
void qemu_system_reset(ShutdownCause reason); void qemu_system_reset(ShutdownCause reason);
void qemu_system_guest_panicked(GuestPanicInformation *info); void qemu_system_guest_panicked(GuestPanicInformation *info);
void qemu_system_guest_crashloaded(GuestPanicInformation *info);
#endif #endif
...@@ -356,6 +356,26 @@ ...@@ -356,6 +356,26 @@
{ 'event': 'GUEST_PANICKED', { 'event': 'GUEST_PANICKED',
'data': { 'action': 'GuestPanicAction', '*info': 'GuestPanicInformation' } } 'data': { 'action': 'GuestPanicAction', '*info': 'GuestPanicInformation' } }
##
# @GUEST_CRASHLOADED:
#
# Emitted when guest OS crash loaded is detected
#
# @action: action that has been taken, currently always "run"
#
# @info: information about a panic
#
# Since: 5.0
#
# Example:
#
# <- { "event": "GUEST_CRASHLOADED",
# "data": { "action": "run" } }
#
##
{ 'event': 'GUEST_CRASHLOADED',
'data': { 'action': 'GuestPanicAction', '*info': 'GuestPanicInformation' } }
## ##
# @GuestPanicAction: # @GuestPanicAction:
# #
...@@ -363,10 +383,10 @@ ...@@ -363,10 +383,10 @@
# #
# @pause: system pauses # @pause: system pauses
# #
# Since: 2.1 (poweroff since 2.8) # Since: 2.1 (poweroff since 2.8, run since 5.0)
## ##
{ 'enum': 'GuestPanicAction', { 'enum': 'GuestPanicAction',
'data': [ 'pause', 'poweroff' ] } 'data': [ 'pause', 'poweroff', 'run' ] }
## ##
# @GuestPanicInformationType: # @GuestPanicInformationType:
......
...@@ -1468,6 +1468,18 @@ void qemu_system_guest_panicked(GuestPanicInformation *info) ...@@ -1468,6 +1468,18 @@ void qemu_system_guest_panicked(GuestPanicInformation *info)
} }
} }
void qemu_system_guest_crashloaded(GuestPanicInformation *info)
{
qemu_log_mask(LOG_GUEST_ERROR, "Guest crash loaded");
qapi_event_send_guest_crashloaded(GUEST_PANIC_ACTION_RUN,
!!info, info);
if (info) {
qapi_free_GuestPanicInformation(info);
}
}
void qemu_system_reset_request(ShutdownCause reason) void qemu_system_reset_request(ShutdownCause reason)
{ {
if (no_reboot && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) { if (no_reboot && reason != SHUTDOWN_CAUSE_SUBSYSTEM_RESET) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册