diff --git a/init/Kconfig b/init/Kconfig index 87fb959a780e07..131a599fcde293 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -652,6 +652,7 @@ config TASK_IO_ACCOUNTING config PSI bool "Pressure stall information tracking" + depends on !SCHED_ALT select KERNFS help Collect metrics that indicate how overcommitted the CPU, memory, diff --git a/kernel/sched/alt_core.c b/kernel/sched/alt_core.c index af4d840d4bb776..37dfdc41d2a763 100644 --- a/kernel/sched/alt_core.c +++ b/kernel/sched/alt_core.c @@ -588,7 +588,6 @@ static void update_rq_clock_task(struct rq *rq, s64 delta) rq->prev_irq_time += irq_delta; delta -= irq_delta; - psi_account_irqtime(rq->curr, irq_delta); #endif #ifdef CONFIG_PARAVIRT_TIME_ACCOUNTING if (static_key_false((¶virt_steal_rq_enabled))) { @@ -769,7 +768,6 @@ unsigned long get_wchan(struct task_struct *p) */ #define __SCHED_DEQUEUE_TASK(p, rq, flags, func) \ sched_info_dequeue(rq, p); \ - psi_dequeue(p, flags & DEQUEUE_SLEEP); \ \ list_del(&p->sq_node); \ if (list_empty(&rq->queue.heads[p->sq_idx])) { \ @@ -779,7 +777,6 @@ unsigned long get_wchan(struct task_struct *p) #define __SCHED_ENQUEUE_TASK(p, rq, flags) \ sched_info_enqueue(rq, p); \ - psi_enqueue(p, flags & ENQUEUE_WAKEUP); \ \ p->sq_idx = task_sched_prio_idx(p, rq); \ list_add_tail(&p->sq_node, &rq->queue.heads[p->sq_idx]); \ @@ -2954,7 +2951,6 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, } wake_flags |= WF_MIGRATED; - psi_ttwu_dequeue(p); set_task_cpu(p, cpu); } #else @@ -4828,8 +4824,6 @@ static void __sched notrace __schedule(unsigned int sched_mode) */ ++*switch_count; - psi_sched_switch(prev, next, !task_on_rq_queued(prev)); - trace_sched_switch(sched_mode & SM_MASK_PREEMPT, prev, next, prev_state); /* Also unlocks the rq: */ @@ -7689,8 +7683,6 @@ void __init sched_init(void) sched_init_topology_cpumask_early(); #endif /* SMP */ - psi_init(); - preempt_dynamic_init(); } diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h index 9fe45bf0cedfde..55a15b806e8799 100644 --- a/kernel/sched/alt_sched.h +++ b/kernel/sched/alt_sched.h @@ -3,7 +3,6 @@ #include #include -#include #include #include #include