From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76E2AC04AB1 for ; Mon, 13 May 2019 04:59:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 34C5320B7C for ; Mon, 13 May 2019 04:59:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34C5320B7C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:50949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQ347-0004Mf-HG for qemu-devel@archiver.kernel.org; Mon, 13 May 2019 00:59:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQ328-0003R3-SW for qemu-devel@nongnu.org; Mon, 13 May 2019 00:57:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQ326-00085Y-UC for qemu-devel@nongnu.org; Mon, 13 May 2019 00:57:52 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43610) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hQ324-00083Z-VA for qemu-devel@nongnu.org; Mon, 13 May 2019 00:57:50 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4D4vlCV064538 for ; Mon, 13 May 2019 00:57:47 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2setc1um4x-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 May 2019 00:57:47 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 May 2019 05:57:16 +0100 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 13 May 2019 05:57:14 +0100 Received: from b03ledav001.gho.boulder.ibm.com (b03ledav001.gho.boulder.ibm.com [9.17.130.232]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x4D4vDto000440 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 May 2019 04:57:13 GMT Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5CC1F6E053; Mon, 13 May 2019 04:57:13 +0000 (GMT) Received: from b03ledav001.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6558D6E04C; Mon, 13 May 2019 04:57:11 +0000 (GMT) Received: from [9.124.31.31] (unknown [9.124.31.31]) by b03ledav001.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 13 May 2019 04:57:11 +0000 (GMT) To: Greg Kurz References: <155591636364.20338.844048953355207313.stgit@aravinda> <155591657807.20338.12115795588476734752.stgit@aravinda> <20190510110604.67c0d18d@bahia.lan> <20190510163350.58cc85b9@bahia.lab.toulouse-stg.fr.ibm.com> From: Aravinda Prasad Date: Mon, 13 May 2019 10:27:09 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20190510163350.58cc85b9@bahia.lab.toulouse-stg.fr.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 19051304-0020-0000-0000-00000EE74712 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00011091; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000285; SDB=6.01202559; UDB=6.00631154; IPR=6.00983476; MB=3.00026861; MTD=3.00000008; XFM=3.00000015; UTC=2019-05-13 04:57:16 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19051304-0021-0000-0000-000065CD9F7E Message-Id: <0da3ea09-52a0-9b5e-5ee9-5da2f8f72878@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-13_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905130036 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: Re: [Qemu-devel] [Qemu-ppc] [PATCH v8 1/6] ppc: spapr: Handle "ibm, nmi-register" and "ibm, nmi-interlock" RTAS calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@au1.ibm.com, qemu-devel@nongnu.org, paulus@ozlabs.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Friday 10 May 2019 08:03 PM, Greg Kurz wrote: > On Fri, 10 May 2019 11:06:04 +0200 > Greg Kurz wrote: > >> On Mon, 22 Apr 2019 12:32:58 +0530 >> Aravinda Prasad wrote: >> >>> This patch adds support in QEMU to handle "ibm,nmi-register" >>> and "ibm,nmi-interlock" RTAS calls. >>> >>> The machine check notification address is saved when the >>> OS issues "ibm,nmi-register" RTAS call. >>> >>> 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 that also received a machine check error waits >>> till the first processor 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. >>> >>> Signed-off-by: Aravinda Prasad >>> --- >>> hw/ppc/spapr.c | 18 ++++++++++++++ >>> hw/ppc/spapr_rtas.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ >>> include/hw/ppc/spapr.h | 9 ++++++- >>> 3 files changed, 87 insertions(+), 1 deletion(-) >>> >>> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c >>> index c56939a..6642cb5 100644 >>> --- a/hw/ppc/spapr.c >>> +++ b/hw/ppc/spapr.c >>> @@ -1805,6 +1805,11 @@ static void spapr_machine_reset(void) >>> first_ppc_cpu->env.gpr[5] = 0; >>> >>> spapr->cas_reboot = false; >>> + >>> + spapr->guest_machine_check_addr = -1; >>> + >>> + /* Signal all vCPUs waiting on this condition */ >>> + qemu_cond_broadcast(&spapr->mc_delivery_cond); >>> } >>> >>> static void spapr_create_nvram(SpaprMachineState *spapr) >>> @@ -2095,6 +2100,16 @@ static const VMStateDescription vmstate_spapr_dtb = { >>> }, >>> }; >>> >>> +static const VMStateDescription vmstate_spapr_machine_check = { >>> + .name = "spapr_machine_check", >>> + .version_id = 1, >>> + .minimum_version_id = 1, >>> + .fields = (VMStateField[]) { >>> + VMSTATE_UINT64(guest_machine_check_addr, SpaprMachineState), > > Also this should use VMSTATE_UINTTL() sure.. Regards, Aravinda > >>> + VMSTATE_END_OF_LIST() >>> + }, >> >> This VMState descriptor is missing a .needed field because we only want >> to migrate the subsection if the guest has called NMI register, ie. >> spapr->guest_machine_check_addr != (target_ulong) -1. >> >>> +}; >>> + >>> static const VMStateDescription vmstate_spapr = {765cf442a8afe8e5c8c6896b5072066df5129077 >>> .name = "spapr", >>> .version_id = 3, >>> @@ -2127,6 +2142,7 @@ static const VMStateDescription vmstate_spapr = { >>> &vmstate_spapr_dtb, >>> &vmstate_spapr_cap_large_decr, >>> &vmstate_spapr_cap_ccf_assist, >>> + &vmstate_spapr_machine_check, >>> NULL >>> } >>> }; >>> @@ -3068,6 +3084,8 @@ static void spapr_machine_init(MachineState *machine) >>> >>> kvmppc_spapr_enable_inkernel_multitce(); >>> } >>> + >>> + qemu_cond_init(&spapr->mc_delivery_cond); >>> } >>> >>> static int spapr_kvm_type(MachineState *machine, const char *vm_type) >>> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c >>> index ee24212..c2f3991 100644 >>> --- a/hw/ppc/spapr_rtas.c >>> +++ b/hw/ppc/spapr_rtas.c >>> @@ -348,6 +348,39 @@ static void rtas_get_power_level(PowerPCCPU *cpu, SpaprMachineState *spapr, >>> rtas_st(rets, 1, 100); >>> } >>> >>> +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) >>> +{ >>> + uint64_t rtas_addr = spapr_get_rtas_addr(); >>> + >>> + if (!rtas_addr) { >>> + rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED); >>> + return; >>> + } >>> + >>> + spapr->guest_machine_check_addr = 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) { >> >> Hmm... the default value is -1. It looks like the check should rather be: >> >> if (spapr->guest_machine_check_addr == (target_ulong) -1) { >> >> >>> + /* NMI register not called */ >>> + rtas_st(rets, 0, RTAS_OUT_PARAM_ERROR); >>> + } else { >>> + 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; >>> @@ -466,6 +499,30 @@ void spapr_load_rtas(SpaprMachineState *spapr, void *fdt, hwaddr addr) >>> } >>> } >>> >>> +uint64_t spapr_get_rtas_addr(void) >> >> Shouldn't this be hwaddr instead of uint64_t ? >> >>> +{ >>> + SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); >>> + int rtas_node; >>> + const struct fdt_property *rtas_addr_prop; >>> + void *fdt = spapr->fdt_blob; >>> + uint32_t rtas_addr; >>> + >>> + /* fetch rtas addr from fdt */ >>> + rtas_node = fdt_path_offset(fdt, "/rtas"); >>> + if (rtas_node == 0) { >>> + return 0; >>> + } >>> + >>> + rtas_addr_prop = fdt_get_property(fdt, rtas_node, "linux,rtas-base", NULL); >>> + if (!rtas_addr_prop) { >> >> Just for curiosity: this is ok for linux, but what about other OSes (eg. AIX) ? >> >>> + return 0; >>> + } >>> + >>> + rtas_addr = fdt32_to_cpu(*(uint32_t *)rtas_addr_prop->data); >> >> Also this assumes the OS called RTAS instantiate-rtas, but some other >> OS might have called RTAS instantiate-rtas-64 instead. I guess it is >> ok for now because SLOF only provides the 32-bit variant, but a >> comment would certainly help IMHO. >> >>> + return (uint64_t)rtas_addr; >>> +} >>> + >>> + >>> static void core_rtas_register_types(void) >>> { >>> spapr_rtas_register(RTAS_DISPLAY_CHARACTER, "display-character", >>> @@ -489,6 +546,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); >>> } >>> >>> type_init(core_rtas_register_types) >>> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h >>> index 7e32f30..ec6f33e 100644 >>> --- a/include/hw/ppc/spapr.h >>> +++ b/include/hw/ppc/spapr.h >>> @@ -187,6 +187,10 @@ struct SpaprMachineState { >>> * occurs during the unplug process. */ >>> QTAILQ_HEAD(, SpaprDimmState) pending_dimm_unplugs; >>> >>> + /* State related to "ibm,nmi-register" and "ibm,nmi-interlock" calls */ >>> + target_ulong guest_machine_check_addr; >>> + QemuCond mc_delivery_cond; >>> + >>> /*< public >*/ >>> char *kvm_type; >>> char *host_model; >>> @@ -623,8 +627,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) >>> >>> -#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2A) >>> +#define RTAS_TOKEN_MAX (RTAS_TOKEN_BASE + 0x2C) >>> >>> /* RTAS ibm,get-system-parameter token values */ >>> #define RTAS_SYSPARM_SPLPAR_CHARACTERISTICS 20 >>> @@ -874,4 +880,5 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize, >>> #define SPAPR_OV5_XIVE_BOTH 0x80 /* Only to advertise on the platform */ >>> >>> void spapr_set_all_lpcrs(target_ulong value, target_ulong mask); >>> +uint64_t spapr_get_rtas_addr(void); >>> #endif /* HW_SPAPR_H */ >>> >>> >> >> > -- Regards, Aravinda