From nobody Mon Feb 9 23:03:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1562049953; cv=none; d=zoho.com; s=zohoarc; b=WF1v5H3h91iHqsUxfSgUxe9s+/N2YQKfx27xTRQP5h/T+F4l0LsFOxpOtY55tZXlQIscQkgMS2M8aTqoFqidIZzS0yJCqaAPVpoGAgobM2TiNRX0zA+8HAXzuTQdV+rfv69RFXr/Y3xi9X1GgYw0zQUDr2upz/33MzUJODbIal8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562049953; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=3DNTXb+EOxbZdMyiVEbZu9hO543qI6oBQyF64lqb5vE=; b=cBcRZ2L4ouY+il0lZLSU1ETmPC//+/inbDE3gOMoeSV8sk9HZK3Hylc+k3XDHcJu4izvpG1w30Gen5SbiYe4GKvC/LrVdK4aSzQWMYEtyByPgjMWW4ShEmIJgsRuS1wFUgMtrxgO8PnSCii2gXiKYnHVkg8dvYPVZ3zFDuPhpBY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562049942936207.44228800447888; Mon, 1 Jul 2019 23:45:42 -0700 (PDT) Received: from localhost ([::1]:49612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiCXt-00022n-VM for importer@patchew.org; Tue, 02 Jul 2019 02:45:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58464) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hiByl-00051Z-NB for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hiByk-0002wM-82 for qemu-devel@nongnu.org; Tue, 02 Jul 2019 02:09:23 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:33785 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hiByj-0002tX-HP; Tue, 02 Jul 2019 02:09:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45dDMk0svbz9sPY; Tue, 2 Jul 2019 16:09:05 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1562047746; bh=2nJOrSX7TAIqpWh5QCL4SMs7wiJ5bhkcxATACsAlos0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0/GHdapugIt/h87WkS/wnlPj/mdip7fOlIsTtLUoxDYmoNf76AcAzdKE1/BmS81g KHeFO6CiyHvcN3Nfs3yF0dNRYbDRo0+2x+qu/vcn3eVfB2FXuFt4Vjs6nhDe8h5FkR iHkgVu/FZfdE9DhyvI6G7u5HdcRrcPaNVqwydq8E= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 2 Jul 2019 16:08:33 +1000 Message-Id: <20190702060857.3926-26-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190702060857.3926-1-david@gibson.dropbear.id.au> References: <20190702060857.3926-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 25/49] xics/kvm: Add error propagation to ic*_set_kvm_state() functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson , rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Greg Kurz This allows errors happening there to be propagated up to spapr_irq, just like XIVE already does. Signed-off-by: Greg Kurz Message-Id: <156077921763.433243.4614327010172954196.stgit@bahia.lan> Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/intc/xics.c | 39 ++++++++++++++++++++++++++++++++++----- hw/intc/xics_kvm.c | 37 ++++++++++++++++++++++--------------- include/hw/ppc/xics.h | 6 +++--- 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 978d7f0886..faa976e2f8 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -267,7 +267,14 @@ static int icp_post_load(void *opaque, int version_id) ICPState *icp =3D opaque; =20 if (kvm_irqchip_in_kernel()) { - return icp_set_kvm_state(icp); + Error *local_err =3D NULL; + int ret; + + ret =3D icp_set_kvm_state(icp, &local_err); + if (ret < 0) { + error_report_err(local_err); + return ret; + } } =20 return 0; @@ -300,7 +307,12 @@ static void icp_reset_handler(void *dev) qemu_set_irq(icp->output, 0); =20 if (kvm_irqchip_in_kernel()) { - icp_set_kvm_state(ICP(dev)); + Error *local_err =3D NULL; + + icp_set_kvm_state(ICP(dev), &local_err); + if (local_err) { + error_report_err(local_err); + } } } =20 @@ -564,7 +576,12 @@ static void ics_simple_reset(DeviceState *dev) icsc->parent_reset(dev); =20 if (kvm_irqchip_in_kernel()) { - ics_set_kvm_state(ICS_BASE(dev)); + Error *local_err =3D NULL; + + ics_set_kvm_state(ICS_BASE(dev), &local_err); + if (local_err) { + error_report_err(local_err); + } } } =20 @@ -680,7 +697,14 @@ static int ics_base_post_load(void *opaque, int versio= n_id) ICSState *ics =3D opaque; =20 if (kvm_irqchip_in_kernel()) { - return ics_set_kvm_state(ics); + Error *local_err =3D NULL; + int ret; + + ret =3D ics_set_kvm_state(ics, &local_err); + if (ret < 0) { + error_report_err(local_err); + return ret; + } } =20 return 0; @@ -766,8 +790,13 @@ void ics_set_irq_type(ICSState *ics, int srcno, bool l= si) lsi ? XICS_FLAGS_IRQ_LSI : XICS_FLAGS_IRQ_MSI; =20 if (kvm_irqchip_in_kernel()) { + Error *local_err =3D NULL; + ics_reset_irq(ics->irqs + srcno); - ics_set_kvm_state_one(ics, srcno); + ics_set_kvm_state_one(ics, srcno, &local_err); + if (local_err) { + error_report_err(local_err); + } } } =20 diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index c9e25fb051..4bfbe1a840 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -106,7 +106,7 @@ void icp_synchronize_state(ICPState *icp) } } =20 -int icp_set_kvm_state(ICPState *icp) +int icp_set_kvm_state(ICPState *icp, Error **errp) { uint64_t state; int ret; @@ -126,10 +126,11 @@ int icp_set_kvm_state(ICPState *icp) | ((uint64_t)icp->pending_priority << KVM_REG_PPC_ICP_PPRI_SHIFT); =20 ret =3D kvm_set_one_reg(icp->cs, KVM_REG_PPC_ICP_STATE, &state); - if (ret !=3D 0) { - error_report("Unable to restore KVM interrupt controller state (0x= %" - PRIx64 ") for CPU %ld: %s", state, kvm_arch_vcpu_id(icp->c= s), - strerror(errno)); + if (ret < 0) { + error_setg_errno(errp, -ret, + "Unable to restore KVM interrupt controller state= (0x%" + PRIx64 ") for CPU %ld", state, + kvm_arch_vcpu_id(icp->cs)); return ret; } =20 @@ -240,10 +241,9 @@ void ics_synchronize_state(ICSState *ics) ics_get_kvm_state(ics); } =20 -int ics_set_kvm_state_one(ICSState *ics, int srcno) +int ics_set_kvm_state_one(ICSState *ics, int srcno, Error **errp) { uint64_t state; - Error *local_err =3D NULL; ICSIRQState *irq =3D &ics->irqs[srcno]; int ret; =20 @@ -278,16 +278,15 @@ int ics_set_kvm_state_one(ICSState *ics, int srcno) } =20 ret =3D kvm_device_access(kernel_xics_fd, KVM_DEV_XICS_GRP_SOURCES, - srcno + ics->offset, &state, true, &local_err); - if (local_err) { - error_report_err(local_err); + srcno + ics->offset, &state, true, errp); + if (ret < 0) { return ret; } =20 return 0; } =20 -int ics_set_kvm_state(ICSState *ics) +int ics_set_kvm_state(ICSState *ics, Error **errp) { int i; =20 @@ -297,10 +296,12 @@ int ics_set_kvm_state(ICSState *ics) } =20 for (i =3D 0; i < ics->nr_irqs; i++) { + Error *local_err =3D NULL; int ret; =20 - ret =3D ics_set_kvm_state_one(ics, i); - if (ret) { + ret =3D ics_set_kvm_state_one(ics, i, &local_err); + if (ret < 0) { + error_propagate(errp, local_err); return ret; } } @@ -402,12 +403,18 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error = **errp) } =20 /* Update the KVM sources */ - ics_set_kvm_state(spapr->ics); + ics_set_kvm_state(spapr->ics, &local_err); + if (local_err) { + goto fail; + } =20 /* Connect the presenters to the initial VCPUs of the machine */ CPU_FOREACH(cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); - icp_set_kvm_state(spapr_cpu_state(cpu)->icp); + icp_set_kvm_state(spapr_cpu_state(cpu)->icp, &local_err); + if (local_err) { + goto fail; + } } =20 return 0; diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index eb65ad7e43..1eb7b5cd68 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -190,13 +190,13 @@ Object *icp_create(Object *cpu, const char *type, XIC= SFabric *xi, =20 /* KVM */ void icp_get_kvm_state(ICPState *icp); -int icp_set_kvm_state(ICPState *icp); +int icp_set_kvm_state(ICPState *icp, Error **errp); void icp_synchronize_state(ICPState *icp); void icp_kvm_realize(DeviceState *dev, Error **errp); =20 void ics_get_kvm_state(ICSState *ics); -int ics_set_kvm_state_one(ICSState *ics, int srcno); -int ics_set_kvm_state(ICSState *ics); +int ics_set_kvm_state_one(ICSState *ics, int srcno, Error **errp); +int ics_set_kvm_state(ICSState *ics, Error **errp); void ics_synchronize_state(ICSState *ics); void ics_kvm_set_irq(ICSState *ics, int srcno, int val); =20 --=20 2.21.0