The patch titled Subject: pagemap: introduce the /proc/PID/pagemap2 file has been added to the -mm tree. Its filename is pagemap-introduce-the-proc-pid-pagemap2-file.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Subject: pagemap: introduce the /proc/PID/pagemap2 file This file is the same as the pagemap one, but shows entries with bits 55-60 being zero (reserved for future use). Next patch will occupy one of them. Signed-off-by: Pavel Emelyanov <xemul@xxxxxxxxxxxxx> Cc: Matt Mackall <mpm@xxxxxxxxxxx> Cc: Xiao Guangrong <xiaoguangrong@xxxxxxxxxxxxxxxxxx> Cc: Glauber Costa <glommer@xxxxxxxxxxxxx> Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/filesystems/proc.txt | 2 ++ Documentation/vm/pagemap.txt | 3 +++ fs/proc/base.c | 2 ++ fs/proc/internal.h | 1 + fs/proc/task_mmu.c | 11 +++++++++++ 5 files changed, 19 insertions(+) diff -puN Documentation/filesystems/proc.txt~pagemap-introduce-the-proc-pid-pagemap2-file Documentation/filesystems/proc.txt --- a/Documentation/filesystems/proc.txt~pagemap-introduce-the-proc-pid-pagemap2-file +++ a/Documentation/filesystems/proc.txt @@ -487,6 +487,8 @@ Any other value written to /proc/PID/cle The /proc/pid/pagemap gives the PFN, which can be used to find the pageflags using /proc/kpageflags and number of times a page is mapped using /proc/kpagecount. For detailed explanation, see Documentation/vm/pagemap.txt. +(There's also a /proc/pid/pagemap2 file which is the 2nd version of the + pagemap one). 1.2 Kernel data --------------- diff -puN Documentation/vm/pagemap.txt~pagemap-introduce-the-proc-pid-pagemap2-file Documentation/vm/pagemap.txt --- a/Documentation/vm/pagemap.txt~pagemap-introduce-the-proc-pid-pagemap2-file +++ a/Documentation/vm/pagemap.txt @@ -30,6 +30,9 @@ There are three components to pagemap: determine which areas of memory are actually mapped and llseek to skip over unmapped regions. + * /proc/pid/pagemap2. This file provides the same info as the pagemap + does, but bits 55-60 are reserved for future use and thus zero + * /proc/kpagecount. This file contains a 64-bit count of the number of times each page is mapped, indexed by PFN. diff -puN fs/proc/base.c~pagemap-introduce-the-proc-pid-pagemap2-file fs/proc/base.c --- a/fs/proc/base.c~pagemap-introduce-the-proc-pid-pagemap2-file +++ a/fs/proc/base.c @@ -2537,6 +2537,7 @@ static const struct pid_entry tgid_base_ REG("clear_refs", S_IWUSR, proc_clear_refs_operations), REG("smaps", S_IRUGO, proc_pid_smaps_operations), REG("pagemap", S_IRUGO, proc_pagemap_operations), + REG("pagemap2", S_IRUGO, proc_pagemap2_operations), #endif #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), @@ -2890,6 +2891,7 @@ static const struct pid_entry tid_base_s REG("clear_refs", S_IWUSR, proc_clear_refs_operations), REG("smaps", S_IRUGO, proc_tid_smaps_operations), REG("pagemap", S_IRUGO, proc_pagemap_operations), + REG("pagemap2", S_IRUGO, proc_pagemap2_operations), #endif #ifdef CONFIG_SECURITY DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations), diff -puN fs/proc/internal.h~pagemap-introduce-the-proc-pid-pagemap2-file fs/proc/internal.h --- a/fs/proc/internal.h~pagemap-introduce-the-proc-pid-pagemap2-file +++ a/fs/proc/internal.h @@ -49,6 +49,7 @@ extern const struct file_operations proc extern const struct file_operations proc_tid_smaps_operations; extern const struct file_operations proc_clear_refs_operations; extern const struct file_operations proc_pagemap_operations; +extern const struct file_operations proc_pagemap2_operations; extern const struct file_operations proc_net_operations; extern const struct inode_operations proc_net_inode_operations; extern const struct inode_operations proc_pid_link_inode_operations; diff -puN fs/proc/task_mmu.c~pagemap-introduce-the-proc-pid-pagemap2-file fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c~pagemap-introduce-the-proc-pid-pagemap2-file +++ a/fs/proc/task_mmu.c @@ -1137,6 +1137,17 @@ const struct file_operations proc_pagema .llseek = mem_lseek, /* borrow this */ .read = pagemap_read, }; + +static ssize_t pagemap2_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ + return do_pagemap_read(file, buf, count, ppos, true); +} + +const struct file_operations proc_pagemap2_operations = { + .llseek = mem_lseek, /* borrow this */ + .read = pagemap2_read, +}; #endif /* CONFIG_PROC_PAGE_MONITOR */ #ifdef CONFIG_NUMA _ Patches currently in -mm which might be from xemul@xxxxxxxxxxxxx are linux-next.patch clear_refs-sanitize-accepted-commands-declaration.patch clear_refs-sanitize-accepted-commands-declaration-fix.patch clear_refs-introduce-private-struct-for-mm_walk.patch pagemap-introduce-pagemap_entry_t-without-pmshift-bits.patch pagemap-introduce-the-proc-pid-pagemap2-file.patch mm-soft-dirty-bits-for-user-memory-changes-tracking.patch ptrace-add-ability-to-retrieve-signals-without-removing-from-a-queue-v4.patch selftest-add-a-test-case-for-ptrace_peeksiginfo.patch kernel-sysc-make-prctlpr_set_mm-generally-available.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