Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f2109f6 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds
Browse files

zram: export new 'mm_stat' sysfs attrs 



Per-device `zram<id>/mm_stat' file provides mm statistics of a particular
zram device in a format similar to block layer statistics.  The file
consists of a single line and represents the following stats (separated by
whitespace):

        orig_data_size
        compr_data_size
        mem_used_total
        mem_limit
        mem_used_max
        zero_pages
        num_migrated

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2f6a3bed

Documentation/ABI/testing/sysfs-block-zram

+8 −0
Original line number Diff line number Diff line
@@ -158,3 +158,11 @@ Description: 
		statistics not accounted by block layer. For example,

		failed_reads, failed_writes, etc. File format is similar to

		block layer statistics file format.



What:		/sys/block/zram<id>/mm_stat

Date:		August 2015

Contact:	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>

Description:

		The mm_stat file is read-only and represents device's mm

		statistics (orig_data_size, compr_data_size, etc.) in a format

		similar to block layer statistics file format.

Documentation/blockdev/zram.txt

+12 −0
Original line number Diff line number Diff line
@@ -144,6 +144,18 @@ whitespace: 
	invalid_io

	notify_free



File /sys/block/zram<id>/mm_stat



The stat file represents device's mm statistics. It consists of a single

line of text and contains the following stats separated by whitespace:

	orig_data_size

	compr_data_size

	mem_used_total

	mem_limit

	mem_used_max

	zero_pages

	num_migrated



8) Deactivate:

	swapoff /dev/zram0

	umount /dev/zram1

drivers/block/zram/zram_drv.c

+31 −0
Original line number Diff line number Diff line
@@ -1051,7 +1051,37 @@ static ssize_t io_stat_show(struct device *dev, 
	return ret;

}



static ssize_t mm_stat_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct zram *zram = dev_to_zram(dev);

	u64 orig_size, mem_used = 0;

	long max_used;

	ssize_t ret;



	down_read(&zram->init_lock);

	if (init_done(zram))

		mem_used = zs_get_total_pages(zram->meta->mem_pool);



	orig_size = atomic64_read(&zram->stats.pages_stored);

	max_used = atomic_long_read(&zram->stats.max_used_pages);



	ret = scnprintf(buf, PAGE_SIZE,

			"%8llu %8llu %8llu %8lu %8ld %8llu %8llu\n",

			orig_size << PAGE_SHIFT,

			(u64)atomic64_read(&zram->stats.compr_data_size),

			mem_used << PAGE_SHIFT,

			zram->limit_pages << PAGE_SHIFT,

			max_used << PAGE_SHIFT,

			(u64)atomic64_read(&zram->stats.zero_pages),

			(u64)atomic64_read(&zram->stats.num_migrated));

	up_read(&zram->init_lock);



	return ret;

}



static DEVICE_ATTR_RO(io_stat);

static DEVICE_ATTR_RO(mm_stat);

ZRAM_ATTR_RO(num_reads);

ZRAM_ATTR_RO(num_writes);

ZRAM_ATTR_RO(failed_reads);
@@ -1080,6 +1110,7 @@ static struct attribute *zram_disk_attrs[] = { 
	&dev_attr_max_comp_streams.attr,

	&dev_attr_comp_algorithm.attr,

	&dev_attr_io_stat.attr,

	&dev_attr_mm_stat.attr,

	NULL,

};