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

Commit eea3a002 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge second patchbomb from Andrew Morton:

 - the rest of MM

 - various misc bits

 - add ability to run /sbin/reboot at reboot time

 - printk/vsprintf changes

 - fiddle with seq_printf() return value

* akpm: (114 commits)
  parisc: remove use of seq_printf return value
  lru_cache: remove use of seq_printf return value
  tracing: remove use of seq_printf return value
  cgroup: remove use of seq_printf return value
  proc: remove use of seq_printf return value
  s390: remove use of seq_printf return value
  cris fasttimer: remove use of seq_printf return value
  cris: remove use of seq_printf return value
  openrisc: remove use of seq_printf return value
  ARM: plat-pxa: remove use of seq_printf return value
  nios2: cpuinfo: remove use of seq_printf return value
  microblaze: mb: remove use of seq_printf return value
  ipc: remove use of seq_printf return value
  rtc: remove use of seq_printf return value
  power: wakeup: remove use of seq_printf return value
  x86: mtrr: if: remove use of seq_printf return value
  linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
  MAINTAINERS: CREDITS: remove Stefano Brivio from B43
  .mailmap: add Ricardo Ribalda
  CREDITS: add Ricardo Ribalda Delgado
  ...
parents e7c82412 e693d73c

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Rajesh Shah <rajesh.shah@intel.com> 
Ralf Baechle <ralf@linux-mips.org>

Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

Rémi Denis-Courmont <rdenis@simphalempin.com>

Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

CREDITS

+17 −0
Original line number Diff line number Diff line
@@ -508,6 +508,10 @@ E: paul@paulbristow.net 
W: http://paulbristow.net/linux/idefloppy.html

D: Maintainer of IDE/ATAPI floppy driver



N: Stefano Brivio

E: stefano.brivio@polimi.it

D: Broadcom B43 driver



N: Dominik Brodowski

E: linux@brodo.de

W: http://www.brodo.de/
@@ -3008,6 +3012,19 @@ W: http://www.qsl.net/dl1bke/ 
D: Generic Z8530 driver, AX.25 DAMA slave implementation

D: Several AX.25 hacks



N: Ricardo Ribalda Delgado

E: ricardo.ribalda@gmail.com

W: http://ribalda.com

D: PLX USB338x driver

D: PCA9634 driver

D: Option GTM671WFS

D: Fintek F81216A

D: Various kernel hacks

S: Qtechnology A/S

S: Valby Langgade 142

S: 2500 Valby

S: Denmark



N: Francois-Rene Rideau

E: fare@tunes.org

W: http://www.tunes.org/~fare

Documentation/ABI/obsolete/sysfs-block-zram

0 → 100644
+119 −0
Original line number Diff line number Diff line 
What:		/sys/block/zram<id>/num_reads

Date:		August 2015

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

Description:

		The num_reads file is read-only and specifies the number of

		reads (failed or successful) done on this device.

		Now accessible via zram<id>/stat node.



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

Date:		August 2015

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

Description:

		The num_writes file is read-only and specifies the number of

		writes (failed or successful) done on this device.

		Now accessible via zram<id>/stat node.



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

Date:		August 2015

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

Description:

		The invalid_io file is read-only and specifies the number of

		non-page-size-aligned I/O requests issued to this device.

		Now accessible via zram<id>/io_stat node.



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

Date:		August 2015

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

Description:

		The failed_reads file is read-only and specifies the number of

		failed reads happened on this device.

		Now accessible via zram<id>/io_stat node.



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

Date:		August 2015

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

Description:

		The failed_writes file is read-only and specifies the number of

		failed writes happened on this device.

		Now accessible via zram<id>/io_stat node.



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

Date:		August 2015

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

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.

		Now accessible via zram<id>/io_stat node.



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

Date:		August 2015

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

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.

		Now accessible via zram<id>/mm_stat node.



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

Date:		August 2015

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

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

		Now accessible via zram<id>/mm_stat node.



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

Date:		August 2015

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

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

		Now accessible via zram<id>/mm_stat node.



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

Date:		August 2015

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

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

		Now accessible via zram<id>/mm_stat node.



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

Date:		August 2015

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

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.

		Unit: bytes

		Downgraded to write-only node: so it's possible to set new

		value only; its current value is stored in zram<id>/mm_stat

		node.



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

Date:		August 2015

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

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

		Downgraded to write-only node: so it's possible to set new

		value only; its current value is stored in zram<id>/mm_stat

		node.

Documentation/ABI/testing/sysfs-block-zram

+25 −0
Original line number Diff line number Diff line
@@ -141,3 +141,28 @@ Description: 
		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

Contact:	Minchan Kim <minchan@kernel.org>

Description:

		The compact file is write-only and trigger compaction for

		allocator zrm uses. The allocator moves some objects so that

		it could free fragment space.



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

Date:		August 2015

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

Description:

		The io_stat file is read-only and accumulates device's I/O

		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

+73 −14
Original line number Diff line number Diff line
@@ -98,20 +98,79 @@ size of the disk when not in use so a huge zram is wasteful. 
	mount /dev/zram1 /tmp



7) Stats:

	Per-device statistics are exported as various nodes under

	/sys/block/zram<id>/

		disksize

		num_reads

		num_writes

Per-device statistics are exported as various nodes under /sys/block/zram<id>/



A brief description of exported device attritbutes. For more details please

read Documentation/ABI/testing/sysfs-block-zram.



Name            access            description

----            ------            -----------

disksize          RW    show and set the device's disk size

initstate         RO    shows the initialization state of the device

reset             WO    trigger device reset

num_reads         RO    the number of reads

failed_reads      RO    the number of failed reads

num_write         RO    the number of writes

failed_writes     RO    the number of failed writes

invalid_io        RO    the number of non-page-size-aligned I/O requests

max_comp_streams  RW    the number of possible concurrent compress operations

comp_algorithm    RW    show and change the compression algorithm

notify_free       RO    the number of notifications to free pages (either

                        slot free notifications or REQ_DISCARD requests)

zero_pages        RO    the number of zero filled pages written to this disk

orig_data_size    RO    uncompressed size of data stored in this disk

compr_data_size   RO    compressed size of data stored in this disk

mem_used_total    RO    the amount of memory allocated for this disk

mem_used_max      RW    the maximum amount memory zram have consumed to

                        store compressed data

mem_limit         RW    the maximum amount of memory ZRAM can use to store

                        the compressed data

num_migrated      RO    the number of objects migrated migrated by compaction





WARNING

=======

per-stat sysfs attributes are considered to be deprecated.

The basic strategy is:

-- the existing RW nodes will be downgraded to WO nodes (in linux 4.11)

-- deprecated RO sysfs nodes will eventually be removed (in linux 4.11)



The list of deprecated attributes can be found here:

Documentation/ABI/obsolete/sysfs-block-zram



Basically, every attribute that has its own read accessible sysfs node

(e.g. num_reads) *AND* is accessible via one of the stat files (zram<id>/stat

or zram<id>/io_stat or zram<id>/mm_stat) is considered to be deprecated.



User space is advised to use the following files to read the device statistics.



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



Represents block layer statistics. Read Documentation/block/stat.txt for

details.



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



The stat file represents device's I/O statistics not accounted by block

layer and, thus, not available in zram<id>/stat file. It consists of a

single line of text and contains the following stats separated by

whitespace:

	failed_reads

	failed_writes

	invalid_io

	notify_free

		zero_pages



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