evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "sysctl: define upper limit for sched_freq_reporting_policy"

Browse source
This commit is contained in:
Linux Build Service Account 2017-02-07 02:08:10 -08:00 • committed by Gerrit - the friendly Code Review server
commit a2c6971ce7
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/linux/sched/sysctl.h
View file

@ -45,6 +45,14 @@ extern unsigned int sysctl_sched_initial_task_util;
extern unsigned int sysctl_sched_cstate_aware; extern unsigned int sysctl_sched_cstate_aware;
#ifdef CONFIG_SCHED_HMP #ifdef CONFIG_SCHED_HMP
enum freq_reporting_policy {
FREQ_REPORT_MAX_CPU_LOAD_TOP_TASK,
FREQ_REPORT_CPU_LOAD,
FREQ_REPORT_TOP_TASK,
FREQ_REPORT_INVALID_POLICY
};
extern int sysctl_sched_freq_inc_notify; extern int sysctl_sched_freq_inc_notify;
extern int sysctl_sched_freq_dec_notify; extern int sysctl_sched_freq_dec_notify;
extern unsigned int sysctl_sched_freq_reporting_policy; extern unsigned int sysctl_sched_freq_reporting_policy;

2
kernel/sched/hmp.c
View file

@ -3108,7 +3108,7 @@ static inline u64 freq_policy_load(struct rq *rq, u64 load)
case FREQ_REPORT_CPU_LOAD: case FREQ_REPORT_CPU_LOAD:
break; break;
default: default:
WARN_ON_ONCE(1); break;
} }
return load; return load;

4
kernel/sched/sched.h
View file

@ -1071,10 +1071,6 @@ enum sched_boost_policy {
#define WINDOW_STATS_AVG 3 #define WINDOW_STATS_AVG 3
#define WINDOW_STATS_INVALID_POLICY 4 #define WINDOW_STATS_INVALID_POLICY 4
#define FREQ_REPORT_MAX_CPU_LOAD_TOP_TASK 0
#define FREQ_REPORT_CPU_LOAD 1
#define FREQ_REPORT_TOP_TASK 2
#define SCHED_UPMIGRATE_MIN_NICE 15 #define SCHED_UPMIGRATE_MIN_NICE 15
#define EXITING_TASK_MARKER 0xdeaddead #define EXITING_TASK_MARKER 0xdeaddead

5
kernel/sysctl.c
View file

@ -133,6 +133,7 @@ static int ten_thousand = 10000;
#endif #endif
#ifdef CONFIG_SCHED_HMP #ifdef CONFIG_SCHED_HMP
static int one_thousand = 1000; static int one_thousand = 1000;
static int max_freq_reporting_policy = FREQ_REPORT_INVALID_POLICY - 1;
#endif #endif
/* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */ /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
@ -297,6 +298,7 @@ static struct ctl_table kern_table[] = {
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = &zero, .extra1 = &zero,
.extra2 = &max_freq_reporting_policy,
}, },
{ {
.procname = "sched_freq_inc_notify", .procname = "sched_freq_inc_notify",
@ -591,7 +593,8 @@ static struct ctl_table kern_table[] = {
.data = &sysctl_sched_time_avg, .data = &sysctl_sched_time_avg,
.maxlen = sizeof(unsigned int), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec, .proc_handler = proc_dointvec_minmax,
.extra1 = &one,
}, },
{ {
.procname = "sched_shares_window_ns", .procname = "sched_shares_window_ns",