From: Marc Zyngier <marc.zyngier@arm.com>
To: Robert Richter <rric@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
Tirumalesh Chalamarla <tchalamarla@cavium.com>,
Radha Mohan Chintakuntla <rchintakuntla@cavium.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Robert Richter <rrichter@cavium.com>
Subject: Re: [PATCH 2/4] arm64: gicv3: its: Add range check for number of allocated pages
Date: Wed, 20 May 2015 13:14:38 +0100 [thread overview]
Message-ID: <20150520131438.6e94e661@why.wild-wind.fr.eu.org> (raw)
In-Reply-To: <1430686172-18222-3-git-send-email-rric@kernel.org>
On Sun, 3 May 2015 21:49:30 +0100
Robert Richter <rric@kernel.org> wrote:
> From: Robert Richter <rrichter@cavium.com>
>
> 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: Robert Richter <rrichter@cavium.com>
Looks good to me.
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
M.
> ---
> drivers/irqchip/irq-gic-v3-its.c | 11 ++++++++++-
> include/linux/irqchip/arm-gic-v3.h | 1 +
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c
> index e30b4de04c6c..a2619a1d5bb3 100644
> --- a/drivers/irqchip/irq-gic-v3-its.c
> +++ b/drivers/irqchip/irq-gic-v3-its.c
> @@ -810,6 +810,7 @@ static int its_alloc_tables(struct its_node *its)
> u64 entry_size = GITS_BASER_ENTRY_SIZE(val);
> int order = get_order(psz);
> int alloc_size;
> + int alloc_pages;
> u64 tmp;
> void *base;
>
> @@ -837,6 +838,14 @@ static int its_alloc_tables(struct its_node *its)
> }
>
> 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",
> + its->msi_chip.of_node->full_name, order, alloc_pages);
> + }
> +
> base = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
> if (!base) {
> err = -ENOMEM;
> @@ -865,7 +874,7 @@ static int its_alloc_tables(struct its_node *its)
> break;
> }
>
> - val |= (alloc_size / psz) - 1;
> + val |= alloc_pages - 1;
>
> writeq_relaxed(val, its->base + GITS_BASER + i * 8);
> tmp = readq_relaxed(its->base + GITS_BASER + i * 8);
> diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
> index ffbc034c8810..f28da189c4aa 100644
> --- a/include/linux/irqchip/arm-gic-v3.h
> +++ b/include/linux/irqchip/arm-gic-v3.h
> @@ -229,6 +229,7 @@
> #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_MASK (3UL << GITS_BASER_PAGE_SIZE_SHIFT)
> +#define GITS_BASER_PAGES_MAX 256
>
> #define GITS_BASER_TYPE_NONE 0
> #define GITS_BASER_TYPE_DEVICE 1
--
Without deviation from the norm, progress is not possible.
next prev parent reply other threads:[~2015-05-20 12:12 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-03 20:49 [PATCH 0/4] arm64: gicv3: its: Fixes and updates for ThunderX Robert Richter
2015-05-03 20:49 ` [PATCH 1/4] arm64: gicv3: its: Encode domain number in PCI stream id Robert Richter
2015-05-20 12:11 ` Marc Zyngier
2015-05-20 12:48 ` Robert Richter
2015-05-22 8:26 ` Marc Zyngier
2015-05-22 22:57 ` Chalamarla, Tirumalesh
2015-05-25 10:38 ` Marc Zyngier
2015-05-03 20:49 ` [PATCH 2/4] arm64: gicv3: its: Add range check for number of allocated pages Robert Richter
2015-05-20 12:14 ` Marc Zyngier [this message]
2015-05-03 20:49 ` [PATCH 3/4] arm64: gicv3: its: Read typer register outside the loop Robert Richter
2015-05-20 12:15 ` Marc Zyngier
2015-05-03 20:49 ` [PATCH 4/4] arm64: gicv3: its: Increase FORCE_MAX_ZONEORDER for Cavium ThunderX Robert Richter
2015-05-05 10:53 ` Will Deacon
2015-05-11 9:14 ` Robert Richter
2015-05-12 12:30 ` Will Deacon
2015-05-12 16:20 ` Robert Richter
2015-05-12 17:24 ` Will Deacon
2015-05-12 17:46 ` Robert Richter
2015-05-20 12:22 ` Marc Zyngier
2015-05-20 12:31 ` Robert Richter
2015-05-20 16:48 ` Catalin Marinas
2015-05-21 8:35 ` Marc Zyngier
2015-05-21 12:13 ` Robert Richter
2015-05-21 12:34 ` Marc Zyngier
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=20150520131438.6e94e661@why.wild-wind.fr.eu.org \
--to=marc.zyngier@arm.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rchintakuntla@cavium.com \
--cc=rric@kernel.org \
--cc=rrichter@cavium.com \
--cc=tchalamarla@cavium.com \
--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).