All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] topology: Remove unused cpu_cluster_mask()
@ 2022-05-13  9:34 Dietmar Eggemann
  2022-05-13  9:48 ` Dietmar Eggemann
  2022-05-19 21:57 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
  0 siblings, 2 replies; 6+ messages in thread
From: Dietmar Eggemann @ 2022-05-13  9:34 UTC (permalink / raw)
  To: Peter Zijlstra, Barry Song, Greg Kroah-Hartman, Heiko Carstens
  Cc: linux-kernel

default_topology[] uses cpu_clustergroup_mask() for the CLS level
(guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
(arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).

Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
related Kconfig for ARM64")

Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
---
 include/linux/topology.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/linux/topology.h b/include/linux/topology.h
index f19bc3626297..4564faafd0e1 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
 }
 #endif
 
-#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
-static inline const struct cpumask *cpu_cluster_mask(int cpu)
-{
-	return topology_cluster_cpumask(cpu);
-}
-#endif
-
 static inline const struct cpumask *cpu_cpu_mask(int cpu)
 {
 	return cpumask_of_node(cpu_to_node(cpu));
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] topology: Remove unused cpu_cluster_mask()
  2022-05-13  9:34 [PATCH] topology: Remove unused cpu_cluster_mask() Dietmar Eggemann
@ 2022-05-13  9:48 ` Dietmar Eggemann
  2022-05-16  6:59   ` Barry Song
  2022-05-19 21:57 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
  1 sibling, 1 reply; 6+ messages in thread
From: Dietmar Eggemann @ 2022-05-13  9:48 UTC (permalink / raw)
  To: Peter Zijlstra, Greg Kroah-Hartman, Heiko Carstens, Barry Song
  Cc: linux-kernel

- Barry Song <song.bao.hua@hisilicon.com> bounced
+ Barry Song <21cnbao@gmail.com>

On 13/05/2022 11:34, Dietmar Eggemann wrote:
> default_topology[] uses cpu_clustergroup_mask() for the CLS level
> (guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
> (arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).
> 
> Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
> related Kconfig for ARM64")
> 
> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
> ---
>  include/linux/topology.h | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/include/linux/topology.h b/include/linux/topology.h
> index f19bc3626297..4564faafd0e1 100644
> --- a/include/linux/topology.h
> +++ b/include/linux/topology.h
> @@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
>  }
>  #endif
>  
> -#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
> -static inline const struct cpumask *cpu_cluster_mask(int cpu)
> -{
> -	return topology_cluster_cpumask(cpu);
> -}
> -#endif
> -
>  static inline const struct cpumask *cpu_cpu_mask(int cpu)
>  {
>  	return cpumask_of_node(cpu_to_node(cpu));


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH] topology: Remove unused cpu_cluster_mask()
  2022-05-13  9:48 ` Dietmar Eggemann
@ 2022-05-16  6:59   ` Barry Song
  0 siblings, 0 replies; 6+ messages in thread
From: Barry Song @ 2022-05-16  6:59 UTC (permalink / raw)
  To: Dietmar Eggemann; +Cc: Peter Zijlstra, Greg Kroah-Hartman, Heiko Carstens, LKML

On Fri, May 13, 2022 at 9:48 PM Dietmar Eggemann
<dietmar.eggemann@arm.com> wrote:
>
> - Barry Song <song.bao.hua@hisilicon.com> bounced
> + Barry Song <21cnbao@gmail.com>
>
> On 13/05/2022 11:34, Dietmar Eggemann wrote:
> > default_topology[] uses cpu_clustergroup_mask() for the CLS level
> > (guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
> > (arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).
> >
> > Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
> > related Kconfig for ARM64")
> >
> > Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
> > ---
> >  include/linux/topology.h | 7 -------
> >  1 file changed, 7 deletions(-)
> >
> > diff --git a/include/linux/topology.h b/include/linux/topology.h
> > index f19bc3626297..4564faafd0e1 100644
> > --- a/include/linux/topology.h
> > +++ b/include/linux/topology.h
> > @@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
> >  }
> >  #endif
> >
> > -#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
> > -static inline const struct cpumask *cpu_cluster_mask(int cpu)
> > -{
> > -     return topology_cluster_cpumask(cpu);
> > -}
> > -#endif
> > -

Acked-by: Barry Song <baohua@kernel.org>

I agree there are no users right now. I probably wrote it like cpu_smt_mask()
and used it in kernel/sched for the wake_affine patch but forgot to remove it
while sending patches without wake_affine.


> >  static inline const struct cpumask *cpu_cpu_mask(int cpu)
> >  {
> >       return cpumask_of_node(cpu_to_node(cpu));
>

Thanks
Barry

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [tip: sched/core] topology: Remove unused cpu_cluster_mask()
  2022-05-13  9:34 [PATCH] topology: Remove unused cpu_cluster_mask() Dietmar Eggemann
  2022-05-13  9:48 ` Dietmar Eggemann
@ 2022-05-19 21:57 ` tip-bot2 for Dietmar Eggemann
  2022-05-20 11:34   ` Barry Song
  1 sibling, 1 reply; 6+ messages in thread
From: tip-bot2 for Dietmar Eggemann @ 2022-05-19 21:57 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: Dietmar Eggemann, Peter Zijlstra (Intel), Barry Song, x86, linux-kernel

The following commit has been merged into the sched/core branch of tip:

Commit-ID:     991d8d8142cad94f9c5c05db25e67fa83d6f772a
Gitweb:        https://git.kernel.org/tip/991d8d8142cad94f9c5c05db25e67fa83d6f772a
Author:        Dietmar Eggemann <dietmar.eggemann@arm.com>
AuthorDate:    Fri, 13 May 2022 11:34:33 +02:00
Committer:     Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 19 May 2022 23:46:13 +02:00

topology: Remove unused cpu_cluster_mask()

default_topology[] uses cpu_clustergroup_mask() for the CLS level
(guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
(arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).

Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
related Kconfig for ARM64")

Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Barry Song <baohua@kernel.org>
Link: https://lore.kernel.org/r/20220513093433.425163-1-dietmar.eggemann@arm.com
---
 include/linux/topology.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/include/linux/topology.h b/include/linux/topology.h
index f19bc36..4564faa 100644
--- a/include/linux/topology.h
+++ b/include/linux/topology.h
@@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
 }
 #endif
 
-#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
-static inline const struct cpumask *cpu_cluster_mask(int cpu)
-{
-	return topology_cluster_cpumask(cpu);
-}
-#endif
-
 static inline const struct cpumask *cpu_cpu_mask(int cpu)
 {
 	return cpumask_of_node(cpu_to_node(cpu));

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [tip: sched/core] topology: Remove unused cpu_cluster_mask()
  2022-05-19 21:57 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
@ 2022-05-20 11:34   ` Barry Song
  2022-05-20 13:05     ` Peter Zijlstra
  0 siblings, 1 reply; 6+ messages in thread
From: Barry Song @ 2022-05-20 11:34 UTC (permalink / raw)
  To: LKML, Greg Kroah-Hartman
  Cc: linux-tip-commits, Dietmar Eggemann, Peter Zijlstra (Intel), x86

On Fri, May 20, 2022 at 9:57 AM tip-bot2 for Dietmar Eggemann
<tip-bot2@linutronix.de> wrote:
>
> The following commit has been merged into the sched/core branch of tip:
>
> Commit-ID:     991d8d8142cad94f9c5c05db25e67fa83d6f772a
> Gitweb:        https://git.kernel.org/tip/991d8d8142cad94f9c5c05db25e67fa83d6f772a
> Author:        Dietmar Eggemann <dietmar.eggemann@arm.com>
> AuthorDate:    Fri, 13 May 2022 11:34:33 +02:00
> Committer:     Peter Zijlstra <peterz@infradead.org>
> CommitterDate: Thu, 19 May 2022 23:46:13 +02:00
>
> topology: Remove unused cpu_cluster_mask()
>
> default_topology[] uses cpu_clustergroup_mask() for the CLS level
> (guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
> (arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).
>
> Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
> related Kconfig for ARM64")
>
> Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> Acked-by: Barry Song <baohua@kernel.org>
> Link: https://lore.kernel.org/r/20220513093433.425163-1-dietmar.eggemann@arm.com
> ---

Hi Peter,
I also received emails which say Greg has put it into drive-core-testing and
driver-core-next.
https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=15f214f9bdb7c1f5


>  include/linux/topology.h | 7 -------
>  1 file changed, 7 deletions(-)
>
> diff --git a/include/linux/topology.h b/include/linux/topology.h
> index f19bc36..4564faa 100644
> --- a/include/linux/topology.h
> +++ b/include/linux/topology.h
> @@ -240,13 +240,6 @@ static inline const struct cpumask *cpu_smt_mask(int cpu)
>  }
>  #endif
>
> -#if defined(CONFIG_SCHED_CLUSTER) && !defined(cpu_cluster_mask)
> -static inline const struct cpumask *cpu_cluster_mask(int cpu)
> -{
> -       return topology_cluster_cpumask(cpu);
> -}
> -#endif
> -
>  static inline const struct cpumask *cpu_cpu_mask(int cpu)
>  {
>         return cpumask_of_node(cpu_to_node(cpu));

Thanks
Barry

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [tip: sched/core] topology: Remove unused cpu_cluster_mask()
  2022-05-20 11:34   ` Barry Song
@ 2022-05-20 13:05     ` Peter Zijlstra
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Zijlstra @ 2022-05-20 13:05 UTC (permalink / raw)
  To: Barry Song
  Cc: LKML, Greg Kroah-Hartman, linux-tip-commits, Dietmar Eggemann, x86

On Fri, May 20, 2022 at 11:34:52PM +1200, Barry Song wrote:
> On Fri, May 20, 2022 at 9:57 AM tip-bot2 for Dietmar Eggemann
> <tip-bot2@linutronix.de> wrote:
> >
> > The following commit has been merged into the sched/core branch of tip:
> >
> > Commit-ID:     991d8d8142cad94f9c5c05db25e67fa83d6f772a
> > Gitweb:        https://git.kernel.org/tip/991d8d8142cad94f9c5c05db25e67fa83d6f772a
> > Author:        Dietmar Eggemann <dietmar.eggemann@arm.com>
> > AuthorDate:    Fri, 13 May 2022 11:34:33 +02:00
> > Committer:     Peter Zijlstra <peterz@infradead.org>
> > CommitterDate: Thu, 19 May 2022 23:46:13 +02:00
> >
> > topology: Remove unused cpu_cluster_mask()
> >
> > default_topology[] uses cpu_clustergroup_mask() for the CLS level
> > (guarded by CONFIG_SCHED_CLUSTER) which is currently provided by x86
> > (arch/x86/kernel/smpboot.c) and arm64 (drivers/base/arch_topology.c).
> >
> > Fixes: 778c558f49a2c ("sched: Add cluster scheduler level in core and
> > related Kconfig for ARM64")
> >
> > Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
> > Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
> > Acked-by: Barry Song <baohua@kernel.org>
> > Link: https://lore.kernel.org/r/20220513093433.425163-1-dietmar.eggemann@arm.com
> > ---
> 
> Hi Peter,
> I also received emails which say Greg has put it into drive-core-testing and
> driver-core-next.
> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git/commit/?h=driver-core-next&id=15f214f9bdb7c1f5

Damn, I must've missed that. It think git will DTRT and the trees will
merge painlessly.

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-20 13:06 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13  9:34 [PATCH] topology: Remove unused cpu_cluster_mask() Dietmar Eggemann
2022-05-13  9:48 ` Dietmar Eggemann
2022-05-16  6:59   ` Barry Song
2022-05-19 21:57 ` [tip: sched/core] " tip-bot2 for Dietmar Eggemann
2022-05-20 11:34   ` Barry Song
2022-05-20 13:05     ` Peter Zijlstra

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.