Commit 30f21363 authored by Robert Richter's avatar Robert Richter Committed by Thomas Gleixner

irqchip/gicv3-its: Add range check for number of allocated pages

The number of pages for the its table may exceed the maximum of 256.
Adding a range check and limitting the number to its maximum.

Based on a patch from Tirumalesh Chalamarla <tchalamarla@cavium.com>.
Signed-off-by: default avatarTirumalesh Chalamarla <tchalamarla@cavium.com>
Signed-off-by: default avatarRobert Richter <rrichter@cavium.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1442869119-1814-2-git-send-email-rric@kernel.orgSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 71f64340
...@@ -822,6 +822,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) ...@@ -822,6 +822,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its)
u64 entry_size = GITS_BASER_ENTRY_SIZE(val); u64 entry_size = GITS_BASER_ENTRY_SIZE(val);
int order = get_order(psz); int order = get_order(psz);
int alloc_size; int alloc_size;
int alloc_pages;
u64 tmp; u64 tmp;
void *base; void *base;
...@@ -856,6 +857,14 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) ...@@ -856,6 +857,14 @@ static int its_alloc_tables(const char *node_name, struct its_node *its)
} }
alloc_size = (1 << order) * PAGE_SIZE; alloc_size = (1 << order) * PAGE_SIZE;
alloc_pages = (alloc_size / psz);
if (alloc_pages > GITS_BASER_PAGES_MAX) {
alloc_pages = GITS_BASER_PAGES_MAX;
order = get_order(GITS_BASER_PAGES_MAX * psz);
pr_warn("%s: Device Table too large, reduce its page order to %u (%u pages)\n",
node_name, order, alloc_pages);
}
base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order); base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
if (!base) { if (!base) {
err = -ENOMEM; err = -ENOMEM;
...@@ -884,7 +893,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its) ...@@ -884,7 +893,7 @@ static int its_alloc_tables(const char *node_name, struct its_node *its)
break; break;
} }
val |= (alloc_size / psz) - 1; val |= alloc_pages - 1;
writeq_relaxed(val, its->base + GITS_BASER + i * 8); writeq_relaxed(val, its->base + GITS_BASER + i * 8);
tmp = readq_relaxed(its->base + GITS_BASER + i * 8); tmp = readq_relaxed(its->base + GITS_BASER + i * 8);
......
...@@ -231,6 +231,7 @@ ...@@ -231,6 +231,7 @@
#define GITS_BASER_PAGE_SIZE_16K (1UL << GITS_BASER_PAGE_SIZE_SHIFT) #define GITS_BASER_PAGE_SIZE_16K (1UL << GITS_BASER_PAGE_SIZE_SHIFT)
#define GITS_BASER_PAGE_SIZE_64K (2UL << GITS_BASER_PAGE_SIZE_SHIFT) #define GITS_BASER_PAGE_SIZE_64K (2UL << GITS_BASER_PAGE_SIZE_SHIFT)
#define GITS_BASER_PAGE_SIZE_MASK (3UL << GITS_BASER_PAGE_SIZE_SHIFT) #define GITS_BASER_PAGE_SIZE_MASK (3UL << GITS_BASER_PAGE_SIZE_SHIFT)
#define GITS_BASER_PAGES_MAX 256
#define GITS_BASER_TYPE_NONE 0 #define GITS_BASER_TYPE_NONE 0
#define GITS_BASER_TYPE_DEVICE 1 #define GITS_BASER_TYPE_DEVICE 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment