The patch titled
Subject: huge tmpfs: show page team flag in pageflags
has been removed from the -mm tree. Its filename was
huge-tmpfs-show-page-team-flag-in-pageflags.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Andres Lagar-Cavilla <andreslc@xxxxxxxxxx>
Subject: huge tmpfs: show page team flag in pageflags
For debugging and testing.
Signed-off-by: Andres Lagar-Cavilla <andreslc@xxxxxxxxxx>
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: Yang Shi <yang.shi@xxxxxxxxxx>
Cc: Ning Qu <quning@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/vm/pagemap.txt | 2 ++
fs/proc/page.c | 6 ++++++
include/uapi/linux/kernel-page-flags.h | 3 ++-
tools/vm/page-types.c | 2 ++
4 files changed, 12 insertions(+), 1 deletion(-)
diff -puN Documentation/vm/pagemap.txt~huge-tmpfs-show-page-team-flag-in-pageflags Documentation/vm/pagemap.txt
--- a/Documentation/vm/pagemap.txt~huge-tmpfs-show-page-team-flag-in-pageflags
+++ a/Documentation/vm/pagemap.txt
@@ -71,6 +71,8 @@ There are four components to pagemap:
23. BALLOON
24. ZERO_PAGE
25. IDLE
+ 26. TEAM
+ 27. TEAM_PMD_MMAP (only if the whole team is mapped as a pmd at least once)
* /proc/kpagecgroup. This file contains a 64-bit inode number of the
memory cgroup each page is charged to, indexed by PFN. Only available when
diff -puN fs/proc/page.c~huge-tmpfs-show-page-team-flag-in-pageflags fs/proc/page.c
--- a/fs/proc/page.c~huge-tmpfs-show-page-team-flag-in-pageflags
+++ a/fs/proc/page.c
@@ -12,6 +12,7 @@
#include <linux/memcontrol.h>
#include <linux/mmu_notifier.h>
#include <linux/page_idle.h>
+#include <linux/pageteam.h>
#include <linux/kernel-page-flags.h>
#include <asm/uaccess.h>
#include "internal.h"
@@ -112,6 +113,11 @@ u64 stable_page_flags(struct page *page)
if (PageKsm(page))
u |= 1 << KPF_KSM;
+ if (PageTeam(page)) {
+ u |= 1 << KPF_TEAM;
+ if (page == team_head(page) && team_pmd_mapped(page))
+ u |= 1 << KPF_TEAM_PMD_MMAP;
+ }
/*
* compound pages: export both head/tail info
* they together define a compound page's start/end pos and order
diff -puN include/uapi/linux/kernel-page-flags.h~huge-tmpfs-show-page-team-flag-in-pageflags include/uapi/linux/kernel-page-flags.h
--- a/include/uapi/linux/kernel-page-flags.h~huge-tmpfs-show-page-team-flag-in-pageflags
+++ a/include/uapi/linux/kernel-page-flags.h
@@ -34,6 +34,7 @@
#define KPF_BALLOON 23
#define KPF_ZERO_PAGE 24
#define KPF_IDLE 25
-
+#define KPF_TEAM 26
+#define KPF_TEAM_PMD_MMAP 27
#endif /* _UAPILINUX_KERNEL_PAGE_FLAGS_H */
diff -puN tools/vm/page-types.c~huge-tmpfs-show-page-team-flag-in-pageflags tools/vm/page-types.c
--- a/tools/vm/page-types.c~huge-tmpfs-show-page-team-flag-in-pageflags
+++ a/tools/vm/page-types.c
@@ -133,6 +133,8 @@ static const char * const page_flag_name
[KPF_BALLOON] = "o:balloon",
[KPF_ZERO_PAGE] = "z:zero_page",
[KPF_IDLE] = "i:idle_page",
+ [KPF_TEAM] = "y:team",
+ [KPF_TEAM_PMD_MMAP] = "Y:team_pmd_mmap",
[KPF_RESERVED] = "r:reserved",
[KPF_MLOCKED] = "m:mlocked",
_
Patches currently in -mm which might be from andreslc@xxxxxxxxxx are
tmpfs-mem_cgroup-charge-fault-to-vm_mm-not-current-mm.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
