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

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

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler updates from Ingo Molnar:

 - membarrier updates (Mathieu Desnoyers)

 - SMP balancing optimizations (Mel Gorman)

 - stats update optimizations (Peter Zijlstra)

 - RT scheduler race fixes (Steven Rostedt)

 - misc fixes and updates

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched/fair: Use a recently used CPU as an idle candidate and the basis for SIS
  sched/fair: Do not migrate if the prev_cpu is idle
  sched/fair: Restructure wake_affine*() to return a CPU id
  sched/fair: Remove unnecessary parameters from wake_affine_idle()
  sched/rt: Make update_curr_rt() more accurate
  sched/rt: Up the root domain ref count when passing it around via IPIs
  sched/rt: Use container_of() to get root domain in rto_push_irq_work_func()
  sched/core: Optimize update_stats_*()
  sched/core: Optimize ttwu_stat()
  membarrier/selftest: Test private expedited sync core command
  membarrier/arm64: Provide core serializing command
  membarrier/x86: Provide core serializing command
  membarrier: Provide core serializing command, *_SYNC_CORE
  lockin/x86: Implement sync_core_before_usermode()
  locking: Introduce sync_core_before_usermode()
  membarrier/selftest: Test global expedited command
  membarrier: Provide GLOBAL_EXPEDITED command
  membarrier: Document scheduler barrier requirements
  powerpc, membarrier: Skip memory barrier in switch_mm()
  membarrier/selftest: Test private expedited command
parents 4b0dda4f 82845079

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9025,6 +9025,7 @@ L: linux-kernel@vger.kernel.org 
S:	Supported

F:	kernel/sched/membarrier.c

F:	include/uapi/linux/membarrier.h

F:	arch/powerpc/include/asm/membarrier.h



MEMORY MANAGEMENT

L:	linux-mm@kvack.org

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config ARM64 
	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA

	select ARCH_HAS_KCOV

	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_STRICT_KERNEL_RWX

arch/arm64/kernel/entry.S

+4 −0
Original line number Diff line number Diff line
@@ -324,6 +324,10 @@ alternative_else_nop_endif 
	ldp	x28, x29, [sp, #16 * 14]

	ldr	lr, [sp, #S_LR]

	add	sp, sp, #S_FRAME_SIZE		// restore sp

	/*

	 * ARCH_HAS_MEMBARRIER_SYNC_CORE rely on eret context synchronization

	 * when returning from IPI handler, and when returning to user-space.

	 */



	.if	\el == 0

alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ config PPC 
	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API                if PPC64

	select ARCH_HAS_MEMBARRIER_CALLBACKS

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE

	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_STRICT_KERNEL_RWX	if ((PPC_BOOK3S_64 || PPC32) && !RELOCATABLE && !HIBERNATION)

arch/powerpc/include/asm/membarrier.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef _ASM_POWERPC_MEMBARRIER_H

#define _ASM_POWERPC_MEMBARRIER_H



static inline void membarrier_arch_switch_mm(struct mm_struct *prev,

					     struct mm_struct *next,

					     struct task_struct *tsk)

{

	/*

	 * Only need the full barrier when switching between processes.

	 * Barrier when switching from kernel to userspace is not

	 * required here, given that it is implied by mmdrop(). Barrier

	 * when switching from userspace to kernel is not needed after

	 * store to rq->curr.

	 */

	if (likely(!(atomic_read(&next->membarrier_state) &

		     (MEMBARRIER_STATE_PRIVATE_EXPEDITED |

		      MEMBARRIER_STATE_GLOBAL_EXPEDITED)) || !prev))

		return;



	/*

	 * The membarrier system call requires a full memory barrier

	 * after storing to rq->curr, before going back to user-space.

	 */

	smp_mb();

}



#endif /* _ASM_POWERPC_MEMBARRIER_H */