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

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

Merge branch 'akpm' (patches from Andrew) 

Merge second patch-bomb from Andrew Morton:
 "Almost all of the rest of MM.  There was an unusually large amount of
  MM material this time"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (141 commits)
  zpool: remove no-op module init/exit
  mm: zbud: constify the zbud_ops
  mm: zpool: constify the zpool_ops
  mm: swap: zswap: maybe_preload & refactoring
  zram: unify error reporting
  zsmalloc: remove null check from destroy_handle_cache()
  zsmalloc: do not take class lock in zs_shrinker_count()
  zsmalloc: use class->pages_per_zspage
  zsmalloc: consider ZS_ALMOST_FULL as migrate source
  zsmalloc: partial page ordering within a fullness_list
  zsmalloc: use shrinker to trigger auto-compaction
  zsmalloc: account the number of compacted pages
  zsmalloc/zram: introduce zs_pool_stats api
  zsmalloc: cosmetic compaction code adjustments
  zsmalloc: introduce zs_can_compact() function
  zsmalloc: always keep per-class stats
  zsmalloc: drop unused variable `nr_to_migrate'
  mm/memblock.c: fix comment in __next_mem_range()
  mm/page_alloc.c: fix type information of memoryless node
  memory-hotplug: fix comments in zone_spanned_pages_in_node() and zone_spanned_pages_in_node()
  ...
parents 839fe915 df69f52d

Documentation/DMA-API.txt

+7 −0
Original line number Diff line number Diff line
@@ -104,6 +104,13 @@ crossing restrictions, pass 0 for alloc; passing 4096 says memory allocated 
from this pool must not cross 4KByte boundaries.





	void *dma_pool_zalloc(struct dma_pool *pool, gfp_t mem_flags,

			      dma_addr_t *handle)



Wraps dma_pool_alloc() and also zeroes the returned memory if the

allocation attempt succeeded.





	void *dma_pool_alloc(struct dma_pool *pool, gfp_t gfp_flags,

			dma_addr_t *dma_handle);

Documentation/blockdev/zram.txt

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ 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

pages_compacted   RO    the number of pages freed during compaction

                        (available only via zram<id>/mm_stat node)

compact           WO    trigger memory compaction



WARNING

Documentation/filesystems/dax.txt

+4 −3
Original line number Diff line number Diff line
@@ -60,9 +60,10 @@ Filesystem support consists of 
- implementing the direct_IO address space operation, and calling

  dax_do_io() instead of blockdev_direct_IO() if S_DAX is set

- implementing an mmap file operation for DAX files which sets the

  VM_MIXEDMAP flag on the VMA, and setting the vm_ops to include handlers

  for fault and page_mkwrite (which should probably call dax_fault() and

  dax_mkwrite(), passing the appropriate get_block() callback)

  VM_MIXEDMAP and VM_HUGEPAGE flags on the VMA, and setting the vm_ops to

  include handlers for fault, pmd_fault and page_mkwrite (which should

  probably call dax_fault(), dax_pmd_fault() and dax_mkwrite(), passing the

  appropriate get_block() callback)

- calling dax_truncate_page() instead of block_truncate_page() for DAX files

- calling dax_zero_page_range() instead of zero_user() for DAX files

- ensuring that there is sufficient locking between reads, writes,

Documentation/filesystems/proc.txt

+13 −5
Original line number Diff line number Diff line
@@ -424,6 +424,7 @@ Private_Dirty: 0 kB 
Referenced:          892 kB

Anonymous:             0 kB

Swap:                  0 kB

SwapPss:               0 kB

KernelPageSize:        4 kB

MMUPageSize:           4 kB

Locked:              374 kB
@@ -433,16 +434,23 @@ the first of these lines shows the same information as is displayed for the 
mapping in /proc/PID/maps.  The remaining lines show the size of the mapping

(size), the amount of the mapping that is currently resident in RAM (RSS), the

process' proportional share of this mapping (PSS), the number of clean and

dirty private pages in the mapping.  Note that even a page which is part of a

MAP_SHARED mapping, but has only a single pte mapped, i.e.  is currently used

by only one process, is accounted as private and not as shared.  "Referenced"

indicates the amount of memory currently marked as referenced or accessed.

dirty private pages in the mapping.



The "proportional set size" (PSS) of a process is the count of pages it has

in memory, where each page is divided by the number of processes sharing it.

So if a process has 1000 pages all to itself, and 1000 shared with one other

process, its PSS will be 1500.

Note that even a page which is part of a MAP_SHARED mapping, but has only

a single pte mapped, i.e.  is currently used by only one process, is accounted

as private and not as shared.

"Referenced" indicates the amount of memory currently marked as referenced or

accessed.

"Anonymous" shows the amount of memory that does not belong to any file.  Even

a mapping associated with a file may contain anonymous pages: when MAP_PRIVATE

and a page is modified, the file page is replaced by a private anonymous copy.

"Swap" shows how much would-be-anonymous memory is also used, but out on

swap.



"SwapPss" shows proportional swap share of this mapping.

"VmFlags" field deserves a separate description. This member represents the kernel

flags associated with the particular virtual memory area in two letter encoded

manner. The codes are the following:

Documentation/sysctl/vm.txt

+2 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ zone[i]'s protection[j] is calculated by following expression. 


(i < j):

  zone[i]->protection[j]

  = (total sums of present_pages from zone[i+1] to zone[j] on the node)

  = (total sums of managed_pages from zone[i+1] to zone[j] on the node)

    / lowmem_reserve_ratio[i];

(i = j):

   (should not be protected. = 0;
@@ -360,7 +360,7 @@ The default values of lowmem_reserve_ratio[i] are 
    256 (if zone[i] means DMA or DMA32 zone)

    32  (others).

As above expression, they are reciprocal number of ratio.

256 means 1/256. # of protection pages becomes about "0.39%" of total present

256 means 1/256. # of protection pages becomes about "0.39%" of total managed

pages of higher zones on the node.



If you would like to protect more pages, smaller values are effective.