2012-04-02 11:39:23 +02:00
|
|
|
/*
|
|
|
|
* QEMU S/390 CPU
|
|
|
|
*
|
2012-04-02 13:31:59 +02:00
|
|
|
* Copyright (c) 2009 Ulrich Hecht
|
|
|
|
* Copyright (c) 2011 Alexander Graf
|
2012-04-02 11:39:23 +02:00
|
|
|
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
2013-01-07 06:27:14 +01:00
|
|
|
* Copyright (c) 2012 IBM Corp.
|
2012-04-02 11:39:23 +02:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, see
|
|
|
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
2013-01-07 06:27:14 +01:00
|
|
|
* Contributions after 2012-12-11 are licensed under the terms of the
|
|
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
2012-04-02 11:39:23 +02:00
|
|
|
*/
|
|
|
|
|
2016-01-26 19:17:00 +01:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2012-05-03 04:13:04 +02:00
|
|
|
#include "cpu.h"
|
2017-08-18 13:43:49 +02:00
|
|
|
#include "internal.h"
|
2017-08-18 13:43:52 +02:00
|
|
|
#include "kvm_s390x.h"
|
|
|
|
#include "sysemu/kvm.h"
|
2012-04-02 11:39:23 +02:00
|
|
|
#include "qemu-common.h"
|
2016-03-20 18:16:19 +01:00
|
|
|
#include "qemu/cutils.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/timer.h"
|
2014-09-30 10:57:29 +02:00
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "trace.h"
|
2016-03-04 18:34:34 +01:00
|
|
|
#include "qapi/visitor.h"
|
2018-02-27 00:13:27 +01:00
|
|
|
#include "qapi/qapi-visit-misc.h"
|
|
|
|
#include "qapi/qapi-visit-run-state.h"
|
s390x/cpu: expose the guest crash information
This patch is the s390 implementation of guest crash information,
similar to commit d187e08dc4 ("i386/cpu: add crash-information QOM
property") and the related commits. We will detect several crash
reasons, with the "disabled wait" being the most important one, since
this is used by all s390 guests as a "panic like" notification.
Demonstrate these ways with examples as follows.
1. crash-information QOM property;
Run qemu with -qmp unix:qmp-sock,server, then use utility "qmp-shell"
to execute "qom-get" command, and might get the result like,
(QEMU) (QEMU) qom-get path=/machine/unattached/device[0] \
property=crash-information
{"return": {"core": 0, "reason": "disabled-wait", "psw-mask": 562956395872256, \
"type": "s390", "psw-addr": 1102832}}
2. GUEST_PANICKED event reporting;
Run qemu with a socket option, and telnet or nc to that,
-chardev socket,id=qmp,port=4444,host=localhost,server \
-mon chardev=qmp,mode=control,pretty=on \
Negotiating the mode by { "execute": "qmp_capabilities" }, and the crash
information will be reported on a guest crash event like,
{
"timestamp": {
"seconds": 1518004739,
"microseconds": 552563
},
"event": "GUEST_PANICKED",
"data": {
"action": "pause",
"info": {
"core": 0,
"psw-addr": 1102832,
"reason": "disabled-wait",
"psw-mask": 562956395872256,
"type": "s390"
}
}
}
3. log;
Run qemu with the parameters: -D <logfile> -d guest_errors, to
specify the logfile and log item. The results might be,
Guest crashed on cpu 0: disabled-wait
PSW: 0x0002000180000000 0x000000000010d3f0
Co-authored-by: Jing Liu <liujbjl@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20180209122543.25755-1-borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[CH: tweaked qapi comment]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-09 13:25:43 +01:00
|
|
|
#include "sysemu/hw_accel.h"
|
2016-03-15 13:18:37 +01:00
|
|
|
#include "exec/exec-all.h"
|
2017-09-13 15:24:08 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2013-01-20 19:41:06 +01:00
|
|
|
#ifndef CONFIG_USER_ONLY
|
2014-06-27 08:40:04 +02:00
|
|
|
#include "hw/hw.h"
|
2012-12-18 08:50:59 +01:00
|
|
|
#include "sysemu/arch_init.h"
|
2016-03-04 18:34:34 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2012-12-18 08:50:59 +01:00
|
|
|
#endif
|
2018-01-19 19:24:22 +01:00
|
|
|
#include "fpu/softfloat.h"
|
2012-12-18 08:50:59 +01:00
|
|
|
|
2013-01-07 06:27:14 +01:00
|
|
|
#define CR0_RESET 0xE0UL
|
|
|
|
#define CR14_RESET 0xC2000000UL;
|
|
|
|
|
2013-06-21 19:09:18 +02:00
|
|
|
static void s390_cpu_set_pc(CPUState *cs, vaddr value)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(cs);
|
|
|
|
|
|
|
|
cpu->env.psw.addr = value;
|
|
|
|
}
|
|
|
|
|
2013-08-25 18:53:55 +02:00
|
|
|
static bool s390_cpu_has_work(CPUState *cs)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(cs);
|
|
|
|
|
2017-09-28 22:36:44 +02:00
|
|
|
/* STOPPED cpus can never wake up */
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
if (s390_cpu_get_state(cpu) != S390_CPU_STATE_LOAD &&
|
|
|
|
s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING) {
|
2017-09-28 22:36:44 +02:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2017-09-28 22:36:42 +02:00
|
|
|
if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return s390_cpu_has_int(cpu);
|
2013-08-25 18:53:55 +02:00
|
|
|
}
|
|
|
|
|
2013-07-25 16:45:51 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
/* S390CPUClass::load_normal() */
|
|
|
|
static void s390_cpu_load_normal(CPUState *s)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(s);
|
2013-11-15 14:46:38 +01:00
|
|
|
cpu->env.psw.addr = ldl_phys(s->as, 4) & PSW_MASK_ESA_ADDR;
|
2013-07-25 16:45:51 +02:00
|
|
|
cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64;
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
|
2013-07-25 16:45:51 +02:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
/* S390CPUClass::cpu_reset() */
|
2012-04-02 11:39:23 +02:00
|
|
|
static void s390_cpu_reset(CPUState *s)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(s);
|
|
|
|
S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
|
|
|
|
CPUS390XState *env = &cpu->env;
|
|
|
|
|
2013-09-05 13:54:39 +02:00
|
|
|
env->pfault_token = -1UL;
|
2018-01-18 09:56:27 +01:00
|
|
|
env->bpbc = false;
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
scc->parent_reset(s);
|
2015-02-24 14:15:27 +01:00
|
|
|
cpu->env.sigp_order = 0;
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* S390CPUClass::initial_reset() */
|
|
|
|
static void s390_cpu_initial_reset(CPUState *s)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(s);
|
|
|
|
CPUS390XState *env = &cpu->env;
|
|
|
|
|
|
|
|
s390_cpu_reset(s);
|
2017-05-12 13:47:30 +02:00
|
|
|
/* initial reset does not clear everything! */
|
|
|
|
memset(&env->start_initial_reset_fields, 0,
|
|
|
|
offsetof(CPUS390XState, end_reset_fields) -
|
|
|
|
offsetof(CPUS390XState, start_initial_reset_fields));
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
|
|
|
|
/* architectured initial values for CR 0 and 14 */
|
|
|
|
env->cregs[0] = CR0_RESET;
|
|
|
|
env->cregs[14] = CR14_RESET;
|
2013-09-05 13:54:39 +02:00
|
|
|
|
2015-06-13 00:46:03 +02:00
|
|
|
/* architectured initial value for Breaking-Event-Address register */
|
|
|
|
env->gbea = 1;
|
|
|
|
|
2013-09-05 13:54:39 +02:00
|
|
|
env->pfault_token = -1UL;
|
2014-02-12 09:56:35 +01:00
|
|
|
|
2015-05-25 01:47:26 +02:00
|
|
|
/* tininess for underflow is detected before rounding */
|
|
|
|
set_float_detect_tininess(float_tininess_before_rounding,
|
|
|
|
&env->fpu_status);
|
|
|
|
|
2014-02-12 09:56:35 +01:00
|
|
|
/* Reset state inside the kernel that we cannot access yet from QEMU. */
|
|
|
|
if (kvm_enabled()) {
|
2014-09-30 10:57:31 +02:00
|
|
|
kvm_s390_reset_vcpu(cpu);
|
2014-02-12 09:56:35 +01:00
|
|
|
}
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* CPUClass:reset() */
|
|
|
|
static void s390_cpu_full_reset(CPUState *s)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = S390_CPU(s);
|
|
|
|
S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
|
|
|
|
CPUS390XState *env = &cpu->env;
|
|
|
|
|
2012-04-02 11:39:23 +02:00
|
|
|
scc->parent_reset(s);
|
2015-02-24 14:15:27 +01:00
|
|
|
cpu->env.sigp_order = 0;
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
|
2012-04-02 11:39:23 +02:00
|
|
|
|
2016-11-14 15:19:17 +01:00
|
|
|
memset(env, 0, offsetof(CPUS390XState, end_reset_fields));
|
2013-01-07 06:27:14 +01:00
|
|
|
|
|
|
|
/* architectured initial values for CR 0 and 14 */
|
|
|
|
env->cregs[0] = CR0_RESET;
|
|
|
|
env->cregs[14] = CR14_RESET;
|
2013-09-05 13:54:39 +02:00
|
|
|
|
2015-06-13 00:46:03 +02:00
|
|
|
/* architectured initial value for Breaking-Event-Address register */
|
|
|
|
env->gbea = 1;
|
|
|
|
|
2013-09-05 13:54:39 +02:00
|
|
|
env->pfault_token = -1UL;
|
|
|
|
|
2015-05-25 01:47:26 +02:00
|
|
|
/* tininess for underflow is detected before rounding */
|
|
|
|
set_float_detect_tininess(float_tininess_before_rounding,
|
|
|
|
&env->fpu_status);
|
|
|
|
|
2014-09-30 10:57:31 +02:00
|
|
|
/* Reset state inside the kernel that we cannot access yet from QEMU. */
|
2013-03-20 13:11:56 +01:00
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_s390_reset_vcpu(cpu);
|
|
|
|
}
|
2012-04-02 11:39:23 +02:00
|
|
|
}
|
|
|
|
|
2013-01-07 06:27:14 +01:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
static void s390_cpu_machine_reset_cb(void *opaque)
|
|
|
|
{
|
|
|
|
S390CPU *cpu = opaque;
|
|
|
|
|
2016-10-31 10:36:08 +01:00
|
|
|
run_on_cpu(CPU(cpu), s390_do_cpu_full_reset, RUN_ON_CPU_NULL);
|
2013-01-07 06:27:14 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-07-12 03:59:58 +02:00
|
|
|
static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
|
|
|
|
{
|
|
|
|
info->mach = bfd_mach_s390_64;
|
|
|
|
info->print_insn = print_insn_s390;
|
|
|
|
}
|
|
|
|
|
2013-01-16 04:00:41 +01:00
|
|
|
static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
|
|
|
|
{
|
2013-07-27 02:53:25 +02:00
|
|
|
CPUState *cs = CPU(dev);
|
2013-01-16 04:00:41 +01:00
|
|
|
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
|
2017-09-28 15:46:08 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
2016-03-04 18:34:31 +01:00
|
|
|
S390CPU *cpu = S390_CPU(dev);
|
2017-09-28 15:46:08 +02:00
|
|
|
#endif
|
2016-03-04 18:34:31 +01:00
|
|
|
Error *err = NULL;
|
|
|
|
|
2016-09-05 10:52:16 +02:00
|
|
|
/* the model has to be realized before qemu_init_vcpu() due to kvm */
|
|
|
|
s390_realize_cpu_model(cs, &err);
|
|
|
|
if (err) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2016-03-04 18:34:34 +01:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
2017-09-13 15:24:08 +02:00
|
|
|
if (cpu->env.core_id >= max_cpus) {
|
|
|
|
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
|
|
|
|
", maximum core-id: %d", cpu->env.core_id,
|
|
|
|
max_cpus - 1);
|
2016-03-04 18:34:34 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2017-09-13 15:24:07 +02:00
|
|
|
|
2017-09-13 15:24:08 +02:00
|
|
|
if (cpu_exists(cpu->env.core_id)) {
|
|
|
|
error_setg(&err, "Unable to add CPU with core-id: %" PRIu32
|
|
|
|
", it already exists", cpu->env.core_id);
|
2016-03-04 18:34:34 +01:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2017-09-13 15:24:08 +02:00
|
|
|
/* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */
|
2017-09-28 15:46:08 +02:00
|
|
|
cs->cpu_index = cpu->env.core_id;
|
|
|
|
#endif
|
|
|
|
|
2016-10-20 13:26:03 +02:00
|
|
|
cpu_exec_realizefn(cs, &err);
|
2016-03-04 18:34:31 +01:00
|
|
|
if (err != NULL) {
|
2016-03-04 18:34:34 +01:00
|
|
|
goto out;
|
2016-03-04 18:34:31 +01:00
|
|
|
}
|
2013-01-16 04:00:41 +01:00
|
|
|
|
2016-03-04 18:34:31 +01:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
|
|
|
|
#endif
|
2014-08-29 15:52:16 +02:00
|
|
|
s390_cpu_gdb_init(cs);
|
2013-07-27 02:53:25 +02:00
|
|
|
qemu_init_vcpu(cs);
|
2014-08-28 13:58:52 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
2016-10-31 10:36:08 +01:00
|
|
|
run_on_cpu(cs, s390_do_cpu_full_reset, RUN_ON_CPU_NULL);
|
2014-08-28 13:58:52 +02:00
|
|
|
#else
|
2013-07-27 02:53:25 +02:00
|
|
|
cpu_reset(cs);
|
2014-08-28 13:58:52 +02:00
|
|
|
#endif
|
2013-01-16 04:00:41 +01:00
|
|
|
|
2016-03-04 18:34:34 +01:00
|
|
|
scc->parent_realize(dev, &err);
|
|
|
|
out:
|
|
|
|
error_propagate(errp, err);
|
|
|
|
}
|
|
|
|
|
s390x/cpu: expose the guest crash information
This patch is the s390 implementation of guest crash information,
similar to commit d187e08dc4 ("i386/cpu: add crash-information QOM
property") and the related commits. We will detect several crash
reasons, with the "disabled wait" being the most important one, since
this is used by all s390 guests as a "panic like" notification.
Demonstrate these ways with examples as follows.
1. crash-information QOM property;
Run qemu with -qmp unix:qmp-sock,server, then use utility "qmp-shell"
to execute "qom-get" command, and might get the result like,
(QEMU) (QEMU) qom-get path=/machine/unattached/device[0] \
property=crash-information
{"return": {"core": 0, "reason": "disabled-wait", "psw-mask": 562956395872256, \
"type": "s390", "psw-addr": 1102832}}
2. GUEST_PANICKED event reporting;
Run qemu with a socket option, and telnet or nc to that,
-chardev socket,id=qmp,port=4444,host=localhost,server \
-mon chardev=qmp,mode=control,pretty=on \
Negotiating the mode by { "execute": "qmp_capabilities" }, and the crash
information will be reported on a guest crash event like,
{
"timestamp": {
"seconds": 1518004739,
"microseconds": 552563
},
"event": "GUEST_PANICKED",
"data": {
"action": "pause",
"info": {
"core": 0,
"psw-addr": 1102832,
"reason": "disabled-wait",
"psw-mask": 562956395872256,
"type": "s390"
}
}
}
3. log;
Run qemu with the parameters: -D <logfile> -d guest_errors, to
specify the logfile and log item. The results might be,
Guest crashed on cpu 0: disabled-wait
PSW: 0x0002000180000000 0x000000000010d3f0
Co-authored-by: Jing Liu <liujbjl@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20180209122543.25755-1-borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[CH: tweaked qapi comment]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-09 13:25:43 +01:00
|
|
|
static GuestPanicInformation *s390_cpu_get_crash_info(CPUState *cs)
|
|
|
|
{
|
|
|
|
GuestPanicInformation *panic_info;
|
|
|
|
S390CPU *cpu = S390_CPU(cs);
|
|
|
|
|
|
|
|
cpu_synchronize_state(cs);
|
|
|
|
panic_info = g_malloc0(sizeof(GuestPanicInformation));
|
|
|
|
|
|
|
|
panic_info->type = GUEST_PANIC_INFORMATION_TYPE_S390;
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
panic_info->u.s390.core = cpu->env.core_id;
|
|
|
|
#else
|
|
|
|
panic_info->u.s390.core = 0; /* sane default for non system emulation */
|
|
|
|
#endif
|
|
|
|
panic_info->u.s390.psw_mask = cpu->env.psw.mask;
|
|
|
|
panic_info->u.s390.psw_addr = cpu->env.psw.addr;
|
|
|
|
panic_info->u.s390.reason = cpu->env.crash_reason;
|
|
|
|
|
|
|
|
return panic_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_cpu_get_crash_info_qom(Object *obj, Visitor *v,
|
|
|
|
const char *name, void *opaque,
|
|
|
|
Error **errp)
|
|
|
|
{
|
|
|
|
CPUState *cs = CPU(obj);
|
|
|
|
GuestPanicInformation *panic_info;
|
|
|
|
|
|
|
|
if (!cs->crash_occurred) {
|
|
|
|
error_setg(errp, "No crash occurred");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
panic_info = s390_cpu_get_crash_info(cs);
|
|
|
|
|
|
|
|
visit_type_GuestPanicInformation(v, "crash-information", &panic_info,
|
|
|
|
errp);
|
|
|
|
qapi_free_GuestPanicInformation(panic_info);
|
|
|
|
}
|
|
|
|
|
2012-04-02 13:56:29 +02:00
|
|
|
static void s390_cpu_initfn(Object *obj)
|
|
|
|
{
|
2013-01-17 12:13:41 +01:00
|
|
|
CPUState *cs = CPU(obj);
|
2012-04-02 13:56:29 +02:00
|
|
|
S390CPU *cpu = S390_CPU(obj);
|
|
|
|
CPUS390XState *env = &cpu->env;
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
struct tm tm;
|
|
|
|
#endif
|
|
|
|
|
2013-01-17 12:13:41 +01:00
|
|
|
cs->env_ptr = env;
|
2016-03-04 18:34:30 +01:00
|
|
|
cs->halted = 1;
|
|
|
|
cs->exception_index = EXCP_HLT;
|
s390x/cpu: expose the guest crash information
This patch is the s390 implementation of guest crash information,
similar to commit d187e08dc4 ("i386/cpu: add crash-information QOM
property") and the related commits. We will detect several crash
reasons, with the "disabled wait" being the most important one, since
this is used by all s390 guests as a "panic like" notification.
Demonstrate these ways with examples as follows.
1. crash-information QOM property;
Run qemu with -qmp unix:qmp-sock,server, then use utility "qmp-shell"
to execute "qom-get" command, and might get the result like,
(QEMU) (QEMU) qom-get path=/machine/unattached/device[0] \
property=crash-information
{"return": {"core": 0, "reason": "disabled-wait", "psw-mask": 562956395872256, \
"type": "s390", "psw-addr": 1102832}}
2. GUEST_PANICKED event reporting;
Run qemu with a socket option, and telnet or nc to that,
-chardev socket,id=qmp,port=4444,host=localhost,server \
-mon chardev=qmp,mode=control,pretty=on \
Negotiating the mode by { "execute": "qmp_capabilities" }, and the crash
information will be reported on a guest crash event like,
{
"timestamp": {
"seconds": 1518004739,
"microseconds": 552563
},
"event": "GUEST_PANICKED",
"data": {
"action": "pause",
"info": {
"core": 0,
"psw-addr": 1102832,
"reason": "disabled-wait",
"psw-mask": 562956395872256,
"type": "s390"
}
}
}
3. log;
Run qemu with the parameters: -D <logfile> -d guest_errors, to
specify the logfile and log item. The results might be,
Guest crashed on cpu 0: disabled-wait
PSW: 0x0002000180000000 0x000000000010d3f0
Co-authored-by: Jing Liu <liujbjl@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20180209122543.25755-1-borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[CH: tweaked qapi comment]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-09 13:25:43 +01:00
|
|
|
object_property_add(obj, "crash-information", "GuestPanicInformation",
|
|
|
|
s390_cpu_get_crash_info_qom, NULL, NULL, NULL, NULL);
|
2016-09-05 10:52:24 +02:00
|
|
|
s390_cpu_model_register_props(obj);
|
2012-04-02 13:56:29 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
qemu_get_timedate(&tm, 0);
|
|
|
|
env->tod_offset = TOD_UNIX_EPOCH +
|
|
|
|
(time2tod(mktimegm(&tm)) * 1000000000ULL);
|
|
|
|
env->tod_basetime = 0;
|
2013-08-21 17:03:08 +02:00
|
|
|
env->tod_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_tod_timer, cpu);
|
|
|
|
env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu);
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
|
2012-04-02 13:56:29 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2013-01-07 07:14:16 +01:00
|
|
|
static void s390_cpu_finalize(Object *obj)
|
|
|
|
{
|
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
S390CPU *cpu = S390_CPU(obj);
|
|
|
|
|
|
|
|
qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu);
|
2015-03-02 17:44:24 +01:00
|
|
|
g_free(cpu->irqstate);
|
2013-01-07 07:14:16 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2014-09-30 10:57:28 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
2014-09-30 10:57:29 +02:00
|
|
|
static bool disabled_wait(CPUState *cpu)
|
|
|
|
{
|
|
|
|
return cpu->halted && !(S390_CPU(cpu)->env.psw.mask &
|
|
|
|
(PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK));
|
|
|
|
}
|
|
|
|
|
2014-09-30 10:57:28 +02:00
|
|
|
static unsigned s390_count_running_cpus(void)
|
|
|
|
{
|
|
|
|
CPUState *cpu;
|
|
|
|
int nr_running = 0;
|
|
|
|
|
|
|
|
CPU_FOREACH(cpu) {
|
|
|
|
uint8_t state = S390_CPU(cpu)->env.cpu_state;
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
if (state == S390_CPU_STATE_OPERATING ||
|
|
|
|
state == S390_CPU_STATE_LOAD) {
|
2014-09-30 10:57:29 +02:00
|
|
|
if (!disabled_wait(cpu)) {
|
|
|
|
nr_running++;
|
|
|
|
}
|
2014-09-30 10:57:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nr_running;
|
|
|
|
}
|
|
|
|
|
2014-09-30 10:57:29 +02:00
|
|
|
unsigned int s390_cpu_halt(S390CPU *cpu)
|
2014-09-30 10:57:28 +02:00
|
|
|
{
|
|
|
|
CPUState *cs = CPU(cpu);
|
2014-09-30 10:57:29 +02:00
|
|
|
trace_cpu_halt(cs->cpu_index);
|
2014-09-30 10:57:28 +02:00
|
|
|
|
2014-09-30 10:57:29 +02:00
|
|
|
if (!cs->halted) {
|
|
|
|
cs->halted = 1;
|
|
|
|
cs->exception_index = EXCP_HLT;
|
2014-09-30 10:57:28 +02:00
|
|
|
}
|
2014-09-30 10:57:29 +02:00
|
|
|
|
|
|
|
return s390_count_running_cpus();
|
2014-09-30 10:57:28 +02:00
|
|
|
}
|
|
|
|
|
2014-09-30 10:57:29 +02:00
|
|
|
void s390_cpu_unhalt(S390CPU *cpu)
|
2014-09-30 10:57:28 +02:00
|
|
|
{
|
|
|
|
CPUState *cs = CPU(cpu);
|
2014-09-30 10:57:29 +02:00
|
|
|
trace_cpu_unhalt(cs->cpu_index);
|
2014-09-30 10:57:28 +02:00
|
|
|
|
2014-09-30 10:57:29 +02:00
|
|
|
if (cs->halted) {
|
|
|
|
cs->halted = 0;
|
|
|
|
cs->exception_index = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int s390_cpu_set_state(uint8_t cpu_state, S390CPU *cpu)
|
|
|
|
{
|
|
|
|
trace_cpu_set_state(CPU(cpu)->cpu_index, cpu_state);
|
|
|
|
|
|
|
|
switch (cpu_state) {
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
case S390_CPU_STATE_STOPPED:
|
|
|
|
case S390_CPU_STATE_CHECK_STOP:
|
2014-09-30 10:57:29 +02:00
|
|
|
/* halt the cpu for common infrastructure */
|
|
|
|
s390_cpu_halt(cpu);
|
|
|
|
break;
|
qmp: expose s390-specific CPU info
Presently s390x is the only architecture not exposing specific
CPU information via QMP query-cpus. Upstream discussion has shown
that it could make sense to report the architecture specific CPU
state, e.g. to detect that a CPU has been stopped.
With this change the output of query-cpus will look like this on
s390:
[
{"arch": "s390", "current": true,
"props": {"core-id": 0}, "cpu-state": "operating", "CPU": 0,
"qom_path": "/machine/unattached/device[0]",
"halted": false, "thread_id": 63115},
{"arch": "s390", "current": false,
"props": {"core-id": 1}, "cpu-state": "stopped", "CPU": 1,
"qom_path": "/machine/unattached/device[1]",
"halted": true, "thread_id": 63116}
]
This change doesn't add the s390-specific data to HMP 'info cpus'.
A follow-on patch will remove all architecture specific information
from there.
Signed-off-by: Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1518797321-28356-2-git-send-email-mihajlov@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-16 17:08:37 +01:00
|
|
|
case S390_CPU_STATE_OPERATING:
|
|
|
|
case S390_CPU_STATE_LOAD:
|
2017-09-28 22:37:08 +02:00
|
|
|
/*
|
|
|
|
* Starting a CPU with a PSW WAIT bit set:
|
|
|
|
* KVM: handles this internally and triggers another WAIT exit.
|
|
|
|
* TCG: will actually try to continue to run. Don't unhalt, will
|
|
|
|
* be done when the CPU actually has work (an interrupt).
|
|
|
|
*/
|
|
|
|
if (!tcg_enabled() || !(cpu->env.psw.mask & PSW_MASK_WAIT)) {
|
|
|
|
s390_cpu_unhalt(cpu);
|
|
|
|
}
|
2014-09-30 10:57:29 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
error_report("Requested CPU state is not a valid S390 CPU state: %u",
|
|
|
|
cpu_state);
|
|
|
|
exit(1);
|
2014-09-30 10:57:28 +02:00
|
|
|
}
|
2014-09-30 10:57:30 +02:00
|
|
|
if (kvm_enabled() && cpu->env.cpu_state != cpu_state) {
|
|
|
|
kvm_s390_set_cpu_state(cpu, cpu_state);
|
|
|
|
}
|
2014-09-30 10:57:29 +02:00
|
|
|
cpu->env.cpu_state = cpu_state;
|
2014-09-30 10:57:28 +02:00
|
|
|
|
|
|
|
return s390_count_running_cpus();
|
|
|
|
}
|
2017-08-18 13:43:50 +02:00
|
|
|
|
|
|
|
int s390_get_clock(uint8_t *tod_high, uint64_t *tod_low)
|
|
|
|
{
|
2017-10-04 12:57:50 +02:00
|
|
|
int r = 0;
|
|
|
|
|
2017-08-18 13:43:50 +02:00
|
|
|
if (kvm_enabled()) {
|
2017-10-04 12:57:50 +02:00
|
|
|
r = kvm_s390_get_clock_ext(tod_high, tod_low);
|
|
|
|
if (r == -ENXIO) {
|
|
|
|
return kvm_s390_get_clock(tod_high, tod_low);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Fixme TCG */
|
|
|
|
*tod_high = 0;
|
|
|
|
*tod_low = 0;
|
2017-08-18 13:43:50 +02:00
|
|
|
}
|
2017-10-04 12:57:50 +02:00
|
|
|
|
|
|
|
return r;
|
2017-08-18 13:43:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int s390_set_clock(uint8_t *tod_high, uint64_t *tod_low)
|
|
|
|
{
|
2017-10-04 12:57:50 +02:00
|
|
|
int r = 0;
|
|
|
|
|
2017-08-18 13:43:50 +02:00
|
|
|
if (kvm_enabled()) {
|
2017-10-04 12:57:50 +02:00
|
|
|
r = kvm_s390_set_clock_ext(tod_high, tod_low);
|
|
|
|
if (r == -ENXIO) {
|
|
|
|
return kvm_s390_set_clock(tod_high, tod_low);
|
|
|
|
}
|
2017-08-18 13:43:50 +02:00
|
|
|
}
|
|
|
|
/* Fixme TCG */
|
2017-10-04 12:57:50 +02:00
|
|
|
return r;
|
2017-08-18 13:43:50 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int s390_set_memory_limit(uint64_t new_limit, uint64_t *hw_limit)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
return kvm_s390_set_mem_limit(new_limit, hw_limit);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void s390_cmma_reset(void)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_s390_cmma_reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int s390_assign_subch_ioeventfd(EventNotifier *notifier, uint32_t sch_id,
|
|
|
|
int vq, bool assign)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
return kvm_s390_assign_subch_ioeventfd(notifier, sch_id, vq, assign);
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void s390_crypto_reset(void)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_s390_crypto_reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool s390_get_squash_mcss(void)
|
|
|
|
{
|
|
|
|
if (object_property_get_bool(OBJECT(qdev_get_machine()), "s390-squash-mcss",
|
|
|
|
NULL)) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2017-08-18 13:43:51 +02:00
|
|
|
|
|
|
|
void s390_enable_css_support(S390CPU *cpu)
|
|
|
|
{
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
kvm_s390_enable_css_support(cpu);
|
|
|
|
}
|
|
|
|
}
|
2014-09-30 10:57:28 +02:00
|
|
|
#endif
|
|
|
|
|
2015-12-03 13:14:41 +01:00
|
|
|
static gchar *s390_gdb_arch_name(CPUState *cs)
|
|
|
|
{
|
|
|
|
return g_strdup("s390:64-bit");
|
|
|
|
}
|
|
|
|
|
2017-09-13 15:24:08 +02:00
|
|
|
static Property s390x_cpu_properties[] = {
|
2017-09-28 15:46:08 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
2017-09-13 15:24:08 +02:00
|
|
|
DEFINE_PROP_UINT32("core-id", S390CPU, env.core_id, 0),
|
2017-09-28 15:46:08 +02:00
|
|
|
#endif
|
2017-09-13 15:24:08 +02:00
|
|
|
DEFINE_PROP_END_OF_LIST()
|
|
|
|
};
|
|
|
|
|
2012-04-02 11:39:23 +02:00
|
|
|
static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
S390CPUClass *scc = S390_CPU_CLASS(oc);
|
|
|
|
CPUClass *cc = CPU_CLASS(scc);
|
2013-01-20 19:41:06 +01:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
2012-04-02 11:39:23 +02:00
|
|
|
|
2018-01-14 03:04:12 +01:00
|
|
|
device_class_set_parent_realize(dc, s390_cpu_realizefn,
|
|
|
|
&scc->parent_realize);
|
2017-09-13 15:24:08 +02:00
|
|
|
dc->props = s390x_cpu_properties;
|
2017-09-13 15:24:11 +02:00
|
|
|
dc->user_creatable = true;
|
2013-01-16 04:00:41 +01:00
|
|
|
|
2012-04-02 11:39:23 +02:00
|
|
|
scc->parent_reset = cc->reset;
|
2013-07-25 16:45:51 +02:00
|
|
|
#if !defined(CONFIG_USER_ONLY)
|
|
|
|
scc->load_normal = s390_cpu_load_normal;
|
|
|
|
#endif
|
s390/cpu: split CPU reset into architectured functions
s390 provides several CPU resets:
- CPU reset, clears interrupts, stop processing, clears TLB, but does
not touch registers
- initial CPU reset, like CPU reset, but also clears PSW, prefix, FPC,
timer and control registers. It does not touch gprs, fprs and acrs (!)
- Power on reset: the full monty
wire up CPUClass reset to the full monty, but provide the lesser resets
as part of S390CPUClass.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
2013-06-28 10:51:09 +02:00
|
|
|
scc->cpu_reset = s390_cpu_reset;
|
|
|
|
scc->initial_cpu_reset = s390_cpu_initial_reset;
|
|
|
|
cc->reset = s390_cpu_full_reset;
|
2016-09-05 10:52:16 +02:00
|
|
|
cc->class_by_name = s390_cpu_class_by_name,
|
2013-08-25 18:53:55 +02:00
|
|
|
cc->has_work = s390_cpu_has_work;
|
2017-07-24 10:52:50 +02:00
|
|
|
#ifdef CONFIG_TCG
|
2013-02-02 10:57:51 +01:00
|
|
|
cc->do_interrupt = s390_cpu_do_interrupt;
|
2017-07-24 10:52:50 +02:00
|
|
|
#endif
|
2013-05-27 01:33:50 +02:00
|
|
|
cc->dump_state = s390_cpu_dump_state;
|
s390x/cpu: expose the guest crash information
This patch is the s390 implementation of guest crash information,
similar to commit d187e08dc4 ("i386/cpu: add crash-information QOM
property") and the related commits. We will detect several crash
reasons, with the "disabled wait" being the most important one, since
this is used by all s390 guests as a "panic like" notification.
Demonstrate these ways with examples as follows.
1. crash-information QOM property;
Run qemu with -qmp unix:qmp-sock,server, then use utility "qmp-shell"
to execute "qom-get" command, and might get the result like,
(QEMU) (QEMU) qom-get path=/machine/unattached/device[0] \
property=crash-information
{"return": {"core": 0, "reason": "disabled-wait", "psw-mask": 562956395872256, \
"type": "s390", "psw-addr": 1102832}}
2. GUEST_PANICKED event reporting;
Run qemu with a socket option, and telnet or nc to that,
-chardev socket,id=qmp,port=4444,host=localhost,server \
-mon chardev=qmp,mode=control,pretty=on \
Negotiating the mode by { "execute": "qmp_capabilities" }, and the crash
information will be reported on a guest crash event like,
{
"timestamp": {
"seconds": 1518004739,
"microseconds": 552563
},
"event": "GUEST_PANICKED",
"data": {
"action": "pause",
"info": {
"core": 0,
"psw-addr": 1102832,
"reason": "disabled-wait",
"psw-mask": 562956395872256,
"type": "s390"
}
}
}
3. log;
Run qemu with the parameters: -D <logfile> -d guest_errors, to
specify the logfile and log item. The results might be,
Guest crashed on cpu 0: disabled-wait
PSW: 0x0002000180000000 0x000000000010d3f0
Co-authored-by: Jing Liu <liujbjl@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20180209122543.25755-1-borntraeger@de.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[CH: tweaked qapi comment]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
2018-02-09 13:25:43 +01:00
|
|
|
cc->get_crash_info = s390_cpu_get_crash_info;
|
2013-06-21 19:09:18 +02:00
|
|
|
cc->set_pc = s390_cpu_set_pc;
|
2013-06-29 04:18:45 +02:00
|
|
|
cc->gdb_read_register = s390_cpu_gdb_read_register;
|
|
|
|
cc->gdb_write_register = s390_cpu_gdb_write_register;
|
2013-08-26 03:01:33 +02:00
|
|
|
#ifdef CONFIG_USER_ONLY
|
|
|
|
cc->handle_mmu_fault = s390_cpu_handle_mmu_fault;
|
|
|
|
#else
|
2013-06-29 18:55:54 +02:00
|
|
|
cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;
|
2014-09-30 10:58:42 +02:00
|
|
|
cc->vmsd = &vmstate_s390_cpu;
|
2013-07-10 15:26:46 +02:00
|
|
|
cc->write_elf64_note = s390_cpu_write_elf64_note;
|
2017-07-24 10:52:50 +02:00
|
|
|
#ifdef CONFIG_TCG
|
2014-09-13 18:45:19 +02:00
|
|
|
cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;
|
2015-06-13 00:46:00 +02:00
|
|
|
cc->debug_excp_handler = s390x_cpu_debug_excp_handler;
|
2017-03-02 03:06:18 +01:00
|
|
|
cc->do_unaligned_access = s390x_cpu_do_unaligned_access;
|
2017-07-24 10:52:50 +02:00
|
|
|
#endif
|
2013-06-29 18:55:54 +02:00
|
|
|
#endif
|
2015-07-12 03:59:58 +02:00
|
|
|
cc->disas_set_info = s390_cpu_disas_set_info;
|
2017-10-26 15:58:14 +02:00
|
|
|
#ifdef CONFIG_TCG
|
2017-10-16 04:02:42 +02:00
|
|
|
cc->tcg_initialize = s390x_translate_init;
|
2017-10-26 15:58:14 +02:00
|
|
|
#endif
|
2015-07-12 03:59:58 +02:00
|
|
|
|
2014-08-29 15:52:16 +02:00
|
|
|
cc->gdb_num_core_regs = S390_NUM_CORE_REGS;
|
|
|
|
cc->gdb_core_xml_file = "s390x-core64.xml";
|
2015-12-03 13:14:41 +01:00
|
|
|
cc->gdb_arch_name = s390_gdb_arch_name;
|
qdev: Protect device-list-properties against broken devices
Several devices don't survive object_unref(object_new(T)): they crash
or hang during cleanup, or they leave dangling pointers behind.
This breaks at least device-list-properties, because
qmp_device_list_properties() needs to create a device to find its
properties. Broken in commit f4eb32b "qmp: show QOM properties in
device-list-properties", v2.1. Example reproducer:
$ qemu-system-aarch64 -nodefaults -display none -machine none -S -qmp stdio
{"QMP": {"version": {"qemu": {"micro": 50, "minor": 4, "major": 2}, "package": ""}, "capabilities": []}}
{ "execute": "qmp_capabilities" }
{"return": {}}
{ "execute": "device-list-properties", "arguments": { "typename": "pxa2xx-pcmcia" } }
qemu-system-aarch64: /home/armbru/work/qemu/memory.c:1307: memory_region_finalize: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed.
Aborted (core dumped)
[Exit 134 (SIGABRT)]
Unfortunately, I can't fix the problems in these devices right now.
Instead, add DeviceClass member cannot_destroy_with_object_finalize_yet
to mark them:
* Hang during cleanup (didn't debug, so I can't say why):
"realview_pci", "versatile_pci".
* Dangling pointer in cpus: most CPUs, plus "allwinner-a10", "digic",
"fsl,imx25", "fsl,imx31", "xlnx,zynqmp", because they create such
CPUs
* Assert kvm_enabled(): "host-x86_64-cpu", host-i386-cpu",
"host-powerpc64-cpu", "host-embedded-powerpc-cpu",
"host-powerpc-cpu" (the powerpc ones can't currently reach the
assertion, because the CPUs are only registered when KVM is enabled,
but the assertion is arguably in the wrong place all the same)
Make qmp_device_list_properties() fail cleanly when the device is so
marked. This improves device-list-properties from "crashes, hangs or
leaves dangling pointers behind" to "fails". Not a complete fix, just
a better-than-nothing work-around. In the above reproducer,
device-list-properties now fails with "Can't list properties of device
'pxa2xx-pcmcia'".
This also protects -device FOO,help, which uses the same machinery
since commit ef52358 "qdev-monitor: include QOM properties in -device
FOO, help output", v2.2. Example reproducer:
$ qemu-system-aarch64 -machine none -device pxa2xx-pcmcia,help
Before:
qemu-system-aarch64: .../memory.c:1307: memory_region_finalize: Assertion `((&mr->subregions)->tqh_first == ((void *)0))' failed.
After:
Can't list properties of device 'pxa2xx-pcmcia'
Cc: "Andreas Färber" <afaerber@suse.de>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: Anthony Green <green@moxielogic.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Cc: Blue Swirl <blauwirbel@gmail.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Jia Liu <proljc@gmail.com>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: qemu-ppc@nongnu.org
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1443689999-12182-10-git-send-email-armbru@redhat.com>
2015-10-01 10:59:58 +02:00
|
|
|
|
2016-09-05 10:52:17 +02:00
|
|
|
s390_cpu_model_class_register_props(oc);
|
2012-04-02 11:39:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo s390_cpu_type_info = {
|
|
|
|
.name = TYPE_S390_CPU,
|
|
|
|
.parent = TYPE_CPU,
|
|
|
|
.instance_size = sizeof(S390CPU),
|
2012-04-02 13:56:29 +02:00
|
|
|
.instance_init = s390_cpu_initfn,
|
2013-01-07 07:14:16 +01:00
|
|
|
.instance_finalize = s390_cpu_finalize,
|
2016-09-05 10:52:16 +02:00
|
|
|
.abstract = true,
|
2012-04-02 11:39:23 +02:00
|
|
|
.class_size = sizeof(S390CPUClass),
|
|
|
|
.class_init = s390_cpu_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void s390_cpu_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&s390_cpu_type_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(s390_cpu_register_types)
|