Skip to content

Commit

Permalink
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/…
Browse files Browse the repository at this point in the history 
…kernel/linux-linaro-stable.git

* linux-linaro-lsk-v4.4-android: (1212 commits)
  ANDROID: sdcardfs: Change current->fs under lock
  ANDROID: sdcardfs: Don't use OVERRIDE_CRED macro
  ANDROID: restrict store of prefer_idle as boolean
  BACKPORT: arm/syscalls: Optimize address limit check
  UPSTREAM: syscalls: Use CHECK_DATA_CORRUPTION for addr_limit_user_check
  BACKPORT: arm64/syscalls: Check address limit on user-mode return
  BACKPORT: x86/syscalls: Check address limit on user-mode return
  BACKPORT: lkdtm: add bad USER_DS test
  UPSTREAM: bug: switch data corruption check to __must_check
  BACKPORT: lkdtm: Add tests for struct list corruption
  UPSTREAM: bug: Provide toggle for BUG on data corruption
  UPSTREAM: list: Split list_del() debug checking into separate function
  UPSTREAM: rculist: Consolidate DEBUG_LIST for list_add_rcu()
  BACKPORT: list: Split list_add() debug checking into separate function
  FROMLIST: ANDROID: binder: Add BINDER_GET_NODE_INFO_FOR_REF ioctl.
  BACKPORT: arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW
  ANDROID: arm64: mm: fix 4.4.154 merge
  BACKPORT: zsmalloc: introduce zs_huge_class_size()
  BACKPORT: zram: drop max_zpage_size and use zs_huge_class_size()
  ANDROID: tracing: fix race condition reading saved tgids
  ...

Change-Id: I9f23db35eb926b6fa0d7af7dbbb55c9a37d536fc
  • Loading branch information
@rkhuangtao
rkhuangtao committed Oct 10, 2018
2 parents 90a00e3 + 8fd9c72 commit d376ad8
Show file tree
Hide file tree
Showing 370 changed files with 9,159 additions and 4,481 deletions.
119 changes: 0 additions & 119 deletions Documentation/ABI/obsolete/sysfs-block-zram
View file

This file was deleted.

118 changes: 25 additions & 93 deletions Documentation/ABI/testing/sysfs-block-zram
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,6 @@ Description:
device. The reset operation frees all the memory associated
with this device.

What: /sys/block/zram<id>/num_reads
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The num_reads file is read-only and specifies the number of
reads (failed or successful) done on this device.

What: /sys/block/zram<id>/num_writes
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The num_writes file is read-only and specifies the number of
writes (failed or successful) done on this device.

What: /sys/block/zram<id>/invalid_io
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The invalid_io file is read-only and specifies the number of
non-page-size-aligned I/O requests issued to this device.

What: /sys/block/zram<id>/failed_reads
Date: February 2014
Contact: Sergey Senozhatsky <[email protected]>
Description:
The failed_reads file is read-only and specifies the number of
failed reads happened on this device.

What: /sys/block/zram<id>/failed_writes
Date: February 2014
Contact: Sergey Senozhatsky <[email protected]>
Description:
The failed_writes file is read-only and specifies the number of
failed writes happened on this device.

What: /sys/block/zram<id>/max_comp_streams
Date: February 2014
Contact: Sergey Senozhatsky <[email protected]>
Expand All @@ -73,74 +38,24 @@ Description:
available and selected compression algorithms, change
compression algorithm selection.

What: /sys/block/zram<id>/notify_free
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The notify_free file is read-only. Depending on device usage
scenario it may account a) the number of pages freed because
of swap slot free notifications or b) the number of pages freed
because of REQ_DISCARD requests sent by bio. The former ones
are sent to a swap block device when a swap slot is freed, which
implies that this disk is being used as a swap disk. The latter
ones are sent by filesystem mounted with discard option,
whenever some data blocks are getting discarded.

What: /sys/block/zram<id>/zero_pages
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The zero_pages file is read-only and specifies number of zero
filled pages written to this disk. No memory is allocated for
such pages.

What: /sys/block/zram<id>/orig_data_size
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The orig_data_size file is read-only and specifies uncompressed
size of data stored in this disk. This excludes zero-filled
pages (zero_pages) since no memory is allocated for them.
Unit: bytes

What: /sys/block/zram<id>/compr_data_size
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The compr_data_size file is read-only and specifies compressed
size of data stored in this disk. So, compression ratio can be
calculated using orig_data_size and this statistic.
Unit: bytes

What: /sys/block/zram<id>/mem_used_total
Date: August 2010
Contact: Nitin Gupta <[email protected]>
Description:
The mem_used_total file is read-only and specifies the amount
of memory, including allocator fragmentation and metadata
overhead, allocated for this disk. So, allocator space
efficiency can be calculated using compr_data_size and this
statistic.
Unit: bytes

What: /sys/block/zram<id>/mem_used_max
Date: August 2014
Contact: Minchan Kim <[email protected]>
Description:
The mem_used_max file is read/write and specifies the amount
of maximum memory zram have consumed to store compressed data.
For resetting the value, you should write "0". Otherwise,
you could see -EINVAL.
The mem_used_max file is write-only and is used to reset
the counter of maximum memory zram have consumed to store
compressed data. For resetting the value, you should write
"0". Otherwise, you could see -EINVAL.
Unit: bytes

What: /sys/block/zram<id>/mem_limit
Date: August 2014
Contact: Minchan Kim <[email protected]>
Description:
The mem_limit file is read/write and specifies the maximum
amount of memory ZRAM can use to store the compressed data. The
limit could be changed in run time and "0" means disable the
limit. No limit is the initial state. Unit: bytes
The mem_limit file is write-only and specifies the maximum
amount of memory ZRAM can use to store the compressed data.
The limit could be changed in run time and "0" means disable
the limit. No limit is the initial state. Unit: bytes

What: /sys/block/zram<id>/compact
Date: August 2015
Expand All @@ -166,3 +81,20 @@ 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.

What: /sys/block/zram<id>/debug_stat
Date: July 2016
Contact: Sergey Senozhatsky <[email protected]>
Description:
The debug_stat file is read-only and represents various
device's debugging info useful for kernel developers. Its
format is not documented intentionally and may change
anytime without any notice.

What: /sys/block/zram<id>/backing_dev
Date: June 2017
Contact: Minchan Kim <[email protected]>
Description:
The backing_dev file is read-write and set up backing
device for zram to write incompressible pages.
For using, user should enable CONFIG_ZRAM_WRITEBACK.
8 changes: 8 additions & 0 deletions Documentation/ABI/testing/sysfs-fs-f2fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ Description:
Controls the dirty page count condition for the in-place-update
policies.

What: /sys/fs/f2fs/<disk>/min_seq_blocks
Date: August 2018
Contact: "Jaegeuk Kim" <[email protected]>
Description:
Controls the dirty page count condition for batched sequential
writes in ->writepages.


What: /sys/fs/f2fs/<disk>/min_hot_blocks
Date: March 2017
Contact: "Jaegeuk Kim" <[email protected]>
Expand Down
Loading

0 comments on commit d376ad8

Please sign in to comment.