From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diA6S-0007PR-2i for qemu-devel@nongnu.org; Wed, 16 Aug 2017 22:00:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diA6Q-0003gY-V1 for qemu-devel@nongnu.org; Wed, 16 Aug 2017 22:00:08 -0400 Date: Thu, 17 Aug 2017 11:39:34 +1000 From: David Gibson Message-ID: <20170817013934.GC5509@umbus.fritz.box> References: <150287457293.9760.17827532208744487789.stgit@aravinda> <150287474187.9760.12052550430995757993.stgit@aravinda> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ZmUaFz6apKcXQszQ" Content-Disposition: inline In-Reply-To: <150287474187.9760.12052550430995757993.stgit@aravinda> Subject: Re: [Qemu-devel] [PATCH v3 2/5] ppc: spapr: Handle "ibm, nmi-register" and "ibm, nmi-interlock" RTAS calls List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aravinda Prasad Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, aik@ozlabs.ru, mahesh@linux.vnet.ibm.com, benh@au1.ibm.com, paulus@samba.org, sam.bobroff@au1.ibm.com --ZmUaFz6apKcXQszQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable What's with the extra spaces in the subject line? On Wed, Aug 16, 2017 at 02:42:21PM +0530, Aravinda Prasad wrote: > This patch adds support in QEMU to handle "ibm,nmi-register" > and "ibm,nmi-interlock" RTAS calls. >=20 > The machine check notification address is saved when the > OS issues "ibm,nmi-register" RTAS call. >=20 > This patch also handles the case when multiple processors > experience machine check at or about the same time by > handling "ibm,nmi-interlock" call. In such cases, as per > PAPR, subsequent processors serialize waiting for the first > processor to issue the "ibm,nmi-interlock" call. The second > processor waits till the first processor, which also > received a machine check error, is done reading the error > log. The first processor issues "ibm,nmi-interlock" call > when the error log is consumed. This patch implements the > releasing part of the error-log while subsequent patch > (which builds error log) handles the locking part. >=20 > Signed-off-by: Aravinda Prasad > --- > hw/ppc/spapr.c | 8 ++++++++ > hw/ppc/spapr_rtas.c | 35 +++++++++++++++++++++++++++++++++++ > include/hw/ppc/spapr.h | 10 +++++++++- > 3 files changed, 52 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 2a3e53d..0bb2c4a 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1441,6 +1441,11 @@ static void ppc_spapr_reset(void) > first_ppc_cpu->env.nip =3D SPAPR_ENTRY_POINT; > =20 > spapr->cas_reboot =3D false; > + > + spapr->mc_in_progress =3D false; > + spapr->guest_machine_check_addr =3D 0; > + qemu_cond_destroy(&spapr->mc_delivery_cond); > + qemu_cond_init(&spapr->mc_delivery_cond); > } > =20 > static void spapr_create_nvram(sPAPRMachineState *spapr) > @@ -2491,6 +2496,9 @@ static void ppc_spapr_init(MachineState *machine) > =20 > kvmppc_spapr_enable_inkernel_multitce(); > } > + > + spapr->mc_in_progress =3D false; > + qemu_cond_init(&spapr->mc_delivery_cond); > } > =20 > static int spapr_kvm_type(const char *vm_type) > diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c > index 94a2799..2f3c47b 100644 > --- a/hw/ppc/spapr_rtas.c > +++ b/hw/ppc/spapr_rtas.c > @@ -348,6 +348,37 @@ static void rtas_get_power_level(PowerPCCPU *cpu, sP= APRMachineState *spapr, > rtas_st(rets, 1, 100); > } > =20 > +static void rtas_ibm_nmi_register(PowerPCCPU *cpu, > + sPAPRMachineState *spapr, > + uint32_t token, uint32_t nargs, > + target_ulong args, > + uint32_t nret, target_ulong rets) > +{ > + spapr->guest_machine_check_addr =3D rtas_ld(args, 1); > + rtas_st(rets, 0, RTAS_OUT_SUCCESS); > +} > + > +static void rtas_ibm_nmi_interlock(PowerPCCPU *cpu, > + sPAPRMachineState *spapr, > + uint32_t token, uint32_t nargs, > + target_ulong args, > + uint32_t nret, target_ulong rets) > +{ > + if (!spapr->guest_machine_check_addr) { > + /* NMI register not called */ > + rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); > + } else { > + /* > + * VCPU issuing "ibm,nmi-interlock" is done with NMI handling, > + * hence unset mc_in_progress. > + */ > + spapr->mc_in_progress =3D false; > + qemu_cond_signal(&spapr->mc_delivery_cond); > + rtas_st(rets, 0, RTAS_OUT_SUCCESS); > + } > +} > + > + > static struct rtas_call { > const char *name; > spapr_rtas_fn fn; > @@ -489,6 +520,10 @@ static void core_rtas_register_types(void) > rtas_set_power_level); > spapr_rtas_register(RTAS_GET_POWER_LEVEL, "get-power-level", > rtas_get_power_level); > + spapr_rtas_register(RTAS_IBM_NMI_REGISTER, "ibm,nmi-register", > + rtas_ibm_nmi_register); > + spapr_rtas_register(RTAS_IBM_NMI_INTERLOCK, "ibm,nmi-interlock", > + rtas_ibm_nmi_interlock); > } > =20 > type_init(core_rtas_register_types) > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 46012b3..eee8d33 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -123,6 +123,12 @@ struct sPAPRMachineState { > * occurs during the unplug process. */ > QTAILQ_HEAD(, sPAPRDIMMState) pending_dimm_unplugs; > =20 > + /* State related to "ibm,nmi-register" and "ibm,nmi-interlock" calls= */ > + target_ulong guest_machine_check_addr; > + bool mc_in_progress; > + int mc_cpu; mc_cpu isn't actually used yet in this patch. In any case it and mc_in_progress could probably be folded together, no? These values will also need to be migrated, AFAICT. > + QemuCond mc_delivery_cond; > + > /*< public >*/ > char *kvm_type; > MemoryHotplugState hotplug_memory; > @@ -519,8 +525,10 @@ target_ulong spapr_hypercall(PowerPCCPU *cpu, target= _ulong opcode, > #define RTAS_IBM_CREATE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x27) > #define RTAS_IBM_REMOVE_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x28) > #define RTAS_IBM_RESET_PE_DMA_WINDOW (RTAS_TOKEN_BASE + 0x29) > +#define RTAS_IBM_NMI_REGISTER (RTAS_TOKEN_BASE + 0x2A) > +#define RTAS_IBM_NMI_INTERLOCK (RTAS_TOKEN_BASE + 0x2B) > =20 > -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) > +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2C) > =20 > /* RTAS ibm,get-system-parameter token values */ > #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20 >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --ZmUaFz6apKcXQszQ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlmU89YACgkQbDjKyiDZ s5K5qxAAq+UOmwWJuUtMKh+pYJPmRD3TnQhMQT699wil4jf/lDp7wT6Zn5FzwrVT BuKPDBgC4ejekw2RkvocS++pCjPRNc52bJnszHIfR0rAmAJzxCHcyf+06XGd4cQx 0se3CB+1q/+bTpZB9PiylyeyKSWLGPR2V6vLX6nCj4dPDbpovXopnDUv6g1uPHU5 UuHkPh4dZYM6G8ZkIo4tIVQz65RFzJeQctxi00bkKwTTOaP9GcS3BaGEdFkMj0T0 Ch8yOCZTQVVXJOWUlDanNGxGPDotOKBSCOYO7AKWHIzEnccRbsyrbEgZ4Wzuycw6 gJrkWA6HYCIuZVKyAZGD23JYsRRQtN/g0Ut1nx1OPZz6vdF/yrHL4/9MkGYuvIzE ntaFCl4Ji7pxLGeKg68j+13seqoAY/tytLxVEUeCtRW9Y/rntGPB+XWC0UqY5/LB NRVDhGJXux1DW4AJPBLUEmyzSjuBN28BTW4kdvDjhzA6aAciYCrfGUh9DI/6N6bN 28+ol0cE4QTeOz2mtAQLSwtLzGZYW4Yt1EqVizzRq+4h7YaAwDgtSHAVpj7UYZs2 LEnBrDc954xvzzq4RReiL3+HJ0BcGOBs0JjLykIwyny9ebtfC0iED9NpeucCgzYq NoERNXtR6RdJwiHVw/eHp5AwkUC2S9Isjg48z8y0/wW7GNhB7rs= =Oz+l -----END PGP SIGNATURE----- --ZmUaFz6apKcXQszQ--