From nobody Mon Sep 25 12:01:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RvM0z2CGkz4vRgl; Mon, 25 Sep 2023 12:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RvM0z1LSDz3dMH; Mon, 25 Sep 2023 12:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695643299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cq7KZmRLxEkbSE572+LAieCfoFex4L5jlPxblMtMPVs=; b=iq/aoJCQonefab9AKvfGFi/2zNf4nd+hAPqC8o02vTpqy31awDSo8w2MQeU0NcUpOTGIcd tGRR7iSYqyQ8kr8mTwrJ7makkgx3OKAOk3BVpgni7J8PFaoYQt7Hfs0xfQE7TKrvfqY+uY hr9NEhkjSUZTrjvhqhsIvsynrjTlbWJtLcVrT005D2WDFvhe2BElur4lgxA4yJ/dgf4eV4 basPIbYaXPBL9JJfXP1dN+XBHdFZ+O+NGhjQldp+RvecpmVOswvKZFmHZRe5V6vclht+E4 akqHxtGd+r6oozs04fxsR/AmPc1RDClxcg18Fvtep6ZQeH8e/IP1iEUAfJ8FDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695643299; a=rsa-sha256; cv=none; b=OUDT7A6TIshNSgGx7JJtCTxdL9/iuQR0TgV9ojr9uAP8rvnaOvxEOXQ4c0v8knKJLKK5Iy 2R8w5rPvDqVkj1aW9uz3EM5vUvHJiwZS0Q5ZPXYKoY4S1M1ZIgeK+bS/RJhkRj5qhQrjcV 1eTPNn7s/uV1Nu/G1OodptsK43c0RSLEphYLMSwPRvveYQPdhTggGDutt6hJIeshHR8IPh bgKYMODro0O2dIbIuAWGnpRqnGn9RZPOvmRrnJnLY898VbarJbac2cH7+MG1R5/HRN6WKR FK8wso6Z5Yh0C49LiMRlIm6NyVcOgdAkRXkU+wEWBxQdTDeNHjqusKDToeTzzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695643299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cq7KZmRLxEkbSE572+LAieCfoFex4L5jlPxblMtMPVs=; b=bV9WhYssDlY2OMESn2pn9gasyr6EsbwbuQzts2cyMx1YA8ok3pDPX5QSulcPm43hBBqVDp Z4st8pt5gIHNAfZ9P2s1OkE5Hw6Y5P99bfH6UBruTVVlAXrM1RhF9tE0MKu6zp4N34aF8u JNWBkebCHz0sPdGM/JT9WbTQ+1iUr0FM/pyLKZBx52EkSexAhAMVkZC3pSop/2dJuGQHk+ nHNfd0ChkvSYEToOwmNUKgm3W/mJhJ8++NIXk38DAYzJbl/4SxjTTF6dFuSK566hxz3gs/ Apb/fJKH16FsqJqP35622qKJToTLP4E5ORcqKlMWxCzcZl1l2keFLSVS8YgMoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RvM0z0984z1Rv7; Mon, 25 Sep 2023 12:01:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PC1ckl058727; Mon, 25 Sep 2023 12:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PC1cpY058724; Mon, 25 Sep 2023 12:01:38 GMT (envelope-from git) Date: Mon, 25 Sep 2023 12:01:38 GMT Message-Id: <202309251201.38PC1cpY058724@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: fc7460a5ca4b - stable/14 - gicv3: Add logging for when its_device_alloc fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc7460a5ca4bddfd54cb093a7eea70c491650d21 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fc7460a5ca4bddfd54cb093a7eea70c491650d21 commit fc7460a5ca4bddfd54cb093a7eea70c491650d21 Author: Andrew Turner AuthorDate: 2023-08-23 17:44:38 +0000 Commit: Andrew Turner CommitDate: 2023-09-25 12:01:28 +0000 gicv3: Add logging for when its_device_alloc fails Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41566 (cherry picked from commit 5429e194212e7d2fd7b4771bcf348f0917a0d505) --- sys/arm64/arm64/gicv3_its.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/sys/arm64/arm64/gicv3_its.c b/sys/arm64/arm64/gicv3_its.c index a126a166c4c9..777e20649f33 100644 --- a/sys/arm64/arm64/gicv3_its.c +++ b/sys/arm64/arm64/gicv3_its.c @@ -1277,21 +1277,44 @@ its_device_alloc(struct gicv3_its_softc *sc, int devid) /* No device table */ if (sc->sc_dev_table_idx < 0) { - if (devid < (1 << sc->sc_devbits)) - return (true); - return (false); + if (devid >= (1 << sc->sc_devbits)) { + if (bootverbose) { + device_printf(sc->dev, + "%s: Device out of range for hardware " + "(%x >= %x)\n", __func__, devid, + 1 << sc->sc_devbits); + } + return (false); + } + return (true); } ptable = &sc->sc_its_ptab[sc->sc_dev_table_idx]; /* Check the devid is within the table limit */ if (!ptable->ptab_indirect) { - return (devid < ptable->ptab_l1_nidents); + if (devid >= ptable->ptab_l1_nidents) { + if (bootverbose) { + device_printf(sc->dev, + "%s: Device out of range for table " + "(%x >= %x)\n", __func__, devid, + ptable->ptab_l1_nidents); + } + return (false); + } + + return (true); } /* Check the devid is within the allocated range */ index = devid / ptable->ptab_l2_nidents; - if (index >= ptable->ptab_l1_nidents) + if (index >= ptable->ptab_l1_nidents) { + if (bootverbose) { + device_printf(sc->dev, + "%s: Index out of range for table (%x >= %x)\n", + __func__, index, ptable->ptab_l1_nidents); + } return (false); + } table = (uint64_t *)ptable->ptab_vaddr; /* We have an second level table */