* [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-01 15:18 [PATCH v7 0/3] mm: make persistent huge zero folio read-only Xueyuan Chen
@ 2026-09-01 15:18 ` Xueyuan Chen
2026-09-02 20:59 ` Dave Hansen
2026-09-03 9:22 ` Mike Rapoport
2026-09-01 15:18 ` [PATCH v7 2/3] arm64/mm: add set_direct_map_ro() Xueyuan Chen
2026-09-01 15:18 ` [PATCH v7 3/3] x86/mm: " Xueyuan Chen
2 siblings, 2 replies; 9+ messages in thread
From: Xueyuan Chen @ 2026-09-01 15:18 UTC (permalink / raw)
To: akpm
Cc: david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, rppt,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
The persistent huge zero folio is shared globally and should stay zero
after initialization. As Jann Horn pointed out [1], kernel bugs have
ended up writing to pages that were meant to be read-only, including in
security-sensitive cases. Making the folio read-only in the direct map
turns such writes into faults instead of silent zero-page corruption.
Add a page-based helper consistent with the existing direct-map interfaces.
Handle TLB invalidation in the architecture implementation; unsupported
architectures retain their current behavior.
Protect the folio after initialization. Skip highmem folios, which have no
permanent direct-map mapping.
Inspired by Jann Horn's read-only zero page work [1] and follow-up
discussion [3] with Yang Shi.
Link: https://lore.kernel.org/r/20260508-ro-zeropage-v1-1-9808abc20b49@google.com [1]
Link: https://lore.kernel.org/r/0e5b23a6-4895-454a-9dfa-6dc21adc2991@kernel.org [2]
Link: https://lore.kernel.org/r/CAHbLzkrXXe7r3n3jXgDKtwZhRqj=jDx9E6dLOULohnhBguvi9A@mail.gmail.com [3]
Suggested-by: David Hildenbrand <david@kernel.org>
Suggested-by: Usama Arif <usama.arif@linux.dev>
Co-developed-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Xueyuan Chen <xueyuan.chen21@gmail.com>
---
include/linux/set_memory.h | 17 +++++++++++++++++
mm/huge_memory.c | 13 ++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h
index 3fe293cfed8c..ed9ce04b18a1 100644
--- a/include/linux/set_memory.h
+++ b/include/linux/set_memory.h
@@ -54,6 +54,23 @@ static inline bool can_set_direct_map(void)
#endif
#endif /* CONFIG_ARCH_HAS_SET_DIRECT_MAP */
+#ifndef set_direct_map_ro
+/**
+ * set_direct_map_ro - make a direct-map range read-only
+ * @page: first page in the direct-map range
+ * @nr: number of pages in the range
+ *
+ * Make the direct-map range starting at @page read-only and invalidate stale
+ * writable translations before returning.
+ *
+ * Return: 0 on success, or a negative error code on failure.
+ */
+static inline int set_direct_map_ro(struct page *page, unsigned int nr)
+{
+ return 0;
+}
+#endif
+
#ifdef CONFIG_X86_64
int set_mce_nospec(unsigned long pfn);
int clear_mce_nospec(unsigned long pfn);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 54494c3fa983..742283b36d74 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -42,6 +42,7 @@
#include <linux/pgalloc_tag.h>
#include <linux/pagewalk.h>
#include <linux/cleanup.h>
+#include <linux/set_memory.h>
#include <asm/tlb.h>
#include "internal.h"
@@ -291,10 +292,16 @@ static int __init huge_zero_init(void)
huge_zero_folio = alloc_huge_zero_folio();
if (!huge_zero_folio) {
pr_warn("Allocating persistent huge zero folio failed\n");
- } else {
- huge_zero_pfn = folio_pfn(huge_zero_folio);
- count_vm_event(THP_ZERO_PAGE_ALLOC);
+ return 0;
}
+
+ huge_zero_pfn = folio_pfn(huge_zero_folio);
+ count_vm_event(THP_ZERO_PAGE_ALLOC);
+
+ /* Highmem folios have no permanent direct-map mapping to protect. */
+ if (!folio_test_highmem(huge_zero_folio))
+ set_direct_map_ro(folio_page(huge_zero_folio, 0), HPAGE_PMD_NR);
+
return 0;
}
--
2.47.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-01 15:18 ` [PATCH v7 1/3] " Xueyuan Chen
@ 2026-09-02 20:59 ` Dave Hansen
2026-09-03 9:20 ` Mike Rapoport
2026-09-03 9:22 ` Mike Rapoport
1 sibling, 1 reply; 9+ messages in thread
From: Dave Hansen @ 2026-09-02 20:59 UTC (permalink / raw)
To: Xueyuan Chen, akpm
Cc: david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, rppt,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
On 9/1/26 08:18, Xueyuan Chen wrote:
> +static inline int set_direct_map_ro(struct page *page, unsigned int nr)
> +{
> + return 0;
> +}
I still really think the stub here needs to return an error *or* the
thing needs to just be void and tell folks that they can't know whether
it worked or not.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-02 20:59 ` Dave Hansen
@ 2026-09-03 9:20 ` Mike Rapoport
2026-09-03 14:09 ` Dave Hansen
0 siblings, 1 reply; 9+ messages in thread
From: Mike Rapoport @ 2026-09-03 9:20 UTC (permalink / raw)
To: Dave Hansen
Cc: Xueyuan Chen, akpm, david, ljs, usama.arif, ziy, baolin.wang,
liam, nico.pache, ryan.roberts, dev.jain, baohua, lance.yang, kas,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
Hi Dave,
On Wed, Sep 02, 2026 at 01:59:15PM -0700, Dave Hansen wrote:
> On 9/1/26 08:18, Xueyuan Chen wrote:
> > +static inline int set_direct_map_ro(struct page *page, unsigned int nr)
> > +{
> > + return 0;
> > +}
>
> I still really think the stub here needs to return an error *or* the
> thing needs to just be void and tell folks that they can't know whether
> it worked or not.
All other stubs return 0 here when an arch does not support set_direct_map.
I'm for keeping them all consistent and fixing that technical debt as a
whole rather than creating a one-off here.
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-03 9:20 ` Mike Rapoport
@ 2026-09-03 14:09 ` Dave Hansen
0 siblings, 0 replies; 9+ messages in thread
From: Dave Hansen @ 2026-09-03 14:09 UTC (permalink / raw)
To: Mike Rapoport
Cc: Xueyuan Chen, akpm, david, ljs, usama.arif, ziy, baolin.wang,
liam, nico.pache, ryan.roberts, dev.jain, baohua, lance.yang, kas,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
On 9/3/26 02:20, Mike Rapoport wrote:
> On Wed, Sep 02, 2026 at 01:59:15PM -0700, Dave Hansen wrote:
>> On 9/1/26 08:18, Xueyuan Chen wrote:
>>> +static inline int set_direct_map_ro(struct page *page, unsigned int nr)
>>> +{
>>> + return 0;
>>> +}
>> I still really think the stub here needs to return an error *or* the
>> thing needs to just be void and tell folks that they can't know whether
>> it worked or not.
> All other stubs return 0 here when an arch does not support set_direct_map.
> I'm for keeping them all consistent and fixing that technical debt as a
> whole rather than creating a one-off here.
Oof. I didn't realize the set_direct_map_*() functions all did this.
I do think it's generally a bad idea, and I'm also OK if it is not fixed
up here.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-01 15:18 ` [PATCH v7 1/3] " Xueyuan Chen
2026-09-02 20:59 ` Dave Hansen
@ 2026-09-03 9:22 ` Mike Rapoport
2026-09-03 12:49 ` Xueyuan Chen
1 sibling, 1 reply; 9+ messages in thread
From: Mike Rapoport @ 2026-09-03 9:22 UTC (permalink / raw)
To: Xueyuan Chen
Cc: akpm, david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, catalin.marinas,
will, mark.rutland, linux-arm-kernel, tglx, mingo, bp,
dave.hansen, x86, hpa, luto, peterz, linux-mm, linux-kernel
On Tue, Sep 01, 2026 at 11:18:16PM +0800, Xueyuan Chen wrote:
> The persistent huge zero folio is shared globally and should stay zero
> after initialization. As Jann Horn pointed out [1], kernel bugs have
> ended up writing to pages that were meant to be read-only, including in
> security-sensitive cases. Making the folio read-only in the direct map
> turns such writes into faults instead of silent zero-page corruption.
>
> Add a page-based helper consistent with the existing direct-map interfaces.
> Handle TLB invalidation in the architecture implementation; unsupported
> architectures retain their current behavior.
>
> Protect the folio after initialization. Skip highmem folios, which have no
> permanent direct-map mapping.
>
> Inspired by Jann Horn's read-only zero page work [1] and follow-up
> discussion [3] with Yang Shi.
>
> Link: https://lore.kernel.org/r/20260508-ro-zeropage-v1-1-9808abc20b49@google.com [1]
> Link: https://lore.kernel.org/r/0e5b23a6-4895-454a-9dfa-6dc21adc2991@kernel.org [2]
> Link: https://lore.kernel.org/r/CAHbLzkrXXe7r3n3jXgDKtwZhRqj=jDx9E6dLOULohnhBguvi9A@mail.gmail.com [3]
>
> Suggested-by: David Hildenbrand <david@kernel.org>
> Suggested-by: Usama Arif <usama.arif@linux.dev>
> Co-developed-by: Lance Yang <lance.yang@linux.dev>
> Signed-off-by: Lance Yang <lance.yang@linux.dev>
> Signed-off-by: Xueyuan Chen <xueyuan.chen21@gmail.com>
> ---
> include/linux/set_memory.h | 17 +++++++++++++++++
> mm/huge_memory.c | 13 ++++++++++---
> 2 files changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h
> index 3fe293cfed8c..ed9ce04b18a1 100644
> --- a/include/linux/set_memory.h
> +++ b/include/linux/set_memory.h
> @@ -54,6 +54,23 @@ static inline bool can_set_direct_map(void)
> #endif
> #endif /* CONFIG_ARCH_HAS_SET_DIRECT_MAP */
>
> +#ifndef set_direct_map_ro
> +/**
> + * set_direct_map_ro - make a direct-map range read-only
> + * @page: first page in the direct-map range
> + * @nr: number of pages in the range
> + *
> + * Make the direct-map range starting at @page read-only and invalidate stale
> + * writable translations before returning.
> + *
> + * Return: 0 on success, or a negative error code on failure.
> + */
> +static inline int set_direct_map_ro(struct page *page, unsigned int nr)
> +{
> + return 0;
> +}
> +#endif
> +
> #ifdef CONFIG_X86_64
> int set_mce_nospec(unsigned long pfn);
> int clear_mce_nospec(unsigned long pfn);
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 54494c3fa983..742283b36d74 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -42,6 +42,7 @@
> #include <linux/pgalloc_tag.h>
> #include <linux/pagewalk.h>
> #include <linux/cleanup.h>
> +#include <linux/set_memory.h>
>
> #include <asm/tlb.h>
> #include "internal.h"
> @@ -291,10 +292,16 @@ static int __init huge_zero_init(void)
> huge_zero_folio = alloc_huge_zero_folio();
> if (!huge_zero_folio) {
> pr_warn("Allocating persistent huge zero folio failed\n");
> - } else {
> - huge_zero_pfn = folio_pfn(huge_zero_folio);
> - count_vm_event(THP_ZERO_PAGE_ALLOC);
> + return 0;
> }
> +
> + huge_zero_pfn = folio_pfn(huge_zero_folio);
> + count_vm_event(THP_ZERO_PAGE_ALLOC);
> +
> + /* Highmem folios have no permanent direct-map mapping to protect. */
> + if (!folio_test_highmem(huge_zero_folio))
> + set_direct_map_ro(folio_page(huge_zero_folio, 0), HPAGE_PMD_NR);
Sorry, I don't remember if it was discussed previously, but why can't we
use the existing set_memory_ro() here?
> +
> return 0;
> }
>
> --
> 2.47.3
>
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v7 1/3] mm: make persistent huge zero folio read-only
2026-09-03 9:22 ` Mike Rapoport
@ 2026-09-03 12:49 ` Xueyuan Chen
0 siblings, 0 replies; 9+ messages in thread
From: Xueyuan Chen @ 2026-09-03 12:49 UTC (permalink / raw)
To: Mike Rapoport
Cc: akpm, david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, catalin.marinas,
will, mark.rutland, linux-arm-kernel, tglx, mingo, bp,
dave.hansen, x86, hpa, luto, peterz, linux-mm, linux-kernel
On Thu, Sep 3, 2026 at 5:22 PM Mike Rapoport <rppt@kernel.org> wrote:
>
> On Tue, Sep 01, 2026 at 11:18:16PM +0800, Xueyuan Chen wrote:
> > The persistent huge zero folio is shared globally and should stay zero
> > after initialization. As Jann Horn pointed out [1], kernel bugs have
> > ended up writing to pages that were meant to be read-only, including in
> > security-sensitive cases. Making the folio read-only in the direct map
> > turns such writes into faults instead of silent zero-page corruption.
> >
> > Add a page-based helper consistent with the existing direct-map interfaces.
> > Handle TLB invalidation in the architecture implementation; unsupported
> > architectures retain their current behavior.
> >
> > Protect the folio after initialization. Skip highmem folios, which have no
> > permanent direct-map mapping.
> >
> > Inspired by Jann Horn's read-only zero page work [1] and follow-up
> > discussion [3] with Yang Shi.
> >
> > Link: https://lore.kernel.org/r/20260508-ro-zeropage-v1-1-9808abc20b49@google.com [1]
> > Link: https://lore.kernel.org/r/0e5b23a6-4895-454a-9dfa-6dc21adc2991@kernel.org [2]
> > Link: https://lore.kernel.org/r/CAHbLzkrXXe7r3n3jXgDKtwZhRqj=jDx9E6dLOULohnhBguvi9A@mail.gmail.com [3]
> >
> > Suggested-by: David Hildenbrand <david@kernel.org>
> > Suggested-by: Usama Arif <usama.arif@linux.dev>
> > Co-developed-by: Lance Yang <lance.yang@linux.dev>
> > Signed-off-by: Lance Yang <lance.yang@linux.dev>
> > Signed-off-by: Xueyuan Chen <xueyuan.chen21@gmail.com>
> > ---
> > include/linux/set_memory.h | 17 +++++++++++++++++
> > mm/huge_memory.c | 13 ++++++++++---
> > 2 files changed, 27 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/set_memory.h b/include/linux/set_memory.h
> > index 3fe293cfed8c..ed9ce04b18a1 100644
> > --- a/include/linux/set_memory.h
> > +++ b/include/linux/set_memory.h
> > @@ -54,6 +54,23 @@ static inline bool can_set_direct_map(void)
> > #endif
> > #endif /* CONFIG_ARCH_HAS_SET_DIRECT_MAP */
> >
> > +#ifndef set_direct_map_ro
> > +/**
> > + * set_direct_map_ro - make a direct-map range read-only
> > + * @page: first page in the direct-map range
> > + * @nr: number of pages in the range
> > + *
> > + * Make the direct-map range starting at @page read-only and invalidate stale
> > + * writable translations before returning.
> > + *
> > + * Return: 0 on success, or a negative error code on failure.
> > + */
> > +static inline int set_direct_map_ro(struct page *page, unsigned int nr)
> > +{
> > + return 0;
> > +}
> > +#endif
> > +
> > #ifdef CONFIG_X86_64
> > int set_mce_nospec(unsigned long pfn);
> > int clear_mce_nospec(unsigned long pfn);
> > diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> > index 54494c3fa983..742283b36d74 100644
> > --- a/mm/huge_memory.c
> > +++ b/mm/huge_memory.c
> > @@ -42,6 +42,7 @@
> > #include <linux/pgalloc_tag.h>
> > #include <linux/pagewalk.h>
> > #include <linux/cleanup.h>
> > +#include <linux/set_memory.h>
> >
> > #include <asm/tlb.h>
> > #include "internal.h"
> > @@ -291,10 +292,16 @@ static int __init huge_zero_init(void)
> > huge_zero_folio = alloc_huge_zero_folio();
> > if (!huge_zero_folio) {
> > pr_warn("Allocating persistent huge zero folio failed\n");
> > - } else {
> > - huge_zero_pfn = folio_pfn(huge_zero_folio);
> > - count_vm_event(THP_ZERO_PAGE_ALLOC);
> > + return 0;
> > }
> > +
> > + huge_zero_pfn = folio_pfn(huge_zero_folio);
> > + count_vm_event(THP_ZERO_PAGE_ALLOC);
> > +
> > + /* Highmem folios have no permanent direct-map mapping to protect. */
> > + if (!folio_test_highmem(huge_zero_folio))
> > + set_direct_map_ro(folio_page(huge_zero_folio, 0), HPAGE_PMD_NR);
>
> Sorry, I don't remember if it was discussed previously, but why can't we
> use the existing set_memory_ro() here?
Hi Mike,
We want to change the linear map here, but arm64 set_memory_ro() only
works on vmalloc addresses.
So a new helper is needed on arm64, and x86 implements the same
helper to keep the two architectures consistent. On x86 it is
basically set_memory_ro() minus the alias check.
Thanks,
Xueyuan
>
> > +
> > return 0;
> > }
> >
> > --
> > 2.47.3
> >
>
> --
> Sincerely yours,
> Mike.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v7 2/3] arm64/mm: add set_direct_map_ro()
2026-09-01 15:18 [PATCH v7 0/3] mm: make persistent huge zero folio read-only Xueyuan Chen
2026-09-01 15:18 ` [PATCH v7 1/3] " Xueyuan Chen
@ 2026-09-01 15:18 ` Xueyuan Chen
2026-09-01 15:18 ` [PATCH v7 3/3] x86/mm: " Xueyuan Chen
2 siblings, 0 replies; 9+ messages in thread
From: Xueyuan Chen @ 2026-09-01 15:18 UTC (permalink / raw)
To: akpm
Cc: david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, rppt,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
Implement set_direct_map_ro() for arm64 and flush the TLB internally.
Co-developed-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Xueyuan Chen <xueyuan.chen21@gmail.com>
---
arch/arm64/include/asm/set_memory.h | 2 ++
arch/arm64/mm/pageattr.c | 12 ++++++++++++
2 files changed, 14 insertions(+)
diff --git a/arch/arm64/include/asm/set_memory.h b/arch/arm64/include/asm/set_memory.h
index 0091ba12200e..1be86dc11543 100644
--- a/arch/arm64/include/asm/set_memory.h
+++ b/arch/arm64/include/asm/set_memory.h
@@ -13,6 +13,8 @@ int set_memory_valid(unsigned long addr, int numpages, int enable);
int set_direct_map_invalid_noflush(struct page *page, unsigned int numpages);
int set_direct_map_default_noflush(struct page *page, unsigned int numpages);
+int set_direct_map_ro(struct page *page, unsigned int nr);
+#define set_direct_map_ro set_direct_map_ro
bool kernel_page_present(struct page *page);
int set_memory_encrypted(unsigned long addr, int numpages);
diff --git a/arch/arm64/mm/pageattr.c b/arch/arm64/mm/pageattr.c
index 132938b32eb1..0e95cd904ccb 100644
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@ -355,6 +355,18 @@ int realm_register_memory_enc_ops(void)
return arm64_mem_crypt_ops_register(&realm_crypt_ops);
}
+int set_direct_map_ro(struct page *page, unsigned int nr)
+{
+ unsigned long addr = (unsigned long)page_address(page);
+
+ if (!can_set_direct_map())
+ return 0;
+
+ return __change_memory_common(addr, PAGE_SIZE * nr,
+ __pgprot(PTE_RDONLY),
+ __pgprot(PTE_WRITE));
+}
+
#ifdef CONFIG_DEBUG_PAGEALLOC
void __kernel_map_pages(struct page *page, int numpages, int enable)
{
--
2.47.3
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v7 3/3] x86/mm: add set_direct_map_ro()
2026-09-01 15:18 [PATCH v7 0/3] mm: make persistent huge zero folio read-only Xueyuan Chen
2026-09-01 15:18 ` [PATCH v7 1/3] " Xueyuan Chen
2026-09-01 15:18 ` [PATCH v7 2/3] arm64/mm: add set_direct_map_ro() Xueyuan Chen
@ 2026-09-01 15:18 ` Xueyuan Chen
2 siblings, 0 replies; 9+ messages in thread
From: Xueyuan Chen @ 2026-09-01 15:18 UTC (permalink / raw)
To: akpm
Cc: david, ljs, usama.arif, ziy, baolin.wang, liam, nico.pache,
ryan.roberts, dev.jain, baohua, lance.yang, kas, rppt,
catalin.marinas, will, mark.rutland, linux-arm-kernel, tglx,
mingo, bp, dave.hansen, x86, hpa, luto, peterz, linux-mm,
linux-kernel
Implement set_direct_map_ro() for x86 with a page-based interface. Clear
_PAGE_RW and _PAGE_DIRTY through the CPA path and let the common CPA
wrapper invalidate stale writable translations before returning.
Co-developed-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Lance Yang <lance.yang@linux.dev>
Signed-off-by: Xueyuan Chen <xueyuan.chen21@gmail.com>
---
arch/x86/include/asm/set_memory.h | 2 ++
arch/x86/mm/pat/set_memory.c | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h
index 39271a5ea925..710164ea8258 100644
--- a/arch/x86/include/asm/set_memory.h
+++ b/arch/x86/include/asm/set_memory.h
@@ -88,6 +88,8 @@ int set_pages_rw(struct page *page, int numpages);
int set_direct_map_invalid_noflush(struct page *page, unsigned int nr);
int set_direct_map_default_noflush(struct page *page, unsigned int nr);
+int set_direct_map_ro(struct page *page, unsigned int nr);
+#define set_direct_map_ro set_direct_map_ro
bool kernel_page_present(struct page *page);
extern int kernel_set_to_readonly;
diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c
index a1a061d995b3..7c0cfa7acd17 100644
--- a/arch/x86/mm/pat/set_memory.c
+++ b/arch/x86/mm/pat/set_memory.c
@@ -2666,6 +2666,16 @@ int set_direct_map_default_noflush(struct page *page, unsigned int nr)
return __set_pages_p(page, nr, 0);
}
+int set_direct_map_ro(struct page *page, unsigned int nr)
+{
+ unsigned long addr = (unsigned long)page_address(page);
+
+ /* Direct-map callers are expected to pass pages without aliases. */
+ return change_page_attr_set_clr(&addr, nr, __pgprot(0),
+ __pgprot(_PAGE_RW | _PAGE_DIRTY), 0,
+ CPA_NO_CHECK_ALIAS, NULL);
+}
+
#ifdef CONFIG_DEBUG_PAGEALLOC
void __kernel_map_pages(struct page *page, int numpages, int enable)
{
--
2.47.3
^ permalink raw reply related [flat|nested] 9+ messages in thread