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

Merge tag 'mm-hotfixes-stable-2023-10-01-08-34' of... 

Merge tag 'mm-hotfixes-stable-2023-10-01-08-34' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "Fourteen hotfixes, eleven of which are cc:stable. The remainder
  pertain to issues which were introduced after 6.5"

* tag 'mm-hotfixes-stable-2023-10-01-08-34' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  Crash: add lock to serialize crash hotplug handling
  selftests/mm: fix awk usage in charge_reserved_hugetlb.sh and hugetlb_reparenting_test.sh that may cause error
  mm: mempolicy: keep VMA walk if both MPOL_MF_STRICT and MPOL_MF_MOVE are specified
  mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
  mm, memcg: reconsider kmem.limit_in_bytes deprecation
  mm: zswap: fix potential memory corruption on duplicate store
  arm64: hugetlb: fix set_huge_pte_at() to work with all swap entries
  mm: hugetlb: add huge page size param to set_huge_pte_at()
  maple_tree: add MAS_UNDERFLOW and MAS_OVERFLOW states
  maple_tree: add mas_is_active() to detect in-tree walks
  nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
  mm: abstract moving to the next PFN
  mm: report success more often from filemap_map_folio_range()
  fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
parents 8f633369 e2a8f20d

Documentation/admin-guide/cgroup-v1/memory.rst

+7 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ Brief summary of control files. 
 memory.oom_control		     set/show oom controls.

 memory.numa_stat		     show the number of memory usage per numa

				     node

 memory.kmem.limit_in_bytes          Deprecated knob to set and read the kernel

                                     memory hard limit. Kernel hard limit is not

                                     supported since 5.16. Writing any value to

                                     do file will not have any effect same as if

                                     nokmem kernel parameter was specified.

                                     Kernel memory is still charged and reported

                                     by memory.kmem.usage_in_bytes.

 memory.kmem.usage_in_bytes          show current kernel memory allocation

 memory.kmem.failcnt                 show the number of kernel memory usage

				     hits limits

arch/arm64/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags); 
#define arch_make_huge_pte arch_make_huge_pte

#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT

extern void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

			    pte_t *ptep, pte_t pte);

			    pte_t *ptep, pte_t pte, unsigned long sz);

#define __HAVE_ARCH_HUGE_PTEP_SET_ACCESS_FLAGS

extern int huge_ptep_set_access_flags(struct vm_area_struct *vma,

				      unsigned long addr, pte_t *ptep,

arch/arm64/mm/hugetlbpage.c

+7 −16
Original line number Diff line number Diff line
@@ -241,15 +241,8 @@ static void clear_flush(struct mm_struct *mm, 
	flush_tlb_range(&vma, saddr, addr);

}



static inline struct folio *hugetlb_swap_entry_to_folio(swp_entry_t entry)

{

	VM_BUG_ON(!is_migration_entry(entry) && !is_hwpoison_entry(entry));



	return page_folio(pfn_to_page(swp_offset_pfn(entry)));

}



void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

			    pte_t *ptep, pte_t pte)

			    pte_t *ptep, pte_t pte, unsigned long sz)

{

	size_t pgsize;

	int i;
@@ -257,13 +250,10 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
	unsigned long pfn, dpfn;

	pgprot_t hugeprot;



	if (!pte_present(pte)) {

		struct folio *folio;



		folio = hugetlb_swap_entry_to_folio(pte_to_swp_entry(pte));

		ncontig = num_contig_ptes(folio_size(folio), &pgsize);

	ncontig = num_contig_ptes(sz, &pgsize);



		for (i = 0; i < ncontig; i++, ptep++)

	if (!pte_present(pte)) {

		for (i = 0; i < ncontig; i++, ptep++, addr += pgsize)

			set_pte_at(mm, addr, ptep, pte);

		return;

	}
@@ -273,7 +263,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
		return;

	}



	ncontig = find_num_contig(mm, addr, ptep, &pgsize);

	pfn = pte_pfn(pte);

	dpfn = pgsize >> PAGE_SHIFT;

	hugeprot = pte_pgprot(pte);
@@ -571,5 +560,7 @@ pte_t huge_ptep_modify_prot_start(struct vm_area_struct *vma, unsigned long addr 
void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,

				  pte_t old_pte, pte_t pte)

{

	set_huge_pte_at(vma->vm_mm, addr, ptep, pte);

	unsigned long psize = huge_page_size(hstate_vma(vma));



	set_huge_pte_at(vma->vm_mm, addr, ptep, pte, psize);

}

arch/parisc/include/asm/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#define __HAVE_ARCH_HUGE_SET_HUGE_PTE_AT

void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t pte);

		     pte_t *ptep, pte_t pte, unsigned long sz);



#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR

pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

arch/parisc/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void __set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
}



void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,

		     pte_t *ptep, pte_t entry)

		     pte_t *ptep, pte_t entry, unsigned long sz)

{

	__set_huge_pte_at(mm, addr, ptep, entry);

}