2014-11-07 11:07:47

by Kirill Tkhai

Subject: [PATCH] sched/fair: Kill task_struct::numa_entry and numa_group::task_list

Nobody iterates over numa_group::task_list, this just confuses a reader.

Signed-off-by: Kirill Tkhai <[email protected]>
---
kernel/sched/core.c | 1 -
kernel/sched/fair.c | 5 -----
2 files changed, 6 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2e7578a..7662d59 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1861,7 +1861,6 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
p->last_task_numa_placement = 0;
p->last_sum_exec_runtime = 0;

- INIT_LIST_HEAD(&p->numa_entry);
p->numa_group = NULL;
#endif /* CONFIG_NUMA_BALANCING */
}
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 826fdf3..fc91348 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -868,7 +868,6 @@ struct numa_group {
spinlock_t lock; /* nr_tasks, tasks */
int nr_tasks;
pid_t gid;
- struct list_head task_list;

struct rcu_head rcu;
nodemask_t active_nodes;
@@ -1894,7 +1893,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,

atomic_set(&grp->refcount, 1);
spin_lock_init(&grp->lock);
- INIT_LIST_HEAD(&grp->task_list);
grp->gid = p->pid;
/* Second half of the array tracks nids where faults happen */
grp->faults_cpu = grp->faults + NR_NUMA_HINT_FAULT_TYPES *
@@ -1907,7 +1905,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,

grp->total_faults = p->total_numa_faults;

- list_add(&p->numa_entry, &grp->task_list);
grp->nr_tasks++;
rcu_assign_pointer(p->numa_group, grp);
}
@@ -1968,7 +1965,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,
my_grp->total_faults -= p->total_numa_faults;
grp->total_faults += p->total_numa_faults;

- list_move(&p->numa_entry, &grp->task_list);
my_grp->nr_tasks--;
grp->nr_tasks++;

@@ -1998,7 +1994,6 @@ void task_numa_free(struct task_struct *p)
grp->faults[i] -= p->numa_faults[i];
grp->total_faults -= p->total_numa_faults;

- list_del(&p->numa_entry);
grp->nr_tasks--;
spin_unlock_irqrestore(&grp->lock, flags);
RCU_INIT_POINTER(p->numa_group, NULL);

2014-11-16 12:32:06

by tip-bot for Vasyl Gomonovych

Subject: [tip:sched/core] sched/fair: Kill task_struct:: numa_entry and numa_group::task_list

Commit-ID: 753899183c53aa609375b214ea8e040da89119c3
Gitweb: http://git.kernel.org/tip/753899183c53aa609375b214ea8e040da89119c3
Author: Kirill Tkhai <[email protected]>
AuthorDate: Fri, 7 Nov 2014 14:07:36 +0300
Committer: Ingo Molnar <[email protected]>
CommitDate: Sun, 16 Nov 2014 10:58:48 +0100

sched/fair: Kill task_struct::numa_entry and numa_group::task_list

Nobody iterates over numa_group::task_list, this just confuses the readers.

Signed-off-by: Kirill Tkhai <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Linus Torvalds <[email protected]>
Link: http://lkml.kernel.org/r/1415358456.28592.17.camel@tkhai
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/sched/core.c | 1 -
kernel/sched/fair.c | 5 -----
2 files changed, 6 deletions(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 960f704..3ccdce1 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1861,7 +1861,6 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
p->last_task_numa_placement = 0;
p->last_sum_exec_runtime = 0;

- INIT_LIST_HEAD(&p->numa_entry);
p->numa_group = NULL;
#endif /* CONFIG_NUMA_BALANCING */
}
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index cf80643..d11c57d 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -873,7 +873,6 @@ struct numa_group {
spinlock_t lock; /* nr_tasks, tasks */
int nr_tasks;
pid_t gid;
- struct list_head task_list;

struct rcu_head rcu;
nodemask_t active_nodes;
@@ -1906,7 +1905,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,

atomic_set(&grp->refcount, 1);
spin_lock_init(&grp->lock);
- INIT_LIST_HEAD(&grp->task_list);
grp->gid = p->pid;
/* Second half of the array tracks nids where faults happen */
grp->faults_cpu = grp->faults + NR_NUMA_HINT_FAULT_TYPES *
@@ -1919,7 +1917,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,

grp->total_faults = p->total_numa_faults;

- list_add(&p->numa_entry, &grp->task_list);
grp->nr_tasks++;
rcu_assign_pointer(p->numa_group, grp);
}
@@ -1980,7 +1977,6 @@ static void task_numa_group(struct task_struct *p, int cpupid, int flags,
my_grp->total_faults -= p->total_numa_faults;
grp->total_faults += p->total_numa_faults;

- list_move(&p->numa_entry, &grp->task_list);
my_grp->nr_tasks--;
grp->nr_tasks++;

@@ -2010,7 +2006,6 @@ void task_numa_free(struct task_struct *p)
grp->faults[i] -= p->numa_faults[i];
grp->total_faults -= p->total_numa_faults;

- list_del(&p->numa_entry);
grp->nr_tasks--;
spin_unlock_irqrestore(&grp->lock, flags);
RCU_INIT_POINTER(p->numa_group, NULL);