From nobody Tue Feb 10 06:26:45 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; dkim=fail; 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=1569395863; cv=none; d=zoho.com; s=zohoarc; b=RtYQ3gDgJB0IRYNmy7MUA4fH+dzx0GiPcqHvUNPRrKm1Uh8FBOvAF+yaeTZXUN2jkZe0WzCZTmGkoa5mnZ6FzkwpneDwKvFAUlpghz7y/q9TqwCMPSa1ou8752GY7IBj+MNDZapLEt63J/H/LvDwUvqk7yLNqJ7FZTOGSUjfFhU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569395863; h=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=aQEL51ZQzn/E9KiQsUT3yN5nIXrxzhyOi9dyZSfLWHM=; b=efjY9Yvecoag3Hvs7QXFQxZgxPzTfpFFFgouoZCEyPpJ1orCCHkwDBs56tUMplgE4hqA+4HOYMcTyJOtxdeb+jgASlyZ56AlUliOdYZt4d+L8LQzBG/YJgFFMMFDkKpVaemSI90ISw3aIO/XmE15P97tSPTWSH+p4Mtrb4SgA04= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 156939586324499.85099099173681; Wed, 25 Sep 2019 00:17:43 -0700 (PDT) Received: from localhost ([::1]:46270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD1YS-00022K-GZ for importer@patchew.org; Wed, 25 Sep 2019 03:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38861) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iD13q-0008Nw-Ti for qemu-devel@nongnu.org; Wed, 25 Sep 2019 02:46:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iD13o-0003c8-Qi for qemu-devel@nongnu.org; Wed, 25 Sep 2019 02:46:02 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:33849) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iD13n-0003WM-VY; Wed, 25 Sep 2019 02:46:00 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46dT8r6Q3Kz9sR8; Wed, 25 Sep 2019 16:45:46 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1569393948; bh=7/ZmWbpKthqCsg3F29+02eHkS47QSKj87SxvyMLlZjw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mMuijqRGkNTILbC2Jxe4rUHCfoSJGBLXMhe6wTfiatQYRxyxZOrUXTuO0bZqB9NFt dVSHlOnCjzlBO8U2s/Sw9ZBaT+kXcHO5qkdxk5gsgWOyNXC4pd0XgihnAgyNqUBL6U 4mlr40wXaVQ1PQO25WTaOOBSOLhWUTX1jYbxTjUs= From: David Gibson To: qemu-ppc@nongnu.org, clg@kaod.org, qemu-devel@nongnu.org Subject: [PATCH 16/20] spapr, xics, xive: Better use of assert()s on irq claim/free paths Date: Wed, 25 Sep 2019 16:45:30 +1000 Message-Id: <20190925064534.19155-17-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925064534.19155-1-david@gibson.dropbear.id.au> References: <20190925064534.19155-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 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: Jason Wang , Riku Voipio , groug@kaod.org, Laurent Vivier , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , philmd@redhat.com, David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The irq claim and free paths for both XICS and XIVE check for some validity conditions. Some of these represent genuine runtime failures, however others - particularly checking that the basic irq number is in a sane range - could only fail in the case of bugs in the callin code. Therefore use assert()s instead of runtime failures for those. In addition the non backend-specific part of the claim/free paths should only be used for PAPR external irqs, that is in the range SPAPR_XIRQ_BASE to the maximum irq number. Put assert()s for that into the top level dispatchers as well. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater Reviewed-by: Greg Kurz --- hw/intc/spapr_xive.c | 8 ++------ hw/ppc/spapr_irq.c | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/hw/intc/spapr_xive.c b/hw/intc/spapr_xive.c index c1c97192a7..47b5ec0b56 100644 --- a/hw/intc/spapr_xive.c +++ b/hw/intc/spapr_xive.c @@ -532,9 +532,7 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lis= n, bool lsi) { XiveSource *xsrc =3D &xive->source; =20 - if (lisn >=3D xive->nr_irqs) { - return false; - } + assert(lisn < xive->nr_irqs); =20 /* * Set default values when allocating an IRQ number @@ -559,9 +557,7 @@ bool spapr_xive_irq_claim(SpaprXive *xive, uint32_t lis= n, bool lsi) =20 bool spapr_xive_irq_free(SpaprXive *xive, uint32_t lisn) { - if (lisn >=3D xive->nr_irqs) { - return false; - } + assert(lisn < xive->nr_irqs); =20 xive->eat[lisn].w &=3D cpu_to_be64(~EAS_VALID); return true; diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index c40357a985..261d66ba17 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -118,11 +118,7 @@ static int spapr_irq_claim_xics(SpaprMachineState *spa= pr, int irq, bool lsi, ICSState *ics =3D spapr->ics; =20 assert(ics); - - if (!ics_valid_irq(ics, irq)) { - error_setg(errp, "IRQ %d is invalid", irq); - return -1; - } + assert(ics_valid_irq(ics, irq)); =20 if (!ics_irq_free(ics, irq - ics->offset)) { error_setg(errp, "IRQ %d is not free", irq); @@ -138,9 +134,9 @@ static void spapr_irq_free_xics(SpaprMachineState *spap= r, int irq) ICSState *ics =3D spapr->ics; uint32_t srcno =3D irq - ics->offset; =20 - if (ics_valid_irq(ics, irq)) { - memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState)); - } + assert(ics_valid_irq(ics, irq)); + + memset(&ics->irqs[srcno], 0, sizeof(ICSIRQState)); } =20 static void spapr_irq_print_info_xics(SpaprMachineState *spapr, Monitor *m= on) @@ -628,6 +624,9 @@ void spapr_irq_init(SpaprMachineState *spapr, Error **e= rrp) =20 int spapr_irq_claim(SpaprMachineState *spapr, int irq, bool lsi, Error **e= rrp) { + assert(irq >=3D SPAPR_XIRQ_BASE); + assert(irq < (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE)); + return spapr->irq->claim(spapr, irq, lsi, errp); } =20 @@ -635,6 +634,9 @@ void spapr_irq_free(SpaprMachineState *spapr, int irq, = int num) { int i; =20 + assert(irq >=3D SPAPR_XIRQ_BASE); + assert((irq+num) <=3D (spapr->irq->nr_xirqs + SPAPR_XIRQ_BASE)); + for (i =3D irq; i < (irq + num); i++) { spapr->irq->free(spapr, irq); } --=20 2.21.0