Skip to content

Commit

Permalink
mm: Add PG_arch_3 page flag
Browse files Browse the repository at this point in the history
As with PG_arch_2, this flag is only allowed on 64-bit architectures due
to the shortage of bits available. It will be used by the arm64 MTE code
in subsequent patches.

Signed-off-by: Peter Collingbourne <pcc@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Steven Price <steven.price@arm.com>
[catalin.marinas@arm.com: added flag preserving in __split_huge_page_tail()]
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
pcc authored and ctmarinas committed Sep 2, 2022
1 parent 32cd851 commit 16cd379
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions fs/proc/page.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ u64 stable_page_flags(struct page *page)
u |= kpf_copy_bit(k, KPF_ARCH, PG_arch_1);
#ifdef CONFIG_64BIT
u |= kpf_copy_bit(k, KPF_ARCH_2, PG_arch_2);
u |= kpf_copy_bit(k, KPF_ARCH_3, PG_arch_3);
#endif

return u;
Expand Down
1 change: 1 addition & 0 deletions include/linux/page-flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ enum pageflags {
#endif
#ifdef CONFIG_64BIT
PG_arch_2,
PG_arch_3,
#endif
#ifdef CONFIG_KASAN_HW_TAGS
PG_skip_kasan_poison,
Expand Down
7 changes: 4 additions & 3 deletions include/trace/events/mmflags.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@
#endif

#ifdef CONFIG_64BIT
#define IF_HAVE_PG_ARCH_2(flag,string) ,{1UL << flag, string}
#define IF_HAVE_PG_ARCH_2_3(flag,string) ,{1UL << flag, string}
#else
#define IF_HAVE_PG_ARCH_2(flag,string)
#define IF_HAVE_PG_ARCH_2_3(flag,string)
#endif

#ifdef CONFIG_KASAN_HW_TAGS
Expand Down Expand Up @@ -130,7 +130,8 @@ IF_HAVE_PG_UNCACHED(PG_uncached, "uncached" ) \
IF_HAVE_PG_HWPOISON(PG_hwpoison, "hwpoison" ) \
IF_HAVE_PG_IDLE(PG_young, "young" ) \
IF_HAVE_PG_IDLE(PG_idle, "idle" ) \
IF_HAVE_PG_ARCH_2(PG_arch_2, "arch_2" ) \
IF_HAVE_PG_ARCH_2_3(PG_arch_2, "arch_2" ) \
IF_HAVE_PG_ARCH_2_3(PG_arch_3, "arch_3" ) \
IF_HAVE_PG_SKIP_KASAN_POISON(PG_skip_kasan_poison, "skip_kasan_poison")

#define show_page_flags(flags) \
Expand Down
1 change: 1 addition & 0 deletions mm/huge_memory.c
Original file line number Diff line number Diff line change
Expand Up @@ -2437,6 +2437,7 @@ static void __split_huge_page_tail(struct page *head, int tail,
(1L << PG_unevictable) |
#ifdef CONFIG_64BIT
(1L << PG_arch_2) |
(1L << PG_arch_3) |
#endif
(1L << PG_dirty)));

Expand Down

0 comments on commit 16cd379

Please sign in to comment.