Commit 6f3f04c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sched-core-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler updates from Ingo Molnar:

 - Updates to scheduler metrics:
     - PELT fixes & enhancements
     - PSI fixes & enhancements
     - Refactor cpu_util_without()

 - Updates to instrumentation/debugging:
     - Remove sched_trace_*() helper functions - can be done via debug
       info
     - Fix double update_rq_clock() warnings

 - Introduce & use "preemption model accessors" to simplify some of the
   Kconfig complexity.

 - Make softirq handling RT-safe.

 - Misc smaller fixes & cleanups.

* tag 'sched-core-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  topology: Remove unused cpu_cluster_mask()
  sched: Reverse sched_class layout
  sched/deadline: Remove superfluous rq clock update in push_dl_task()
  sched/core: Avoid obvious double update_rq_clock warning
  smp: Make softirq handling RT safe in flush_smp_call_function_queue()
  smp: Rename flush_smp_call_function_from_idle()
  sched: Fix missing prototype warnings
  sched/fair: Remove cfs_rq_tg_path()
  sched/fair: Remove sched_trace_*() helper functions
  sched/fair: Refactor cpu_util_without()
  sched/fair: Revise comment about lb decision matrix
  sched/psi: report zeroes for CPU full at the system level
  sched/fair: Delete useless condition in tg_unthrottle_up()
  sched/fair: Fix cfs_rq_clock_pelt() for throttled cfs_rq
  sched/fair: Move calculate of avg_load to a better location
  mailmap: Update my email address to @redhat.com
  MAINTAINERS: Add myself as scheduler topology reviewer
  psi: Fix trigger being fired unexpectedly at initial
  ftrace: Use preemption model accessors for trace header printout
  kcsan: Use preemption model accessors
parents cfeb2522 991d8d81

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ Vasily Averin <vasily.averin@linux.dev> <vvs@virtuozzo.com> 
Vasily Averin <vasily.averin@linux.dev> <vvs@openvz.org>

Vasily Averin <vasily.averin@linux.dev> <vvs@parallels.com>

Vasily Averin <vasily.averin@linux.dev> <vvs@sw.ru>

Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>

Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>

Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/accounting/psi.rst

+4 −5
Original line number Diff line number Diff line
@@ -37,11 +37,7 @@ Pressure interface 
Pressure information for each resource is exported through the

respective file in /proc/pressure/ -- cpu, memory, and io.



The format for CPU is as such::



	some avg10=0.00 avg60=0.00 avg300=0.00 total=0



and for memory and IO::

The format is as such::



	some avg10=0.00 avg60=0.00 avg300=0.00 total=0

	full avg10=0.00 avg60=0.00 avg300=0.00 total=0
@@ -58,6 +54,9 @@ situation from a state where some tasks are stalled but the CPU is 
still doing productive work. As such, time spent in this subset of the

stall state is tracked separately and exported in the "full" averages.



CPU full is undefined at the system level, but has been reported

since 5.13, so it is set to zero for backward compatibility.



The ratios (in %) are tracked as recent trends over ten, sixty, and

three hundred second windows, which gives insight into short term events

as well as medium and long term trends. The total absolute stall time

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -17524,6 +17524,7 @@ R: Steven Rostedt <rostedt@goodmis.org> (SCHED_FIFO/SCHED_RR) 
R:	Ben Segall <bsegall@google.com> (CONFIG_CFS_BANDWIDTH)

R:	Mel Gorman <mgorman@suse.de> (CONFIG_NUMA_BALANCING)

R:	Daniel Bristot de Oliveira <bristot@redhat.com> (SCHED_DEADLINE)

R:	Valentin Schneider <vschneid@redhat.com> (TOPOLOGY)

L:	linux-kernel@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core

include/asm-generic/vmlinux.lds.h

+6 −6
Original line number Diff line number Diff line
@@ -126,13 +126,13 @@ 
 */

#define SCHED_DATA				\

	STRUCT_ALIGN();				\

	__begin_sched_classes = .;		\

	*(__idle_sched_class)			\

	*(__fair_sched_class)			\

	*(__rt_sched_class)			\

	*(__dl_sched_class)			\

	__sched_class_highest = .;		\

	*(__stop_sched_class)			\

	__end_sched_classes = .;

	*(__dl_sched_class)			\

	*(__rt_sched_class)			\

	*(__fair_sched_class)			\

	*(__idle_sched_class)			\

	__sched_class_lowest = .;



/* The actual configuration determine if the init/exit sections

 * are handled as text/data or they can be discarded (which

include/linux/interrupt.h

+9 −0
Original line number Diff line number Diff line
@@ -589,6 +589,15 @@ struct softirq_action 
asmlinkage void do_softirq(void);

asmlinkage void __do_softirq(void);



#ifdef CONFIG_PREEMPT_RT

extern void do_softirq_post_smp_call_flush(unsigned int was_pending);

#else

static inline void do_softirq_post_smp_call_flush(unsigned int unused)

{

	do_softirq();

}

#endif



extern void open_softirq(int nr, void (*action)(struct softirq_action *));

extern void softirq_init(void);

extern void __raise_softirq_irqoff(unsigned int nr);