Commit 73da9e1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge updates from Andrew Morton:

 - misc fixes

 - ocfs2 updates

 - most of MM

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits)
  mm: remove PG_highmem description
  tools, vm: new option to specify kpageflags file
  mm/swap.c: make functions and their kernel-doc agree
  mm, memory_hotplug: fix memmap initialization
  mm: correct comments regarding do_fault_around()
  mm: numa: do not trap faults on shared data section pages.
  hugetlb, mbind: fall back to default policy if vma is NULL
  hugetlb, mempolicy: fix the mbind hugetlb migration
  mm, hugetlb: further simplify hugetlb allocation API
  mm, hugetlb: get rid of surplus page accounting tricks
  mm, hugetlb: do not rely on overcommit limit during migration
  mm, hugetlb: integrate giga hugetlb more naturally to the allocation path
  mm, hugetlb: unify core page allocation accounting and initialization
  mm/memcontrol.c: try harder to decrease [memory,memsw].limit_in_bytes
  mm/memcontrol.c: make local symbol static
  mm/hmm: fix uninitialized use of 'entry' in hmm_vma_walk_pmd()
  include/linux/mmzone.h: fix explanation of lower bits in the SPARSEMEM mem_map pointer
  mm/compaction.c: fix comment for try_to_compact_pages()
  mm/page_ext.c: make page_ext_init a noop when CONFIG_PAGE_EXTENSION but nothing uses it
  zsmalloc: use U suffix for negative literals being shifted
  ...
parents b2fe5fa6 3f56a2f8

Documentation/sysctl/vm.txt

+0 −25
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ Currently, these files are in /proc/sys/vm: 
- dirty_writeback_centisecs

- drop_caches

- extfrag_threshold

- hugepages_treat_as_movable

- hugetlb_shm_group

- laptop_mode

- legacy_va_layout
@@ -261,30 +260,6 @@ any throttling. 


==============================================================



hugepages_treat_as_movable



This parameter controls whether we can allocate hugepages from ZONE_MOVABLE

or not. If set to non-zero, hugepages can be allocated from ZONE_MOVABLE.

ZONE_MOVABLE is created when kernel boot parameter kernelcore= is specified,

so this parameter has no effect if used without kernelcore=.



Hugepage migration is now available in some situations which depend on the

architecture and/or the hugepage size. If a hugepage supports migration,

allocation from ZONE_MOVABLE is always enabled for the hugepage regardless

of the value of this parameter.

IOW, this parameter affects only non-migratable hugepages.



Assuming that hugepages are not migratable in your system, one usecase of

this parameter is that users can make hugepage pool more extensible by

enabling the allocation from ZONE_MOVABLE. This is because on ZONE_MOVABLE

page reclaim/migration/compaction work more and you can get contiguous

memory more likely. Note that using ZONE_MOVABLE for non-migratable

hugepages can do harm to other features like memory hotremove (because

memory hotremove expects that memory blocks on ZONE_MOVABLE are always

removable,) so it's a trade-off responsible for the users.



==============================================================



hugetlb_shm_group



hugetlb_shm_group contains group id that is allowed to create SysV

Documentation/vm/hugetlbpage.txt

+18 −9
Original line number Diff line number Diff line
@@ -20,19 +20,20 @@ options. 


The /proc/meminfo file provides information about the total number of

persistent hugetlb pages in the kernel's huge page pool.  It also displays

information about the number of free, reserved and surplus huge pages and the

default huge page size.  The huge page size is needed for generating the

proper alignment and size of the arguments to system calls that map huge page

regions.

default huge page size and information about the number of free, reserved

and surplus huge pages in the pool of huge pages of default size.

The huge page size is needed for generating the proper alignment and

size of the arguments to system calls that map huge page regions.



The output of "cat /proc/meminfo" will include lines like:



.....

HugePages_Total: vvv

HugePages_Free:  www

HugePages_Rsvd:  xxx

HugePages_Surp:  yyy

Hugepagesize:    zzz kB

HugePages_Total: uuu

HugePages_Free:  vvv

HugePages_Rsvd:  www

HugePages_Surp:  xxx

Hugepagesize:    yyy kB

Hugetlb:         zzz kB



where:

HugePages_Total is the size of the pool of huge pages.
@@ -47,6 +48,14 @@ HugePages_Surp is short for "surplus," and is the number of huge pages in 
                the pool above the value in /proc/sys/vm/nr_hugepages. The

                maximum number of surplus huge pages is controlled by

                /proc/sys/vm/nr_overcommit_hugepages.

Hugepagesize    is the default hugepage size (in Kb).

Hugetlb         is the total amount of memory (in kB), consumed by huge

                pages of all sizes.

                If huge pages of different sizes are in use, this number

                will exceed HugePages_Total * Hugepagesize. To get more

                detailed information, please, refer to

                /sys/kernel/mm/hugepages (described below).





/proc/filesystems should also show a filesystem of type "hugetlbfs" configured

in the kernel.

arch/arc/include/asm/hugepage.h

+3 −0
Original line number Diff line number Diff line
@@ -74,4 +74,7 @@ extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp); 
extern void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start,

				unsigned long end);



/* We don't have hardware dirty/accessed bits, generic_pmdp_establish is fine.*/

#define pmdp_establish generic_pmdp_establish



#endif

arch/arm/include/asm/pgtable-3level.h

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ PMD_BIT_FUNC(mkyoung, |= PMD_SECT_AF); 
#define pfn_pmd(pfn,prot)	(__pmd(((phys_addr_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define mk_pmd(page,prot)	pfn_pmd(page_to_pfn(page),prot)



/* No hardware dirty/accessed bits -- generic_pmdp_establish() fits */

#define pmdp_establish generic_pmdp_establish



/* represent a notpresent pmd by faulting entry, this is used by pmdp_invalidate */

static inline pmd_t pmd_mknotpresent(pmd_t pmd)

{

arch/arm64/include/asm/pgtable.h

+7 −0
Original line number Diff line number Diff line
@@ -706,6 +706,13 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, 
{

	ptep_set_wrprotect(mm, address, (pte_t *)pmdp);

}



#define pmdp_establish pmdp_establish

static inline pmd_t pmdp_establish(struct vm_area_struct *vma,

		unsigned long address, pmd_t *pmdp, pmd_t pmd)

{

	return __pmd(xchg_relaxed(&pmd_val(*pmdp), pmd_val(pmd)));

}

#endif



extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

CRA Git | Maintained and supported by SUSTech CRA and CCSE