From nobody Fri May 3 14:06:19 2024 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=1574032978; cv=none; d=zoho.com; s=zohoarc; b=EGxfrnUv1U3HUXoiNRnzm4CtXweylh4SrAoBbMt9jQqTUfNa+UeifOqWYtHrWd1ZvhoshBAfC6QhD1X4eT089AHwQUm2uBE0xIdLIi7BJTYgcCRWyWgQDUVVrPINPl1jeH1W8qP3xQOLOK5Q6Y3rrcuqvvci4G9h4oCsn4+PlYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574032978; 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; bh=uMgOwI2DTO3+0/IiWk3xNPN42O1nQhXiCh6AftWrji0=; b=mapGPYYBTpUoDmBERDrmGdMJWzLj/59eliVA6iSnz+SHF4wFMQe2hDeg9J7Czxg/wa+XTFa08kM9GjsHX50mkYjVfGa3VDtfMClVTuVKNy70qXSNfFsXVqFbfU4MglU6qE3iyb2px88SbztZ09DPKIMfSXCKgcXnVBg7SsWi5gA= 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 15740329789107.5214628738807505; Sun, 17 Nov 2019 15:22:58 -0800 (PST) Received: from localhost ([::1]:57018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTse-0008MI-It for importer@patchew.org; Sun, 17 Nov 2019 18:22:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49775) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTqX-0006Qu-Jk for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWTqW-0007Q6-Gg for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:45 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:24622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWTqW-0007Pi-8h for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:44 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAHNCN5P145373 for ; Sun, 17 Nov 2019 18:20:42 -0500 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2way8kdf1e-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Nov 2019 18:20:42 -0500 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 17 Nov 2019 23:20:39 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 17 Nov 2019 23:20:37 -0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAHNKaPu56426640 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Nov 2019 23:20:36 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7FAADA4040; Sun, 17 Nov 2019 23:20:36 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 50E0CA404D; Sun, 17 Nov 2019 23:20:36 +0000 (GMT) Received: from bahia.lan (unknown [9.145.70.126]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Sun, 17 Nov 2019 23:20:36 +0000 (GMT) Subject: [PATCH for-5.0 1/4] xics: Link ICS_PROP_XICS property to ICSState::xics pointer From: Greg Kurz To: David Gibson Date: Mon, 18 Nov 2019 00:20:36 +0100 In-Reply-To: <157403283036.409804.13586263493813758117.stgit@bahia.lan> References: <157403283036.409804.13586263493813758117.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19111723-0028-0000-0000-000003B970AB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111723-0029-0000-0000-0000247C86E6 Message-Id: <157403283596.409804.17347207690271971987.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-17_05:2019-11-15,2019-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 clxscore=1034 lowpriorityscore=0 adultscore=0 bulkscore=0 impostorscore=0 mlxlogscore=519 phishscore=0 mlxscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911170222 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The ICS object has both a pointer and an ICS_PROP_XICS property pointing to the XICS fabric. Confusing bugs could arise if these ever go out of sync. Change the property definition so that it explicitely sets the pointer. The property isn't optional : not being able to set the link is a bug and QEMU should rather abort than exit in this case. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 13 +++---------- hw/ppc/pnv_psi.c | 3 +-- hw/ppc/spapr_irq.c | 9 ++------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index e7ac9ba618fa..f7a454808992 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -609,17 +609,8 @@ static void ics_reset_handler(void *dev) static void ics_realize(DeviceState *dev, Error **errp) { ICSState *ics =3D ICS(dev); - Error *local_err =3D NULL; - Object *obj; =20 - obj =3D object_property_get_link(OBJECT(dev), ICS_PROP_XICS, &local_er= r); - if (!obj) { - error_propagate_prepend(errp, local_err, - "required link '" ICS_PROP_XICS - "' not found: "); - return; - } - ics->xics =3D XICS_FABRIC(obj); + assert(ics->xics); =20 if (!ics->nr_irqs) { error_setg(errp, "Number of interrupts needs to be greater 0"); @@ -699,6 +690,8 @@ static const VMStateDescription vmstate_ics =3D { =20 static Property ics_properties[] =3D { DEFINE_PROP_UINT32("nr-irqs", ICSState, nr_irqs, 0), + DEFINE_PROP_LINK(ICS_PROP_XICS, ICSState, xics, TYPE_XICS_FABRIC, + XICSFabric *), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index a360515a86f8..7e725aaf2bd5 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -497,8 +497,7 @@ static void pnv_psi_power8_realize(DeviceState *dev, Er= ror **errp) } =20 /* Create PSI interrupt control source */ - object_property_add_const_link(OBJECT(ics), ICS_PROP_XICS, obj, - &error_abort); + object_property_set_link(OBJECT(ics), obj, ICS_PROP_XICS, &error_abort= ); object_property_set_int(OBJECT(ics), PSI_NUM_INTERRUPTS, "nr-irqs", &e= rr); if (err) { error_propagate(errp, err); diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 168044be853a..487c8ceb35a3 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -319,13 +319,8 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **= errp) return; } =20 - object_property_add_const_link(obj, ICS_PROP_XICS, OBJECT(spapr), - &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - + object_property_set_link(obj, OBJECT(spapr), ICS_PROP_XICS, + &error_abort); object_property_set_int(obj, smc->nr_xirqs, "nr-irqs", &local_err); if (local_err) { error_propagate(errp, local_err); From nobody Fri May 3 14:06:19 2024 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=1574032974; cv=none; d=zoho.com; s=zohoarc; b=SaqeSPrG4F02B6IC6ivjOhPFIJEx7td+vAv+rYQuA2nSXxti3zOTjnM4qJ21oxlWy8SmEP33lemo0jFv+pOJ4BLhacyku5Dhpv83ziQzJhI8d1pCW+ATkahYkkC48hpZKlj3U0KeqigPJVBfRbYBHj17/KfccrRv4LpIx983wEU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574032974; 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; bh=lFzHOHoziKIH3YhdKi2Py1uojvC5jjxxKyw9uGLcekk=; b=nQd8XrhuTYUxuGz21ois20xVC9tyU0N/IVJz6QsTtykHYPGOZHGjf+tv2qgHIbOUVq3vpb0WrN1XSfGnHwEZl6NXDCRFuP2WHOvy7HtI+Nla+uiO+Jp7l2NqOAIkSTTFIDBrUd+YvC+bhfLO24xvBn0jZKEoU4DgvfcV+G3KjUw= 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 1574032974539449.2269911094279; Sun, 17 Nov 2019 15:22:54 -0800 (PST) Received: from localhost ([::1]:57016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTsY-0008EU-8F for importer@patchew.org; Sun, 17 Nov 2019 18:22:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49804) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTqc-0006Vf-8c for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWTqb-0007Rg-4n for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:50 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:58184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWTqa-0007RM-Rh for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:49 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAHNCFU9132317 for ; Sun, 17 Nov 2019 18:20:48 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2way2xwqtv-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Nov 2019 18:20:47 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 17 Nov 2019 23:20:45 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 17 Nov 2019 23:20:43 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAHNKg5t61145118 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Nov 2019 23:20:42 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 162D742041; Sun, 17 Nov 2019 23:20:42 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DA0AF4203F; Sun, 17 Nov 2019 23:20:41 +0000 (GMT) Received: from bahia.lan (unknown [9.145.70.126]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Sun, 17 Nov 2019 23:20:41 +0000 (GMT) Subject: [PATCH for-5.0 2/4] xics: Link ICP_PROP_XICS property to ICPState::xics pointer From: Greg Kurz To: David Gibson Date: Mon, 18 Nov 2019 00:20:41 +0100 In-Reply-To: <157403283036.409804.13586263493813758117.stgit@bahia.lan> References: <157403283036.409804.13586263493813758117.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19111723-0016-0000-0000-000002C634C7 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111723-0017-0000-0000-00003327E25D Message-Id: <157403284152.409804.17114564311521923733.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-17_05:2019-11-15,2019-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=638 priorityscore=1501 clxscore=1034 lowpriorityscore=0 adultscore=0 suspectscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911170222 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The ICP object has both a pointer and an ICP_PROP_XICS property pointing to the XICS fabric. Confusing bugs could arise if these ever go out of sync. Change the property definition so that it explicitely sets the pointer. The property isn't optional : not being able to set the link is a bug and QEMU should rather abort than exit in this case. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index f7a454808992..35dddb88670e 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -310,15 +310,7 @@ static void icp_realize(DeviceState *dev, Error **errp) Object *obj; Error *err =3D NULL; =20 - obj =3D object_property_get_link(OBJECT(dev), ICP_PROP_XICS, &err); - if (!obj) { - error_propagate_prepend(errp, err, - "required link '" ICP_PROP_XICS - "' not found: "); - return; - } - - icp->xics =3D XICS_FABRIC(obj); + assert(icp->xics); =20 obj =3D object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err); if (!obj) { @@ -368,12 +360,19 @@ static void icp_unrealize(DeviceState *dev, Error **e= rrp) vmstate_unregister(NULL, &vmstate_icp_server, icp); } =20 +static Property icp_properties[] =3D { + DEFINE_PROP_LINK(ICP_PROP_XICS, ICPState, xics, TYPE_XICS_FABRIC, + XICSFabric *), + DEFINE_PROP_END_OF_LIST(), +}; + static void icp_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D icp_realize; dc->unrealize =3D icp_unrealize; + dc->props =3D icp_properties; /* * Reason: part of XICS interrupt controller, needs to be wired up * by icp_create(). @@ -397,9 +396,7 @@ Object *icp_create(Object *cpu, const char *type, XICSF= abric *xi, Error **errp) obj =3D object_new(type); object_property_add_child(cpu, type, obj, &error_abort); object_unref(obj); - object_ref(OBJECT(xi)); - object_property_add_const_link(obj, ICP_PROP_XICS, OBJECT(xi), - &error_abort); + object_property_set_link(obj, OBJECT(xi), ICP_PROP_XICS, &error_abort); object_ref(cpu); object_property_add_const_link(obj, ICP_PROP_CPU, cpu, &error_abort); object_property_set_bool(obj, true, "realized", &local_err); @@ -417,7 +414,6 @@ void icp_destroy(ICPState *icp) Object *obj =3D OBJECT(icp); =20 object_unref(object_property_get_link(obj, ICP_PROP_CPU, &error_abort)= ); - object_unref(object_property_get_link(obj, ICP_PROP_XICS, &error_abort= )); object_unparent(obj); } =20 From nobody Fri May 3 14:06:19 2024 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=1574032978; cv=none; d=zoho.com; s=zohoarc; b=I6Dz9vFJXjAkBDpQfJHmjKSWbUIfBbYBPU/RrWWn7O/EZjexcdt2BWPpx0Blxyv3Kt996kZQLVaVDe9KBQyUITtoNGL8MJy8Zut3Wqdn7GBSzsqsyGK1129E60CLJzPHRztd7u3MRL7VlnnabbtkB9pF9IILBuULqhl6LQDRFa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574032978; 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; bh=8GOLlMGBS4g3HKc2Czk8DO+z1BndezRmSMaNlDKIxBM=; b=lvA9OdEKutWDkRD255QBD7kCw2a7AfAVDWYmyyw5+e97fyi2uatJpsOSjR37igA7R0RDWFltJTorj2YctYF739e89HlAsSNHDXoLG0n/rVdG6T1Z6vbFus/LKUqv3v1OljsqjhK9oJO9zp7XpC5rfYqzhcheBU8gXKcDQYzkGGE= 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 15740329784899.114658701014037; Sun, 17 Nov 2019 15:22:58 -0800 (PST) Received: from localhost ([::1]:57020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTse-0008PD-TS for importer@patchew.org; Sun, 17 Nov 2019 18:22:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49827) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTqg-0006c5-KF for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWTqf-0007St-Fh for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:54 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:64126 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWTqf-0007Sl-AH for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:20:53 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAHNCJlf100875 for ; Sun, 17 Nov 2019 18:20:52 -0500 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wayen5841-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Nov 2019 18:20:52 -0500 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 17 Nov 2019 23:20:51 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 17 Nov 2019 23:20:48 -0000 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAHNKlMP29360220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Nov 2019 23:20:47 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F24A11C050; Sun, 17 Nov 2019 23:20:47 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6EAC411C04C; Sun, 17 Nov 2019 23:20:47 +0000 (GMT) Received: from bahia.lan (unknown [9.145.70.126]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Sun, 17 Nov 2019 23:20:47 +0000 (GMT) Subject: [PATCH for-5.0 3/4] xics: Link ICP_PROP_CPU property to ICPState::cs pointer From: Greg Kurz To: David Gibson Date: Mon, 18 Nov 2019 00:20:47 +0100 In-Reply-To: <157403283036.409804.13586263493813758117.stgit@bahia.lan> References: <157403283036.409804.13586263493813758117.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19111723-0020-0000-0000-00000388BC4C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111723-0021-0000-0000-000021DEDF4D Message-Id: <157403284709.409804.16142099083325945141.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-17_05:2019-11-15,2019-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 mlxscore=0 lowpriorityscore=0 adultscore=0 mlxlogscore=775 clxscore=1034 bulkscore=0 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911170222 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 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: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The ICP object has both a pointer and an ICP_PROP_CPU property pointing to the cpu. Confusing bugs could arise if these ever go out of sync. Change the property definition so that it explicitely sets the pointer. The property isn't optional : not being able to set the link is a bug and QEMU should rather abort than exit in this case. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/intc/xics.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 35dddb88670e..0b259a09c545 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -305,25 +305,13 @@ void icp_reset(ICPState *icp) static void icp_realize(DeviceState *dev, Error **errp) { ICPState *icp =3D ICP(dev); - PowerPCCPU *cpu; CPUPPCState *env; - Object *obj; Error *err =3D NULL; =20 assert(icp->xics); + assert(icp->cs); =20 - obj =3D object_property_get_link(OBJECT(dev), ICP_PROP_CPU, &err); - if (!obj) { - error_propagate_prepend(errp, err, - "required link '" ICP_PROP_CPU - "' not found: "); - return; - } - - cpu =3D POWERPC_CPU(obj); - icp->cs =3D CPU(obj); - - env =3D &cpu->env; + env =3D &POWERPC_CPU(icp->cs)->env; switch (PPC_INPUT(env)) { case PPC_FLAGS_INPUT_POWER7: icp->output =3D env->irq_inputs[POWER7_INPUT_INT]; @@ -363,6 +351,7 @@ static void icp_unrealize(DeviceState *dev, Error **err= p) static Property icp_properties[] =3D { DEFINE_PROP_LINK(ICP_PROP_XICS, ICPState, xics, TYPE_XICS_FABRIC, XICSFabric *), + DEFINE_PROP_LINK(ICP_PROP_CPU, ICPState, cs, TYPE_CPU, CPUState *), DEFINE_PROP_END_OF_LIST(), }; =20 @@ -397,8 +386,7 @@ Object *icp_create(Object *cpu, const char *type, XICSF= abric *xi, Error **errp) object_property_add_child(cpu, type, obj, &error_abort); object_unref(obj); object_property_set_link(obj, OBJECT(xi), ICP_PROP_XICS, &error_abort); - object_ref(cpu); - object_property_add_const_link(obj, ICP_PROP_CPU, cpu, &error_abort); + object_property_set_link(obj, cpu, ICP_PROP_CPU, &error_abort); object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { object_unparent(obj); @@ -413,7 +401,6 @@ void icp_destroy(ICPState *icp) { Object *obj =3D OBJECT(icp); =20 - object_unref(object_property_get_link(obj, ICP_PROP_CPU, &error_abort)= ); object_unparent(obj); } =20 From nobody Fri May 3 14:06:19 2024 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=1574033084; cv=none; d=zoho.com; s=zohoarc; b=aIKRPmOnYf3Re4jH0/vx90raPzf2nj+ci72+eXHYpIO70rOeypfRhP/OjYJ85KXYyPsyrsvaY0vSlykqVbnhIxm0KBYnm3e+b4SZotRIe9A+lVA39zk5zJg/R6asfYemxBqyaL0J1VNjs/aqoVmur9vZgpo5OsgHD1FLlode70I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1574033084; 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; bh=xZRZgmLlOA9iITGz98A4zfDixoV5jWzJQErwIvrvePs=; b=Q+YLEB3jC/wB97J6j5DlFUa5QGYJdVEX0+5qh4ifpG6/6gDn+BZ3c5wAkxvf6ovMtgLzPKFn3jlBrshcI3r0Nnl2vP6cIMKWTarAmYKtpwERGruPGI74CVgeMXVqUveC6rztsxn6+oEU2g/77ssxsQ+TgK1+tcXUtCX/Da9Mw04= 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 1574033084072774.5763864226383; Sun, 17 Nov 2019 15:24:44 -0800 (PST) Received: from localhost ([::1]:57048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTuN-0002kF-0E for importer@patchew.org; Sun, 17 Nov 2019 18:24:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49865) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iWTqp-0006j2-6k for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:21:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iWTqm-0007Ux-Un for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:21:02 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:42672) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iWTqm-0007Ua-D2 for qemu-devel@nongnu.org; Sun, 17 Nov 2019 18:21:00 -0500 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id xAHNCRi6028978 for ; Sun, 17 Nov 2019 18:20:59 -0500 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2wayf4dgs7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 17 Nov 2019 18:20:59 -0500 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 17 Nov 2019 23:20:57 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Sun, 17 Nov 2019 23:20:54 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id xAHNKrj429360226 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Nov 2019 23:20:53 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 28E3CAE053; Sun, 17 Nov 2019 23:20:53 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 03E43AE051; Sun, 17 Nov 2019 23:20:53 +0000 (GMT) Received: from bahia.lan (unknown [9.145.70.126]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Sun, 17 Nov 2019 23:20:52 +0000 (GMT) Subject: [PATCH for-5.0 4/4] spapr: Abort if XICS interrupt controller cannot be initialized From: Greg Kurz To: David Gibson Date: Mon, 18 Nov 2019 00:20:52 +0100 In-Reply-To: <157403283036.409804.13586263493813758117.stgit@bahia.lan> References: <157403283036.409804.13586263493813758117.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19111723-0012-0000-0000-000003662F5E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19111723-0013-0000-0000-000021A1B26D Message-Id: <157403285265.409804.8683093665795248192.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.95,18.0.572 definitions=2019-11-17_05:2019-11-15,2019-11-17 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1034 mlxscore=0 malwarescore=0 impostorscore=0 phishscore=0 bulkscore=0 mlxlogscore=988 priorityscore=1501 spamscore=0 suspectscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-1911170222 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 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: qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric?= Le Goater , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Failing to set any of the ICS property should really never happen: - object_property_add_child() always succeed unless the child object already has a parent, which isn't the case here obviously since the ICS has just been created with object_new() - the ICS has an "nr-irqs" property than can be set as long as the ICS isn't realized In both cases, an error indicates there is a bug in QEMU. Propagating the error, ie. exiting QEMU since spapr_irq_init() is called with &error_fatal doesn't make much sense. Abort instead. This is consistent with what is done with XIVE : both qdev_create() and qdev_prop_set_uint32() abort QEMU on error. Signed-off-by: Greg Kurz Reviewed-by: C=C3=A9dric Le Goater --- hw/ppc/spapr_irq.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 487c8ceb35a3..37f65dac9ca8 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -313,20 +313,11 @@ void spapr_irq_init(SpaprMachineState *spapr, Error *= *errp) Object *obj; =20 obj =3D object_new(TYPE_ICS_SPAPR); - object_property_add_child(OBJECT(spapr), "ics", obj, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } =20 + object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort); object_property_set_link(obj, OBJECT(spapr), ICS_PROP_XICS, &error_abort); - object_property_set_int(obj, smc->nr_xirqs, "nr-irqs", &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - + object_property_set_int(obj, smc->nr_xirqs, "nr-irqs", &error_abor= t); object_property_set_bool(obj, true, "realized", &local_err); if (local_err) { error_propagate(errp, local_err);