mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping
@ 2020-11-13  7:30 Anshuman Khandual
  2020-11-13  7:43 ` Ard Biesheuvel
  2020-11-13 11:27 ` Will Deacon
  0 siblings, 2 replies; 3+ messages in thread
From: Anshuman Khandual @ 2020-11-13  7:30 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: ardb, Anshuman Khandual, Catalin Marinas, Will Deacon,
	Mark Rutland, Steven Price, Robin Murphy, David Hildenbrand,
	Andrew Morton, linux-kernel

During memory hotplug process, the linear mapping should not be created for
a given memory range if that would fall outside the maximum allowed linear
range. Else it might cause memory corruption in the kernel virtual space.

Maximum linear mapping region is [PAGE_OFFSET..(PAGE_END -1)] accommodating
both its ends but excluding PAGE_END. Max physical range that can be mapped
inside this linear mapping range, must also be derived from its end points.

This ensures that arch_add_memory() validates memory hot add range for its
potential linear mapping requirements, before creating it with
__create_pgd_mapping().

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Steven Price <steven.price@arm.com>
Cc: Robin Murphy <robin.murphy@arm.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Fixes: 4ab215061554 ("arm64: Add memory hotplug support")
Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
---
This applies on 5.10-rc3

Changes in V3:

- Dropped comment paragraphs from code and commit message per Ard
- Dropped parenthesis brackets in the comparison per Ard

Changes in V2: (https://lore.kernel.org/linux-arm-kernel/1605236574-14636-1-git-send-email-anshuman.khandual@arm.com/)

- Replaced (start + size) with (start + size - 1) in the comparison per Ard
- Dropped parenthesis brackets in the comparison per Ard

Changes in V1: (https://lore.kernel.org/linux-arm-kernel/1600332402-30123-1-git-send-email-anshuman.khandual@arm.com/)

 arch/arm64/mm/mmu.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 1c0f3e02f731..ca692a815731 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -1444,11 +1444,28 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size)
 	free_empty_tables(start, end, PAGE_OFFSET, PAGE_END);
 }
 
+static bool inside_linear_region(u64 start, u64 size)
+{
+	/*
+	 * Linear mapping region is the range [PAGE_OFFSET..(PAGE_END - 1)]
+	 * accommodating both its ends but excluding PAGE_END. Max physical
+	 * range which can be mapped inside this linear mapping range, must
+	 * also be derived from its end points.
+	 */
+	return start >= __pa(_PAGE_OFFSET(vabits_actual)) &&
+	       (start + size - 1) <= __pa(PAGE_END - 1);
+}
+
 int arch_add_memory(int nid, u64 start, u64 size,
 		    struct mhp_params *params)
 {
 	int ret, flags = 0;
 
+	if (!inside_linear_region(start, size)) {
+		pr_err("[%llx %llx] is outside linear mapping region\n", start, start + size);
+		return -EINVAL;
+	}
+
 	if (rodata_full || debug_pagealloc_enabled())
 		flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
 
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping
  2020-11-13  7:30 [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping Anshuman Khandual
@ 2020-11-13  7:43 ` Ard Biesheuvel
  2020-11-13 11:27 ` Will Deacon
  1 sibling, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2020-11-13  7:43 UTC (permalink / raw)
  To: Anshuman Khandual
  Cc: Linux ARM, Catalin Marinas, Will Deacon, Mark Rutland,
	Steven Price, Robin Murphy, David Hildenbrand, Andrew Morton,
	Linux Kernel Mailing List

On Fri, 13 Nov 2020 at 08:31, Anshuman Khandual
<anshuman.khandual@arm.com> wrote:
>
> During memory hotplug process, the linear mapping should not be created for
> a given memory range if that would fall outside the maximum allowed linear
> range. Else it might cause memory corruption in the kernel virtual space.
>
> Maximum linear mapping region is [PAGE_OFFSET..(PAGE_END -1)] accommodating
> both its ends but excluding PAGE_END. Max physical range that can be mapped
> inside this linear mapping range, must also be derived from its end points.
>
> This ensures that arch_add_memory() validates memory hot add range for its
> potential linear mapping requirements, before creating it with
> __create_pgd_mapping().
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Ard Biesheuvel <ardb@kernel.org>
> Cc: Steven Price <steven.price@arm.com>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> Fixes: 4ab215061554 ("arm64: Add memory hotplug support")
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
> ---
> This applies on 5.10-rc3
>
> Changes in V3:
>
> - Dropped comment paragraphs from code and commit message per Ard
> - Dropped parenthesis brackets in the comparison per Ard
>
> Changes in V2: (https://lore.kernel.org/linux-arm-kernel/1605236574-14636-1-git-send-email-anshuman.khandual@arm.com/)
>
> - Replaced (start + size) with (start + size - 1) in the comparison per Ard
> - Dropped parenthesis brackets in the comparison per Ard
>
> Changes in V1: (https://lore.kernel.org/linux-arm-kernel/1600332402-30123-1-git-send-email-anshuman.khandual@arm.com/)
>
>  arch/arm64/mm/mmu.c | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>
> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
> index 1c0f3e02f731..ca692a815731 100644
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@ -1444,11 +1444,28 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size)
>         free_empty_tables(start, end, PAGE_OFFSET, PAGE_END);
>  }
>
> +static bool inside_linear_region(u64 start, u64 size)
> +{
> +       /*
> +        * Linear mapping region is the range [PAGE_OFFSET..(PAGE_END - 1)]
> +        * accommodating both its ends but excluding PAGE_END. Max physical
> +        * range which can be mapped inside this linear mapping range, must
> +        * also be derived from its end points.
> +        */
> +       return start >= __pa(_PAGE_OFFSET(vabits_actual)) &&
> +              (start + size - 1) <= __pa(PAGE_END - 1);
> +}
> +
>  int arch_add_memory(int nid, u64 start, u64 size,
>                     struct mhp_params *params)
>  {
>         int ret, flags = 0;
>
> +       if (!inside_linear_region(start, size)) {
> +               pr_err("[%llx %llx] is outside linear mapping region\n", start, start + size);
> +               return -EINVAL;
> +       }
> +
>         if (rodata_full || debug_pagealloc_enabled())
>                 flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping
  2020-11-13  7:30 [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping Anshuman Khandual
  2020-11-13  7:43 ` Ard Biesheuvel
@ 2020-11-13 11:27 ` Will Deacon
  1 sibling, 0 replies; 3+ messages in thread
From: Will Deacon @ 2020-11-13 11:27 UTC (permalink / raw)
  To: Anshuman Khandual, linux-arm-kernel
  Cc: catalin.marinas, kernel-team, Will Deacon, linux-kernel,
	Robin Murphy, Steven Price, David Hildenbrand, ardb,
	Mark Rutland, Andrew Morton

On Fri, 13 Nov 2020 13:00:14 +0530, Anshuman Khandual wrote:
> During memory hotplug process, the linear mapping should not be created for
> a given memory range if that would fall outside the maximum allowed linear
> range. Else it might cause memory corruption in the kernel virtual space.
> 
> Maximum linear mapping region is [PAGE_OFFSET..(PAGE_END -1)] accommodating
> both its ends but excluding PAGE_END. Max physical range that can be mapped
> inside this linear mapping range, must also be derived from its end points.
> 
> [...]

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64/mm: Validate hotplug range before creating linear mapping
      https://git.kernel.org/arm64/c/58284a901b42

Cheers,
-- 
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-13 12:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13  7:30 [PATCH V3] arm64/mm: Validate hotplug range before creating linear mapping Anshuman Khandual
2020-11-13  7:43 ` Ard Biesheuvel
2020-11-13 11:27 ` Will Deacon

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®