Re: [RESEND][PATCH v2 0/9] x86: remove cpu_**_mask() functions

Ingo Molnar
2015-05-27T13:24:31Z

* Bartosz Golaszewski <bgolaszewski@baylibre.com> wrote:

> Two functions defined in asm/smp.h: cpu_sibling_mask() and cpu_core_mask(),
> have the same functionality as macros defined in linux/topology.h:
> topology_thread_cpumask() and topology_core_cpumask() respectively.
>
> They are not documented and are architecture specific. Also: different
> naming for the same functionality (in case of cpu_sibling_mask() and
> topology_thread_cpumask()) is a bit misleading.
>
> This series makes all the callers switch to using the topology.h macros
> and removes their smp.h counterparts. While we're at it: rename
> topology_thread_cpumask() to topology_sibling_cpumask() to be
> consistent with the term used in the scheduler.
>
> The same duplication exists on powerpc.
>
> NOTE: patch 2/9 had been already submitted separately but didn't
> receive any attention, so I'm attaching it to this series.
>
> v2:
> - renamed topology_thread_cpumask() to topology_sibling_cpumask()
> - updated Documentation/cputopology.txt
>
> v1:
> https://lkml.org/lkml/2015/4/30/188
>
> Bartosz Golaszewski (9):
> topology: rename topology_thread_cpumask()
> Documentation: update cputopology.txt
> coretemp: replace cpu_sibling_mask() with topology_sibling_cpumask()
> powernow-k8: replace cpu_core_mask() with topology_core_cpumask()
> p4-clockmod: replace cpu_sibling_mask() with topology_sibling_cpumask()
> acpi-cpufreq: replace cpu_**_mask() with topology_**_cpumask()
> speedstep-ich: replace cpu_sibling_mask() with topology_sibling_cpumask()
> x86: replace cpu_**_mask() with topology_**_cpumask()
> x86: remove cpu_sibling_mask() and cpu_core_mask()
>
> Documentation/cputopology.txt | 37 +++++++++++++------
> arch/arm/include/asm/topology.h | 2 +-
> arch/arm64/include/asm/topology.h | 2 +-
> arch/ia64/include/asm/topology.h | 2 +-
> arch/mips/include/asm/topology.h | 2 +-
> arch/powerpc/include/asm/topology.h | 2 +-
> arch/powerpc/mm/tlb_nohash.c | 2 +-
> arch/s390/include/asm/topology.h | 3 +-
> arch/sparc/include/asm/topology_64.h | 2 +-
> arch/tile/include/asm/topology.h | 2 +-
> arch/x86/include/asm/smp.h | 10 ------
> arch/x86/include/asm/topology.h | 2 +-
> arch/x86/kernel/cpu/perf_event_intel.c | 6 ++--
> arch/x86/kernel/cpu/proc.c | 3 +-
> arch/x86/kernel/smpboot.c | 42 +++++++++++-----------
> arch/x86/kernel/tsc_sync.c | 2 +-
> block/blk-mq-cpumap.c | 2 +-
> drivers/acpi/acpi_pad.c | 2 +-
> drivers/base/topology.c | 2 +-
> drivers/cpufreq/acpi-cpufreq.c | 5 +--
> drivers/cpufreq/p4-clockmod.c | 2 +-
> drivers/cpufreq/powernow-k8.c | 13 ++-----
> drivers/cpufreq/speedstep-ich.c | 2 +-
> drivers/hwmon/coretemp.c | 3 +-
> drivers/net/ethernet/sfc/efx.c | 2 +-
> .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 2 +-
> drivers/staging/lustre/lustre/ptlrpc/service.c | 4 +--
> include/linux/topology.h | 6 ++--
> lib/cpu_rmap.c | 2 +-
> 29 files changed, 87 insertions(+), 81 deletions(-)

So considering that Andrew has not picked these up yet, and because they have a
significant cross section with WIP code in the x86 and perf code (and conflict
with ongoing work in the perf tree), I've merged these bits.

Andrew, do you have any objections to that?

Thanks,

Ingo