From: "Ard Biesheuvel" <ardb@kernel.org>
To: "Kevin Brodsky" <kevin.brodsky@arm.com>,
"Ard Biesheuvel" <ardb+git@google.com>,
linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, "Will Deacon" <will@kernel.org>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Mark Rutland" <mark.rutland@arm.com>,
"Ryan Roberts" <ryan.roberts@arm.com>,
"Anshuman Khandual" <anshuman.khandual@arm.com>,
"Liz Prucka" <lizprucka@google.com>,
"Seth Jenkins" <sethjenkins@google.com>,
"Kees Cook" <kees@kernel.org>, "Mike Rapoport" <rppt@kernel.org>,
"David Hildenbrand" <david@kernel.org>,
"Andrew Morton" <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH v4 13/15] arm64: mm: Unmap kernel data/bss entirely from the linear map
Date: Wed, 29 Apr 2026 19:37:36 +0200 [thread overview]
Message-ID: <5279ea66-0e31-4f53-ad76-4fd8ebc012fc@app.fastmail.com> (raw)
In-Reply-To: <15555e9f-65ab-4811-b20c-8ada90bdc9d0@arm.com>
On Wed, 29 Apr 2026, at 15:55, Kevin Brodsky wrote:
> On 27/04/2026 17:34, Ard Biesheuvel wrote:
>> From: Ard Biesheuvel <ardb@kernel.org>
>>
>> The linear aliases of the kernel text and rodata are mapped read-only in
>> the linear map as well. Given that the contents of these regions are
>> mostly identical to the version in the loadable image, mapping them
>> read-only and leaving their contents visible is a reasonable hardening
>> measure.
>>
>> Data and bss, however, are now also mapped read-only but the contents of
>> these regions are more likely to contain data that we'd rather not leak.
>
> That sounds like a good rationale but I wonder, is there anything
> stopping us from unmapping text/rodata as well?
>
There is the zero page now, which may be accessed via
'page_address(ZERO_PAGE(0))'. Also, anything that dereferences page tables
(like /sys/kernel/debug/kernel_page_tables) will expect to have read-only
access to swapper_pg_dir.
>> So let's unmap these entirely in the linear map when the kernel is
>> running normally.
>>
>> When going into hibernation or waking up from it, these regions need to
>> be mapped, so map the region initially, and toggle the valid bit so
>> map/unmap the region as needed.
>
> Doesn't safe_copy_page() already handle that? I suppose this is an
> optimisation to avoid modifying the linear map for every page, but if so
> it would be good to spell it out.
>
Uhm, good question.
When hibernate was first implemented for arm64, we had to bring back the
linear alias of the kernel image, and when I started working on this, I
hadn't realised that we have safe_copy_page() now which should take care
of this even if the linear alias is invalid.
However, if I remove this handling, things breaks mysteriously, and it
is a bit tricky to debug so it may take me some time to answer this
question. In any case, I will address this in the next revision, and
put you on cc.
>> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
>> ---
>> arch/arm64/mm/mmu.c | 44 ++++++++++++++++----
>> 1 file changed, 37 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
>> index 9361b7efb848..a464f3d2d2df 100644
>> --- a/arch/arm64/mm/mmu.c
>> +++ b/arch/arm64/mm/mmu.c
>> @@ -24,6 +24,7 @@
>> #include <linux/mm.h>
>> #include <linux/vmalloc.h>
>> #include <linux/set_memory.h>
>> +#include <linux/suspend.h>
>> #include <linux/kfence.h>
>> #include <linux/pkeys.h>
>> #include <linux/mm_inline.h>
>> @@ -1040,6 +1041,31 @@ static void __init __map_memblock(phys_addr_t start, phys_addr_t end,
>> end - start, prot, early_pgtable_alloc, flags);
>> }
>>
>> +static void remap_linear_data_alias(bool unmap)
>> +{
>> + set_memory_valid((unsigned long)lm_alias(__init_end),
>> + (unsigned long)(__fixmap_pgdir_start - __init_end) / PAGE_SIZE,
>> + !unmap);
>> +}
>> +
>> +static int arm64_hibernate_pm_notify(struct notifier_block *nb,
>> + unsigned long mode, void *unused)
>> +{
>> + switch (mode) {
>> + default:
>> + break;
>> + case PM_POST_HIBERNATION:
>> + case PM_POST_RESTORE:
>> + remap_linear_data_alias(true);
>> + break;
>> + case PM_HIBERNATION_PREPARE:
>> + case PM_RESTORE_PREPARE:
>> + remap_linear_data_alias(false);
>> + break;
>> + }
>> + return 0;
>> +}
>> +
>> void __init mark_linear_text_alias_ro(void)
>> {
>> /*
>> @@ -1048,6 +1074,16 @@ void __init mark_linear_text_alias_ro(void)
>> update_mapping_prot(__pa_symbol(_text), (unsigned long)lm_alias(_text),
>> (unsigned long)__init_begin - (unsigned long)_text,
>> pgprot_tagged(PAGE_KERNEL_RO));
>> +
>> + remap_linear_data_alias(true);
>
> It's really hard to know what this does without looking at the function.
> How about mark_linear_data_alias_valid(false)?
>
Sure.
>> +
>> + if (IS_ENABLED(CONFIG_HIBERNATION)) {
>> + static struct notifier_block nb = {
>> + .notifier_call = arm64_hibernate_pm_notify
>> + };
>> +
>> + register_pm_notifier(&nb);
>> + }
>> }
>>
>> #ifdef CONFIG_KFENCE
>> @@ -1162,7 +1198,7 @@ static void __init map_mem(void)
>>
>> /* Map the kernel data/bss so it can be remapped later */
>> __map_memblock(init_end, kernel_end, pgprot_tagged(PAGE_KERNEL),
>> - flags);
>> + flags | NO_BLOCK_MAPPINGS);
>
> Might be an obvious question but why do we need this?
>
set_memory_valid() only works on regions that are mapped down to pages.
next prev parent reply other threads:[~2026-04-29 17:38 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-27 15:34 [PATCH v4 00/15] arm64: Unmap linear alias of kernel data/bss Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 01/15] arm64: mm: Map the linear alias of text/rodata as tagged Ard Biesheuvel
2026-04-28 14:16 ` Kevin Brodsky
2026-04-28 16:23 ` Ard Biesheuvel
2026-04-29 7:57 ` Kevin Brodsky
2026-04-29 7:58 ` Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 02/15] mm: Make empty_zero_page __ro_after_init Ard Biesheuvel
2026-04-28 12:27 ` Mike Rapoport
2026-04-28 14:16 ` Kevin Brodsky
2026-04-28 19:51 ` David Hildenbrand (Arm)
2026-04-27 15:34 ` [PATCH v4 03/15] arm64: mm: Preserve existing table mappings when mapping DRAM Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 04/15] arm64: mm: Preserve non-contiguous descriptors " Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 05/15] arm64: mm: Remove bogus stop condition from map_mem() loop Ard Biesheuvel
2026-04-28 14:33 ` Kevin Brodsky
2026-04-27 15:34 ` [PATCH v4 06/15] arm64: mm: Drop redundant pgd_t* argument from map_mem() Ard Biesheuvel
2026-04-28 14:33 ` Kevin Brodsky
2026-04-27 15:34 ` [PATCH v4 07/15] arm64: mm: Permit contiguous descriptors to be rewritten Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 08/15] arm64: kfence: Avoid NOMAP tricks when mapping the early pool Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 09/15] arm64: mm: Permit contiguous attribute for preliminary mappings Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 10/15] arm64: Move fixmap page tables to end of kernel image Ard Biesheuvel
2026-04-29 13:52 ` Kevin Brodsky
2026-04-27 15:34 ` [PATCH v4 11/15] arm64: mm: Don't abuse memblock NOMAP to check for overlaps Ard Biesheuvel
2026-04-29 10:54 ` Kevin Brodsky
2026-04-29 14:23 ` Ard Biesheuvel
2026-04-29 14:30 ` Kevin Brodsky
2026-04-27 15:34 ` [PATCH v4 12/15] arm64: mm: Map the kernel data/bss read-only in the linear map Ard Biesheuvel
2026-04-29 13:54 ` Kevin Brodsky
2026-04-29 14:46 ` Ard Biesheuvel
2026-04-27 15:34 ` [PATCH v4 13/15] arm64: mm: Unmap kernel data/bss entirely from " Ard Biesheuvel
2026-04-29 13:55 ` Kevin Brodsky
2026-04-29 17:37 ` Ard Biesheuvel [this message]
2026-04-27 15:34 ` [PATCH v4 14/15] arm64: mm: Generalize manipulation code of read-only descriptors Ard Biesheuvel
2026-04-29 13:57 ` Kevin Brodsky
2026-04-27 15:34 ` [PATCH v4 15/15] arm64: mm: Remap linear aliases of the fixmap page tables read-only Ard Biesheuvel
2026-04-29 13:57 ` Kevin Brodsky
2026-04-29 14:08 ` Ard Biesheuvel
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=5279ea66-0e31-4f53-ad76-4fd8ebc012fc@app.fastmail.com \
--to=ardb@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb+git@google.com \
--cc=catalin.marinas@arm.com \
--cc=david@kernel.org \
--cc=kees@kernel.org \
--cc=kevin.brodsky@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lizprucka@google.com \
--cc=mark.rutland@arm.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=sethjenkins@google.com \
--cc=will@kernel.org \
/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