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

Commit 56c29979 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "10 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: move pcp and lru-pcp draining into single wq
  mailmap: update Yakir Yang email address
  mm, swap_cgroup: reschedule when neeed in swap_cgroup_swapoff()
  dax: fix radix tree insertion race
  mm, thp: fix setting of defer+madvise thp defrag mode
  ptrace: fix PTRACE_LISTEN race corrupting task->state
  vmlinux.lds: add missing VMLINUX_SYMBOL macros
  mm/page_alloc.c: fix print order in show_free_areas()
  userfaultfd: report actual registered features in fdinfo
  mm: fix page_vma_mapped_walk() for ksm pages
parents cefdc26e ce612879

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

fs/dax.c

+22 −13
Original line number Diff line number Diff line
@@ -373,6 +373,22 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, 
		}

		spin_lock_irq(&mapping->tree_lock);



		if (!entry) {

			/*

			 * We needed to drop the page_tree lock while calling

			 * radix_tree_preload() and we didn't have an entry to

			 * lock.  See if another thread inserted an entry at

			 * our index during this time.

			 */

			entry = __radix_tree_lookup(&mapping->page_tree, index,

					NULL, &slot);

			if (entry) {

				radix_tree_preload_end();

				spin_unlock_irq(&mapping->tree_lock);

				goto restart;

			}

		}



		if (pmd_downgrade) {

			radix_tree_delete(&mapping->page_tree, index);

			mapping->nrexceptional--;
@@ -388,19 +404,12 @@ static void *grab_mapping_entry(struct address_space *mapping, pgoff_t index, 
		if (err) {

			spin_unlock_irq(&mapping->tree_lock);

			/*

			 * Someone already created the entry?  This is a

			 * normal failure when inserting PMDs in a range

			 * that already contains PTEs.  In that case we want

			 * to return -EEXIST immediately.

			 */

			if (err == -EEXIST && !(size_flag & RADIX_DAX_PMD))

				goto restart;

			/*

			 * Our insertion of a DAX PMD entry failed, most

			 * likely because it collided with a PTE sized entry

			 * at a different index in the PMD range.  We haven't

			 * inserted anything into the radix tree and have no

			 * waiters to wake.

			 * Our insertion of a DAX entry failed, most likely

			 * because we were inserting a PMD entry and it

			 * collided with a PTE sized entry at a different

			 * index in the PMD range.  We haven't inserted

			 * anything into the radix tree and have no waiters to

			 * wake.

			 */

			return ERR_PTR(err);

		}

fs/userfaultfd.c

+1 −1
Original line number Diff line number Diff line
@@ -1756,7 +1756,7 @@ static void userfaultfd_show_fdinfo(struct seq_file *m, struct file *f) 
	 *	protocols: aa:... bb:...

	 */

	seq_printf(m, "pending:\t%lu\ntotal:\t%lu\nAPI:\t%Lx:%x:%Lx\n",

		   pending, total, UFFD_API, UFFD_API_FEATURES,

		   pending, total, UFFD_API, ctx->features,

		   UFFD_API_IOCTLS|UFFD_API_RANGE_IOCTLS);

}

#endif

include/asm-generic/vmlinux.lds.h

+2 −2
Original line number Diff line number Diff line
@@ -261,9 +261,9 @@ 
 */

#ifndef RO_AFTER_INIT_DATA

#define RO_AFTER_INIT_DATA						\

	__start_ro_after_init = .;					\

	VMLINUX_SYMBOL(__start_ro_after_init) = .;			\

	*(.data..ro_after_init)						\

	__end_ro_after_init = .;

	VMLINUX_SYMBOL(__end_ro_after_init) = .;

#endif



/*

kernel/ptrace.c

+10 −4
Original line number Diff line number Diff line
@@ -184,11 +184,17 @@ static void ptrace_unfreeze_traced(struct task_struct *task) 


	WARN_ON(!task->ptrace || task->parent != current);



	/*

	 * PTRACE_LISTEN can allow ptrace_trap_notify to wake us up remotely.

	 * Recheck state under the lock to close this race.

	 */

	spin_lock_irq(&task->sighand->siglock);

	if (task->state == __TASK_TRACED) {

		if (__fatal_signal_pending(task))

			wake_up_state(task, __TASK_TRACED);

		else

			task->state = TASK_TRACED;

	}

	spin_unlock_irq(&task->sighand->siglock);

}