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

sched/hmp: Use GFP_KERNEL for top task memory allocations

Browse source 
Task load structure allocations can consume a lot of memory as the
number of tasks begin to increase. Also they might exhaust the atomic
memory pool pretty quickly if a workload starts spawning lots of
threads in a short amount of time thus increasing the possibility of
failed allocations. Move the call to init_new_task_load() outside
atomic context and start using GFP_KERNEL for allocations. There is
no need for this allocation to be in atomic context.

Change-Id: I357772e10bf8958804d9cd0c78eda27139054b21
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
This commit is contained in:
Syed Rameez Mustafa 2016-11-01 18:13:36 -07:00
parent ecd8f7800f
commit 576259be4a
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kernel/sched/core.c
View file

@ -2269,17 +2269,7 @@ void sched_exit(struct task_struct *p)
reset_task_stats(p); reset_task_stats(p);
p->ravg.mark_start = wallclock; p->ravg.mark_start = wallclock;
p->ravg.sum_history[0] = EXITING_TASK_MARKER; p->ravg.sum_history[0] = EXITING_TASK_MARKER;
free_task_load_ptrs(p);
kfree(p->ravg.curr_window_cpu);
kfree(p->ravg.prev_window_cpu);
/*
* update_task_ravg() can be called for exiting tasks. While the
* function itself ensures correct behavior, the corresponding
* trace event requires that these pointers be NULL.
*/
p->ravg.curr_window_cpu = NULL;
p->ravg.prev_window_cpu = NULL;
enqueue_task(rq, p, 0); enqueue_task(rq, p, 0);
clear_ed_task(p, rq); clear_ed_task(p, rq);
@ -2384,10 +2374,12 @@ int sysctl_numa_balancing(struct ctl_table *table, int write,
int sched_fork(unsigned long clone_flags, struct task_struct *p) int sched_fork(unsigned long clone_flags, struct task_struct *p)
{ {
unsigned long flags; unsigned long flags;
int cpu = get_cpu(); int cpu;
init_new_task_load(p, false);
cpu = get_cpu();
__sched_fork(clone_flags, p); __sched_fork(clone_flags, p);
init_new_task_load(p, false);
/* /*
* We mark the process as running here. This guarantees that * We mark the process as running here. This guarantees that
* nobody will actually run it, and a signal or other external * nobody will actually run it, and a signal or other external

18
kernel/sched/hmp.c
View file

@ -1624,6 +1624,20 @@ unsigned int cpu_temp(int cpu)
return 0; return 0;
} }
void free_task_load_ptrs(struct task_struct *p)
{
kfree(p->ravg.curr_window_cpu);
kfree(p->ravg.prev_window_cpu);
/*
* update_task_ravg() can be called for exiting tasks. While the
* function itself ensures correct behavior, the corresponding
* trace event requires that these pointers be NULL.
*/
p->ravg.curr_window_cpu = NULL;
p->ravg.prev_window_cpu = NULL;
}
void init_new_task_load(struct task_struct *p, bool idle_task) void init_new_task_load(struct task_struct *p, bool idle_task)
{ {
int i; int i;
@ -1636,8 +1650,8 @@ void init_new_task_load(struct task_struct *p, bool idle_task)
memset(&p->ravg, 0, sizeof(struct ravg)); memset(&p->ravg, 0, sizeof(struct ravg));
p->cpu_cycles = 0; p->cpu_cycles = 0;
p->ravg.curr_window_cpu = kcalloc(nr_cpu_ids, sizeof(u32), GFP_ATOMIC); p->ravg.curr_window_cpu = kcalloc(nr_cpu_ids, sizeof(u32), GFP_KERNEL);
p->ravg.prev_window_cpu = kcalloc(nr_cpu_ids, sizeof(u32), GFP_ATOMIC); p->ravg.prev_window_cpu = kcalloc(nr_cpu_ids, sizeof(u32), GFP_KERNEL);
/* Don't have much choice. CPU frequency would be bogus */ /* Don't have much choice. CPU frequency would be bogus */
BUG_ON(!p->ravg.curr_window_cpu || !p->ravg.prev_window_cpu); BUG_ON(!p->ravg.curr_window_cpu || !p->ravg.prev_window_cpu);

3
kernel/sched/sched.h
View file

@ -1079,6 +1079,7 @@ extern unsigned int __read_mostly sched_downmigrate;
extern unsigned int __read_mostly sysctl_sched_spill_nr_run; extern unsigned int __read_mostly sysctl_sched_spill_nr_run;
extern unsigned int __read_mostly sched_load_granule; extern unsigned int __read_mostly sched_load_granule;
extern void free_task_load_ptrs(struct task_struct *p);
extern void init_new_task_load(struct task_struct *p, bool idle_task); extern void init_new_task_load(struct task_struct *p, bool idle_task);
extern u64 sched_ktime_clock(void); extern u64 sched_ktime_clock(void);
extern int got_boost_kick(void); extern int got_boost_kick(void);
@ -1527,6 +1528,8 @@ static inline struct sched_cluster *rq_cluster(struct rq *rq)
return NULL; return NULL;
} }
static inline void free_task_load_ptrs(struct task_struct *p) { }
static inline void init_new_task_load(struct task_struct *p, bool idle_task) static inline void init_new_task_load(struct task_struct *p, bool idle_task)
{ {
} }