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

Commit 091a1eaa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'akpm' 

* akpm:
  mm: madvise(MADV_DODUMP): allow hugetlbfs pages
  ocfs2: fix locking for res->tracking and dlm->tracking_list
  mm/vmscan.c: fix int overflow in callers of do_shrink_slab()
  mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly
  mm/vmstat.c: fix outdated vmstat_text
  proc: restrict kernel stack dumps to root
  mm/hugetlb: add mmap() encodings for 32MB and 512MB page sizes
  mm/migrate.c: split only transparent huge pages when allocation fails
  ipc/shm.c: use ERR_CAST() for shm_lock() error return
  mm/gup_benchmark: fix unsigned comparison to zero in __gup_benchmark_ioctl
  mm, thp: fix mlocking THP page with migration enabled
  ocfs2: fix crash in ocfs2_duplicate_clusters_by_page()
  hugetlb: take PMD sharing into account when flushing tlb/caches
  mm: migration: fix migration of huge PMD shared pages
parents 5943a9bb d41aa525

fs/ocfs2/dlm/dlmmaster.c

+2 −2
Original line number Diff line number Diff line
@@ -584,9 +584,9 @@ static void dlm_init_lockres(struct dlm_ctxt *dlm, 


	res->last_used = 0;



	spin_lock(&dlm->spinlock);

	spin_lock(&dlm->track_lock);

	list_add_tail(&res->tracking, &dlm->tracking_list);

	spin_unlock(&dlm->spinlock);

	spin_unlock(&dlm->track_lock);



	memset(res->lvb, 0, DLM_LVB_LEN);

	memset(res->refmap, 0, sizeof(res->refmap));

fs/ocfs2/refcounttree.c

+12 −4
Original line number Diff line number Diff line
@@ -2946,6 +2946,7 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, 
		if (map_end & (PAGE_SIZE - 1))

			to = map_end & (PAGE_SIZE - 1);



retry:

		page = find_or_create_page(mapping, page_index, GFP_NOFS);

		if (!page) {

			ret = -ENOMEM;
@@ -2954,11 +2955,18 @@ int ocfs2_duplicate_clusters_by_page(handle_t *handle, 
		}



		/*

		 * In case PAGE_SIZE <= CLUSTER_SIZE, This page

		 * can't be dirtied before we CoW it out.

		 * In case PAGE_SIZE <= CLUSTER_SIZE, we do not expect a dirty

		 * page, so write it back.

		 */

		if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize)

			BUG_ON(PageDirty(page));

		if (PAGE_SIZE <= OCFS2_SB(sb)->s_clustersize) {

			if (PageDirty(page)) {

				/*

				 * write_on_page will unlock the page on return

				 */

				ret = write_one_page(page);

				goto retry;

			}

		}



		if (!PageUptodate(page)) {

			ret = block_read_full_page(page, ocfs2_get_block);

fs/proc/base.c

+14 −0
Original line number Diff line number Diff line
@@ -407,6 +407,20 @@ static int proc_pid_stack(struct seq_file *m, struct pid_namespace *ns, 
	unsigned long *entries;

	int err;



	/*

	 * The ability to racily run the kernel stack unwinder on a running task

	 * and then observe the unwinder output is scary; while it is useful for

	 * debugging kernel issues, it can also allow an attacker to leak kernel

	 * stack contents.

	 * Doing this in a manner that is at least safe from races would require

	 * some work to ensure that the remote task can not be scheduled; and

	 * even then, this would still expose the unwinder as local attack

	 * surface.

	 * Therefore, this interface is restricted to root.

	 */

	if (!file_ns_capable(m->file, &init_user_ns, CAP_SYS_ADMIN))

		return -EACCES;



	entries = kmalloc_array(MAX_STACK_TRACE_DEPTH, sizeof(*entries),

				GFP_KERNEL);

	if (!entries)

include/linux/hugetlb.h

+14 −0
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
pte_t *huge_pte_offset(struct mm_struct *mm,

		       unsigned long addr, unsigned long sz);

int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep);

void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma,

				unsigned long *start, unsigned long *end);

struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,

			      int write);

struct page *follow_huge_pd(struct vm_area_struct *vma,
@@ -170,6 +172,18 @@ static inline unsigned long hugetlb_total_pages(void) 
	return 0;

}



static inline int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr,

					pte_t *ptep)

{

	return 0;

}



static inline void adjust_range_if_pmd_sharing_possible(

				struct vm_area_struct *vma,

				unsigned long *start, unsigned long *end)

{

}



#define follow_hugetlb_page(m,v,p,vs,a,b,i,w,n)	({ BUG(); 0; })

#define follow_huge_addr(mm, addr, write)	ERR_PTR(-EINVAL)

#define copy_hugetlb_page_range(src, dst, vma)	({ BUG(); 0; })

include/linux/mm.h

+6 −0
Original line number Diff line number Diff line
@@ -2455,6 +2455,12 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm, 
	return vma;

}



static inline bool range_in_vma(struct vm_area_struct *vma,

				unsigned long start, unsigned long end)

{

	return (vma && vma->vm_start <= start && end <= vma->vm_end);

}



#ifdef CONFIG_MMU

pgprot_t vm_get_page_prot(unsigned long vm_flags);

void vma_set_page_prot(struct vm_area_struct *vma);