mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sascha Bischoff <sascha.bischoff@arm.com>
To: Marc Zyngier <maz@kernel.org>,
	 Lorenzo Pieralisi <lpieralisi@kernel.org>,
	 Thomas Gleixner <tglx@kernel.org>, Radu Rendec <radu@rendec.net>,
	 Timothy Hayes <timothy.hayes@arm.com>,
	 Catalin Marinas <catalin.marinas@arm.com>,
	 Jonathan Cameron <jic23@kernel.org>,
	 "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,  Fuad Tabba <fuad.tabba@linux.dev>,
	 Sascha Bischoff <sascha.bischoff@arm.com>
Subject: [PATCH v3 04/14] irqchip/gic-v5: Retain the L2 IST when mapping times out
Date: Wed, 18 Nov 2026 17:35:33 +0000	[thread overview]
Message-ID: <20261118-host_gicv5_fixes-v3-4-13c1859e8aa3@arm.com> (raw)
In-Reply-To: <20261118-host_gicv5_fixes-v3-0-13c1859e8aa3@arm.com>

If the IDLE poll after IRS_MAP_L2_ISTR times out, the mapping
operation has not been cancelled and could arguably still happen at a
later stage. Clearing the L1 entry and freeing the L2 IST can
therefore race with hardware completing the map and accessing the
freed table.

Retain the L1 entry and L2 IST on failure. Reject a subsequent
allocation that finds a nonzero but invalid L1 entry, so it cannot
overwrite the entry while the earlier mapping may still be
pending. Mark the retained table as intentional for kmemleak on both
success and failure.

Fixes: 0f01013258768 ("irqchip/gic-v5: Add GICv5 LPI/IPI support")
Reported-by: Fuad Tabba <fuad.tabba@linux.dev>
Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com>
Link: https://lore.kernel.org/r/20261112145814.853424-1-fuad.tabba@linux.dev
---
 drivers/irqchip/irq-gic-v5-irs.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v5-irs.c b/drivers/irqchip/irq-gic-v5-irs.c
index ead76560ea08f..78deb46baa784 100644
--- a/drivers/irqchip/irq-gic-v5-irs.c
+++ b/drivers/irqchip/irq-gic-v5-irs.c
@@ -217,6 +217,10 @@ int gicv5_irs_iste_alloc(const u32 lpi)
 	if (FIELD_GET(GICV5_ISTL1E_VALID, le64_to_cpu(l1ist[index])))
 		return 0;
 
+	/* A previous map timed out; do not overwrite its pending L1 entry. */
+	if (READ_ONCE(l1ist[index]))
+		return -EBUSY;
+
 	l2ist = kzalloc(l2size, GFP_KERNEL);
 	if (!l2ist)
 		return -ENOMEM;
@@ -235,13 +239,11 @@ int gicv5_irs_iste_alloc(const u32 lpi)
 	l2istr = FIELD_PREP(GICV5_IRS_MAP_L2_ISTR_ID, lpi);
 	irs_writel_relaxed(irs_data, l2istr, GICV5_IRS_MAP_L2_ISTR);
 
+	/* The map cannot be cancelled, so retain the table even on timeout. */
+	kmemleak_ignore(l2ist);
 	ret = gicv5_irs_ist_synchronise(irs_data);
-	if (ret) {
-		l1ist[index] = 0;
-		kfree(l2ist);
+	if (ret)
 		return ret;
-	}
-	kmemleak_ignore(l2ist);
 
 	/*
 	 * Make sure we invalidate the cache line pulled before the IRS

-- 
2.34.1


  parent reply	other threads:[~2026-11-18 17:36 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-18 17:35 [PATCH v3 00/14] irqchip/gic-v5: Fix misc IRS and ITS host driver issues Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 01/14] irqchip/gic-v5: Reject SPIs not backed by an IRS Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 02/14] irqchip/gic-v5: Only set IRS DPS when 1ofN routing is supported Sascha Bischoff
2026-11-19 11:50   ` Fuad Tabba
2026-11-18 17:35 ` [PATCH v3 03/14] irqchip/gic-v5: Serialise IRS synchronisation requests Sascha Bischoff
2026-11-19 11:53   ` Fuad Tabba
2026-11-18 17:35 ` Sascha Bischoff [this message]
2026-11-19 12:00   ` [PATCH v3 04/14] irqchip/gic-v5: Retain the L2 IST when mapping times out Fuad Tabba
2026-11-18 17:35 ` [PATCH v3 05/14] irqchip/gic-v5: Serialise ITS invalidation commands Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 06/14] irqchip/gic-v5: Use linear DT and ITT when L2 covers all IDs Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 07/14] irqchip/gic-v5: Honour ACPI ITS noncoherent flag Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 08/14] irqchip/gic-v5: Use firmware node name in ITS warning Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 09/14] irqchip/gic-v5: Invalidate ITS device cache before freeing ITT Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 10/14] irqchip/gic-v5: Clean the allocated linear device table size Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 11/14] irqchip/gic-v5: Release ITS MMIO region on DT probe failure Sascha Bischoff
2026-11-18 17:35 ` [PATCH v3 12/14] irqchip/gic-v5: Retain the ITT when device invalidation times out Sascha Bischoff
2026-11-19 10:28   ` Lorenzo Pieralisi
2026-11-19 12:07     ` Fuad Tabba
2026-11-18 17:35 ` [PATCH v3 13/14] irqchip/gic-v5: Clean a level 2 device table before making it valid Sascha Bischoff
2026-11-19 10:19   ` Lorenzo Pieralisi
2026-11-18 17:35 ` [PATCH v3 14/14] irqchip/gic-v5: Invalidate the L1 DTE when allocating an L2 device table Sascha Bischoff
2026-11-19 10:13   ` Lorenzo Pieralisi
2026-11-19 12:32     ` Fuad Tabba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261118-host_gicv5_fixes-v3-4-13c1859e8aa3@arm.com \
    --to=sascha.bischoff@arm.com \
    --cc=catalin.marinas@arm.com \
    --cc=fuad.tabba@linux.dev \
    --cc=jic23@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lpieralisi@kernel.org \
    --cc=maz@kernel.org \
    --cc=radu@rendec.net \
    --cc=rafael.j.wysocki@intel.com \
    --cc=tglx@kernel.org \
    --cc=timothy.hayes@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®