Revert "psi: Introduce ftrace events"

This reverts commit 344e3f9eb5.

Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
Change-Id: I4024587c720835942d310e0c268d64214dd0818d
This commit is contained in:
UtsavBalar1231 2022-04-26 21:42:27 +05:30 committed by spakkkk
parent cc4d3ef6e1
commit 42d7ce5bee
2 changed files with 0 additions and 43 deletions

View File

@ -555,16 +555,6 @@ config PSI_DEFAULT_DISABLED
Say N if unsure.
config PSI_FTRACE
bool "Insert debug hooks for PSI ftrace events"
default n
depends on PSI
help
If not set, PSI ftrace events will be disabled and
will not incur any performance penalty.
If set, PSI ftrace events may be
enabled.
endmenu # "CPU/Task time and stats accounting"
config CPU_ISOLATION

View File

@ -142,9 +142,6 @@
#include <linux/psi.h>
#include "sched.h"
#define CREATE_TRACE_POINTS
#include <trace/events/psi.h>
static int psi_bug __read_mostly;
DEFINE_STATIC_KEY_FALSE(psi_disabled);
@ -449,33 +446,6 @@ static void psi_avgs_work(struct work_struct *work)
mutex_unlock(&group->avgs_lock);
}
#ifdef CONFIG_PSI_FTRACE
static void trace_event_helper(struct psi_group *group)
{
struct zone *zone;
unsigned long wmark;
unsigned long free;
unsigned long cma;
unsigned long file;
u64 memstall = group->total[PSI_POLL][PSI_MEM_SOME];
for_each_populated_zone(zone) {
wmark = zone->watermark[WMARK_HIGH];
free = zone_page_state(zone, NR_FREE_PAGES);
cma = zone_page_state(zone, NR_FREE_CMA_PAGES);
file = zone_page_state(zone, NR_ZONE_ACTIVE_FILE) +
zone_page_state(zone, NR_ZONE_INACTIVE_FILE);
trace_psi_window_vmstat(
memstall, zone->name, wmark, free, cma, file);
}
}
#else
static void trace_event_helper(struct psi_group *group)
{
}
#endif /* CONFIG_PSI_FTRACE */
/* Trigger tracking window manupulations */
static void window_reset(struct psi_window *win, u64 now, u64 value,
u64 prev_growth)
@ -568,8 +538,6 @@ static u64 update_triggers(struct psi_group *group, u64 now)
if (now < t->last_event_time + t->win.size)
continue;
trace_psi_event(t->state, t->threshold);
/* Generate an event */
if (cmpxchg(&t->event, 0, 1) == 0)
wake_up_interruptible(&t->event_wait);
@ -641,7 +609,6 @@ static void psi_poll_work(struct kthread_work *work)
*/
group->polling_until = now +
group->poll_min_period * UPDATES_PER_WINDOW;
trace_event_helper(group);
}
if (now > group->polling_until) {