tools/vm/page-types.c: add memory cgroup dumping and filtering

On Sat, Feb 06, 2016 at 01:06:29PM +0300, Konstantin Khlebnikov wrote:
...
>  static int		opt_list;	/* list pages (in ranges) */
>  static int		opt_no_summary;	/* don't show summary */
>  static pid_t		opt_pid;	/* process to walk */
> -const char *		opt_file;
> +const char *		opt_file;	/* file or directory path */
> +static int64_t		opt_cgroup = -1;/* cgroup inode */

ino should be a positive number, so we could use uint64_t here. Of
course, ino=0 could be used for filtering pages not charged to any
cgroup (as it is in this patch), but I doubt this would be useful.

Also, this patch conflicts with the recent change by Naoya introducing
support of dumping swap entries - https://lkml.org/lkml/2016/2/4/50

I attached a fixlet that addresses these two issues. What do you think
about it?

Other than that the patch looks good to me,

Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/tools/vm/page-types.c b/tools/vm/page-types.c
index a85c5e7a98ed7a6d9b539345ba185e9316785dc4..dab61c377f54f5222199431f52d7a0f528a95f17 100644 (file)
--- a/tools/vm/page-types.c
+++ b/tools/vm/page-types.c
@@ -170,7 +170,7 @@ static int          opt_list;       /* list pages (in ranges) */
 static int             opt_no_summary; /* don't show summary */
 static pid_t           opt_pid;        /* process to walk */
 const char *           opt_file;       /* file or directory path */
-static int64_t         opt_cgroup = -1;/* cgroup inode */
+static uint64_t                opt_cgroup;     /* cgroup inode */
 static int             opt_list_cgroup;/* list page cgroup */
 
 #define MAX_ADDR_RANGES        1024
@@ -604,7 +604,7 @@ static void add_page(unsigned long voffset, unsigned long offset,
        if (!bit_mask_ok(flags))
                return;
 
-       if (opt_cgroup >= 0 && cgroup != (uint64_t)opt_cgroup)
+       if (opt_cgroup && cgroup != (uint64_t)opt_cgroup)
                return;
 
        if (opt_hwpoison)
@@ -659,10 +659,13 @@ static void walk_swap(unsigned long voffset, uint64_t pme)
        if (!bit_mask_ok(flags))
                return;
 
+       if (opt_cgroup)
+               return;
+
        if (opt_list == 1)
-               show_page_range(voffset, pagemap_swap_offset(pme), 1, flags);
+               show_page_range(voffset, pagemap_swap_offset(pme), 1, flags, 0);
        else if (opt_list == 2)
-               show_page(voffset, pagemap_swap_offset(pme), flags);
+               show_page(voffset, pagemap_swap_offset(pme), flags, 0);
 
        nr_pages[hash_slot(flags)]++;
        total_pages++;
@@ -1240,7 +1243,7 @@ int main(int argc, char *argv[])
                }
        }
 
-       if (opt_cgroup >= 0 || opt_list_cgroup)
+       if (opt_cgroup || opt_list_cgroup)
                kpagecgroup_fd = checked_open(PROC_KPAGECGROUP, O_RDONLY);
 
        if (opt_list && opt_pid)