Revert "fs,kernel,mm: tune to Ktweak balance"
This reverts commit 50e7a3b302
.
This commit is contained in:
parent
635001307c
commit
15afa770f5
5 changed files with 14 additions and 14 deletions
|
@ -419,7 +419,7 @@ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free'
|
||||||
*/
|
*/
|
||||||
#define DEFAULT_MAX_SAMPLE_RATE 100000
|
#define DEFAULT_MAX_SAMPLE_RATE 100000
|
||||||
#define DEFAULT_SAMPLE_PERIOD_NS (NSEC_PER_SEC / DEFAULT_MAX_SAMPLE_RATE)
|
#define DEFAULT_SAMPLE_PERIOD_NS (NSEC_PER_SEC / DEFAULT_MAX_SAMPLE_RATE)
|
||||||
#define DEFAULT_CPU_TIME_MAX_PERCENT 5
|
#define DEFAULT_CPU_TIME_MAX_PERCENT 25
|
||||||
|
|
||||||
int sysctl_perf_event_sample_rate __read_mostly = DEFAULT_MAX_SAMPLE_RATE;
|
int sysctl_perf_event_sample_rate __read_mostly = DEFAULT_MAX_SAMPLE_RATE;
|
||||||
|
|
||||||
|
|
|
@ -197,7 +197,7 @@ void sched_autogroup_exit(struct signal_struct *sig)
|
||||||
|
|
||||||
static int __init setup_autogroup(char *str)
|
static int __init setup_autogroup(char *str)
|
||||||
{
|
{
|
||||||
sysctl_sched_autogroup_enabled = 1;
|
sysctl_sched_autogroup_enabled = 0;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,8 @@ EXPORT_SYMBOL_GPL(sysctl_sched_features);
|
||||||
#if !defined(CONFIG_ANDROID)
|
#if !defined(CONFIG_ANDROID)
|
||||||
const_debug unsigned int sysctl_sched_nr_migrate = NR_CPUS;
|
const_debug unsigned int sysctl_sched_nr_migrate = NR_CPUS;
|
||||||
#else
|
#else
|
||||||
const_debug unsigned int sysctl_sched_nr_migrate = NR_CPUS;
|
<<<<<<< HEAD
|
||||||
|
const_debug unsigned int sysctl_sched_nr_migrate = 32;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -39,9 +39,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_stat_runtime);
|
||||||
*
|
*
|
||||||
* (default: 6ms * (1 + ilog(ncpus)), units: nanoseconds)
|
* (default: 6ms * (1 + ilog(ncpus)), units: nanoseconds)
|
||||||
*/
|
*/
|
||||||
unsigned int sysctl_sched_latency = 4000000ULL;
|
unsigned int sysctl_sched_latency = 5000000ULL;
|
||||||
EXPORT_SYMBOL_GPL(sysctl_sched_latency);
|
EXPORT_SYMBOL_GPL(sysctl_sched_latency);
|
||||||
static unsigned int normalized_sysctl_sched_latency = 4000000ULL;
|
static unsigned int normalized_sysctl_sched_latency = 5000000ULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* The initial- and re-scaling of tunables is configurable
|
* The initial- and re-scaling of tunables is configurable
|
||||||
|
@ -54,16 +54,16 @@ static unsigned int normalized_sysctl_sched_latency = 4000000ULL;
|
||||||
*
|
*
|
||||||
* (default SCHED_TUNABLESCALING_LOG = *(1+ilog(ncpus))
|
* (default SCHED_TUNABLESCALING_LOG = *(1+ilog(ncpus))
|
||||||
*/
|
*/
|
||||||
enum sched_tunable_scaling sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
|
enum sched_tunable_scaling sysctl_sched_tunable_scaling = SCHED_TUNABLESCALING_LOG;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Minimal preemption granularity for CPU-bound tasks:
|
* Minimal preemption granularity for CPU-bound tasks:
|
||||||
*
|
*
|
||||||
* (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
* (default: 0.75 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
||||||
*/
|
*/
|
||||||
unsigned int sysctl_sched_min_granularity = 500000ULL;
|
unsigned int sysctl_sched_min_granularity = 750000ULL;
|
||||||
EXPORT_SYMBOL_GPL(sysctl_sched_min_granularity);
|
EXPORT_SYMBOL_GPL(sysctl_sched_min_granularity);
|
||||||
static unsigned int normalized_sysctl_sched_min_granularity = 500000ULL;
|
static unsigned int normalized_sysctl_sched_min_granularity = 750000ULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This value is kept at sysctl_sched_latency/sysctl_sched_min_granularity
|
* This value is kept at sysctl_sched_latency/sysctl_sched_min_granularity
|
||||||
|
@ -74,7 +74,7 @@ static unsigned int sched_nr_latency = 8;
|
||||||
* After fork, child runs first. If set to 0 (default) then
|
* After fork, child runs first. If set to 0 (default) then
|
||||||
* parent will (try to) run first.
|
* parent will (try to) run first.
|
||||||
*/
|
*/
|
||||||
unsigned int sysctl_sched_child_runs_first __read_mostly = 1;
|
unsigned int sysctl_sched_child_runs_first __read_mostly;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SCHED_OTHER wake-up granularity.
|
* SCHED_OTHER wake-up granularity.
|
||||||
|
@ -85,10 +85,10 @@ unsigned int sysctl_sched_child_runs_first __read_mostly = 1;
|
||||||
*
|
*
|
||||||
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
* (default: 1 msec * (1 + ilog(ncpus)), units: nanoseconds)
|
||||||
*/
|
*/
|
||||||
unsigned int sysctl_sched_wakeup_granularity = 2000000UL;
|
unsigned int sysctl_sched_wakeup_granularity = 1000000UL;
|
||||||
static unsigned int normalized_sysctl_sched_wakeup_granularity = 2000000UL;
|
static unsigned int normalized_sysctl_sched_wakeup_granularity = 1000000UL;
|
||||||
|
|
||||||
unsigned int __read_mostly sysctl_sched_migration_cost = 5000000UL;
|
unsigned int __read_mostly sysctl_sched_migration_cost = 500000UL;
|
||||||
|
|
||||||
int sched_thermal_decay_shift;
|
int sched_thermal_decay_shift;
|
||||||
static int __init setup_sched_thermal_decay_shift(char *str)
|
static int __init setup_sched_thermal_decay_shift(char *str)
|
||||||
|
|
|
@ -49,8 +49,7 @@ SCHED_FEAT(NONTASK_CAPACITY, true)
|
||||||
* Queue remote wakeups on the target CPU and process them
|
* Queue remote wakeups on the target CPU and process them
|
||||||
* using the scheduler IPI. Reduces rq->lock contention/bounces.
|
* using the scheduler IPI. Reduces rq->lock contention/bounces.
|
||||||
*/
|
*/
|
||||||
#define SCHED_FEAT_TTWU_QUEUE 1
|
SCHED_FEAT(TTWU_QUEUE, true)
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* When doing wakeups, attempt to limit superfluous scans of the LLC domain.
|
* When doing wakeups, attempt to limit superfluous scans of the LLC domain.
|
||||||
|
|
Loading…
Add table
Reference in a new issue