linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Zyngier <marc.zyngier@arm.com>
To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
	Jeremy Linton <jeremy.linton@arm.com>,
	Jeffrey Hugo <jhugo@codeaurora.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH 10/10] irqchip/gic-v3-its: Allow use of LPI tables in reserved memory
Date: Fri, 21 Sep 2018 20:59:54 +0100	[thread overview]
Message-ID: <20180921195954.21574-11-marc.zyngier@arm.com> (raw)
In-Reply-To: <20180921195954.21574-1-marc.zyngier@arm.com>

If the LPI tables have been reserved with the EFI reservation
mechanism, we assume that these tables are safe to use even
when we find the redistributors to have LPIs enabled at
boot time, meaning that kexec can now work with GICv3.

You're welcome.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 drivers/irqchip/irq-gic-v3-its.c | 43 ++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
index 4912dc57bf07..0235b69160bc 100644
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@ -28,6 +28,7 @@
 #include <linux/list.h>
 #include <linux/list_sort.h>
 #include <linux/log2.h>
+#include <linux/memblock.h>
 #include <linux/mm.h>
 #include <linux/msi.h>
 #include <linux/of.h>
@@ -1629,6 +1630,33 @@ static void its_free_prop_table(struct page *prop_page)
 		   get_order(LPI_PROPBASE_SZ));
 }
 
+static bool gic_check_reserved_range(phys_addr_t addr, unsigned long size)
+{
+	phys_addr_t start, end, addr_end;
+	u64 i;
+
+	/*
+	 * We don't bother checking for a kdump kernel as by
+	 * construction, the LPI tables are out of this kernel's
+	 * memory map.
+	 */
+	if (is_kdump_kernel())
+		return true;
+
+	addr_end = addr + size - 1;
+
+	for_each_reserved_mem_region(i, &start, &end) {
+		if (addr >= start && addr_end <= end)
+			return true;
+	}
+
+	/* Not found, not a good sign... */
+	pr_warn("GICv3: Expected reserved range [%pa:%pa], not found\n",
+		&addr, &addr_end);
+	add_taint(TAINT_CRAP, LOCKDEP_STILL_OK);
+	return false;
+}
+
 static int gic_reserve_range(phys_addr_t addr, unsigned long size)
 {
 	if (efi_enabled(EFI_CONFIG_TABLES))
@@ -1976,15 +2004,19 @@ static void its_free_pending_table(struct page *pt)
 }
 
 /*
- * Booting with kdump and LPIs enabled is generally fine.
+ * Booting with kdump and LPIs enabled is generally fine. Any other
+ * case is wrong in the absence of firmware/EFI support.
  */
 static bool enabled_lpis_allowed(void)
 {
-	/* Allow a kdump kernel */
-	if (is_kdump_kernel())
-		return true;
+	phys_addr_t addr;
+	u64 val;
 
-	return false;
+	/* Check whether the property table is in a reserved region */
+	val = gicr_read_propbaser(gic_data_rdist_rd_base() + GICR_PROPBASER);
+	addr = val & GENMASK_ULL(51, 12);
+
+	return gic_check_reserved_range(addr, LPI_PROPBASE_SZ);
 }
 
 static int __init allocate_lpi_tables(void)
@@ -2052,6 +2084,7 @@ static void its_cpu_init_lpis(void)
 		paddr = gicr_read_pendbaser(rbase + GICR_PENDBASER);
 		paddr &= GENMASK_ULL(51, 16);
 
+		WARN_ON(!gic_check_reserved_range(paddr, LPI_PENDBASE_SZ));
 		its_free_pending_table(gic_data_rdist()->pend_page);
 		gic_data_rdist()->pend_page = NULL;
 
-- 
2.18.0


  parent reply	other threads:[~2018-09-21 20:00 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-21 19:59 [PATCH 00/10] GICv3 support for kexec/kdump on EFI systems Marc Zyngier
2018-09-21 19:59 ` [PATCH 01/10] irqchip/gic-v3-its: Change initialization ordering for LPIs Marc Zyngier
2018-09-24 10:49   ` Julien Thierry
2018-09-21 19:59 ` [PATCH 02/10] irqchip/gic-v3-its: Consolidate LPI_PENDBASE_SZ usage Marc Zyngier
2018-09-24 10:33   ` Suzuki K Poulose
2018-09-24 10:50     ` Julien Thierry
2018-09-24 10:54       ` Suzuki K Poulose
2018-09-24 10:55         ` Julien Thierry
2018-09-26 10:28     ` Marc Zyngier
2018-09-21 19:59 ` [PATCH 03/10] irqchip/gic-v3-its: Split property table clearing from allocation Marc Zyngier
2018-09-21 19:59 ` [PATCH 04/10] irqchip/gic-v3-its: Move pending table allocation to init time Marc Zyngier
2018-09-24 11:58   ` Julien Thierry
2018-09-26 10:39     ` Marc Zyngier
2018-09-21 19:59 ` [PATCH 05/10] irqchip/gic-v3-its: Keep track of property table's PA and VA Marc Zyngier
2018-09-21 19:59 ` [PATCH 06/10] irqchip/gic-v3-its: Allow use of pre-programmed LPI tables Marc Zyngier
2018-09-24 12:52   ` Julien Thierry
2018-09-21 19:59 ` [PATCH 07/10] irqchip/gic-v3-its: Use pre-programmed redistributor tables with kdump kernels Marc Zyngier
2018-09-21 19:59 ` [PATCH 08/10] irqchip/gic-v3-its: Check that all RDs have the same property table Marc Zyngier
2018-09-21 19:59 ` [PATCH 09/10] irqchip/gic-v3-its: Register LPI tables with EFI config table Marc Zyngier
2018-09-21 19:59 ` Marc Zyngier [this message]
2018-09-25 18:48 ` [PATCH 00/10] GICv3 support for kexec/kdump on EFI systems Jeremy Linton
2018-09-27  9:55 ` Bhupesh Sharma
2018-09-27 13:01 ` Zhang, Lei
2018-09-27 21:10 ` Richard Ruigrok
2018-09-28 10:33   ` Marc Zyngier
     [not found] ` <CACiNFG5r2Czfy_kXA2PPQa=xdyzq0vUgoQZ=XNME4d_h=O1oBw@mail.gmail.com>
2019-02-01  9:15   ` Marc Zyngier
2019-02-02  3:05     ` Xulin Sun

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=20180921195954.21574-11-marc.zyngier@arm.com \
    --to=marc.zyngier@arm.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=jason@lakedaemon.net \
    --cc=jeremy.linton@arm.com \
    --cc=jhugo@codeaurora.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).