summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorMinchan Kim <minchan@kernel.org>2018-06-07 20:05:45 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-07 20:34:34 -0400
commitd7eac6b6e1838ef1a1400df4ec55daa34bbc855e (patch)
treec909e5c21f836908a88de0fcc8cce881eec5842a /drivers/block
parent89e85bce4b02edb7408aebf69d5d1a6692a05f4f (diff)
zram: record accessed second
zRam as swap is useful for small memory device. However, swap means those pages on zram are mostly cold pages due to VM's LRU algorithm. Especially, once init data for application are touched for launching, they tend to be not accessed any more and finally swapped out. zRAM can store such cold pages as compressed form but it's pointless to keep in memory. Better idea is app developers free them directly rather than remaining them on heap. This patch records last access time of each block of zram so that With upcoming zram memory tracking, it could help userspace developers to reduce memory footprint. Link: http://lkml.kernel.org/r/20180416090946.63057-4-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/zram/zram_drv.c16
-rw-r--r--drivers/block/zram/zram_drv.h1
2 files changed, 17 insertions, 0 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 777fb3339f59..7fc10e2ad734 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -107,6 +107,16 @@ static inline void zram_set_element(struct zram *zram, u32 index,
107 zram->table[index].element = element; 107 zram->table[index].element = element;
108} 108}
109 109
110static void zram_accessed(struct zram *zram, u32 index)
111{
112 zram->table[index].ac_time = sched_clock();
113}
114
115static void zram_reset_access(struct zram *zram, u32 index)
116{
117 zram->table[index].ac_time = 0;
118}
119
110static unsigned long zram_get_element(struct zram *zram, u32 index) 120static unsigned long zram_get_element(struct zram *zram, u32 index)
111{ 121{
112 return zram->table[index].element; 122 return zram->table[index].element;
@@ -806,6 +816,8 @@ static void zram_free_page(struct zram *zram, size_t index)
806{ 816{
807 unsigned long handle; 817 unsigned long handle;
808 818
819 zram_reset_access(zram, index);
820
809 if (zram_test_flag(zram, index, ZRAM_HUGE)) { 821 if (zram_test_flag(zram, index, ZRAM_HUGE)) {
810 zram_clear_flag(zram, index, ZRAM_HUGE); 822 zram_clear_flag(zram, index, ZRAM_HUGE);
811 atomic64_dec(&zram->stats.huge_pages); 823 atomic64_dec(&zram->stats.huge_pages);
@@ -1177,6 +1189,10 @@ static int zram_bvec_rw(struct zram *zram, struct bio_vec *bvec, u32 index,
1177 1189
1178 generic_end_io_acct(q, rw_acct, &zram->disk->part0, start_time); 1190 generic_end_io_acct(q, rw_acct, &zram->disk->part0, start_time);
1179 1191
1192 zram_slot_lock(zram, index);
1193 zram_accessed(zram, index);
1194 zram_slot_unlock(zram, index);
1195
1180 if (unlikely(ret < 0)) { 1196 if (unlikely(ret < 0)) {
1181 if (!is_write) 1197 if (!is_write)
1182 atomic64_inc(&zram->stats.failed_reads); 1198 atomic64_inc(&zram->stats.failed_reads);
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index ff0547bdb586..1075218e88b2 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -61,6 +61,7 @@ struct zram_table_entry {
61 unsigned long element; 61 unsigned long element;
62 }; 62 };
63 unsigned long value; 63 unsigned long value;
64 u64 ac_time;
64}; 65};
65 66
66struct zram_stats { 67struct zram_stats {