* [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor
@ 2024-07-13 8:59 Xiu Jianfeng
2024-07-29 11:20 ` Xiu Jianfeng
2024-07-30 22:29 ` Tejun Heo
0 siblings, 2 replies; 3+ messages in thread
From: Xiu Jianfeng @ 2024-07-13 8:59 UTC (permalink / raw)
To: longman, lizefan.x, mingo, peterz, juri.lelli, vincent.guittot,
tj, hannes, mkoutny
Cc: cgroups, linux-kernel
Since the SLAB implementation was removed in v6.8, so the
cpuset_slab_spread_rotor is no longer used and can be removed.
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
include/linux/cpuset.h | 6 ------
include/linux/sched.h | 1 -
kernel/cgroup/cpuset.c | 13 -------------
kernel/fork.c | 1 -
4 files changed, 21 deletions(-)
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index de4cf0ee96f7..2a6981eeebf8 100644
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
@@ -113,7 +113,6 @@ extern int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *tsk);
extern int cpuset_mem_spread_node(void);
-extern int cpuset_slab_spread_node(void);
static inline int cpuset_do_page_mem_spread(void)
{
@@ -246,11 +245,6 @@ static inline int cpuset_mem_spread_node(void)
return 0;
}
-static inline int cpuset_slab_spread_node(void)
-{
- return 0;
-}
-
static inline int cpuset_do_page_mem_spread(void)
{
return 0;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 75138bf70da3..e151da1675fe 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1248,7 +1248,6 @@ struct task_struct {
/* Sequence number to catch updates: */
seqcount_spinlock_t mems_allowed_seq;
int cpuset_mem_spread_rotor;
- int cpuset_slab_spread_rotor;
#endif
#ifdef CONFIG_CGROUPS
/* Control Group info protected by css_set_lock: */
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
index 40ec4abaf440..ba7f7f967565 100644
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@ -5028,19 +5028,6 @@ int cpuset_mem_spread_node(void)
return cpuset_spread_node(¤t->cpuset_mem_spread_rotor);
}
-/**
- * cpuset_slab_spread_node() - On which node to begin search for a slab page
- */
-int cpuset_slab_spread_node(void)
-{
- if (current->cpuset_slab_spread_rotor == NUMA_NO_NODE)
- current->cpuset_slab_spread_rotor =
- node_random(¤t->mems_allowed);
-
- return cpuset_spread_node(¤t->cpuset_slab_spread_rotor);
-}
-EXPORT_SYMBOL_GPL(cpuset_mem_spread_node);
-
/**
* cpuset_mems_allowed_intersects - Does @tsk1's mems_allowed intersect @tsk2's?
* @tsk1: pointer to task_struct of some task.
diff --git a/kernel/fork.c b/kernel/fork.c
index 08e13b919d80..559e8df1672a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2313,7 +2313,6 @@ __latent_entropy struct task_struct *copy_process(
#endif
#ifdef CONFIG_CPUSETS
p->cpuset_mem_spread_rotor = NUMA_NO_NODE;
- p->cpuset_slab_spread_rotor = NUMA_NO_NODE;
seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock);
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor
2024-07-13 8:59 [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor Xiu Jianfeng
@ 2024-07-29 11:20 ` Xiu Jianfeng
2024-07-30 22:29 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Xiu Jianfeng @ 2024-07-29 11:20 UTC (permalink / raw)
To: longman, lizefan.x, mingo, peterz, juri.lelli, vincent.guittot,
tj, hannes, mkoutny
Cc: cgroups, linux-kernel
Hi,
Friendly ping...
On 2024/7/13 16:59, Xiu Jianfeng wrote:
> Since the SLAB implementation was removed in v6.8, so the
> cpuset_slab_spread_rotor is no longer used and can be removed.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
> ---
> include/linux/cpuset.h | 6 ------
> include/linux/sched.h | 1 -
> kernel/cgroup/cpuset.c | 13 -------------
> kernel/fork.c | 1 -
> 4 files changed, 21 deletions(-)
>
> diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
> index de4cf0ee96f7..2a6981eeebf8 100644
> --- a/include/linux/cpuset.h
> +++ b/include/linux/cpuset.h
> @@ -113,7 +113,6 @@ extern int proc_cpuset_show(struct seq_file *m, struct pid_namespace *ns,
> struct pid *pid, struct task_struct *tsk);
>
> extern int cpuset_mem_spread_node(void);
> -extern int cpuset_slab_spread_node(void);
>
> static inline int cpuset_do_page_mem_spread(void)
> {
> @@ -246,11 +245,6 @@ static inline int cpuset_mem_spread_node(void)
> return 0;
> }
>
> -static inline int cpuset_slab_spread_node(void)
> -{
> - return 0;
> -}
> -
> static inline int cpuset_do_page_mem_spread(void)
> {
> return 0;
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index 75138bf70da3..e151da1675fe 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -1248,7 +1248,6 @@ struct task_struct {
> /* Sequence number to catch updates: */
> seqcount_spinlock_t mems_allowed_seq;
> int cpuset_mem_spread_rotor;
> - int cpuset_slab_spread_rotor;
> #endif
> #ifdef CONFIG_CGROUPS
> /* Control Group info protected by css_set_lock: */
> diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c
> index 40ec4abaf440..ba7f7f967565 100644
> --- a/kernel/cgroup/cpuset.c
> +++ b/kernel/cgroup/cpuset.c
> @@ -5028,19 +5028,6 @@ int cpuset_mem_spread_node(void)
> return cpuset_spread_node(¤t->cpuset_mem_spread_rotor);
> }
>
> -/**
> - * cpuset_slab_spread_node() - On which node to begin search for a slab page
> - */
> -int cpuset_slab_spread_node(void)
> -{
> - if (current->cpuset_slab_spread_rotor == NUMA_NO_NODE)
> - current->cpuset_slab_spread_rotor =
> - node_random(¤t->mems_allowed);
> -
> - return cpuset_spread_node(¤t->cpuset_slab_spread_rotor);
> -}
> -EXPORT_SYMBOL_GPL(cpuset_mem_spread_node);
> -
> /**
> * cpuset_mems_allowed_intersects - Does @tsk1's mems_allowed intersect @tsk2's?
> * @tsk1: pointer to task_struct of some task.
> diff --git a/kernel/fork.c b/kernel/fork.c
> index 08e13b919d80..559e8df1672a 100644
> --- a/kernel/fork.c
> +++ b/kernel/fork.c
> @@ -2313,7 +2313,6 @@ __latent_entropy struct task_struct *copy_process(
> #endif
> #ifdef CONFIG_CPUSETS
> p->cpuset_mem_spread_rotor = NUMA_NO_NODE;
> - p->cpuset_slab_spread_rotor = NUMA_NO_NODE;
> seqcount_spinlock_init(&p->mems_allowed_seq, &p->alloc_lock);
> #endif
> #ifdef CONFIG_TRACE_IRQFLAGS
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor
2024-07-13 8:59 [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor Xiu Jianfeng
2024-07-29 11:20 ` Xiu Jianfeng
@ 2024-07-30 22:29 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2024-07-30 22:29 UTC (permalink / raw)
To: Xiu Jianfeng
Cc: longman, lizefan.x, mingo, peterz, juri.lelli, vincent.guittot,
hannes, mkoutny, cgroups, linux-kernel
On Sat, Jul 13, 2024 at 08:59:16AM +0000, Xiu Jianfeng wrote:
> Since the SLAB implementation was removed in v6.8, so the
> cpuset_slab_spread_rotor is no longer used and can be removed.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Applied cgroup/for-6.12.
Thanks.
--
tejun
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-30 22:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-13 8:59 [PATCH -next] cgroup/cpuset: Remove cpuset_slab_spread_rotor Xiu Jianfeng
2024-07-29 11:20 ` Xiu Jianfeng
2024-07-30 22:29 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®