From: "Adrian Barnaś" <abarnas@google.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-mm@kvack.org, "Adrian Barnaś" <abarnas@google.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>,
"Ryan Roberts" <ryan.roberts@arm.com>,
"David Hildenbrand" <david@kernel.org>,
"Mike Rapoport (Microsoft)" <rppt@kernel.org>,
"Ard Biesheuvel" <ardb@kernel.org>,
"Christoph Lameter" <cl@gentwo.org>,
"Yang Shi" <yang@os.amperecomputing.com>,
"Brendan Jackman" <jackmanb@google.com>
Subject: [RFC PATCH 3/6] arm64: mm: fix restoring linear map permissions on execmem cache clean
Date: Thu, 11 Jun 2026 13:01:41 +0000 [thread overview]
Message-ID: <20260611130144.1385343-4-abarnas@google.com> (raw)
In-Reply-To: <20260611130144.1385343-1-abarnas@google.com>
Strip the read-only attribute from the selected memory range when
restoring the linear map after an execmem cache clean.
An execmem cache clean is performed when a cache block becomes empty
after unloading a module. When making the memory valid again, the linear
memory alias must also have its read-only attribute cleared.
Without this change, the linear memory alias remains read-only even
after the execmem cache block itself is freed, which prevents subsequent
allocations from writing to that memory.
Signed-off-by: Adrian Barnaś <abarnas@google.com>
---
arch/arm64/mm/pageattr.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 88720bbba892..eaefdf90b0d5 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -239,6 +239,13 @@ int set_memory_x(unsigned long addr, int numpages)
__pgprot(PTE_PXN));
}
+static int set_memory_default(unsigned long addr, int numpages)
+{
+ return __change_memory_common(addr, PAGE_SIZE * numpages,
+ __pgprot(PTE_VALID),
+ __pgprot(PTE_RDONLY));
+}
+
int set_memory_valid(unsigned long addr, int numpages, int enable)
{
if (enable)
@@ -362,7 +369,15 @@ int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
if (!can_set_direct_map())
return 0;
- return set_memory_valid(addr, nr, valid);
+ /*
+ * Execmem cache uses this function to reset permissions on linear mapping
+ * when freeing unused cache block. On x86 it makes memory RW which is
+ * desirable. On ARM64 set_memory_valid() just change valid bit which
+ * leave direct mapping read-only so use set_memory_default instead.
+ */
+
+ return valid ? set_memory_default(addr, nr) :
+ set_memory_valid(addr, nr, false);
}
#ifdef CONFIG_DEBUG_PAGEALLOC
--
2.54.0.1136.gdb2ca164c4-goog
next prev parent reply other threads:[~2026-06-11 13:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-11 13:01 [RFC PATCH 0/6] arm64: mm: Introducing ROX CACHE to ARM64 systems with bbml2 no abort Adrian Barnaś
2026-06-11 13:01 ` [RFC PATCH 1/6] arm64: mm: explicitly declare module and ftrace execmem regions Adrian Barnaś
2026-06-11 13:36 ` Brendan Jackman
2026-06-11 13:01 ` [RFC PATCH 2/6] arm64: mm: allow huge vmap permission adjustments with bbml2_no_abort Adrian Barnaś
2026-06-11 13:01 ` Adrian Barnaś [this message]
2026-06-11 13:54 ` [RFC PATCH 3/6] arm64: mm: fix restoring linear map permissions on execmem cache clean Brendan Jackman
2026-06-11 13:01 ` [RFC PATCH 4/6] arm64: mm: add helper to fill execmem with trapping instructions Adrian Barnaś
2026-06-11 13:01 ` [RFC PATCH 5/6] arm64: execmem: enable EXECMEM_ROX_CACHE on supported CPUs Adrian Barnaś
2026-06-11 13:01 ` [RFC PATCH 6/6] arm64: mm: support PMD page coalescing in the linear map Adrian Barnaś
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=20260611130144.1385343-4-abarnas@google.com \
--to=abarnas@google.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=cl@gentwo.org \
--cc=david@kernel.org \
--cc=jackmanb@google.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=will@kernel.org \
--cc=yang@os.amperecomputing.com \
/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